diff --git a/__mocks__/react-native-blob-util.js b/__mocks__/react-native-blob-util.js
deleted file mode 100644
index ff8b4c56321a..000000000000
--- a/__mocks__/react-native-blob-util.js
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/__mocks__/react-native-blob-util.ts b/__mocks__/react-native-blob-util.ts
new file mode 100644
index 000000000000..bdaa0ae3ded5
--- /dev/null
+++ b/__mocks__/react-native-blob-util.ts
@@ -0,0 +1,5 @@
+import type RNFetchBlob from 'react-native-blob-util';
+
+const ReactNativeBlobUtilMock: Partial<typeof RNFetchBlob> = {};
+
+export default ReactNativeBlobUtilMock;
diff --git a/__mocks__/react-native-device-info.js b/__mocks__/react-native-device-info.js
deleted file mode 100644
index 2ba5b6ef85b3..000000000000
--- a/__mocks__/react-native-device-info.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import MockDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock';
-
-export default MockDeviceInfo;
diff --git a/__mocks__/react-native-device-info.ts b/__mocks__/react-native-device-info.ts
new file mode 100644
index 000000000000..bb04f1a176b2
--- /dev/null
+++ b/__mocks__/react-native-device-info.ts
@@ -0,0 +1,6 @@
+import type DeviceInfoModule from 'react-native-device-info';
+import MockDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock';
+
+const DeviceInfo: typeof DeviceInfoModule = MockDeviceInfo;
+
+export default DeviceInfo;
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c0d157da2afd..cbfdb4b0b0a5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043900
-        versionName "1.4.39-0"
+        versionCode 1001043902
+        versionName "1.4.39-2"
     }
 
     flavorDimensions "default"
diff --git a/desktop/main.js b/desktop/main.js
index e53f03530b57..4b38c5d36ab3 100644
--- a/desktop/main.js
+++ b/desktop/main.js
@@ -410,6 +410,14 @@ const mainWindow = () => {
                                     browserWindow.webContents.goBack();
                                 },
                             },
+                            {
+                                role: 'back',
+                                visible: false,
+                                accelerator: process.platform === 'darwin' ? 'Cmd+Left' : 'Shift+Left',
+                                click: () => {
+                                    browserWindow.webContents.goBack();
+                                },
+                            },
                             {
                                 id: 'forward',
                                 role: 'forward',
@@ -418,6 +426,14 @@ const mainWindow = () => {
                                     browserWindow.webContents.goForward();
                                 },
                             },
+                            {
+                                role: 'forward',
+                                visible: false,
+                                accelerator: process.platform === 'darwin' ? 'Cmd+Right' : 'Shift+Right',
+                                click: () => {
+                                    browserWindow.webContents.goForward();
+                                },
+                            },
                         ],
                     },
                     {
diff --git a/docs/redirects.csv b/docs/redirects.csv
index 648f3ad6612f..674e5c32ab04 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -48,6 +48,7 @@ https://community.expensify.com/discussion/4463/how-to-remove-or-manage-settings
 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://help.expensify.com/articles/expensify-classic/billing-and-subscriptions/Annual-Subscription
 https://community.expensify.com/discussion/5667/deep-dive-how-does-the-annual-subscription-billing-work,https://help.expensify.com/articles/expensify-classic/billing-and-subscriptions/Annual-Subscription
+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/
 https://help.expensify.com/articles/expensify-classic/getting-started/Employees,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace
 https://help.expensify.com/articles/expensify-classic/getting-started/Using-The-App,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c23bcfef9657..0c53a62c88a6 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.39.0</string>
+	<string>1.4.39.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 61cf39e17bc7..ed74e6865d2f 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.39.0</string>
+	<string>1.4.39.2</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 27ca75150241..94c770eaf29f 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.39</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.39.0</string>
+	<string>1.4.39.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1664c982ce50..2c05bf4175d8 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1178,10 +1178,6 @@ PODS:
     - React-Core
   - react-native-launch-arguments (4.0.2):
     - React
-  - react-native-live-markdown (0.1.0):
-    - glog
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Core
   - react-native-netinfo (11.2.1):
     - React-Core
   - react-native-pager-view (6.2.2):
@@ -1412,6 +1408,10 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
+  - RNLiveMarkdown (0.1.5):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core
   - RNLocalize (2.2.6):
     - React-Core
   - rnmapbox-maps (10.0.11):
@@ -1529,7 +1529,6 @@ DEPENDENCIES:
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-key-command (from `../node_modules/react-native-key-command`)
   - react-native-launch-arguments (from `../node_modules/react-native-launch-arguments`)
-  - "react-native-live-markdown (from `../node_modules/@expensify/react-native-live-markdown`)"
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-pdf (from `../node_modules/react-native-pdf`)
@@ -1574,6 +1573,7 @@ DEPENDENCIES:
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)"
+  - "RNLiveMarkdown (from `../node_modules/@expensify/react-native-live-markdown`)"
   - RNLocalize (from `../node_modules/react-native-localize`)
   - "rnmapbox-maps (from `../node_modules/@rnmapbox/maps`)"
   - RNPermissions (from `../node_modules/react-native-permissions`)
@@ -1725,8 +1725,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-key-command"
   react-native-launch-arguments:
     :path: "../node_modules/react-native-launch-arguments"
-  react-native-live-markdown:
-    :path: "../node_modules/@expensify/react-native-live-markdown"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-pager-view:
@@ -1815,6 +1813,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-gesture-handler"
   RNGoogleSignin:
     :path: "../node_modules/@react-native-google-signin/google-signin"
+  RNLiveMarkdown:
+    :path: "../node_modules/@expensify/react-native-live-markdown"
   RNLocalize:
     :path: "../node_modules/react-native-localize"
   rnmapbox-maps:
@@ -1922,7 +1922,6 @@ SPEC CHECKSUMS:
   react-native-image-picker: c33d4e79f0a14a2b66e5065e14946ae63749660b
   react-native-key-command: 5af6ee30ff4932f78da6a2109017549042932aa5
   react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
-  react-native-live-markdown: 81ac491b913cb8541a06586adcdc159ab1b86fb5
   react-native-netinfo: 8a7fd3f7130ef4ad2fb4276d5c9f8d3f28d2df3d
   react-native-pager-view: 02a5c4962530f7efc10dd51ee9cdabeff5e6c631
   react-native-pdf: b4ca3d37a9a86d9165287741c8b2ef4d8940c00e
@@ -1967,6 +1966,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 25b969a1ffc806b9f9ad2e170d4a3b049c6af85e
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
+  RNLiveMarkdown: 35eeecf7e57eb26fdc279d5d4815982a9a9f7beb
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64
   RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa
diff --git a/package-lock.json b/package-lock.json
index a7b27a7f0332..694646334480 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,17 @@
 {
   "name": "new.expensify",
-  "version": "1.4.39-0",
+  "version": "1.4.39-2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.39-0",
+      "version": "1.4.39-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@dotlottie/react-player": "^1.6.3",
-        "@expensify/react-native-live-markdown": "git+ssh://git@github.com/Expensify/react-native-live-markdown.git#77f85a5265043c6100f1fa65edd58901724faf08",
+        "@expensify/react-native-live-markdown": "0.1.5",
         "@expo/metro-runtime": "~3.1.1",
         "@formatjs/intl-datetimeformat": "^6.10.0",
         "@formatjs/intl-getcanonicallocales": "^2.2.0",
@@ -3374,13 +3374,9 @@
       }
     },
     "node_modules/@expensify/react-native-live-markdown": {
-      "version": "0.1.0",
-      "resolved": "git+ssh://git@github.com/Expensify/react-native-live-markdown.git#77f85a5265043c6100f1fa65edd58901724faf08",
-      "integrity": "sha512-EpXjQ+JBR3pRuYuT5iFzQw45hrCcr5ZmX/lji4i3Un/BOQ14JbTkQjjwo4hYX3EdOvfrAUSJs0ZVqeCEIMo3YQ==",
-      "license": "MIT",
-      "workspaces": [
-        "example"
-      ],
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.5.tgz",
+      "integrity": "sha512-Z1tduU1C2BDgZNMrDvXtiWUhQoroMasvwucLBdLSypAMB4Kls4G038A/yZEbD00YVXjXv2tBUiqvUmCMuRdlqw==",
       "engines": {
         "node": ">= 18.0.0"
       },
diff --git a/package.json b/package.json
index 6626baf86ad5..0f856afb44e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.39-0",
+  "version": "1.4.39-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "git+ssh://git@github.com/Expensify/react-native-live-markdown.git#77f85a5265043c6100f1fa65edd58901724faf08",
+    "@expensify/react-native-live-markdown": "0.1.5",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-getcanonicallocales": "^2.2.0",
diff --git a/src/CONST.ts b/src/CONST.ts
index be78f257a44b..79895d20aa57 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -736,7 +736,6 @@ const CONST = {
         REPORT_INITIAL_RENDER: 'report_initial_render',
         SWITCH_REPORT: 'switch_report',
         SIDEBAR_LOADED: 'sidebar_loaded',
-        OPEN_SEARCH: 'open_search',
         LOAD_SEARCH_OPTIONS: 'load_search_options',
         COLD: 'cold',
         WARM: 'warm',
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 9fed8b69db79..b46d3db8b60d 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -424,7 +424,7 @@ type OnyxValues = {
     [ONYXKEYS.WALLET_TERMS]: OnyxTypes.WalletTerms;
     [ONYXKEYS.BANK_ACCOUNT_LIST]: OnyxTypes.BankAccountList;
     [ONYXKEYS.FUND_LIST]: OnyxTypes.FundList;
-    [ONYXKEYS.CARD_LIST]: Record<string, OnyxTypes.Card>;
+    [ONYXKEYS.CARD_LIST]: OnyxTypes.CardList;
     [ONYXKEYS.WALLET_STATEMENT]: OnyxTypes.WalletStatement;
     [ONYXKEYS.PERSONAL_BANK_ACCOUNT]: OnyxTypes.PersonalBankAccount;
     [ONYXKEYS.REIMBURSEMENT_ACCOUNT]: OnyxTypes.ReimbursementAccount;
@@ -465,7 +465,8 @@ type OnyxValues = {
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
     [ONYXKEYS.COLLECTION.POLICY_REPORT_FIELDS]: OnyxTypes.PolicyReportFields;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
-    [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: Record<string, number>;
+    [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs | undefined;
+    [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT]: string | undefined;
     [ONYXKEYS.COLLECTION.REPORT]: OnyxTypes.Report;
     [ONYXKEYS.COLLECTION.REPORT_METADATA]: OnyxTypes.ReportMetadata;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS]: OnyxTypes.ReportActions;
@@ -547,8 +548,8 @@ type OnyxValues = {
     [ONYXKEYS.FORMS.REPORT_VIRTUAL_CARD_FRAUD_DRAFT]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM_DRAFT]: OnyxTypes.Form;
-    [ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM]: OnyxTypes.Form;
-    [ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT]: OnyxTypes.Form;
+    [ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM]: OnyxTypes.GetPhysicalCardForm;
+    [ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT]: OnyxTypes.GetPhysicalCardForm;
     [ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM]: OnyxTypes.ReportFieldEditForm;
     [ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM_DRAFT]: OnyxTypes.Form;
     // @ts-expect-error Different values are defined under the same key: ReimbursementAccount and ReimbursementAccountForm
diff --git a/src/components/AmountTextInput.tsx b/src/components/AmountTextInput.tsx
index 245aa2126d08..05080fcdd21c 100644
--- a/src/components/AmountTextInput.tsx
+++ b/src/components/AmountTextInput.tsx
@@ -43,7 +43,6 @@ function AmountTextInput(
             disableKeyboard
             autoGrow
             hideFocusedState
-            shouldInterceptSwipe
             inputStyle={[styles.iouAmountTextInput, styles.p0, styles.noLeftBorderRadius, styles.noRightBorderRadius, style]}
             textInputContainerStyles={[styles.borderNone, styles.noLeftBorderRadius, styles.noRightBorderRadius]}
             onChangeText={onChangeAmount}
diff --git a/src/components/Composer/index.tsx b/src/components/Composer/index.tsx
index a5c9e8952905..516de55c73ba 100755
--- a/src/components/Composer/index.tsx
+++ b/src/components/Composer/index.tsx
@@ -1,4 +1,3 @@
-import {MarkdownTextInput} from '@expensify/react-native-live-markdown';
 import type {BaseSyntheticEvent, ForwardedRef} from 'react';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {flushSync} from 'react-dom';
@@ -6,10 +5,10 @@ import {flushSync} from 'react-dom';
 import type {DimensionValue, NativeSyntheticEvent, Text as RNText, TextInput, TextInputKeyPressEventData, TextInputSelectionChangeEventData} from 'react-native';
 import {StyleSheet, View} from 'react-native';
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
+import RNTextInput from '@components/RNTextInput';
 import Text from '@components/Text';
 import useHtmlPaste from '@hooks/useHtmlPaste';
 import useIsScrollBarVisible from '@hooks/useIsScrollBarVisible';
-import useMarkdownStyle from '@hooks/useMarkdownStyle';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -81,7 +80,6 @@ function Composer(
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const markdownStyle = useMarkdownStyle();
     const {windowWidth} = useWindowDimensions();
     const textRef = useRef<HTMLElement & RNText>(null);
     const textInput = useRef<AnimatedTextInputRef | null>(null);
@@ -170,7 +168,7 @@ function Composer(
 
                 // 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 = ['INPUT', 'TEXTAREA', 'SPAN'].includes(eventTarget?.nodeName ?? '') || eventTarget?.contentEditable === 'true';
+                const isTargetInput = eventTarget?.nodeName === 'INPUT' || eventTarget?.nodeName === 'TEXTAREA' || eventTarget?.contentEditable === 'true';
                 if (isTargetInput) {
                     return true;
                 }
@@ -329,14 +327,13 @@ function Composer(
 
     return (
         <>
-            <MarkdownTextInput
+            <RNTextInput
                 autoComplete="off"
                 autoCorrect={!Browser.isMobileSafari()}
                 placeholderTextColor={theme.placeholderText}
-                ref={(el) => (textInput.current = el as AnimatedTextInputRef)}
+                ref={(el) => (textInput.current = el)}
                 selection={selection}
                 style={inputStyleMemo}
-                markdownStyle={markdownStyle}
                 value={value}
                 defaultValue={defaultValue}
                 autoFocus={autoFocus}
diff --git a/src/components/ConnectBankAccountButton.js b/src/components/ConnectBankAccountButton.js
deleted file mode 100644
index f036918d9429..000000000000
--- a/src/components/ConnectBankAccountButton.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import {View} from 'react-native';
-import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
-import Navigation from '@libs/Navigation/Navigation';
-import * as ReimbursementAccount from '@userActions/ReimbursementAccount';
-import Button from './Button';
-import * as Expensicons from './Icon/Expensicons';
-import networkPropTypes from './networkPropTypes';
-import {withNetwork} from './OnyxProvider';
-import Text from './Text';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
-
-const propTypes = {
-    ...withLocalizePropTypes,
-
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
-    /** PolicyID for navigating to bank account route of that policy */
-    policyID: PropTypes.string.isRequired,
-
-    /** Button styles, also applied for offline message wrapper */
-    style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-};
-
-const defaultProps = {
-    style: [],
-};
-
-function ConnectBankAccountButton(props) {
-    const styles = useThemeStyles();
-    const activeRoute = Navigation.getActiveRouteWithoutParams();
-    return props.network.isOffline ? (
-        <View style={props.style}>
-            <Text>{`${props.translate('common.youAppearToBeOffline')} ${props.translate('common.thisFeatureRequiresInternet')}`}</Text>
-        </View>
-    ) : (
-        <Button
-            text={props.translate('workspace.common.connectBankAccount')}
-            onPress={() => ReimbursementAccount.navigateToBankAccountRoute(props.policyID, activeRoute)}
-            icon={Expensicons.Bank}
-            style={props.style}
-            iconStyles={[styles.buttonCTAIcon]}
-            shouldShowRightIcon
-            large
-            success
-        />
-    );
-}
-
-ConnectBankAccountButton.propTypes = propTypes;
-ConnectBankAccountButton.defaultProps = defaultProps;
-ConnectBankAccountButton.displayName = 'ConnectBankAccountButton';
-
-export default compose(withNetwork(), withLocalize)(ConnectBankAccountButton);
diff --git a/src/components/ConnectBankAccountButton.tsx b/src/components/ConnectBankAccountButton.tsx
new file mode 100644
index 000000000000..aed1c88ab1d1
--- /dev/null
+++ b/src/components/ConnectBankAccountButton.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReimbursementAccount from '@userActions/ReimbursementAccount';
+import Button from './Button';
+import * as Expensicons from './Icon/Expensicons';
+import Text from './Text';
+
+type ConnectBankAccountButtonProps = {
+    /** PolicyID for navigating to bank account route of that policy */
+    policyID: string;
+
+    /** Button styles, also applied for offline message wrapper */
+    style?: StyleProp<ViewStyle>;
+};
+
+function ConnectBankAccountButton({style, policyID}: ConnectBankAccountButtonProps) {
+    const styles = useThemeStyles();
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+    const activeRoute = Navigation.getActiveRouteWithoutParams();
+
+    return isOffline ? (
+        <View style={style}>
+            <Text>{`${translate('common.youAppearToBeOffline')} ${translate('common.thisFeatureRequiresInternet')}`}</Text>
+        </View>
+    ) : (
+        <Button
+            text={translate('workspace.common.connectBankAccount')}
+            onPress={() => ReimbursementAccount.navigateToBankAccountRoute(policyID, activeRoute)}
+            icon={Expensicons.Bank}
+            style={style}
+            iconStyles={styles.buttonCTAIcon}
+            shouldShowRightIcon
+            large
+            success
+        />
+    );
+}
+
+ConnectBankAccountButton.displayName = 'ConnectBankAccountButton';
+
+export default ConnectBankAccountButton;
diff --git a/src/components/ContextMenuItem.tsx b/src/components/ContextMenuItem.tsx
index d292f80d135e..d6c8fd973983 100644
--- a/src/components/ContextMenuItem.tsx
+++ b/src/components/ContextMenuItem.tsx
@@ -1,6 +1,6 @@
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useImperativeHandle} from 'react';
-import type {GestureResponderEvent} from 'react-native';
+import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useThrottledButtonState from '@hooks/useThrottledButtonState';
@@ -41,6 +41,9 @@ type ContextMenuItemProps = {
 
     /** Whether the width should be limited */
     shouldLimitWidth?: boolean;
+
+    /** Styles to apply to ManuItem wrapper */
+    wrapperStyle?: StyleProp<ViewStyle>;
 };
 
 type ContextMenuItemHandle = {
@@ -48,7 +51,19 @@ type ContextMenuItemHandle = {
 };
 
 function ContextMenuItem(
-    {onPress, successIcon, successText = '', icon, text, isMini = false, description = '', isAnonymousAction = false, isFocused = false, shouldLimitWidth = true}: ContextMenuItemProps,
+    {
+        onPress,
+        successIcon,
+        successText = '',
+        icon,
+        text,
+        isMini = false,
+        description = '',
+        isAnonymousAction = false,
+        isFocused = false,
+        shouldLimitWidth = true,
+        wrapperStyle,
+    }: ContextMenuItemProps,
     ref: ForwardedRef<ContextMenuItemHandle>,
 ) {
     const styles = useThemeStyles();
@@ -93,7 +108,7 @@ function ContextMenuItem(
             title={itemText}
             icon={itemIcon}
             onPress={triggerPressAndUpdateSuccess}
-            wrapperStyle={styles.pr9}
+            wrapperStyle={[styles.pr9, wrapperStyle]}
             success={!isThrottledButtonActive}
             description={description}
             descriptionTextStyle={styles.breakWord}
diff --git a/src/components/DistanceRequest/index.js b/src/components/DistanceRequest/index.js
index eafc36a57927..419e22e8a158 100644
--- a/src/components/DistanceRequest/index.js
+++ b/src/components/DistanceRequest/index.js
@@ -194,17 +194,21 @@ function DistanceRequest({transactionID, report, transaction, route, isEditingRe
             }
 
             const newWaypoints = {};
+            let emptyWaypointIndex = -1;
             _.each(data, (waypoint, index) => {
                 newWaypoints[`waypoint${index}`] = lodashGet(waypoints, waypoint, {});
+                // Find waypoint that BECOMES empty after dragging
+                if (_.isEmpty(newWaypoints[`waypoint${index}`]) && !_.isEmpty(lodashGet(waypoints, `waypoint${index}`, {}))) {
+                    emptyWaypointIndex = index;
+                }
             });
 
             setOptimisticWaypoints(newWaypoints);
-            // eslint-disable-next-line rulesdir/no-thenable-actions-in-views
-            Transaction.updateWaypoints(transactionID, newWaypoints).then(() => {
+            Promise.all([Transaction.removeWaypoint(transaction, emptyWaypointIndex.toString(), true), Transaction.updateWaypoints(transactionID, newWaypoints, true)]).then(() => {
                 setOptimisticWaypoints(null);
             });
         },
-        [transactionID, waypoints, waypointsList],
+        [transactionID, transaction, waypoints, waypointsList],
     );
 
     const submitWaypoints = useCallback(() => {
diff --git a/src/components/OptionsList/BaseOptionsList.tsx b/src/components/OptionsList/BaseOptionsList.tsx
index 6f265bfb8440..4a9df89ae644 100644
--- a/src/components/OptionsList/BaseOptionsList.tsx
+++ b/src/components/OptionsList/BaseOptionsList.tsx
@@ -9,8 +9,6 @@ import SectionList from '@components/SectionList';
 import Text from '@components/Text';
 import usePrevious from '@hooks/usePrevious';
 import useThemeStyles from '@hooks/useThemeStyles';
-import Timing from '@libs/actions/Timing';
-import Performance from '@libs/Performance';
 import type {OptionData} from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
 import variables from '@styles/variables';
@@ -110,16 +108,6 @@ function BaseOptionsList(
         flattenedData.current = buildFlatSectionArray();
     });
 
-    useEffect(() => {
-        if (isLoading) {
-            return;
-        }
-
-        // Mark the end of the search page load time. This data is collected only for Search page.
-        Timing.end(CONST.TIMING.OPEN_SEARCH);
-        Performance.markEnd(CONST.TIMING.OPEN_SEARCH);
-    }, [isLoading]);
-
     const onViewableItemsChanged = () => {
         if (didLayout.current || !onLayout) {
             return;
diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index 133996fde41c..f0cd8dc1b4b5 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -9,7 +9,6 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import SpacerView from '@components/SpacerView';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -42,7 +41,6 @@ function MoneyReportView({report, policy, policyReportFields, shouldShowHorizont
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const {canUseReportFields} = usePermissions();
     const isSettled = ReportUtils.isSettled(report.reportID);
     const isTotalUpdated = ReportUtils.hasUpdatedTotal(report);
 
@@ -69,7 +67,7 @@ function MoneyReportView({report, policy, policyReportFields, shouldShowHorizont
         <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true)]}>
             <AnimatedEmptyStateBackground />
             <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth, true)]}>
-                {canUseReportFields &&
+                {ReportUtils.reportFieldsEnabled(report) &&
                     sortedPolicyReportFields.map((reportField) => {
                         const isTitleField = ReportUtils.isReportFieldOfTypeTitle(reportField);
                         const fieldValue = isTitleField ? report.reportName : reportField.value ?? reportField.defaultValue;
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index df5be02ca64f..3fa6f1872ca3 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -152,10 +152,11 @@ function MoneyRequestView({
                 Navigation.dismissModal();
                 return;
             }
-            IOU.updateMoneyRequestBillable(transaction?.transactionID ?? '', report?.reportID, newBillable);
+            // @ts-expect-error: the type used across the app for policyTags is not what is returned by Onyx, PolicyTagList represents that, but existing policy tag utils need a refactor to fix this
+            IOU.updateMoneyRequestBillable(transaction?.transactionID ?? '', report?.reportID, newBillable, policy, policyTags, policyCategories);
             Navigation.dismissModal();
         },
-        [transaction, report],
+        [transaction, report, policy, policyTags, policyCategories],
     );
 
     if (isCardTransaction) {
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 0d450e46568d..9711e126907f 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -151,8 +151,8 @@ function TaskView({report, shouldShowHorizontalRule, ...props}: TaskViewProps) {
                         interactive={!isDisableInteractive}
                     />
                 </OfflineWithFeedback>
-                {report.managerID ? (
-                    <OfflineWithFeedback pendingAction={report.pendingFields?.managerID}>
+                <OfflineWithFeedback pendingAction={report.pendingFields?.managerID}>
+                    {report.managerID ? (
                         <MenuItem
                             label={translate('task.assignee')}
                             title={ReportUtils.getDisplayNameForParticipant(report.managerID)}
@@ -169,18 +169,18 @@ function TaskView({report, shouldShowHorizontalRule, ...props}: TaskViewProps) {
                             interactive={!isDisableInteractive}
                             titleWithTooltips={assigneeTooltipDetails}
                         />
-                    </OfflineWithFeedback>
-                ) : (
-                    <MenuItemWithTopDescription
-                        description={translate('task.assignee')}
-                        onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID))}
-                        shouldShowRightIcon={isOpen}
-                        disabled={disableState}
-                        wrapperStyle={[styles.pv2]}
-                        shouldGreyOutWhenDisabled={false}
-                        interactive={!isDisableInteractive}
-                    />
-                )}
+                    ) : (
+                        <MenuItemWithTopDescription
+                            description={translate('task.assignee')}
+                            onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID))}
+                            shouldShowRightIcon={isOpen}
+                            disabled={disableState}
+                            wrapperStyle={[styles.pv2]}
+                            shouldGreyOutWhenDisabled={false}
+                            interactive={!isDisableInteractive}
+                        />
+                    )}
+                </OfflineWithFeedback>
             </OfflineWithFeedback>
             <SpacerView
                 shouldShow={shouldShowHorizontalRule}
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 83ce2145fcdb..c77e244b4c92 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -59,6 +59,7 @@ function BaseSelectionList<TItem extends User | RadioItem>(
         shouldUseDynamicMaxToRenderPerBatch = false,
         rightHandSideComponent,
         isLoadingNewOptions = false,
+        onLayout,
     }: BaseSelectionListProps<TItem>,
     inputRef: ForwardedRef<RNTextInput>,
 ) {
@@ -320,6 +321,14 @@ function BaseSelectionList<TItem extends User | RadioItem>(
         [focusedIndex, isInitialSectionListRender, scrollToIndex, shouldUseDynamicMaxToRenderPerBatch],
     );
 
+    const onSectionListLayout = useCallback(
+        (nativeEvent: LayoutChangeEvent) => {
+            onLayout?.(nativeEvent);
+            scrollToFocusedIndexOnFirstRender(nativeEvent);
+        },
+        [onLayout, scrollToFocusedIndexOnFirstRender],
+    );
+
     const updateAndScrollToFocusedIndex = useCallback(
         (newFocusedIndex: number) => {
             setFocusedIndex(newFocusedIndex);
@@ -468,7 +477,7 @@ function BaseSelectionList<TItem extends User | RadioItem>(
                                     windowSize={5}
                                     viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
                                     testID="selection-list"
-                                    onLayout={scrollToFocusedIndexOnFirstRender}
+                                    onLayout={onSectionListLayout}
                                     style={(!maxToRenderPerBatch || isInitialSectionListRender) && styles.opacity0}
                                 />
                                 {children}
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 222c818dd66d..be871971ee92 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -1,5 +1,5 @@
 import type {ReactElement, ReactNode} from 'react';
-import type {GestureResponderEvent, InputModeOptions, SectionListData, StyleProp, TextStyle, ViewStyle} from 'react-native';
+import type {GestureResponderEvent, InputModeOptions, LayoutChangeEvent, SectionListData, StyleProp, TextStyle, ViewStyle} from 'react-native';
 import type {Errors, Icon, PendingAction} from '@src/types/onyx/OnyxCommon';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 
@@ -55,7 +55,7 @@ type User = {
     login?: string;
 
     /** Element to show on the right side of the item */
-    rightElement?: ReactElement;
+    rightElement?: ReactNode;
 
     /** Icons for the user (can be multiple if it's a Workspace) */
     icons?: Icon[];
@@ -129,6 +129,9 @@ type Section<TItem extends User | RadioItem> = {
 
     /** Whether this section items disabled for selection */
     isDisabled?: boolean;
+
+    /** Whether this section should be shown or not */
+    shouldShow?: boolean;
 };
 
 type BaseSelectionListProps<TItem extends User | RadioItem> = Partial<ChildrenProps> & {
@@ -233,6 +236,9 @@ type BaseSelectionListProps<TItem extends User | RadioItem> = Partial<ChildrenPr
 
     /** Whether to show the loading indicator for new options */
     isLoadingNewOptions?: boolean;
+
+    /** Fired when the list is displayed with the items */
+    onLayout?: (event: LayoutChangeEvent) => void;
 };
 
 type ItemLayout = {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 7368665514ab..5509d79368f9 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -723,6 +723,10 @@ export default {
         title: 'Security options',
         subtitle: 'Enable two-factor authentication to keep your account safe.',
     },
+    shareCodePage: {
+        title: 'Your code',
+        subtitle: 'Invite members to Expensify by sharing your personal QR code or referral link.',
+    },
     loungeAccessPage: {
         loungeAccess: 'Lounge access',
         headline: 'The Expensify Lounge is closed.',
@@ -1996,7 +2000,7 @@ export default {
         parentNavigationSummary: ({rootReportName, workspaceName}: ParentNavigationSummaryParams) => `From ${rootReportName}${workspaceName ? ` in ${workspaceName}` : ''}`,
     },
     qrCodes: {
-        copy: 'Copy',
+        copy: 'Copy URL',
         copied: 'Copied!',
     },
     moderation: {
@@ -2186,9 +2190,9 @@ export default {
         },
         smartscanFailed: 'Receipt scanning failed. Enter details manually.',
         someTagLevelsRequired: 'Missing tag',
-        tagOutOfPolicy: ({tagName}: ViolationsTagOutOfPolicyParams) => `${tagName ?? ''} no longer valid`,
+        tagOutOfPolicy: ({tagName}: ViolationsTagOutOfPolicyParams) => `${tagName ?? 'Tag'} no longer valid`,
         taxAmountChanged: 'Tax amount was modified',
-        taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName ?? ''} no longer valid`,
+        taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName ?? 'Tax'} no longer valid`,
         taxRateChanged: 'Tax rate was modified',
         taxRequired: 'Missing tax rate',
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 812c84525d41..a4b0cabe59e8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -717,6 +717,10 @@ export default {
         title: 'Opciones de seguridad',
         subtitle: 'Activa la autenticación de dos factores para mantener tu cuenta segura.',
     },
+    shareCodePage: {
+        title: 'Tu código',
+        subtitle: 'Invita a miembros a Expensify compartiendo tu código QR personal o enlace de invitación.',
+    },
     loungeAccessPage: {
         loungeAccess: 'Acceso a la sala vip',
         headline: 'La sala vip de Expensify está cerrada.',
@@ -2482,7 +2486,7 @@ export default {
         parentNavigationSummary: ({rootReportName, workspaceName}: ParentNavigationSummaryParams) => `De ${rootReportName}${workspaceName ? ` en ${workspaceName}` : ''}`,
     },
     qrCodes: {
-        copy: 'Copiar',
+        copy: 'Copiar URL',
         copied: '¡Copiado!',
     },
     actionableMentionWhisperOptions: {
@@ -2674,9 +2678,9 @@ export default {
         },
         smartscanFailed: 'No se pudo escanear el recibo. Introduce los datos manualmente',
         someTagLevelsRequired: 'Falta etiqueta',
-        tagOutOfPolicy: ({tagName}: ViolationsTagOutOfPolicyParams) => `La etiqueta ${tagName} ya no es válida`,
+        tagOutOfPolicy: ({tagName}: ViolationsTagOutOfPolicyParams) => `La etiqueta ${tagName ? `${tagName} ` : ''}ya no es válida`,
         taxAmountChanged: 'El importe del impuesto fue modificado',
-        taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName} ya no es válido`,
+        taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName ?? 'El impuesto'} ya no es válido`,
         taxRateChanged: 'La tasa de impuesto fue modificada',
         taxRequired: 'Falta la tasa de impuesto',
     },
diff --git a/src/libs/API/parameters/UpdatePolicyRoomNameParams.ts b/src/libs/API/parameters/UpdatePolicyRoomNameParams.ts
index 65b858b7c20f..18e6d560b94f 100644
--- a/src/libs/API/parameters/UpdatePolicyRoomNameParams.ts
+++ b/src/libs/API/parameters/UpdatePolicyRoomNameParams.ts
@@ -1,6 +1,7 @@
 type UpdatePolicyRoomNameParams = {
     reportID: string;
     policyRoomName: string;
+    renamedRoomReportActionID: string;
 };
 
 export default UpdatePolicyRoomNameParams;
diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index f7ac80a1d7f3..f99230382d12 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -1,9 +1,10 @@
 import lodash from 'lodash';
 import Onyx from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import type {OnyxValues} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Card} from '@src/types/onyx';
+import type {Card, CardList} from '@src/types/onyx';
 import * as Localize from './Localize';
 
 let allCards: OnyxValues[typeof ONYXKEYS.CARD_LIST] = {};
@@ -88,10 +89,10 @@ function formatCardExpiration(expirationDateString: string) {
  * @param cardList - collection of assigned cards
  * @returns collection of assigned cards grouped by domain
  */
-function getDomainCards(cardList: Record<string, Card>) {
+function getDomainCards(cardList: OnyxEntry<CardList>): Record<string, Card[]> {
     // Check for domainName to filter out personal credit cards.
-    // eslint-disable-next-line you-dont-need-lodash-underscore/filter
-    const activeCards = lodash.filter(cardList, (card) => !!card.domainName && (CONST.EXPENSIFY_CARD.ACTIVE_STATES as ReadonlyArray<Card['state']>).includes(card.state));
+    const activeCards = Object.values(cardList ?? {}).filter((card) => !!card?.domainName && CONST.EXPENSIFY_CARD.ACTIVE_STATES.some((element) => element === card.state));
+
     return lodash.groupBy(activeCards, (card) => card.domainName);
 }
 
diff --git a/src/libs/GetPhysicalCardUtils.ts b/src/libs/GetPhysicalCardUtils.ts
index 139297a26513..82d991efb3aa 100644
--- a/src/libs/GetPhysicalCardUtils.ts
+++ b/src/libs/GetPhysicalCardUtils.ts
@@ -1,44 +1,13 @@
+import type {OnyxEntry} from 'react-native-onyx';
 import ROUTES from '@src/ROUTES';
-import type {Login} from '@src/types/onyx';
+import type {Route} from '@src/ROUTES';
+import type {GetPhysicalCardForm, LoginList, PrivatePersonalDetails} from '@src/types/onyx';
 import Navigation from './Navigation/Navigation';
 import * as PersonalDetailsUtils from './PersonalDetailsUtils';
 import * as UserUtils from './UserUtils';
 
-type DraftValues = {
-    addressLine1: string;
-    addressLine2: string;
-    city: string;
-    country: string;
-    legalFirstName: string;
-    legalLastName: string;
-    phoneNumber: string;
-    state: string;
-    zipPostCode: string;
-};
-
-type PrivatePersonalDetails = {
-    address: {street: string; city: string; state: string; country: string; zip: string};
-    legalFirstName: string;
-    legalLastName: string;
-    phoneNumber: string;
-};
-
-type LoginList = Record<string, Login>;
-
-/**
- *
- * @param domain
- * @param privatePersonalDetails
- * @param loginList
- * @returns
- */
-function getCurrentRoute(domain: string, privatePersonalDetails: PrivatePersonalDetails, loginList: LoginList) {
-    const {
-        address: {street, city, state, country, zip},
-        legalFirstName,
-        legalLastName,
-        phoneNumber,
-    } = privatePersonalDetails;
+function getCurrentRoute(domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, loginList: OnyxEntry<LoginList>): Route {
+    const {address, legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
 
     if (!legalFirstName && !legalLastName) {
         return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.getRoute(domain);
@@ -46,21 +15,14 @@ function getCurrentRoute(domain: string, privatePersonalDetails: PrivatePersonal
     if (!phoneNumber && !UserUtils.getSecondaryPhoneLogin(loginList)) {
         return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE.getRoute(domain);
     }
-    if (!(street && city && state && country && zip)) {
+    if (!(address?.street && address?.city && address?.state && address?.country && address?.zip)) {
         return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_ADDRESS.getRoute(domain);
     }
 
     return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_CONFIRM.getRoute(domain);
 }
 
-/**
- *
- * @param domain
- * @param privatePersonalDetails
- * @param loginList
- * @returns
- */
-function goToNextPhysicalCardRoute(domain: string, privatePersonalDetails: PrivatePersonalDetails, loginList: LoginList) {
+function goToNextPhysicalCardRoute(domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, loginList: OnyxEntry<LoginList>) {
     Navigation.navigate(getCurrentRoute(domain, privatePersonalDetails, loginList));
 }
 
@@ -72,7 +34,7 @@ function goToNextPhysicalCardRoute(domain: string, privatePersonalDetails: Priva
  * @param loginList
  * @returns
  */
-function setCurrentRoute(currentRoute: string, domain: string, privatePersonalDetails: PrivatePersonalDetails, loginList: LoginList) {
+function setCurrentRoute(currentRoute: string, domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, loginList: OnyxEntry<LoginList>) {
     const expectedRoute = getCurrentRoute(domain, privatePersonalDetails, loginList);
 
     // If the user is on the current route or the current route is confirmation, then he's allowed to stay on the current step
@@ -90,24 +52,22 @@ function setCurrentRoute(currentRoute: string, domain: string, privatePersonalDe
  * @param privatePersonalDetails
  * @returns
  */
-function getUpdatedDraftValues(draftValues: DraftValues, privatePersonalDetails: PrivatePersonalDetails, loginList: LoginList) {
-    const {
-        address: {city, country, state, street = '', zip},
-        legalFirstName,
-        legalLastName,
-        phoneNumber,
-    } = privatePersonalDetails;
+function getUpdatedDraftValues(draftValues: OnyxEntry<GetPhysicalCardForm>, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, loginList: OnyxEntry<LoginList>): GetPhysicalCardForm {
+    const {address, legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
 
     return {
-        legalFirstName: draftValues.legalFirstName || legalFirstName,
-        legalLastName: draftValues.legalLastName || legalLastName,
-        addressLine1: draftValues.addressLine1 || street.split('\n')[0],
-        addressLine2: draftValues.addressLine2 || street.split('\n')[1] || '',
-        city: draftValues.city || city,
-        country: draftValues.country || country,
-        phoneNumber: draftValues.phoneNumber || (phoneNumber ?? UserUtils.getSecondaryPhoneLogin(loginList) ?? ''),
-        state: draftValues.state || state,
-        zipPostCode: draftValues.zipPostCode || zip,
+        /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+        // we do not need to use nullish coalescing here because we want to allow empty strings
+        legalFirstName: draftValues?.legalFirstName || legalFirstName,
+        legalLastName: draftValues?.legalLastName || legalLastName,
+        addressLine1: draftValues?.addressLine1 || address?.street.split('\n')[0],
+        addressLine2: draftValues?.addressLine2 || address?.street.split('\n')[1] || '',
+        city: draftValues?.city || address?.city,
+        country: draftValues?.country || address?.country,
+        phoneNumber: draftValues?.phoneNumber || phoneNumber || UserUtils.getSecondaryPhoneLogin(loginList) || '',
+        state: draftValues?.state || address?.state,
+        zipPostCode: draftValues?.zipPostCode || address?.zip || '',
+        /* eslint-enable @typescript-eslint/prefer-nullish-coalescing */
     };
 }
 
@@ -116,8 +76,8 @@ function getUpdatedDraftValues(draftValues: DraftValues, privatePersonalDetails:
  * @param draftValues
  * @returns
  */
-function getUpdatedPrivatePersonalDetails(draftValues: DraftValues): PrivatePersonalDetails {
-    const {addressLine1, addressLine2, city, country, legalFirstName, legalLastName, phoneNumber, state, zipPostCode} = draftValues;
+function getUpdatedPrivatePersonalDetails(draftValues: OnyxEntry<GetPhysicalCardForm>): PrivatePersonalDetails {
+    const {addressLine1, addressLine2, city = '', country = '', legalFirstName, legalLastName, phoneNumber, state = '', zipPostCode = ''} = draftValues ?? {};
     return {
         legalFirstName,
         legalLastName,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index d3df217c1342..e40edc9c96e2 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -109,10 +109,26 @@ type SettingsNavigatorParamList = {
     [SCREENS.SETTINGS.WALLET.DOMAIN_CARD]: undefined;
     [SCREENS.SETTINGS.WALLET.REPORT_VIRTUAL_CARD_FRAUD]: undefined;
     [SCREENS.SETTINGS.WALLET.CARD_ACTIVATE]: undefined;
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.NAME]: undefined;
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.PHONE]: undefined;
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.ADDRESS]: undefined;
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.CONFIRM]: undefined;
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.NAME]: {
+        /** domain passed via route /settings/wallet/card/:domain */
+        domain: string;
+    };
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.PHONE]: {
+        /** domain passed via route /settings/wallet/card/:domain */
+        domain: string;
+    };
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.ADDRESS]: {
+        /** Currently selected country */
+        country: string;
+        /** domain passed via route /settings/wallet/card/:domain */
+        domain: string;
+    };
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.CONFIRM]: {
+        /** Currently selected country */
+        country: string;
+        /** domain passed via route /settings/wallet/card/:domain */
+        domain: string;
+    };
     [SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE]: undefined;
     [SCREENS.SETTINGS.WALLET.CHOOSE_TRANSFER_ACCOUNT]: undefined;
     [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS]: undefined;
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 44449fecd517..046a66a8d6e0 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -5,6 +5,7 @@ import lodashGet from 'lodash/get';
 import lodashOrderBy from 'lodash/orderBy';
 import lodashSet from 'lodash/set';
 import lodashSortBy from 'lodash/sortBy';
+import type {ReactElement} from 'react';
 import Onyx from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
@@ -29,7 +30,6 @@ import type {Participant} from '@src/types/onyx/IOU';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type {PolicyTaxRate, PolicyTaxRates} from '@src/types/onyx/PolicyTaxRates';
 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';
@@ -118,13 +118,13 @@ type GetOptionsConfig = {
 
 type MemberForList = {
     text: string;
-    alternateText: string | null;
-    keyForList: string | null;
+    alternateText: string;
+    keyForList: string;
     isSelected: boolean;
-    isDisabled: boolean | null;
-    accountID?: number | null;
-    login: string | null;
-    rightElement: React.ReactNode | null;
+    isDisabled: boolean;
+    accountID?: number;
+    login: string;
+    rightElement: ReactElement | null;
     icons?: OnyxCommon.Icon[];
     pendingAction?: OnyxCommon.PendingAction;
 };
@@ -1837,12 +1837,14 @@ function getShareDestinationOptions(
  * @param member - personalDetails or userToInvite
  * @param config - keys to overwrite the default values
  */
-function formatMemberForList(member: ReportUtils.OptionData, config: ReportUtils.OptionData | EmptyObject = {}): MemberForList | undefined {
+function formatMemberForList(member: ReportUtils.OptionData, config?: Partial<MemberForList>): MemberForList;
+function formatMemberForList(member: null | undefined, config?: Partial<MemberForList>): undefined;
+function formatMemberForList(member: ReportUtils.OptionData | null | undefined, config: Partial<MemberForList> = {}): MemberForList | undefined {
     if (!member) {
         return undefined;
     }
 
-    const accountID = member.accountID;
+    const accountID = member.accountID ?? undefined;
 
     return {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -2022,3 +2024,5 @@ export {
     formatSectionsFromSearchTerm,
     transformedTaxRates,
 };
+
+export type {MemberForList};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 3bf909bf14d5..26280f95447d 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -31,7 +31,7 @@ import type {
 } from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
 import type {Errors, Icon, PendingAction} from '@src/types/onyx/OnyxCommon';
-import type {ChangeLog, IOUMessage, OriginalMessageActionName, OriginalMessageCreated, PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import type {ChangeLog, IOUMessage, OriginalMessageActionName, OriginalMessageCreated, OriginalMessageRenamed, PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type {Status} from '@src/types/onyx/PersonalDetails';
 import type {NotificationPreference} from '@src/types/onyx/Report';
 import type {Message, ReportActionBase, ReportActions} from '@src/types/onyx/ReportAction';
@@ -199,6 +199,9 @@ type OptimisticClosedReportAction = Pick<
 type OptimisticCreatedReportAction = OriginalMessageCreated &
     Pick<ReportActionBase, 'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'pendingAction'>;
 
+type OptimisticRenamedReportAction = OriginalMessageRenamed &
+    Pick<ReportActionBase, 'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'pendingAction'>;
+
 type OptimisticChatReport = Pick<
     Report,
     | 'type'
@@ -1886,6 +1889,13 @@ function isReportFieldOfTypeTitle(reportField: OnyxEntry<PolicyReportField>): bo
     return reportField?.type === 'formula' && reportField?.fieldID === CONST.REPORT_FIELD_TITLE_FIELD_ID;
 }
 
+/**
+ * Check if report fields are available to use in a report
+ */
+function reportFieldsEnabled(report: Report) {
+    return Permissions.canUseReportFields(allBetas ?? []) && isPaidGroupPolicyExpenseReport(report);
+}
+
 /**
  * Given a report field, check if the field can be edited or not.
  * For title fields, its considered disabled if `deletable` prop is `true` (https://github.com/Expensify/App/issues/35043#issuecomment-1911275433)
@@ -1943,7 +1953,7 @@ function getMoneyRequestReportName(report: OnyxEntry<Report>, policy: OnyxEntry<
     const reportFields = isReportSettled ? report?.reportFields : getReportFieldsByPolicyID(report?.policyID ?? '');
     const titleReportField = getFormulaTypeReportField(reportFields ?? {});
 
-    if (titleReportField && report?.reportName && Permissions.canUseReportFields(allBetas ?? [])) {
+    if (titleReportField && report?.reportName && reportFieldsEnabled(report)) {
         return report.reportName;
     }
 
@@ -3334,6 +3344,10 @@ function buildOptimisticChatReport(
     };
 }
 
+function getCurrentUserAvatarOrDefault(): UserUtils.AvatarSource {
+    return allPersonalDetails?.[currentUserAccountID ?? '']?.avatar ?? UserUtils.getDefaultAvatarURL(currentUserAccountID);
+}
+
 /**
  * Returns the necessary reportAction onyx data to indicate that the chat has been created optimistically
  * @param [created] - Action created time
@@ -3364,12 +3378,54 @@ function buildOptimisticCreatedReportAction(emailCreatingAction: string, created
             },
         ],
         automatic: false,
-        avatar: allPersonalDetails?.[currentUserAccountID ?? '']?.avatar ?? UserUtils.getDefaultAvatarURL(currentUserAccountID),
+        avatar: getCurrentUserAvatarOrDefault(),
         created,
         shouldShow: true,
     };
 }
 
+/**
+ * Returns the necessary reportAction onyx data to indicate that the room has been renamed
+ */
+function buildOptimisticRenamedRoomReportAction(newName: string, oldName: string): OptimisticRenamedReportAction {
+    const now = DateUtils.getDBTime();
+    return {
+        reportActionID: NumberUtils.rand64(),
+        actionName: CONST.REPORT.ACTIONS.TYPE.RENAMED,
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        actorAccountID: currentUserAccountID,
+        message: [
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                style: 'strong',
+                text: 'You',
+            },
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                style: 'normal',
+                text: ` renamed this report. New title is '${newName}' (previously '${oldName}').`,
+            },
+        ],
+        person: [
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                style: 'strong',
+                text: allPersonalDetails?.[currentUserAccountID ?? '']?.displayName ?? currentUserEmail,
+            },
+        ],
+        originalMessage: {
+            oldName,
+            newName,
+            html: `Room renamed to ${newName}`,
+            lastModified: now,
+        },
+        automatic: false,
+        avatar: getCurrentUserAvatarOrDefault(),
+        created: now,
+        shouldShow: true,
+    };
+}
+
 /**
  * Returns the necessary reportAction onyx data to indicate that a task report has been edited
  */
@@ -3399,7 +3455,7 @@ function buildOptimisticEditedTaskReportAction(emailEditingTask: string): Optimi
             },
         ],
         automatic: false,
-        avatar: allPersonalDetails?.[currentUserAccountID ?? '']?.avatar ?? UserUtils.getDefaultAvatarURL(currentUserAccountID),
+        avatar: getCurrentUserAvatarOrDefault(),
         created: DateUtils.getDBTime(),
         shouldShow: false,
     };
@@ -3415,7 +3471,7 @@ function buildOptimisticClosedReportAction(emailClosingReport: string, policyNam
         actionName: CONST.REPORT.ACTIONS.TYPE.CLOSED,
         actorAccountID: currentUserAccountID,
         automatic: false,
-        avatar: allPersonalDetails?.[currentUserAccountID ?? '']?.avatar ?? UserUtils.getDefaultAvatarURL(currentUserAccountID),
+        avatar: getCurrentUserAvatarOrDefault(),
         created: DateUtils.getDBTime(),
         message: [
             {
@@ -4863,6 +4919,7 @@ export {
     buildOptimisticChatReport,
     buildOptimisticClosedReportAction,
     buildOptimisticCreatedReportAction,
+    buildOptimisticRenamedRoomReportAction,
     buildOptimisticEditedTaskReportAction,
     buildOptimisticIOUReport,
     buildOptimisticApprovedReportAction,
@@ -4984,6 +5041,7 @@ export {
     hasUpdatedTotal,
     isReportFieldDisabled,
     getAvailableReportFields,
+    reportFieldsEnabled,
     getAllAncestorReportActionIDs,
 };
 
diff --git a/src/libs/TaskUtils.ts b/src/libs/TaskUtils.ts
index da2727d29942..623d449db885 100644
--- a/src/libs/TaskUtils.ts
+++ b/src/libs/TaskUtils.ts
@@ -46,7 +46,7 @@ function getTaskTitle(taskReportID: string, fallbackTitle = ''): string {
 function getTaskCreatedMessage(reportAction: OnyxEntry<ReportAction>) {
     const taskReportID = reportAction?.childReportID ?? '';
     const taskTitle = getTaskTitle(taskReportID, reportAction?.childReportName);
-    return Localize.translateLocal('task.messages.created', {title: taskTitle});
+    return taskTitle ? Localize.translateLocal('task.messages.created', {title: taskTitle}) : '';
 }
 
 export {getTaskReportActionMessage, getTaskTitle, getTaskCreatedMessage};
diff --git a/src/libs/UserUtils.ts b/src/libs/UserUtils.ts
index a8c918bc5def..52c3ecef156c 100644
--- a/src/libs/UserUtils.ts
+++ b/src/libs/UserUtils.ts
@@ -218,8 +218,8 @@ function getSmallSizeAvatar(avatarSource: AvatarSource, accountID?: number): Ava
 /**
  * Gets the secondary phone login number
  */
-function getSecondaryPhoneLogin(loginList: Record<string, Login>): string | undefined {
-    const parsedLoginList = Object.keys(loginList).map((login) => Str.removeSMSDomain(login));
+function getSecondaryPhoneLogin(loginList: OnyxEntry<Login>): string | undefined {
+    const parsedLoginList = Object.keys(loginList ?? {}).map((login) => Str.removeSMSDomain(login));
     return parsedLoginList.find((login) => Str.isValidPhone(login));
 }
 
diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts
index 9a05ba4d87ed..992449267934 100644
--- a/src/libs/Violations/ViolationsUtils.ts
+++ b/src/libs/Violations/ViolationsUtils.ts
@@ -4,7 +4,7 @@ import type {OnyxUpdate} from 'react-native-onyx';
 import type {Phrase, PhraseParameters} from '@libs/Localize';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyCategories, PolicyTags, Transaction, TransactionViolation} from '@src/types/onyx';
+import type {PolicyCategories, PolicyTagList, Transaction, TransactionViolation} from '@src/types/onyx';
 
 const ViolationsUtils = {
     /**
@@ -12,10 +12,10 @@ const ViolationsUtils = {
      * violations.
      */
     getViolationsOnyxData(
-        transaction: Transaction,
+        updatedTransaction: Transaction,
         transactionViolations: TransactionViolation[],
         policyRequiresTags: boolean,
-        policyTags: PolicyTags,
+        policyTagList: PolicyTagList,
         policyRequiresCategories: boolean,
         policyCategories: PolicyCategories,
     ): OnyxUpdate {
@@ -24,15 +24,16 @@ const ViolationsUtils = {
         if (policyRequiresCategories) {
             const hasCategoryOutOfPolicyViolation = transactionViolations.some((violation) => violation.name === 'categoryOutOfPolicy');
             const hasMissingCategoryViolation = transactionViolations.some((violation) => violation.name === 'missingCategory');
-            const isCategoryInPolicy = !!policyCategories[transaction.category ?? '']?.enabled;
+            const categoryKey = updatedTransaction.category;
+            const isCategoryInPolicy = categoryKey ? policyCategories?.[categoryKey]?.enabled : false;
 
             // Add 'categoryOutOfPolicy' violation if category is not in policy
-            if (!hasCategoryOutOfPolicyViolation && transaction.category && !isCategoryInPolicy) {
+            if (!hasCategoryOutOfPolicyViolation && categoryKey && !isCategoryInPolicy) {
                 newTransactionViolations.push({name: 'categoryOutOfPolicy', type: 'violation', userMessage: ''});
             }
 
             // Remove 'categoryOutOfPolicy' violation if category is in policy
-            if (hasCategoryOutOfPolicyViolation && transaction.category && isCategoryInPolicy) {
+            if (hasCategoryOutOfPolicyViolation && updatedTransaction.category && isCategoryInPolicy) {
                 newTransactionViolations = reject(newTransactionViolations, {name: 'categoryOutOfPolicy'});
             }
 
@@ -42,23 +43,25 @@ const ViolationsUtils = {
             }
 
             // Add 'missingCategory' violation if category is required and not set
-            if (!hasMissingCategoryViolation && policyRequiresCategories && !transaction.category) {
+            if (!hasMissingCategoryViolation && policyRequiresCategories && !categoryKey) {
                 newTransactionViolations.push({name: 'missingCategory', type: 'violation', userMessage: ''});
             }
         }
 
         if (policyRequiresTags) {
+            const policyTagListName = Object.keys(policyTagList)[0];
+            const policyTags = policyTagList[policyTagListName]?.tags;
             const hasTagOutOfPolicyViolation = transactionViolations.some((violation) => violation.name === 'tagOutOfPolicy');
             const hasMissingTagViolation = transactionViolations.some((violation) => violation.name === 'missingTag');
-            const isTagInPolicy = !!policyTags[transaction.tag ?? '']?.enabled;
+            const isTagInPolicy = policyTags ? !!policyTags[updatedTransaction.tag ?? '']?.enabled : false;
 
             // Add 'tagOutOfPolicy' violation if tag is not in policy
-            if (!hasTagOutOfPolicyViolation && transaction.tag && !isTagInPolicy) {
+            if (!hasTagOutOfPolicyViolation && updatedTransaction.tag && !isTagInPolicy) {
                 newTransactionViolations.push({name: 'tagOutOfPolicy', type: 'violation', userMessage: ''});
             }
 
             // Remove 'tagOutOfPolicy' violation if tag is in policy
-            if (hasTagOutOfPolicyViolation && transaction.tag && isTagInPolicy) {
+            if (hasTagOutOfPolicyViolation && updatedTransaction.tag && isTagInPolicy) {
                 newTransactionViolations = reject(newTransactionViolations, {name: 'tagOutOfPolicy'});
             }
 
@@ -68,14 +71,14 @@ const ViolationsUtils = {
             }
 
             // Add 'missingTag violation' if tag is required and not set
-            if (!hasMissingTagViolation && !transaction.tag && policyRequiresTags) {
+            if (!hasMissingTagViolation && !updatedTransaction.tag && policyRequiresTags) {
                 newTransactionViolations.push({name: 'missingTag', type: 'violation', userMessage: ''});
             }
         }
 
         return {
             onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${updatedTransaction.transactionID}`,
             value: newTransactionViolations,
         };
     },
diff --git a/src/libs/actions/FormActions.ts b/src/libs/actions/FormActions.ts
index e32863cff0b1..ed612a757f4b 100644
--- a/src/libs/actions/FormActions.ts
+++ b/src/libs/actions/FormActions.ts
@@ -30,7 +30,7 @@ function setDraftValues(formID: OnyxFormKeyWithoutDraft, draftValues: NullishDee
 }
 
 function clearDraftValues(formID: OnyxFormKeyWithoutDraft) {
-    Onyx.set(FormUtils.getDraftKey(formID), {});
+    Onyx.set(FormUtils.getDraftKey(formID), null);
 }
 
 export {setDraftValues, setErrorFields, setErrors, clearErrors, clearErrorFields, setIsLoading, clearDraftValues};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 05fd97f494b7..d7ac6f3c9361 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -393,9 +393,9 @@ function buildOnyxDataForMoneyRequest(
     optimisticPolicyRecentlyUsedTags: OnyxTypes.RecentlyUsedTags,
     isNewChatReport: boolean,
     shouldCreateNewMoneyRequestReport: boolean,
-    policy?: OnyxTypes.Policy | EmptyObject,
-    policyTags?: OnyxTypes.PolicyTags,
-    policyCategories?: OnyxTypes.PolicyCategories,
+    policy?: OnyxEntry<OnyxTypes.Policy>,
+    policyTags?: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     optimisticNextStep?: OnyxTypes.ReportNextStep | null,
     needsToBeManuallySubmitted = true,
 ): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
@@ -710,9 +710,9 @@ function getMoneyRequestInformation(
     category: string | undefined,
     tag: string | undefined,
     billable: boolean | undefined,
-    policy: OnyxTypes.Policy | EmptyObject | undefined,
-    policyTags: OnyxTypes.PolicyTags | undefined,
-    policyCategories: OnyxTypes.PolicyCategories | undefined,
+    policy: OnyxEntry<OnyxTypes.Policy> | undefined,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList> | undefined,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories> | undefined,
     payeeAccountID = userAccountID,
     payeeEmail = currentUserEmail,
     moneyRequestReportID = '',
@@ -927,9 +927,9 @@ function createDistanceRequest(
     merchant: string,
     billable: boolean | undefined,
     validWaypoints: WaypointCollection,
-    policy: OnyxTypes.Policy | EmptyObject | undefined,
-    policyTags: OnyxTypes.PolicyTags,
-    policyCategories: OnyxTypes.PolicyCategories,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     // 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);
@@ -984,8 +984,13 @@ function createDistanceRequest(
 }
 
 /**
+ * @param transactionID
+ * @param transactionThreadReportID
  * @param transactionChanges
  * @param [transactionChanges.created] Present when updated the date field
+ * @param policy  May be undefined, an empty object, or an object matching the Policy type (src/types/onyx/Policy.ts)
+ * @param policyTags
+ * @param policyCategories
  * @param onlyIncludeChangedFields
  *               When 'true', then the returned params will only include the transaction details for the fields that were changed.
  *               When `false`, then the returned params will include all the transaction details, regardless of which fields were changed.
@@ -995,6 +1000,9 @@ function getUpdateMoneyRequestParams(
     transactionID: string,
     transactionThreadReportID: string,
     transactionChanges: TransactionChanges,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
     onlyIncludeChangedFields: boolean,
 ): UpdateMoneyRequestData {
     const optimisticData: OnyxUpdate[] = [];
@@ -1210,6 +1218,25 @@ function getUpdateMoneyRequestParams(
         });
     }
 
+    if (policy?.id && updatedTransaction) {
+        const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? [];
+        optimisticData.push(
+            ViolationsUtils.getViolationsOnyxData(
+                updatedTransaction,
+                currentTransactionViolations,
+                !!policy.requiresTag,
+                policyTags ?? {},
+                !!policy.requiresCategory,
+                policyCategories ?? {},
+            ),
+        );
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+            value: currentTransactionViolations,
+        });
+    }
+
     return {
         params,
         onyxData: {optimisticData, successData, failureData},
@@ -1217,71 +1244,127 @@ function getUpdateMoneyRequestParams(
 }
 
 /** Updates the created date of a money request */
-function updateMoneyRequestDate(transactionID: string, transactionThreadReportID: string, value: string) {
+function updateMoneyRequestDate(
+    transactionID: string,
+    transactionThreadReportID: string,
+    value: string,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges: TransactionChanges = {
         created: value,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DATE, params, onyxData);
 }
 
 /** Updates the billable field of a money request */
-function updateMoneyRequestBillable(transactionID: string, transactionThreadReportID: string, value: boolean) {
+function updateMoneyRequestBillable(
+    transactionID: string,
+    transactionThreadReportID: string,
+    value: boolean,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges: TransactionChanges = {
         billable: value,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_BILLABLE, params, onyxData);
 }
 
 /** Updates the merchant field of a money request */
-function updateMoneyRequestMerchant(transactionID: string, transactionThreadReportID: string, value: string) {
+function updateMoneyRequestMerchant(
+    transactionID: string,
+    transactionThreadReportID: string,
+    value: string,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges: TransactionChanges = {
         merchant: value,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_MERCHANT, params, onyxData);
 }
 
 /** Updates the tag of a money request */
-function updateMoneyRequestTag(transactionID: string, transactionThreadReportID: string, tag: string) {
+function updateMoneyRequestTag(
+    transactionID: string,
+    transactionThreadReportID: string,
+    tag: string,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges: TransactionChanges = {
         tag,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_TAG, params, onyxData);
 }
 
 /** Updates the waypoints of a distance money request */
-function updateMoneyRequestDistance(transactionID: string, transactionThreadReportID: string, waypoints: WaypointCollection) {
+function updateMoneyRequestDistance(
+    transactionID: string,
+    transactionThreadReportID: string,
+    waypoints: WaypointCollection,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges: TransactionChanges = {
         waypoints,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DISTANCE, params, onyxData);
 }
 
 /** Updates the category of a money request */
-function updateMoneyRequestCategory(transactionID: string, transactionThreadReportID: string, category: string) {
+function updateMoneyRequestCategory(
+    transactionID: string,
+    transactionThreadReportID: string,
+    category: string,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges: TransactionChanges = {
         category,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_CATEGORY, params, onyxData);
 }
 
 /** Updates the description of a money request */
-function updateMoneyRequestDescription(transactionID: string, transactionThreadReportID: string, comment: string) {
+function updateMoneyRequestDescription(
+    transactionID: string,
+    transactionThreadReportID: string,
+    comment: string,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges: TransactionChanges = {
         comment,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DESCRIPTION, params, onyxData);
 }
 
 /** Edits an existing distance request */
-function updateDistanceRequest(transactionID: string, transactionThreadReportID: string, transactionChanges: TransactionChanges) {
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, false);
+function updateDistanceRequest(
+    transactionID: string,
+    transactionThreadReportID: string,
+    transactionChanges: TransactionChanges,
+    policy: OnyxTypes.Policy,
+    policyTags: OnyxTypes.PolicyTagList,
+    policyCategories: OnyxTypes.PolicyCategories,
+) {
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, false);
     API.write(WRITE_COMMANDS.UPDATE_DISTANCE_REQUEST, params, onyxData);
 }
 
@@ -1304,9 +1387,9 @@ function requestMoney(
     taxCode = '',
     taxAmount = 0,
     billable?: boolean,
-    policy = undefined,
-    policyTags = undefined,
-    policyCategories = undefined,
+    policy?: OnyxEntry<OnyxTypes.Policy>,
+    policyTags?: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     gpsPoints = undefined,
 ) {
     // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
@@ -2346,7 +2429,14 @@ function setDraftSplitTransaction(transactionID: string, transactionChanges: Tra
     Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`, updatedTransaction);
 }
 
-function editRegularMoneyRequest(transactionID: string, transactionThreadReportID: string, transactionChanges: TransactionChanges) {
+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}`];
@@ -2559,6 +2649,25 @@ function editRegularMoneyRequest(transactionID: string, transactionThreadReportI
         },
     ];
 
+    // Add transaction violations if there is a policy and updated transaaction
+    if (policy?.id && updatedTransaction) {
+        const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? [];
+        const updatedViolationsOnyxData = ViolationsUtils.getViolationsOnyxData(
+            updatedTransaction,
+            currentTransactionViolations,
+            !!policy.requiresTag,
+            policyTags,
+            !!policy.requiresCategory,
+            policyCategories,
+        );
+        optimisticData.push(updatedViolationsOnyxData);
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+            value: currentTransactionViolations,
+        });
+    }
+
     // STEP 6: Call the API endpoint
     const {created, amount, currency, comment, merchant, category, billable, tag} = ReportUtils.getTransactionDetails(updatedTransaction) ?? {};
 
@@ -2578,21 +2687,36 @@ function editRegularMoneyRequest(transactionID: string, transactionThreadReportI
     API.write(WRITE_COMMANDS.EDIT_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
 }
 
-function editMoneyRequest(transaction: OnyxTypes.Transaction, transactionThreadReportID: string, transactionChanges: TransactionChanges) {
+function editMoneyRequest(
+    transaction: OnyxTypes.Transaction,
+    transactionThreadReportID: string,
+    transactionChanges: TransactionChanges,
+    policy: OnyxTypes.Policy,
+    policyTags: OnyxTypes.PolicyTagList,
+    policyCategories: OnyxTypes.PolicyCategories,
+) {
     if (TransactionUtils.isDistanceRequest(transaction)) {
-        updateDistanceRequest(transaction.transactionID, transactionThreadReportID, transactionChanges);
+        updateDistanceRequest(transaction.transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories);
     } else {
-        editRegularMoneyRequest(transaction.transactionID, transactionThreadReportID, transactionChanges);
+        editRegularMoneyRequest(transaction.transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories);
     }
 }
 
 /** Updates the amount and currency fields of a money request */
-function updateMoneyRequestAmountAndCurrency(transactionID: string, transactionThreadReportID: string, currency: string, amount: number) {
+function updateMoneyRequestAmountAndCurrency(
+    transactionID: string,
+    transactionThreadReportID: string,
+    currency: string,
+    amount: number,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
     const transactionChanges = {
         amount,
         currency,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_AMOUNT_AND_CURRENCY, params, onyxData);
 }
 
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 866206895d5e..498ce6918509 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -35,7 +35,19 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Policy, PolicyMember, PolicyTags, RecentlyUsedCategories, RecentlyUsedTags, ReimbursementAccount, Report, ReportAction, Transaction} from '@src/types/onyx';
+import type {
+    InvitedEmailsToAccountIDs,
+    PersonalDetailsList,
+    Policy,
+    PolicyMember,
+    PolicyTags,
+    RecentlyUsedCategories,
+    RecentlyUsedTags,
+    ReimbursementAccount,
+    Report,
+    ReportAction,
+    Transaction,
+} from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import type {CustomUnit} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
@@ -518,7 +530,7 @@ function removeMembers(accountIDs: number[], policyID: string) {
  *
  * @returns - object with onyxSuccessData, onyxOptimisticData, and optimisticReportIDs (map login to reportID)
  */
-function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: Record<string, number>, hasOutstandingChildRequest = false): WorkspaceMembersChats {
+function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, hasOutstandingChildRequest = false): WorkspaceMembersChats {
     const workspaceMembersChats: WorkspaceMembersChats = {
         onyxSuccessData: [],
         onyxOptimisticData: [],
@@ -607,7 +619,7 @@ function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: R
 /**
  * Adds members to the specified workspace/policyID
  */
-function addMembersToWorkspace(invitedEmailsToAccountIDs: Record<string, number>, welcomeNote: string, policyID: string) {
+function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, welcomeNote: string, policyID: string) {
     const membersListKey = `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}` as const;
     const logins = Object.keys(invitedEmailsToAccountIDs).map((memberLogin) => OptionsListUtils.addSMSDomainIfPhoneNumber(memberLogin));
     const accountIDs = Object.values(invitedEmailsToAccountIDs);
@@ -1499,7 +1511,7 @@ function openDraftWorkspaceRequest(policyID: string) {
     API.read(READ_COMMANDS.OPEN_DRAFT_WORKSPACE_REQUEST, params);
 }
 
-function setWorkspaceInviteMembersDraft(policyID: string, invitedEmailsToAccountIDs: Record<string, number>) {
+function setWorkspaceInviteMembersDraft(policyID: string, invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs) {
     Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, invitedEmailsToAccountIDs);
 }
 
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index d31973f6f120..3fbe9cf86e15 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1826,6 +1826,7 @@ function navigateToConciergeChatAndDeleteReport(reportID: string) {
 }
 
 /**
+ * @param policyRoomReport The policy room report
  * @param policyRoomName The updated name for the policy room
  */
 function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomName: string) {
@@ -1838,6 +1839,8 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
         return;
     }
 
+    const optimisticRenamedAction = ReportUtils.buildOptimisticRenamedRoomReportAction(policyRoomName, previousName ?? '');
+
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1852,6 +1855,13 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticRenamedAction.reportActionID]: optimisticRenamedAction,
+            },
+        },
     ];
     const successData: OnyxUpdate[] = [
         {
@@ -1863,6 +1873,11 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {[optimisticRenamedAction.reportActionID]: {pendingAction: null}},
+        },
     ];
     const failureData: OnyxUpdate[] = [
         {
@@ -1872,9 +1887,18 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
                 reportName: previousName,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {[optimisticRenamedAction.reportActionID]: null},
+        },
     ];
 
-    const parameters: UpdatePolicyRoomNameParams = {reportID, policyRoomName};
+    const parameters: UpdatePolicyRoomNameParams = {
+        reportID,
+        policyRoomName,
+        renamedRoomReportActionID: optimisticRenamedAction.reportActionID,
+    };
 
     API.write(WRITE_COMMANDS.UPDATE_POLICY_ROOM_NAME, parameters, {optimisticData, successData, failureData});
     Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index 1d9af01f2fa0..8f2f01cde3ac 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -106,7 +106,7 @@ function saveWaypoint(transactionID: string, index: string, waypoint: RecentWayp
     }
 }
 
-function removeWaypoint(transaction: Transaction, currentIndex: string, isDraft: boolean) {
+function removeWaypoint(transaction: Transaction, currentIndex: string, isDraft: boolean): Promise<void> {
     // Index comes from the route params and is a string
     const index = Number(currentIndex);
     const existingWaypoints = transaction?.comment?.waypoints ?? {};
@@ -115,7 +115,7 @@ function removeWaypoint(transaction: Transaction, currentIndex: string, isDraft:
     const waypointValues = Object.values(existingWaypoints);
     const removed = waypointValues.splice(index, 1);
     if (removed.length === 0) {
-        return;
+        return Promise.resolve();
     }
 
     const isRemovedWaypointEmpty = removed.length > 0 && !TransactionUtils.waypointHasValidAddress(removed[0] ?? {});
@@ -164,10 +164,9 @@ function removeWaypoint(transaction: Transaction, currentIndex: string, isDraft:
         };
     }
     if (isDraft) {
-        Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transaction.transactionID}`, newTransaction);
-        return;
+        return Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transaction.transactionID}`, newTransaction);
     }
-    Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, newTransaction);
+    return Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, newTransaction);
 }
 
 function getOnyxDataForRouteRequest(transactionID: string, isDraft = false): OnyxData {
diff --git a/src/libs/actions/Wallet.ts b/src/libs/actions/Wallet.ts
index b03b5e8f6d3d..354e5b076f01 100644
--- a/src/libs/actions/Wallet.ts
+++ b/src/libs/actions/Wallet.ts
@@ -261,12 +261,7 @@ 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 = '', address: {city = '', country = '', state = '', street = '', zip = ''} = {}} = privatePersonalDetails;
 
     const requestParams: RequestPhysicalExpensifyCardParams = {
         authToken,
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index 7e1a9f7d9b7b..777321fc2068 100644
--- a/src/pages/EditRequestPage.js
+++ b/src/pages/EditRequestPage.js
@@ -28,6 +28,7 @@ import EditRequestReceiptPage from './EditRequestReceiptPage';
 import EditRequestTagPage from './EditRequestTagPage';
 import reportActionPropTypes from './home/report/reportActionPropTypes';
 import reportPropTypes from './reportPropTypes';
+import {policyPropTypes} from './workspace/withPolicy';
 
 const propTypes = {
     /** Route from navigation */
@@ -46,6 +47,9 @@ const propTypes = {
     /** The report object for the thread report */
     report: reportPropTypes,
 
+    /** The policy of the report */
+    policy: policyPropTypes.policy,
+
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
 
@@ -61,13 +65,14 @@ const propTypes = {
 
 const defaultProps = {
     report: {},
+    policy: {},
     policyCategories: {},
     policyTags: {},
     parentReportActions: {},
     transaction: {},
 };
 
-function EditRequestPage({report, route, policyCategories, policyTags, parentReportActions, transaction}) {
+function EditRequestPage({report, route, policy, policyCategories, policyTags, parentReportActions, transaction}) {
     const parentReportActionID = lodashGet(report, 'parentReportActionID', '0');
     const parentReportAction = lodashGet(parentReportActions, parentReportActionID, {});
     const {
@@ -118,10 +123,10 @@ function EditRequestPage({report, route, policyCategories, policyTags, parentRep
                 return;
             }
 
-            IOU.updateMoneyRequestAmountAndCurrency(transaction.transactionID, report.reportID, newCurrency, newAmount);
+            IOU.updateMoneyRequestAmountAndCurrency(transaction.transactionID, report.reportID, newCurrency, newAmount, policy, policyTags, policyCategories);
             Navigation.dismissModal();
         },
-        [transaction, report],
+        [transaction, report, policy, policyTags, policyCategories],
     );
 
     const saveCreated = useCallback(
@@ -131,10 +136,10 @@ function EditRequestPage({report, route, policyCategories, policyTags, parentRep
                 Navigation.dismissModal();
                 return;
             }
-            IOU.updateMoneyRequestDate(transaction.transactionID, report.reportID, newCreated);
+            IOU.updateMoneyRequestDate(transaction.transactionID, report.reportID, newCreated, policy, policyTags, policyCategories);
             Navigation.dismissModal();
         },
-        [transaction, report],
+        [transaction, report, policy, policyTags, policyCategories],
     );
 
     const saveMerchant = useCallback(
@@ -149,10 +154,17 @@ function EditRequestPage({report, route, policyCategories, policyTags, parentRep
             }
 
             // An empty newTrimmedMerchant is only possible for the P2P IOU case
-            IOU.updateMoneyRequestMerchant(transaction.transactionID, report.reportID, newTrimmedMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
+            IOU.updateMoneyRequestMerchant(
+                transaction.transactionID,
+                report.reportID,
+                newTrimmedMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
+                policy,
+                policyTags,
+                policyCategories,
+            );
             Navigation.dismissModal();
         },
-        [transactionMerchant, transaction, report],
+        [transactionMerchant, transaction, report, policy, policyTags, policyCategories],
     );
 
     const saveTag = useCallback(
@@ -162,20 +174,20 @@ function EditRequestPage({report, route, policyCategories, policyTags, parentRep
                 // In case the same tag has been selected, reset the tag.
                 updatedTag = '';
             }
-            IOU.updateMoneyRequestTag(transaction.transactionID, report.reportID, updatedTag);
+            IOU.updateMoneyRequestTag(transaction.transactionID, report.reportID, updatedTag, policy, policyTags, policyCategories);
             Navigation.dismissModal();
         },
-        [transactionTag, transaction.transactionID, report.reportID],
+        [transactionTag, transaction.transactionID, report.reportID, policy, policyTags, policyCategories],
     );
 
     const saveCategory = useCallback(
         ({category: newCategory}) => {
             // In case the same category has been selected, reset the category.
             const updatedCategory = newCategory === transactionCategory ? '' : newCategory;
-            IOU.updateMoneyRequestCategory(transaction.transactionID, report.reportID, updatedCategory);
+            IOU.updateMoneyRequestCategory(transaction.transactionID, report.reportID, updatedCategory, policy, policyTags, policyCategories);
             Navigation.dismissModal();
         },
-        [transactionCategory, transaction.transactionID, report.reportID],
+        [transactionCategory, transaction.transactionID, report.reportID, policy, policyTags, policyCategories],
     );
 
     if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.DATE) {
@@ -274,6 +286,9 @@ export default compose(
     }),
     // eslint-disable-next-line rulesdir/no-multiple-onyx-in-file
     withOnyx({
+        policy: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        },
         policyCategories: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
         },
diff --git a/src/pages/RoomInvitePage.js b/src/pages/RoomInvitePage.js
index 3f55ad6c0ff7..9c43a1820aa9 100644
--- a/src/pages/RoomInvitePage.js
+++ b/src/pages/RoomInvitePage.js
@@ -86,7 +86,7 @@ function RoomInvitePage(props) {
 
         // Update selectedOptions with the latest personalDetails information
         const detailsMap = {};
-        _.forEach(inviteOptions.personalDetails, (detail) => (detailsMap[detail.login] = OptionsListUtils.formatMemberForList(detail, false)));
+        _.forEach(inviteOptions.personalDetails, (detail) => (detailsMap[detail.login] = OptionsListUtils.formatMemberForList(detail)));
         const newSelectedOptions = [];
         _.forEach(selectedOptions, (option) => {
             newSelectedOptions.push(_.has(detailsMap, option.login) ? {...detailsMap[option.login], isSelected: true} : option);
@@ -142,7 +142,7 @@ function RoomInvitePage(props) {
         // Filtering out selected users from the search results
         const selectedLogins = _.map(selectedOptions, ({login}) => login);
         const personalDetailsWithoutSelected = _.filter(personalDetails, ({login}) => !_.contains(selectedLogins, login));
-        const personalDetailsFormatted = _.map(personalDetailsWithoutSelected, (personalDetail) => OptionsListUtils.formatMemberForList(personalDetail, false));
+        const personalDetailsFormatted = _.map(personalDetailsWithoutSelected, (personalDetail) => OptionsListUtils.formatMemberForList(personalDetail));
         const hasUnselectedUserToInvite = userToInvite && !_.contains(selectedLogins, userToInvite.login);
 
         sectionsArr.push({
@@ -156,7 +156,7 @@ function RoomInvitePage(props) {
         if (hasUnselectedUserToInvite) {
             sectionsArr.push({
                 title: undefined,
-                data: [OptionsListUtils.formatMemberForList(userToInvite, false)],
+                data: [OptionsListUtils.formatMemberForList(userToInvite)],
                 shouldShow: true,
                 indexOffset,
             });
diff --git a/src/pages/ShareCodePage.tsx b/src/pages/ShareCodePage.tsx
index 3dab7054c626..138aa729fcc2 100644
--- a/src/pages/ShareCodePage.tsx
+++ b/src/pages/ShareCodePage.tsx
@@ -11,6 +11,7 @@ import MenuItem from '@components/MenuItem';
 import QRShareWithDownload from '@components/QRShare/QRShareWithDownload';
 import type QRShareWithDownloadHandle from '@components/QRShare/QRShareWithDownload/types';
 import ScreenWrapper from '@components/ScreenWrapper';
+import Section from '@components/Section';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useEnvironment from '@hooks/useEnvironment';
@@ -82,45 +83,60 @@ function ShareCodePage({report, session, currentUserPersonalDetails}: ShareCodeP
                 shouldShowBackButton={isReport || isSmallScreenWidth}
                 icon={Illustrations.QRCode}
             />
-            <ScrollView style={[themeStyles.flex1, themeStyles.mt3]}>
-                <View style={[isSmallScreenWidth ? themeStyles.workspaceSectionMobile : themeStyles.workspaceSection, themeStyles.ph4]}>
-                    <QRShareWithDownload
-                        ref={qrCodeRef}
-                        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}
-                    />
-                </View>
+            <ScrollView style={[themeStyles.flex1, themeStyles.pt3]}>
+                <View style={[themeStyles.flex1, isSmallScreenWidth ? themeStyles.workspaceSectionMobile : themeStyles.workspaceSection]}>
+                    <Section
+                        title={translate('shareCodePage.title')}
+                        subtitle={translate('shareCodePage.subtitle')}
+                        isCentralPane
+                        subtitleMuted
+                        childrenStyles={themeStyles.pt5}
+                        titleStyles={themeStyles.accountSettingsSectionTitle}
+                    >
+                        <View style={[isSmallScreenWidth ? themeStyles.workspaceSectionMobile : themeStyles.qrShareSection]}>
+                            <QRShareWithDownload
+                                ref={qrCodeRef}
+                                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}
+                            />
+                        </View>
 
-                <View style={{marginTop: 36}}>
-                    <ContextMenuItem
-                        isAnonymousAction
-                        text={translate('qrCodes.copy')}
-                        icon={Expensicons.Copy}
-                        successIcon={Expensicons.Checkmark}
-                        successText={translate('qrCodes.copied')}
-                        onPress={() => Clipboard.setString(url)}
-                        shouldLimitWidth={false}
-                    />
+                        <View style={{marginTop: 36}}>
+                            <ContextMenuItem
+                                isAnonymousAction
+                                text={translate('qrCodes.copy')}
+                                icon={Expensicons.Copy}
+                                successIcon={Expensicons.Checkmark}
+                                successText={translate('qrCodes.copied')}
+                                onPress={() => Clipboard.setString(url)}
+                                shouldLimitWidth={false}
+                                wrapperStyle={themeStyles.sectionMenuItemTopDescription}
+                            />
 
-                    {isNative && (
-                        <MenuItem
-                            isAnonymousAction
-                            title={translate('common.download')}
-                            icon={Expensicons.Download}
-                            // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                            onPress={() => qrCodeRef.current?.download?.()}
-                        />
-                    )}
+                            {isNative && (
+                                <MenuItem
+                                    isAnonymousAction
+                                    title={translate('common.download')}
+                                    icon={Expensicons.Download}
+                                    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+                                    onPress={() => qrCodeRef.current?.download?.()}
+                                    wrapperStyle={themeStyles.sectionMenuItemTopDescription}
+                                />
+                            )}
 
-                    <MenuItem
-                        title={translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE}.buttonText1`)}
-                        icon={Expensicons.Cash}
-                        onPress={() => Navigation.navigate(ROUTES.REFERRAL_DETAILS_MODAL.getRoute(CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE))}
-                    />
+                            <MenuItem
+                                title={translate(`referralProgram.${CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE}.buttonText1`)}
+                                icon={Expensicons.Cash}
+                                onPress={() => Navigation.navigate(ROUTES.REFERRAL_DETAILS_MODAL.getRoute(CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE))}
+                                wrapperStyle={themeStyles.sectionMenuItemTopDescription}
+                                shouldShowRightIcon
+                            />
+                        </View>
+                    </Section>
                 </View>
             </ScrollView>
         </ScreenWrapper>
diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.js b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.js
index 20f290d18764..12e31495af2b 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.js
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.js
@@ -483,7 +483,7 @@ function ComposerWithSuggestions({
             }
 
             // if we're typing on another input/text area, do not focus
-            if (['INPUT', 'TEXTAREA', 'DIV'].includes(e.target.nodeName)) {
+            if (['INPUT', 'TEXTAREA'].includes(e.target.nodeName)) {
                 return;
             }
 
@@ -643,12 +643,14 @@ function ComposerWithSuggestions({
                 resetKeyboardInput={resetKeyboardInput}
             />
 
-            <SilentCommentUpdater
-                reportID={reportID}
-                value={value}
-                updateComment={updateComment}
-                commentRef={commentRef}
-            />
+            {ReportUtils.isValidReportIDFromPath(reportID) && (
+                <SilentCommentUpdater
+                    reportID={reportID}
+                    value={value}
+                    updateComment={updateComment}
+                    commentRef={commentRef}
+                />
+            )}
 
             {/* Only used for testing so far */}
             {children}
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 98865539091a..cf4e6a461bc1 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -66,9 +66,9 @@ const propTypes = {
 };
 const defaultProps = {
     personalDetails: {},
-    policy: {},
-    policyCategories: {},
-    policyTags: {},
+    policy: null,
+    policyCategories: null,
+    policyTags: null,
     report: {},
     transaction: {},
     ...withCurrentUserPersonalDetailsDefaultProps,
@@ -303,26 +303,33 @@ function IOURequestStepConfirmation({
             }
 
             if (receiptFile) {
-                getCurrentPosition(
-                    (successData) => {
-                        requestMoney(selectedParticipants, trimmedComment, receiptFile, {
-                            lat: successData.coords.latitude,
-                            long: successData.coords.longitude,
-                        });
-                    },
-                    (errorData) => {
-                        Log.info('[IOURequestStepConfirmation] getCurrentPosition failed', false, errorData);
-                        // When there is an error, the money can still be requested, it just won't include the GPS coordinates
-                        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,
-                    },
-                );
+                // 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) {
+                    getCurrentPosition(
+                        (successData) => {
+                            requestMoney(selectedParticipants, trimmedComment, receiptFile, {
+                                lat: successData.coords.latitude,
+                                long: successData.coords.longitude,
+                            });
+                        },
+                        (errorData) => {
+                            Log.info('[IOURequestStepConfirmation] getCurrentPosition failed', false, errorData);
+                            // When there is an error, the money can still be requested, it just won't include the GPS coordinates
+                            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,
+                        },
+                    );
+                    return;
+                }
+
+                // Otherwise, the money is being requested through the "Manual" flow with an attached image and the GPS coordinates are not needed.
+                requestMoney(selectedParticipants, trimmedComment, receiptFile);
                 return;
             }
 
diff --git a/src/pages/iou/request/step/IOURequestStepDescription.js b/src/pages/iou/request/step/IOURequestStepDescription.js
index e6fff0541599..3a50eff13918 100644
--- a/src/pages/iou/request/step/IOURequestStepDescription.js
+++ b/src/pages/iou/request/step/IOURequestStepDescription.js
@@ -1,11 +1,14 @@
 import {useFocusEffect} from '@react-navigation/native';
 import lodashGet from 'lodash/get';
 import lodashIsEmpty from 'lodash/isEmpty';
+import PropTypes from 'prop-types';
 import React, {useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import categoryPropTypes from '@components/categoryPropTypes';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapperWithRef from '@components/Form/InputWrapper';
+import tagPropTypes from '@components/tagPropTypes';
 import TextInput from '@components/TextInput';
 import transactionPropTypes from '@components/transactionPropTypes';
 import useLocalize from '@hooks/useLocalize';
@@ -16,6 +19,7 @@ import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {policyPropTypes} from '@src/pages/workspace/withPolicy';
 import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes';
 import StepScreenWrapper from './StepScreenWrapper';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
@@ -31,11 +35,23 @@ const propTypes = {
 
     /** The draft transaction that holds data to be persisted on the current transaction */
     splitDraftTransaction: transactionPropTypes,
+
+    /** The policy of the report */
+    policy: policyPropTypes.policy,
+
+    /** Collection of categories attached to a policy */
+    policyCategories: PropTypes.objectOf(categoryPropTypes),
+
+    /** Collection of tags attached to a policy */
+    policyTags: tagPropTypes,
 };
 
 const defaultProps = {
     transaction: {},
     splitDraftTransaction: {},
+    policy: null,
+    policyTags: null,
+    policyCategories: null,
 };
 
 function IOURequestStepDescription({
@@ -44,6 +60,9 @@ function IOURequestStepDescription({
     },
     transaction,
     splitDraftTransaction,
+    policy,
+    policyTags,
+    policyCategories,
 }) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -96,7 +115,7 @@ function IOURequestStepDescription({
         IOU.setMoneyRequestDescription(transaction.transactionID, newComment, action === CONST.IOU.ACTION.CREATE);
 
         if (action === CONST.IOU.ACTION.EDIT) {
-            IOU.updateMoneyRequestDescription(transaction.transactionID, reportID, newComment);
+            IOU.updateMoneyRequestDescription(transaction.transactionID, reportID, newComment, policy, policyTags, policyCategories);
         }
 
         navigateBack();
@@ -156,5 +175,14 @@ export default compose(
                 return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
             },
         },
+        policy: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        },
+        policyCategories: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+        },
+        policyTags: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        },
     }),
 )(IOURequestStepDescription);
diff --git a/src/pages/iou/request/step/IOURequestStepDistance.js b/src/pages/iou/request/step/IOURequestStepDistance.js
index 7ea7854e5a5f..4a0777b11fe7 100644
--- a/src/pages/iou/request/step/IOURequestStepDistance.js
+++ b/src/pages/iou/request/step/IOURequestStepDistance.js
@@ -150,17 +150,21 @@ function IOURequestStepDistance({
             }
 
             const newWaypoints = {};
+            let emptyWaypointIndex = -1;
             _.each(data, (waypoint, index) => {
                 newWaypoints[`waypoint${index}`] = lodashGet(waypoints, waypoint, {});
+                // Find waypoint that BECOMES empty after dragging
+                if (_.isEmpty(newWaypoints[`waypoint${index}`]) && !_.isEmpty(lodashGet(waypoints, `waypoint${index}`, {}))) {
+                    emptyWaypointIndex = index;
+                }
             });
 
             setOptimisticWaypoints(newWaypoints);
-            // eslint-disable-next-line rulesdir/no-thenable-actions-in-views
-            Transaction.updateWaypoints(transactionID, newWaypoints, true).then(() => {
+            Promise.all([Transaction.removeWaypoint(transaction, emptyWaypointIndex.toString(), true), Transaction.updateWaypoints(transactionID, newWaypoints, true)]).then(() => {
                 setOptimisticWaypoints(null);
             });
         },
-        [transactionID, waypoints, waypointsList],
+        [transactionID, transaction, waypoints, waypointsList],
     );
 
     const submitWaypoints = useCallback(() => {
diff --git a/src/pages/iou/request/step/IOURequestStepTag.js b/src/pages/iou/request/step/IOURequestStepTag.js
index 47ee8c05ad45..1a26d10552f7 100644
--- a/src/pages/iou/request/step/IOURequestStepTag.js
+++ b/src/pages/iou/request/step/IOURequestStepTag.js
@@ -1,6 +1,8 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
+import categoryPropTypes from '@components/categoryPropTypes';
 import TagPicker from '@components/TagPicker';
 import tagPropTypes from '@components/tagPropTypes';
 import Text from '@components/Text';
@@ -11,6 +13,7 @@ import compose from '@libs/compose';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import reportPropTypes from '@pages/reportPropTypes';
+import {policyPropTypes} from '@pages/workspace/withPolicy';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -30,17 +33,27 @@ const propTypes = {
     /** The report currently being used */
     report: reportPropTypes,
 
+    /** The policy of the report */
+    policy: policyPropTypes.policy,
+
+    /** The category configuration of the report's policy */
+    policyCategories: PropTypes.objectOf(categoryPropTypes),
+
     /** Collection of tags attached to a policy */
     policyTags: tagPropTypes,
 };
 
 const defaultProps = {
     report: {},
-    policyTags: {},
+    policy: null,
+    policyTags: null,
+    policyCategories: null,
     transaction: {},
 };
 
 function IOURequestStepTag({
+    policy,
+    policyCategories,
     policyTags,
     report,
     route: {
@@ -74,7 +87,7 @@ function IOURequestStepTag({
             return;
         }
         if (isEditing) {
-            IOU.updateMoneyRequestTag(transactionID, report.reportID, updatedTag);
+            IOU.updateMoneyRequestTag(transactionID, report.reportID, updatedTag, policy, policyTags, policyCategories);
             Navigation.dismissModal();
             return;
         }
@@ -113,6 +126,12 @@ export default compose(
     withWritableReportOrNotFound,
     withFullTransactionOrNotFound,
     withOnyx({
+        policy: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        },
+        policyCategories: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+        },
         policyTags: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
         },
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index b5e77ab438f5..2872fae5b511 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -168,7 +168,7 @@ function ProfilePage(props) {
                 shouldShowBackButton={props.isSmallScreenWidth}
                 icon={Illustrations.Profile}
             />
-            <ScrollView>
+            <ScrollView style={styles.pt3}>
                 <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
                         title={props.translate('profilePage.publicSection.title')}
diff --git a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
similarity index 60%
rename from src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js
rename to src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
index 6688a0a69fa9..c1d8faf7e9ff 100644
--- a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.js
+++ b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
@@ -1,7 +1,7 @@
-import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useRef} from 'react';
+import type {ReactNode} from 'react';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -10,111 +10,73 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as FormActions from '@libs/actions/FormActions';
 import * as Wallet from '@libs/actions/Wallet';
 import * as CardUtils from '@libs/CardUtils';
-import FormUtils from '@libs/FormUtils';
 import * as GetPhysicalCardUtils from '@libs/GetPhysicalCardUtils';
-import {translatableTextPropTypes} from '@libs/Localize';
 import Navigation from '@libs/Navigation/Navigation';
-import assignedCardPropTypes from '@pages/settings/Wallet/assignedCardPropTypes';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type {CardList, GetPhysicalCardForm, LoginList, PrivatePersonalDetails, Session} from '@src/types/onyx';
+import type {Errors} from '@src/types/onyx/OnyxCommon';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
 
-const propTypes = {
-    /* Onyx Props */
+type OnValidate = (values: OnyxEntry<GetPhysicalCardForm>) => Errors;
+
+type RenderContentProps = ChildrenProps & {
+    onSubmit: () => void;
+    submitButtonText: string;
+    onValidate: OnValidate;
+};
+
+type BaseGetPhysicalCardOnyxProps = {
     /** List of available assigned cards */
-    cardList: PropTypes.objectOf(assignedCardPropTypes),
+    cardList: OnyxEntry<CardList>;
 
     /** User's private personal details */
-    privatePersonalDetails: PropTypes.shape({
-        legalFirstName: PropTypes.string,
-        legalLastName: PropTypes.string,
-        phoneNumber: PropTypes.string,
-        /** User's home address */
-        address: PropTypes.shape({
-            street: PropTypes.string,
-            city: PropTypes.string,
-            state: PropTypes.string,
-            zip: PropTypes.string,
-            country: PropTypes.string,
-        }),
-    }),
+    privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>;
 
     /** Draft values used by the get physical card form */
-    draftValues: PropTypes.shape({
-        addressLine1: PropTypes.string,
-        addressLine2: PropTypes.string,
-        city: PropTypes.string,
-        country: PropTypes.string,
-        phoneNumber: PropTypes.string,
-        legalFirstName: PropTypes.string,
-        legalLastName: PropTypes.string,
-        state: PropTypes.string,
-        zipPostCode: PropTypes.string,
-    }),
+    draftValues: OnyxEntry<GetPhysicalCardForm>;
 
     /** Session info for the currently logged in user. */
-    session: PropTypes.shape({
-        /** Currently logged in user authToken */
-        authToken: PropTypes.string,
-    }),
+    session: OnyxEntry<Session>;
 
     /** List of available login methods */
-    loginList: PropTypes.shape({
-        /** The partner creating the account. It depends on the source: website, mobile, integrations, ... */
-        partnerName: PropTypes.string,
-
-        /** Phone/Email associated with user */
-        partnerUserID: PropTypes.string,
-
-        /** The date when the login was validated, used to show the brickroad status */
-        validatedDate: PropTypes.string,
-
-        /** Field-specific server side errors keyed by microtime */
-        errorFields: PropTypes.objectOf(PropTypes.objectOf(translatableTextPropTypes)),
-
-        /** Field-specific pending states for offline UI status */
-        pendingFields: PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
-    }),
+    loginList: OnyxEntry<LoginList>;
+};
 
-    /* Base Props */
+type BaseGetPhysicalCardProps = BaseGetPhysicalCardOnyxProps & {
     /** Text displayed below page title */
-    headline: PropTypes.string.isRequired,
+    headline: string;
 
     /** Children components that will be rendered by renderContent */
-    children: PropTypes.node,
+    children?: ReactNode;
 
     /** Current route from ROUTES */
-    currentRoute: PropTypes.string.isRequired,
+    currentRoute: string;
 
     /** Expensify card domain */
-    domain: PropTypes.string,
+    domain: string;
 
     /** Whether or not the current step of the get physical card flow is the confirmation page */
-    isConfirmation: PropTypes.bool,
+    isConfirmation?: boolean;
 
     /** Render prop, used to render form content */
-    renderContent: PropTypes.func,
+    renderContent?: (args: RenderContentProps) => React.ReactNode;
 
     /** Text displayed on bottom submit button */
-    submitButtonText: PropTypes.string.isRequired,
+    submitButtonText: string;
 
     /** Title displayed on top of the page */
-    title: PropTypes.string.isRequired,
+    title: string;
 
     /** Callback executed when validating get physical card form data */
-    onValidate: PropTypes.func,
+    onValidate?: OnValidate;
 };
 
-const defaultProps = {
-    cardList: {},
-    children: null,
-    domain: '',
-    draftValues: null,
-    privatePersonalDetails: null,
-    session: {},
-    loginList: {},
-    isConfirmation: false,
-    renderContent: (onSubmit, submitButtonText, styles, children = () => {}, onValidate = () => ({})) => (
+function DefaultRenderContent({onSubmit, submitButtonText, children, onValidate}: RenderContentProps) {
+    const styles = useThemeStyles();
+
+    return (
         <FormProvider
             formID={ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM}
             submitButtonText={submitButtonText}
@@ -124,9 +86,8 @@ const defaultProps = {
         >
             {children}
         </FormProvider>
-    ),
-    onValidate: () => ({}),
-};
+    );
+}
 
 function BaseGetPhysicalCard({
     cardList,
@@ -136,14 +97,14 @@ function BaseGetPhysicalCard({
     draftValues,
     privatePersonalDetails,
     headline,
-    isConfirmation,
+    isConfirmation = false,
     loginList,
-    renderContent,
-    session: {authToken},
+    renderContent = DefaultRenderContent,
+    session,
     submitButtonText,
     title,
-    onValidate,
-}) {
+    onValidate = () => ({}),
+}: BaseGetPhysicalCardProps) {
     const styles = useThemeStyles();
     const isRouteSet = useRef(false);
 
@@ -153,7 +114,7 @@ function BaseGetPhysicalCard({
         }
 
         const domainCards = CardUtils.getDomainCards(cardList)[domain] || [];
-        const physicalCard = _.find(domainCards, (card) => !card.isVirtual);
+        const physicalCard = domainCards.find((card) => !card?.isVirtual);
 
         // When there are no cards for the specified domain, user is redirected to the wallet page
         if (domainCards.length === 0) {
@@ -169,7 +130,7 @@ function BaseGetPhysicalCard({
         }
 
         if (!draftValues) {
-            const updatedDraftValues = GetPhysicalCardUtils.getUpdatedDraftValues({}, privatePersonalDetails, loginList);
+            const updatedDraftValues = GetPhysicalCardUtils.getUpdatedDraftValues(null, 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);
@@ -187,9 +148,10 @@ function BaseGetPhysicalCard({
         // If the current step of the get physical card flow is the confirmation page
         if (isConfirmation) {
             const domainCards = CardUtils.getDomainCards(cardList)[domain];
-            const physicalCard = _.find(domainCards, (card) => !card.isVirtual) || {};
-            const cardID = physicalCard.cardID;
-            Wallet.requestPhysicalExpensifyCard(cardID, authToken, updatedPrivatePersonalDetails);
+            const physicalCard = domainCards.find((card) => !card?.isVirtual);
+            const cardID = physicalCard?.cardID ?? 0;
+
+            Wallet.requestPhysicalExpensifyCard(cardID, 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);
@@ -197,7 +159,7 @@ function BaseGetPhysicalCard({
             return;
         }
         GetPhysicalCardUtils.goToNextPhysicalCardRoute(domain, updatedPrivatePersonalDetails, loginList);
-    }, [authToken, cardList, domain, draftValues, isConfirmation, loginList]);
+    }, [cardList, domain, draftValues, isConfirmation, loginList, session?.authToken]);
     return (
         <ScreenWrapper
             shouldEnablePickerAvoiding={false}
@@ -209,16 +171,14 @@ function BaseGetPhysicalCard({
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(domain))}
             />
             <Text style={[styles.textHeadline, styles.mh5, styles.mb5]}>{headline}</Text>
-            {renderContent(onSubmit, submitButtonText, styles, children, onValidate)}
+            {renderContent({onSubmit, submitButtonText, children, onValidate})}
         </ScreenWrapper>
     );
 }
 
-BaseGetPhysicalCard.defaultProps = defaultProps;
 BaseGetPhysicalCard.displayName = 'BaseGetPhysicalCard';
-BaseGetPhysicalCard.propTypes = propTypes;
 
-export default withOnyx({
+export default withOnyx<BaseGetPhysicalCardProps, BaseGetPhysicalCardOnyxProps>({
     cardList: {
         key: ONYXKEYS.CARD_LIST,
     },
@@ -232,6 +192,8 @@ export default withOnyx({
         key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
     },
     draftValues: {
-        key: FormUtils.getDraftKey(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM),
+        key: ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT,
     },
 })(BaseGetPhysicalCard);
+
+export type {RenderContentProps};
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.js b/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.tsx
similarity index 59%
rename from src/pages/settings/Wallet/Card/GetPhysicalCardAddress.js
rename to src/pages/settings/Wallet/Card/GetPhysicalCardAddress.tsx
index 21ba85b6c5dd..e90df5bed1f2 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.js
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.tsx
@@ -1,58 +1,35 @@
-import PropTypes from 'prop-types';
+import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect} 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 FormUtils from '@libs/FormUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {GetPhysicalCardForm} from '@src/types/onyx';
 import BaseGetPhysicalCard from './BaseGetPhysicalCard';
+import type {RenderContentProps} from './BaseGetPhysicalCard';
 
-const propTypes = {
-    /* Onyx Props */
+type GetPhysicalCardAddressOnyxProps = {
     /** Draft values used by the get physical card form */
-    draftValues: PropTypes.shape({
-        // User home address
-        addressLine1: PropTypes.string,
-        addressLine2: PropTypes.string,
-        city: PropTypes.string,
-        country: PropTypes.string,
-        state: PropTypes.string,
-        zipPostCode: PropTypes.string,
-    }),
-
-    /** Route from navigation */
-    route: PropTypes.shape({
-        /** Params from the route */
-        params: PropTypes.shape({
-            /** Currently selected country */
-            country: PropTypes.string,
-            /** domain passed via route /settings/wallet/card/:domain */
-            domain: PropTypes.string,
-        }),
-    }).isRequired,
+    draftValues: OnyxEntry<GetPhysicalCardForm>;
 };
 
-const defaultProps = {
-    draftValues: {
-        addressLine1: '',
-        addressLine2: '',
-        city: '',
-        country: '',
-        state: '',
-        zipPostCode: '',
-    },
-};
+type GetPhysicalCardAddressProps = GetPhysicalCardAddressOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.ADDRESS>;
 
 function GetPhysicalCardAddress({
-    draftValues: {addressLine1, addressLine2, city, state, zipPostCode, country},
+    draftValues,
     route: {
         params: {country: countryFromUrl, domain},
     },
-}) {
+}: GetPhysicalCardAddressProps) {
     const {translate} = useLocalize();
 
+    const {addressLine1 = '', addressLine2 = '', city = '', state = '', zipPostCode = '', country = ''} = draftValues ?? {};
+
     useEffect(() => {
         if (!countryFromUrl) {
             return;
@@ -61,7 +38,7 @@ function GetPhysicalCardAddress({
     }, [countryFromUrl]);
 
     const renderContent = useCallback(
-        (onSubmit, submitButtonText) => (
+        ({onSubmit, submitButtonText}: RenderContentProps) => (
             <AddressForm
                 formID={ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM}
                 onSubmit={onSubmit}
@@ -90,12 +67,10 @@ function GetPhysicalCardAddress({
     );
 }
 
-GetPhysicalCardAddress.defaultProps = defaultProps;
 GetPhysicalCardAddress.displayName = 'GetPhysicalCardAddress';
-GetPhysicalCardAddress.propTypes = propTypes;
 
-export default withOnyx({
+export default withOnyx<GetPhysicalCardAddressProps, GetPhysicalCardAddressOnyxProps>({
     draftValues: {
-        key: FormUtils.getDraftKey(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM),
+        key: ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT,
     },
 })(GetPhysicalCardAddress);
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js b/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.tsx
similarity index 64%
rename from src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js
rename to src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.tsx
index 9f364c32c075..9095da7db0d1 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.js
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.tsx
@@ -1,79 +1,52 @@
-import PropTypes from 'prop-types';
+import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import FormUtils from '@libs/FormUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+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 {GetPhysicalCardForm} from '@src/types/onyx';
 import BaseGetPhysicalCard from './BaseGetPhysicalCard';
 
-const goToGetPhysicalCardName = (domain) => {
+const goToGetPhysicalCardName = (domain: string) => {
     Navigation.navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.getRoute(domain), CONST.NAVIGATION.ACTION_TYPE.PUSH);
 };
 
-const goToGetPhysicalCardPhone = (domain) => {
+const goToGetPhysicalCardPhone = (domain: string) => {
     Navigation.navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE.getRoute(domain), CONST.NAVIGATION.ACTION_TYPE.PUSH);
 };
 
-const goToGetPhysicalCardAddress = (domain) => {
+const goToGetPhysicalCardAddress = (domain: string) => {
     Navigation.navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_ADDRESS.getRoute(domain), CONST.NAVIGATION.ACTION_TYPE.PUSH);
 };
 
-const propTypes = {
-    /* Onyx Props */
+type GetPhysicalCardConfirmOnyxProps = {
     /** Draft values used by the get physical card form */
-    draftValues: PropTypes.shape({
-        addressLine1: PropTypes.string,
-        addressLine2: PropTypes.string,
-        city: PropTypes.string,
-        state: PropTypes.string,
-        country: PropTypes.string,
-        zipPostCode: PropTypes.string,
-        phoneNumber: PropTypes.string,
-        legalFirstName: PropTypes.string,
-        legalLastName: PropTypes.string,
-    }),
-
-    /* Navigation Props */
-    /** Navigation route context info provided by react navigation */
-    route: PropTypes.shape({
-        params: PropTypes.shape({
-            /** domain passed via route /settings/wallet/card/:domain */
-            domain: PropTypes.string,
-        }),
-    }).isRequired,
+    draftValues: OnyxEntry<GetPhysicalCardForm>;
 };
 
-const defaultProps = {
-    draftValues: {
-        addressLine1: '',
-        addressLine2: '',
-        city: '',
-        state: '',
-        country: '',
-        zipPostCode: '',
-        phoneNumber: '',
-        legalFirstName: '',
-        legalLastName: '',
-    },
-};
+type GetPhysicalCardConfirmProps = GetPhysicalCardConfirmOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.CONFIRM>;
 
 function GetPhysicalCardConfirm({
-    draftValues: {addressLine1, addressLine2, city, state, country, zipPostCode, legalFirstName, legalLastName, phoneNumber},
+    draftValues,
     route: {
         params: {domain},
     },
-}) {
+}: GetPhysicalCardConfirmProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
+    const {addressLine1, addressLine2, city = '', state = '', zipPostCode = '', country = '', phoneNumber = '', legalFirstName = '', legalLastName = ''} = draftValues ?? {};
+
     return (
         <BaseGetPhysicalCard
             currentRoute={ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_CONFIRM.getRoute(domain)}
@@ -83,7 +56,7 @@ function GetPhysicalCardConfirm({
             submitButtonText={translate('getPhysicalCard.shipCard')}
             title={translate('getPhysicalCard.header')}
         >
-            <Text style={[styles.baseFontStyle, styles.mb5, styles.mh5]}>{translate('getPhysicalCard.estimatedDeliveryMessage')}</Text>
+            <Text style={[styles.mb5, styles.mh5]}>{translate('getPhysicalCard.estimatedDeliveryMessage')}</Text>
             <MenuItemWithTopDescription
                 description={translate('getPhysicalCard.legalName')}
                 iconRight={Expensicons.ArrowRight}
@@ -117,12 +90,10 @@ function GetPhysicalCardConfirm({
     );
 }
 
-GetPhysicalCardConfirm.defaultProps = defaultProps;
 GetPhysicalCardConfirm.displayName = 'GetPhysicalCardConfirm';
-GetPhysicalCardConfirm.propTypes = propTypes;
 
-export default withOnyx({
+export default withOnyx<GetPhysicalCardConfirmProps, GetPhysicalCardConfirmOnyxProps>({
     draftValues: {
-        key: FormUtils.getDraftKey(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM),
+        key: ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT,
     },
 })(GetPhysicalCardConfirm);
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardName.js b/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
similarity index 64%
rename from src/pages/settings/Wallet/Card/GetPhysicalCardName.js
rename to src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
index abe94e7a0c2f..40252da7dac8 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardName.js
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
@@ -1,63 +1,55 @@
-import PropTypes from 'prop-types';
+import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import InputWrapper from '@components/Form/InputWrapper';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import FormUtils from '@libs/FormUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
+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 {GetPhysicalCardForm} from '@src/types/onyx';
 import BaseGetPhysicalCard from './BaseGetPhysicalCard';
 
-const propTypes = {
-    /* Onyx Props */
-    /** Draft values used by the get physical card form */
-    draftValues: PropTypes.shape({
-        legalFirstName: PropTypes.string,
-        legalLastName: PropTypes.string,
-    }),
-
-    /** Route from navigation */
-    route: PropTypes.shape({
-        /** Params from the route */
-        params: PropTypes.shape({
-            /** domain passed via route /settings/wallet/card/:domain */
-            domain: PropTypes.string,
-        }),
-    }).isRequired,
+type OnValidateResult = {
+    legalFirstName?: string;
+    legalLastName?: string;
 };
 
-const defaultProps = {
-    draftValues: {
-        legalFirstName: '',
-        legalLastName: '',
-    },
+type GetPhysicalCardNameOnyxProps = {
+    /** Draft values used by the get physical card form */
+    draftValues: OnyxEntry<GetPhysicalCardForm>;
 };
 
+type GetPhysicalCardNameProps = GetPhysicalCardNameOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.NAME>;
+
 function GetPhysicalCardName({
-    draftValues: {legalFirstName, legalLastName},
+    draftValues,
     route: {
         params: {domain},
     },
-}) {
+}: GetPhysicalCardNameProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const onValidate = (values) => {
-        const errors = {};
 
-        if (!ValidationUtils.isValidLegalName(values.legalFirstName)) {
+    const {legalFirstName = '', legalLastName = ''} = draftValues ?? {};
+
+    const onValidate = (values: OnyxEntry<GetPhysicalCardForm>): OnValidateResult => {
+        const errors: OnValidateResult = {};
+
+        if (values?.legalFirstName && !ValidationUtils.isValidLegalName(values.legalFirstName)) {
             errors.legalFirstName = 'privatePersonalDetails.error.hasInvalidCharacter';
-        } else if (_.isEmpty(values.legalFirstName)) {
+        } else if (!values?.legalFirstName) {
             errors.legalFirstName = 'common.error.fieldRequired';
         }
 
-        if (!ValidationUtils.isValidLegalName(values.legalLastName)) {
+        if (values?.legalLastName && !ValidationUtils.isValidLegalName(values.legalLastName)) {
             errors.legalLastName = 'privatePersonalDetails.error.hasInvalidCharacter';
-        } else if (_.isEmpty(values.legalLastName)) {
+        } else if (!values?.legalLastName) {
             errors.legalLastName = 'common.error.fieldRequired';
         }
 
@@ -79,7 +71,7 @@ function GetPhysicalCardName({
                 name="legalFirstName"
                 label={translate('getPhysicalCard.legalFirstName')}
                 aria-label={translate('getPhysicalCard.legalFirstName')}
-                role={CONST.ACCESSIBILITY_ROLE.TEXT}
+                role={CONST.ROLE.PRESENTATION}
                 autoCapitalize="words"
                 defaultValue={legalFirstName}
                 shouldSaveDraft
@@ -90,7 +82,7 @@ function GetPhysicalCardName({
                 name="legalLastName"
                 label={translate('getPhysicalCard.legalLastName')}
                 aria-label={translate('getPhysicalCard.legalLastName')}
-                role={CONST.ACCESSIBILITY_ROLE.TEXT}
+                role={CONST.ROLE.PRESENTATION}
                 autoCapitalize="words"
                 defaultValue={legalLastName}
                 containerStyles={styles.mt5}
@@ -100,12 +92,10 @@ function GetPhysicalCardName({
     );
 }
 
-GetPhysicalCardName.defaultProps = defaultProps;
 GetPhysicalCardName.displayName = 'GetPhysicalCardName';
-GetPhysicalCardName.propTypes = propTypes;
 
-export default withOnyx({
+export default withOnyx<GetPhysicalCardNameProps, GetPhysicalCardNameOnyxProps>({
     draftValues: {
-        key: FormUtils.getDraftKey(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM),
+        key: ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT,
     },
 })(GetPhysicalCardName);
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.tsx
similarity index 58%
rename from src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js
rename to src/pages/settings/Wallet/Card/GetPhysicalCardPhone.tsx
index 27897c08d125..4786b9eb18e3 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.js
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.tsx
@@ -1,55 +1,49 @@
+import type {StackScreenProps} from '@react-navigation/stack';
 import Str from 'expensify-common/lib/str';
-import PropTypes from 'prop-types';
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import InputWrapper from '@components/Form/InputWrapper';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
-import FormUtils from '@libs/FormUtils';
 import {parsePhoneNumber} from '@libs/PhoneNumber';
+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 {GetPhysicalCardForm} from '@src/types/onyx';
 import BaseGetPhysicalCard from './BaseGetPhysicalCard';
 
-const propTypes = {
-    /* Onyx Props */
-    /** Draft values used by the get physical card form */
-    draftValues: PropTypes.shape({
-        phoneNumber: PropTypes.string,
-    }),
-
-    /** Route from navigation */
-    route: PropTypes.shape({
-        /** Params from the route */
-        params: PropTypes.shape({
-            /** domain passed via route /settings/wallet/card/:domain */
-            domain: PropTypes.string,
-        }),
-    }).isRequired,
+type OnValidateResult = {
+    phoneNumber?: string;
 };
 
-const defaultProps = {
-    draftValues: {
-        phoneNumber: '',
-    },
+type GetPhysicalCardPhoneOnyxProps = {
+    /** Draft values used by the get physical card form */
+    draftValues: OnyxEntry<GetPhysicalCardForm>;
 };
 
+type GetPhysicalCardPhoneProps = GetPhysicalCardPhoneOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.ADDRESS>;
+
 function GetPhysicalCardPhone({
-    draftValues: {phoneNumber},
     route: {
         params: {domain},
     },
-}) {
+    draftValues,
+}: GetPhysicalCardPhoneProps) {
     const {translate} = useLocalize();
 
-    const onValidate = (values) => {
-        const errors = {};
+    const {phoneNumber = ''} = draftValues ?? {};
+
+    const onValidate = (values: OnyxEntry<GetPhysicalCardForm>): OnValidateResult => {
+        const {phoneNumber: phoneNumberToValidate = ''} = values ?? {};
+
+        const errors: OnValidateResult = {};
 
-        if (!(parsePhoneNumber(values.phoneNumber).possible && Str.isValidPhone(values.phoneNumber))) {
+        if (!(parsePhoneNumber(phoneNumberToValidate).possible && Str.isValidPhone(phoneNumberToValidate))) {
             errors.phoneNumber = 'common.error.phoneNumber';
-        } else if (_.isEmpty(values.phoneNumber)) {
+        } else if (!phoneNumberToValidate) {
             errors.phoneNumber = 'common.error.fieldRequired';
         }
 
@@ -71,7 +65,7 @@ function GetPhysicalCardPhone({
                 name="phoneNumber"
                 label={translate('getPhysicalCard.phoneNumber')}
                 aria-label={translate('getPhysicalCard.phoneNumber')}
-                role={CONST.ACCESSIBILITY_ROLE.TEXT}
+                role={CONST.ROLE.PRESENTATION}
                 defaultValue={phoneNumber}
                 shouldSaveDraft
             />
@@ -79,12 +73,10 @@ function GetPhysicalCardPhone({
     );
 }
 
-GetPhysicalCardPhone.defaultProps = defaultProps;
 GetPhysicalCardPhone.displayName = 'GetPhysicalCardPhone';
-GetPhysicalCardPhone.propTypes = propTypes;
 
-export default withOnyx({
+export default withOnyx<GetPhysicalCardPhoneProps, GetPhysicalCardPhoneOnyxProps>({
     draftValues: {
-        key: FormUtils.getDraftKey(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM),
+        key: ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT,
     },
 })(GetPhysicalCardPhone);
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
similarity index 64%
rename from src/pages/workspace/WorkspaceInviteMessagePage.js
rename to src/pages/workspace/WorkspaceInviteMessagePage.tsx
index bd5de51e0503..2e43708ed3ce 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.js
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -1,130 +1,110 @@
-import lodashGet from 'lodash/get';
-import PropTypes from 'prop-types';
+import type {StackScreenProps} from '@react-navigation/stack';
+import lodashDebounce from 'lodash/debounce';
 import React, {useEffect, useState} from 'react';
 import {Keyboard, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
+import type {GestureResponderEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MultipleAvatars from '@components/MultipleAvatars';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
-import withNavigationFocus from '@components/withNavigationFocus';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
+import type {SettingsNavigatorParamList} from '@navigation/types';
 import * as Link from '@userActions/Link';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {InvitedEmailsToAccountIDs, PersonalDetailsList} from '@src/types/onyx';
+import type {Errors} from '@src/types/onyx/OnyxCommon';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import SearchInputManager from './SearchInputManager';
-import {policyDefaultProps, policyPropTypes} from './withPolicy';
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
+import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
 
-const personalDetailsPropTypes = PropTypes.shape({
-    /** The accountID of the person */
-    accountID: PropTypes.number.isRequired,
-
-    /** The login of the person (either email or phone number) */
-    login: PropTypes.string,
-
-    /** The URL of the person's avatar (there should already be a default avatar if
-  the person doesn't have their own avatar uploaded yet, except for anon users) */
-    avatar: PropTypes.string,
-
-    /** This is either the user's full name, or their login if full name is an empty string */
-    displayName: PropTypes.string,
-});
-
-const propTypes = {
+type WorkspaceInviteMessagePageOnyxProps = {
     /** All of the personal details for everyone */
-    allPersonalDetails: PropTypes.objectOf(personalDetailsPropTypes),
-
-    invitedEmailsToAccountIDsDraft: PropTypes.objectOf(PropTypes.number),
+    allPersonalDetails: OnyxEntry<PersonalDetailsList>;
 
-    /** URL Route params */
-    route: PropTypes.shape({
-        /** Params from the URL path */
-        params: PropTypes.shape({
-            /** policyID passed via route: /workspace/:policyID/invite-message */
-            policyID: PropTypes.string,
-        }),
-    }).isRequired,
+    /** An object containing the accountID for every invited user email */
+    invitedEmailsToAccountIDsDraft: OnyxEntry<InvitedEmailsToAccountIDs | undefined>;
 
-    ...policyPropTypes,
+    /** Updated workspace invite message */
+    workspaceInviteMessageDraft: OnyxEntry<string | undefined>;
 };
 
-const defaultProps = {
-    ...policyDefaultProps,
-    allPersonalDetails: {},
-    invitedEmailsToAccountIDsDraft: {},
-};
+type WorkspaceInviteMessagePageProps = WithPolicyAndFullscreenLoadingProps &
+    WorkspaceInviteMessagePageOnyxProps &
+    StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVITE_MESSAGE>;
 
-function WorkspaceInviteMessagePage(props) {
+function WorkspaceInviteMessagePage({workspaceInviteMessageDraft, invitedEmailsToAccountIDsDraft, policy, route, allPersonalDetails}: WorkspaceInviteMessagePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const [welcomeNote, setWelcomeNote] = useState();
+    const [welcomeNote, setWelcomeNote] = useState<string>();
 
     const {inputCallbackRef} = useAutoFocusInput();
 
     const getDefaultWelcomeNote = () =>
-        props.workspaceInviteMessageDraft ||
+        // workspaceInviteMessageDraft can be an empty string
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        workspaceInviteMessageDraft ||
         translate('workspace.inviteMessage.welcomeNote', {
-            workspaceName: props.policy.name,
+            workspaceName: policy?.name ?? '',
         });
 
     useEffect(() => {
-        if (!_.isEmpty(props.invitedEmailsToAccountIDsDraft)) {
+        if (!isEmptyObject(invitedEmailsToAccountIDsDraft)) {
             setWelcomeNote(getDefaultWelcomeNote());
             return;
         }
-        Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(props.route.params.policyID), true);
+        Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID), true);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    const debouncedSaveDraft = _.debounce((newDraft) => {
-        Policy.setWorkspaceInviteMessageDraft(props.route.params.policyID, newDraft);
+    const debouncedSaveDraft = lodashDebounce((newDraft: string) => {
+        Policy.setWorkspaceInviteMessageDraft(route.params.policyID, newDraft);
     });
 
     const sendInvitation = () => {
         Keyboard.dismiss();
-        Policy.addMembersToWorkspace(props.invitedEmailsToAccountIDsDraft, welcomeNote, props.route.params.policyID);
-        Policy.setWorkspaceInviteMembersDraft(props.route.params.policyID, {});
+        Policy.addMembersToWorkspace(invitedEmailsToAccountIDsDraft ?? {}, welcomeNote ?? '', route.params.policyID);
+        Policy.setWorkspaceInviteMembersDraft(route.params.policyID, {});
         SearchInputManager.searchInput = '';
         // Pop the invite message page before navigating to the members page.
         Navigation.goBack();
-        Navigation.navigate(ROUTES.WORKSPACE_MEMBERS.getRoute(props.route.params.policyID));
+        Navigation.navigate(ROUTES.WORKSPACE_MEMBERS.getRoute(route.params.policyID));
     };
 
-    /**
-     * Opens privacy url as an external link
-     * @param {Object} event
-     */
-    const openPrivacyURL = (event) => {
-        event.preventDefault();
+    /** Opens privacy url as an external link */
+    const openPrivacyURL = (event: GestureResponderEvent | KeyboardEvent | undefined) => {
+        event?.preventDefault();
         Link.openExternalLink(CONST.PRIVACY_URL);
     };
 
-    const validate = () => {
-        const errorFields = {};
-        if (_.isEmpty(props.invitedEmailsToAccountIDsDraft)) {
+    const validate = (): Errors => {
+        const errorFields: Errors = {};
+        if (isEmptyObject(invitedEmailsToAccountIDsDraft)) {
             errorFields.welcomeMessage = 'workspace.inviteMessage.inviteNoMembersError';
         }
         return errorFields;
     };
 
-    const policyName = lodashGet(props.policy, 'name');
+    const policyName = policy?.name;
 
     return (
         <ScreenWrapper
@@ -132,8 +112,8 @@ function WorkspaceInviteMessagePage(props) {
             testID={WorkspaceInviteMessagePage.displayName}
         >
             <FullPageNotFoundView
-                shouldShow={_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy) || PolicyUtils.isPendingDeletePolicy(props.policy)}
-                subtitleKey={_.isEmpty(props.policy) ? undefined : 'workspace.common.notAuthorized'}
+                shouldShow={isEmptyObject(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)}
+                subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
             >
                 <HeaderWithBackButton
@@ -143,7 +123,7 @@ function WorkspaceInviteMessagePage(props) {
                     guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
                     shouldShowBackButton
                     onCloseButtonPress={() => Navigation.dismissModal()}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(props.route.params.policyID))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID))}
                 />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
@@ -169,7 +149,11 @@ function WorkspaceInviteMessagePage(props) {
                     <View style={[styles.mv4, styles.justifyContentCenter, styles.alignItemsCenter]}>
                         <MultipleAvatars
                             size={CONST.AVATAR_SIZE.LARGE}
-                            icons={OptionsListUtils.getAvatarsForAccountIDs(_.values(props.invitedEmailsToAccountIDsDraft), props.allPersonalDetails, props.invitedEmailsToAccountIDsDraft)}
+                            icons={OptionsListUtils.getAvatarsForAccountIDs(
+                                Object.values(invitedEmailsToAccountIDsDraft ?? {}),
+                                allPersonalDetails ?? {},
+                                invitedEmailsToAccountIDsDraft ?? {},
+                            )}
                             shouldStackHorizontally
                             shouldDisplayAvatarsInRows
                             secondAvatarStyle={[styles.secondAvatarInline]}
@@ -191,16 +175,16 @@ function WorkspaceInviteMessagePage(props) {
                             containerStyles={[styles.autoGrowHeightMultilineInput]}
                             defaultValue={getDefaultWelcomeNote()}
                             value={welcomeNote}
-                            onChangeText={(text) => {
+                            onChangeText={(text: string) => {
                                 setWelcomeNote(text);
                                 debouncedSaveDraft(text);
                             }}
-                            ref={(el) => {
-                                if (!el) {
+                            ref={(element: AnimatedTextInputRef) => {
+                                if (!element) {
                                     return;
                                 }
-                                inputCallbackRef(el);
-                                updateMultilineInputRange(el);
+                                inputCallbackRef(element);
+                                updateMultilineInputRange(element);
                             }}
                         />
                     </View>
@@ -210,13 +194,10 @@ function WorkspaceInviteMessagePage(props) {
     );
 }
 
-WorkspaceInviteMessagePage.propTypes = propTypes;
-WorkspaceInviteMessagePage.defaultProps = defaultProps;
 WorkspaceInviteMessagePage.displayName = 'WorkspaceInviteMessagePage';
 
-export default compose(
-    withPolicyAndFullscreenLoading,
-    withOnyx({
+export default withPolicyAndFullscreenLoading(
+    withOnyx<WorkspaceInviteMessagePageProps, WorkspaceInviteMessagePageOnyxProps>({
         allPersonalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
@@ -226,6 +207,5 @@ export default compose(
         workspaceInviteMessageDraft: {
             key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT}${route.params.policyID.toString()}`,
         },
-    }),
-    withNavigationFocus,
-)(WorkspaceInviteMessagePage);
+    })(WorkspaceInviteMessagePage),
+);
diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.tsx
similarity index 57%
rename from src/pages/workspace/WorkspaceInvitePage.js
rename to src/pages/workspace/WorkspaceInvitePage.tsx
index 8fcf425d8f34..ae139752a052 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -1,98 +1,87 @@
 import {useNavigation} from '@react-navigation/native';
+import type {StackNavigationProp, StackScreenProps} from '@react-navigation/stack';
 import Str from 'expensify-common/lib/str';
-import lodashGet from 'lodash/get';
-import PropTypes from 'prop-types';
 import React, {useEffect, useMemo, useState} from 'react';
+import type {SectionListData} from 'react-native';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
+import type {Section} from '@components/SelectionList/types';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as LoginUtils from '@libs/LoginUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import type {MemberForList} from '@libs/OptionsListUtils';
 import {parsePhoneNumber} 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 CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Beta, InvitedEmailsToAccountIDs, PersonalDetailsList} from '@src/types/onyx';
+import type {Errors} from '@src/types/onyx/OnyxCommon';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import SearchInputManager from './SearchInputManager';
-import {policyDefaultProps, policyPropTypes} from './withPolicy';
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
+import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
 
-const personalDetailsPropTypes = PropTypes.shape({
-    /** The login of the person (either email or phone number) */
-    login: PropTypes.string,
+type MembersSection = SectionListData<MemberForList, Section<MemberForList>>;
 
-    /** The URL of the person's avatar (there should already be a default avatar if
-  the person doesn't have their own avatar uploaded yet, except for anon users) */
-    avatar: PropTypes.string,
-
-    /** This is either the user's full name, or their login if full name is an empty string */
-    displayName: PropTypes.string,
-});
+type WorkspaceInvitePageOnyxProps = {
+    /** All of the personal details for everyone */
+    personalDetails: OnyxEntry<PersonalDetailsList>;
 
-const propTypes = {
     /** Beta features list */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
-    /** All of the personal details for everyone */
-    personalDetails: PropTypes.objectOf(personalDetailsPropTypes),
-
-    /** URL Route params */
-    route: PropTypes.shape({
-        /** Params from the URL path */
-        params: PropTypes.shape({
-            /** policyID passed via route: /workspace/:policyID/invite */
-            policyID: PropTypes.string,
-        }),
-    }).isRequired,
-
-    isLoadingReportData: PropTypes.bool,
-    invitedEmailsToAccountIDsDraft: PropTypes.objectOf(PropTypes.number),
-    ...policyPropTypes,
-};
+    betas: OnyxEntry<Beta[]>;
 
-const defaultProps = {
-    personalDetails: {},
-    betas: [],
-    isLoadingReportData: true,
-    invitedEmailsToAccountIDsDraft: {},
-    ...policyDefaultProps,
+    /** An object containing the accountID for every invited user email */
+    invitedEmailsToAccountIDsDraft: OnyxEntry<InvitedEmailsToAccountIDs | undefined>;
 };
 
-function WorkspaceInvitePage(props) {
+type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps & WorkspaceInvitePageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVITE>;
+
+function WorkspaceInvitePage({
+    route,
+    policyMembers,
+    personalDetails: personalDetailsProp,
+    betas,
+    invitedEmailsToAccountIDsDraft,
+    policy,
+    isLoadingReportData = true,
+}: WorkspaceInvitePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [searchTerm, setSearchTerm] = useState('');
-    const [selectedOptions, setSelectedOptions] = useState([]);
-    const [personalDetails, setPersonalDetails] = useState([]);
-    const [usersToInvite, setUsersToInvite] = useState([]);
+    const [selectedOptions, setSelectedOptions] = useState<MemberForList[]>([]);
+    const [personalDetails, setPersonalDetails] = useState<OptionData[]>([]);
+    const [usersToInvite, setUsersToInvite] = useState<OptionData[]>([]);
     const [didScreenTransitionEnd, setDidScreenTransitionEnd] = useState(false);
-    const navigation = useNavigation();
+    const navigation = useNavigation<StackNavigationProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVITE>>();
     const openWorkspaceInvitePage = () => {
-        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(props.policyMembers, props.personalDetails);
-        Policy.openWorkspaceInvitePage(props.route.params.policyID, _.keys(policyMemberEmailsToAccountIDs));
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policyMembers, personalDetailsProp);
+        Policy.openWorkspaceInvitePage(route.params.policyID, Object.keys(policyMemberEmailsToAccountIDs));
     };
 
     useEffect(() => {
         setSearchTerm(SearchInputManager.searchInput);
         return () => {
-            Policy.setWorkspaceInviteMembersDraft(props.route.params.policyID, {});
+            Policy.setWorkspaceInviteMembersDraft(route.params.policyID, {});
         };
-    }, [props.route.params.policyID]);
+    }, [route.params.policyID]);
 
     useEffect(() => {
-        Policy.clearErrors(props.route.params.policyID);
+        Policy.clearErrors(route.params.policyID);
         openWorkspaceInvitePage();
         // eslint-disable-next-line react-hooks/exhaustive-deps -- policyID changes remount the component
     }, []);
@@ -111,57 +100,69 @@ function WorkspaceInvitePage(props) {
 
     useNetwork({onReconnect: openWorkspaceInvitePage});
 
-    const excludedUsers = useMemo(() => PolicyUtils.getIneligibleInvitees(props.policyMembers, props.personalDetails), [props.policyMembers, props.personalDetails]);
+    const excludedUsers = useMemo(() => PolicyUtils.getIneligibleInvitees(policyMembers, personalDetailsProp), [policyMembers, personalDetailsProp]);
 
     useEffect(() => {
-        const newUsersToInviteDict = {};
-        const newPersonalDetailsDict = {};
-        const newSelectedOptionsDict = {};
+        const newUsersToInviteDict: Record<number, OptionData> = {};
+        const newPersonalDetailsDict: Record<number, OptionData> = {};
+        const newSelectedOptionsDict: Record<number, MemberForList> = {};
 
-        const inviteOptions = OptionsListUtils.getMemberInviteOptions(props.personalDetails, props.betas, searchTerm, excludedUsers, true);
+        const inviteOptions = OptionsListUtils.getMemberInviteOptions(personalDetailsProp, betas ?? [], searchTerm, excludedUsers, true);
 
         // Update selectedOptions with the latest personalDetails and policyMembers information
-        const detailsMap = {};
-        _.each(inviteOptions.personalDetails, (detail) => (detailsMap[detail.login] = OptionsListUtils.formatMemberForList(detail)));
+        const detailsMap: Record<string, MemberForList> = {};
+        inviteOptions.personalDetails.forEach((detail) => {
+            if (!detail.login) {
+                return;
+            }
 
-        const newSelectedOptions = [];
-        _.each(_.keys(props.invitedEmailsToAccountIDsDraft), (login) => {
-            if (!_.has(detailsMap, login)) {
+            detailsMap[detail.login] = OptionsListUtils.formatMemberForList(detail);
+        });
+
+        const newSelectedOptions: MemberForList[] = [];
+        Object.keys(invitedEmailsToAccountIDsDraft ?? {}).forEach((login) => {
+            if (!(login in detailsMap)) {
                 return;
             }
             newSelectedOptions.push({...detailsMap[login], isSelected: true});
         });
-        _.each(selectedOptions, (option) => {
-            newSelectedOptions.push(_.has(detailsMap, option.login) ? {...detailsMap[option.login], isSelected: true} : option);
+        selectedOptions.forEach((option) => {
+            newSelectedOptions.push(option.login && option.login in detailsMap ? {...detailsMap[option.login], isSelected: true} : option);
         });
 
         const userToInvite = inviteOptions.userToInvite;
 
         // Only add the user to the invites list if it is valid
-        if (userToInvite) {
+        if (typeof userToInvite?.accountID === 'number') {
             newUsersToInviteDict[userToInvite.accountID] = userToInvite;
         }
 
         // Add all personal details to the new dict
-        _.each(inviteOptions.personalDetails, (details) => {
+        inviteOptions.personalDetails.forEach((details) => {
+            if (typeof details.accountID !== 'number') {
+                return;
+            }
             newPersonalDetailsDict[details.accountID] = details;
         });
 
         // Add all selected options to the new dict
-        _.each(newSelectedOptions, (option) => {
+        newSelectedOptions.forEach((option) => {
+            if (typeof option.accountID !== 'number') {
+                return;
+            }
             newSelectedOptionsDict[option.accountID] = option;
         });
 
         // Strip out dictionary keys and update arrays
-        setUsersToInvite(_.values(newUsersToInviteDict));
-        setPersonalDetails(_.values(newPersonalDetailsDict));
-        setSelectedOptions(_.values(newSelectedOptionsDict));
+        setUsersToInvite(Object.values(newUsersToInviteDict));
+        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
-    }, [props.personalDetails, props.policyMembers, props.betas, searchTerm, excludedUsers]);
+    }, [personalDetailsProp, policyMembers, betas, searchTerm, excludedUsers]);
 
-    const sections = useMemo(() => {
-        const sectionsArr = [];
+    const sections: MembersSection[] = useMemo(() => {
+        const sectionsArr: MembersSection[] = [];
         let indexOffset = 0;
 
         if (!didScreenTransitionEnd) {
@@ -171,13 +172,13 @@ function WorkspaceInvitePage(props) {
         // Filter all options that is a part of the search term or in the personal details
         let filterSelectedOptions = selectedOptions;
         if (searchTerm !== '') {
-            filterSelectedOptions = _.filter(selectedOptions, (option) => {
-                const accountID = lodashGet(option, 'accountID', null);
-                const isOptionInPersonalDetails = _.some(personalDetails, (personalDetail) => personalDetail.accountID === accountID);
+            filterSelectedOptions = selectedOptions.filter((option) => {
+                const accountID = option.accountID;
+                const isOptionInPersonalDetails = Object.values(personalDetails).some((personalDetail) => personalDetail.accountID === accountID);
                 const parsedPhoneNumber = parsePhoneNumber(LoginUtils.appendCountryCode(Str.removeSMSDomain(searchTerm)));
-                const searchValue = parsedPhoneNumber.possible ? parsedPhoneNumber.number.e164 : searchTerm.toLowerCase();
+                const searchValue = parsedPhoneNumber.possible ? parsedPhoneNumber.number?.e164 ?? '' : searchTerm.toLowerCase();
 
-                const isPartOfSearchTerm = option.text.toLowerCase().includes(searchValue) || option.login.toLowerCase().includes(searchValue);
+                const isPartOfSearchTerm = !!option.text?.toLowerCase().includes(searchValue) || !!option.login?.toLowerCase().includes(searchValue);
                 return isPartOfSearchTerm || isOptionInPersonalDetails;
             });
         }
@@ -191,20 +192,20 @@ function WorkspaceInvitePage(props) {
         indexOffset += filterSelectedOptions.length;
 
         // Filtering out selected users from the search results
-        const selectedLogins = _.map(selectedOptions, ({login}) => login);
-        const personalDetailsWithoutSelected = _.filter(personalDetails, ({login}) => !_.contains(selectedLogins, login));
-        const personalDetailsFormatted = _.map(personalDetailsWithoutSelected, OptionsListUtils.formatMemberForList);
+        const selectedLogins = selectedOptions.map(({login}) => login);
+        const personalDetailsWithoutSelected = Object.values(personalDetails).filter(({login}) => !selectedLogins.some((selectedLogin) => selectedLogin === login));
+        const personalDetailsFormatted = personalDetailsWithoutSelected.map((item) => OptionsListUtils.formatMemberForList(item));
 
         sectionsArr.push({
             title: translate('common.contacts'),
             data: personalDetailsFormatted,
-            shouldShow: !_.isEmpty(personalDetailsFormatted),
+            shouldShow: !isEmptyObject(personalDetailsFormatted),
             indexOffset,
         });
         indexOffset += personalDetailsFormatted.length;
 
-        _.each(usersToInvite, (userToInvite) => {
-            const hasUnselectedUserToInvite = !_.contains(selectedLogins, userToInvite.login);
+        Object.values(usersToInvite).forEach((userToInvite) => {
+            const hasUnselectedUserToInvite = !selectedLogins.some((selectedLogin) => selectedLogin === userToInvite.login);
 
             if (hasUnselectedUserToInvite) {
                 sectionsArr.push({
@@ -219,14 +220,14 @@ function WorkspaceInvitePage(props) {
         return sectionsArr;
     }, [personalDetails, searchTerm, selectedOptions, usersToInvite, translate, didScreenTransitionEnd]);
 
-    const toggleOption = (option) => {
-        Policy.clearErrors(props.route.params.policyID);
+    const toggleOption = (option: MemberForList) => {
+        Policy.clearErrors(route.params.policyID);
 
-        const isOptionInList = _.some(selectedOptions, (selectedOption) => selectedOption.login === option.login);
+        const isOptionInList = selectedOptions.some((selectedOption) => selectedOption.login === option.login);
 
-        let newSelectedOptions;
+        let newSelectedOptions: MemberForList[];
         if (isOptionInList) {
-            newSelectedOptions = _.reject(selectedOptions, (selectedOption) => selectedOption.login === option.login);
+            newSelectedOptions = selectedOptions.filter((selectedOption) => selectedOption.login !== option.login);
         } else {
             newSelectedOptions = [...selectedOptions, {...option, isSelected: true}];
         }
@@ -234,14 +235,14 @@ function WorkspaceInvitePage(props) {
         setSelectedOptions(newSelectedOptions);
     };
 
-    const validate = () => {
-        const errors = {};
+    const validate = (): boolean => {
+        const errors: Errors = {};
         if (selectedOptions.length <= 0) {
-            errors.noUserSelected = true;
+            errors.noUserSelected = 'true';
         }
 
-        Policy.setWorkspaceErrors(props.route.params.policyID, errors);
-        return _.size(errors) <= 0;
+        Policy.setWorkspaceErrors(route.params.policyID, errors);
+        return isEmptyObject(errors);
     };
 
     const inviteUser = () => {
@@ -249,27 +250,24 @@ function WorkspaceInvitePage(props) {
             return;
         }
 
-        const invitedEmailsToAccountIDs = {};
-        _.each(selectedOptions, (option) => {
-            const login = option.login || '';
-            const accountID = lodashGet(option, 'accountID', '');
+        const invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs = {};
+        selectedOptions.forEach((option) => {
+            const login = option.login ?? '';
+            const accountID = option.accountID ?? '';
             if (!login.toLowerCase().trim() || !accountID) {
                 return;
             }
             invitedEmailsToAccountIDs[login] = Number(accountID);
         });
-        Policy.setWorkspaceInviteMembersDraft(props.route.params.policyID, invitedEmailsToAccountIDs);
-        Navigation.navigate(ROUTES.WORKSPACE_INVITE_MESSAGE.getRoute(props.route.params.policyID));
+        Policy.setWorkspaceInviteMembersDraft(route.params.policyID, invitedEmailsToAccountIDs);
+        Navigation.navigate(ROUTES.WORKSPACE_INVITE_MESSAGE.getRoute(route.params.policyID));
     };
 
-    const [policyName, shouldShowAlertPrompt] = useMemo(
-        () => [lodashGet(props.policy, 'name'), _.size(lodashGet(props.policy, 'errors', {})) > 0 || lodashGet(props.policy, 'alertMessage', '').length > 0],
-        [props.policy],
-    );
+    const [policyName, shouldShowAlertPrompt] = useMemo(() => [policy?.name ?? '', !isEmptyObject(policy?.errors) || !!policy?.alertMessage], [policy]);
 
     const headerMessage = useMemo(() => {
         const searchValue = searchTerm.trim().toLowerCase();
-        if (usersToInvite.length === 0 && CONST.EXPENSIFY_EMAILS.includes(searchValue)) {
+        if (usersToInvite.length === 0 && CONST.EXPENSIFY_EMAILS.some((email) => email === searchValue)) {
             return translate('messages.errorMessageInvalidEmail');
         }
         if (
@@ -289,8 +287,8 @@ function WorkspaceInvitePage(props) {
             testID={WorkspaceInvitePage.displayName}
         >
             <FullPageNotFoundView
-                shouldShow={(_.isEmpty(props.policy) && !props.isLoadingReportData) || !PolicyUtils.isPolicyAdmin(props.policy) || PolicyUtils.isPendingDeletePolicy(props.policy)}
-                subtitleKey={_.isEmpty(props.policy) ? undefined : 'workspace.common.notAuthorized'}
+                shouldShow={(isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)}
+                subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
             >
                 <HeaderWithBackButton
@@ -299,7 +297,7 @@ function WorkspaceInvitePage(props) {
                     shouldShowGetAssistanceButton
                     guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
                     onBackButtonPress={() => {
-                        Policy.clearErrors(props.route.params.policyID);
+                        Policy.clearErrors(route.params.policyID);
                         Navigation.goBack();
                     }}
                 />
@@ -316,7 +314,7 @@ function WorkspaceInvitePage(props) {
                     onSelectRow={toggleOption}
                     onConfirm={inviteUser}
                     showScrollIndicator
-                    showLoadingPlaceholder={!didScreenTransitionEnd || !OptionsListUtils.isPersonalDetailsReady(props.personalDetails)}
+                    showLoadingPlaceholder={!didScreenTransitionEnd || !OptionsListUtils.isPersonalDetailsReady(personalDetailsProp)}
                     shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                 />
                 <View style={[styles.flexShrink0]}>
@@ -325,7 +323,7 @@ function WorkspaceInvitePage(props) {
                         isAlertVisible={shouldShowAlertPrompt}
                         buttonText={translate('common.next')}
                         onSubmit={inviteUser}
-                        message={[props.policy.alertMessage, {isTranslated: true}]}
+                        message={[policy?.alertMessage ?? '', {isTranslated: true}]}
                         containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto, styles.mb5]}
                         enabledWhenOffline
                         disablePressOnEnter
@@ -336,24 +334,18 @@ function WorkspaceInvitePage(props) {
     );
 }
 
-WorkspaceInvitePage.propTypes = propTypes;
-WorkspaceInvitePage.defaultProps = defaultProps;
 WorkspaceInvitePage.displayName = 'WorkspaceInvitePage';
 
-export default compose(
-    withPolicyAndFullscreenLoading,
-    withOnyx({
+export default withPolicyAndFullscreenLoading(
+    withOnyx<WorkspaceInvitePageProps, WorkspaceInvitePageOnyxProps>({
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
         betas: {
             key: ONYXKEYS.BETAS,
         },
-        isLoadingReportData: {
-            key: ONYXKEYS.IS_LOADING_REPORT_DATA,
-        },
         invitedEmailsToAccountIDsDraft: {
             key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`,
         },
-    }),
-)(WorkspaceInvitePage);
+    })(WorkspaceInvitePage),
+);
diff --git a/src/styles/index.ts b/src/styles/index.ts
index f503f5892038..1d3e323d6bd1 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -2619,6 +2619,10 @@ const styles = (theme: ThemeColors) =>
             alignItems: 'center',
         },
 
+        qrShareSection: {
+            width: 264,
+        },
+
         sectionMenuItemTopDescription: {
             ...spacing.ph8,
             ...spacing.mhn8,
diff --git a/src/types/modules/react-native-device-info.d.ts b/src/types/modules/react-native-device-info.d.ts
new file mode 100644
index 000000000000..1b2a0968cd41
--- /dev/null
+++ b/src/types/modules/react-native-device-info.d.ts
@@ -0,0 +1,7 @@
+declare module 'react-native-device-info/jest/react-native-device-info-mock' {
+    import type DeviceInfo from 'react-native-device-info';
+
+    const MockDeviceInfo: typeof DeviceInfo;
+
+    export default MockDeviceInfo;
+}
diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index e3b025ff5a2f..68acd88aa120 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -33,5 +33,7 @@ type TCardDetails = {
     };
 };
 
+type CardList = Record<string, Card>;
+
 export default Card;
-export type {TCardDetails};
+export type {TCardDetails, CardList};
diff --git a/src/types/onyx/Form.ts b/src/types/onyx/Form.ts
index 6938e17163d2..c2fb1a4960f0 100644
--- a/src/types/onyx/Form.ts
+++ b/src/types/onyx/Form.ts
@@ -55,6 +55,35 @@ type PrivateNotesForm = Form<{
     privateNotes: string;
 }>;
 
+type GetPhysicalCardForm = Form<{
+    /** Address line 1 for delivery */
+    addressLine1?: string;
+
+    /** Address line 2 for delivery */
+    addressLine2?: string;
+
+    /** City for delivery */
+    city?: string;
+
+    /** Country for delivery */
+    country?: string;
+
+    /** First name for delivery */
+    legalFirstName?: string;
+
+    /** Last name  for delivery */
+    legalLastName?: string;
+
+    /** Phone number for delivery */
+    phoneNumber?: string;
+
+    /** State for delivery */
+    state?: string;
+
+    /** Zip code  for delivery */
+    zipPostCode?: string;
+}>;
+
 type PersonalBankAccountForm = Form<PersonalBankAccount>;
 
 type WorkspaceSettingsForm = Form<{
@@ -80,6 +109,7 @@ export type {
     PrivateNotesForm,
     DisplayNameForm,
     FormValueType,
+    GetPhysicalCardForm,
     NewRoomForm,
     BaseForm,
     IKnowATeacherForm,
diff --git a/src/types/onyx/InvitedEmailsToAccountIDs.ts b/src/types/onyx/InvitedEmailsToAccountIDs.ts
new file mode 100644
index 000000000000..929d21746682
--- /dev/null
+++ b/src/types/onyx/InvitedEmailsToAccountIDs.ts
@@ -0,0 +1,3 @@
+type InvitedEmailsToAccountIDs = Record<string, number>;
+
+export default InvitedEmailsToAccountIDs;
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 459ff5524034..7cfaa968e2ad 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -283,6 +283,7 @@ export type {
     ChangeLog,
     OriginalMessageIOU,
     OriginalMessageCreated,
+    OriginalMessageRenamed,
     OriginalMessageAddComment,
     OriginalMessageChronosOOOList,
     OriginalMessageSource,
diff --git a/src/types/onyx/PolicyTag.ts b/src/types/onyx/PolicyTag.ts
index c14ede73b622..ff688419605d 100644
--- a/src/types/onyx/PolicyTag.ts
+++ b/src/types/onyx/PolicyTag.ts
@@ -15,4 +15,17 @@ type PolicyTag = {
 
 type PolicyTags = Record<string, PolicyTag>;
 
-export type {PolicyTag, PolicyTags};
+type PolicyTagList<T extends string = string> = Record<
+    T,
+    {
+        /** Name of the tag list */
+        name: T;
+
+        /** Flag that determines if tags are required */
+        required: boolean;
+
+        tags: PolicyTags;
+    }
+>;
+
+export type {PolicyTag, PolicyTags, PolicyTagList};
diff --git a/src/types/onyx/PrivatePersonalDetails.ts b/src/types/onyx/PrivatePersonalDetails.ts
index 6ef5b75c4a0f..4d0dedf16ea7 100644
--- a/src/types/onyx/PrivatePersonalDetails.ts
+++ b/src/types/onyx/PrivatePersonalDetails.ts
@@ -10,6 +10,7 @@ type PrivatePersonalDetails = {
     legalFirstName?: string;
     legalLastName?: string;
     dob?: string;
+    phoneNumber?: string;
 
     /** User's home address */
     address?: Address;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 4728c8872e75..aae3b6f2532a 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -5,6 +5,7 @@ import type BankAccount from './BankAccount';
 import type Beta from './Beta';
 import type BlockedFromConcierge from './BlockedFromConcierge';
 import type Card from './Card';
+import type {CardList} from './Card';
 import type Credentials from './Credentials';
 import type Currency from './Currency';
 import type CustomStatusDraft from './CustomStatusDraft';
@@ -14,6 +15,7 @@ import type {
     CloseAccountForm,
     DateOfBirthForm,
     DisplayNameForm,
+    GetPhysicalCardForm,
     IKnowATeacherForm,
     IntroSchoolPrincipalForm,
     NewRoomForm,
@@ -27,6 +29,7 @@ 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 LastPaymentMethod from './LastPaymentMethod';
 import type Locale from './Locale';
@@ -45,7 +48,7 @@ import type {PolicyCategories, PolicyCategory} from './PolicyCategory';
 import type {PolicyMembers} from './PolicyMember';
 import type PolicyMember from './PolicyMember';
 import type {PolicyReportField, PolicyReportFields} from './PolicyReportField';
-import type {PolicyTag, PolicyTags} from './PolicyTag';
+import type {PolicyTag, PolicyTagList, PolicyTags} from './PolicyTag';
 import type PrivatePersonalDetails from './PrivatePersonalDetails';
 import type RecentlyUsedCategories from './RecentlyUsedCategories';
 import type RecentlyUsedReportFields from './RecentlyUsedReportFields';
@@ -92,6 +95,7 @@ export type {
     Beta,
     BlockedFromConcierge,
     Card,
+    CardList,
     Credentials,
     Currency,
     CustomStatusDraft,
@@ -102,6 +106,7 @@ export type {
     FrequentlyUsedEmoji,
     Fund,
     FundList,
+    GetPhysicalCardForm,
     IntroSelected,
     IOU,
     Locale,
@@ -123,6 +128,7 @@ export type {
     PolicyMembers,
     PolicyTag,
     PolicyTags,
+    PolicyTagList,
     PrivatePersonalDetails,
     RecentWaypoint,
     RecentlyUsedCategories,
@@ -166,6 +172,7 @@ export type {
     NewRoomForm,
     IKnowATeacherForm,
     IntroSchoolPrincipalForm,
+    InvitedEmailsToAccountIDs,
     PrivateNotesForm,
     ReportFieldEditForm,
     RoomNameForm,
diff --git a/tests/unit/ViolationUtilsTest.js b/tests/unit/ViolationUtilsTest.js
index f0b53443831e..2b644c1fc822 100644
--- a/tests/unit/ViolationUtilsTest.js
+++ b/tests/unit/ViolationUtilsTest.js
@@ -128,7 +128,13 @@ describe('getViolationsOnyxData', () => {
     describe('policyRequiresTags', () => {
         beforeEach(() => {
             policyRequiresTags = true;
-            policyTags = {Lunch: {enabled: true}, Dinner: {enabled: true}};
+            policyTags = {
+                Tag: {
+                    name: 'Tag',
+                    required: true,
+                    tags: {Lunch: {enabled: true}, Dinner: {enabled: true}},
+                },
+            };
             transaction.tag = 'Lunch';
         });