From 283cf9025558090815f01e7f71550525a6d24ff3 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Thu, 26 Oct 2023 18:56:47 -0400
Subject: [PATCH 001/383] Fixed getting two magic codes upon signing in once

---
 src/pages/signin/ChooseSSOOrMagicCode.js | 29 +++++-------------------
 src/pages/signin/SignInPage.js           |  6 ++++-
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.js b/src/pages/signin/ChooseSSOOrMagicCode.js
index db985e525545..da1a299fa14d 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.js
+++ b/src/pages/signin/ChooseSSOOrMagicCode.js
@@ -16,18 +16,11 @@ import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
-import Terms from './Terms';
+import ValidateCodeForm from './ValidateCodeForm';
 
 const propTypes = {
     /* Onyx Props */
 
-    /** The credentials of the logged in person */
-    credentials: PropTypes.shape({
-        /** The email/phone the user logged in with */
-        login: PropTypes.string,
-    }),
-
     /** The details about the account that the user is signing in with */
     account: PropTypes.shape({
         /** Whether or not a sign on form is loading (being submitted) */
@@ -48,11 +41,10 @@ const propTypes = {
 };
 
 const defaultProps = {
-    credentials: {},
     account: {},
 };
 
-function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}) {
+function ChooseSSOOrMagicCode({account, setIsUsingMagicCode}) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -79,21 +71,12 @@ function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}) {
                     </Text>
                 </View>
 
-                <Button
-                    isDisabled={isOffline}
-                    style={[styles.mv3]}
-                    text={translate('samlSignIn.useMagicCode')}
-                    isLoading={account.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM)}
-                    onPress={() => {
-                        Session.resendValidateCode(credentials.login);
-                        setIsUsingMagicCode(true);
-                    }}
+                <ValidateCodeForm
+                    setIsUsingMagicCode={setIsUsingMagicCode}
+                    isUsingRecoveryCode={false}
+                    setIsUsingRecoveryCode={() => undefined}
                 />
                 {Boolean(account) && !_.isEmpty(account.errors) && <FormHelpMessage message={ErrorUtils.getLatestErrorMessage(account)} />}
-                <ChangeExpensifyLoginLink onPress={() => Session.clearSignInData()} />
-            </View>
-            <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
-                <Terms />
             </View>
         </>
     );
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 8cb0ef9907af..26985bad0507 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -271,7 +271,11 @@ function SignInPageInner({credentials, account, isInModal, activeClients, prefer
                             />
                         )}
                         {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
-                        {shouldShowChooseSSOOrMagicCode && <ChooseSSOOrMagicCode setIsUsingMagicCode={setIsUsingMagicCode} />}
+                        {shouldShowChooseSSOOrMagicCode && (
+                            <ChooseSSOOrMagicCode
+                                setIsUsingMagicCode={setIsUsingMagicCode}
+                            />
+                        )}
                         {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
                     </>
                 )}

From 172c9afa1f45208f1e98d5a279dd74e803bb06c9 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Wed, 22 Nov 2023 09:23:03 -0400
Subject: [PATCH 002/383] Fixed prettier after fixed conficts / after merge

---
 src/pages/signin/SignInPage.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 26985bad0507..8cb0ef9907af 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -271,11 +271,7 @@ function SignInPageInner({credentials, account, isInModal, activeClients, prefer
                             />
                         )}
                         {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
-                        {shouldShowChooseSSOOrMagicCode && (
-                            <ChooseSSOOrMagicCode
-                                setIsUsingMagicCode={setIsUsingMagicCode}
-                            />
-                        )}
+                        {shouldShowChooseSSOOrMagicCode && <ChooseSSOOrMagicCode setIsUsingMagicCode={setIsUsingMagicCode} />}
                         {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
                     </>
                 )}

From f0012ab4fde1e8fb2145177c9c8a5cf322da9847 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Thu, 23 Nov 2023 15:04:18 -0400
Subject: [PATCH 003/383] Added recovery mode feature to code form, fixed bugs:
 both loading state and form error duplicated

---
 src/pages/signin/ChooseSSOOrMagicCode.js | 40 +++++-------------------
 src/pages/signin/SignInPage.js           |  7 ++++-
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.js b/src/pages/signin/ChooseSSOOrMagicCode.js
index da1a299fa14d..832b685e0404 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.js
+++ b/src/pages/signin/ChooseSSOOrMagicCode.js
@@ -1,16 +1,13 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
 import Button from '@components/Button';
-import FormHelpMessage from '@components/FormHelpMessage';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
@@ -19,36 +16,18 @@ import ROUTES from '@src/ROUTES';
 import ValidateCodeForm from './ValidateCodeForm';
 
 const propTypes = {
-    /* Onyx Props */
-
-    /** The details about the account that the user is signing in with */
-    account: PropTypes.shape({
-        /** Whether or not a sign on form is loading (being submitted) */
-        isLoading: PropTypes.bool,
-
-        /** Form that is being loaded */
-        loadingForm: PropTypes.oneOf(_.values(CONST.FORMS)),
-
-        /** Whether this account has 2FA enabled or not */
-        requiresTwoFactorAuth: PropTypes.bool,
-
-        /** Server-side errors in the submitted authentication code */
-        errors: PropTypes.objectOf(PropTypes.string),
-    }),
-
     /** Function that returns whether the user is using SAML or magic codes to log in */
     setIsUsingMagicCode: PropTypes.func.isRequired,
 };
 
-const defaultProps = {
-    account: {},
-};
+const defaultProps = {};
 
-function ChooseSSOOrMagicCode({account, setIsUsingMagicCode}) {
+function ChooseSSOOrMagicCode({setIsUsingMagicCode}) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {isSmallScreenWidth} = useWindowDimensions();
+    const [isUsingRecoveryCode, setIsUsingRecoveryCode] = useState(false);
 
     return (
         <>
@@ -59,7 +38,6 @@ function ChooseSSOOrMagicCode({account, setIsUsingMagicCode}) {
                     success
                     style={[styles.mv3]}
                     text={translate('samlSignIn.useSingleSignOn')}
-                    isLoading={account.isLoading}
                     onPress={() => {
                         Navigation.navigate(ROUTES.SAML_SIGN_IN);
                     }}
@@ -73,10 +51,9 @@ function ChooseSSOOrMagicCode({account, setIsUsingMagicCode}) {
 
                 <ValidateCodeForm
                     setIsUsingMagicCode={setIsUsingMagicCode}
-                    isUsingRecoveryCode={false}
-                    setIsUsingRecoveryCode={() => undefined}
+                    isUsingRecoveryCode={isUsingRecoveryCode}
+                    setIsUsingRecoveryCode={setIsUsingRecoveryCode}
                 />
-                {Boolean(account) && !_.isEmpty(account.errors) && <FormHelpMessage message={ErrorUtils.getLatestErrorMessage(account)} />}
             </View>
         </>
     );
@@ -86,7 +63,4 @@ ChooseSSOOrMagicCode.propTypes = propTypes;
 ChooseSSOOrMagicCode.defaultProps = defaultProps;
 ChooseSSOOrMagicCode.displayName = 'ChooseSSOOrMagicCode';
 
-export default withOnyx({
-    credentials: {key: ONYXKEYS.CREDENTIALS},
-    account: {key: ONYXKEYS.ACCOUNT},
-})(ChooseSSOOrMagicCode);
+export default withOnyx()(ChooseSSOOrMagicCode);
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 8cb0ef9907af..343092088529 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -271,7 +271,12 @@ function SignInPageInner({credentials, account, isInModal, activeClients, prefer
                             />
                         )}
                         {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
-                        {shouldShowChooseSSOOrMagicCode && <ChooseSSOOrMagicCode setIsUsingMagicCode={setIsUsingMagicCode} />}
+                        {shouldShowChooseSSOOrMagicCode && (
+                            <ChooseSSOOrMagicCode
+                                isUsingMagicCode={isUsingMagicCode}
+                                setIsUsingMagicCode={setIsUsingMagicCode}
+                            />
+                        )}
                         {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
                     </>
                 )}

From b50afa851b1ddc95c041daf11efee261f9a8361a Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Fri, 24 Nov 2023 15:24:31 -0400
Subject: [PATCH 004/383] Fixed two factor auth bug

---
 src/pages/signin/ChooseSSOOrMagicCode.js | 9 ++++++---
 src/pages/signin/SignInPage.js           | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.js b/src/pages/signin/ChooseSSOOrMagicCode.js
index 832b685e0404..7e63424b50c6 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.js
+++ b/src/pages/signin/ChooseSSOOrMagicCode.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, {useState} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
@@ -18,16 +18,19 @@ import ValidateCodeForm from './ValidateCodeForm';
 const propTypes = {
     /** Function that returns whether the user is using SAML or magic codes to log in */
     setIsUsingMagicCode: PropTypes.func.isRequired,
+    /** Determines if user is switched to using recovery code instead of 2fa code */
+    isUsingRecoveryCode: PropTypes.bool.isRequired,
+    /** Function to change `isUsingRecoveryCode` state when user toggles between 2fa code and recovery code */
+    setIsUsingRecoveryCode: PropTypes.func.isRequired,
 };
 
 const defaultProps = {};
 
-function ChooseSSOOrMagicCode({setIsUsingMagicCode}) {
+function ChooseSSOOrMagicCode({setIsUsingMagicCode, isUsingRecoveryCode, setIsUsingRecoveryCode}) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const [isUsingRecoveryCode, setIsUsingRecoveryCode] = useState(false);
 
     return (
         <>
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 343092088529..06e391137649 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -275,6 +275,8 @@ function SignInPageInner({credentials, account, isInModal, activeClients, prefer
                             <ChooseSSOOrMagicCode
                                 isUsingMagicCode={isUsingMagicCode}
                                 setIsUsingMagicCode={setIsUsingMagicCode}
+                                isUsingRecoveryCode={isUsingRecoveryCode}
+                                setIsUsingRecoveryCode={setIsUsingRecoveryCode}
                             />
                         )}
                         {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}

From 12421b3ddefb527f6679fa4c5dba3200ef7e4e2a Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Mon, 27 Nov 2023 20:27:03 -0400
Subject: [PATCH 005/383] Fixed form text when changing from magic code to
 recovery code or twofactor auth

---
 src/pages/signin/ChooseSSOOrMagicCode.js      | 30 +++++++++++++++----
 src/pages/signin/SignInPage.js                |  1 -
 .../ValidateCodeForm/BaseValidateCodeForm.js  | 12 ++++++--
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.js b/src/pages/signin/ChooseSSOOrMagicCode.js
index 7e63424b50c6..eaa3dfbb7667 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.js
+++ b/src/pages/signin/ChooseSSOOrMagicCode.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import _ from 'underscore';
 import Button from '@components/Button';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
@@ -16,6 +17,20 @@ import ROUTES from '@src/ROUTES';
 import ValidateCodeForm from './ValidateCodeForm';
 
 const propTypes = {
+    /** The details about the account that the user is signing in with */
+    account: PropTypes.shape({
+        /** Whether or not a sign on form is loading (being submitted) */
+        isLoading: PropTypes.bool,
+
+        /** Form that is being loaded */
+        loadingForm: PropTypes.oneOf(_.values(CONST.FORMS)),
+
+        /** Whether this account has 2FA enabled or not */
+        requiresTwoFactorAuth: PropTypes.bool,
+
+        /** Server-side errors in the submitted authentication code */
+        errors: PropTypes.objectOf(PropTypes.string),
+    }),
     /** Function that returns whether the user is using SAML or magic codes to log in */
     setIsUsingMagicCode: PropTypes.func.isRequired,
     /** Determines if user is switched to using recovery code instead of 2fa code */
@@ -24,13 +39,17 @@ const propTypes = {
     setIsUsingRecoveryCode: PropTypes.func.isRequired,
 };
 
-const defaultProps = {};
+const defaultProps = {
+    account: {},
+};
 
-function ChooseSSOOrMagicCode({setIsUsingMagicCode, isUsingRecoveryCode, setIsUsingRecoveryCode}) {
+function ChooseSSOOrMagicCode({account, setIsUsingMagicCode, isUsingRecoveryCode, setIsUsingRecoveryCode}) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {isSmallScreenWidth} = useWindowDimensions();
+    const loginTextAfterMagicCode = isUsingRecoveryCode ? translate('validateCodeForm.enterRecoveryCode') : translate('validateCodeForm.enterAuthenticatorCode');
+    const loginText = account.requiresTwoFactorAuth ? loginTextAfterMagicCode : translate('samlSignIn.orContinueWithMagicCode');
 
     return (
         <>
@@ -47,15 +66,14 @@ function ChooseSSOOrMagicCode({setIsUsingMagicCode, isUsingRecoveryCode, setIsUs
                 />
 
                 <View style={[styles.mt5]}>
-                    <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>
-                        {translate('samlSignIn.orContinueWithMagicCode')}
-                    </Text>
+                    <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{loginText}</Text>
                 </View>
 
                 <ValidateCodeForm
                     setIsUsingMagicCode={setIsUsingMagicCode}
                     isUsingRecoveryCode={isUsingRecoveryCode}
                     setIsUsingRecoveryCode={setIsUsingRecoveryCode}
+                    account={account}
                 />
             </View>
         </>
@@ -66,4 +84,4 @@ ChooseSSOOrMagicCode.propTypes = propTypes;
 ChooseSSOOrMagicCode.defaultProps = defaultProps;
 ChooseSSOOrMagicCode.displayName = 'ChooseSSOOrMagicCode';
 
-export default withOnyx()(ChooseSSOOrMagicCode);
+export default withOnyx({account: {key: ONYXKEYS.ACCOUNT}})(ChooseSSOOrMagicCode);
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 06e391137649..54d43b9833f4 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -273,7 +273,6 @@ function SignInPageInner({credentials, account, isInModal, activeClients, prefer
                         {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
                         {shouldShowChooseSSOOrMagicCode && (
                             <ChooseSSOOrMagicCode
-                                isUsingMagicCode={isUsingMagicCode}
                                 setIsUsingMagicCode={setIsUsingMagicCode}
                                 isUsingRecoveryCode={isUsingRecoveryCode}
                                 setIsUsingRecoveryCode={setIsUsingRecoveryCode}
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
index 03db6d3436cf..e6eaa30767ad 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
@@ -2,7 +2,7 @@ import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
+import Onyx, {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import Button from '@components/Button';
 import FormHelpMessage from '@components/FormHelpMessage';
@@ -58,6 +58,8 @@ const propTypes = {
         authToken: PropTypes.string,
     }),
 
+    magicCodeTimeRemaining: PropTypes.number,
+
     /** Information about the network */
     network: networkPropTypes.isRequired,
 
@@ -73,12 +75,15 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
+const defaultMagicCodeTimeRemaining = 30;
+
 const defaultProps = {
     account: {},
     credentials: {},
     session: {
         authToken: null,
     },
+    magicCodeTimeRemaining: defaultMagicCodeTimeRemaining,
 };
 
 function BaseValidateCodeForm(props) {
@@ -88,7 +93,7 @@ function BaseValidateCodeForm(props) {
     const [formError, setFormError] = useState({});
     const [validateCode, setValidateCode] = useState(props.credentials.validateCode || '');
     const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
-    const [timeRemaining, setTimeRemaining] = useState(30);
+    const [timeRemaining, setTimeRemaining] = useState(props.magicCodeTimeRemaining);
     const [recoveryCode, setRecoveryCode] = useState('');
 
     const prevRequiresTwoFactorAuth = usePrevious(props.account.requiresTwoFactorAuth);
@@ -150,6 +155,8 @@ function BaseValidateCodeForm(props) {
         if (timeRemaining > 0) {
             timerRef.current = setTimeout(() => {
                 setTimeRemaining(timeRemaining - 1);
+                // eslint-disable-next-line rulesdir/prefer-actions-set-data
+                Onyx.set(ONYXKEYS.MAGIC_CODE_TIME_REMAINING, timeRemaining - 1);
             }, 1000);
         }
         return () => {
@@ -415,6 +422,7 @@ export default compose(
         account: {key: ONYXKEYS.ACCOUNT},
         credentials: {key: ONYXKEYS.CREDENTIALS},
         session: {key: ONYXKEYS.SESSION},
+        magicCodeTimeRemaining: {key: ONYXKEYS.MAGIC_CODE_TIME_REMAINING},
     }),
     withNetwork(),
 )(BaseValidateCodeForm);

From 2b5248bd09793adb2174f68fac97584ad19b1afd Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Tue, 26 Dec 2023 12:34:44 -0400
Subject: [PATCH 006/383] Fixed merge issues

---
 src/pages/signin/ChooseSSOOrMagicCode.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.js b/src/pages/signin/ChooseSSOOrMagicCode.js
index eaa3dfbb7667..62edc4c91182 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.js
+++ b/src/pages/signin/ChooseSSOOrMagicCode.js
@@ -10,7 +10,6 @@ import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
-import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';

From 628467e9068eaf7175a58c24b8662852b9c8b446 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Mon, 4 Mar 2024 10:34:01 -0400
Subject: [PATCH 007/383] Fixed merge conflics and issues

---
 src/pages/signin/ChooseSSOOrMagicCode.tsx | 52 +++++++----------------
 src/pages/signin/SignInPage.tsx           |  1 -
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.tsx b/src/pages/signin/ChooseSSOOrMagicCode.tsx
index 7a39df332611..6aac41bccce4 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.tsx
+++ b/src/pages/signin/ChooseSSOOrMagicCode.tsx
@@ -3,43 +3,39 @@ import {Keyboard, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Button from '@components/Button';
-import FormHelpMessage from '@components/FormHelpMessage';
 import Text from '@components/Text';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import * as Session from '@userActions/Session';
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Account, Credentials} from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
-import Terms from './Terms';
+import type {Account} from '@src/types/onyx';
+import ValidateCodeForm from './ValidateCodeForm';
 
 type ChooseSSOOrMagicCodeOnyxProps = {
-    /** The credentials of the logged in person */
-    credentials: OnyxEntry<Credentials>;
-
     /** The details about the account that the user is signing in with */
     account: OnyxEntry<Account>;
 };
 
 type ChooseSSOOrMagicCodeProps = ChooseSSOOrMagicCodeOnyxProps & {
-    /** Function that returns whether the user is using SAML or magic codes to log in */
-    setIsUsingMagicCode: (value: boolean) => void;
+    /** Determines if user is switched to using recovery code instead of 2fa code */
+    isUsingRecoveryCode: boolean;
+
+    /** Function to change `isUsingRecoveryCode` state when user toggles between 2fa code and recovery code */
+    setIsUsingRecoveryCode: (value: boolean) => void;
 };
 
-function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}: ChooseSSOOrMagicCodeProps) {
+function ChooseSSOOrMagicCode({account, isUsingRecoveryCode, setIsUsingRecoveryCode}: ChooseSSOOrMagicCodeProps) {
     const styles = useThemeStyles();
     const {isKeyboardShown} = useKeyboardState();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {isSmallScreenWidth} = useWindowDimensions();
+    const loginTextAfterMagicCode = isUsingRecoveryCode ? translate('validateCodeForm.enterRecoveryCode') : translate('validateCodeForm.enterAuthenticatorCode');
+    const loginText = account?.requiresTwoFactorAuth ? loginTextAfterMagicCode : translate('samlSignIn.orContinueWithMagicCode');
 
     // This view doesn't have a field for user input, so dismiss the device keyboard if shown
     useEffect(() => {
@@ -58,33 +54,20 @@ function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}: Choos
                     success
                     style={[styles.mv3]}
                     text={translate('samlSignIn.useSingleSignOn')}
-                    isLoading={account?.isLoading}
                     onPress={() => {
                         Navigation.navigate(ROUTES.SAML_SIGN_IN);
                     }}
                 />
 
                 <View style={[styles.mt5]}>
-                    <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>
-                        {translate('samlSignIn.orContinueWithMagicCode')}
-                    </Text>
+                    <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{loginText}</Text>
                 </View>
 
-                <Button
-                    isDisabled={isOffline}
-                    style={[styles.mv3]}
-                    text={translate('samlSignIn.useMagicCode')}
-                    isLoading={account?.isLoading && account?.loadingForm === (account?.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM)}
-                    onPress={() => {
-                        Session.resendValidateCode(credentials?.login);
-                        setIsUsingMagicCode(true);
-                    }}
+                <ValidateCodeForm
+                    isVisible
+                    isUsingRecoveryCode={isUsingRecoveryCode}
+                    setIsUsingRecoveryCode={setIsUsingRecoveryCode}
                 />
-                {!!account && !isEmptyObject(account.errors) && <FormHelpMessage message={ErrorUtils.getLatestErrorMessage(account)} />}
-                <ChangeExpensifyLoginLink onPress={() => Session.clearSignInData()} />
-            </View>
-            <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
-                <Terms />
             </View>
         </>
     );
@@ -92,7 +75,4 @@ function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}: Choos
 
 ChooseSSOOrMagicCode.displayName = 'ChooseSSOOrMagicCode';
 
-export default withOnyx<ChooseSSOOrMagicCodeProps, ChooseSSOOrMagicCodeOnyxProps>({
-    credentials: {key: ONYXKEYS.CREDENTIALS},
-    account: {key: ONYXKEYS.ACCOUNT},
-})(ChooseSSOOrMagicCode);
+export default withOnyx<ChooseSSOOrMagicCodeProps, ChooseSSOOrMagicCodeOnyxProps>({account: {key: ONYXKEYS.ACCOUNT}})(ChooseSSOOrMagicCode);
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 7600c62392eb..94a4ce1f7951 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -281,7 +281,6 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
                         {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
                         {shouldShowChooseSSOOrMagicCode && (
                             <ChooseSSOOrMagicCode
-                                setIsUsingMagicCode={setIsUsingMagicCode}
                                 isUsingRecoveryCode={isUsingRecoveryCode}
                                 setIsUsingRecoveryCode={setIsUsingRecoveryCode}
                             />

From e0413db0c504daca3d7bab67ecc3f47adaf404ff Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Mon, 4 Mar 2024 11:35:10 -0400
Subject: [PATCH 008/383] Fixed lint issue

---
 src/pages/signin/ChooseSSOOrMagicCode.tsx | 42 +++++++++++------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.tsx b/src/pages/signin/ChooseSSOOrMagicCode.tsx
index 6aac41bccce4..33cb081fb5c8 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.tsx
+++ b/src/pages/signin/ChooseSSOOrMagicCode.tsx
@@ -46,30 +46,28 @@ function ChooseSSOOrMagicCode({account, isUsingRecoveryCode, setIsUsingRecoveryC
     }, [isKeyboardShown]);
 
     return (
-        <>
-            <View>
-                <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{translate('samlSignIn.welcomeSAMLEnabled')}</Text>
-                <Button
-                    isDisabled={isOffline}
-                    success
-                    style={[styles.mv3]}
-                    text={translate('samlSignIn.useSingleSignOn')}
-                    onPress={() => {
-                        Navigation.navigate(ROUTES.SAML_SIGN_IN);
-                    }}
-                />
+        <View>
+            <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{translate('samlSignIn.welcomeSAMLEnabled')}</Text>
+            <Button
+                isDisabled={isOffline}
+                success
+                style={[styles.mv3]}
+                text={translate('samlSignIn.useSingleSignOn')}
+                onPress={() => {
+                    Navigation.navigate(ROUTES.SAML_SIGN_IN);
+                }}
+            />
 
-                <View style={[styles.mt5]}>
-                    <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{loginText}</Text>
-                </View>
-
-                <ValidateCodeForm
-                    isVisible
-                    isUsingRecoveryCode={isUsingRecoveryCode}
-                    setIsUsingRecoveryCode={setIsUsingRecoveryCode}
-                />
+            <View style={[styles.mt5]}>
+                <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{loginText}</Text>
             </View>
-        </>
+
+            <ValidateCodeForm
+                isVisible
+                isUsingRecoveryCode={isUsingRecoveryCode}
+                setIsUsingRecoveryCode={setIsUsingRecoveryCode}
+            />
+        </View>
     );
 }
 

From c423527466ca883908319c4d55834b1ecb98cd10 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Mon, 18 Mar 2024 14:42:57 -0400
Subject: [PATCH 009/383] Removed keyboard validation that dismiss the device
 keyboard if shown, because now we have a field for user input

---
 src/pages/signin/ChooseSSOOrMagicCode.tsx | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/pages/signin/ChooseSSOOrMagicCode.tsx b/src/pages/signin/ChooseSSOOrMagicCode.tsx
index e17afdea5910..3895b303020b 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.tsx
+++ b/src/pages/signin/ChooseSSOOrMagicCode.tsx
@@ -1,10 +1,9 @@
-import React, {useEffect} from 'react';
-import {Keyboard, View} from 'react-native';
+import React from 'react';
+import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Button from '@components/Button';
 import Text from '@components/Text';
-import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -30,21 +29,12 @@ type ChooseSSOOrMagicCodeProps = ChooseSSOOrMagicCodeOnyxProps & {
 
 function ChooseSSOOrMagicCode({account, isUsingRecoveryCode, setIsUsingRecoveryCode}: ChooseSSOOrMagicCodeProps) {
     const styles = useThemeStyles();
-    const {isKeyboardShown} = useKeyboardState();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {isSmallScreenWidth} = useWindowDimensions();
     const loginTextAfterMagicCode = isUsingRecoveryCode ? translate('validateCodeForm.enterRecoveryCode') : translate('validateCodeForm.enterAuthenticatorCode');
     const loginText = account?.requiresTwoFactorAuth ? loginTextAfterMagicCode : translate('samlSignIn.orContinueWithMagicCode');
 
-    // This view doesn't have a field for user input, so dismiss the device keyboard if shown
-    useEffect(() => {
-        if (!isKeyboardShown) {
-            return;
-        }
-        Keyboard.dismiss();
-    }, [isKeyboardShown]);
-
     return (
         <View>
             <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{translate('samlSignIn.welcomeSAMLEnabled')}</Text>

From ce8e379365fdafb576cf59d4dcca05657308c36d Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 19 Mar 2024 12:41:08 -0700
Subject: [PATCH 010/383] Basic handling for new ACTIONABLETRACKEXPENSEWHISPER

---
 src/CONST.ts                               |  3 ++-
 src/languages/en.ts                        |  6 +++++
 src/languages/es.ts                        |  6 +++++
 src/libs/ReportActionsUtils.ts             |  5 ++++
 src/pages/home/report/ReportActionItem.tsx | 29 ++++++++++++++++++++++
 src/types/onyx/OriginalMessage.ts          |  1 +
 6 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 43ccd6062505..183c2b2beefd 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -611,9 +611,10 @@ const CONST = {
             LIMIT: 50,
             // OldDot Actions render getMessage from Web-Expensify/lib/Report/Action PHP files via getMessageOfOldDotReportAction in ReportActionsUtils.ts
             TYPE: {
+                ACTIONABLEJOINREQUEST: 'ACTIONABLEJOINREQUEST',
                 ACTIONABLEMENTIONWHISPER: 'ACTIONABLEMENTIONWHISPER',
+                ACTIONABLETRACKEXPENSEWHISPER: 'ACTIONABLETRACKEXPENSEWHISPER',
                 ADDCOMMENT: 'ADDCOMMENT',
-                ACTIONABLEJOINREQUEST: 'ACTIONABLEJOINREQUEST',
                 APPROVED: 'APPROVED',
                 CHANGEFIELD: 'CHANGEFIELD', // OldDot Action
                 CHANGEPOLICY: 'CHANGEPOLICY', // OldDot Action
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 9bf33638d880..45502177aa27 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2371,6 +2371,12 @@ export default {
         accept: 'Accept',
         decline: 'Decline',
     },
+    actionableMentionTrackExpense: {
+        request: 'Request someone to pay it',
+        categorize: 'Categorize it',
+        share: 'Share it with my accountant',
+        nothing: 'Nothing for now'
+    },
     teachersUnitePage: {
         teachersUnite: 'Teachers Unite',
         joinExpensifyOrg: 'Join Expensify.org in eliminating injustice around the world and help teachers split their expenses for classrooms in need!',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b4d7465244b7..249717f3ef23 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2840,6 +2840,12 @@ export default {
         accept: 'Aceptar',
         decline: 'Rechazar',
     },
+    actionableMentionTrackExpense: {
+        request: 'Request someone to pay it',
+        categorize: 'Categorize it',
+        share: 'Share it with my accountant',
+        nothing: 'Nothing for now'
+    },
     moderation: {
         flagDescription: 'Todos los mensajes marcados se enviarán a un moderador para su revisión.',
         chooseAReason: 'Elige abajo un motivo para reportarlo:',
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 206c3ecd75a6..9a0cb2ac6fb5 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -943,6 +943,10 @@ function isActionableJoinRequest(reportAction: OnyxEntry<ReportAction>): boolean
     return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLEJOINREQUEST;
 }
 
+function isActionableTrackExpense(reportAction: OnyxEntry<ReportAction>): boolean {
+    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLETRACKEXPENSEWHISPER;
+}
+
 /**
  * Checks if any report actions correspond to a join request action that is still pending.
  * @param reportID
@@ -1025,6 +1029,7 @@ export {
     isCurrentActionUnread,
     isActionableJoinRequest,
     isActionableJoinRequestPending,
+    isActionableTrackExpense,
 };
 
 export type {LastVisibleMessage};
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 85e66cac3324..d41ac9ecf783 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -370,6 +370,35 @@ function ReportActionItem({
             return [];
         }
 
+        if (ReportActionUtils.isActionableTrackExpense()) {
+            return [
+                {
+                    text: 'actionableMentionTrackExpense.request',
+                    key: `${action.reportActionID}-actionableMentionTrackExpense-request`,
+                    onPress: () => console.log('Track'),
+                    isPrimary: true,
+                },
+                {
+                    text: 'actionableMentionTrackExpense.categorize',
+                    key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`,
+                    onPress: () => console.log('Categorize'),
+                    isPrimary: true,
+                },
+                {
+                    text: 'actionableMentionTrackExpense.share',
+                    key: `${action.reportActionID}-actionableMentionTrackExpense-share`,
+                    onPress: () => console.log('Share'),
+                    isPrimary: true,
+                },
+                {
+                    text: 'actionableMentionTrackExpense.nothing',
+                    key: `${action.reportActionID}-actionableMentionTrackExpense-nothing`,
+                    onPress: () => console.log('Nothing'),
+                    isPrimary: true,
+                },
+            ];
+        }
+
         if (ReportActionsUtils.isActionableJoinRequest(action)) {
             return [
                 {
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index e3ba941482a0..9b28b5aae8af 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -25,6 +25,7 @@ type OriginalMessageActionName =
     | 'TASKREOPENED'
     | 'ACTIONABLEJOINREQUEST'
     | 'ACTIONABLEMENTIONWHISPER'
+    | 'ACTIONABLETRACKEXPENSEWHISPER'
     | ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG>;
 type OriginalMessageApproved = {
     actionName: typeof CONST.REPORT.ACTIONS.TYPE.APPROVED;

From cb398c2eba7a8adb1d8ffaf8cb814029e9121af6 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 19 Mar 2024 12:48:30 -0700
Subject: [PATCH 011/383] Show buttons

---
 src/pages/home/report/ContextMenu/ContextMenuActions.tsx | 5 ++++-
 src/pages/home/report/ReportActionItem.tsx               | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index c5ab9bbff1f5..5687a5202bac 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -376,7 +376,10 @@ const ContextMenuActions: ContextMenuAction[] = [
                 } else if (ReportActionsUtils.isActionableMentionWhisper(reportAction)) {
                     const mentionWhisperMessage = ReportActionsUtils.getActionableMentionWhisperMessage(reportAction);
                     setClipboardMessage(mentionWhisperMessage);
-                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
+                } else if (ReportActionsUtils.isActionableTrackExpense(reportAction)) {
+                    setClipboardMessage("What would you like to do with this expense?");
+                }
+                else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
                     Clipboard.setString(Localize.translateLocal('iou.heldRequest', {comment: reportAction.message?.[1]?.text ?? ''}));
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
                     Clipboard.setString(Localize.translateLocal('iou.unheldRequest'));
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index d41ac9ecf783..bda9a7241570 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -366,11 +366,11 @@ function ReportActionItem({
         const isWhisperResolution = (action?.originalMessage as OriginalMessageActionableMentionWhisper['originalMessage'])?.resolution !== null;
         const isJoinChoice = (action?.originalMessage as OriginalMessageJoinPolicyChangeLog['originalMessage'])?.choice === '';
 
-        if (!((ReportActionsUtils.isActionableMentionWhisper(action) && isWhisperResolution) || (ReportActionsUtils.isActionableJoinRequest(action) && isJoinChoice))) {
+        if (!((ReportActionsUtils.isActionableMentionWhisper(action) && isWhisperResolution) || (ReportActionsUtils.isActionableJoinRequest(action) && isJoinChoice) || ReportActionsUtils.isActionableTrackExpense(action))) {
             return [];
         }
 
-        if (ReportActionUtils.isActionableTrackExpense()) {
+        if (ReportActionsUtils.isActionableTrackExpense(action)) {
             return [
                 {
                     text: 'actionableMentionTrackExpense.request',

From bb4483fb5877b1121137e650c603896212d47844 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 21 Mar 2024 02:15:17 +0530
Subject: [PATCH 012/383] adds a draft transaction while moving a tracked to
 request someone

---
 .../ActionableItemButtons.tsx                 |  8 +-
 src/languages/en.ts                           |  2 +-
 src/languages/es.ts                           |  2 +-
 src/libs/Permissions.ts                       |  2 +-
 src/libs/ReportUtils.ts                       | 12 +++
 src/libs/TransactionUtils.ts                  |  4 +-
 .../report/ContextMenu/ContextMenuActions.tsx |  5 +-
 src/pages/home/report/ReportActionItem.tsx    | 75 +++++++++++--------
 8 files changed, 68 insertions(+), 42 deletions(-)

diff --git a/src/components/ReportActionItem/ActionableItemButtons.tsx b/src/components/ReportActionItem/ActionableItemButtons.tsx
index 6ead20d3e643..8e5590537f51 100644
--- a/src/components/ReportActionItem/ActionableItemButtons.tsx
+++ b/src/components/ReportActionItem/ActionableItemButtons.tsx
@@ -10,10 +10,12 @@ type ActionableItem = {
     key: string;
     onPress: () => void;
     text: TranslationPaths;
+    isMediumSized?: boolean;
 };
 
 type ActionableItemButtonsProps = {
     items: ActionableItem[];
+    layout?: 'horizontal' | 'vertical';
 };
 
 function ActionableItemButtons(props: ActionableItemButtonsProps) {
@@ -21,14 +23,14 @@ function ActionableItemButtons(props: ActionableItemButtonsProps) {
     const {translate} = useLocalize();
 
     return (
-        <View style={[styles.flexRow, styles.gap2]}>
+        <View style={[props.layout === 'horizontal' ? styles.flexRow : [styles.flexColumn, styles.alignItemsStart], styles.gap2, styles.mt2]}>
             {props.items?.map((item) => (
                 <Button
                     key={item.key}
-                    style={[styles.mt2]}
                     onPress={item.onPress}
                     text={translate(item.text)}
-                    small
+                    small={!item.isMediumSized}
+                    medium={item.isMediumSized}
                     success={item.isPrimary}
                 />
             ))}
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 45502177aa27..b383bd7a98c3 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2375,7 +2375,7 @@ export default {
         request: 'Request someone to pay it',
         categorize: 'Categorize it',
         share: 'Share it with my accountant',
-        nothing: 'Nothing for now'
+        nothing: 'Nothing for now',
     },
     teachersUnitePage: {
         teachersUnite: 'Teachers Unite',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 249717f3ef23..d25fe3266356 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2844,7 +2844,7 @@ export default {
         request: 'Request someone to pay it',
         categorize: 'Categorize it',
         share: 'Share it with my accountant',
-        nothing: 'Nothing for now'
+        nothing: 'Nothing for now',
     },
     moderation: {
         flagDescription: 'Todos los mensajes marcados se enviarán a un moderador para su revisión.',
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 071113a70fae..5cd408ce0572 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -3,7 +3,7 @@ import CONST from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ALL);
+    return true;
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 40be4cc9f3a3..122163703a4e 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -52,6 +52,7 @@ import type {Receipt, TransactionChanges, WaypointCollection} from '@src/types/o
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
+import * as TransactionEdit from '@userActions/TransactionEdit';
 import * as store from './actions/ReimbursementAccount/store';
 import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
@@ -5423,6 +5424,16 @@ function hasActionsWithErrors(reportID: string): boolean {
     return Object.values(reportActions ?? {}).some((action) => !isEmptyObject(action.errors));
 }
 
+function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string) {
+    const transaction = getTransaction(transactionID);
+    if (isEmpty(transaction)) {
+        return;
+    }
+    TransactionEdit.createBackupTransaction(transaction as Transaction);
+
+    Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID))
+}
+
 export {
     getReportParticipantsTitle,
     isReportMessageAttachment,
@@ -5636,6 +5647,7 @@ export {
     shouldCreateNewMoneyRequestReport,
     isTrackExpenseReport,
     hasActionsWithErrors,
+    createDraftTransactionAndNavigateToParticipantSelector,
 };
 
 export type {
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index bc94c8fee8fc..ae012add6063 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -257,9 +257,9 @@ function getDescription(transaction: OnyxEntry<Transaction>): string {
 /**
  * Return the amount field from the transaction, return the modifiedAmount if present.
  */
-function getAmount(transaction: OnyxEntry<Transaction>, isFromExpenseReport = false): number {
+function getAmount(transaction: OnyxEntry<Transaction>, isFromExpenseReport = false, isFromTrackedExpense = false): number {
     // IOU requests cannot have negative values, but they can be stored as negative values, let's return absolute value
-    if (!isFromExpenseReport) {
+    if (!isFromExpenseReport || isFromTrackedExpense) {
         const amount = transaction?.modifiedAmount ?? 0;
         if (amount) {
             return Math.abs(amount);
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index 5687a5202bac..8b94a94d231e 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -377,9 +377,8 @@ const ContextMenuActions: ContextMenuAction[] = [
                     const mentionWhisperMessage = ReportActionsUtils.getActionableMentionWhisperMessage(reportAction);
                     setClipboardMessage(mentionWhisperMessage);
                 } else if (ReportActionsUtils.isActionableTrackExpense(reportAction)) {
-                    setClipboardMessage("What would you like to do with this expense?");
-                }
-                else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
+                    setClipboardMessage('What would you like to do with this expense?');
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
                     Clipboard.setString(Localize.translateLocal('iou.heldRequest', {comment: reportAction.message?.[1]?.text ?? ''}));
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
                     Clipboard.setString(Localize.translateLocal('iou.unheldRequest'));
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index bda9a7241570..0f4fb3d3fdc1 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -1,10 +1,10 @@
 import lodashIsEqual from 'lodash/isEqual';
-import React, {memo, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
-import type {GestureResponderEvent, TextInput} from 'react-native';
-import {InteractionManager, View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import type {Emoji} from '@assets/emojis/types';
+import React, { memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import type { GestureResponderEvent, TextInput } from 'react-native';
+import { InteractionManager, View } from 'react-native';
+import type { OnyxCollection, OnyxEntry } from 'react-native-onyx';
+import { withOnyx } from 'react-native-onyx';
+import type { Emoji } from '@assets/emojis/types';
 import Button from '@components/Button';
 import DisplayNames from '@components/DisplayNames';
 import Hoverable from '@components/Hoverable';
@@ -13,11 +13,11 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import InlineSystemMessage from '@components/InlineSystemMessage';
 import KYCWall from '@components/KYCWall';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import {useBlockedFromConcierge, usePersonalDetails, useReportActionsDrafts} from '@components/OnyxProvider';
+import { useBlockedFromConcierge, usePersonalDetails, useReportActionsDrafts } from '@components/OnyxProvider';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 import ReportActionItemEmojiReactions from '@components/Reactions/ReportActionItemEmojiReactions';
 import RenderHTML from '@components/RenderHTML';
-import type {ActionableItem} from '@components/ReportActionItem/ActionableItemButtons';
+import type { ActionableItem } from '@components/ReportActionItem/ActionableItemButtons';
 import ActionableItemButtons from '@components/ReportActionItem/ActionableItemButtons';
 import ChronosOOOListActions from '@components/ReportActionItem/ChronosOOOListActions';
 import MoneyReportView from '@components/ReportActionItem/MoneyReportView';
@@ -28,7 +28,7 @@ import ReportPreview from '@components/ReportActionItem/ReportPreview';
 import TaskAction from '@components/ReportActionItem/TaskAction';
 import TaskPreview from '@components/ReportActionItem/TaskPreview';
 import TaskView from '@components/ReportActionItem/TaskView';
-import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
+import { ShowContextMenuContext } from '@components/ShowContextMenuContext';
 import Text from '@components/Text';
 import UnreadActionIndicator from '@components/UnreadActionIndicator';
 import useLocalize from '@hooks/useLocalize';
@@ -49,7 +49,7 @@ import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SelectionScraper from '@libs/SelectionScraper';
-import {ReactionListContext} from '@pages/home/ReportScreenContext';
+import { ReactionListContext } from '@pages/home/ReportScreenContext';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
 import * as Policy from '@userActions/Policy';
@@ -58,16 +58,16 @@ import * as ReportActions from '@userActions/ReportActions';
 import * as Session from '@userActions/Session';
 import * as User from '@userActions/User';
 import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
+import type { TranslationPaths } from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {OriginalMessageActionableMentionWhisper, OriginalMessageJoinPolicyChangeLog} from '@src/types/onyx/OriginalMessage';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import type { OriginalMessageActionableMentionWhisper, OriginalMessageJoinPolicyChangeLog } from '@src/types/onyx/OriginalMessage';
+import { isEmptyObject } from '@src/types/utils/EmptyObject';
 import AnimatedEmptyStateBackground from './AnimatedEmptyStateBackground';
 import MiniReportActionContextMenu from './ContextMenu/MiniReportActionContextMenu';
 import * as ReportActionContextMenu from './ContextMenu/ReportActionContextMenu';
-import {hideContextMenu} from './ContextMenu/ReportActionContextMenu';
+import { hideContextMenu } from './ContextMenu/ReportActionContextMenu';
 import LinkPreviewer from './LinkPreviewer';
 import ReportActionItemBasicMessage from './ReportActionItemBasicMessage';
 import ReportActionItemCreated from './ReportActionItemCreated';
@@ -161,8 +161,8 @@ function ReportActionItem({
     policy,
     onPress = undefined,
 }: ReportActionItemProps) {
-    const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const { translate } = useLocalize();
+    const { isSmallScreenWidth } = useWindowDimensions();
     const blockedFromConcierge = useBlockedFromConcierge();
     const reportActionDrafts = useReportActionsDrafts();
     const draftMessage = useMemo(() => getDraftMessage(reportActionDrafts, report.reportID, action), [action, report.reportID, reportActionDrafts]);
@@ -176,7 +176,7 @@ function ReportActionItem({
     const [isHidden, setIsHidden] = useState(false);
     const [moderationDecision, setModerationDecision] = useState<OnyxTypes.DecisionName>(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
     const reactionListRef = useContext(ReactionListContext);
-    const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
+    const { updateHiddenAttachments } = useContext(ReportAttachmentsContext);
     const textInputRef = useRef<TextInput & HTMLTextAreaElement>();
     const popoverAnchorRef = useRef<ReportActionContextMenu.ContextMenuAnchor>(null);
     const downloadedPreviews = useRef<string[]>([]);
@@ -366,7 +366,13 @@ function ReportActionItem({
         const isWhisperResolution = (action?.originalMessage as OriginalMessageActionableMentionWhisper['originalMessage'])?.resolution !== null;
         const isJoinChoice = (action?.originalMessage as OriginalMessageJoinPolicyChangeLog['originalMessage'])?.choice === '';
 
-        if (!((ReportActionsUtils.isActionableMentionWhisper(action) && isWhisperResolution) || (ReportActionsUtils.isActionableJoinRequest(action) && isJoinChoice) || ReportActionsUtils.isActionableTrackExpense(action))) {
+        if (
+            !(
+                (ReportActionsUtils.isActionableMentionWhisper(action) && isWhisperResolution) ||
+                (ReportActionsUtils.isActionableJoinRequest(action) && isJoinChoice) ||
+                ReportActionsUtils.isActionableTrackExpense(action)
+            )
+        ) {
             return [];
         }
 
@@ -375,26 +381,28 @@ function ReportActionItem({
                 {
                     text: 'actionableMentionTrackExpense.request',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-request`,
-                    onPress: () => console.log('Track'),
-                    isPrimary: true,
+                    onPress: () => {
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(action?.originalMessage?.transactionID, report.reportID);
+                    },
+                    isMediumSized: true,
                 },
                 {
                     text: 'actionableMentionTrackExpense.categorize',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`,
                     onPress: () => console.log('Categorize'),
-                    isPrimary: true,
+                    isMediumSized: true,
                 },
                 {
                     text: 'actionableMentionTrackExpense.share',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-share`,
                     onPress: () => console.log('Share'),
-                    isPrimary: true,
+                    isMediumSized: true,
                 },
                 {
                     text: 'actionableMentionTrackExpense.nothing',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-nothing`,
                     onPress: () => console.log('Nothing'),
-                    isPrimary: true,
+                    isMediumSized: true,
                 },
             ];
         }
@@ -505,7 +513,7 @@ function ReportActionItem({
             const missingPaymentMethod = ReportUtils.getIndicatedMissingPaymentMethod(userWallet, report.reportID, action);
             children = (
                 <ReportActionItemBasicMessage
-                    message={translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnabledWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
+                    message={translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnabledWallet' : 'iou.waitingOnBankAccount', { submitterDisplayName })}
                 >
                     <>
                         {missingPaymentMethod === 'bankAccount' && (
@@ -550,7 +558,7 @@ function ReportActionItem({
             // This handles all historical actions from OldDot that we just want to display the message text
             children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMessageOfOldDotReportAction(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
-            children = <ReportActionItemBasicMessage message={translate('iou.heldRequest', {comment: action.message?.[1].text ?? ''})} />;
+            children = <ReportActionItemBasicMessage message={translate('iou.heldRequest', { comment: action.message?.[1].text ?? '' })} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
             children = <ReportActionItemBasicMessage message={translate('iou.unheldRequest')} />;
         } else {
@@ -575,7 +583,7 @@ function ReportActionItem({
                                 >
                                     <Text
                                         style={[styles.buttonSmallText, styles.userSelectNone]}
-                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                        dataSet={{ [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true }}
                                     >
                                         {isHidden ? translate('moderation.revealMessage') : translate('moderation.hideMessage')}
                                     </Text>
@@ -586,7 +594,12 @@ function ReportActionItem({
                                 for example: Invite a user mentioned but not a member of the room
                                 https://github.com/Expensify/App/issues/32741
                             */}
-                            {actionableItemButtons.length > 0 && <ActionableItemButtons items={actionableItemButtons} />}
+                            {actionableItemButtons.length > 0 && (
+                                <ActionableItemButtons
+                                    items={actionableItemButtons}
+                                    layout={ReportActionsUtils.isActionableTrackExpense(action) ? 'vertical' : 'horizontal'}
+                                />
+                            )}
                         </View>
                     ) : (
                         <ReportActionItemMessageEdit
@@ -914,22 +927,22 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
         initialValue: CONST.EMOJI_DEFAULT_SKIN_TONE,
     },
     iouReport: {
-        key: ({action}) => {
+        key: ({ action }) => {
             const iouReportID = ReportActionsUtils.getIOUReportIDFromReportActionPreview(action);
             return `${ONYXKEYS.COLLECTION.REPORT}${iouReportID ?? 0}`;
         },
         initialValue: {} as OnyxTypes.Report,
     },
     policyReportFields: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_REPORT_FIELDS}${report.policyID ?? 0}`,
+        key: ({ report }) => `${ONYXKEYS.COLLECTION.POLICY_REPORT_FIELDS}${report.policyID ?? 0}`,
         initialValue: {},
     },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID ?? 0}`,
+        key: ({ report }) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID ?? 0}`,
         initialValue: {} as OnyxTypes.Policy,
     },
     emojiReactions: {
-        key: ({action}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
+        key: ({ action }) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
         initialValue: {},
     },
     userWallet: {

From 3566460ccd2aa92e0f78a9b82d31a21f2eb62016 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 20 Mar 2024 00:45:01 +0100
Subject: [PATCH 013/383] add multitag regex

---
 src/CONST.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CONST.ts b/src/CONST.ts
index 3c53f083abac..a3fd483255a4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1655,6 +1655,10 @@ const CONST = {
 
         MERGED_ACCOUNT_PREFIX: /^(MERGED_\d+@)/,
 
+        get MULTI_LEVEL_TAG() {
+            return new RegExp("/\\{1,2}:/g");
+        },
+
         ROUTES: {
             VALIDATE_LOGIN: /\/v($|(\/\/*))/,
             UNLINK_LOGIN: /\/u($|(\/\/*))/,

From 04d2b5962b3d77bc25b65dc0053585427163658e Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 20 Mar 2024 00:59:48 +0100
Subject: [PATCH 014/383] introducted a new boolean agrument, defaulted to
 false, callled excludeMultiLevelTags for the getTagLists function

---
 src/libs/PolicyUtils.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 39e6c8932aad..45e5aa03760f 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -188,13 +188,15 @@ function getTagListName(policyTagList: OnyxEntry<PolicyTagList>, tagIndex: numbe
 /**
  * Gets all tag lists of a policy
  */
-function getTagLists(policyTagList: OnyxEntry<PolicyTagList>): Array<PolicyTagList[keyof PolicyTagList]> {
+function getTagLists(policyTagList: OnyxEntry<PolicyTagList>, excludeMultiLevelTags = false): Array<PolicyTagList[keyof PolicyTagList]> {
     if (isEmptyObject(policyTagList)) {
         return [];
     }
 
+    const regex = new RegExp(CONST.REGEX.MULTI_LEVEL_TAG, `/\\{1,2}:/g`);
+
     return Object.values(policyTagList)
-        .filter((policyTagListValue) => policyTagListValue !== null)
+        .filter((policyTagListValue) => policyTagListValue !== null && (!excludeMultiLevelTags || regex.test(policyTagListValue.name)))
         .sort((tagA, tagB) => tagA.orderWeight - tagB.orderWeight);
 }
 

From cbd67a509ec7230569bf924dec7a47bea45647bf Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 20 Mar 2024 01:31:18 +0100
Subject: [PATCH 015/383] introducted a new boolean agrument, defaulted to
 false, callled excludeMultiLevelTags for the getTagLists function

---
 src/libs/PolicyUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 45e5aa03760f..7a34ae22f023 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -196,7 +196,7 @@ function getTagLists(policyTagList: OnyxEntry<PolicyTagList>, excludeMultiLevelT
     const regex = new RegExp(CONST.REGEX.MULTI_LEVEL_TAG, `/\\{1,2}:/g`);
 
     return Object.values(policyTagList)
-        .filter((policyTagListValue) => policyTagListValue !== null && (!excludeMultiLevelTags || regex.test(policyTagListValue.name)))
+        .filter((policyTagListValue) => !(!policyTagListValue || excludeMultiLevelTags || regex.test(policyTagListValue.name)))
         .sort((tagA, tagB) => tagA.orderWeight - tagB.orderWeight);
 }
 

From 3dc48b4e97f9427f0d459a6da5fdce76df758e77 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Thu, 21 Mar 2024 15:55:25 +0300
Subject: [PATCH 016/383] Removing multitags

---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 392d392c55ef..860b47d615ec 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -76,6 +76,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
             policyTagLists
                 .map((policyTagList) =>
                     Object.values(policyTagList.tags || [])
+                        .filter((value) => value.name == getCleanTagName(value.name))
                         .sort((a, b) => localeCompare(a.name, b.name))
                         .map((value) => ({
                             value: value.name,

From 3c73312640b3fe60b3d050a98ab76d60754b7b5f Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Thu, 21 Mar 2024 14:15:47 +0100
Subject: [PATCH 017/383] fix

---
 src/libs/PolicyUtils.ts                       | 34 +++----------------
 .../workspace/tags/WorkspaceTagsPage.tsx      |  2 +-
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 7a34ae22f023..f7f83f1cfbcb 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -4,8 +4,7 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetailsList, Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
-import type {PolicyFeatureName} from '@src/types/onyx/Policy';
+import type {PersonalDetailsList, Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags} from '@src/types/onyx';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import Navigation from './Navigation/Navigation';
@@ -35,7 +34,7 @@ function hasPolicyMemberError(policyMembers: OnyxEntry<PolicyMembers>): boolean
  *  Check if the policy has any tax rate errors.
  */
 function hasTaxRateError(policy: OnyxEntry<Policy>): boolean {
-    return Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0 || Object.values(taxRate?.errorFields ?? {}).some(Boolean));
+    return Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0);
 }
 
 /**
@@ -188,15 +187,13 @@ function getTagListName(policyTagList: OnyxEntry<PolicyTagList>, tagIndex: numbe
 /**
  * Gets all tag lists of a policy
  */
-function getTagLists(policyTagList: OnyxEntry<PolicyTagList>, excludeMultiLevelTags = false): Array<PolicyTagList[keyof PolicyTagList]> {
+function getTagLists(policyTagList: OnyxEntry<PolicyTagList> ): Array<PolicyTagList[keyof PolicyTagList]> {
     if (isEmptyObject(policyTagList)) {
         return [];
     }
 
-    const regex = new RegExp(CONST.REGEX.MULTI_LEVEL_TAG, `/\\{1,2}:/g`);
-
     return Object.values(policyTagList)
-        .filter((policyTagListValue) => !(!policyTagListValue || excludeMultiLevelTags || regex.test(policyTagListValue.name)))
+        .filter((policyTagListValue) => policyTagListValue !== null)
         .sort((tagA, tagB) => tagA.orderWeight - tagB.orderWeight);
 }
 
@@ -279,26 +276,6 @@ function goBackFromInvalidPolicy() {
     Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
 }
 
-/** Get a tax with given ID from policy */
-function getTaxByID(policy: OnyxEntry<Policy>, taxID: string): TaxRate | undefined {
-    return policy?.taxRates?.taxes?.[taxID];
-}
-
-/**
- * Whether the tax rate can be deleted and disabled
- */
-function canEditTaxRate(policy: Policy, taxID: string): boolean {
-    return policy.taxRates?.defaultExternalID !== taxID;
-}
-
-function isPolicyFeatureEnabled(policy: OnyxEntry<Policy> | EmptyObject, featureName: PolicyFeatureName): boolean {
-    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
-        return Boolean(policy?.tax?.trackingEnabled);
-    }
-
-    return Boolean(policy?.[featureName]);
-}
-
 export {
     getActivePolicies,
     hasAccountingConnections,
@@ -319,7 +296,6 @@ export {
     getIneligibleInvitees,
     getTagLists,
     getTagListName,
-    canEditTaxRate,
     getTagList,
     getCleanedTagName,
     getCountOfEnabledTagsOfList,
@@ -330,9 +306,7 @@ export {
     getPathWithoutPolicyID,
     getPolicyMembersByIdWithoutCurrentUser,
     goBackFromInvalidPolicy,
-    isPolicyFeatureEnabled,
     hasTaxRateError,
-    getTaxByID,
     hasPolicyCategoriesError,
 };
 
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index d19604608bbb..0b0758affd93 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -84,7 +84,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
             policyTagLists
                 .map((policyTagList) =>
                     Object.values(policyTagList.tags || [])
-                        .filter((value) => value.name == getCleanTagName(value.name))
+                        .filter((value) => value.name === PolicyUtils.getCleanedTagName(value.name))
                         .sort((a, b) => localeCompare(a.name, b.name))
                         .map((value) => ({
                             value: value.name,

From 5461f4cba0ec67d0d7bff03b287357880049333e Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 21 Mar 2024 18:53:35 +0530
Subject: [PATCH 018/383] adds route param for move iou action

---
 src/CONST.ts                                  |  1 +
 src/ROUTES.ts                                 | 10 ++--
 src/libs/ReportUtils.ts                       |  4 +-
 src/pages/home/report/ReportActionItem.tsx    | 46 +++++++++----------
 .../step/IOURequestStepParticipants.js        |  6 +--
 .../step/withFullTransactionOrNotFound.js     |  2 +-
 src/types/onyx/OriginalMessage.ts             | 10 +++-
 7 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index fce3186656e4..1915b8b27e9e 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1341,6 +1341,7 @@ const CONST = {
         ACTION: {
             EDIT: 'edit',
             CREATE: 'create',
+            MOVE: 'move',
         },
         DEFAULT_AMOUNT: 0,
         TYPE: {
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 1f802c5036e3..bcc92bef0bcc 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -313,8 +313,8 @@ const ROUTES = {
         getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string) => `create/${iouType}/start/${transactionID}/${reportID}` as const,
     },
     MONEY_REQUEST_STEP_CONFIRMATION: {
-        route: 'create/:iouType/confirmation/:transactionID/:reportID',
-        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string) => `create/${iouType}/confirmation/${transactionID}/${reportID}` as const,
+        route: ':action/:iouType/confirmation/:transactionID/:reportID',
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, action: ValueOf<typeof CONST.IOU.ACTION> = 'create') => `${action}/${iouType}/confirmation/${transactionID}/${reportID}` as const,
     },
     MONEY_REQUEST_STEP_AMOUNT: {
         route: 'create/:iouType/amount/:transactionID/:reportID',
@@ -362,9 +362,9 @@ const ROUTES = {
             getUrlWithBackToParam(`${action}/${iouType}/merchant/${transactionID}/${reportID}`, backTo),
     },
     MONEY_REQUEST_STEP_PARTICIPANTS: {
-        route: 'create/:iouType/participants/:transactionID/:reportID',
-        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
-            getUrlWithBackToParam(`create/${iouType}/participants/${transactionID}/${reportID}`, backTo),
+        route: ':action/:iouType/participants/:transactionID/:reportID',
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '', action: ValueOf<typeof CONST.IOU.ACTION> = 'create') =>
+            getUrlWithBackToParam(`${action}/${iouType}/participants/${transactionID}/${reportID}`, backTo),
     },
     MONEY_REQUEST_STEP_SCAN: {
         route: ':action/:iouType/scan/:transactionID/:reportID',
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index fa3af1a049bd..8d3317d2dceb 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -12,6 +12,7 @@ import type {ValueOf} from 'type-fest';
 import type {FileObject} from '@components/AttachmentModal';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as defaultWorkspaceAvatars from '@components/Icon/WorkspaceDefaultAvatars';
+import * as TransactionEdit from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {ParentNavigationSummaryParams, TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -51,7 +52,6 @@ import type {Receipt, TransactionChanges, WaypointCollection} from '@src/types/o
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
-import * as TransactionEdit from '@userActions/TransactionEdit';
 import * as store from './actions/ReimbursementAccount/store';
 import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
@@ -5453,7 +5453,7 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
     }
     TransactionEdit.createBackupTransaction(transaction as Transaction);
 
-    Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID))
+    Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID, undefined, CONST.IOU.ACTION.MOVE));
 }
 
 export {
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 2fdbb8d61088..3fb64ca3f5c9 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -1,10 +1,10 @@
 import lodashIsEqual from 'lodash/isEqual';
-import React, { memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
-import type { GestureResponderEvent, TextInput } from 'react-native';
-import { InteractionManager, View } from 'react-native';
-import type { OnyxCollection, OnyxEntry } from 'react-native-onyx';
-import { withOnyx } from 'react-native-onyx';
-import type { Emoji } from '@assets/emojis/types';
+import React, {memo, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
+import type {GestureResponderEvent, TextInput} from 'react-native';
+import {InteractionManager, View} from 'react-native';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import type {Emoji} from '@assets/emojis/types';
 import Button from '@components/Button';
 import DisplayNames from '@components/DisplayNames';
 import Hoverable from '@components/Hoverable';
@@ -13,11 +13,11 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import InlineSystemMessage from '@components/InlineSystemMessage';
 import KYCWall from '@components/KYCWall';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import { useBlockedFromConcierge, usePersonalDetails, useReportActionsDrafts } from '@components/OnyxProvider';
+import {useBlockedFromConcierge, usePersonalDetails, useReportActionsDrafts} from '@components/OnyxProvider';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 import ReportActionItemEmojiReactions from '@components/Reactions/ReportActionItemEmojiReactions';
 import RenderHTML from '@components/RenderHTML';
-import type { ActionableItem } from '@components/ReportActionItem/ActionableItemButtons';
+import type {ActionableItem} from '@components/ReportActionItem/ActionableItemButtons';
 import ActionableItemButtons from '@components/ReportActionItem/ActionableItemButtons';
 import ChronosOOOListActions from '@components/ReportActionItem/ChronosOOOListActions';
 import MoneyReportView from '@components/ReportActionItem/MoneyReportView';
@@ -28,7 +28,7 @@ import ReportPreview from '@components/ReportActionItem/ReportPreview';
 import TaskAction from '@components/ReportActionItem/TaskAction';
 import TaskPreview from '@components/ReportActionItem/TaskPreview';
 import TaskView from '@components/ReportActionItem/TaskView';
-import { ShowContextMenuContext } from '@components/ShowContextMenuContext';
+import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
 import Text from '@components/Text';
 import UnreadActionIndicator from '@components/UnreadActionIndicator';
 import useLocalize from '@hooks/useLocalize';
@@ -49,7 +49,7 @@ import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SelectionScraper from '@libs/SelectionScraper';
-import { ReactionListContext } from '@pages/home/ReportScreenContext';
+import {ReactionListContext} from '@pages/home/ReportScreenContext';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
 import * as Policy from '@userActions/Policy';
@@ -58,16 +58,16 @@ import * as ReportActions from '@userActions/ReportActions';
 import * as Session from '@userActions/Session';
 import * as User from '@userActions/User';
 import CONST from '@src/CONST';
-import type { TranslationPaths } from '@src/languages/types';
+import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type { OriginalMessageActionableMentionWhisper, OriginalMessageJoinPolicyChangeLog } from '@src/types/onyx/OriginalMessage';
-import { isEmptyObject } from '@src/types/utils/EmptyObject';
+import type {OriginalMessageActionableMentionWhisper, OriginalMessageJoinPolicyChangeLog} from '@src/types/onyx/OriginalMessage';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import AnimatedEmptyStateBackground from './AnimatedEmptyStateBackground';
 import MiniReportActionContextMenu from './ContextMenu/MiniReportActionContextMenu';
 import * as ReportActionContextMenu from './ContextMenu/ReportActionContextMenu';
-import { hideContextMenu } from './ContextMenu/ReportActionContextMenu';
+import {hideContextMenu} from './ContextMenu/ReportActionContextMenu';
 import LinkPreviewer from './LinkPreviewer';
 import ReportActionItemBasicMessage from './ReportActionItemBasicMessage';
 import ReportActionItemCreated from './ReportActionItemCreated';
@@ -157,8 +157,8 @@ function ReportActionItem({
     policy,
     onPress = undefined,
 }: ReportActionItemProps) {
-    const { translate } = useLocalize();
-    const { isSmallScreenWidth } = useWindowDimensions();
+    const {translate} = useLocalize();
+    const {isSmallScreenWidth} = useWindowDimensions();
     const blockedFromConcierge = useBlockedFromConcierge();
     const reportActionDrafts = useReportActionsDrafts();
     const draftMessage = useMemo(() => getDraftMessage(reportActionDrafts, report.reportID, action), [action, report.reportID, reportActionDrafts]);
@@ -172,7 +172,7 @@ function ReportActionItem({
     const [isHidden, setIsHidden] = useState(false);
     const [moderationDecision, setModerationDecision] = useState<OnyxTypes.DecisionName>(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
     const reactionListRef = useContext(ReactionListContext);
-    const { updateHiddenAttachments } = useContext(ReportAttachmentsContext);
+    const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
     const textInputRef = useRef<TextInput & HTMLTextAreaElement>();
     const popoverAnchorRef = useRef<ReportActionContextMenu.ContextMenuAnchor>(null);
     const downloadedPreviews = useRef<string[]>([]);
@@ -509,7 +509,7 @@ function ReportActionItem({
             const missingPaymentMethod = ReportUtils.getIndicatedMissingPaymentMethod(userWallet, report.reportID, action);
             children = (
                 <ReportActionItemBasicMessage
-                    message={translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnabledWallet' : 'iou.waitingOnBankAccount', { submitterDisplayName })}
+                    message={translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnabledWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
                 >
                     <>
                         {missingPaymentMethod === 'bankAccount' && (
@@ -554,7 +554,7 @@ function ReportActionItem({
             // This handles all historical actions from OldDot that we just want to display the message text
             children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMessageOfOldDotReportAction(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
-            children = <ReportActionItemBasicMessage message={translate('iou.heldRequest', { comment: action.message?.[1].text ?? '' })} />;
+            children = <ReportActionItemBasicMessage message={translate('iou.heldRequest', {comment: action.message?.[1].text ?? ''})} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
             children = <ReportActionItemBasicMessage message={translate('iou.unheldRequest')} />;
         } else {
@@ -579,7 +579,7 @@ function ReportActionItem({
                                 >
                                     <Text
                                         style={[styles.buttonSmallText, styles.userSelectNone]}
-                                        dataSet={{ [CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true }}
+                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                     >
                                         {isHidden ? translate('moderation.revealMessage') : translate('moderation.hideMessage')}
                                     </Text>
@@ -922,18 +922,18 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
         initialValue: CONST.EMOJI_DEFAULT_SKIN_TONE,
     },
     iouReport: {
-        key: ({ action }) => {
+        key: ({action}) => {
             const iouReportID = ReportActionsUtils.getIOUReportIDFromReportActionPreview(action);
             return `${ONYXKEYS.COLLECTION.REPORT}${iouReportID ?? 0}`;
         },
         initialValue: {} as OnyxTypes.Report,
     },
     policy: {
-        key: ({ report }) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID ?? 0}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID ?? 0}`,
         initialValue: {} as OnyxTypes.Policy,
     },
     emojiReactions: {
-        key: ({ action }) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
+        key: ({action}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
         initialValue: {},
     },
     userWallet: {
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index 5ca465d8fb78..fda6403d6cea 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -32,7 +32,7 @@ const defaultProps = {
 
 function IOURequestStepParticipants({
     route: {
-        params: {iouType, reportID, transactionID},
+        params: {iouType, reportID, transactionID, action: iouAction},
     },
     transaction,
     transaction: {participants = []},
@@ -128,9 +128,9 @@ function IOURequestStepParticipants({
 
             IOU.setMoneyRequestTag(transactionID, '');
             IOU.setMoneyRequestCategory(transactionID, '');
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(nextStepIOUType, transactionID, selectedReportID.current || reportID));
+            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(nextStepIOUType, transactionID, selectedReportID.current || reportID, iouAction));
         },
-        [iouType, transactionID, reportID],
+        [iouType, transactionID, reportID, iouAction],
     );
 
     const navigateBack = useCallback(() => {
diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.js b/src/pages/iou/request/step/withFullTransactionOrNotFound.js
index 7cdbb3484999..25ae6a63e45d 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.js
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.js
@@ -71,7 +71,7 @@ export default function (WrappedComponent) {
             key: ({route}) => {
                 const transactionID = lodashGet(route, 'params.transactionID', 0);
                 const userAction = lodashGet(route, 'params.action', CONST.IOU.ACTION.CREATE);
-                return `${userAction === CONST.IOU.ACTION.CREATE ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+                return `${[CONST.IOU.ACTION.CREATE, CONST.IOU.ACTION.MOVE].includes(userAction) ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
             },
         },
     })(WithFullTransactionOrNotFoundWithRef);
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 9b28b5aae8af..08a8e45b0b63 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -276,6 +276,13 @@ type OriginalMessageReimbursementQueued = {
     };
 };
 
+type OriginalMessageTrackedExpenseWhisper = {
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLETRACKEXPENSEWHISPER;
+    originalMessage: {
+        transactionID: string;
+    };
+};
+
 type OriginalMessageReimbursementDequeued = {
     actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENTDEQUEUED;
     originalMessage: {
@@ -314,7 +321,8 @@ type OriginalMessage =
     | OriginalMessageReimbursementQueued
     | OriginalMessageReimbursementDequeued
     | OriginalMessageMoved
-    | OriginalMessageMarkedReimbursed;
+    | OriginalMessageMarkedReimbursed
+    | OriginalMessageTrackedExpenseWhisper;
 
 export default OriginalMessage;
 export type {

From 6dbefcfad1a8b0189754aaee634b87d51cb59a51 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Thu, 21 Mar 2024 15:31:28 +0100
Subject: [PATCH 019/383] fix

---
 src/libs/PolicyUtils.ts                        | 2 +-
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index f7f83f1cfbcb..675e268045c1 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -187,7 +187,7 @@ function getTagListName(policyTagList: OnyxEntry<PolicyTagList>, tagIndex: numbe
 /**
  * Gets all tag lists of a policy
  */
-function getTagLists(policyTagList: OnyxEntry<PolicyTagList> ): Array<PolicyTagList[keyof PolicyTagList]> {
+function getTagLists(policyTagList: OnyxEntry<PolicyTagList>): Array<PolicyTagList[keyof PolicyTagList]> {
     if (isEmptyObject(policyTagList)) {
         return [];
     }
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 0b0758affd93..46417f445bf8 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -84,8 +84,8 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
             policyTagLists
                 .map((policyTagList) =>
                     Object.values(policyTagList.tags || [])
-                        .filter((value) => value.name === PolicyUtils.getCleanedTagName(value.name))
                         .sort((a, b) => localeCompare(a.name, b.name))
+                        .filter((value) => PolicyUtils.getCleanedTagName(value.name) === value.name)
                         .map((value) => ({
                             value: value.name,
                             text: value.name,

From cb96df9e670a724043bafa8b39e2c585b1ef37e8 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Thu, 21 Mar 2024 15:39:20 +0100
Subject: [PATCH 020/383] Refactoring ...

---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index a355cc062f3d..46417f445bf8 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -85,6 +85,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
                 .map((policyTagList) =>
                     Object.values(policyTagList.tags || [])
                         .sort((a, b) => localeCompare(a.name, b.name))
+                        .filter((value) => PolicyUtils.getCleanedTagName(value.name) === value.name)
                         .map((value) => ({
                             value: value.name,
                             text: value.name,

From 0099a3987b5b02fb77137753932a6a7f7e50c325 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 00:39:37 +0530
Subject: [PATCH 021/383] fixes routes

---
 src/ROUTES.ts                                 | 12 ++++++------
 ...oraryForRefactorRequestConfirmationList.js | 19 ++++++++++++-------
 src/libs/IOUUtils.ts                          |  6 +++++-
 .../iou/request/step/IOURequestStepAmount.js  |  4 ++--
 .../step/IOURequestStepConfirmation.js        |  6 ++++--
 .../step/IOURequestStepParticipants.js        |  4 ++--
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 1c013cd919a0..24463ebb5668 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -314,9 +314,9 @@ const ROUTES = {
         getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, action: ValueOf<typeof CONST.IOU.ACTION> = 'create') => `${action}/${iouType}/confirmation/${transactionID}/${reportID}` as const,
     },
     MONEY_REQUEST_STEP_AMOUNT: {
-        route: 'create/:iouType/amount/:transactionID/:reportID',
-        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
-            getUrlWithBackToParam(`create/${iouType}/amount/${transactionID}/${reportID}`, backTo),
+        route: ':action/:iouType/amount/:transactionID/:reportID',
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '', action: ValueOf<typeof CONST.IOU.ACTION>= 'create') =>
+            getUrlWithBackToParam(`${action}/${iouType}/amount/${transactionID}/${reportID}`, backTo),
     },
     MONEY_REQUEST_STEP_TAX_RATE: {
         route: 'create/:iouType/taxRate/:transactionID/:reportID?',
@@ -334,9 +334,9 @@ const ROUTES = {
             getUrlWithBackToParam(`${action}/${iouType}/category/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo),
     },
     MONEY_REQUEST_STEP_CURRENCY: {
-        route: 'create/:iouType/currency/:transactionID/:reportID/:pageIndex?',
-        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, pageIndex = '', backTo = '') =>
-            getUrlWithBackToParam(`create/${iouType}/currency/${transactionID}/${reportID}/${pageIndex}`, backTo),
+        route: ':action/:iouType/currency/:transactionID/:reportID/:pageIndex?',
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, pageIndex = '', backTo = '', action:ValueOf<typeof CONST.IOU.ACTION> = 'create') =>
+            getUrlWithBackToParam(`${action}/${iouType}/currency/${transactionID}/${reportID}/${pageIndex}`, backTo),
     },
     MONEY_REQUEST_STEP_DATE: {
         route: ':action/:iouType/date/:transactionID/:reportID',
diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index f27cd507d668..02faf21826ad 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -170,6 +170,9 @@ const propTypes = {
 
     /** Transaction that represents the money request */
     transaction: transactionPropTypes,
+
+    /** The action of the IOU */
+    iouAction: PropTypes.string,
 };
 
 const defaultProps = {
@@ -202,6 +205,7 @@ const defaultProps = {
     isDistanceRequest: false,
     shouldShowSmartScanFields: true,
     isPolicyExpenseChat: false,
+    iouAction: CONST.IOU.ACTION.CREATE,
 };
 
 function MoneyTemporaryForRefactorRequestConfirmationList({
@@ -242,6 +246,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
     session: {accountID},
     shouldShowSmartScanFields,
     transaction,
+    iouAction,
 }) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -685,7 +690,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                             Navigation.navigate(ROUTES.EDIT_SPLIT_BILL.getRoute(reportID, reportActionID, CONST.EDIT_REQUEST_FIELD.AMOUNT));
                             return;
                         }
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams(), iouAction));
                     }}
                     style={[styles.moneyRequestMenuItem, styles.mt2]}
                     titleStyle={styles.moneyRequestConfirmationAmount}
@@ -707,7 +712,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     description={translate('common.description')}
                     onPress={() => {
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
                         );
                     }}
                     style={[styles.moneyRequestMenuItem]}
@@ -731,7 +736,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() =>
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
                         )
                     }
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -753,7 +758,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() => {
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
                         );
                     }}
                     disabled={didConfirm}
@@ -777,7 +782,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() => {
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
                         );
                     }}
                     disabled={didConfirm}
@@ -799,7 +804,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     numberOfLinesTitle={2}
                     onPress={() =>
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
                         )
                     }
                     style={[styles.moneyRequestMenuItem]}
@@ -822,7 +827,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     numberOfLinesTitle={2}
                     onPress={() =>
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(CONST.IOU.ACTION.CREATE, iouType, index, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(iouAction, iouType, index, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
                         )
                     }
                     style={[styles.moneyRequestMenuItem]}
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index 65390982f18c..ce75a4e56e7a 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -7,7 +7,11 @@ import * as CurrencyUtils from './CurrencyUtils';
 import Navigation from './Navigation/Navigation';
 import * as TransactionUtils from './TransactionUtils';
 
-function navigateToStartMoneyRequestStep(requestType: ValueOf<typeof CONST.IOU.REQUEST_TYPE>, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string) {
+function navigateToStartMoneyRequestStep(requestType: ValueOf<typeof CONST.IOU.REQUEST_TYPE>, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, iouAction?: ValueOf<typeof CONST.IOU.ACTION>): void {
+    if(iouAction === CONST.IOU.ACTION.MOVE) {
+        Navigation.goBack();
+        return;
+    }
     // If the participants were automatically added to the transaction, then the user needs taken back to the starting step
     switch (requestType) {
         case CONST.IOU.REQUEST_TYPE.DISTANCE:
diff --git a/src/pages/iou/request/step/IOURequestStepAmount.js b/src/pages/iou/request/step/IOURequestStepAmount.js
index 9fdd2bea24f4..76c8e18c94a9 100644
--- a/src/pages/iou/request/step/IOURequestStepAmount.js
+++ b/src/pages/iou/request/step/IOURequestStepAmount.js
@@ -67,7 +67,7 @@ const getTaxAmount = (transaction, defaultTaxValue, amount) => {
 function IOURequestStepAmount({
     report,
     route: {
-        params: {iouType, reportID, transactionID, backTo},
+        params: {iouType, reportID, transactionID, backTo, action: iouAction},
     },
     transaction,
     transaction: {currency},
@@ -117,7 +117,7 @@ function IOURequestStepAmount({
     };
 
     const navigateToCurrencySelectionPage = () => {
-        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CURRENCY.getRoute(iouType, transactionID, reportID, backTo ? 'confirm' : '', Navigation.getActiveRouteWithoutParams()));
+        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CURRENCY.getRoute(iouType, transactionID, reportID, backTo ? 'confirm' : '', Navigation.getActiveRouteWithoutParams(), iouAction));
     };
 
     /**
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 435121a76028..29eae5c58331 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import {format} from 'date-fns';
 import _ from 'underscore';
 import categoryPropTypes from '@components/categoryPropTypes';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
@@ -81,7 +82,7 @@ function IOURequestStepConfirmation({
     policyCategories,
     report,
     route: {
-        params: {iouType, reportID, transactionID},
+        params: {iouType, reportID, transactionID, action: iouAction},
     },
     transaction,
 }) {
@@ -546,9 +547,10 @@ function IOURequestStepConfirmation({
                             policyID={report.policyID}
                             bankAccountRoute={ReportUtils.getBankAccountRoute(report)}
                             iouMerchant={transaction.merchant}
-                            iouCreated={transaction.created}
+                            iouCreated={format(new Date(transaction.created), 'yyyy-MM-dd')}
                             isDistanceRequest={requestType === CONST.IOU.REQUEST_TYPE.DISTANCE}
                             shouldShowSmartScanFields={requestType !== CONST.IOU.REQUEST_TYPE.SCAN}
+                            iouAction={iouAction}
                         />
                     </View>
                 </View>
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index fda6403d6cea..117309e57ea4 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -134,8 +134,8 @@ function IOURequestStepParticipants({
     );
 
     const navigateBack = useCallback(() => {
-        IOUUtils.navigateToStartMoneyRequestStep(iouRequestType, iouType, transactionID, reportID);
-    }, [iouRequestType, iouType, transactionID, reportID]);
+        IOUUtils.navigateToStartMoneyRequestStep(iouRequestType, iouType, transactionID, reportID, iouAction);
+    }, [iouRequestType, iouType, transactionID, reportID, iouAction]);
 
     return (
         <StepScreenWrapper

From a3dc485fb6aadf78aee4eab59c4502a398c93dda Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 01:18:12 +0530
Subject: [PATCH 022/383] adds dismiss actionable whisper

---
 src/libs/API/types.ts                      |   2 +
 src/libs/ReportUtils.ts                    |   1 +
 src/libs/actions/Report.ts                 | 281 ++++++++++++---------
 src/pages/home/report/ReportActionItem.tsx |   9 +-
 src/types/onyx/OriginalMessage.ts          |   2 +
 5 files changed, 175 insertions(+), 120 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 9d6e6b3929b8..ef6d529fb2c0 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -193,6 +193,7 @@ const WRITE_COMMANDS = {
     UPDATE_POLICY_DISTANCE_RATE_VALUE: 'UpdatePolicyDistanceRateValue',
     SET_POLICY_DISTANCE_RATES_ENABLED: 'SetPolicyDistanceRatesEnabled',
     DELETE_POLICY_DISTANCE_RATES: 'DeletePolicyDistanceRates',
+    DISMISS_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -384,6 +385,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED]: Parameters.SetPolicyDistanceRatesEnabledParams;
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
+    [WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER]: Parameters.DismissActionableWhisperParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 17edac3164e3..1853324fe4e9 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5516,6 +5516,7 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
     if (isEmpty(transaction)) {
         return;
     }
+
     TransactionEdit.createBackupTransaction(transaction as Transaction);
 
     Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID, undefined, CONST.IOU.ACTION.MOVE));
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 93154bfff16b..2766c78979d4 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1,13 +1,13 @@
-import {format as timezoneFormat, utcToZonedTime} from 'date-fns-tz';
+import { format as timezoneFormat, utcToZonedTime } from 'date-fns-tz';
 import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import Str from 'expensify-common/lib/str';
 import isEmpty from 'lodash/isEmpty';
-import {DeviceEventEmitter, InteractionManager, Linking} from 'react-native';
-import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import { DeviceEventEmitter, InteractionManager, Linking } from 'react-native';
+import type { NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate } from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type {PartialDeep, ValueOf} from 'type-fest';
-import type {Emoji} from '@assets/emojis/types';
-import type {FileObject} from '@components/AttachmentModal';
+import type { PartialDeep, ValueOf } from 'type-fest';
+import type { Emoji } from '@assets/emojis/types';
+import type { FileObject } from '@components/AttachmentModal';
 import * as ActiveClientManager from '@libs/ActiveClientManager';
 import * as API from '@libs/API';
 import type {
@@ -42,7 +42,7 @@ import type {
     UpdateRoomDescriptionParams,
 } from '@libs/API/parameters';
 import type UpdateRoomVisibilityParams from '@libs/API/parameters/UpdateRoomVisibilityParams';
-import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import { READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS } from '@libs/API/types';
 import * as CollectionUtils from '@libs/CollectionUtils';
 import DateUtils from '@libs/DateUtils';
 import * as EmojiUtils from '@libs/EmojiUtils';
@@ -54,30 +54,30 @@ import LocalNotification from '@libs/Notification/LocalNotification';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PhoneNumber from '@libs/PhoneNumber';
 import getPolicyMemberAccountIDs from '@libs/PolicyMembersUtils';
-import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
+import { extractPolicyIDFromPath } from '@libs/PolicyUtils';
 import processReportIDDeeplink from '@libs/processReportIDDeeplink';
 import * as Pusher from '@libs/Pusher/pusher';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
-import type {OptimisticAddCommentReportAction} from '@libs/ReportUtils';
+import { doesReportBelongToWorkspace } from '@libs/ReportUtils';
+import type { OptimisticAddCommentReportAction } from '@libs/ReportUtils';
 import shouldSkipDeepLinkNavigation from '@libs/shouldSkipDeepLinkNavigation';
 import * as UserUtils from '@libs/UserUtils';
 import Visibility from '@libs/Visibility';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Route} from '@src/ROUTES';
+import type { Route } from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/NewRoomForm';
-import type {PersonalDetails, PersonalDetailsList, PolicyReportField, RecentlyUsedReportFields, ReportActionReactions, ReportMetadata, ReportUserIsTyping} from '@src/types/onyx';
-import type {Decision, OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
-import type {NotificationPreference, RoomVisibility, WriteCapability} from '@src/types/onyx/Report';
+import type { PersonalDetails, PersonalDetailsList, PolicyReportField, RecentlyUsedReportFields, ReportActionReactions, ReportMetadata, ReportUserIsTyping } from '@src/types/onyx';
+import type { Decision, OriginalMessageIOU } from '@src/types/onyx/OriginalMessage';
+import type { NotificationPreference, RoomVisibility, WriteCapability } from '@src/types/onyx/Report';
 import type Report from '@src/types/onyx/Report';
-import type {Message, ReportActionBase, ReportActions} from '@src/types/onyx/ReportAction';
+import type { Message, ReportActionBase, ReportActions } from '@src/types/onyx/ReportAction';
 import type ReportAction from '@src/types/onyx/ReportAction';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import type { EmptyObject } from '@src/types/utils/EmptyObject';
+import { isEmptyObject } from '@src/types/utils/EmptyObject';
 import * as CachedPDFPaths from './CachedPDFPaths';
 import * as Modal from './Modal';
 import * as Session from './Session';
@@ -217,7 +217,7 @@ function getNormalizedStatus(typingStatus: Pusher.UserIsTypingEvent | Pusher.Use
     let normalizedStatus: ReportUserIsTyping;
 
     if (typingStatus.userLogin) {
-        normalizedStatus = {[typingStatus.userLogin]: true};
+        normalizedStatus = { [typingStatus.userLogin]: true };
     } else {
         normalizedStatus = typingStatus;
     }
@@ -264,7 +264,7 @@ function subscribeToReportTypingEvents(reportID: string) {
             delete typingWatchTimers[reportUserIdentifier];
         }, 1500);
     }).catch((error) => {
-        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
+        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', { errorType: error.type, pusherChannelName });
     });
 }
 
@@ -295,7 +295,7 @@ function subscribeToReportLeavingEvents(reportID: string) {
 
         Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, true);
     }).catch((error) => {
-        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
+        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', { errorType: error.type, pusherChannelName });
     });
 }
 
@@ -334,7 +334,7 @@ let newActionSubscribers: ActionSubscriber[] = [];
  * @returns Remove subscriber for report id
  */
 function subscribeToNewActionEvent(reportID: string, callback: SubscriberCallback): () => void {
-    newActionSubscribers.push({callback, reportID});
+    newActionSubscribers.push({ callback, reportID });
     return () => {
         newActionSubscribers = newActionSubscribers.filter((subscriber) => subscriber.reportID !== reportID);
     };
@@ -436,7 +436,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
     const successReportActions: OnyxCollection<NullishDeep<ReportAction>> = {};
 
     Object.entries(optimisticReportActions).forEach(([actionKey]) => {
-        successReportActions[actionKey] = {pendingAction: null, isOptimisticAction: null};
+        successReportActions[actionKey] = { pendingAction: null, isOptimisticAction: null };
     });
 
     const successData: OnyxUpdate[] = [
@@ -452,7 +452,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         lastMessageText: '',
         lastVisibleActionCreated: '',
     };
-    const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportActionsUtils.getLastVisibleMessage(reportID);
+    const { lastMessageText = '', lastMessageTranslationKey = '' } = ReportActionsUtils.getLastVisibleMessage(reportID);
     if (lastMessageText || lastMessageTranslationKey) {
         const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID);
         const lastVisibleActionCreated = lastVisibleAction?.created;
@@ -501,7 +501,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-            value: {[currentUserAccountID]: {timezone}},
+            value: { [currentUserAccountID]: { timezone } },
         });
         DateUtils.setTimezoneUpdated();
     }
@@ -556,8 +556,8 @@ function openReport(
     const optimisticReport = reportActionsExist(reportID)
         ? {}
         : {
-              reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
-          };
+            reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
+        };
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -649,13 +649,13 @@ function openReport(
         optimisticData.push({
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
+            value: { [optimisticCreatedAction.reportActionID]: optimisticCreatedAction },
         });
         successData.push(
             {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-                value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
+                value: { [optimisticCreatedAction.reportActionID]: { pendingAction: null } },
             },
             {
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -718,12 +718,12 @@ function openReport(
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
-                value: {[parentReportActionID]: {childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT}},
+                value: { [parentReportActionID]: { childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT } },
             });
             failureData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
-                value: {[parentReportActionID]: {childReportID: '0', childType: ''}},
+                value: { [parentReportActionID]: { childReportID: '0', childType: '' } },
             });
         }
     }
@@ -732,12 +732,12 @@ function openReport(
 
     if (isFromDeepLink) {
         // eslint-disable-next-line rulesdir/no-api-side-effects-method
-        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT, parameters, {optimisticData, successData, failureData}).finally(() => {
+        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT, parameters, { optimisticData, successData, failureData }).finally(() => {
             Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
         });
     } else {
         // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.OPEN_REPORT, parameters, {optimisticData, successData, failureData});
+        API.write(WRITE_COMMANDS.OPEN_REPORT, parameters, { optimisticData, successData, failureData });
     }
 }
 
@@ -763,7 +763,7 @@ function navigateToAndOpenReport(userLogins: string[], shouldDismissModal = true
     if (shouldDismissModal) {
         Navigation.dismissModalWithReport(report);
     } else {
-        Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
+        Navigation.navigateWithSwitchPolicyID({ route: ROUTES.HOME });
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
     }
 }
@@ -866,7 +866,7 @@ function reconnect(reportID: string) {
         reportID,
     };
 
-    API.write(WRITE_COMMANDS.RECONNECT_TO_REPORT, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.RECONNECT_TO_REPORT, parameters, { optimisticData, successData, failureData });
 }
 
 /**
@@ -909,7 +909,7 @@ function getOlderActions(reportID: string, reportActionID: string) {
         reportActionID,
     };
 
-    API.read(READ_COMMANDS.GET_OLDER_ACTIONS, parameters, {optimisticData, successData, failureData});
+    API.read(READ_COMMANDS.GET_OLDER_ACTIONS, parameters, { optimisticData, successData, failureData });
 }
 
 /**
@@ -952,7 +952,7 @@ function getNewerActions(reportID: string, reportActionID: string) {
         reportActionID,
     };
 
-    API.read(READ_COMMANDS.GET_NEWER_ACTIONS, parameters, {optimisticData, successData, failureData});
+    API.read(READ_COMMANDS.GET_NEWER_ACTIONS, parameters, { optimisticData, successData, failureData });
 }
 
 /**
@@ -986,7 +986,7 @@ function readNewestAction(reportID: string) {
         lastReadTime,
     };
 
-    API.write(WRITE_COMMANDS.READ_NEWEST_ACTION, parameters, {optimisticData});
+    API.write(WRITE_COMMANDS.READ_NEWEST_ACTION, parameters, { optimisticData });
     DeviceEventEmitter.emit(`readNewestAction_${reportID}`, lastReadTime);
 }
 
@@ -1027,7 +1027,7 @@ function markCommentAsUnread(reportID: string, reportActionCreated: string) {
         lastReadTime,
     };
 
-    API.write(WRITE_COMMANDS.MARK_AS_UNREAD, parameters, {optimisticData});
+    API.write(WRITE_COMMANDS.MARK_AS_UNREAD, parameters, { optimisticData });
     DeviceEventEmitter.emit(`unreadAction_${reportID}`, lastReadTime);
 }
 
@@ -1040,7 +1040,7 @@ function togglePinnedState(reportID: string, isPinnedChat: boolean) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {isPinned: pinnedValue},
+            value: { isPinned: pinnedValue },
         },
     ];
 
@@ -1049,7 +1049,7 @@ function togglePinnedState(reportID: string, isPinnedChat: boolean) {
         pinnedValue,
     };
 
-    API.write(WRITE_COMMANDS.TOGGLE_PINNED_CHAT, parameters, {optimisticData});
+    API.write(WRITE_COMMANDS.TOGGLE_PINNED_CHAT, parameters, { optimisticData });
 }
 
 /**
@@ -1067,7 +1067,7 @@ function saveReportCommentNumberOfLines(reportID: string, numberOfLines: number)
 
 /** Immediate indication whether the report has a draft comment. */
 function setReportWithDraft(reportID: string, hasDraft: boolean): Promise<void> {
-    return Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {hasDraft});
+    return Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { hasDraft });
 }
 
 /** Broadcasts whether or not a user is typing on a report over the report's private pusher channel. */
@@ -1164,7 +1164,7 @@ function deleteReportComment(reportID: string, reportAction: ReportAction) {
         lastMessageText: '',
         lastVisibleActionCreated: '',
     };
-    const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportUtils.getLastVisibleMessage(originalReportID, optimisticReportActions as ReportActions);
+    const { lastMessageText = '', lastMessageTranslationKey = '' } = ReportUtils.getLastVisibleMessage(originalReportID, optimisticReportActions as ReportActions);
     if (lastMessageText || lastMessageTranslationKey) {
         const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(originalReportID, optimisticReportActions as ReportActions);
         const lastVisibleActionCreated = lastVisibleAction?.created;
@@ -1238,7 +1238,7 @@ function deleteReportComment(reportID: string, reportAction: ReportAction) {
     };
 
     CachedPDFPaths.clearByKey(reportActionID);
-    API.write(WRITE_COMMANDS.DELETE_COMMENT, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.DELETE_COMMENT, parameters, { optimisticData, successData, failureData });
 }
 
 /**
@@ -1301,7 +1301,7 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
     // For longer comments, skip parsing and display plaintext for performance reasons. It takes over 40s to parse a 100k long string!!
     let parsedOriginalCommentHTML = originalCommentHTML;
     if (textForNewComment.length <= CONST.MAX_MARKUP_LENGTH) {
-        const autolinkFilter = {filterRules: parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink')};
+        const autolinkFilter = { filterRules: parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink') };
         parsedOriginalCommentHTML = parser.replace(originalCommentMarkdown, autolinkFilter);
     }
 
@@ -1387,19 +1387,19 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
         reportActionID,
     };
 
-    API.write(WRITE_COMMANDS.UPDATE_COMMENT, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.UPDATE_COMMENT, parameters, { optimisticData, successData, failureData });
 }
 
 /** Deletes the draft for a comment report action. */
 function deleteReportActionDraft(reportID: string, reportAction: ReportAction) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, {[reportAction.reportActionID]: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, { [reportAction.reportActionID]: null });
 }
 
 /** Saves the draft for a comment report action. This will put the comment into "edit mode" */
 function saveReportActionDraft(reportID: string, reportAction: ReportAction, draftMessage: string) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, {[reportAction.reportActionID]: {message: draftMessage}});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, { [reportAction.reportActionID]: { message: draftMessage } });
 }
 
 /** Saves the number of lines for the report action draft */
@@ -1427,7 +1427,7 @@ function updateNotificationPreference(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {notificationPreference: newValue},
+            value: { notificationPreference: newValue },
         },
     ];
 
@@ -1435,7 +1435,7 @@ function updateNotificationPreference(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {notificationPreference: previousValue},
+            value: { notificationPreference: previousValue },
         },
     ];
 
@@ -1443,18 +1443,18 @@ function updateNotificationPreference(
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`,
-            value: {[parentReportActionID]: {childReportNotificationPreference: newValue}},
+            value: { [parentReportActionID]: { childReportNotificationPreference: newValue } },
         });
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`,
-            value: {[parentReportActionID]: {childReportNotificationPreference: previousValue}},
+            value: { [parentReportActionID]: { childReportNotificationPreference: previousValue } },
         });
     }
 
-    const parameters: UpdateReportNotificationPreferenceParams = {reportID, notificationPreference: newValue};
+    const parameters: UpdateReportNotificationPreferenceParams = { reportID, notificationPreference: newValue };
 
-    API.write(WRITE_COMMANDS.UPDATE_REPORT_NOTIFICATION_PREFERENCE, parameters, {optimisticData, failureData});
+    API.write(WRITE_COMMANDS.UPDATE_REPORT_NOTIFICATION_PREFERENCE, parameters, { optimisticData, failureData });
     if (navigate && !isEmptyObject(report)) {
         ReportUtils.goBackToDetailsPage(report);
     }
@@ -1472,7 +1472,7 @@ function updateRoomVisibility(reportID: string, previousValue: RoomVisibility |
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {visibility: newValue},
+            value: { visibility: newValue },
         },
     ];
 
@@ -1480,13 +1480,13 @@ function updateRoomVisibility(reportID: string, previousValue: RoomVisibility |
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {visibility: previousValue},
+            value: { visibility: previousValue },
         },
     ];
 
-    const parameters: UpdateRoomVisibilityParams = {reportID, visibility: newValue};
+    const parameters: UpdateRoomVisibilityParams = { reportID, visibility: newValue };
 
-    API.write(WRITE_COMMANDS.UPDATE_ROOM_VISIBILITY, parameters, {optimisticData, failureData});
+    API.write(WRITE_COMMANDS.UPDATE_ROOM_VISIBILITY, parameters, { optimisticData, failureData });
     if (navigate && !isEmptyObject(report)) {
         ReportUtils.goBackToDetailsPage(report);
     }
@@ -1584,7 +1584,7 @@ function updateReportName(reportID: string, value: string, previousValue: string
         reportName: value,
     };
 
-    API.write(WRITE_COMMANDS.SET_REPORT_NAME, parameters, {optimisticData, failureData, successData});
+    API.write(WRITE_COMMANDS.SET_REPORT_NAME, parameters, { optimisticData, failureData, successData });
 }
 
 function updateReportField(reportID: string, reportField: PolicyReportField, previousReportField: PolicyReportField) {
@@ -1661,10 +1661,10 @@ function updateReportField(reportID: string, reportField: PolicyReportField, pre
 
     const parameters = {
         reportID,
-        reportFields: JSON.stringify({[fieldKey]: reportField}),
+        reportFields: JSON.stringify({ [fieldKey]: reportField }),
     };
 
-    API.write(WRITE_COMMANDS.SET_REPORT_FIELD, parameters, {optimisticData, failureData, successData});
+    API.write(WRITE_COMMANDS.SET_REPORT_FIELD, parameters, { optimisticData, failureData, successData });
 }
 
 function updateDescription(reportID: string, previousValue: string, newValue: string) {
@@ -1680,27 +1680,27 @@ function updateDescription(reportID: string, previousValue: string, newValue: st
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {description: parsedDescription, pendingFields: {description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}},
+            value: { description: parsedDescription, pendingFields: { description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE } },
         },
     ];
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {description: previousValue, pendingFields: {description: null}},
+            value: { description: previousValue, pendingFields: { description: null } },
         },
     ];
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {pendingFields: {description: null}},
+            value: { pendingFields: { description: null } },
         },
     ];
 
-    const parameters: UpdateRoomDescriptionParams = {reportID, description: parsedDescription};
+    const parameters: UpdateRoomDescriptionParams = { reportID, description: parsedDescription };
 
-    API.write(WRITE_COMMANDS.UPDATE_ROOM_DESCRIPTION, parameters, {optimisticData, failureData, successData});
+    API.write(WRITE_COMMANDS.UPDATE_ROOM_DESCRIPTION, parameters, { optimisticData, failureData, successData });
     Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
 }
 
@@ -1714,20 +1714,20 @@ function updateWriteCapabilityAndNavigate(report: Report, newValue: WriteCapabil
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
-            value: {writeCapability: newValue},
+            value: { writeCapability: newValue },
         },
     ];
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
-            value: {writeCapability: report.writeCapability},
+            value: { writeCapability: report.writeCapability },
         },
     ];
 
-    const parameters: UpdateReportWriteCapabilityParams = {reportID: report.reportID, writeCapability: newValue};
+    const parameters: UpdateReportWriteCapabilityParams = { reportID: report.reportID, writeCapability: newValue };
 
-    API.write(WRITE_COMMANDS.UPDATE_REPORT_WRITE_CAPABILITY, parameters, {optimisticData, failureData});
+    API.write(WRITE_COMMANDS.UPDATE_REPORT_WRITE_CAPABILITY, parameters, { optimisticData, failureData });
     // Return to the report settings page since this field utilizes push-to-page
     Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID));
 }
@@ -1776,12 +1776,12 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         {
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${policyReport.reportID}`,
-            value: {[createdReportAction.reportActionID]: createdReportAction},
+            value: { [createdReportAction.reportActionID]: createdReportAction },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.NEW_ROOM_FORM,
-            value: {isLoading: true},
+            value: { isLoading: true },
         },
     ];
     const successData: OnyxUpdate[] = [
@@ -1806,7 +1806,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.NEW_ROOM_FORM,
-            value: {isLoading: false},
+            value: { isLoading: false },
         },
     ];
     const failureData: OnyxUpdate[] = [
@@ -1822,7 +1822,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.NEW_ROOM_FORM,
-            value: {isLoading: false},
+            value: { isLoading: false },
         },
     ];
 
@@ -1836,7 +1836,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         description: policyReport.description,
     };
 
-    API.write(WRITE_COMMANDS.ADD_WORKSPACE_ROOM, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.ADD_WORKSPACE_ROOM, parameters, { optimisticData, successData, failureData });
     Navigation.dismissModalWithReport(policyReport);
 }
 
@@ -1928,7 +1928,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {[optimisticRenamedAction.reportActionID]: {pendingAction: null}},
+            value: { [optimisticRenamedAction.reportActionID]: { pendingAction: null } },
         },
     ];
     const failureData: OnyxUpdate[] = [
@@ -1942,7 +1942,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {[optimisticRenamedAction.reportActionID]: null},
+            value: { [optimisticRenamedAction.reportActionID]: null },
         },
     ];
 
@@ -1952,7 +1952,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
         renamedRoomReportActionID: optimisticRenamedAction.reportActionID,
     };
 
-    API.write(WRITE_COMMANDS.UPDATE_POLICY_ROOM_NAME, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_ROOM_NAME, parameters, { optimisticData, successData, failureData });
     Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
 }
 
@@ -1984,7 +1984,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
     // Due to payload size constraints, some push notifications may have their report action stripped
     // so we must double check that we were provided an action before using it in these checks.
     if (action && ReportActionsUtils.isDeletedAction(action)) {
-        Log.info(`${tag} Skipping notification because the action was deleted`, false, {reportID, action});
+        Log.info(`${tag} Skipping notification because the action was deleted`, false, { reportID, action });
         return false;
     }
 
@@ -2020,7 +2020,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
 
     // If this notification was delayed and the user saw the message already, don't show it
     if (action && report?.lastReadTime && report.lastReadTime >= action.created) {
-        Log.info(`${tag} No notification because the comment was already read`, false, {created: action.created, lastReadTime: report.lastReadTime});
+        Log.info(`${tag} No notification because the comment was already read`, false, { created: action.created, lastReadTime: report.lastReadTime });
         return false;
     }
 
@@ -2032,7 +2032,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
 
     // Only show notifications for supported types of report actions
     if (!ReportActionsUtils.isNotifiableReportAction(action)) {
-        Log.info(`${tag} No notification because this action type is not supported`, false, {actionName: action?.actionName});
+        Log.info(`${tag} No notification because this action type is not supported`, false, { actionName: action?.actionName });
         return false;
     }
 
@@ -2048,7 +2048,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
 
     const report = allReports?.[reportID] ?? null;
     if (!report) {
-        Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", {reportID, reportActionID: reportAction.reportActionID});
+        Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", { reportID, reportActionID: reportAction.reportActionID });
         return;
     }
 
@@ -2058,7 +2058,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
             const policyMembersAccountIDs = policyID ? getPolicyMemberAccountIDs(policyID) : [];
             const reportBelongsToWorkspace = policyID ? doesReportBelongToWorkspace(report, policyMembersAccountIDs, policyID) : false;
             if (!reportBelongsToWorkspace) {
-                Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
+                Navigation.navigateWithSwitchPolicyID({ route: ROUTES.HOME });
             }
             Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
         });
@@ -2074,7 +2074,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
 
 /** Clear the errors associated with the IOUs of a given report. */
 function clearIOUError(reportID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {errorFields: {iou: null}});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { errorFields: { iou: null } });
 }
 
 /**
@@ -2137,7 +2137,7 @@ function addEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji
         useEmojiReactions: true,
     };
 
-    API.write(WRITE_COMMANDS.ADD_EMOJI_REACTION, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.ADD_EMOJI_REACTION, parameters, { optimisticData, successData, failureData });
 }
 
 /**
@@ -2167,7 +2167,7 @@ function removeEmojiReaction(reportID: string, reportActionID: string, emoji: Em
         useEmojiReactions: true,
     };
 
-    API.write(WRITE_COMMANDS.REMOVE_EMOJI_REACTION, parameters, {optimisticData});
+    API.write(WRITE_COMMANDS.REMOVE_EMOJI_REACTION, parameters, { optimisticData });
 }
 
 /**
@@ -2281,14 +2281,14 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
             value:
                 isWorkspaceMemberLeavingWorkspaceRoom || isChatThread
                     ? {
-                          notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
-                      }
+                        notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+                    }
                     : {
-                          reportID: null,
-                          stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-                          statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-                          notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
-                      },
+                        reportID: null,
+                        stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                        statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                        notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+                    },
         },
     ];
 
@@ -2298,11 +2298,11 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value:
                 isWorkspaceMemberLeavingWorkspaceRoom || isChatThread
-                    ? {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN}
+                    ? { notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN }
                     : Object.keys(report).reduce<Record<string, null>>((acc, key) => {
-                          acc[key] = null;
-                          return acc;
-                      }, {}),
+                        acc[key] = null;
+                        return acc;
+                    }, {}),
         },
     ];
 
@@ -2318,17 +2318,17 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            value: {[report.parentReportActionID]: {childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN}},
+            value: { [report.parentReportActionID]: { childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN } },
         });
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            value: {[report.parentReportActionID]: {childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN}},
+            value: { [report.parentReportActionID]: { childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN } },
         });
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            value: {[report.parentReportActionID]: {childReportNotificationPreference: report.notificationPreference}},
+            value: { [report.parentReportActionID]: { childReportNotificationPreference: report.notificationPreference } },
         });
     }
 
@@ -2336,7 +2336,7 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
         reportID,
     };
 
-    API.write(WRITE_COMMANDS.LEAVE_ROOM, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.LEAVE_ROOM, parameters, { optimisticData, successData, failureData });
 
     const sortedReportsByLastRead = ReportUtils.sortReportsByLastRead(Object.values(allReports ?? {}) as Report[], reportMetadata);
 
@@ -2438,7 +2438,7 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
         inviteeEmails,
     };
 
-    API.write(WRITE_COMMANDS.INVITE_TO_ROOM, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.INVITE_TO_ROOM, parameters, { optimisticData, successData, failureData });
 }
 
 /** Removes people from a room
@@ -2490,7 +2490,7 @@ function removeFromRoom(reportID: string, targetAccountIDs: number[]) {
         targetAccountIDs,
     };
 
-    API.write(WRITE_COMMANDS.REMOVE_FROM_ROOM, parameters, {optimisticData, failureData, successData});
+    API.write(WRITE_COMMANDS.REMOVE_FROM_ROOM, parameters, { optimisticData, failureData, successData });
 }
 
 function setLastOpenedPublicRoom(reportID: string) {
@@ -2586,7 +2586,7 @@ function flagComment(reportID: string, reportAction: OnyxEntry<ReportAction>, se
         isDevRequest: Environment.isDevelopment(),
     };
 
-    API.write(WRITE_COMMANDS.FLAG_COMMENT, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.FLAG_COMMENT, parameters, { optimisticData, successData, failureData });
 }
 
 /** Updates a given user's private notes on a report */
@@ -2636,9 +2636,9 @@ const updatePrivateNotes = (reportID: string, accountID: number, note: string) =
         },
     ];
 
-    const parameters: UpdateReportPrivateNoteParams = {reportID, privateNotes: note};
+    const parameters: UpdateReportPrivateNoteParams = { reportID, privateNotes: note };
 
-    API.write(WRITE_COMMANDS.UPDATE_REPORT_PRIVATE_NOTE, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.UPDATE_REPORT_PRIVATE_NOTE, parameters, { optimisticData, successData, failureData });
 };
 
 /** Fetches all the private notes for a given report */
@@ -2681,9 +2681,9 @@ function getReportPrivateNote(reportID: string | undefined) {
         },
     ];
 
-    const parameters: GetReportPrivateNoteParams = {reportID};
+    const parameters: GetReportPrivateNoteParams = { reportID };
 
-    API.read(READ_COMMANDS.GET_REPORT_PRIVATE_NOTE, parameters, {optimisticData, successData, failureData});
+    API.read(READ_COMMANDS.GET_REPORT_PRIVATE_NOTE, parameters, { optimisticData, successData, failureData });
 }
 
 /**
@@ -2746,7 +2746,7 @@ function completeEngagementModal(text: string, choice: ValueOf<typeof CONST.INTR
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_INTRO_SELECTED,
-            value: {choice},
+            value: { choice },
         },
     ];
 
@@ -2754,7 +2754,7 @@ function completeEngagementModal(text: string, choice: ValueOf<typeof CONST.INTR
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeChatReportID}`,
-            value: {[reportCommentAction.reportActionID ?? '']: {pendingAction: null}},
+            value: { [reportCommentAction.reportActionID ?? '']: { pendingAction: null } },
         },
     ];
 
@@ -2786,7 +2786,7 @@ function dismissEngagementModal() {
 
 /** Loads necessary data for rendering the RoomMembersPage */
 function openRoomMembersPage(reportID: string) {
-    const parameters: OpenRoomMembersPageParams = {reportID};
+    const parameters: OpenRoomMembersPageParams = { reportID };
 
     API.read(READ_COMMANDS.OPEN_ROOM_MEMBERS_PAGE, parameters);
 }
@@ -2803,7 +2803,7 @@ function hasErrorInPrivateNotes(report: OnyxEntry<Report>): boolean {
 
 /** Clears all errors associated with a given private note */
 function clearPrivateNotesError(reportID: string, accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {privateNotes: {[accountID]: {errors: null}}});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { privateNotes: { [accountID]: { errors: null } } });
 }
 
 function getDraftPrivateNote(reportID: string): string {
@@ -2841,9 +2841,9 @@ function searchForReports(searchInput: string) {
         },
     ];
 
-    const parameters: SearchForReportsParams = {searchInput};
+    const parameters: SearchForReportsParams = { searchInput };
 
-    API.read(READ_COMMANDS.SEARCH_FOR_REPORTS, parameters, {successData, failureData});
+    API.read(READ_COMMANDS.SEARCH_FOR_REPORTS, parameters, { successData, failureData });
 }
 
 function searchInServer(searchInput: string) {
@@ -2863,7 +2863,7 @@ function updateLastVisitTime(reportID: string) {
     if (!ReportUtils.isValidReportIDFromPath(reportID)) {
         return;
     }
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {lastVisitTime: DateUtils.getDBTime()});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, { lastVisitTime: DateUtils.getDBTime() });
 }
 
 function clearNewRoomFormError() {
@@ -2936,7 +2936,57 @@ function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEnt
         resolution,
     };
 
-    API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, {optimisticData, failureData});
+    API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, { optimisticData, failureData });
+}
+
+
+function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: OnyxEntry<ReportAction>){
+
+    const message = reportAction?.message?.[0];
+    if (!message) {
+        return;
+    }
+
+    const updatedMessage: Message = {
+        ...message,
+        resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING,
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    message: [updatedMessage],
+                    originalMessage: {
+                        resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    message: [message],
+                    originalMessage: {
+                        resolution: null,
+                    },
+                },
+            },
+        },
+    ];
+
+    const params = {
+        reportActionID: reportAction.reportActionID,
+    };
+
+    API.write(WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER, params, { optimisticData, failureData });
 }
 
 export {
@@ -3010,4 +3060,5 @@ export {
     updateReportName,
     resolveActionableMentionWhisper,
     updateRoomVisibility,
+    dismissTrackExpenseActionableWhisper,
 };
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index c06c6f39a98c..b02403201e75 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -364,9 +364,8 @@ function ReportActionItem({
 
         if (
             !(
-                (ReportActionsUtils.isActionableMentionWhisper(action) && isWhisperResolution) ||
-                (ReportActionsUtils.isActionableJoinRequest(action) && isJoinChoice) ||
-                ReportActionsUtils.isActionableTrackExpense(action)
+                ((ReportActionsUtils.isActionableMentionWhisper(action) || ReportActionsUtils.isActionableTrackExpense(action)) && isWhisperResolution) ||
+                (ReportActionsUtils.isActionableJoinRequest(action) && isJoinChoice)
             )
         ) {
             return [];
@@ -397,7 +396,7 @@ function ReportActionItem({
                 {
                     text: 'actionableMentionTrackExpense.nothing',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-nothing`,
-                    onPress: () => console.log('Nothing'),
+                    onPress: () => Report.dismissTrackExpenseActionableWhisper(report.reportID, action),
                     isMediumSized: true,
                 },
             ];
@@ -816,7 +815,7 @@ function ReportActionItem({
     }
 
     // if action is actionable mention whisper and resolved by user, then we don't want to render anything
-    if (ReportActionsUtils.isActionableMentionWhisper(action) && (action.originalMessage.resolution ?? null)) {
+    if ((ReportActionsUtils.isActionableMentionWhisper(action) || ReportActionsUtils.isActionableTrackExpense(action)) && (action.originalMessage?.resolution ?? null)) {
         return null;
     }
 
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 729d88461c3b..0de566f0909f 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -285,6 +285,8 @@ type OriginalMessageTrackedExpenseWhisper = {
     actionName: typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLETRACKEXPENSEWHISPER;
     originalMessage: {
         transactionID: string;
+        //  todo: add constants for tracking expense whisper resolution
+        resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION>;
     };
 };
 

From 757385215ff3323179904943fb5889471a87d155 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 01:25:21 +0530
Subject: [PATCH 023/383] fixes type error and run prettier

---
 src/ROUTES.ts                                 |   7 +-
 ...oraryForRefactorRequestConfirmationList.js |  20 +-
 ...missTrackExpenseActionableWhisperParams.ts |   5 +
 src/libs/API/parameters/index.ts              |   1 +
 src/libs/API/types.ts                         |   2 +-
 src/libs/IOUUtils.ts                          |  10 +-
 src/libs/actions/Report.ts                    | 236 +++++++++---------
 .../step/IOURequestStepConfirmation.js        |   2 +-
 8 files changed, 142 insertions(+), 141 deletions(-)
 create mode 100644 src/libs/API/parameters/DismissTrackExpenseActionableWhisperParams.ts

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 24463ebb5668..fbbdb0cab543 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -311,11 +311,12 @@ const ROUTES = {
     },
     MONEY_REQUEST_STEP_CONFIRMATION: {
         route: ':action/:iouType/confirmation/:transactionID/:reportID',
-        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, action: ValueOf<typeof CONST.IOU.ACTION> = 'create') => `${action}/${iouType}/confirmation/${transactionID}/${reportID}` as const,
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, action: ValueOf<typeof CONST.IOU.ACTION> = 'create') =>
+            `${action}/${iouType}/confirmation/${transactionID}/${reportID}` as const,
     },
     MONEY_REQUEST_STEP_AMOUNT: {
         route: ':action/:iouType/amount/:transactionID/:reportID',
-        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '', action: ValueOf<typeof CONST.IOU.ACTION>= 'create') =>
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '', action: ValueOf<typeof CONST.IOU.ACTION> = 'create') =>
             getUrlWithBackToParam(`${action}/${iouType}/amount/${transactionID}/${reportID}`, backTo),
     },
     MONEY_REQUEST_STEP_TAX_RATE: {
@@ -335,7 +336,7 @@ const ROUTES = {
     },
     MONEY_REQUEST_STEP_CURRENCY: {
         route: ':action/:iouType/currency/:transactionID/:reportID/:pageIndex?',
-        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, pageIndex = '', backTo = '', action:ValueOf<typeof CONST.IOU.ACTION> = 'create') =>
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, pageIndex = '', backTo = '', action: ValueOf<typeof CONST.IOU.ACTION> = 'create') =>
             getUrlWithBackToParam(`${action}/${iouType}/currency/${transactionID}/${reportID}/${pageIndex}`, backTo),
     },
     MONEY_REQUEST_STEP_DATE: {
diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 02faf21826ad..56986c3cb8e0 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -735,9 +735,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
                     onPress={() =>
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
-                        )
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()))
                     }
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     disabled={didConfirm || !canEditDistance}
@@ -757,9 +755,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
                     onPress={() => {
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
-                        );
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
                     }}
                     disabled={didConfirm}
                     interactive={!isReadOnly}
@@ -781,9 +777,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
                     onPress={() => {
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
-                        );
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
                     }}
                     disabled={didConfirm}
                     interactive={!isReadOnly}
@@ -803,9 +797,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     description={translate('common.category')}
                     numberOfLinesTitle={2}
                     onPress={() =>
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
-                        )
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()))
                     }
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
@@ -826,9 +818,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     description={name}
                     numberOfLinesTitle={2}
                     onPress={() =>
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(iouAction, iouType, index, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
-                        )
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(iouAction, iouType, index, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()))
                     }
                     style={[styles.moneyRequestMenuItem]}
                     disabled={didConfirm}
diff --git a/src/libs/API/parameters/DismissTrackExpenseActionableWhisperParams.ts b/src/libs/API/parameters/DismissTrackExpenseActionableWhisperParams.ts
new file mode 100644
index 000000000000..e441d100784d
--- /dev/null
+++ b/src/libs/API/parameters/DismissTrackExpenseActionableWhisperParams.ts
@@ -0,0 +1,5 @@
+type DismissTrackExpenseActionableWhisperParams = {
+    reportActionID: string;
+};
+
+export default DismissTrackExpenseActionableWhisperParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 1895c2426e1a..1c85c69698da 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -196,3 +196,4 @@ export type {default as SetPolicyCustomTaxNameParams} from './SetPolicyCustomTax
 export type {default as SetPolicyForeignCurrencyDefaultParams} from './SetPolicyForeignCurrencyDefaultParams';
 export type {default as SetPolicyCurrencyDefaultParams} from './SetPolicyCurrencyDefaultParams';
 export type {default as RenamePolicyTaxParams} from './RenamePolicyTaxParams';
+export type {default as DismissTrackExpenseActionableWhisperParams} from './DismissTrackExpenseActionableWhisperParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index ef6d529fb2c0..d6c1540bf902 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -385,7 +385,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED]: Parameters.SetPolicyDistanceRatesEnabledParams;
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
-    [WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER]: Parameters.DismissActionableWhisperParams;
+    [WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index ce75a4e56e7a..7c3abf8804b4 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -7,8 +7,14 @@ import * as CurrencyUtils from './CurrencyUtils';
 import Navigation from './Navigation/Navigation';
 import * as TransactionUtils from './TransactionUtils';
 
-function navigateToStartMoneyRequestStep(requestType: ValueOf<typeof CONST.IOU.REQUEST_TYPE>, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, iouAction?: ValueOf<typeof CONST.IOU.ACTION>): void {
-    if(iouAction === CONST.IOU.ACTION.MOVE) {
+function navigateToStartMoneyRequestStep(
+    requestType: ValueOf<typeof CONST.IOU.REQUEST_TYPE>,
+    iouType: ValueOf<typeof CONST.IOU.TYPE>,
+    transactionID: string,
+    reportID: string,
+    iouAction?: ValueOf<typeof CONST.IOU.ACTION>,
+): void {
+    if (iouAction === CONST.IOU.ACTION.MOVE) {
         Navigation.goBack();
         return;
     }
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 2766c78979d4..bcfd515c8bfe 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1,13 +1,13 @@
-import { format as timezoneFormat, utcToZonedTime } from 'date-fns-tz';
+import {format as timezoneFormat, utcToZonedTime} from 'date-fns-tz';
 import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import Str from 'expensify-common/lib/str';
 import isEmpty from 'lodash/isEmpty';
-import { DeviceEventEmitter, InteractionManager, Linking } from 'react-native';
-import type { NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate } from 'react-native-onyx';
+import {DeviceEventEmitter, InteractionManager, Linking} from 'react-native';
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type { PartialDeep, ValueOf } from 'type-fest';
-import type { Emoji } from '@assets/emojis/types';
-import type { FileObject } from '@components/AttachmentModal';
+import type {PartialDeep, ValueOf} from 'type-fest';
+import type {Emoji} from '@assets/emojis/types';
+import type {FileObject} from '@components/AttachmentModal';
 import * as ActiveClientManager from '@libs/ActiveClientManager';
 import * as API from '@libs/API';
 import type {
@@ -42,7 +42,7 @@ import type {
     UpdateRoomDescriptionParams,
 } from '@libs/API/parameters';
 import type UpdateRoomVisibilityParams from '@libs/API/parameters/UpdateRoomVisibilityParams';
-import { READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS } from '@libs/API/types';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as CollectionUtils from '@libs/CollectionUtils';
 import DateUtils from '@libs/DateUtils';
 import * as EmojiUtils from '@libs/EmojiUtils';
@@ -54,30 +54,30 @@ import LocalNotification from '@libs/Notification/LocalNotification';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PhoneNumber from '@libs/PhoneNumber';
 import getPolicyMemberAccountIDs from '@libs/PolicyMembersUtils';
-import { extractPolicyIDFromPath } from '@libs/PolicyUtils';
+import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
 import processReportIDDeeplink from '@libs/processReportIDDeeplink';
 import * as Pusher from '@libs/Pusher/pusher';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import { doesReportBelongToWorkspace } from '@libs/ReportUtils';
-import type { OptimisticAddCommentReportAction } from '@libs/ReportUtils';
+import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
+import type {OptimisticAddCommentReportAction} from '@libs/ReportUtils';
 import shouldSkipDeepLinkNavigation from '@libs/shouldSkipDeepLinkNavigation';
 import * as UserUtils from '@libs/UserUtils';
 import Visibility from '@libs/Visibility';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type { Route } from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/NewRoomForm';
-import type { PersonalDetails, PersonalDetailsList, PolicyReportField, RecentlyUsedReportFields, ReportActionReactions, ReportMetadata, ReportUserIsTyping } from '@src/types/onyx';
-import type { Decision, OriginalMessageIOU } from '@src/types/onyx/OriginalMessage';
-import type { NotificationPreference, RoomVisibility, WriteCapability } from '@src/types/onyx/Report';
+import type {PersonalDetails, PersonalDetailsList, PolicyReportField, RecentlyUsedReportFields, ReportActionReactions, ReportMetadata, ReportUserIsTyping} from '@src/types/onyx';
+import type {Decision, OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
+import type {NotificationPreference, RoomVisibility, WriteCapability} from '@src/types/onyx/Report';
 import type Report from '@src/types/onyx/Report';
-import type { Message, ReportActionBase, ReportActions } from '@src/types/onyx/ReportAction';
+import type {Message, ReportActionBase, ReportActions} from '@src/types/onyx/ReportAction';
 import type ReportAction from '@src/types/onyx/ReportAction';
-import type { EmptyObject } from '@src/types/utils/EmptyObject';
-import { isEmptyObject } from '@src/types/utils/EmptyObject';
+import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as CachedPDFPaths from './CachedPDFPaths';
 import * as Modal from './Modal';
 import * as Session from './Session';
@@ -217,7 +217,7 @@ function getNormalizedStatus(typingStatus: Pusher.UserIsTypingEvent | Pusher.Use
     let normalizedStatus: ReportUserIsTyping;
 
     if (typingStatus.userLogin) {
-        normalizedStatus = { [typingStatus.userLogin]: true };
+        normalizedStatus = {[typingStatus.userLogin]: true};
     } else {
         normalizedStatus = typingStatus;
     }
@@ -264,7 +264,7 @@ function subscribeToReportTypingEvents(reportID: string) {
             delete typingWatchTimers[reportUserIdentifier];
         }, 1500);
     }).catch((error) => {
-        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', { errorType: error.type, pusherChannelName });
+        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
     });
 }
 
@@ -295,7 +295,7 @@ function subscribeToReportLeavingEvents(reportID: string) {
 
         Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, true);
     }).catch((error) => {
-        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', { errorType: error.type, pusherChannelName });
+        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
     });
 }
 
@@ -334,7 +334,7 @@ let newActionSubscribers: ActionSubscriber[] = [];
  * @returns Remove subscriber for report id
  */
 function subscribeToNewActionEvent(reportID: string, callback: SubscriberCallback): () => void {
-    newActionSubscribers.push({ callback, reportID });
+    newActionSubscribers.push({callback, reportID});
     return () => {
         newActionSubscribers = newActionSubscribers.filter((subscriber) => subscriber.reportID !== reportID);
     };
@@ -436,7 +436,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
     const successReportActions: OnyxCollection<NullishDeep<ReportAction>> = {};
 
     Object.entries(optimisticReportActions).forEach(([actionKey]) => {
-        successReportActions[actionKey] = { pendingAction: null, isOptimisticAction: null };
+        successReportActions[actionKey] = {pendingAction: null, isOptimisticAction: null};
     });
 
     const successData: OnyxUpdate[] = [
@@ -452,7 +452,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         lastMessageText: '',
         lastVisibleActionCreated: '',
     };
-    const { lastMessageText = '', lastMessageTranslationKey = '' } = ReportActionsUtils.getLastVisibleMessage(reportID);
+    const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportActionsUtils.getLastVisibleMessage(reportID);
     if (lastMessageText || lastMessageTranslationKey) {
         const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID);
         const lastVisibleActionCreated = lastVisibleAction?.created;
@@ -501,7 +501,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-            value: { [currentUserAccountID]: { timezone } },
+            value: {[currentUserAccountID]: {timezone}},
         });
         DateUtils.setTimezoneUpdated();
     }
@@ -556,8 +556,8 @@ function openReport(
     const optimisticReport = reportActionsExist(reportID)
         ? {}
         : {
-            reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
-        };
+              reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
+          };
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -649,13 +649,13 @@ function openReport(
         optimisticData.push({
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: { [optimisticCreatedAction.reportActionID]: optimisticCreatedAction },
+            value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
         });
         successData.push(
             {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-                value: { [optimisticCreatedAction.reportActionID]: { pendingAction: null } },
+                value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
             },
             {
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -718,12 +718,12 @@ function openReport(
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
-                value: { [parentReportActionID]: { childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT } },
+                value: {[parentReportActionID]: {childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT}},
             });
             failureData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
-                value: { [parentReportActionID]: { childReportID: '0', childType: '' } },
+                value: {[parentReportActionID]: {childReportID: '0', childType: ''}},
             });
         }
     }
@@ -732,12 +732,12 @@ function openReport(
 
     if (isFromDeepLink) {
         // eslint-disable-next-line rulesdir/no-api-side-effects-method
-        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT, parameters, { optimisticData, successData, failureData }).finally(() => {
+        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT, parameters, {optimisticData, successData, failureData}).finally(() => {
             Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
         });
     } else {
         // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.OPEN_REPORT, parameters, { optimisticData, successData, failureData });
+        API.write(WRITE_COMMANDS.OPEN_REPORT, parameters, {optimisticData, successData, failureData});
     }
 }
 
@@ -763,7 +763,7 @@ function navigateToAndOpenReport(userLogins: string[], shouldDismissModal = true
     if (shouldDismissModal) {
         Navigation.dismissModalWithReport(report);
     } else {
-        Navigation.navigateWithSwitchPolicyID({ route: ROUTES.HOME });
+        Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
     }
 }
@@ -866,7 +866,7 @@ function reconnect(reportID: string) {
         reportID,
     };
 
-    API.write(WRITE_COMMANDS.RECONNECT_TO_REPORT, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.RECONNECT_TO_REPORT, parameters, {optimisticData, successData, failureData});
 }
 
 /**
@@ -909,7 +909,7 @@ function getOlderActions(reportID: string, reportActionID: string) {
         reportActionID,
     };
 
-    API.read(READ_COMMANDS.GET_OLDER_ACTIONS, parameters, { optimisticData, successData, failureData });
+    API.read(READ_COMMANDS.GET_OLDER_ACTIONS, parameters, {optimisticData, successData, failureData});
 }
 
 /**
@@ -952,7 +952,7 @@ function getNewerActions(reportID: string, reportActionID: string) {
         reportActionID,
     };
 
-    API.read(READ_COMMANDS.GET_NEWER_ACTIONS, parameters, { optimisticData, successData, failureData });
+    API.read(READ_COMMANDS.GET_NEWER_ACTIONS, parameters, {optimisticData, successData, failureData});
 }
 
 /**
@@ -986,7 +986,7 @@ function readNewestAction(reportID: string) {
         lastReadTime,
     };
 
-    API.write(WRITE_COMMANDS.READ_NEWEST_ACTION, parameters, { optimisticData });
+    API.write(WRITE_COMMANDS.READ_NEWEST_ACTION, parameters, {optimisticData});
     DeviceEventEmitter.emit(`readNewestAction_${reportID}`, lastReadTime);
 }
 
@@ -1027,7 +1027,7 @@ function markCommentAsUnread(reportID: string, reportActionCreated: string) {
         lastReadTime,
     };
 
-    API.write(WRITE_COMMANDS.MARK_AS_UNREAD, parameters, { optimisticData });
+    API.write(WRITE_COMMANDS.MARK_AS_UNREAD, parameters, {optimisticData});
     DeviceEventEmitter.emit(`unreadAction_${reportID}`, lastReadTime);
 }
 
@@ -1040,7 +1040,7 @@ function togglePinnedState(reportID: string, isPinnedChat: boolean) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { isPinned: pinnedValue },
+            value: {isPinned: pinnedValue},
         },
     ];
 
@@ -1049,7 +1049,7 @@ function togglePinnedState(reportID: string, isPinnedChat: boolean) {
         pinnedValue,
     };
 
-    API.write(WRITE_COMMANDS.TOGGLE_PINNED_CHAT, parameters, { optimisticData });
+    API.write(WRITE_COMMANDS.TOGGLE_PINNED_CHAT, parameters, {optimisticData});
 }
 
 /**
@@ -1067,7 +1067,7 @@ function saveReportCommentNumberOfLines(reportID: string, numberOfLines: number)
 
 /** Immediate indication whether the report has a draft comment. */
 function setReportWithDraft(reportID: string, hasDraft: boolean): Promise<void> {
-    return Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { hasDraft });
+    return Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {hasDraft});
 }
 
 /** Broadcasts whether or not a user is typing on a report over the report's private pusher channel. */
@@ -1164,7 +1164,7 @@ function deleteReportComment(reportID: string, reportAction: ReportAction) {
         lastMessageText: '',
         lastVisibleActionCreated: '',
     };
-    const { lastMessageText = '', lastMessageTranslationKey = '' } = ReportUtils.getLastVisibleMessage(originalReportID, optimisticReportActions as ReportActions);
+    const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportUtils.getLastVisibleMessage(originalReportID, optimisticReportActions as ReportActions);
     if (lastMessageText || lastMessageTranslationKey) {
         const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(originalReportID, optimisticReportActions as ReportActions);
         const lastVisibleActionCreated = lastVisibleAction?.created;
@@ -1238,7 +1238,7 @@ function deleteReportComment(reportID: string, reportAction: ReportAction) {
     };
 
     CachedPDFPaths.clearByKey(reportActionID);
-    API.write(WRITE_COMMANDS.DELETE_COMMENT, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.DELETE_COMMENT, parameters, {optimisticData, successData, failureData});
 }
 
 /**
@@ -1301,7 +1301,7 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
     // For longer comments, skip parsing and display plaintext for performance reasons. It takes over 40s to parse a 100k long string!!
     let parsedOriginalCommentHTML = originalCommentHTML;
     if (textForNewComment.length <= CONST.MAX_MARKUP_LENGTH) {
-        const autolinkFilter = { filterRules: parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink') };
+        const autolinkFilter = {filterRules: parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink')};
         parsedOriginalCommentHTML = parser.replace(originalCommentMarkdown, autolinkFilter);
     }
 
@@ -1387,19 +1387,19 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
         reportActionID,
     };
 
-    API.write(WRITE_COMMANDS.UPDATE_COMMENT, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.UPDATE_COMMENT, parameters, {optimisticData, successData, failureData});
 }
 
 /** Deletes the draft for a comment report action. */
 function deleteReportActionDraft(reportID: string, reportAction: ReportAction) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, { [reportAction.reportActionID]: null });
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, {[reportAction.reportActionID]: null});
 }
 
 /** Saves the draft for a comment report action. This will put the comment into "edit mode" */
 function saveReportActionDraft(reportID: string, reportAction: ReportAction, draftMessage: string) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, { [reportAction.reportActionID]: { message: draftMessage } });
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, {[reportAction.reportActionID]: {message: draftMessage}});
 }
 
 /** Saves the number of lines for the report action draft */
@@ -1427,7 +1427,7 @@ function updateNotificationPreference(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { notificationPreference: newValue },
+            value: {notificationPreference: newValue},
         },
     ];
 
@@ -1435,7 +1435,7 @@ function updateNotificationPreference(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { notificationPreference: previousValue },
+            value: {notificationPreference: previousValue},
         },
     ];
 
@@ -1443,18 +1443,18 @@ function updateNotificationPreference(
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`,
-            value: { [parentReportActionID]: { childReportNotificationPreference: newValue } },
+            value: {[parentReportActionID]: {childReportNotificationPreference: newValue}},
         });
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`,
-            value: { [parentReportActionID]: { childReportNotificationPreference: previousValue } },
+            value: {[parentReportActionID]: {childReportNotificationPreference: previousValue}},
         });
     }
 
-    const parameters: UpdateReportNotificationPreferenceParams = { reportID, notificationPreference: newValue };
+    const parameters: UpdateReportNotificationPreferenceParams = {reportID, notificationPreference: newValue};
 
-    API.write(WRITE_COMMANDS.UPDATE_REPORT_NOTIFICATION_PREFERENCE, parameters, { optimisticData, failureData });
+    API.write(WRITE_COMMANDS.UPDATE_REPORT_NOTIFICATION_PREFERENCE, parameters, {optimisticData, failureData});
     if (navigate && !isEmptyObject(report)) {
         ReportUtils.goBackToDetailsPage(report);
     }
@@ -1472,7 +1472,7 @@ function updateRoomVisibility(reportID: string, previousValue: RoomVisibility |
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { visibility: newValue },
+            value: {visibility: newValue},
         },
     ];
 
@@ -1480,13 +1480,13 @@ function updateRoomVisibility(reportID: string, previousValue: RoomVisibility |
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { visibility: previousValue },
+            value: {visibility: previousValue},
         },
     ];
 
-    const parameters: UpdateRoomVisibilityParams = { reportID, visibility: newValue };
+    const parameters: UpdateRoomVisibilityParams = {reportID, visibility: newValue};
 
-    API.write(WRITE_COMMANDS.UPDATE_ROOM_VISIBILITY, parameters, { optimisticData, failureData });
+    API.write(WRITE_COMMANDS.UPDATE_ROOM_VISIBILITY, parameters, {optimisticData, failureData});
     if (navigate && !isEmptyObject(report)) {
         ReportUtils.goBackToDetailsPage(report);
     }
@@ -1584,7 +1584,7 @@ function updateReportName(reportID: string, value: string, previousValue: string
         reportName: value,
     };
 
-    API.write(WRITE_COMMANDS.SET_REPORT_NAME, parameters, { optimisticData, failureData, successData });
+    API.write(WRITE_COMMANDS.SET_REPORT_NAME, parameters, {optimisticData, failureData, successData});
 }
 
 function updateReportField(reportID: string, reportField: PolicyReportField, previousReportField: PolicyReportField) {
@@ -1661,10 +1661,10 @@ function updateReportField(reportID: string, reportField: PolicyReportField, pre
 
     const parameters = {
         reportID,
-        reportFields: JSON.stringify({ [fieldKey]: reportField }),
+        reportFields: JSON.stringify({[fieldKey]: reportField}),
     };
 
-    API.write(WRITE_COMMANDS.SET_REPORT_FIELD, parameters, { optimisticData, failureData, successData });
+    API.write(WRITE_COMMANDS.SET_REPORT_FIELD, parameters, {optimisticData, failureData, successData});
 }
 
 function updateDescription(reportID: string, previousValue: string, newValue: string) {
@@ -1680,27 +1680,27 @@ function updateDescription(reportID: string, previousValue: string, newValue: st
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { description: parsedDescription, pendingFields: { description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE } },
+            value: {description: parsedDescription, pendingFields: {description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}},
         },
     ];
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { description: previousValue, pendingFields: { description: null } },
+            value: {description: previousValue, pendingFields: {description: null}},
         },
     ];
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: { pendingFields: { description: null } },
+            value: {pendingFields: {description: null}},
         },
     ];
 
-    const parameters: UpdateRoomDescriptionParams = { reportID, description: parsedDescription };
+    const parameters: UpdateRoomDescriptionParams = {reportID, description: parsedDescription};
 
-    API.write(WRITE_COMMANDS.UPDATE_ROOM_DESCRIPTION, parameters, { optimisticData, failureData, successData });
+    API.write(WRITE_COMMANDS.UPDATE_ROOM_DESCRIPTION, parameters, {optimisticData, failureData, successData});
     Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
 }
 
@@ -1714,20 +1714,20 @@ function updateWriteCapabilityAndNavigate(report: Report, newValue: WriteCapabil
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
-            value: { writeCapability: newValue },
+            value: {writeCapability: newValue},
         },
     ];
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
-            value: { writeCapability: report.writeCapability },
+            value: {writeCapability: report.writeCapability},
         },
     ];
 
-    const parameters: UpdateReportWriteCapabilityParams = { reportID: report.reportID, writeCapability: newValue };
+    const parameters: UpdateReportWriteCapabilityParams = {reportID: report.reportID, writeCapability: newValue};
 
-    API.write(WRITE_COMMANDS.UPDATE_REPORT_WRITE_CAPABILITY, parameters, { optimisticData, failureData });
+    API.write(WRITE_COMMANDS.UPDATE_REPORT_WRITE_CAPABILITY, parameters, {optimisticData, failureData});
     // Return to the report settings page since this field utilizes push-to-page
     Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID));
 }
@@ -1776,12 +1776,12 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         {
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${policyReport.reportID}`,
-            value: { [createdReportAction.reportActionID]: createdReportAction },
+            value: {[createdReportAction.reportActionID]: createdReportAction},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.NEW_ROOM_FORM,
-            value: { isLoading: true },
+            value: {isLoading: true},
         },
     ];
     const successData: OnyxUpdate[] = [
@@ -1806,7 +1806,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.NEW_ROOM_FORM,
-            value: { isLoading: false },
+            value: {isLoading: false},
         },
     ];
     const failureData: OnyxUpdate[] = [
@@ -1822,7 +1822,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.NEW_ROOM_FORM,
-            value: { isLoading: false },
+            value: {isLoading: false},
         },
     ];
 
@@ -1836,7 +1836,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
         description: policyReport.description,
     };
 
-    API.write(WRITE_COMMANDS.ADD_WORKSPACE_ROOM, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.ADD_WORKSPACE_ROOM, parameters, {optimisticData, successData, failureData});
     Navigation.dismissModalWithReport(policyReport);
 }
 
@@ -1928,7 +1928,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: { [optimisticRenamedAction.reportActionID]: { pendingAction: null } },
+            value: {[optimisticRenamedAction.reportActionID]: {pendingAction: null}},
         },
     ];
     const failureData: OnyxUpdate[] = [
@@ -1942,7 +1942,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: { [optimisticRenamedAction.reportActionID]: null },
+            value: {[optimisticRenamedAction.reportActionID]: null},
         },
     ];
 
@@ -1952,7 +1952,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomNam
         renamedRoomReportActionID: optimisticRenamedAction.reportActionID,
     };
 
-    API.write(WRITE_COMMANDS.UPDATE_POLICY_ROOM_NAME, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_ROOM_NAME, parameters, {optimisticData, successData, failureData});
     Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
 }
 
@@ -1984,7 +1984,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
     // Due to payload size constraints, some push notifications may have their report action stripped
     // so we must double check that we were provided an action before using it in these checks.
     if (action && ReportActionsUtils.isDeletedAction(action)) {
-        Log.info(`${tag} Skipping notification because the action was deleted`, false, { reportID, action });
+        Log.info(`${tag} Skipping notification because the action was deleted`, false, {reportID, action});
         return false;
     }
 
@@ -2020,7 +2020,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
 
     // If this notification was delayed and the user saw the message already, don't show it
     if (action && report?.lastReadTime && report.lastReadTime >= action.created) {
-        Log.info(`${tag} No notification because the comment was already read`, false, { created: action.created, lastReadTime: report.lastReadTime });
+        Log.info(`${tag} No notification because the comment was already read`, false, {created: action.created, lastReadTime: report.lastReadTime});
         return false;
     }
 
@@ -2032,7 +2032,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
 
     // Only show notifications for supported types of report actions
     if (!ReportActionsUtils.isNotifiableReportAction(action)) {
-        Log.info(`${tag} No notification because this action type is not supported`, false, { actionName: action?.actionName });
+        Log.info(`${tag} No notification because this action type is not supported`, false, {actionName: action?.actionName});
         return false;
     }
 
@@ -2048,7 +2048,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
 
     const report = allReports?.[reportID] ?? null;
     if (!report) {
-        Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", { reportID, reportActionID: reportAction.reportActionID });
+        Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", {reportID, reportActionID: reportAction.reportActionID});
         return;
     }
 
@@ -2058,7 +2058,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
             const policyMembersAccountIDs = policyID ? getPolicyMemberAccountIDs(policyID) : [];
             const reportBelongsToWorkspace = policyID ? doesReportBelongToWorkspace(report, policyMembersAccountIDs, policyID) : false;
             if (!reportBelongsToWorkspace) {
-                Navigation.navigateWithSwitchPolicyID({ route: ROUTES.HOME });
+                Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
             }
             Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
         });
@@ -2074,7 +2074,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
 
 /** Clear the errors associated with the IOUs of a given report. */
 function clearIOUError(reportID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { errorFields: { iou: null } });
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {errorFields: {iou: null}});
 }
 
 /**
@@ -2137,7 +2137,7 @@ function addEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji
         useEmojiReactions: true,
     };
 
-    API.write(WRITE_COMMANDS.ADD_EMOJI_REACTION, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.ADD_EMOJI_REACTION, parameters, {optimisticData, successData, failureData});
 }
 
 /**
@@ -2167,7 +2167,7 @@ function removeEmojiReaction(reportID: string, reportActionID: string, emoji: Em
         useEmojiReactions: true,
     };
 
-    API.write(WRITE_COMMANDS.REMOVE_EMOJI_REACTION, parameters, { optimisticData });
+    API.write(WRITE_COMMANDS.REMOVE_EMOJI_REACTION, parameters, {optimisticData});
 }
 
 /**
@@ -2281,14 +2281,14 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
             value:
                 isWorkspaceMemberLeavingWorkspaceRoom || isChatThread
                     ? {
-                        notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
-                    }
+                          notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+                      }
                     : {
-                        reportID: null,
-                        stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-                        statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-                        notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
-                    },
+                          reportID: null,
+                          stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                          statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                          notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+                      },
         },
     ];
 
@@ -2298,11 +2298,11 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value:
                 isWorkspaceMemberLeavingWorkspaceRoom || isChatThread
-                    ? { notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN }
+                    ? {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN}
                     : Object.keys(report).reduce<Record<string, null>>((acc, key) => {
-                        acc[key] = null;
-                        return acc;
-                    }, {}),
+                          acc[key] = null;
+                          return acc;
+                      }, {}),
         },
     ];
 
@@ -2318,17 +2318,17 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            value: { [report.parentReportActionID]: { childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN } },
+            value: {[report.parentReportActionID]: {childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN}},
         });
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            value: { [report.parentReportActionID]: { childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN } },
+            value: {[report.parentReportActionID]: {childReportNotificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN}},
         });
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            value: { [report.parentReportActionID]: { childReportNotificationPreference: report.notificationPreference } },
+            value: {[report.parentReportActionID]: {childReportNotificationPreference: report.notificationPreference}},
         });
     }
 
@@ -2336,7 +2336,7 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
         reportID,
     };
 
-    API.write(WRITE_COMMANDS.LEAVE_ROOM, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.LEAVE_ROOM, parameters, {optimisticData, successData, failureData});
 
     const sortedReportsByLastRead = ReportUtils.sortReportsByLastRead(Object.values(allReports ?? {}) as Report[], reportMetadata);
 
@@ -2438,7 +2438,7 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
         inviteeEmails,
     };
 
-    API.write(WRITE_COMMANDS.INVITE_TO_ROOM, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.INVITE_TO_ROOM, parameters, {optimisticData, successData, failureData});
 }
 
 /** Removes people from a room
@@ -2490,7 +2490,7 @@ function removeFromRoom(reportID: string, targetAccountIDs: number[]) {
         targetAccountIDs,
     };
 
-    API.write(WRITE_COMMANDS.REMOVE_FROM_ROOM, parameters, { optimisticData, failureData, successData });
+    API.write(WRITE_COMMANDS.REMOVE_FROM_ROOM, parameters, {optimisticData, failureData, successData});
 }
 
 function setLastOpenedPublicRoom(reportID: string) {
@@ -2586,7 +2586,7 @@ function flagComment(reportID: string, reportAction: OnyxEntry<ReportAction>, se
         isDevRequest: Environment.isDevelopment(),
     };
 
-    API.write(WRITE_COMMANDS.FLAG_COMMENT, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.FLAG_COMMENT, parameters, {optimisticData, successData, failureData});
 }
 
 /** Updates a given user's private notes on a report */
@@ -2636,9 +2636,9 @@ const updatePrivateNotes = (reportID: string, accountID: number, note: string) =
         },
     ];
 
-    const parameters: UpdateReportPrivateNoteParams = { reportID, privateNotes: note };
+    const parameters: UpdateReportPrivateNoteParams = {reportID, privateNotes: note};
 
-    API.write(WRITE_COMMANDS.UPDATE_REPORT_PRIVATE_NOTE, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.UPDATE_REPORT_PRIVATE_NOTE, parameters, {optimisticData, successData, failureData});
 };
 
 /** Fetches all the private notes for a given report */
@@ -2681,9 +2681,9 @@ function getReportPrivateNote(reportID: string | undefined) {
         },
     ];
 
-    const parameters: GetReportPrivateNoteParams = { reportID };
+    const parameters: GetReportPrivateNoteParams = {reportID};
 
-    API.read(READ_COMMANDS.GET_REPORT_PRIVATE_NOTE, parameters, { optimisticData, successData, failureData });
+    API.read(READ_COMMANDS.GET_REPORT_PRIVATE_NOTE, parameters, {optimisticData, successData, failureData});
 }
 
 /**
@@ -2746,7 +2746,7 @@ function completeEngagementModal(text: string, choice: ValueOf<typeof CONST.INTR
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_INTRO_SELECTED,
-            value: { choice },
+            value: {choice},
         },
     ];
 
@@ -2754,7 +2754,7 @@ function completeEngagementModal(text: string, choice: ValueOf<typeof CONST.INTR
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeChatReportID}`,
-            value: { [reportCommentAction.reportActionID ?? '']: { pendingAction: null } },
+            value: {[reportCommentAction.reportActionID ?? '']: {pendingAction: null}},
         },
     ];
 
@@ -2786,7 +2786,7 @@ function dismissEngagementModal() {
 
 /** Loads necessary data for rendering the RoomMembersPage */
 function openRoomMembersPage(reportID: string) {
-    const parameters: OpenRoomMembersPageParams = { reportID };
+    const parameters: OpenRoomMembersPageParams = {reportID};
 
     API.read(READ_COMMANDS.OPEN_ROOM_MEMBERS_PAGE, parameters);
 }
@@ -2803,7 +2803,7 @@ function hasErrorInPrivateNotes(report: OnyxEntry<Report>): boolean {
 
 /** Clears all errors associated with a given private note */
 function clearPrivateNotesError(reportID: string, accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { privateNotes: { [accountID]: { errors: null } } });
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {privateNotes: {[accountID]: {errors: null}}});
 }
 
 function getDraftPrivateNote(reportID: string): string {
@@ -2841,9 +2841,9 @@ function searchForReports(searchInput: string) {
         },
     ];
 
-    const parameters: SearchForReportsParams = { searchInput };
+    const parameters: SearchForReportsParams = {searchInput};
 
-    API.read(READ_COMMANDS.SEARCH_FOR_REPORTS, parameters, { successData, failureData });
+    API.read(READ_COMMANDS.SEARCH_FOR_REPORTS, parameters, {successData, failureData});
 }
 
 function searchInServer(searchInput: string) {
@@ -2863,7 +2863,7 @@ function updateLastVisitTime(reportID: string) {
     if (!ReportUtils.isValidReportIDFromPath(reportID)) {
         return;
     }
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, { lastVisitTime: DateUtils.getDBTime() });
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {lastVisitTime: DateUtils.getDBTime()});
 }
 
 function clearNewRoomFormError() {
@@ -2936,12 +2936,10 @@ function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEnt
         resolution,
     };
 
-    API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, { optimisticData, failureData });
+    API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, {optimisticData, failureData});
 }
 
-
-function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: OnyxEntry<ReportAction>){
-
+function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: OnyxEntry<ReportAction>) {
     const message = reportAction?.message?.[0];
     if (!message) {
         return;
@@ -2986,7 +2984,7 @@ function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: On
         reportActionID: reportAction.reportActionID,
     };
 
-    API.write(WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER, params, { optimisticData, failureData });
+    API.write(WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER, params, {optimisticData, failureData});
 }
 
 export {
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 29eae5c58331..16e749b8aa6d 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -1,9 +1,9 @@
+import {format} from 'date-fns';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import {format} from 'date-fns';
 import _ from 'underscore';
 import categoryPropTypes from '@components/categoryPropTypes';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';

From cabc1e7dc72d75427b6ac024663614e59fde6131 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 01:42:47 +0530
Subject: [PATCH 024/383] fixes more type errors

---
 src/libs/actions/Report.ts                 |  4 +++-
 src/pages/home/report/ReportActionItem.tsx | 12 +++++++++---
 src/types/onyx/OriginalMessage.ts          |  6 ++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index bcfd515c8bfe..59211432161c 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2984,7 +2984,9 @@ function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: On
         reportActionID: reportAction.reportActionID,
     };
 
-    API.write(WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER, params, {optimisticData, failureData});
+    console.log(reportAction)
+
+    // API.write(WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER, params, {optimisticData, failureData});
 }
 
 export {
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index b02403201e75..7b8853f849dc 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -62,7 +62,7 @@ import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {OriginalMessageActionableMentionWhisper, OriginalMessageJoinPolicyChangeLog} from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageActionableMentionWhisper, OriginalMessageJoinPolicyChangeLog, OriginalMessageActionableTrackedExpenseWhisper} from '@src/types/onyx/OriginalMessage';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import AnimatedEmptyStateBackground from './AnimatedEmptyStateBackground';
 import MiniReportActionContextMenu from './ContextMenu/MiniReportActionContextMenu';
@@ -372,12 +372,13 @@ function ReportActionItem({
         }
 
         if (ReportActionsUtils.isActionableTrackExpense(action)) {
+            const transactionID = (action?.originalMessage as OriginalMessageActionableTrackedExpenseWhisper['originalMessage'])?.transactionID;
             return [
                 {
                     text: 'actionableMentionTrackExpense.request',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-request`,
                     onPress: () => {
-                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(action?.originalMessage?.transactionID, report.reportID);
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID);
                     },
                     isMediumSized: true,
                 },
@@ -815,7 +816,12 @@ function ReportActionItem({
     }
 
     // if action is actionable mention whisper and resolved by user, then we don't want to render anything
-    if ((ReportActionsUtils.isActionableMentionWhisper(action) || ReportActionsUtils.isActionableTrackExpense(action)) && (action.originalMessage?.resolution ?? null)) {
+    if (ReportActionsUtils.isActionableMentionWhisper(action) && (action.originalMessage.resolution ?? null)) {
+        return null;
+    }
+
+    // if action is actionable track expense whisper and resolved by user, then we don't want to render anything
+    if (ReportActionsUtils.isActionableTrackExpense(action) && (action.originalMessage as OriginalMessageActionableTrackedExpenseWhisper['originalMessage']).resolution) {
         return null;
     }
 
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 0de566f0909f..d1813af12b75 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -281,10 +281,11 @@ type OriginalMessageReimbursementQueued = {
     };
 };
 
-type OriginalMessageTrackedExpenseWhisper = {
+type OriginalMessageActionableTrackedExpenseWhisper = {
     actionName: typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLETRACKEXPENSEWHISPER;
     originalMessage: {
         transactionID: string;
+        lastModified: string;
         //  todo: add constants for tracking expense whisper resolution
         resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION>;
     };
@@ -330,7 +331,7 @@ type OriginalMessage =
     | OriginalMessageReimbursementDequeued
     | OriginalMessageMoved
     | OriginalMessageMarkedReimbursed
-    | OriginalMessageTrackedExpenseWhisper;
+    | OriginalMessageActionableTrackedExpenseWhisper;
 
 export default OriginalMessage;
 export type {
@@ -354,4 +355,5 @@ export type {
     OriginalMessageReimbursementDequeued,
     DecisionName,
     PaymentMethodType,
+    OriginalMessageActionableTrackedExpenseWhisper
 };

From 161c67e653828951623abeb2762b508f580e476b Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 01:50:29 +0530
Subject: [PATCH 025/383] fixes lint

---
 src/libs/ReportUtils.ts    | 2 +-
 src/libs/actions/Report.ts | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 1853324fe4e9..256b9347220a 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -12,7 +12,7 @@ import type {ValueOf} from 'type-fest';
 import type {FileObject} from '@components/AttachmentModal';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as defaultWorkspaceAvatars from '@components/Icon/WorkspaceDefaultAvatars';
-import * as TransactionEdit from '@userActions/TransactionEdit';
+import * as TransactionEdit from './actions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {ParentNavigationSummaryParams, TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 59211432161c..bcfd515c8bfe 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2984,9 +2984,7 @@ function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: On
         reportActionID: reportAction.reportActionID,
     };
 
-    console.log(reportAction)
-
-    // API.write(WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER, params, {optimisticData, failureData});
+    API.write(WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER, params, {optimisticData, failureData});
 }
 
 export {

From 948216335d5f4d22992262b261c428f32a6c222c Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 01:52:13 +0530
Subject: [PATCH 026/383] prettier diffs

---
 src/libs/ReportUtils.ts                    | 2 +-
 src/pages/home/report/ReportActionItem.tsx | 2 +-
 src/types/onyx/OriginalMessage.ts          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 256b9347220a..22d9f8306c11 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -12,7 +12,6 @@ import type {ValueOf} from 'type-fest';
 import type {FileObject} from '@components/AttachmentModal';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as defaultWorkspaceAvatars from '@components/Icon/WorkspaceDefaultAvatars';
-import * as TransactionEdit from './actions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {ParentNavigationSummaryParams, TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -53,6 +52,7 @@ import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
 import * as store from './actions/ReimbursementAccount/store';
+import * as TransactionEdit from './actions/TransactionEdit';
 import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 7b8853f849dc..b47cc9bc591e 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -62,7 +62,7 @@ import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {OriginalMessageActionableMentionWhisper, OriginalMessageJoinPolicyChangeLog, OriginalMessageActionableTrackedExpenseWhisper} from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageActionableMentionWhisper, OriginalMessageActionableTrackedExpenseWhisper, OriginalMessageJoinPolicyChangeLog} from '@src/types/onyx/OriginalMessage';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import AnimatedEmptyStateBackground from './AnimatedEmptyStateBackground';
 import MiniReportActionContextMenu from './ContextMenu/MiniReportActionContextMenu';
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index d1813af12b75..af375edd845a 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -355,5 +355,5 @@ export type {
     OriginalMessageReimbursementDequeued,
     DecisionName,
     PaymentMethodType,
-    OriginalMessageActionableTrackedExpenseWhisper
+    OriginalMessageActionableTrackedExpenseWhisper,
 };

From 113d7b404862cdf4a7caaa002fc75a8cd74cc73d Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 01:59:49 +0530
Subject: [PATCH 027/383] scroll down when whisper is resolved

---
 src/pages/home/report/ReportActionItem.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index b47cc9bc591e..b082437509c5 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -329,10 +329,11 @@ function ReportActionItem({
         [draftMessage, action, report.reportID, toggleContextMenuFromActiveReportAction, originalReport, originalReportID],
     );
 
-    // Handles manual scrolling to the bottom of the chat when the last message is an actionable mention whisper and it's resolved.
+    // Handles manual scrolling to the bottom of the chat when the last message is an actionable whisper and it's resolved.
     // This fixes an issue where InvertedFlatList fails to auto scroll down and results in an empty space at the bottom of the chat in IOS.
     useEffect(() => {
-        if (index !== 0 || !ReportActionsUtils.isActionableMentionWhisper(action)) {
+        const isActionableWhisper = ReportActionsUtils.isActionableMentionWhisper(action) || ReportActionsUtils.isActionableTrackExpense(action);
+        if (index !== 0 || !isActionableWhisper) {
             return;
         }
 

From 4c3bd1a368587052b6e4480ca6ec0bf0df6ad161 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 02:19:14 +0530
Subject: [PATCH 028/383] exclude workspace chat from the participant list

---
 ...MoneyTemporaryForRefactorRequestParticipantsSelector.js | 7 ++++++-
 src/pages/iou/request/step/IOURequestStepParticipants.js   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index b052731c361c..d4cdaf7911c8 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -62,6 +62,9 @@ const propTypes = {
 
     /** Whether the parent screen transition has ended */
     didScreenTransitionEnd: PropTypes.bool,
+
+    /** The action of the IOU, i.e. create, split, move */
+    iouAction: PropTypes.oneOf(_.values(CONST.IOU.ACTION)),
 };
 
 const defaultProps = {
@@ -71,6 +74,7 @@ const defaultProps = {
     betas: [],
     dismissedReferralBanners: {},
     didScreenTransitionEnd: false,
+    iouAction: CONST.IOU.ACTION.CREATE,
 };
 
 function MoneyTemporaryForRefactorRequestParticipantsSelector({
@@ -84,6 +88,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
     iouRequestType,
     dismissedReferralBanners,
     didScreenTransitionEnd,
+    iouAction,
 }) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -120,7 +125,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
             // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
             // sees the option to request money from their admin on their own Workspace Chat.
-            iouType === CONST.IOU.TYPE.REQUEST,
+            iouType === CONST.IOU.TYPE.REQUEST && iouAction !== CONST.IOU.ACTION.MOVE,
 
             canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE,
             false,
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index 117309e57ea4..bca6c1ec607d 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -153,6 +153,7 @@ function IOURequestStepParticipants({
                     iouType={iouType}
                     iouRequestType={iouRequestType}
                     didScreenTransitionEnd={didScreenTransitionEnd}
+                    iouAction={iouAction}
                 />
             )}
         </StepScreenWrapper>

From 816a190d5e5e8456a5aadb805985574078a10325 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 24 Mar 2024 03:22:49 +0530
Subject: [PATCH 029/383] adds api command for request someone whisper

---
 src/CONST.ts                                  |  1 +
 src/libs/API/types.ts                         |  1 +
 src/libs/actions/IOU.ts                       | 90 ++++++++++++-------
 .../step/IOURequestStepConfirmation.js        | 15 +++-
 4 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 72b4f6ae62ed..888170e1b4f4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1365,6 +1365,7 @@ const CONST = {
             DELETE: 'delete',
             APPROVE: 'approve',
             TRACK: 'track',
+            MOVE: 'move',
         },
         AMOUNT_MAX_LENGTH: 10,
         RECEIPT_STATE: {
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index d6c1540bf902..c68cfa589e3d 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -194,6 +194,7 @@ const WRITE_COMMANDS = {
     SET_POLICY_DISTANCE_RATES_ENABLED: 'SetPolicyDistanceRatesEnabled',
     DELETE_POLICY_DISTANCE_RATES: 'DeletePolicyDistanceRates',
     DISMISS_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
+    CONVERT_TRACKED_EXPENSE_TO_REQUEST: 'ConvertTrackedExpenseToRequest',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 857f6f39173a..a6f5ce7deb61 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2071,6 +2071,7 @@ function requestMoney(
     policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     gpsPoints = undefined,
+    isConvertingFromTrackExpenseToRequest = undefined,
 ) {
     // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
@@ -2091,7 +2092,7 @@ function requestMoney(
         createdReportActionIDForThread,
         onyxData,
     } = getMoneyRequestInformation(
-        currentChatReport,
+        isConvertingFromTrackExpenseToRequest ? {} : currentChatReport,
         participant,
         comment,
         amount,
@@ -2110,38 +2111,67 @@ function requestMoney(
         payeeEmail,
         moneyRequestReportID,
     );
+
+    // console.log('payerAccountID', payerAccountID);
+    // console.log('payerEmail', payerEmail);
+    // console.log('iouReport', iouReport);
+    // console.log('chatReport', chatReport);
+    // console.log('transaction', transaction);
+    // console.log('iouAction', iouAction);
+    // console.log('createdChatReportActionID', createdChatReportActionID);
+    // console.log('createdIOUReportActionID', createdIOUReportActionID);
+    // console.log('reportPreviewAction', reportPreviewAction);
+    // console.log('transactionThreadReportID', transactionThreadReportID);
+    // console.log('createdReportActionIDForThread', createdReportActionIDForThread);
+    // console.log('onyxData', onyxData);
+
     const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
 
-    const parameters: RequestMoneyParams = {
-        debtorEmail: payerEmail,
-        debtorAccountID: payerAccountID,
-        amount,
-        currency,
-        comment,
-        created: currentCreated,
-        merchant,
-        iouReportID: iouReport.reportID,
-        chatReportID: chatReport.reportID,
-        transactionID: transaction.transactionID,
-        reportActionID: iouAction.reportActionID,
-        createdChatReportActionID,
-        createdIOUReportActionID,
-        reportPreviewReportActionID: reportPreviewAction.reportActionID,
-        receipt,
-        receiptState: receipt?.state,
-        category,
-        tag,
-        taxCode,
-        taxAmount,
-        billable,
-        // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
-        gpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
-        transactionThreadReportID,
-        createdReportActionIDForThread,
-    };
+    if (isConvertingFromTrackExpenseToRequest) {
+        const parameters = {
+            payerAccountID,
+            iouReportID: iouReport.reportID,
+            chatReportID: chatReport.reportID,
+            transactionID: transaction.transactionID,
+            reportActionID: iouAction.reportActionID,
+            createdChatReportActionID,
+            createdIOUReportActionID,
+            reportPreviewReportActionID: reportPreviewAction.reportActionID,
+        };
+        API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, onyxData);
+    } else {
+        const parameters: RequestMoneyParams = {
+            debtorEmail: payerEmail,
+            debtorAccountID: payerAccountID,
+            amount,
+            currency,
+            comment,
+            created: currentCreated,
+            merchant,
+            iouReportID: iouReport.reportID,
+            chatReportID: chatReport.reportID,
+            transactionID: transaction.transactionID,
+            reportActionID: iouAction.reportActionID,
+            createdChatReportActionID,
+            createdIOUReportActionID,
+            reportPreviewReportActionID: reportPreviewAction.reportActionID,
+            receipt,
+            receiptState: receipt?.state,
+            category,
+            tag,
+            taxCode,
+            taxAmount,
+            billable,
+            // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
+            gpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
+            transactionThreadReportID,
+            createdReportActionIDForThread,
+        };
 
-    API.write(WRITE_COMMANDS.REQUEST_MONEY, parameters, onyxData);
-    resetMoneyRequestInfo();
+        // eslint-disable-next-line rulesdir/no-multiple-api-calls
+        API.write(WRITE_COMMANDS.REQUEST_MONEY, parameters, onyxData);
+        resetMoneyRequestInfo();
+    }
     Navigation.dismissModal(activeReportID);
     Report.notifyNewAction(activeReportID, payeeAccountID);
 }
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 16e749b8aa6d..73f90171190b 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -198,6 +198,7 @@ function IOURequestStepConfirmation({
      */
     const requestMoney = useCallback(
         (selectedParticipants, trimmedComment, receiptObj, gpsPoints) => {
+            const isConvertingFromTrackExpenseToRequest = iouAction === CONST.IOU.ACTION.MOVE;
             IOU.requestMoney(
                 report,
                 transaction.amount,
@@ -218,9 +219,21 @@ function IOURequestStepConfirmation({
                 policyTags,
                 policyCategories,
                 gpsPoints,
+                isConvertingFromTrackExpenseToRequest,
             );
         },
-        [report, transaction, transactionTaxCode, transactionTaxAmount, currentUserPersonalDetails.login, currentUserPersonalDetails.accountID, policy, policyTags, policyCategories],
+        [
+            report,
+            transaction,
+            transactionTaxCode,
+            transactionTaxAmount,
+            currentUserPersonalDetails.login,
+            currentUserPersonalDetails.accountID,
+            policy,
+            policyTags,
+            policyCategories,
+            iouAction,
+        ],
     );
 
     /**

From 0420ab50b5a844e8badd664e2d4bb641803e9825 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 25 Mar 2024 01:38:01 +0530
Subject: [PATCH 030/383] adds basic handling for categorize tracked exp.

---
 src/CONST.ts                                  |  1 +
 src/libs/ReportUtils.ts                       |  4 +-
 src/pages/home/report/ReportActionItem.tsx    |  4 +-
 ...yForRefactorRequestParticipantsSelector.js | 39 ++++++++++++++++++-
 .../step/withFullTransactionOrNotFound.js     |  6 ++-
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index f3a90ad85615..db1eeed5e924 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1343,6 +1343,7 @@ const CONST = {
             EDIT: 'edit',
             CREATE: 'create',
             MOVE: 'move',
+            CATEGORIZE: 'categorize',
         },
         DEFAULT_AMOUNT: 0,
         TYPE: {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 85d902ba45fe..3b31ca285669 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5511,7 +5511,7 @@ function hasActionsWithErrors(reportID: string): boolean {
     return Object.values(reportActions ?? {}).some((action) => !isEmptyObject(action.errors));
 }
 
-function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string) {
+function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>): void {
     const transaction = getTransaction(transactionID);
     if (isEmpty(transaction)) {
         return;
@@ -5519,7 +5519,7 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
 
     TransactionEdit.createBackupTransaction(transaction as Transaction);
 
-    Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID, undefined, CONST.IOU.ACTION.MOVE));
+    Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID, undefined, actionName));
 }
 
 export {
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index b082437509c5..152ea7a95cdd 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -379,14 +379,14 @@ function ReportActionItem({
                     text: 'actionableMentionTrackExpense.request',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-request`,
                     onPress: () => {
-                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID);
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.MOVE);
                     },
                     isMediumSized: true,
                 },
                 {
                     text: 'actionableMentionTrackExpense.categorize',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`,
-                    onPress: () => console.log('Categorize'),
+                    onPress: () => ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.CATEGORIZE),
                     isMediumSized: true,
                 },
                 {
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index d4cdaf7911c8..7ffd0a54eb21 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -4,8 +4,10 @@ import React, {useCallback, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import Button from '@components/Button';
 import FormHelpMessage from '@components/FormHelpMessage';
+import * as Illustrations from '@components/Icon/Illustrations';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import {PressableWithFeedback} from '@components/Pressable';
 import ReferralProgramCTA from '@components/ReferralProgramCTA';
@@ -21,8 +23,13 @@ import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import reportPropTypes from '@pages/reportPropTypes';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import Navigation from '@libs/Navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+import OfflineIndicator from '@components/OfflineIndicator';
 
 const propTypes = {
     /** Beta features list */
@@ -102,6 +109,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
     const maxParticipantsReached = participants.length === CONST.REPORT.MAXIMUM_PARTICIPANTS;
     const setSearchTermAndSearchInServer = useSearchTermAndSearch(setSearchTerm, maxParticipantsReached);
+    const {isSmallScreenWidth} = useWindowDimensions();
 
     /**
      * Returns the sections needed for the OptionsSelector
@@ -127,7 +135,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
             // sees the option to request money from their admin on their own Workspace Chat.
             iouType === CONST.IOU.TYPE.REQUEST && iouAction !== CONST.IOU.ACTION.MOVE,
 
-            canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE,
+            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && iouAction !== CONST.IOU.ACTION.CATEGORIZE,
             false,
             {},
             [],
@@ -185,7 +193,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
         }
 
         return [newSections, chatOptions];
-    }, [didScreenTransitionEnd, reports, personalDetails, betas, searchTerm, participants, iouType, iouRequestType, maxParticipantsReached, canUseP2PDistanceRequests, translate]);
+    }, [didScreenTransitionEnd, reports, personalDetails, betas, searchTerm, participants, iouType, iouRequestType, maxParticipantsReached, canUseP2PDistanceRequests, translate, iouAction]);
 
     /**
      * Adds a single participant to the request
@@ -350,6 +358,33 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
     const isOptionsDataReady = useMemo(() => ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails), [personalDetails]);
 
+    const renderEmptyWorkspaceView = () => (
+        <>
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyWorkspaceIconWidth}
+                iconHeight={variables.emptyWorkspaceIconHeight}
+                title={translate('workspace.emptyWorkspace.notFound')}
+                subtitle={translate('workspace.emptyWorkspace.description')}
+                shouldShowLink={false}
+            />
+            <Button
+                success
+                large
+                text={translate('footer.learnMore')}
+                onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}
+                style={[styles.mh5, styles.mb5]}
+            />
+            {isSmallScreenWidth && <OfflineIndicator />}
+        </>
+    );
+
+    const isAllSectionsEmpty = _.every(sections, (section) => section.data.length === 0);
+
+    if (iouAction === CONST.IOU.ACTION.CATEGORIZE && isAllSectionsEmpty && didScreenTransitionEnd) {
+        return renderEmptyWorkspaceView();
+    }
+
     return (
         <View style={[styles.flex1, styles.w100, participants.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
             <SelectionList
diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.js b/src/pages/iou/request/step/withFullTransactionOrNotFound.js
index 25ae6a63e45d..1c7b4432254e 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.js
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.js
@@ -71,7 +71,11 @@ export default function (WrappedComponent) {
             key: ({route}) => {
                 const transactionID = lodashGet(route, 'params.transactionID', 0);
                 const userAction = lodashGet(route, 'params.action', CONST.IOU.ACTION.CREATE);
-                return `${[CONST.IOU.ACTION.CREATE, CONST.IOU.ACTION.MOVE].includes(userAction) ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+                return `${
+                    [CONST.IOU.ACTION.CREATE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(userAction)
+                        ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT
+                        : ONYXKEYS.COLLECTION.TRANSACTION
+                }${transactionID}`;
             },
         },
     })(WithFullTransactionOrNotFoundWithRef);

From deb3d6b41d8df7db0dd8f9fcd593b1a61bd05330 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 25 Mar 2024 02:19:46 +0530
Subject: [PATCH 031/383] fixes type errors

---
 .../ConvertTrackedExpenseToRequestParams.ts          | 12 ++++++++++++
 src/libs/API/parameters/index.ts                     |  1 +
 src/libs/API/types.ts                                |  1 +
 .../iou/request/step/IOURequestStepConfirmation.js   |  4 ++--
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts

diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
new file mode 100644
index 000000000000..a0a16a2fb5b6
--- /dev/null
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -0,0 +1,12 @@
+type ConvertTrackedExpenseToRequestParams = {
+	payerAccountID: number;
+	transactionID: string;
+	reportActionID: string;
+	createdChatReportActionID: string;
+	createdIOUReportActionID: string;
+	reportPreviewReportActionID: string;
+};
+
+export default ConvertTrackedExpenseToRequestParams;
+
+
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 1c85c69698da..d111a69bba96 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -197,3 +197,4 @@ export type {default as SetPolicyForeignCurrencyDefaultParams} from './SetPolicy
 export type {default as SetPolicyCurrencyDefaultParams} from './SetPolicyCurrencyDefaultParams';
 export type {default as RenamePolicyTaxParams} from './RenamePolicyTaxParams';
 export type {default as DismissTrackExpenseActionableWhisperParams} from './DismissTrackExpenseActionableWhisperParams';
+export type {default as ConvertTrackedExpenseToRequestParams} from './ConvertTrackedExpenseToRequestParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index c68cfa589e3d..5784aa8dd139 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -387,6 +387,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED]: Parameters.SetPolicyDistanceRatesEnabledParams;
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
     [WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
+    [WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST]: Parameters.ConvertTrackedExpenseToRequestParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 73f90171190b..2b12f570696a 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -201,7 +201,7 @@ function IOURequestStepConfirmation({
             const isConvertingFromTrackExpenseToRequest = iouAction === CONST.IOU.ACTION.MOVE;
             IOU.requestMoney(
                 report,
-                transaction.amount,
+                TransactionUtils.getAmount(transaction, undefined, [CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(iouAction)),
                 transaction.currency,
                 transaction.created,
                 transaction.merchant,
@@ -537,7 +537,7 @@ function IOURequestStepConfirmation({
                             transaction={transaction}
                             hasMultipleParticipants={iouType === CONST.IOU.TYPE.SPLIT}
                             selectedParticipants={participants}
-                            iouAmount={transaction.amount}
+                            iouAmount={TransactionUtils.getAmount(transaction, undefined, true)}
                             iouComment={lodashGet(transaction, 'comment.comment', '')}
                             iouCurrencyCode={transaction.currency}
                             iouIsBillable={transaction.billable}

From 0d4a429c6bf4cfcd29781515549a881c18491537 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 25 Mar 2024 04:24:26 +0530
Subject: [PATCH 032/383] fix navigation from confirmation page to catgory page

---
 ...oraryForRefactorRequestConfirmationList.js |  4 ++--
 .../request/step/IOURequestStepCategory.js    |  7 ++++++
 .../step/IOURequestStepParticipants.js        | 24 ++++++++++++-------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 56986c3cb8e0..7afd0612fe98 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -797,7 +797,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     description={translate('common.category')}
                     numberOfLinesTitle={2}
                     onPress={() =>
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()))
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()), iouAction === CONST.IOU.ACTION.CATEGORIZE ? CONST.NAVIGATION.ACTION_TYPE.PUSH : undefined)
                     }
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
@@ -807,7 +807,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                 />
             ),
             shouldShow: shouldShowCategories,
-            isSupplementary: !isCategoryRequired,
+            isSupplementary: iouAction === CONST.IOU.ACTION.CATEGORIZE ? false : !isCategoryRequired,
         },
         ..._.map(policyTagLists, ({name}, index) => ({
             item: (
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.js b/src/pages/iou/request/step/IOURequestStepCategory.js
index 4f0c77480c04..f2a4889b3fb8 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.js
+++ b/src/pages/iou/request/step/IOURequestStepCategory.js
@@ -20,6 +20,7 @@ import reportActionPropTypes from '@pages/home/report/reportActionPropTypes';
 import reportPropTypes from '@pages/reportPropTypes';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {policyPropTypes} from '@src/pages/workspace/withPolicy';
 import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes';
@@ -125,6 +126,12 @@ function IOURequestStepCategory({
         }
 
         IOU.setMoneyRequestCategory(transactionID, updatedCategory);
+
+        if (action === CONST.IOU.ACTION.CATEGORIZE) {
+            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(iouType, transactionID, report.reportID, action));
+            return;
+        }
+
         navigateBack();
     };
 
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index bca6c1ec607d..68114077cd38 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -1,6 +1,6 @@
-import {useNavigation} from '@react-navigation/native';
+import { useNavigation } from '@react-navigation/native';
 import lodashGet from 'lodash/get';
-import React, {useCallback, useEffect, useMemo, useRef} from 'react';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import _ from 'underscore';
 import transactionPropTypes from '@components/transactionPropTypes';
 import useLocalize from '@hooks/useLocalize';
@@ -32,12 +32,12 @@ const defaultProps = {
 
 function IOURequestStepParticipants({
     route: {
-        params: {iouType, reportID, transactionID, action: iouAction},
+        params: { iouType, reportID, transactionID, action: iouAction },
     },
     transaction,
-    transaction: {participants = []},
+    transaction: { participants = [] },
 }) {
-    const {translate} = useLocalize();
+    const { translate } = useLocalize();
     const navigation = useNavigation();
     const selectedReportID = useRef(reportID);
     const numberOfParticipants = useRef(participants.length);
@@ -62,7 +62,7 @@ function IOURequestStepParticipants({
     // This is because until the request is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
     // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
     useEffect(() => {
-        IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, () => {}, iouRequestType, iouType, transactionID, reportID, receiptType);
+        IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, () => { }, iouRequestType, iouType, transactionID, reportID, receiptType);
     }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID]);
 
     const updateRouteParams = useCallback(() => {
@@ -126,9 +126,17 @@ function IOURequestStepParticipants({
                 nextStepIOUType = CONST.IOU.TYPE.SEND;
             }
 
+            const isCategorizing = iouAction === CONST.IOU.ACTION.CATEGORIZE;
+
             IOU.setMoneyRequestTag(transactionID, '');
             IOU.setMoneyRequestCategory(transactionID, '');
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(nextStepIOUType, transactionID, selectedReportID.current || reportID, iouAction));
+
+            const iouConfirmationPageRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(nextStepIOUType, transactionID, selectedReportID.current || reportID, iouAction);
+            if (isCategorizing) {
+                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, nextStepIOUType, transactionID, selectedReportID.current || reportID, iouConfirmationPageRoute));
+            } else {
+                Navigation.navigate(iouConfirmationPageRoute);
+            }
         },
         [iouType, transactionID, reportID, iouAction],
     );
@@ -145,7 +153,7 @@ function IOURequestStepParticipants({
             testID={IOURequestStepParticipants.displayName}
             includeSafeAreaPaddingBottom
         >
-            {({didScreenTransitionEnd}) => (
+            {({ didScreenTransitionEnd }) => (
                 <MoneyRequestParticipantsSelector
                     participants={isSplitRequest ? participants : []}
                     onParticipantsAdded={addParticipant}

From f860fa08e9e8bc56033ca0a815d5c2113408e2a4 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 25 Mar 2024 04:25:14 +0530
Subject: [PATCH 033/383] run prettier

---
 ...yTemporaryForRefactorRequestConfirmationList.js |  5 ++++-
 .../ConvertTrackedExpenseToRequestParams.ts        | 14 ++++++--------
 ...poraryForRefactorRequestParticipantsSelector.js |  6 +++---
 .../iou/request/step/IOURequestStepCategory.js     |  2 +-
 .../iou/request/step/IOURequestStepParticipants.js | 14 +++++++-------
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 7afd0612fe98..30ddc76b87b2 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -797,7 +797,10 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     description={translate('common.category')}
                     numberOfLinesTitle={2}
                     onPress={() =>
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()), iouAction === CONST.IOU.ACTION.CATEGORIZE ? CONST.NAVIGATION.ACTION_TYPE.PUSH : undefined)
+                        Navigation.navigate(
+                            ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            iouAction === CONST.IOU.ACTION.CATEGORIZE ? CONST.NAVIGATION.ACTION_TYPE.PUSH : undefined,
+                        )
                     }
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
index a0a16a2fb5b6..71e58dd812e9 100644
--- a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -1,12 +1,10 @@
 type ConvertTrackedExpenseToRequestParams = {
-	payerAccountID: number;
-	transactionID: string;
-	reportActionID: string;
-	createdChatReportActionID: string;
-	createdIOUReportActionID: string;
-	reportPreviewReportActionID: string;
+    payerAccountID: number;
+    transactionID: string;
+    reportActionID: string;
+    createdChatReportActionID: string;
+    createdIOUReportActionID: string;
+    reportPreviewReportActionID: string;
 };
 
 export default ConvertTrackedExpenseToRequestParams;
-
-
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 7ffd0a54eb21..66559df62655 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -8,6 +8,7 @@ import BlockingView from '@components/BlockingViews/BlockingView';
 import Button from '@components/Button';
 import FormHelpMessage from '@components/FormHelpMessage';
 import * as Illustrations from '@components/Icon/Illustrations';
+import OfflineIndicator from '@components/OfflineIndicator';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import {PressableWithFeedback} from '@components/Pressable';
 import ReferralProgramCTA from '@components/ReferralProgramCTA';
@@ -19,17 +20,16 @@ import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
 import useSearchTermAndSearch from '@hooks/useSearchTermAndSearch';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import reportPropTypes from '@pages/reportPropTypes';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import Navigation from '@libs/Navigation/Navigation';
 import ROUTES from '@src/ROUTES';
-import OfflineIndicator from '@components/OfflineIndicator';
 
 const propTypes = {
     /** Beta features list */
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.js b/src/pages/iou/request/step/IOURequestStepCategory.js
index f2a4889b3fb8..5a5fcc04c6f7 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.js
+++ b/src/pages/iou/request/step/IOURequestStepCategory.js
@@ -20,9 +20,9 @@ import reportActionPropTypes from '@pages/home/report/reportActionPropTypes';
 import reportPropTypes from '@pages/reportPropTypes';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {policyPropTypes} from '@src/pages/workspace/withPolicy';
+import ROUTES from '@src/ROUTES';
 import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes';
 import StepScreenWrapper from './StepScreenWrapper';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index 68114077cd38..d4184bacf524 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -1,6 +1,6 @@
-import { useNavigation } from '@react-navigation/native';
+import {useNavigation} from '@react-navigation/native';
 import lodashGet from 'lodash/get';
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, {useCallback, useEffect, useMemo, useRef} from 'react';
 import _ from 'underscore';
 import transactionPropTypes from '@components/transactionPropTypes';
 import useLocalize from '@hooks/useLocalize';
@@ -32,12 +32,12 @@ const defaultProps = {
 
 function IOURequestStepParticipants({
     route: {
-        params: { iouType, reportID, transactionID, action: iouAction },
+        params: {iouType, reportID, transactionID, action: iouAction},
     },
     transaction,
-    transaction: { participants = [] },
+    transaction: {participants = []},
 }) {
-    const { translate } = useLocalize();
+    const {translate} = useLocalize();
     const navigation = useNavigation();
     const selectedReportID = useRef(reportID);
     const numberOfParticipants = useRef(participants.length);
@@ -62,7 +62,7 @@ function IOURequestStepParticipants({
     // This is because until the request is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
     // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
     useEffect(() => {
-        IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, () => { }, iouRequestType, iouType, transactionID, reportID, receiptType);
+        IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, () => {}, iouRequestType, iouType, transactionID, reportID, receiptType);
     }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID]);
 
     const updateRouteParams = useCallback(() => {
@@ -153,7 +153,7 @@ function IOURequestStepParticipants({
             testID={IOURequestStepParticipants.displayName}
             includeSafeAreaPaddingBottom
         >
-            {({ didScreenTransitionEnd }) => (
+            {({didScreenTransitionEnd}) => (
                 <MoneyRequestParticipantsSelector
                     participants={isSplitRequest ? participants : []}
                     onParticipantsAdded={addParticipant}

From 151da261342b3b4b4dcf4b1b8f5098dd45f705a8 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 26 Mar 2024 13:07:06 +0700
Subject: [PATCH 034/383] Fix the optimistic data of hold action isn't
 consistent with backend data

---
 src/libs/actions/IOU.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 85ab98bb7819..17785304af80 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -5047,8 +5047,9 @@ function getIOUReportID(iou?: OnyxTypes.IOU, route?: MoneyRequestRoute): string
  * Put money request on HOLD
  */
 function putOnHold(transactionID: string, comment: string, reportID: string) {
-    const createdReportAction = ReportUtils.buildOptimisticHoldReportAction();
-    const createdReportActionComment = ReportUtils.buildOptimisticHoldReportActionComment(comment);
+    const currentTime = DateUtils.getDBTime();
+    const createdReportAction = ReportUtils.buildOptimisticHoldReportAction(DateUtils.subtractMillisecondsFromDateTime(currentTime, 1));
+    const createdReportActionComment = ReportUtils.buildOptimisticHoldReportActionComment(comment, currentTime);
 
     const optimisticData: OnyxUpdate[] = [
         {

From a460367b1250a618b80c634595f48da22ef18bb9 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 26 Mar 2024 20:08:20 +0530
Subject: [PATCH 035/383] polish categorize flow

---
 src/libs/ReportUtils.ts                       |   4 +-
 src/libs/actions/IOU.ts                       | 164 +++++++++++-------
 src/pages/home/report/ReportActionItem.tsx    |   4 +-
 .../request/step/IOURequestStepCategory.js    |  22 ++-
 .../step/IOURequestStepConfirmation.js        |   4 +-
 src/types/onyx/Transaction.ts                 |   3 +
 6 files changed, 135 insertions(+), 66 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 7b7396ea75de..9a7161e9a08a 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5516,13 +5516,13 @@ function hasActionsWithErrors(reportID: string): boolean {
     return Object.values(reportActions ?? {}).some((action) => !isEmptyObject(action.errors));
 }
 
-function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>): void {
+function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>, reportActionID: string): void {
     const transaction = getTransaction(transactionID);
     if (isEmpty(transaction)) {
         return;
     }
 
-    TransactionEdit.createBackupTransaction(transaction as Transaction);
+    TransactionEdit.createBackupTransaction({...transaction, actionableWhisperReportActionID: reportActionID} as Transaction);
 
     Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID, undefined, actionName));
 }
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 51a129ea4b30..d2f3373bf1e7 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2085,13 +2085,16 @@ function requestMoney(
     policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     gpsPoints = undefined,
-    isConvertingFromTrackExpenseToRequest = undefined,
+    action?: ValueOf<typeof CONST.IOU.ACTION>,
+    actionableWhisperReportActionID?: string,
 ) {
     // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
     const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
     const moneyRequestReportID = isMoneyRequestReport ? report.reportID : '';
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
+    const isConvertingFromTrackExpenseToRequest = action === CONST.IOU.ACTION.MOVE;
+
     const {
         payerAccountID,
         payerEmail,
@@ -2126,70 +2129,115 @@ function requestMoney(
         moneyRequestReportID,
     );
 
-    // console.log('payerAccountID', payerAccountID);
-    // console.log('payerEmail', payerEmail);
-    // console.log('iouReport', iouReport);
-    // console.log('chatReport', chatReport);
-    // console.log('transaction', transaction);
-    // console.log('iouAction', iouAction);
-    // console.log('createdChatReportActionID', createdChatReportActionID);
-    // console.log('createdIOUReportActionID', createdIOUReportActionID);
-    // console.log('reportPreviewAction', reportPreviewAction);
-    // console.log('transactionThreadReportID', transactionThreadReportID);
-    // console.log('createdReportActionIDForThread', createdReportActionIDForThread);
-    // console.log('onyxData', onyxData);
-
     const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
 
-    if (isConvertingFromTrackExpenseToRequest) {
-        const parameters = {
-            payerAccountID,
-            iouReportID: iouReport.reportID,
-            chatReportID: chatReport.reportID,
-            transactionID: transaction.transactionID,
-            reportActionID: iouAction.reportActionID,
-            createdChatReportActionID,
-            createdIOUReportActionID,
-            reportPreviewReportActionID: reportPreviewAction.reportActionID,
-        };
-        API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, onyxData);
-    } else {
-        const parameters: RequestMoneyParams = {
-            debtorEmail: payerEmail,
-            debtorAccountID: payerAccountID,
-            amount,
-            currency,
-            comment,
-            created: currentCreated,
-            merchant,
-            iouReportID: iouReport.reportID,
-            chatReportID: chatReport.reportID,
-            transactionID: transaction.transactionID,
-            reportActionID: iouAction.reportActionID,
-            createdChatReportActionID,
-            createdIOUReportActionID,
-            reportPreviewReportActionID: reportPreviewAction.reportActionID,
-            receipt,
-            receiptState: receipt?.state,
-            category,
-            tag,
-            taxCode,
-            taxAmount,
-            billable,
-            // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
-            gpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
-            transactionThreadReportID,
-            createdReportActionIDForThread,
-        };
-
-        // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.REQUEST_MONEY, parameters, onyxData);
-        resetMoneyRequestInfo();
+    switch (action) {
+        case CONST.IOU.ACTION.MOVE: {
+            const parameters = {
+                payerAccountID,
+                iouReportID: iouReport.reportID,
+                chatReportID: chatReport.reportID,
+                transactionID: transaction.transactionID,
+                reportActionID: iouAction.reportActionID,
+                createdChatReportActionID,
+                createdIOUReportActionID,
+                reportPreviewReportActionID: reportPreviewAction.reportActionID,
+            };
+            API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, onyxData);
+            break;
+        }
+        case CONST.IOU.ACTION.CATEGORIZE: {
+            const params = {
+                policyID: chatReport.policyID,
+                transactionID: transaction.transactionID,
+                actionableWhisperReportActionID,
+                moneyRequestReportID: iouReport.reportID,
+                moneyRequestCreatedReportActionID: createdChatReportActionID,
+            };
+            console.log('Categorizing tracked transaction', params);
+            break;
+        }
+        default: {
+            const parameters: RequestMoneyParams = {
+                debtorEmail: payerEmail,
+                debtorAccountID: payerAccountID,
+                amount,
+                currency,
+                comment,
+                created: currentCreated,
+                merchant,
+                iouReportID: iouReport.reportID,
+                chatReportID: chatReport.reportID,
+                transactionID: transaction.transactionID,
+                reportActionID: iouAction.reportActionID,
+                createdChatReportActionID,
+                createdIOUReportActionID,
+                reportPreviewReportActionID: reportPreviewAction.reportActionID,
+                receipt,
+                receiptState: receipt?.state,
+                category,
+                tag,
+                taxCode,
+                taxAmount,
+                billable,
+                // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
+                gpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
+                transactionThreadReportID,
+                createdReportActionIDForThread,
+            };
+
+            // eslint-disable-next-line rulesdir/no-multiple-api-calls
+            API.write(WRITE_COMMANDS.REQUEST_MONEY, parameters, onyxData);
+            resetMoneyRequestInfo();
+        }
     }
     Navigation.dismissModal(activeReportID);
     Report.notifyNewAction(activeReportID, payeeAccountID);
 }
 
+function categorizeTrackedTransaction(chatReportID, action) {
+    const policyID = generatePolicyID();
+    const workspaceName = generateDefaultWorkspaceName('');
+    const {
+        announceChatReportID,
+        announceChatData,
+        announceReportActionData,
+        announceCreatedReportActionID,
+        adminsChatReportID,
+        adminsChatData,
+        adminsReportActionData,
+        adminsCreatedReportActionID,
+        expenseChatReportID,
+        expenseChatData,
+        expenseReportActionData,
+        expenseCreatedReportActionID,
+    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
+
+    const moneyRequestReport = ReportUtils.buildOptimisticExpenseReport(chatReportID, policyID, sessionAccountID, 0, 'USD');
+    const moneyRequestCreatedReportActionID = ReportUtils.buildOptimisticCreatedReportAction(sessionEmail ?? '');
+
+    const params = {
+        policyID,
+        transactionID: action.originalMessage.transactionID,
+
+        // reportActionID of the actionable whisper
+        actionableWhisperReportActionID: action.reportActionID,
+
+        // Parameters for the money request
+        moneyRequestReportID: moneyRequestReport.reportID,
+        moneyRequestCreatedReportActionID,
+
+        // Parameters for the workspace
+        announceChatReportID,
+        announceCreatedReportActionID,
+        adminsChatReportID,
+        adminsCreatedReportActionID,
+        policyExpenseChatReportID: expenseChatReportID,
+        policyExpenseCreatedReportActionID: expenseCreatedReportActionID,
+    };
+    API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, params);
+}
+
 /**
  * Track an expense
  */
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 168a2b3ca73c..ac648bc1a5d1 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -379,14 +379,14 @@ function ReportActionItem({
                     text: 'actionableMentionTrackExpense.request',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-request`,
                     onPress: () => {
-                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.MOVE);
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.MOVE, action.reportActionID);
                     },
                     isMediumSized: true,
                 },
                 {
                     text: 'actionableMentionTrackExpense.categorize',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`,
-                    onPress: () => ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.CATEGORIZE),
+                    onPress: () => ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID),
                     isMediumSized: true,
                 },
                 {
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.js b/src/pages/iou/request/step/IOURequestStepCategory.js
index 5a5fcc04c6f7..7131ad3d46b2 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.js
+++ b/src/pages/iou/request/step/IOURequestStepCategory.js
@@ -1,7 +1,7 @@
 import lodashGet from 'lodash/get';
 import lodashIsEmpty from 'lodash/isEmpty';
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, {useEffect} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import CategoryPicker from '@components/CategoryPicker';
@@ -10,6 +10,7 @@ import tagPropTypes from '@components/tagPropTypes';
 import Text from '@components/Text';
 import transactionPropTypes from '@components/transactionPropTypes';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import compose from '@libs/compose';
 import Navigation from '@libs/Navigation/Navigation';
@@ -19,6 +20,7 @@ import * as TransactionUtils from '@libs/TransactionUtils';
 import reportActionPropTypes from '@pages/home/report/reportActionPropTypes';
 import reportPropTypes from '@pages/reportPropTypes';
 import * as IOU from '@userActions/IOU';
+import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {policyPropTypes} from '@src/pages/workspace/withPolicy';
@@ -94,9 +96,11 @@ function IOURequestStepCategory({
     const {category: transactionCategory} = ReportUtils.getTransactionDetails(isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction);
 
     const reportAction = reportActions[report.parentReportActionID || reportActionID];
-    const shouldShowCategory = ReportUtils.isGroupPolicy(report) && (transactionCategory || OptionsListUtils.hasEnabledOptions(_.values(policyCategories)));
+    const shouldShowCategory =
+        ReportUtils.isGroupPolicy(report) && (transactionCategory || OptionsListUtils.hasEnabledOptions(_.values(policyCategories)) || action === CONST.IOU.ACTION.CATEGORIZE);
     const isSplitBill = iouType === CONST.IOU.TYPE.SPLIT;
     const canEditSplitBill = isSplitBill && reportAction && session.accountID === reportAction.actorAccountID && TransactionUtils.areRequiredFieldsEmpty(transaction);
+
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage = !shouldShowCategory || (isEditing && (isSplitBill ? !canEditSplitBill : !ReportUtils.canEditMoneyRequest(reportAction)));
 
@@ -104,6 +108,20 @@ function IOURequestStepCategory({
         Navigation.goBack(backTo);
     };
 
+    const fetchData = () => {
+        if (policy && policyCategories) {
+            return;
+        }
+
+        Policy.openDraftWorkspaceRequest(report.policyID);
+    };
+    useNetwork({onReconnect: fetchData});
+
+    useEffect(() => {
+        fetchData();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
     /**
      * @param {Object} category
      * @param {String} category.searchText
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 2b12f570696a..1a69e0ec876f 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -198,7 +198,6 @@ function IOURequestStepConfirmation({
      */
     const requestMoney = useCallback(
         (selectedParticipants, trimmedComment, receiptObj, gpsPoints) => {
-            const isConvertingFromTrackExpenseToRequest = iouAction === CONST.IOU.ACTION.MOVE;
             IOU.requestMoney(
                 report,
                 TransactionUtils.getAmount(transaction, undefined, [CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(iouAction)),
@@ -219,7 +218,8 @@ function IOURequestStepConfirmation({
                 policyTags,
                 policyCategories,
                 gpsPoints,
-                isConvertingFromTrackExpenseToRequest,
+                iouAction,
+                transaction.actionableWhisperReportActionID,
             );
         },
         [
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index 1a7541955720..b3068e578733 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -209,6 +209,9 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
 
         /** Indicates transaction loading */
         isLoading?: boolean;
+
+        /** The actionable report action ID associated with the transaction */
+        actionableWhisperReportActionID?: string;
     },
     keyof Comment
 >;

From 302b53693c44a57bad0c3cab103d16a9d1306eba Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 26 Mar 2024 20:20:36 +0530
Subject: [PATCH 036/383] remove unused code

---
 src/libs/IOUUtils.ts    |  2 +-
 src/libs/actions/IOU.ts | 43 -----------------------------------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index 7c3abf8804b4..7a3f58bda669 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -14,7 +14,7 @@ function navigateToStartMoneyRequestStep(
     reportID: string,
     iouAction?: ValueOf<typeof CONST.IOU.ACTION>,
 ): void {
-    if (iouAction === CONST.IOU.ACTION.MOVE) {
+    if (iouAction === CONST.IOU.ACTION.CATEGORIZE || iouAction === CONST.IOU.ACTION.MOVE) {
         Navigation.goBack();
         return;
     }
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index d2f3373bf1e7..2d6af9634519 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2195,49 +2195,6 @@ function requestMoney(
     Report.notifyNewAction(activeReportID, payeeAccountID);
 }
 
-function categorizeTrackedTransaction(chatReportID, action) {
-    const policyID = generatePolicyID();
-    const workspaceName = generateDefaultWorkspaceName('');
-    const {
-        announceChatReportID,
-        announceChatData,
-        announceReportActionData,
-        announceCreatedReportActionID,
-        adminsChatReportID,
-        adminsChatData,
-        adminsReportActionData,
-        adminsCreatedReportActionID,
-        expenseChatReportID,
-        expenseChatData,
-        expenseReportActionData,
-        expenseCreatedReportActionID,
-    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
-
-    const moneyRequestReport = ReportUtils.buildOptimisticExpenseReport(chatReportID, policyID, sessionAccountID, 0, 'USD');
-    const moneyRequestCreatedReportActionID = ReportUtils.buildOptimisticCreatedReportAction(sessionEmail ?? '');
-
-    const params = {
-        policyID,
-        transactionID: action.originalMessage.transactionID,
-
-        // reportActionID of the actionable whisper
-        actionableWhisperReportActionID: action.reportActionID,
-
-        // Parameters for the money request
-        moneyRequestReportID: moneyRequestReport.reportID,
-        moneyRequestCreatedReportActionID,
-
-        // Parameters for the workspace
-        announceChatReportID,
-        announceCreatedReportActionID,
-        adminsChatReportID,
-        adminsCreatedReportActionID,
-        policyExpenseChatReportID: expenseChatReportID,
-        policyExpenseCreatedReportActionID: expenseCreatedReportActionID,
-    };
-    API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, params);
-}
-
 /**
  * Track an expense
  */

From 2ba1c6527585854870253a40025dd81ba8877d72 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 26 Mar 2024 20:30:39 +0530
Subject: [PATCH 037/383] fix header title for whisper actions

---
 src/languages/en.ts                                      | 1 +
 src/languages/es.ts                                      | 1 +
 src/pages/iou/request/step/IOURequestStepConfirmation.js | 8 +++++++-
 src/pages/iou/request/step/IOURequestStepParticipants.js | 8 +++++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 93752e13c57f..54cd1cff54c8 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -608,6 +608,7 @@ export default {
         addToSplit: 'Add to split',
         splitBill: 'Split bill',
         request: 'Request',
+        categorize: 'Categorize',
         participants: 'Participants',
         requestMoney: 'Request money',
         sendMoney: 'Send money',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 53fcc09a4b86..d8f2d6397b13 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -604,6 +604,7 @@ export default {
         addToSplit: 'Añadir para dividir',
         splitBill: 'Dividir factura',
         request: 'Solicitar',
+        categorize: 'Categorizar',
         participants: 'Participantes',
         requestMoney: 'Pedir dinero',
         sendMoney: 'Enviar dinero',
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 1a69e0ec876f..dd406d4e8ca5 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -98,6 +98,12 @@ function IOURequestStepConfirmation({
     const transactionTaxAmount = transaction.taxAmount;
     const requestType = TransactionUtils.getRequestType(transaction);
     const headerTitle = useMemo(() => {
+        if (iouAction === CONST.IOU.ACTION.CATEGORIZE) {
+            return translate('iou.categorize');
+        }
+        if (iouAction === CONST.IOU.ACTION.MOVE) {
+            return translate('iou.request');
+        }
         if (iouType === CONST.IOU.TYPE.SPLIT) {
             return translate('iou.split');
         }
@@ -108,7 +114,7 @@ function IOURequestStepConfirmation({
             return translate('common.send');
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
-    }, [iouType, transaction, translate]);
+    }, [iouType, transaction, translate, iouAction]);
 
     const participants = useMemo(
         () =>
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index d4184bacf524..df86a709f4d4 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -44,6 +44,12 @@ function IOURequestStepParticipants({
     const iouRequestType = TransactionUtils.getRequestType(transaction);
     const isSplitRequest = iouType === CONST.IOU.TYPE.SPLIT;
     const headerTitle = useMemo(() => {
+        if (iouAction === CONST.IOU.ACTION.CATEGORIZE) {
+            return translate('iou.categorize');
+        }
+        if (iouAction === CONST.IOU.ACTION.MOVE) {
+            return translate('iou.request');
+        }
         if (isSplitRequest) {
             return translate('iou.split');
         }
@@ -51,7 +57,7 @@ function IOURequestStepParticipants({
             return translate('common.send');
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
-    }, [iouType, transaction, translate, isSplitRequest]);
+    }, [iouType, transaction, translate, isSplitRequest, iouAction]);
 
     const receiptFilename = lodashGet(transaction, 'filename');
     const receiptPath = lodashGet(transaction, 'receipt.source');

From 65544d2f00432fd11979239f2aba29b1c4be084b Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 27 Mar 2024 02:16:19 +0530
Subject: [PATCH 038/383] adds categorize api call

---
 src/libs/API/types.ts                                    | 2 ++
 src/libs/actions/IOU.ts                                  | 8 +++++---
 src/pages/iou/request/step/IOURequestStepConfirmation.js | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 4e1bd03166e9..9763fb57c54d 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -197,6 +197,7 @@ const WRITE_COMMANDS = {
     DELETE_POLICY_DISTANCE_RATES: 'DeletePolicyDistanceRates',
     DISMISS_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
     CONVERT_TRACKED_EXPENSE_TO_REQUEST: 'ConvertTrackedExpenseToRequest',
+    CATEGORIZE_TRACKED_TRANSACTION: 'CategorizeTrackedExpense',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -392,6 +393,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
     [WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
     [WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST]: Parameters.ConvertTrackedExpenseToRequestParams;
+    [WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION]: Parameters.CategorizeTrackedExpenseParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 3773fe515ed0..883b9ffd2b66 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2094,6 +2094,7 @@ function requestMoney(
     const moneyRequestReportID = isMoneyRequestReport ? report.reportID : '';
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
     const isConvertingFromTrackExpenseToRequest = action === CONST.IOU.ACTION.MOVE;
+    const isCategorizing = action === CONST.IOU.ACTION.CATEGORIZE;
 
     const {
         payerAccountID,
@@ -2147,14 +2148,15 @@ function requestMoney(
             break;
         }
         case CONST.IOU.ACTION.CATEGORIZE: {
-            const params = {
+            const parameters = {
                 policyID: chatReport.policyID,
                 transactionID: transaction.transactionID,
                 actionableWhisperReportActionID,
-                moneyRequestReportID: iouReport.reportID,
+                moneyRequestReportID: chatReport.reportID,
                 moneyRequestCreatedReportActionID: createdChatReportActionID,
             };
-            console.log('Categorizing tracked transaction', params);
+            // eslint-disable-next-line rulesdir/no-multiple-api-calls
+            API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, onyxData);
             break;
         }
         default: {
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index dd406d4e8ca5..459bb6edef07 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -174,11 +174,11 @@ function IOURequestStepConfirmation({
         // If there is not a report attached to the IOU with a reportID, then the participants were manually selected and the user needs taken
         // back to the participants step
         if (!transaction.participantsAutoAssigned) {
-            Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID));
+            Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID, undefined, iouAction));
             return;
         }
-        IOUUtils.navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID);
-    }, [transaction, iouType, requestType, transactionID, reportID]);
+        IOUUtils.navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID, iouAction);
+    }, [transaction, iouType, requestType, transactionID, reportID, iouAction]);
 
     const navigateToAddReceipt = useCallback(() => {
         Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));

From 60eed83db7f8c77d5c764e51677bcbe232db4ae1 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 27 Mar 2024 02:46:23 +0530
Subject: [PATCH 039/383] fix money request reportid

---
 src/libs/actions/IOU.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 883b9ffd2b66..7c503056bff9 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2110,7 +2110,7 @@ function requestMoney(
         createdReportActionIDForThread,
         onyxData,
     } = getMoneyRequestInformation(
-        isConvertingFromTrackExpenseToRequest ? {} : currentChatReport,
+        isConvertingFromTrackExpenseToRequest || isCategorizing ? {} : currentChatReport,
         participant,
         comment,
         amount,
@@ -2152,7 +2152,7 @@ function requestMoney(
                 policyID: chatReport.policyID,
                 transactionID: transaction.transactionID,
                 actionableWhisperReportActionID,
-                moneyRequestReportID: chatReport.reportID,
+                moneyRequestReportID: iouReport.reportID,
                 moneyRequestCreatedReportActionID: createdChatReportActionID,
             };
             // eslint-disable-next-line rulesdir/no-multiple-api-calls

From a20ab3b32fdf0b0cde1b4dab382fcf318ee70af1 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 27 Mar 2024 02:47:46 +0530
Subject: [PATCH 040/383] fixes  blocking vie conditional

---
 .../MoneyTemporaryForRefactorRequestParticipantsSelector.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 66559df62655..1c5ad3d77f6b 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -381,7 +381,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
     const isAllSectionsEmpty = _.every(sections, (section) => section.data.length === 0);
 
-    if (iouAction === CONST.IOU.ACTION.CATEGORIZE && isAllSectionsEmpty && didScreenTransitionEnd) {
+    if (iouAction === CONST.IOU.ACTION.CATEGORIZE && isAllSectionsEmpty && didScreenTransitionEnd && searchTerm.trim() === '') {
         return renderEmptyWorkspaceView();
     }
 

From c2af527911282797e15292c077b4d33d9cff8390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Wed, 27 Mar 2024 17:39:05 +0100
Subject: [PATCH 041/383] refactorings

---
 .../SelectionList/BaseSelectionList.tsx       |   3 +
 src/components/SelectionList/types.ts         |   6 +-
 src/pages/WorkspaceSwitcherPage.tsx           | 270 +++++++--------
 src/pages/WorkspaceSwitcherPage_.tsx          | 311 ++++++++++++++++++
 .../card/WorkspaceCardCreateAWorkspace.tsx    |   2 +-
 5 files changed, 441 insertions(+), 151 deletions(-)
 create mode 100644 src/pages/WorkspaceSwitcherPage_.tsx

diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 015fd284c0b4..96891b1cc07d 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -297,6 +297,9 @@ function BaseSelectionList<TItem extends ListItem>(
     };
 
     const renderSectionHeader = ({section}: {section: SectionListDataType<TItem>}) => {
+        if (section.CustomSectionHeader) {
+            return <section.CustomSectionHeader section={section} />;
+        }
         if (!section.title || isEmptyObject(section.data)) {
             return null;
         }
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 8b070e1aa5cb..108a62fff215 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -324,7 +324,11 @@ type FlattenedSectionsReturn<TItem extends ListItem> = {
 
 type ButtonOrCheckBoxRoles = 'button' | 'checkbox';
 
-type SectionListDataType<TItem extends ListItem> = SectionListData<TItem, Section<TItem>>;
+type ExtendedSectionListData<TItem extends ListItem, TSection extends Section<TItem>> = SectionListData<TItem, TSection> & {
+    CustomSectionHeader?: ({section}: {section: TSection}) => ReactElement;
+};
+
+type SectionListDataType<TItem extends ListItem> = ExtendedSectionListData<TItem, Section<TItem>>;
 
 export type {
     BaseSelectionListProps,
diff --git a/src/pages/WorkspaceSwitcherPage.tsx b/src/pages/WorkspaceSwitcherPage.tsx
index 2eb5ecaf373f..68cdffbaf57e 100644
--- a/src/pages/WorkspaceSwitcherPage.tsx
+++ b/src/pages/WorkspaceSwitcherPage.tsx
@@ -1,19 +1,18 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
-import {MagnifyingGlass} from '@components/Icon/Expensicons';
-import OptionRow from '@components/OptionRow';
-import OptionsSelector from '@components/OptionsSelector';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import UserListItem from '@components/SelectionList/UserListItem';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
-import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useTheme from '@hooks/useTheme';
@@ -53,13 +52,49 @@ type WorkspaceSwitcherPageOnyxProps = {
 
 type WorkspaceSwitcherPageProps = WorkspaceSwitcherPageOnyxProps;
 
+function WorkspacesSectionHeader() {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb1]}>
+            <View>
+                <Text
+                    style={styles.label}
+                    color={theme.textSupporting}
+                >
+                    {translate('common.workspaces')}
+                </Text>
+            </View>
+            <Tooltip text={translate('workspace.new.newWorkspace')}>
+                <PressableWithFeedback
+                    accessible={false}
+                    role={CONST.ROLE.BUTTON}
+                    onPress={() => {
+                        Navigation.goBack();
+                        interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
+                    }}
+                >
+                    {({hovered}) => (
+                        <Icon
+                            src={Expensicons.Plus}
+                            width={12}
+                            height={12}
+                            additionalStyles={[styles.buttonDefaultBG, styles.borderRadiusNormal, styles.p2, hovered && styles.buttonHoveredBG]}
+                            fill={theme.icon}
+                        />
+                    )}
+                </PressableWithFeedback>
+            </Tooltip>
+        </View>
+    );
+}
 function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
-    const [selectedOption, setSelectedOption] = useState<SimpleWorkspaceItem>();
-    const [searchTerm, setSearchTerm] = useState('');
-    const {inputCallbackRef} = useAutoFocusInput();
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const {translate} = useLocalize();
     const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace();
 
@@ -105,11 +140,6 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
 
             const {policyID} = option;
 
-            if (policyID) {
-                setSelectedOption(option);
-            } else {
-                setSelectedOption(undefined);
-            }
             setActiveWorkspaceID(policyID);
             Navigation.goBack();
             if (policyID !== activeWorkspaceID) {
@@ -141,163 +171,105 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                 boldStyle: hasUnreadData(policy?.id),
                 keyForList: policy?.id,
                 isPolicyAdmin: PolicyUtils.isPolicyAdmin(policy),
+                isSelected: activeWorkspaceID === policy?.id,
             }));
-    }, [policies, getIndicatorTypeForPolicy, hasUnreadData, isOffline]);
+    }, [policies, isOffline, getIndicatorTypeForPolicy, hasUnreadData, activeWorkspaceID]);
 
     const filteredAndSortedUserWorkspaces = useMemo(
         () =>
             usersWorkspaces
-                .filter((policy) => policy.text?.toLowerCase().includes(searchTerm?.toLowerCase() ?? ''))
+                .filter((policy) => policy.text?.toLowerCase().includes(debouncedSearchTerm?.toLowerCase() ?? ''))
                 .sort((policy1, policy2) => sortWorkspacesBySelected(policy1, policy2, activeWorkspaceID)),
-        [searchTerm, usersWorkspaces, activeWorkspaceID],
-    );
-
-    const usersWorkspacesSectionData = useMemo(
-        () => ({
-            data: filteredAndSortedUserWorkspaces,
-            shouldShow: true,
-            indexOffset: 0,
-        }),
-        [filteredAndSortedUserWorkspaces],
+        [debouncedSearchTerm, usersWorkspaces, activeWorkspaceID],
     );
 
-    const everythingSection = useMemo(() => {
-        const option = {
-            reportID: '',
-            text: CONST.WORKSPACE_SWITCHER.NAME,
-            icons: [
-                {
-                    source: Expensicons.ExpensifyAppIcon,
-                    name: CONST.WORKSPACE_SWITCHER.NAME,
-                    type: CONST.ICON_TYPE_AVATAR,
-                },
-            ],
-            brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
-            boldStyle: hasUnreadData(undefined),
-        };
-
-        return (
-            <>
-                <View style={[styles.mh4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb3]}>
-                    <Text
-                        style={styles.label}
-                        color={theme.textSupporting}
-                    >
-                        {translate('workspace.switcher.everythingSection')}
-                    </Text>
-                </View>
-                <View>
-                    <OptionRow
-                        option={option}
-                        onSelectRow={selectPolicy}
-                        showTitleTooltip={false}
-                        highlightSelected
-                        isSelected={!activeWorkspaceID}
-                        optionIsFocused={!activeWorkspaceID}
-                    />
-                </View>
-            </>
-        );
-    }, [activeWorkspaceID, getIndicatorTypeForPolicy, hasUnreadData, selectPolicy, styles, theme.textSupporting, translate]);
+    const usersWorkspacesSectionData = useMemo(() => {
+        const options = [
+            {
+                title: translate('workspace.switcher.everythingSection'),
+                shouldShow: true,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: CONST.WORKSPACE_SWITCHER.NAME,
+                        policyID: '',
+                        icons: [{source: Expensicons.ExpensifyAppIcon, name: CONST.WORKSPACE_SWITCHER.NAME, type: CONST.ICON_TYPE_AVATAR}],
+                        brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
+                        boldStyle: hasUnreadData(undefined),
+                        isSelected: activeWorkspaceID === undefined,
+                    },
+                ],
+            },
+        ];
+        if (filteredAndSortedUserWorkspaces.length > 0) {
+            options.push({
+                CustomSectionHeader: WorkspacesSectionHeader,
+                data: filteredAndSortedUserWorkspaces,
+                shouldShow: true,
+                indexOffset: 1,
+            });
+        }
+        return options;
+    }, [activeWorkspaceID, filteredAndSortedUserWorkspaces, getIndicatorTypeForPolicy, hasUnreadData, translate]);
 
     const headerMessage = filteredAndSortedUserWorkspaces.length === 0 ? translate('common.noResultsFound') : '';
+    const shouldShowCreateWorkspace = usersWorkspaces.length === 0;
 
-    const workspacesSection = useMemo(
-        () => (
-            <>
-                <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, ...(usersWorkspaces.length > 0 ? [styles.mb1] : [styles.mb3])]}>
-                    <View>
-                        <Text
-                            style={styles.label}
-                            color={theme.textSupporting}
-                        >
-                            {translate('common.workspaces')}
-                        </Text>
+    const renderRightHandSideComponent = useCallback(
+        (item: (typeof filteredAndSortedUserWorkspaces)[number]) => {
+            if (item.isSelected) {
+                return (
+                    <View style={styles.defaultCheckmarkWrapper}>
+                        <Icon
+                            src={Expensicons.Checkmark}
+                            fill={theme.iconSuccessFill}
+                        />
                     </View>
-                    <Tooltip text={translate('workspace.new.newWorkspace')}>
-                        <PressableWithFeedback
-                            accessible={false}
-                            role={CONST.ROLE.BUTTON}
-                            onPress={() => {
-                                Navigation.goBack();
-                                interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
-                            }}
-                        >
-                            {({hovered}) => (
-                                <Icon
-                                    src={Expensicons.Plus}
-                                    width={12}
-                                    height={12}
-                                    additionalStyles={[styles.buttonDefaultBG, styles.borderRadiusNormal, styles.p2, hovered && styles.buttonHoveredBG]}
-                                    fill={theme.icon}
-                                />
-                            )}
-                        </PressableWithFeedback>
-                    </Tooltip>
-                </View>
+                );
+            }
 
-                {usersWorkspaces.length > 0 ? (
-                    <OptionsSelector
-                        // @ts-expect-error TODO: remove this comment once OptionsSelector (https://github.com/Expensify/App/issues/25125) is migrated to TS
-                        placeholder={translate('workspace.switcher.placeholder')}
-                        ref={inputCallbackRef}
-                        sections={[usersWorkspacesSectionData]}
-                        value={searchTerm}
-                        shouldShowTextInput={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH}
-                        onChangeText={setSearchTerm}
-                        selectedOptions={selectedOption ? [selectedOption] : []}
-                        onSelectRow={selectPolicy}
-                        shouldPreventDefaultFocusOnSelectRow
-                        headerMessage={headerMessage}
-                        highlightSelectedOptions
-                        shouldShowOptions
-                        autoFocus={false}
-                        canSelectMultipleOptions={false}
-                        shouldShowSubscript={false}
-                        showTitleTooltip={false}
-                        contentContainerStyles={[styles.pt0, styles.mt0]}
-                        textIconLeft={MagnifyingGlass}
-                        // Null is to avoid selecting unfocused option when Global selected, undefined is to focus selected workspace
-                        initiallyFocusedOptionKey={!activeWorkspaceID ? null : undefined}
-                    />
-                ) : (
-                    <WorkspaceCardCreateAWorkspace />
-                )}
-            </>
-        ),
-        [
-            inputCallbackRef,
-            setSearchTerm,
-            searchTerm,
-            selectPolicy,
-            selectedOption,
-            styles,
-            theme.textSupporting,
-            translate,
-            usersWorkspaces.length,
-            usersWorkspacesSectionData,
-            activeWorkspaceID,
-            theme.icon,
-            headerMessage,
-        ],
+            if (item.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR) {
+                return (
+                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
+                        <Icon
+                            src={Expensicons.DotIndicator}
+                            fill={theme.danger}
+                        />
+                    </View>
+                );
+            }
+            if (item.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO) {
+                return (
+                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
+                        <Icon
+                            src={Expensicons.DotIndicator}
+                            fill={theme.iconSuccessFill}
+                        />
+                    </View>
+                );
+            }
+            return null;
+        },
+        [styles, theme],
     );
 
-    useEffect(() => {
-        if (!activeWorkspaceID) {
-            return;
-        }
-        const optionToSet = usersWorkspaces.find((option) => option.policyID === activeWorkspaceID);
-        setSelectedOption(optionToSet);
-    }, [activeWorkspaceID, usersWorkspaces]);
-
     return (
         <ScreenWrapper testID={WorkspaceSwitcherPage.displayName}>
             <HeaderWithBackButton
                 title={translate('workspace.switcher.headerTitle')}
                 onBackButtonPress={Navigation.goBack}
             />
-            {everythingSection}
-            {workspacesSection}
+            <SelectionList
+                ListItem={UserListItem}
+                sections={usersWorkspacesSectionData}
+                onSelectRow={selectPolicy}
+                textInputLabel={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH ? translate('common.search') : undefined}
+                textInputValue={searchTerm}
+                onChangeText={setSearchTerm}
+                headerMessage={headerMessage}
+                rightHandSideComponent={renderRightHandSideComponent}
+                footerContent={shouldShowCreateWorkspace && <WorkspaceCardCreateAWorkspace />}
+            />
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/WorkspaceSwitcherPage_.tsx b/src/pages/WorkspaceSwitcherPage_.tsx
new file mode 100644
index 000000000000..2eb5ecaf373f
--- /dev/null
+++ b/src/pages/WorkspaceSwitcherPage_.tsx
@@ -0,0 +1,311 @@
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {View} from 'react-native';
+import type {OnyxCollection} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import {MagnifyingGlass} from '@components/Icon/Expensicons';
+import OptionRow from '@components/OptionRow';
+import OptionsSelector from '@components/OptionsSelector';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import Tooltip from '@components/Tooltip';
+import useActiveWorkspace from '@hooks/useActiveWorkspace';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import {getWorkspacesBrickRoads, getWorkspacesUnreadStatuses} from '@libs/WorkspacesSettingsUtils';
+import * as App from '@userActions/App';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import WorkspaceCardCreateAWorkspace from './workspace/card/WorkspaceCardCreateAWorkspace';
+
+type SimpleWorkspaceItem = {
+    text?: string;
+    policyID?: string;
+    isPolicyAdmin?: boolean;
+};
+
+const sortWorkspacesBySelected = (workspace1: SimpleWorkspaceItem, workspace2: SimpleWorkspaceItem, selectedWorkspaceID: string | undefined): number => {
+    if (workspace1.policyID === selectedWorkspaceID) {
+        return -1;
+    }
+    if (workspace2.policyID === selectedWorkspaceID) {
+        return 1;
+    }
+    return workspace1.text?.toLowerCase().localeCompare(workspace2.text?.toLowerCase() ?? '') ?? 0;
+};
+
+type WorkspaceSwitcherPageOnyxProps = {
+    /** The list of this user's policies */
+    policies: OnyxCollection<Policy>;
+};
+
+type WorkspaceSwitcherPageProps = WorkspaceSwitcherPageOnyxProps;
+
+function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {isOffline} = useNetwork();
+    const [selectedOption, setSelectedOption] = useState<SimpleWorkspaceItem>();
+    const [searchTerm, setSearchTerm] = useState('');
+    const {inputCallbackRef} = useAutoFocusInput();
+    const {translate} = useLocalize();
+    const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace();
+
+    const brickRoadsForPolicies = useMemo(() => getWorkspacesBrickRoads(), []);
+    const unreadStatusesForPolicies = useMemo(() => getWorkspacesUnreadStatuses(), []);
+
+    const getIndicatorTypeForPolicy = useCallback(
+        (policyId?: string) => {
+            if (policyId && policyId !== activeWorkspaceID) {
+                return brickRoadsForPolicies[policyId];
+            }
+
+            if (Object.values(brickRoadsForPolicies).includes(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR)) {
+                return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
+            }
+
+            if (Object.values(brickRoadsForPolicies).includes(CONST.BRICK_ROAD_INDICATOR_STATUS.INFO)) {
+                return CONST.BRICK_ROAD_INDICATOR_STATUS.INFO;
+            }
+
+            return undefined;
+        },
+        [activeWorkspaceID, brickRoadsForPolicies],
+    );
+
+    const hasUnreadData = useCallback(
+        // TO DO: Implement checking if policy has some unread data
+        (policyId?: string) => {
+            if (policyId) {
+                return unreadStatusesForPolicies[policyId];
+            }
+
+            return Object.values(unreadStatusesForPolicies).some((status) => status);
+        },
+        [unreadStatusesForPolicies],
+    );
+
+    const selectPolicy = useCallback(
+        (option?: SimpleWorkspaceItem) => {
+            if (!option) {
+                return;
+            }
+
+            const {policyID} = option;
+
+            if (policyID) {
+                setSelectedOption(option);
+            } else {
+                setSelectedOption(undefined);
+            }
+            setActiveWorkspaceID(policyID);
+            Navigation.goBack();
+            if (policyID !== activeWorkspaceID) {
+                Navigation.navigateWithSwitchPolicyID({policyID});
+            }
+        },
+        [activeWorkspaceID, setActiveWorkspaceID],
+    );
+
+    const usersWorkspaces = useMemo(() => {
+        if (!policies || isEmptyObject(policies)) {
+            return [];
+        }
+
+        return Object.values(policies)
+            .filter((policy) => PolicyUtils.shouldShowPolicy(policy, !!isOffline))
+            .map((policy) => ({
+                text: policy?.name,
+                policyID: policy?.id,
+                brickRoadIndicator: getIndicatorTypeForPolicy(policy?.id),
+                icons: [
+                    {
+                        source: policy?.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy?.name),
+                        fallbackIcon: Expensicons.FallbackWorkspaceAvatar,
+                        name: policy?.name,
+                        type: CONST.ICON_TYPE_WORKSPACE,
+                    },
+                ],
+                boldStyle: hasUnreadData(policy?.id),
+                keyForList: policy?.id,
+                isPolicyAdmin: PolicyUtils.isPolicyAdmin(policy),
+            }));
+    }, [policies, getIndicatorTypeForPolicy, hasUnreadData, isOffline]);
+
+    const filteredAndSortedUserWorkspaces = useMemo(
+        () =>
+            usersWorkspaces
+                .filter((policy) => policy.text?.toLowerCase().includes(searchTerm?.toLowerCase() ?? ''))
+                .sort((policy1, policy2) => sortWorkspacesBySelected(policy1, policy2, activeWorkspaceID)),
+        [searchTerm, usersWorkspaces, activeWorkspaceID],
+    );
+
+    const usersWorkspacesSectionData = useMemo(
+        () => ({
+            data: filteredAndSortedUserWorkspaces,
+            shouldShow: true,
+            indexOffset: 0,
+        }),
+        [filteredAndSortedUserWorkspaces],
+    );
+
+    const everythingSection = useMemo(() => {
+        const option = {
+            reportID: '',
+            text: CONST.WORKSPACE_SWITCHER.NAME,
+            icons: [
+                {
+                    source: Expensicons.ExpensifyAppIcon,
+                    name: CONST.WORKSPACE_SWITCHER.NAME,
+                    type: CONST.ICON_TYPE_AVATAR,
+                },
+            ],
+            brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
+            boldStyle: hasUnreadData(undefined),
+        };
+
+        return (
+            <>
+                <View style={[styles.mh4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb3]}>
+                    <Text
+                        style={styles.label}
+                        color={theme.textSupporting}
+                    >
+                        {translate('workspace.switcher.everythingSection')}
+                    </Text>
+                </View>
+                <View>
+                    <OptionRow
+                        option={option}
+                        onSelectRow={selectPolicy}
+                        showTitleTooltip={false}
+                        highlightSelected
+                        isSelected={!activeWorkspaceID}
+                        optionIsFocused={!activeWorkspaceID}
+                    />
+                </View>
+            </>
+        );
+    }, [activeWorkspaceID, getIndicatorTypeForPolicy, hasUnreadData, selectPolicy, styles, theme.textSupporting, translate]);
+
+    const headerMessage = filteredAndSortedUserWorkspaces.length === 0 ? translate('common.noResultsFound') : '';
+
+    const workspacesSection = useMemo(
+        () => (
+            <>
+                <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, ...(usersWorkspaces.length > 0 ? [styles.mb1] : [styles.mb3])]}>
+                    <View>
+                        <Text
+                            style={styles.label}
+                            color={theme.textSupporting}
+                        >
+                            {translate('common.workspaces')}
+                        </Text>
+                    </View>
+                    <Tooltip text={translate('workspace.new.newWorkspace')}>
+                        <PressableWithFeedback
+                            accessible={false}
+                            role={CONST.ROLE.BUTTON}
+                            onPress={() => {
+                                Navigation.goBack();
+                                interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
+                            }}
+                        >
+                            {({hovered}) => (
+                                <Icon
+                                    src={Expensicons.Plus}
+                                    width={12}
+                                    height={12}
+                                    additionalStyles={[styles.buttonDefaultBG, styles.borderRadiusNormal, styles.p2, hovered && styles.buttonHoveredBG]}
+                                    fill={theme.icon}
+                                />
+                            )}
+                        </PressableWithFeedback>
+                    </Tooltip>
+                </View>
+
+                {usersWorkspaces.length > 0 ? (
+                    <OptionsSelector
+                        // @ts-expect-error TODO: remove this comment once OptionsSelector (https://github.com/Expensify/App/issues/25125) is migrated to TS
+                        placeholder={translate('workspace.switcher.placeholder')}
+                        ref={inputCallbackRef}
+                        sections={[usersWorkspacesSectionData]}
+                        value={searchTerm}
+                        shouldShowTextInput={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH}
+                        onChangeText={setSearchTerm}
+                        selectedOptions={selectedOption ? [selectedOption] : []}
+                        onSelectRow={selectPolicy}
+                        shouldPreventDefaultFocusOnSelectRow
+                        headerMessage={headerMessage}
+                        highlightSelectedOptions
+                        shouldShowOptions
+                        autoFocus={false}
+                        canSelectMultipleOptions={false}
+                        shouldShowSubscript={false}
+                        showTitleTooltip={false}
+                        contentContainerStyles={[styles.pt0, styles.mt0]}
+                        textIconLeft={MagnifyingGlass}
+                        // Null is to avoid selecting unfocused option when Global selected, undefined is to focus selected workspace
+                        initiallyFocusedOptionKey={!activeWorkspaceID ? null : undefined}
+                    />
+                ) : (
+                    <WorkspaceCardCreateAWorkspace />
+                )}
+            </>
+        ),
+        [
+            inputCallbackRef,
+            setSearchTerm,
+            searchTerm,
+            selectPolicy,
+            selectedOption,
+            styles,
+            theme.textSupporting,
+            translate,
+            usersWorkspaces.length,
+            usersWorkspacesSectionData,
+            activeWorkspaceID,
+            theme.icon,
+            headerMessage,
+        ],
+    );
+
+    useEffect(() => {
+        if (!activeWorkspaceID) {
+            return;
+        }
+        const optionToSet = usersWorkspaces.find((option) => option.policyID === activeWorkspaceID);
+        setSelectedOption(optionToSet);
+    }, [activeWorkspaceID, usersWorkspaces]);
+
+    return (
+        <ScreenWrapper testID={WorkspaceSwitcherPage.displayName}>
+            <HeaderWithBackButton
+                title={translate('workspace.switcher.headerTitle')}
+                onBackButtonPress={Navigation.goBack}
+            />
+            {everythingSection}
+            {workspacesSection}
+        </ScreenWrapper>
+    );
+}
+
+WorkspaceSwitcherPage.displayName = 'WorkspaceSwitcherPage';
+
+export default withOnyx<WorkspaceSwitcherPageProps, WorkspaceSwitcherPageOnyxProps>({
+    policies: {
+        key: ONYXKEYS.COLLECTION.POLICY,
+    },
+})(WorkspaceSwitcherPage);
diff --git a/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx b/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx
index 3546a437b2e2..2c0c039718e2 100644
--- a/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx
+++ b/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx
@@ -17,7 +17,7 @@ function WorkspaceCardCreateAWorkspace() {
             cardLayout={CARD_LAYOUT.ICON_ON_TOP}
             subtitle={translate('workspace.emptyWorkspace.subtitle')}
             subtitleMuted
-            containerStyles={[styles.highlightBG]}
+            containerStyles={[styles.highlightBG, styles.mh0]}
         >
             <Button
                 onPress={() => {

From 007659fa9fae5d9dcf6533b161e00dd229197f73 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 28 Mar 2024 01:59:46 +0530
Subject: [PATCH 042/383] deleted tracked exp. when moving transaction

---
 src/libs/ReportUtils.ts                       |  10 +-
 src/libs/actions/IOU.ts                       | 325 ++++++++++--------
 .../step/IOURequestStepConfirmation.js        |   2 +
 src/types/onyx/Transaction.ts                 |   7 +
 4 files changed, 192 insertions(+), 152 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 58ecb5110377..2ed872548576 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5523,8 +5523,16 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
     if (isEmpty(transaction)) {
         return;
     }
+    const reportActions = ReportActionsUtils.getAllReportActions(reportID);
 
-    TransactionEdit.createBackupTransaction({...transaction, actionableWhisperReportActionID: reportActionID} as Transaction);
+    const linkedTrackedExpenseReportAction = Object.values(reportActions).find((action) => (action.originalMessage as IOUMessage)?.IOUTransactionID === transactionID);
+
+    TransactionEdit.createBackupTransaction({
+        ...transaction,
+        actionableWhisperReportActionID: reportActionID,
+        linkedTrackedExpenseReportAction,
+        linkedTrackedExpenseReportID: reportID,
+    } as Transaction);
 
     Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID, undefined, actionName));
 }
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index b7622837ce0a..2dd80239d0da 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -53,7 +53,7 @@ import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Participant, Split} from '@src/types/onyx/IOU';
 import type {ErrorFields, Errors} from '@src/types/onyx/OnyxCommon';
-import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import type {IOUMessage, PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type {OnyxData} from '@src/types/onyx/Request';
 import type {Comment, Receipt, ReceiptSource, TaxRate, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
@@ -994,6 +994,159 @@ function buildOnyxDataForTrackExpense(
     return [optimisticData, successData, failureData];
 }
 
+function getDeleteTrackExpenseInformation(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction) {
+    // STEP 1: Get all collections we're updating
+    const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
+    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+    const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
+    const transactionThreadID = reportAction.childReportID;
+    let transactionThread = null;
+    if (transactionThreadID) {
+        transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`] ?? null;
+    }
+
+    // STEP 2: Decide if we need to:
+    // 1. Delete the transactionThread - delete if there are no visible comments in the thread
+    // 2. Update the moneyRequestPreview to show [Deleted request] - update if the transactionThread exists AND it isn't being deleted
+    const shouldDeleteTransactionThread = transactionThreadID ? (reportAction?.childVisibleActionCount ?? 0) === 0 : false;
+    const shouldShowDeletedRequestMessage = !!transactionThreadID && !shouldDeleteTransactionThread;
+
+    // STEP 3: Update the IOU reportAction.
+    const updatedReportAction = {
+        [reportAction.reportActionID]: {
+            pendingAction: shouldShowDeletedRequestMessage ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+            previousMessage: reportAction.message,
+            message: [
+                {
+                    type: 'COMMENT',
+                    html: '',
+                    text: '',
+                    isEdited: true,
+                    isDeletedParentAction: shouldShowDeletedRequestMessage,
+                },
+            ],
+            originalMessage: {
+                IOUTransactionID: null,
+            },
+            errors: undefined,
+        },
+    } as OnyxTypes.ReportActions;
+
+    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(chatReport?.reportID ?? '', updatedReportAction);
+    const reportLastMessageText = ReportActionsUtils.getLastVisibleMessage(chatReport?.reportID ?? '', updatedReportAction).lastMessageText;
+
+    // STEP 4: Build Onyx data
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+            value: null,
+        },
+    ];
+
+    if (Permissions.canUseViolations(betas)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+            value: null,
+        });
+    }
+
+    if (shouldDeleteTransactionThread) {
+        optimisticData.push(
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
+                value: null,
+            },
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadID}`,
+                value: null,
+            },
+        );
+    }
+
+    optimisticData.push(
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+            value: updatedReportAction,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
+            value: {
+                lastMessageText: reportLastMessageText,
+                lastVisibleActionCreated: lastVisibleAction?.created,
+            },
+        },
+    );
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    pendingAction: null,
+                    errors: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+            value: transaction,
+        },
+    ];
+
+    if (Permissions.canUseViolations(betas)) {
+        failureData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+            value: transactionViolations,
+        });
+    }
+
+    if (shouldDeleteTransactionThread) {
+        failureData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
+            value: transactionThread,
+        });
+    }
+
+    failureData.push(
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    ...reportAction,
+                    pendingAction: null,
+                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericDeleteFailureMessage'),
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
+            value: chatReport,
+        },
+    );
+
+    const parameters: DeleteMoneyRequestParams = {
+        transactionID,
+        reportActionID: reportAction.reportActionID,
+    };
+
+    return {parameters, optimisticData, successData, failureData, shouldDeleteTransactionThread, chatReport};
+}
+
 /**
  * Gathers all the data needed to make a money request. It attempts to find existing reports, iouReports, and receipts. If it doesn't find them, then
  * it creates optimistic versions of them and uses those instead
@@ -1017,6 +1170,9 @@ function getMoneyRequestInformation(
     payeeAccountID = userAccountID,
     payeeEmail = currentUserEmail,
     moneyRequestReportID = '',
+    linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
+    linkedTrackedExpenseReportID?: string,
+    shouldDeleteLinkedTrackedExpense?: boolean,
 ): MoneyRequestInformation {
     const payerEmail = PhoneNumber.addSMSDomainIfPhoneNumber(participant.login ?? '');
     const payerAccountID = Number(participant.accountID);
@@ -1182,6 +1338,13 @@ function getMoneyRequestInformation(
         optimisticNextStep,
     );
 
+    if(shouldDeleteLinkedTrackedExpense && linkedTrackedExpenseReportAction && linkedTrackedExpenseReportID) {
+        const {optimisticData: deleteOptimisticData, successData: deleteSuccessData, failureData: deleteFailureData} = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, optimisticTransaction.transactionID, linkedTrackedExpenseReportAction);
+        optimisticData.push(...deleteOptimisticData);
+        successData.push(...deleteSuccessData);
+        failureData.push(...deleteFailureData);
+    }
+
     return {
         payerAccountID,
         payerEmail,
@@ -2087,6 +2250,8 @@ function requestMoney(
     gpsPoints = undefined,
     action?: ValueOf<typeof CONST.IOU.ACTION>,
     actionableWhisperReportActionID?: string,
+    linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
+    linkedTrackedExpenseReportID?: string,
 ) {
     // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
@@ -2118,7 +2283,7 @@ function requestMoney(
         currentCreated,
         merchant,
         receipt,
-        undefined,
+        isConvertingFromTrackExpenseToRequest || isCategorizing ? (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID : undefined,
         category,
         tag,
         billable,
@@ -2128,6 +2293,9 @@ function requestMoney(
         payeeAccountID,
         payeeEmail,
         moneyRequestReportID,
+        linkedTrackedExpenseReportAction,
+        linkedTrackedExpenseReportID,
+        isConvertingFromTrackExpenseToRequest || isCategorizing,
     );
 
     const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
@@ -2150,11 +2318,13 @@ function requestMoney(
         case CONST.IOU.ACTION.CATEGORIZE: {
             const parameters = {
                 policyID: chatReport.policyID,
-                transactionID: transaction.transactionID,
+                transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,
                 actionableWhisperReportActionID,
                 moneyRequestReportID: iouReport.reportID,
                 moneyRequestCreatedReportActionID: createdChatReportActionID,
             };
+
+            console.log('Categorizing tracked expense', parameters);
             // eslint-disable-next-line rulesdir/no-multiple-api-calls
             API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, onyxData);
             break;
@@ -3905,154 +4075,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
 }
 
 function deleteTrackExpense(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
-    // STEP 1: Get all collections we're updating
-    const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
-    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
-    const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
-    const transactionThreadID = reportAction.childReportID;
-    let transactionThread = null;
-    if (transactionThreadID) {
-        transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`] ?? null;
-    }
-
-    // STEP 2: Decide if we need to:
-    // 1. Delete the transactionThread - delete if there are no visible comments in the thread
-    // 2. Update the moneyRequestPreview to show [Deleted request] - update if the transactionThread exists AND it isn't being deleted
-    const shouldDeleteTransactionThread = transactionThreadID ? (reportAction?.childVisibleActionCount ?? 0) === 0 : false;
-    const shouldShowDeletedRequestMessage = !!transactionThreadID && !shouldDeleteTransactionThread;
-
-    // STEP 3: Update the IOU reportAction.
-    const updatedReportAction = {
-        [reportAction.reportActionID]: {
-            pendingAction: shouldShowDeletedRequestMessage ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-            previousMessage: reportAction.message,
-            message: [
-                {
-                    type: 'COMMENT',
-                    html: '',
-                    text: '',
-                    isEdited: true,
-                    isDeletedParentAction: shouldShowDeletedRequestMessage,
-                },
-            ],
-            originalMessage: {
-                IOUTransactionID: null,
-            },
-            errors: undefined,
-        },
-    } as OnyxTypes.ReportActions;
-
-    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(chatReport?.reportID ?? '', updatedReportAction);
-    const reportLastMessageText = ReportActionsUtils.getLastVisibleMessage(chatReport?.reportID ?? '', updatedReportAction).lastMessageText;
-
-    // STEP 4: Build Onyx data
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: null,
-        },
-    ];
-
-    if (Permissions.canUseViolations(betas)) {
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
-            value: null,
-        });
-    }
-
-    if (shouldDeleteTransactionThread) {
-        optimisticData.push(
-            {
-                onyxMethod: Onyx.METHOD.SET,
-                key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
-                value: null,
-            },
-            {
-                onyxMethod: Onyx.METHOD.SET,
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadID}`,
-                value: null,
-            },
-        );
-    }
-
-    optimisticData.push(
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
-            value: updatedReportAction,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
-            value: {
-                lastMessageText: reportLastMessageText,
-                lastVisibleActionCreated: lastVisibleAction?.created,
-            },
-        },
-    );
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    pendingAction: null,
-                    errors: null,
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: transaction,
-        },
-    ];
-
-    if (Permissions.canUseViolations(betas)) {
-        failureData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
-            value: transactionViolations,
-        });
-    }
-
-    if (shouldDeleteTransactionThread) {
-        failureData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
-            value: transactionThread,
-        });
-    }
-
-    failureData.push(
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    ...reportAction,
-                    pendingAction: null,
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericDeleteFailureMessage'),
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
-            value: chatReport,
-        },
-    );
-
-    const parameters: DeleteMoneyRequestParams = {
-        transactionID,
-        reportActionID: reportAction.reportActionID,
-    };
+    const {parameters, optimisticData, successData, failureData, shouldDeleteTransactionThread} = getDeleteTrackExpenseInformation(chatReportID, transactionID, reportAction);
 
     // STEP 6: Make the API request
     API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 459bb6edef07..e8a1b0cdd020 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -226,6 +226,8 @@ function IOURequestStepConfirmation({
                 gpsPoints,
                 iouAction,
                 transaction.actionableWhisperReportActionID,
+                transaction.linkedTrackedExpenseReportAction,
+                transaction.linkedTrackedExpenseReportID,
             );
         },
         [
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index e3e3ffcbb609..8de6ad140141 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -1,6 +1,7 @@
 import type {KeysOfUnion, ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
 import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
 import type {Participant, Split} from './IOU';
 import type * as OnyxCommon from './OnyxCommon';
@@ -214,6 +215,12 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
 
         /** The actionable report action ID associated with the transaction */
         actionableWhisperReportActionID?: string;
+
+        /** The linked reportAction id for the tracked expense */
+        linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction;
+
+        /** The linked report id for the tracked expense */
+        linkedTrackedExpenseReportID?: string;
     },
     keyof Comment
 >;

From b9722381fb84e6a32808147d988f43d6fca49ea2 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 27 Mar 2024 21:31:48 +0100
Subject: [PATCH 043/383] CONST.ts revert

---
 src/CONST.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 4eff4ee25502..47caa5e64a90 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1666,10 +1666,6 @@ const CONST = {
 
         MERGED_ACCOUNT_PREFIX: /^(MERGED_\d+@)/,
 
-        get MULTI_LEVEL_TAG() {
-            return new RegExp("/\\{1,2}:/g");
-        },
-
         ROUTES: {
             VALIDATE_LOGIN: /\/v($|(\/\/*))/,
             UNLINK_LOGIN: /\/u($|(\/\/*))/,

From 0832056be8491a8e093b65ce44db328d5e05aadc Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 28 Mar 2024 02:59:04 +0530
Subject: [PATCH 044/383] fix lint

---
 src/libs/actions/IOU.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 2dd80239d0da..443fc94cdeb1 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -4075,7 +4075,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
 }
 
 function deleteTrackExpense(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
-    const {parameters, optimisticData, successData, failureData, shouldDeleteTransactionThread} = getDeleteTrackExpenseInformation(chatReportID, transactionID, reportAction);
+    const {parameters, optimisticData, successData, failureData, shouldDeleteTransactionThread, chatReport} = getDeleteTrackExpenseInformation(chatReportID, transactionID, reportAction);
 
     // STEP 6: Make the API request
     API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});

From 551d81d92882d6fb6324f55a1c453a912f17188c Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 27 Mar 2024 22:56:31 +0100
Subject: [PATCH 045/383] revert

---
 src/libs/PolicyUtils.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 7923533f8f6c..a16141dd3063 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -276,6 +276,11 @@ function goBackFromInvalidPolicy() {
     Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
 }
 
+/** Get a tax with given ID from policy */
+function getTaxByID(policy: OnyxEntry<Policy>, taxID: string): TaxRate | undefined {
+    return policy?.taxRates?.taxes?.[taxID];
+}
+
 export {
     getActivePolicies,
     hasAccountingConnections,
@@ -307,6 +312,7 @@ export {
     getPolicyMembersByIdWithoutCurrentUser,
     goBackFromInvalidPolicy,
     hasTaxRateError,
+    getTaxByID,
     hasPolicyCategoriesError,
 };
 

From fd16783e0aad8797c0b6f635fbf618f39ccda3d6 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 27 Mar 2024 23:45:57 +0100
Subject: [PATCH 046/383] reverting ...

---
 src/libs/PolicyUtils.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index a16141dd3063..43bda05c9e21 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -34,7 +34,7 @@ function hasPolicyMemberError(policyMembers: OnyxEntry<PolicyMembers>): boolean
  *  Check if the policy has any tax rate errors.
  */
 function hasTaxRateError(policy: OnyxEntry<Policy>): boolean {
-    return Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0);
+    return Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0 || Object.values(taxRate?.errorFields ?? {}).some(Boolean));
 }
 
 /**
@@ -281,6 +281,21 @@ function getTaxByID(policy: OnyxEntry<Policy>, taxID: string): TaxRate | undefin
     return policy?.taxRates?.taxes?.[taxID];
 }
 
+/**
+ * Whether the tax rate can be deleted and disabled
+ */
+function canEditTaxRate(policy: Policy, taxID: string): boolean {
+    return policy.taxRates?.defaultExternalID !== taxID;
+}
+
+function isPolicyFeatureEnabled(policy: OnyxEntry<Policy> | EmptyObject, featureName: PolicyFeatureName): boolean {
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
+        return Boolean(policy?.tax?.trackingEnabled);
+    }
+
+    return Boolean(policy?.[featureName]);
+}
+
 export {
     getActivePolicies,
     hasAccountingConnections,
@@ -301,6 +316,7 @@ export {
     getIneligibleInvitees,
     getTagLists,
     getTagListName,
+    canEditTaxRate,
     getTagList,
     getCleanedTagName,
     getCountOfEnabledTagsOfList,
@@ -311,6 +327,7 @@ export {
     getPathWithoutPolicyID,
     getPolicyMembersByIdWithoutCurrentUser,
     goBackFromInvalidPolicy,
+    isPolicyFeatureEnabled,
     hasTaxRateError,
     getTaxByID,
     hasPolicyCategoriesError,

From 06e5ea49b0c2d761180a7c05ebfcc8133dd1cfad Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 27 Mar 2024 16:16:31 -0700
Subject: [PATCH 047/383] chore: add parameter type for
 OpenPolicyAccountingPage

---
 src/libs/API/parameters/OpenPolicyAccountingPageParams.ts | 5 +++++
 src/libs/API/parameters/index.ts                          | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 src/libs/API/parameters/OpenPolicyAccountingPageParams.ts

diff --git a/src/libs/API/parameters/OpenPolicyAccountingPageParams.ts b/src/libs/API/parameters/OpenPolicyAccountingPageParams.ts
new file mode 100644
index 000000000000..0ebaa58ef0d1
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyAccountingPageParams.ts
@@ -0,0 +1,5 @@
+type OpenPolicyAccountingPageParams = {
+    policyID: string;
+};
+
+export default OpenPolicyAccountingPageParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 87d9e2265568..27c9f718a950 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -198,3 +198,4 @@ export type {default as SetPolicyCustomTaxNameParams} from './SetPolicyCustomTax
 export type {default as SetPolicyForeignCurrencyDefaultParams} from './SetPolicyForeignCurrencyDefaultParams';
 export type {default as SetPolicyCurrencyDefaultParams} from './SetPolicyCurrencyDefaultParams';
 export type {default as RenamePolicyTaxParams} from './RenamePolicyTaxParams';
+export type {default as OpenPolicyAccountingPageParams} from './OpenPolicyAccountingPageParams';

From c9455856db0bd6835463c8ac2a247dcb98b6c129 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 27 Mar 2024 16:18:35 -0700
Subject: [PATCH 048/383] chore: add new command

---
 src/libs/API/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index fd84e65c028e..c8a878fd6a14 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -426,6 +426,7 @@ const READ_COMMANDS = {
     OPEN_POLICY_WORKFLOWS_PAGE: 'OpenPolicyWorkflowsPage',
     OPEN_POLICY_DISTANCE_RATES_PAGE: 'OpenPolicyDistanceRatesPage',
     OPEN_POLICY_MORE_FEATURES_PAGE: 'OpenPolicyMoreFeaturesPage',
+    OPEN_POLICY_ACCOUNTING_PAGE: 'OpenPolicyAccountingPage',
 } as const;
 
 type ReadCommand = ValueOf<typeof READ_COMMANDS>;
@@ -466,6 +467,7 @@ type ReadCommandParameters = {
     [READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE]: Parameters.OpenPolicyWorkflowsPageParams;
     [READ_COMMANDS.OPEN_POLICY_DISTANCE_RATES_PAGE]: Parameters.OpenPolicyDistanceRatesPageParams;
     [READ_COMMANDS.OPEN_POLICY_MORE_FEATURES_PAGE]: Parameters.OpenPolicyMoreFeaturesPageParams;
+    [READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE]: Parameters.OpenPolicyAccountingPageParams;
 };
 
 const SIDE_EFFECT_REQUEST_COMMANDS = {

From e0532d5aaceb560bb1648dae198129656c6dfd08 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 27 Mar 2024 16:19:04 -0700
Subject: [PATCH 049/383] chore: add new action func to call web-e command

---
 src/libs/actions/PolicyConnections.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/libs/actions/PolicyConnections.ts

diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
new file mode 100644
index 000000000000..1270a7173d3f
--- /dev/null
+++ b/src/libs/actions/PolicyConnections.ts
@@ -0,0 +1,15 @@
+import * as API from '@libs/API';
+import type {OpenPolicyAccountingPageParams} from '@libs/API/parameters';
+import {READ_COMMANDS} from '@libs/API/types';
+
+function openPolicyAccountingPage({policyID}: {policyID: string}) {
+    const parameters: OpenPolicyAccountingPageParams = {
+        policyID,
+    };
+
+    API.read(READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE, parameters);
+}
+
+// More action functions will be added later
+// eslint-disable-next-line import/prefer-default-export
+export {openPolicyAccountingPage};

From e6292e33f285564a63b26e6e25b68f425b54ea3d Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 27 Mar 2024 16:25:50 -0700
Subject: [PATCH 050/383] feat: add new HOC component

---
 src/pages/workspace/withPolicyConnections.tsx | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/pages/workspace/withPolicyConnections.tsx

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
new file mode 100644
index 000000000000..f4b6fd96a4d3
--- /dev/null
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -0,0 +1,55 @@
+import {useEffect} from 'react';
+import type {ComponentType} from 'react';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import useNetwork from '@hooks/useNetwork';
+import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
+import withPolicy from './withPolicy';
+import type {WithPolicyProps} from './withPolicy';
+
+type WithPolicyConnectionsProps = WithPolicyProps;
+
+function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
+    function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
+        const {isOffline} = useNetwork();
+
+        useEffect(() => {
+            if (!policy?.connections || policy?.connections) {
+                return;
+            }
+
+            openPolicyAccountingPage({policyID: policy?.id});
+        }, [policy]);
+
+        if (!policy?.connections) {
+            if (isOffline) {
+                return (
+                    <FullPageOfflineBlockingView>
+                        <WrappedComponent
+                            policy={policy}
+                            policyMembers={policyMembers}
+                            policyDraft={policyDraft}
+                            policyMembersDraft={policyMembersDraft}
+                            route={route}
+                        />
+                    </FullPageOfflineBlockingView>
+                );
+            }
+
+            return null;
+        }
+
+        return (
+            <WrappedComponent
+                policy={policy}
+                policyMembers={policyMembers}
+                policyDraft={policyDraft}
+                policyMembersDraft={policyMembersDraft}
+                route={route}
+            />
+        );
+    }
+
+    return withPolicy(WithPolicyConnections);
+}
+
+export default withPolicyConnections;

From df39b5bdc06a9c5a0fc7d52a52e9873ff249f223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Thu, 28 Mar 2024 18:10:27 +0100
Subject: [PATCH 051/383] more refactorings

---
 .../SelectionList/BaseSelectionList.tsx       | 15 +++-
 src/components/SelectionList/types.ts         |  2 +-
 src/pages/WorkspaceSwitcherPage.tsx           | 77 +++++++++++--------
 3 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 96891b1cc07d..8d44eca3c05e 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -162,7 +162,20 @@ function BaseSelectionList<TItem extends ListItem>(
     }, [canSelectMultiple, sections]);
 
     // If `initiallyFocusedOptionKey` is not passed, we fall back to `-1`, to avoid showing the highlight on the first member
-    const [focusedIndex, setFocusedIndex] = useState(() => flattenedSections.allOptions.findIndex((option) => option.keyForList === initiallyFocusedOptionKey));
+    const [focusedIndex, setFocusedIndex] = useState(-1);
+    const isFocusedIndexSet = useRef(false);
+
+    useEffect(() => {
+        if (isFocusedIndexSet.current || (flattenedSections.allOptions.length < 1 && initiallyFocusedOptionKey === undefined)) {
+            return;
+        }
+        console.log('initiallyFocusedOptionKey', initiallyFocusedOptionKey);
+        const index = flattenedSections.allOptions.findIndex((option) => option.keyForList === initiallyFocusedOptionKey);
+        if (index !== -1) {
+            setFocusedIndex(index);
+            isFocusedIndexSet.current = true;
+        }
+    }, [flattenedSections.allOptions, initiallyFocusedOptionKey]);
 
     const [slicedSections, ShowMoreButtonInstance] = useMemo(
         () => [
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 108a62fff215..c03d146e5dad 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -278,7 +278,7 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     shouldDelayFocus?: boolean;
 
     /** Component to display on the right side of each child */
-    rightHandSideComponent?: ((item: ListItem) => ReactElement<ListItem>) | ReactElement | null;
+    rightHandSideComponent?: ((item: TItem) => ReactElement<TItem> | ReactElement | null | undefined) | null;
 
     /** Direction of checkmark to show */
     checkmarkPosition?: ValueOf<typeof CONST.DIRECTION>;
diff --git a/src/pages/WorkspaceSwitcherPage.tsx b/src/pages/WorkspaceSwitcherPage.tsx
index 68cdffbaf57e..5f8affabfa17 100644
--- a/src/pages/WorkspaceSwitcherPage.tsx
+++ b/src/pages/WorkspaceSwitcherPage.tsx
@@ -8,6 +8,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
+import type {ListItem, SectionListDataType} from '@components/SelectionList/types';
 import UserListItem from '@components/SelectionList/UserListItem';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
@@ -22,6 +23,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import {getWorkspacesBrickRoads, getWorkspacesUnreadStatuses} from '@libs/WorkspacesSettingsUtils';
+import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 import * as App from '@userActions/App';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -29,13 +31,14 @@ import type {Policy} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import WorkspaceCardCreateAWorkspace from './workspace/card/WorkspaceCardCreateAWorkspace';
 
-type SimpleWorkspaceItem = {
-    text?: string;
-    policyID?: string;
+type WorkspaceListItem = {
+    text: string;
+    policyID: string;
     isPolicyAdmin?: boolean;
-};
+    brickRoadIndicator?: BrickRoad;
+} & ListItem;
 
-const sortWorkspacesBySelected = (workspace1: SimpleWorkspaceItem, workspace2: SimpleWorkspaceItem, selectedWorkspaceID: string | undefined): number => {
+const sortWorkspacesBySelected = (workspace1: WorkspaceListItem, workspace2: WorkspaceListItem, selectedWorkspaceID: string | undefined): number => {
     if (workspace1.policyID === selectedWorkspaceID) {
         return -1;
     }
@@ -90,6 +93,9 @@ function WorkspacesSectionHeader() {
         </View>
     );
 }
+
+const WorkspaceSectionHeaderInstance = <WorkspaceCardCreateAWorkspace />;
+
 function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -133,7 +139,7 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
     );
 
     const selectPolicy = useCallback(
-        (option?: SimpleWorkspaceItem) => {
+        (option?: WorkspaceListItem) => {
             if (!option) {
                 return;
             }
@@ -149,7 +155,7 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
         [activeWorkspaceID, setActiveWorkspaceID],
     );
 
-    const usersWorkspaces = useMemo(() => {
+    const usersWorkspaces = useMemo<WorkspaceListItem[]>(() => {
         if (!policies || isEmptyObject(policies)) {
             return [];
         }
@@ -157,8 +163,8 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
         return Object.values(policies)
             .filter((policy) => PolicyUtils.shouldShowPolicy(policy, !!isOffline))
             .map((policy) => ({
-                text: policy?.name,
-                policyID: policy?.id,
+                text: policy?.name ?? '',
+                policyID: policy?.id ?? '',
                 brickRoadIndicator: getIndicatorTypeForPolicy(policy?.id),
                 icons: [
                     {
@@ -175,7 +181,7 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
             }));
     }, [policies, isOffline, getIndicatorTypeForPolicy, hasUnreadData, activeWorkspaceID]);
 
-    const filteredAndSortedUserWorkspaces = useMemo(
+    const filteredAndSortedUserWorkspaces = useMemo<WorkspaceListItem[]>(
         () =>
             usersWorkspaces
                 .filter((policy) => policy.text?.toLowerCase().includes(debouncedSearchTerm?.toLowerCase() ?? ''))
@@ -183,8 +189,8 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
         [debouncedSearchTerm, usersWorkspaces, activeWorkspaceID],
     );
 
-    const usersWorkspacesSectionData = useMemo(() => {
-        const options = [
+    const sections = useMemo(() => {
+        const options: Array<SectionListDataType<WorkspaceListItem>> = [
             {
                 title: translate('workspace.switcher.everythingSection'),
                 shouldShow: true,
@@ -195,8 +201,8 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                         policyID: '',
                         icons: [{source: Expensicons.ExpensifyAppIcon, name: CONST.WORKSPACE_SWITCHER.NAME, type: CONST.ICON_TYPE_AVATAR}],
                         brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
-                        boldStyle: hasUnreadData(undefined),
                         isSelected: activeWorkspaceID === undefined,
+                        keyForList: CONST.WORKSPACE_SWITCHER.NAME,
                     },
                 ],
             },
@@ -210,13 +216,13 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
             });
         }
         return options;
-    }, [activeWorkspaceID, filteredAndSortedUserWorkspaces, getIndicatorTypeForPolicy, hasUnreadData, translate]);
+    }, [activeWorkspaceID, filteredAndSortedUserWorkspaces, getIndicatorTypeForPolicy, translate]);
 
     const headerMessage = filteredAndSortedUserWorkspaces.length === 0 ? translate('common.noResultsFound') : '';
     const shouldShowCreateWorkspace = usersWorkspaces.length === 0;
 
     const renderRightHandSideComponent = useCallback(
-        (item: (typeof filteredAndSortedUserWorkspaces)[number]) => {
+        (item: WorkspaceListItem) => {
             if (item.isSelected) {
                 return (
                     <View style={styles.defaultCheckmarkWrapper}>
@@ -254,22 +260,31 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
     );
 
     return (
-        <ScreenWrapper testID={WorkspaceSwitcherPage.displayName}>
-            <HeaderWithBackButton
-                title={translate('workspace.switcher.headerTitle')}
-                onBackButtonPress={Navigation.goBack}
-            />
-            <SelectionList
-                ListItem={UserListItem}
-                sections={usersWorkspacesSectionData}
-                onSelectRow={selectPolicy}
-                textInputLabel={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH ? translate('common.search') : undefined}
-                textInputValue={searchTerm}
-                onChangeText={setSearchTerm}
-                headerMessage={headerMessage}
-                rightHandSideComponent={renderRightHandSideComponent}
-                footerContent={shouldShowCreateWorkspace && <WorkspaceCardCreateAWorkspace />}
-            />
+        <ScreenWrapper
+            testID={WorkspaceSwitcherPage.displayName}
+            includeSafeAreaPaddingBottom={false}
+        >
+            {({didScreenTransitionEnd}) => (
+                <>
+                    <HeaderWithBackButton
+                        title={translate('workspace.switcher.headerTitle')}
+                        onBackButtonPress={Navigation.goBack}
+                    />
+                    <SelectionList
+                        ListItem={UserListItem}
+                        sections={didScreenTransitionEnd ? sections : CONST.EMPTY_ARRAY}
+                        onSelectRow={selectPolicy}
+                        textInputLabel={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH ? translate('common.search') : undefined}
+                        textInputValue={searchTerm}
+                        onChangeText={setSearchTerm}
+                        headerMessage={headerMessage}
+                        rightHandSideComponent={renderRightHandSideComponent}
+                        footerContent={shouldShowCreateWorkspace && WorkspaceSectionHeaderInstance}
+                        initiallyFocusedOptionKey={activeWorkspaceID ?? CONST.WORKSPACE_SWITCHER.NAME}
+                        showLoadingPlaceholder
+                    />
+                </>
+            )}
         </ScreenWrapper>
     );
 }

From b509d0fcabf73131eac2ee4b3373147a4e28eb73 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 28 Mar 2024 10:29:17 -0700
Subject: [PATCH 052/383] fix: conditional statement & change the parameter
 from object to single string

---
 src/libs/actions/PolicyConnections.ts         | 2 +-
 src/pages/workspace/withPolicyConnections.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
index 1270a7173d3f..89eae3d20ace 100644
--- a/src/libs/actions/PolicyConnections.ts
+++ b/src/libs/actions/PolicyConnections.ts
@@ -2,7 +2,7 @@ import * as API from '@libs/API';
 import type {OpenPolicyAccountingPageParams} from '@libs/API/parameters';
 import {READ_COMMANDS} from '@libs/API/types';
 
-function openPolicyAccountingPage({policyID}: {policyID: string}) {
+function openPolicyAccountingPage(policyID: string) {
     const parameters: OpenPolicyAccountingPageParams = {
         policyID,
     };
diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index f4b6fd96a4d3..435aa7873428 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -13,11 +13,11 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
         const {isOffline} = useNetwork();
 
         useEffect(() => {
-            if (!policy?.connections || policy?.connections) {
+            if (!!policy?.connections || !policy?.id) {
                 return;
             }
 
-            openPolicyAccountingPage({policyID: policy?.id});
+            openPolicyAccountingPage(policy.id);
         }, [policy]);
 
         if (!policy?.connections) {

From 8e32fded9dff0a2401b310b4a31efeee4708d9d8 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 28 Mar 2024 10:36:28 -0700
Subject: [PATCH 053/383] fix: check if the connections feature is enabled &
 add comments

---
 src/pages/workspace/withPolicyConnections.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 435aa7873428..e733e947168a 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -13,10 +13,12 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
         const {isOffline} = useNetwork();
 
         useEffect(() => {
-            if (!!policy?.connections || !policy?.id) {
+            if (!policy?.areConnectionsEnabled || !!policy?.connections || !policy?.id) {
                 return;
             }
 
+            // If the policy doesn't have the connections data when it has the accounting connections feature enabled,
+            // call the API to get the data
             openPolicyAccountingPage(policy.id);
         }, [policy]);
 

From eb07cd32a7d3fe74c98ea73c9cb89a4fe2ce473a Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 28 Mar 2024 14:41:55 -0700
Subject: [PATCH 054/383] feat: add a function to get the URL to start the QBO
 authentication flow

---
 src/libs/actions/connections/QuickBooksOnline.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/libs/actions/connections/QuickBooksOnline.ts

diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
new file mode 100644
index 000000000000..f70ba8c9c907
--- /dev/null
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -0,0 +1,13 @@
+import {getCommandURL} from '@libs/ApiUtils';
+import CONFIG from '@src/CONFIG';
+
+function getQuickBooksOnlineSetupLink(policyID: string) {
+    const callbackPath = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}/workspace/${policyID}/accounting`;
+    const otherParams = new URLSearchParams({callbackPath, policyID}).toString();
+    const commandURL = getCommandURL({command: 'ConnectToQuickbooksOnline'});
+    return `${commandURL}&${otherParams}`;
+}
+
+// More action functions will be added later
+// eslint-disable-next-line import/prefer-default-export
+export {getQuickBooksOnlineSetupLink};

From ea46f0e3dc782dac0a04bdacd36e7ffe54f49b0b Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 28 Mar 2024 15:25:33 -0700
Subject: [PATCH 055/383] chore: add new text

---
 src/languages/en.ts | 3 +++
 src/languages/es.ts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 74d8deb98066..90baa1068da7 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1999,6 +1999,9 @@ export default {
             invalidRateError: 'Please enter a valid rate',
             lowRateError: 'Rate must be greater than 0',
         },
+        accounting: {
+            setup: 'Set up',
+        },
         bills: {
             manageYourBills: 'Manage your bills',
             askYourVendorsBeforeEmail: 'Ask your vendors to forward their invoices to ',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index da4a17e76fdc..aaea03cbdb03 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2027,6 +2027,9 @@ export default {
             invalidRateError: 'Por favor, introduce una tarifa válida',
             lowRateError: 'La tarifa debe ser mayor que 0',
         },
+        accounting: {
+            setup: 'Wait for the translation here -> https://github.com/Expensify/App/pull/38283/files#r1543793379',
+        },
         bills: {
             manageYourBills: 'Gestiona tus facturas',
             askYourVendorsBeforeEmail: 'Pide a tus proveedores que envíen sus facturas a ',

From 364e45a3ef88d43815e564fa3b0e7f176c1a3465 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 28 Mar 2024 16:30:52 -0700
Subject: [PATCH 056/383] fix: the command name

---
 src/libs/actions/connections/QuickBooksOnline.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index f70ba8c9c907..b27100290413 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -4,7 +4,7 @@ import CONFIG from '@src/CONFIG';
 function getQuickBooksOnlineSetupLink(policyID: string) {
     const callbackPath = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}/workspace/${policyID}/accounting`;
     const otherParams = new URLSearchParams({callbackPath, policyID}).toString();
-    const commandURL = getCommandURL({command: 'ConnectToQuickbooksOnline'});
+    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'});
     return `${commandURL}&${otherParams}`;
 }
 

From db079f8bdfcf0037cd7cfbafae6db7bc2da20f86 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 28 Mar 2024 16:33:47 -0700
Subject: [PATCH 057/383] feat: implement the button to start QBO auth flow

---
 .../index.native.tsx                          | 42 +++++++++++++++++++
 .../ConnectToQuickbooksOnlineButton/index.tsx | 23 ++++++++++
 .../ConnectToQuickbooksOnlineButton/types.ts  |  7 ++++
 3 files changed, 72 insertions(+)
 create mode 100644 src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
 create mode 100644 src/components/ConnectToQuickbooksOnlineButton/index.tsx
 create mode 100644 src/components/ConnectToQuickbooksOnlineButton/types.ts

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
new file mode 100644
index 000000000000..6bffaa1f607c
--- /dev/null
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -0,0 +1,42 @@
+import React, {useState} from 'react';
+import {Button, Modal} from 'react-native';
+import WebView from 'react-native-webview';
+import {useSession} from '@components/OnyxProvider';
+import useEnvironment from '@hooks/useEnvironment';
+import useLocalize from '@hooks/useLocalize';
+import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
+import type {ConnectToQuickbooksOnlineButtonProps} from './types';
+
+function ConnectToQuickbooksOnlineButton({policyID}: ConnectToQuickbooksOnlineButtonProps) {
+    const [isWebViewOpen, setWebViewOpen] = useState<boolean>(false);
+    const session = useSession();
+    const {translate} = useLocalize();
+    const {environmentURL} = useEnvironment();
+
+    return (
+        <>
+            <Button
+                onPress={() => setWebViewOpen(true)}
+                title={translate('workspace.accounting.setup')}
+            />
+            <Modal
+                onDismiss={() => setWebViewOpen(false)}
+                presentationStyle="fullScreen"
+                visible={isWebViewOpen}
+            >
+                <WebView
+                    source={{
+                        uri: `${environmentURL}${getQuickBooksOnlineSetupLink(policyID)}`,
+                        headers: {
+                            Cookie: `authToken=${session.authToken}`,
+                        },
+                    }}
+                    incognito
+                    startInLoadingState={false}
+                />
+            </Modal>
+        </>
+    );
+}
+
+export default ConnectToQuickbooksOnlineButton;
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
new file mode 100644
index 000000000000..b77a42aca5b1
--- /dev/null
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import Button from '@components/Button';
+import useEnvironment from '@hooks/useEnvironment';
+import useLocalize from '@hooks/useLocalize';
+import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
+import * as Link from '@userActions/Link';
+import type {ConnectToQuickbooksOnlineButtonProps} from './types';
+
+function ConnectToQuickbooksOnlineButton({policyID}: ConnectToQuickbooksOnlineButtonProps) {
+    const {translate} = useLocalize();
+    const {environmentURL} = useEnvironment();
+
+    return (
+        <Button
+            onPress={() => {
+                Link.openLink(`${environmentURL}${getQuickBooksOnlineSetupLink(policyID)}`, environmentURL, false);
+            }}
+            text={translate('workspace.accounting.setup')}
+        />
+    );
+}
+
+export default ConnectToQuickbooksOnlineButton;
diff --git a/src/components/ConnectToQuickbooksOnlineButton/types.ts b/src/components/ConnectToQuickbooksOnlineButton/types.ts
new file mode 100644
index 000000000000..dce818f221a2
--- /dev/null
+++ b/src/components/ConnectToQuickbooksOnlineButton/types.ts
@@ -0,0 +1,7 @@
+type ConnectToQuickbooksOnlineButtonProps = {
+    policyID: string;
+};
+
+// More types will be added later
+// eslint-disable-next-line import/prefer-default-export
+export type {ConnectToQuickbooksOnlineButtonProps};

From 39e2defa88e2f8346cc9bc5df6261e8e4311fd55 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Fri, 29 Mar 2024 07:22:39 +0100
Subject: [PATCH 058/383] merge confilcts

---
 .../workspace/tags/WorkspaceTagsPage.tsx      | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 54cbe27b67d4..a3dd72389dde 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -84,33 +84,34 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
         () =>
             policyTagLists
                 .map((policyTagList) =>
-                    lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => {
-                        const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
-                        const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                        return {
-                            value: tag.name,
-                            text: tag.name,
-                            keyForList: tag.name,
-                            isSelected: !!selectedTags[tag.name],
-                            pendingAction: tag.pendingAction,
-                            errors: tag.errors ?? undefined,
-                            enabled: tag.enabled,
-                            isDisabled,
-                            rightElement: (
-                                <View style={styles.flexRow}>
-                                    <Text style={[styles.textSupporting, styles.alignSelfCenter, styles.pl2, styles.label]}>
-                                        {tag.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')}
-                                    </Text>
-                                    <View style={[styles.p1, styles.pl2]}>
-                                        <Icon
-                                            src={Expensicons.ArrowRight}
-                                            fill={theme.icon}
-                                        />
+                    lodashSortBy(Object.values(policyTagList.tags || []).filter((value) => PolicyUtils.getCleanedTagName(value.name) === value.name), 'name', localeCompare)
+                        .map((value) => {
+                            const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
+                            const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                            return {
+                                value: tag.name,
+                                text: tag.name,
+                                keyForList: tag.name,
+                                isSelected: !!selectedTags[tag.name],
+                                pendingAction: tag.pendingAction,
+                                errors: tag.errors ?? undefined,
+                                enabled: tag.enabled,
+                                isDisabled,
+                                rightElement: (
+                                    <View style={styles.flexRow}>
+                                        <Text style={[styles.textSupporting, styles.alignSelfCenter, styles.pl2, styles.label]}>
+                                            {tag.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')}
+                                        </Text>
+                                        <View style={[styles.p1, styles.pl2]}>
+                                            <Icon
+                                                src={Expensicons.ArrowRight}
+                                                fill={theme.icon}
+                                            />
+                                        </View>
                                     </View>
-                                </View>
-                            ),
-                        };
-                    }),
+                                ),
+                            };
+                        }),
                 )
                 .flat(),
         [policyTagLists, selectedTags, styles.alignSelfCenter, styles.flexRow, styles.label, styles.p1, styles.pl2, styles.textSupporting, theme.icon, translate],

From 8d56fad4abd4b4f0514467b3e17dce0649a8e740 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Fri, 29 Mar 2024 08:27:10 +0100
Subject: [PATCH 059/383] prettier...

---
 .../workspace/tags/WorkspaceTagsPage.tsx      | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index a3dd72389dde..97ad17e47a48 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -84,34 +84,37 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
         () =>
             policyTagLists
                 .map((policyTagList) =>
-                    lodashSortBy(Object.values(policyTagList.tags || []).filter((value) => PolicyUtils.getCleanedTagName(value.name) === value.name), 'name', localeCompare)
-                        .map((value) => {
-                            const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
-                            const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                            return {
-                                value: tag.name,
-                                text: tag.name,
-                                keyForList: tag.name,
-                                isSelected: !!selectedTags[tag.name],
-                                pendingAction: tag.pendingAction,
-                                errors: tag.errors ?? undefined,
-                                enabled: tag.enabled,
-                                isDisabled,
-                                rightElement: (
-                                    <View style={styles.flexRow}>
-                                        <Text style={[styles.textSupporting, styles.alignSelfCenter, styles.pl2, styles.label]}>
-                                            {tag.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')}
-                                        </Text>
-                                        <View style={[styles.p1, styles.pl2]}>
-                                            <Icon
-                                                src={Expensicons.ArrowRight}
-                                                fill={theme.icon}
-                                            />
-                                        </View>
+                    lodashSortBy(
+                        Object.values(policyTagList.tags || []).filter((value) => PolicyUtils.getCleanedTagName(value.name) === value.name),
+                        'name',
+                        localeCompare,
+                    ).map((value) => {
+                        const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
+                        const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                        return {
+                            value: tag.name,
+                            text: tag.name,
+                            keyForList: tag.name,
+                            isSelected: !!selectedTags[tag.name],
+                            pendingAction: tag.pendingAction,
+                            errors: tag.errors ?? undefined,
+                            enabled: tag.enabled,
+                            isDisabled,
+                            rightElement: (
+                                <View style={styles.flexRow}>
+                                    <Text style={[styles.textSupporting, styles.alignSelfCenter, styles.pl2, styles.label]}>
+                                        {tag.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')}
+                                    </Text>
+                                    <View style={[styles.p1, styles.pl2]}>
+                                        <Icon
+                                            src={Expensicons.ArrowRight}
+                                            fill={theme.icon}
+                                        />
                                     </View>
-                                ),
-                            };
-                        }),
+                                </View>
+                            ),
+                        };
+                    }),
                 )
                 .flat(),
         [policyTagLists, selectedTags, styles.alignSelfCenter, styles.flexRow, styles.label, styles.p1, styles.pl2, styles.textSupporting, theme.icon, translate],

From f7a932c077350958afd617da7d2544436eb626b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Fri, 29 Mar 2024 15:54:33 +0100
Subject: [PATCH 060/383] even more refactorings

---
 .../SelectionList/BaseSelectionList.tsx       |   4 +-
 .../SelectionList/RadioListItem.tsx           |   6 +-
 .../SelectionList/TableListItem.tsx           |   6 +-
 src/components/SelectionList/UserListItem.tsx |   6 +-
 src/components/SelectionList/types.ts         |  32 +-
 .../WorkspacesSectionHeader.tsx               |  55 ++++
 .../index.tsx}                                |  65 +---
 src/pages/WorkspaceSwitcherPage_.tsx          | 311 ------------------
 .../card/WorkspaceCardCreateAWorkspace.tsx    |   2 +-
 9 files changed, 94 insertions(+), 393 deletions(-)
 create mode 100644 src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx
 rename src/pages/{WorkspaceSwitcherPage.tsx => WorkspaceSwitcherPage/index.tsx} (81%)
 delete mode 100644 src/pages/WorkspaceSwitcherPage_.tsx

diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 8d44eca3c05e..442fa80f6fc5 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -50,6 +50,7 @@ function BaseSelectionList<TItem extends ListItem>(
         onConfirm,
         headerContent,
         footerContent,
+        listFooterContent,
         showScrollIndicator = true,
         showLoadingPlaceholder = false,
         showConfirmButton = false,
@@ -169,7 +170,6 @@ function BaseSelectionList<TItem extends ListItem>(
         if (isFocusedIndexSet.current || (flattenedSections.allOptions.length < 1 && initiallyFocusedOptionKey === undefined)) {
             return;
         }
-        console.log('initiallyFocusedOptionKey', initiallyFocusedOptionKey);
         const index = flattenedSections.allOptions.findIndex((option) => option.keyForList === initiallyFocusedOptionKey);
         if (index !== -1) {
             setFocusedIndex(index);
@@ -588,7 +588,7 @@ function BaseSelectionList<TItem extends ListItem>(
                                     testID="selection-list"
                                     onLayout={onSectionListLayout}
                                     style={(!maxToRenderPerBatch || isInitialSectionListRender) && styles.opacity0}
-                                    ListFooterComponent={ShowMoreButtonInstance}
+                                    ListFooterComponent={listFooterContent ?? ShowMoreButtonInstance}
                                 />
                                 {children}
                             </>
diff --git a/src/components/SelectionList/RadioListItem.tsx b/src/components/SelectionList/RadioListItem.tsx
index e7823209cf7e..fc32b69ca95c 100644
--- a/src/components/SelectionList/RadioListItem.tsx
+++ b/src/components/SelectionList/RadioListItem.tsx
@@ -5,9 +5,9 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import BaseListItem from './BaseListItem';
-import type {RadioListItemProps} from './types';
+import type {ListItem, RadioListItemProps} from './types';
 
-function RadioListItem({
+function RadioListItem<TItem extends ListItem>({
     item,
     isFocused,
     showTooltip,
@@ -20,7 +20,7 @@ function RadioListItem({
     rightHandSideComponent,
     checkmarkPosition,
     isMultilineSupported = false,
-}: RadioListItemProps) {
+}: RadioListItemProps<TItem>) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const fullTitle = isMultilineSupported ? item.text?.trimStart() : item.text;
diff --git a/src/components/SelectionList/TableListItem.tsx b/src/components/SelectionList/TableListItem.tsx
index b7c3ed549d82..91892e0f72b2 100644
--- a/src/components/SelectionList/TableListItem.tsx
+++ b/src/components/SelectionList/TableListItem.tsx
@@ -6,9 +6,9 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import BaseListItem from './BaseListItem';
-import type {TableListItemProps} from './types';
+import type {ListItem, TableListItemProps} from './types';
 
-function TableListItem({
+function TableListItem<TItem extends ListItem>({
     item,
     isFocused,
     showTooltip,
@@ -20,7 +20,7 @@ function TableListItem({
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     checkmarkPosition,
-}: TableListItemProps) {
+}: TableListItemProps<TItem>) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
diff --git a/src/components/SelectionList/UserListItem.tsx b/src/components/SelectionList/UserListItem.tsx
index b52289ffdb59..d370616c8f72 100644
--- a/src/components/SelectionList/UserListItem.tsx
+++ b/src/components/SelectionList/UserListItem.tsx
@@ -10,9 +10,9 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import BaseListItem from './BaseListItem';
-import type {UserListItemProps} from './types';
+import type {ListItem, UserListItemProps} from './types';
 
-function UserListItem({
+function UserListItem<TItem extends ListItem>({
     item,
     isFocused,
     showTooltip,
@@ -24,7 +24,7 @@ function UserListItem({
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     checkmarkPosition,
-}: UserListItemProps) {
+}: UserListItemProps<TItem>) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index c03d146e5dad..5372c016613b 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -10,7 +10,12 @@ import type RadioListItem from './RadioListItem';
 import type TableListItem from './TableListItem';
 import type UserListItem from './UserListItem';
 
-type CommonListItemProps<TItem> = {
+type TRightHandSideComponent<TItem extends ListItem> = {
+    /** Component to display on the right side */
+    rightHandSideComponent?: ((item: TItem) => ReactElement | null | undefined) | ReactElement | null;
+};
+
+type CommonListItemProps<TItem extends ListItem> = {
     /** Whether this item is focused (for arrow key controls) */
     isFocused?: boolean;
 
@@ -32,9 +37,6 @@ type CommonListItemProps<TItem> = {
     /** Callback to fire when an error is dismissed */
     onDismissError?: (item: TItem) => void;
 
-    /** Component to display on the right side */
-    rightHandSideComponent?: ((item: TItem) => ReactElement<TItem>) | ReactElement | null;
-
     /** Direction of checkmark to show */
     checkmarkPosition?: ValueOf<typeof CONST.DIRECTION>;
 
@@ -52,7 +54,7 @@ type CommonListItemProps<TItem> = {
 
     /** Whether to wrap long text up to 2 lines */
     isMultilineSupported?: boolean;
-};
+} & TRightHandSideComponent<TItem>;
 
 type ListItem = {
     /** Text to display */
@@ -115,9 +117,9 @@ type ListItem = {
     searchText?: string | null;
 };
 
-type ListItemProps = CommonListItemProps<ListItem> & {
+type ListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
     /** The section list item */
-    item: ListItem;
+    item: TItem;
 
     /** Additional styles to apply to text */
     style?: StyleProp<TextStyle>;
@@ -139,10 +141,10 @@ type BaseListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
     errors?: Errors | ReceiptErrors | null;
     pendingAction?: PendingAction | null;
     FooterComponent?: ReactElement;
-    children?: ReactElement<ListItemProps> | ((hovered: boolean) => ReactElement<ListItemProps>);
+    children?: ReactElement<ListItemProps<TItem>> | ((hovered: boolean) => ReactElement<ListItemProps<TItem>>);
 };
 
-type UserListItemProps = ListItemProps & {
+type UserListItemProps<TItem extends ListItem> = ListItemProps<TItem> & {
     /** Errors that this user may contain */
     errors?: Errors | ReceiptErrors | null;
 
@@ -153,9 +155,9 @@ type UserListItemProps = ListItemProps & {
     FooterComponent?: ReactElement;
 };
 
-type RadioListItemProps = ListItemProps;
+type RadioListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
 
-type TableListItemProps = ListItemProps;
+type TableListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
 
 type Section<TItem extends ListItem> = {
     /** Title of the section */
@@ -259,6 +261,9 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Custom content to display in the footer */
     footerContent?: ReactNode;
 
+    /** Custom content to display in the footer of list component. If present ShowMore button won't be displayed */
+    listFooterContent?: React.JSX.Element | null;
+
     /** Whether to use dynamic maxToRenderPerBatch depending on the visible number of elements */
     shouldUseDynamicMaxToRenderPerBatch?: boolean;
 
@@ -277,9 +282,6 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Whether focus event should be delayed */
     shouldDelayFocus?: boolean;
 
-    /** Component to display on the right side of each child */
-    rightHandSideComponent?: ((item: TItem) => ReactElement<TItem> | ReactElement | null | undefined) | null;
-
     /** Direction of checkmark to show */
     checkmarkPosition?: ValueOf<typeof CONST.DIRECTION>;
 
@@ -303,7 +305,7 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
 
     /** Ref for textInput */
     textInputRef?: MutableRefObject<TextInput | null>;
-};
+} & TRightHandSideComponent<TItem>;
 
 type SelectionListHandle = {
     scrollAndHighlightItem?: (items: string[], timeout: number) => void;
diff --git a/src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx b/src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx
new file mode 100644
index 000000000000..85e13ba4c0a5
--- /dev/null
+++ b/src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import {PressableWithFeedback} from '@components/Pressable';
+import Text from '@components/Text';
+import Tooltip from '@components/Tooltip';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import Navigation from '@libs/Navigation/Navigation';
+import * as App from '@userActions/App';
+import CONST from '@src/CONST';
+
+function WorkspacesSectionHeader() {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb1]}>
+            <View>
+                <Text
+                    style={styles.label}
+                    color={theme.textSupporting}
+                >
+                    {translate('common.workspaces')}
+                </Text>
+            </View>
+            <Tooltip text={translate('workspace.new.newWorkspace')}>
+                <PressableWithFeedback
+                    accessible={false}
+                    role={CONST.ROLE.BUTTON}
+                    onPress={() => {
+                        Navigation.goBack();
+                        interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
+                    }}
+                >
+                    {({hovered}) => (
+                        <Icon
+                            src={Expensicons.Plus}
+                            width={12}
+                            height={12}
+                            additionalStyles={[styles.buttonDefaultBG, styles.borderRadiusNormal, styles.p2, hovered && styles.buttonHoveredBG]}
+                            fill={theme.icon}
+                        />
+                    )}
+                </PressableWithFeedback>
+            </Tooltip>
+        </View>
+    );
+}
+
+export default WorkspacesSectionHeader;
diff --git a/src/pages/WorkspaceSwitcherPage.tsx b/src/pages/WorkspaceSwitcherPage/index.tsx
similarity index 81%
rename from src/pages/WorkspaceSwitcherPage.tsx
rename to src/pages/WorkspaceSwitcherPage/index.tsx
index 5f8affabfa17..2e2a4293b95e 100644
--- a/src/pages/WorkspaceSwitcherPage.tsx
+++ b/src/pages/WorkspaceSwitcherPage/index.tsx
@@ -5,31 +5,27 @@ import {withOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import type {ListItem, SectionListDataType} from '@components/SelectionList/types';
 import UserListItem from '@components/SelectionList/UserListItem';
-import Text from '@components/Text';
-import Tooltip from '@components/Tooltip';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import {getWorkspacesBrickRoads, getWorkspacesUnreadStatuses} from '@libs/WorkspacesSettingsUtils';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
-import * as App from '@userActions/App';
+import WorkspaceCardCreateAWorkspace from '@pages/workspace/card/WorkspaceCardCreateAWorkspace';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import WorkspaceCardCreateAWorkspace from './workspace/card/WorkspaceCardCreateAWorkspace';
+import WorkspacesSectionHeader from './WorkspacesSectionHeader';
 
 type WorkspaceListItem = {
     text: string;
@@ -55,46 +51,7 @@ type WorkspaceSwitcherPageOnyxProps = {
 
 type WorkspaceSwitcherPageProps = WorkspaceSwitcherPageOnyxProps;
 
-function WorkspacesSectionHeader() {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-
-    return (
-        <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb1]}>
-            <View>
-                <Text
-                    style={styles.label}
-                    color={theme.textSupporting}
-                >
-                    {translate('common.workspaces')}
-                </Text>
-            </View>
-            <Tooltip text={translate('workspace.new.newWorkspace')}>
-                <PressableWithFeedback
-                    accessible={false}
-                    role={CONST.ROLE.BUTTON}
-                    onPress={() => {
-                        Navigation.goBack();
-                        interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
-                    }}
-                >
-                    {({hovered}) => (
-                        <Icon
-                            src={Expensicons.Plus}
-                            width={12}
-                            height={12}
-                            additionalStyles={[styles.buttonDefaultBG, styles.borderRadiusNormal, styles.p2, hovered && styles.buttonHoveredBG]}
-                            fill={theme.icon}
-                        />
-                    )}
-                </PressableWithFeedback>
-            </Tooltip>
-        </View>
-    );
-}
-
-const WorkspaceSectionHeaderInstance = <WorkspaceCardCreateAWorkspace />;
+const WorkspaceCardCreateAWorkspaceInstance = <WorkspaceCardCreateAWorkspace />;
 
 function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
     const theme = useTheme();
@@ -207,14 +164,12 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                 ],
             },
         ];
-        if (filteredAndSortedUserWorkspaces.length > 0) {
-            options.push({
-                CustomSectionHeader: WorkspacesSectionHeader,
-                data: filteredAndSortedUserWorkspaces,
-                shouldShow: true,
-                indexOffset: 1,
-            });
-        }
+        options.push({
+            CustomSectionHeader: WorkspacesSectionHeader,
+            data: filteredAndSortedUserWorkspaces,
+            shouldShow: true,
+            indexOffset: 1,
+        });
         return options;
     }, [activeWorkspaceID, filteredAndSortedUserWorkspaces, getIndicatorTypeForPolicy, translate]);
 
@@ -279,7 +234,7 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                         onChangeText={setSearchTerm}
                         headerMessage={headerMessage}
                         rightHandSideComponent={renderRightHandSideComponent}
-                        footerContent={shouldShowCreateWorkspace && WorkspaceSectionHeaderInstance}
+                        listFooterContent={shouldShowCreateWorkspace ? WorkspaceCardCreateAWorkspaceInstance : null}
                         initiallyFocusedOptionKey={activeWorkspaceID ?? CONST.WORKSPACE_SWITCHER.NAME}
                         showLoadingPlaceholder
                     />
diff --git a/src/pages/WorkspaceSwitcherPage_.tsx b/src/pages/WorkspaceSwitcherPage_.tsx
deleted file mode 100644
index 2eb5ecaf373f..000000000000
--- a/src/pages/WorkspaceSwitcherPage_.tsx
+++ /dev/null
@@ -1,311 +0,0 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {View} from 'react-native';
-import type {OnyxCollection} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import Icon from '@components/Icon';
-import * as Expensicons from '@components/Icon/Expensicons';
-import {MagnifyingGlass} from '@components/Icon/Expensicons';
-import OptionRow from '@components/OptionRow';
-import OptionsSelector from '@components/OptionsSelector';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import ScreenWrapper from '@components/ScreenWrapper';
-import Text from '@components/Text';
-import Tooltip from '@components/Tooltip';
-import useActiveWorkspace from '@hooks/useActiveWorkspace';
-import useAutoFocusInput from '@hooks/useAutoFocusInput';
-import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import interceptAnonymousUser from '@libs/interceptAnonymousUser';
-import Navigation from '@libs/Navigation/Navigation';
-import * as PolicyUtils from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
-import {getWorkspacesBrickRoads, getWorkspacesUnreadStatuses} from '@libs/WorkspacesSettingsUtils';
-import * as App from '@userActions/App';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy} from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import WorkspaceCardCreateAWorkspace from './workspace/card/WorkspaceCardCreateAWorkspace';
-
-type SimpleWorkspaceItem = {
-    text?: string;
-    policyID?: string;
-    isPolicyAdmin?: boolean;
-};
-
-const sortWorkspacesBySelected = (workspace1: SimpleWorkspaceItem, workspace2: SimpleWorkspaceItem, selectedWorkspaceID: string | undefined): number => {
-    if (workspace1.policyID === selectedWorkspaceID) {
-        return -1;
-    }
-    if (workspace2.policyID === selectedWorkspaceID) {
-        return 1;
-    }
-    return workspace1.text?.toLowerCase().localeCompare(workspace2.text?.toLowerCase() ?? '') ?? 0;
-};
-
-type WorkspaceSwitcherPageOnyxProps = {
-    /** The list of this user's policies */
-    policies: OnyxCollection<Policy>;
-};
-
-type WorkspaceSwitcherPageProps = WorkspaceSwitcherPageOnyxProps;
-
-function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const {isOffline} = useNetwork();
-    const [selectedOption, setSelectedOption] = useState<SimpleWorkspaceItem>();
-    const [searchTerm, setSearchTerm] = useState('');
-    const {inputCallbackRef} = useAutoFocusInput();
-    const {translate} = useLocalize();
-    const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace();
-
-    const brickRoadsForPolicies = useMemo(() => getWorkspacesBrickRoads(), []);
-    const unreadStatusesForPolicies = useMemo(() => getWorkspacesUnreadStatuses(), []);
-
-    const getIndicatorTypeForPolicy = useCallback(
-        (policyId?: string) => {
-            if (policyId && policyId !== activeWorkspaceID) {
-                return brickRoadsForPolicies[policyId];
-            }
-
-            if (Object.values(brickRoadsForPolicies).includes(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR)) {
-                return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
-            }
-
-            if (Object.values(brickRoadsForPolicies).includes(CONST.BRICK_ROAD_INDICATOR_STATUS.INFO)) {
-                return CONST.BRICK_ROAD_INDICATOR_STATUS.INFO;
-            }
-
-            return undefined;
-        },
-        [activeWorkspaceID, brickRoadsForPolicies],
-    );
-
-    const hasUnreadData = useCallback(
-        // TO DO: Implement checking if policy has some unread data
-        (policyId?: string) => {
-            if (policyId) {
-                return unreadStatusesForPolicies[policyId];
-            }
-
-            return Object.values(unreadStatusesForPolicies).some((status) => status);
-        },
-        [unreadStatusesForPolicies],
-    );
-
-    const selectPolicy = useCallback(
-        (option?: SimpleWorkspaceItem) => {
-            if (!option) {
-                return;
-            }
-
-            const {policyID} = option;
-
-            if (policyID) {
-                setSelectedOption(option);
-            } else {
-                setSelectedOption(undefined);
-            }
-            setActiveWorkspaceID(policyID);
-            Navigation.goBack();
-            if (policyID !== activeWorkspaceID) {
-                Navigation.navigateWithSwitchPolicyID({policyID});
-            }
-        },
-        [activeWorkspaceID, setActiveWorkspaceID],
-    );
-
-    const usersWorkspaces = useMemo(() => {
-        if (!policies || isEmptyObject(policies)) {
-            return [];
-        }
-
-        return Object.values(policies)
-            .filter((policy) => PolicyUtils.shouldShowPolicy(policy, !!isOffline))
-            .map((policy) => ({
-                text: policy?.name,
-                policyID: policy?.id,
-                brickRoadIndicator: getIndicatorTypeForPolicy(policy?.id),
-                icons: [
-                    {
-                        source: policy?.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy?.name),
-                        fallbackIcon: Expensicons.FallbackWorkspaceAvatar,
-                        name: policy?.name,
-                        type: CONST.ICON_TYPE_WORKSPACE,
-                    },
-                ],
-                boldStyle: hasUnreadData(policy?.id),
-                keyForList: policy?.id,
-                isPolicyAdmin: PolicyUtils.isPolicyAdmin(policy),
-            }));
-    }, [policies, getIndicatorTypeForPolicy, hasUnreadData, isOffline]);
-
-    const filteredAndSortedUserWorkspaces = useMemo(
-        () =>
-            usersWorkspaces
-                .filter((policy) => policy.text?.toLowerCase().includes(searchTerm?.toLowerCase() ?? ''))
-                .sort((policy1, policy2) => sortWorkspacesBySelected(policy1, policy2, activeWorkspaceID)),
-        [searchTerm, usersWorkspaces, activeWorkspaceID],
-    );
-
-    const usersWorkspacesSectionData = useMemo(
-        () => ({
-            data: filteredAndSortedUserWorkspaces,
-            shouldShow: true,
-            indexOffset: 0,
-        }),
-        [filteredAndSortedUserWorkspaces],
-    );
-
-    const everythingSection = useMemo(() => {
-        const option = {
-            reportID: '',
-            text: CONST.WORKSPACE_SWITCHER.NAME,
-            icons: [
-                {
-                    source: Expensicons.ExpensifyAppIcon,
-                    name: CONST.WORKSPACE_SWITCHER.NAME,
-                    type: CONST.ICON_TYPE_AVATAR,
-                },
-            ],
-            brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
-            boldStyle: hasUnreadData(undefined),
-        };
-
-        return (
-            <>
-                <View style={[styles.mh4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb3]}>
-                    <Text
-                        style={styles.label}
-                        color={theme.textSupporting}
-                    >
-                        {translate('workspace.switcher.everythingSection')}
-                    </Text>
-                </View>
-                <View>
-                    <OptionRow
-                        option={option}
-                        onSelectRow={selectPolicy}
-                        showTitleTooltip={false}
-                        highlightSelected
-                        isSelected={!activeWorkspaceID}
-                        optionIsFocused={!activeWorkspaceID}
-                    />
-                </View>
-            </>
-        );
-    }, [activeWorkspaceID, getIndicatorTypeForPolicy, hasUnreadData, selectPolicy, styles, theme.textSupporting, translate]);
-
-    const headerMessage = filteredAndSortedUserWorkspaces.length === 0 ? translate('common.noResultsFound') : '';
-
-    const workspacesSection = useMemo(
-        () => (
-            <>
-                <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, ...(usersWorkspaces.length > 0 ? [styles.mb1] : [styles.mb3])]}>
-                    <View>
-                        <Text
-                            style={styles.label}
-                            color={theme.textSupporting}
-                        >
-                            {translate('common.workspaces')}
-                        </Text>
-                    </View>
-                    <Tooltip text={translate('workspace.new.newWorkspace')}>
-                        <PressableWithFeedback
-                            accessible={false}
-                            role={CONST.ROLE.BUTTON}
-                            onPress={() => {
-                                Navigation.goBack();
-                                interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
-                            }}
-                        >
-                            {({hovered}) => (
-                                <Icon
-                                    src={Expensicons.Plus}
-                                    width={12}
-                                    height={12}
-                                    additionalStyles={[styles.buttonDefaultBG, styles.borderRadiusNormal, styles.p2, hovered && styles.buttonHoveredBG]}
-                                    fill={theme.icon}
-                                />
-                            )}
-                        </PressableWithFeedback>
-                    </Tooltip>
-                </View>
-
-                {usersWorkspaces.length > 0 ? (
-                    <OptionsSelector
-                        // @ts-expect-error TODO: remove this comment once OptionsSelector (https://github.com/Expensify/App/issues/25125) is migrated to TS
-                        placeholder={translate('workspace.switcher.placeholder')}
-                        ref={inputCallbackRef}
-                        sections={[usersWorkspacesSectionData]}
-                        value={searchTerm}
-                        shouldShowTextInput={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH}
-                        onChangeText={setSearchTerm}
-                        selectedOptions={selectedOption ? [selectedOption] : []}
-                        onSelectRow={selectPolicy}
-                        shouldPreventDefaultFocusOnSelectRow
-                        headerMessage={headerMessage}
-                        highlightSelectedOptions
-                        shouldShowOptions
-                        autoFocus={false}
-                        canSelectMultipleOptions={false}
-                        shouldShowSubscript={false}
-                        showTitleTooltip={false}
-                        contentContainerStyles={[styles.pt0, styles.mt0]}
-                        textIconLeft={MagnifyingGlass}
-                        // Null is to avoid selecting unfocused option when Global selected, undefined is to focus selected workspace
-                        initiallyFocusedOptionKey={!activeWorkspaceID ? null : undefined}
-                    />
-                ) : (
-                    <WorkspaceCardCreateAWorkspace />
-                )}
-            </>
-        ),
-        [
-            inputCallbackRef,
-            setSearchTerm,
-            searchTerm,
-            selectPolicy,
-            selectedOption,
-            styles,
-            theme.textSupporting,
-            translate,
-            usersWorkspaces.length,
-            usersWorkspacesSectionData,
-            activeWorkspaceID,
-            theme.icon,
-            headerMessage,
-        ],
-    );
-
-    useEffect(() => {
-        if (!activeWorkspaceID) {
-            return;
-        }
-        const optionToSet = usersWorkspaces.find((option) => option.policyID === activeWorkspaceID);
-        setSelectedOption(optionToSet);
-    }, [activeWorkspaceID, usersWorkspaces]);
-
-    return (
-        <ScreenWrapper testID={WorkspaceSwitcherPage.displayName}>
-            <HeaderWithBackButton
-                title={translate('workspace.switcher.headerTitle')}
-                onBackButtonPress={Navigation.goBack}
-            />
-            {everythingSection}
-            {workspacesSection}
-        </ScreenWrapper>
-    );
-}
-
-WorkspaceSwitcherPage.displayName = 'WorkspaceSwitcherPage';
-
-export default withOnyx<WorkspaceSwitcherPageProps, WorkspaceSwitcherPageOnyxProps>({
-    policies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-})(WorkspaceSwitcherPage);
diff --git a/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx b/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx
index 2c0c039718e2..f965a5bbba30 100644
--- a/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx
+++ b/src/pages/workspace/card/WorkspaceCardCreateAWorkspace.tsx
@@ -17,7 +17,7 @@ function WorkspaceCardCreateAWorkspace() {
             cardLayout={CARD_LAYOUT.ICON_ON_TOP}
             subtitle={translate('workspace.emptyWorkspace.subtitle')}
             subtitleMuted
-            containerStyles={[styles.highlightBG, styles.mh0]}
+            containerStyles={[styles.highlightBG, styles.mv2]}
         >
             <Button
                 onPress={() => {

From d8139a8c5fe43e9d0cd562cbfe2dda09d599f2f1 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Fri, 29 Mar 2024 10:14:53 -0700
Subject: [PATCH 061/383] doc: add and improve comments

---
 src/pages/workspace/withPolicyConnections.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index e733e947168a..49013e711334 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -8,17 +8,27 @@ import type {WithPolicyProps} from './withPolicy';
 
 type WithPolicyConnectionsProps = WithPolicyProps;
 
+/**
+ * Higher-order component that fetches the connections data and populates
+ * the corresponding field of the policy object if the field is empty. It then passes the policy object
+ * to the wrapped component.
+ *
+ * Use this HOC when you need the policy object with its connections field populated.
+ *
+ * Only the active policy gets the complete policy data upon app start that includes the connections data.
+ * For other policies, the connections data needs to be fetched when it's needed.
+ */
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
     function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
 
         useEffect(() => {
+            // When the accounting feature is not enabled, or if the connections data already exists,
+            // there is no need to fetch the connections data.
             if (!policy?.areConnectionsEnabled || !!policy?.connections || !policy?.id) {
                 return;
             }
 
-            // If the policy doesn't have the connections data when it has the accounting connections feature enabled,
-            // call the API to get the data
             openPolicyAccountingPage(policy.id);
         }, [policy]);
 

From 9a44aeb3151b93cea19a61ebda2eb30a4efede1f Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Fri, 29 Mar 2024 10:22:11 -0700
Subject: [PATCH 062/383] doc: add comment on the purpose of the new state

---
 src/pages/workspace/withPolicyConnections.tsx | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 49013e711334..ea562d5acca6 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,4 +1,4 @@
-import {useEffect} from 'react';
+import {useEffect, useState} from 'react';
 import type {ComponentType} from 'react';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import useNetwork from '@hooks/useNetwork';
@@ -19,18 +19,37 @@ type WithPolicyConnectionsProps = WithPolicyProps;
  * For other policies, the connections data needs to be fetched when it's needed.
  */
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
+    /**
+     * Higher-order component that adds policy connections functionality to a component.
+     *
+     * @component
+     * @param {WithPolicyConnectionsProps} props - The props for the component.
+     * @returns {JSX.Element | null} The wrapped component with policy connections functionality.
+     */
+    /**
+     * Higher-order component that adds policy connections functionality to a component.
+     *
+     * @param {WithPolicyConnectionsProps} props - The props for the component.
+     * @returns {React.ReactNode} - The wrapped component.
+     */
     function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
 
+        // When the accounting feature is enabled, but the user hasn't connected to any accounting software,
+        // the connections data doesn't exist. We don't want to continually attempt to fetch non-existent data.
+        // This state helps us track whether a data fetch attempt has been made.
+        const [wasConnectionsDataFetched, setWasConnectionsDataFetched] = useState(false);
+
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
-            if (!policy?.areConnectionsEnabled || !!policy?.connections || !policy?.id) {
+            if (wasConnectionsDataFetched || !policy?.areConnectionsEnabled || !!policy?.connections || !policy?.id) {
                 return;
             }
 
             openPolicyAccountingPage(policy.id);
-        }, [policy]);
+            setWasConnectionsDataFetched(true);
+        }, [policy, wasConnectionsDataFetched]);
 
         if (!policy?.connections) {
             if (isOffline) {

From cf2cce6c92f6629e75f381f2b50c4ac3e103a1e7 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Fri, 29 Mar 2024 10:38:59 -0700
Subject: [PATCH 063/383] doc: remove unnecessary comments

---
 src/pages/workspace/withPolicyConnections.tsx | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index ea562d5acca6..06431c2653ca 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -19,19 +19,6 @@ type WithPolicyConnectionsProps = WithPolicyProps;
  * For other policies, the connections data needs to be fetched when it's needed.
  */
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
-    /**
-     * Higher-order component that adds policy connections functionality to a component.
-     *
-     * @component
-     * @param {WithPolicyConnectionsProps} props - The props for the component.
-     * @returns {JSX.Element | null} The wrapped component with policy connections functionality.
-     */
-    /**
-     * Higher-order component that adds policy connections functionality to a component.
-     *
-     * @param {WithPolicyConnectionsProps} props - The props for the component.
-     * @returns {React.ReactNode} - The wrapped component.
-     */
     function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
 

From 9574470492426b3f77ac3c8aa0371efdcbdc2a35 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <104348397+ishpaul777@users.noreply.github.com>
Date: Sun, 31 Mar 2024 00:19:15 +0530
Subject: [PATCH 064/383] Revert "Add One Transaction Report View"

---
 .../ReportActionItem/MoneyRequestView.tsx     |  10 +-
 src/libs/ReportActionsUtils.ts                |  30 ----
 src/libs/ReportUtils.ts                       |  32 -----
 src/pages/home/ReportScreen.tsx               |   1 -
 src/pages/home/report/ReportActionItem.tsx    |  56 +-------
 .../report/ReportActionItemParentAction.tsx   |  18 +--
 src/pages/home/report/ReportActionsList.tsx   |  12 --
 .../report/ReportActionsListItemRenderer.tsx  |  12 --
 src/pages/home/report/ReportActionsView.tsx   | 131 ++++--------------
 src/pages/reportPropTypes.js                  |   3 -
 src/styles/utils/index.ts                     |  19 +--
 src/types/onyx/Report.ts                      |   4 +-
 .../EnforceActionExportRestrictions.ts        |   4 -
 .../perf-test/ReportActionsList.perf-test.tsx |   2 -
 14 files changed, 51 insertions(+), 283 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 37d939e13868..5c382ca8ee33 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -70,9 +70,6 @@ type MoneyRequestViewPropsWithoutTransaction = MoneyRequestViewOnyxPropsWithoutT
 
     /** Whether we should display the horizontal rule below the component */
     shouldShowHorizontalRule: boolean;
-
-    /** Whether we should display the animated banner above the component */
-    shouldShowAnimatedBackground: boolean;
 };
 
 type MoneyRequestViewProps = MoneyRequestViewTransactionOnyxProps & MoneyRequestViewPropsWithoutTransaction;
@@ -87,7 +84,6 @@ function MoneyRequestView({
     policyTagList,
     policy,
     transactionViolations,
-    shouldShowAnimatedBackground,
 }: MoneyRequestViewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -241,9 +237,9 @@ function MoneyRequestView({
     );
 
     return (
-        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true, shouldShowAnimatedBackground)]}>
-            {shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
-            <View style={shouldShowAnimatedBackground && [StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth, true)]}>
+        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)]}>
+            <AnimatedEmptyStateBackground />
+            <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
                 {/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
                 {(showMapAsImage || hasReceipt) && (
                     <OfflineWithFeedback
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index c3b377783b13..43145dc3c7a1 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -213,35 +213,6 @@ function isTransactionThread(parentReportAction: OnyxEntry<ReportAction> | Empty
     );
 }
 
-/**
- * Returns the reportID for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions with a childReportID. Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
- */
-function getOneTransactionThreadReportID(reportActions: OnyxEntry<ReportActions> | ReportAction[]): string | null {
-    const reportActionsArray = Object.values(reportActions ?? {});
-
-    if (!reportActionsArray.length) {
-        return null;
-    }
-
-    // Get all IOU report actions for the report.
-    const iouRequestTypes: Array<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>> = [CONST.IOU.REPORT_ACTION_TYPE.CREATE, CONST.IOU.REPORT_ACTION_TYPE.SPLIT, CONST.IOU.REPORT_ACTION_TYPE.PAY];
-    const iouRequestActions = reportActionsArray.filter(
-        (action) =>
-            action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
-            (iouRequestTypes.includes(action.originalMessage.type) ?? []) &&
-            action.childReportID &&
-            action.originalMessage.IOUTransactionID,
-    );
-
-    // If we don't have any IOU request actions, or we have more than one IOU request actions, this isn't a oneTransaction report
-    if (!iouRequestActions.length || iouRequestActions.length > 1) {
-        return null;
-    }
-
-    // Ensure we have a childReportID associated with the IOU report action
-    return iouRequestActions[0].childReportID ?? null;
-}
-
 /**
  * Sort an array of reportActions by their created timestamp first, and reportActionID second
  * This gives us a stable order even in the case of multiple reportActions created on the same millisecond
@@ -1059,7 +1030,6 @@ function getReportActionMessageText(reportAction: OnyxEntry<ReportAction> | Empt
 
 export {
     extractLinksFromMessageHtml,
-    getOneTransactionThreadReportID,
     getAllReportActions,
     getIOUReportIDFromReportActionPreview,
     getLastClosedReportAction,
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 9fa28535a7a7..73782c256ffd 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1264,23 +1264,6 @@ function isMoneyRequestReport(reportOrID: OnyxEntry<Report> | EmptyObject | stri
     return isIOUReport(report) || isExpenseReport(report);
 }
 
-/**
- * Checks if a report has only one transaction associated with it
- */
-function isOneTransactionReport(reportID: string): boolean {
-    const reportActions = reportActionsByReport?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? ([] as ReportAction[]);
-    return ReportActionsUtils.getOneTransactionThreadReportID(reportActions) !== null;
-}
-
-/**
- * Checks if a report is a transaction thread associated with a report that has only one transaction
- */
-function isOneTransactionThread(reportID: string, parentReportID: string): boolean {
-    const parentReportActions = reportActionsByReport?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? ([] as ReportAction[]);
-    const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(parentReportActions);
-    return reportID === transactionThreadReportID;
-}
-
 /**
  * Should return true only for personal 1:1 report
  *
@@ -1811,11 +1794,6 @@ function getIcons(
         };
         const isManager = currentUserAccountID === report?.managerID;
 
-        // For one transaction IOUs, display a simplified report icon
-        if (isOneTransactionReport(report?.reportID ?? '0')) {
-            return [ownerIcon];
-        }
-
         return isManager ? [managerIcon, ownerIcon] : [ownerIcon, managerIcon];
     }
 
@@ -4419,11 +4397,6 @@ function shouldReportBeInOptionList({
         return false;
     }
 
-    // If this is a transaction thread associated with a report that only has one transaction, omit it
-    if (isOneTransactionThread(report.reportID, report.parentReportID ?? '0')) {
-        return false;
-    }
-
     // Include the currently viewed report. If we excluded the currently viewed report, then there
     // would be no way to highlight it in the options list and it would be confusing to users because they lose
     // a sense of context.
@@ -4894,10 +4867,6 @@ function shouldReportShowSubscript(report: OnyxEntry<Report>): boolean {
         return true;
     }
 
-    if (isExpenseReport(report) && isOneTransactionReport(report?.reportID ?? '')) {
-        return true;
-    }
-
     if (isWorkspaceTaskReport(report)) {
         return true;
     }
@@ -5809,7 +5778,6 @@ export {
     hasSingleParticipant,
     getReportRecipientAccountIDs,
     isOneOnOneChat,
-    isOneTransactionThread,
     isPayer,
     goBackToDetailsPage,
     getTransactionReportName,
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index f1f8eb8047c7..ddff1f15c38f 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -635,7 +635,6 @@ function ReportScreen({
                                         isLoadingNewerReportActions={reportMetadata?.isLoadingNewerReportActions}
                                         isLoadingOlderReportActions={reportMetadata?.isLoadingOlderReportActions}
                                         isReadyForCommentLinking={!shouldShowSkeleton}
-                                        transactionThreadReportID={ReportActionsUtils.getOneTransactionThreadReportID(reportActions ?? [])}
                                     />
                                 )}
 
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 2716fedcf59a..f441f8e0ea3f 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -49,7 +49,6 @@ import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SelectionScraper from '@libs/SelectionScraper';
-import * as TransactionUtils from '@libs/TransactionUtils';
 import {ReactionListContext} from '@pages/home/ReportScreenContext';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
@@ -101,22 +100,12 @@ type ReportActionItemOnyxProps = {
 
     /** The policy which the user has access to and which the report is tied to */
     policy: OnyxEntry<OnyxTypes.Policy>;
-
-    /** Transaction associated with this report, if any */
-    transaction: OnyxEntry<OnyxTypes.Transaction>;
 };
 
 type ReportActionItemProps = {
     /** Report for this action */
     report: OnyxTypes.Report;
 
-    /** The transaction thread report associated with the report for this action, if any */
-    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** Array of report actions for the report for this action */
-    // eslint-disable-next-line react/no-unused-prop-types
-    reportActions: OnyxTypes.ReportAction[];
-
     /** Report action belonging to the report's parent */
     parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -153,7 +142,6 @@ const isIOUReport = (actionObj: OnyxEntry<OnyxTypes.ReportAction>): actionObj is
 function ReportActionItem({
     action,
     report,
-    transactionThreadReport,
     linkedReportActionID,
     displayAsGroup,
     emojiReactions,
@@ -167,7 +155,6 @@ function ReportActionItem({
     shouldHideThreadDividerLine = false,
     shouldShowSubscriptAvatar = false,
     policy,
-    transaction,
     onPress = undefined,
 }: ReportActionItemProps) {
     const {translate} = useLocalize();
@@ -193,7 +180,7 @@ function ReportActionItem({
     const originalReportID = ReportUtils.getOriginalReportID(report.reportID, action);
     const originalReport = report.reportID === originalReportID ? report : ReportUtils.getReport(originalReportID);
     const isReportActionLinked = linkedReportActionID && action.reportActionID && linkedReportActionID === action.reportActionID;
-    const transactionCurrency = TransactionUtils.getCurrency(transaction);
+
     const reportScrollManager = useReportScrollManager();
 
     const highlightedBackgroundColorIfNeeded = useMemo(
@@ -713,7 +700,6 @@ function ReportActionItem({
                     <MoneyRequestView
                         report={report}
                         shouldShowHorizontalRule={!shouldHideThreadDividerLine}
-                        shouldShowAnimatedBackground
                     />
                 </ShowContextMenuContext.Provider>
             );
@@ -753,30 +739,11 @@ function ReportActionItem({
         if (ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report)) {
             return (
                 <OfflineWithFeedback pendingAction={action.pendingAction}>
-                    {transactionThreadReport && !isEmptyObject(transactionThreadReport) ? (
-                        <>
-                            {transactionCurrency !== report.currency && (
-                                <MoneyReportView
-                                    report={report}
-                                    policy={policy}
-                                    shouldShowHorizontalRule={!shouldHideThreadDividerLine}
-                                />
-                            )}
-                            <ShowContextMenuContext.Provider value={contextValue}>
-                                <MoneyRequestView
-                                    report={transactionThreadReport}
-                                    shouldShowHorizontalRule={!shouldHideThreadDividerLine}
-                                    shouldShowAnimatedBackground={transactionCurrency === report.currency}
-                                />
-                            </ShowContextMenuContext.Provider>
-                        </>
-                    ) : (
-                        <MoneyReportView
-                            report={report}
-                            policy={policy}
-                            shouldShowHorizontalRule={!shouldHideThreadDividerLine}
-                        />
-                    )}
+                    <MoneyReportView
+                        report={report}
+                        policy={policy}
+                        shouldShowHorizontalRule={!shouldHideThreadDividerLine}
+                    />
                 </OfflineWithFeedback>
             );
         }
@@ -932,14 +899,6 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
     userWallet: {
         key: ONYXKEYS.USER_WALLET,
     },
-    transaction: {
-        key: ({transactionThreadReport, reportActions}) => {
-            const parentReportActionID = isEmptyObject(transactionThreadReport) ? '0' : transactionThreadReport.parentReportActionID;
-            const action = reportActions?.find((reportAction) => reportAction.reportActionID === parentReportActionID);
-            const transactionID = (action as OnyxTypes.OriginalMessageIOU)?.originalMessage.IOUTransactionID ? (action as OnyxTypes.OriginalMessageIOU).originalMessage.IOUTransactionID : 0;
-            return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
-        },
-    },
 })(
     memo(ReportActionItem, (prevProps, nextProps) => {
         const prevParentReportAction = prevProps.parentReportAction;
@@ -971,9 +930,6 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
             prevProps.linkedReportActionID === nextProps.linkedReportActionID &&
             lodashIsEqual(prevProps.report.fieldList, nextProps.report.fieldList) &&
             lodashIsEqual(prevProps.policy, nextProps.policy) &&
-            lodashIsEqual(prevProps.transactionThreadReport, nextProps.transactionThreadReport) &&
-            lodashIsEqual(prevProps.reportActions, nextProps.reportActions) &&
-            lodashIsEqual(prevProps.transaction, nextProps.transaction) &&
             lodashIsEqual(prevParentReportAction, nextParentReportAction)
         );
     }),
diff --git a/src/pages/home/report/ReportActionItemParentAction.tsx b/src/pages/home/report/ReportActionItemParentAction.tsx
index 3d98973c86c4..c6bc181bdbe7 100644
--- a/src/pages/home/report/ReportActionItemParentAction.tsx
+++ b/src/pages/home/report/ReportActionItemParentAction.tsx
@@ -31,12 +31,6 @@ type ReportActionItemParentActionProps = {
     /** The current report is displayed */
     report: OnyxEntry<OnyxTypes.Report>;
 
-    /** The transaction thread report associated with the current report, if any */
-    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** Array of report actions for this report */
-    reportActions: OnyxTypes.ReportAction[];
-
     /** Report actions belonging to the report's parent */
     parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -44,15 +38,7 @@ type ReportActionItemParentActionProps = {
     shouldDisplayReplyDivider: boolean;
 };
 
-function ReportActionItemParentAction({
-    report,
-    transactionThreadReport,
-    reportActions,
-    parentReportAction,
-    index = 0,
-    shouldHideThreadDividerLine = false,
-    shouldDisplayReplyDivider,
-}: ReportActionItemParentActionProps) {
+function ReportActionItemParentAction({report, parentReportAction, index = 0, shouldHideThreadDividerLine = false, shouldDisplayReplyDivider}: ReportActionItemParentActionProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {isSmallScreenWidth} = useWindowDimensions();
@@ -106,8 +92,6 @@ function ReportActionItemParentAction({
                         onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? ''))}
                         parentReportAction={parentReportAction}
                         report={ancestor.report}
-                        reportActions={reportActions}
-                        transactionThreadReport={transactionThreadReport}
                         action={ancestor.reportAction}
                         displayAsGroup={false}
                         isMostRecentIOUReportAction={false}
diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
index d1b9c420b0af..3b001d859ed8 100644
--- a/src/pages/home/report/ReportActionsList.tsx
+++ b/src/pages/home/report/ReportActionsList.tsx
@@ -41,12 +41,6 @@ type ReportActionsListProps = WithCurrentUserPersonalDetailsProps & {
     /** The report currently being looked at */
     report: OnyxTypes.Report;
 
-    /** The transaction thread report associated with the current report, if any */
-    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** Array of report actions for the current report */
-    reportActions: OnyxTypes.ReportAction[];
-
     /** The report's parentReportAction */
     parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -131,8 +125,6 @@ const onScrollToIndexFailed = () => {};
 
 function ReportActionsList({
     report,
-    transactionThreadReport,
-    reportActions = [],
     parentReportAction,
     isLoadingInitialReportActions = false,
     isLoadingOlderReportActions = false,
@@ -522,11 +514,9 @@ function ReportActionsList({
         ({item: reportAction, index}: ListRenderItemInfo<OnyxTypes.ReportAction>) => (
             <ReportActionsListItemRenderer
                 reportAction={reportAction}
-                reportActions={reportActions}
                 parentReportAction={parentReportAction}
                 index={index}
                 report={report}
-                transactionThreadReport={transactionThreadReport}
                 linkedReportActionID={linkedReportActionID}
                 displayAsGroup={ReportActionsUtils.isConsecutiveActionMadeByPreviousActor(sortedVisibleReportActions, index)}
                 mostRecentIOUReportActionID={mostRecentIOUReportActionID}
@@ -544,8 +534,6 @@ function ReportActionsList({
             shouldHideThreadDividerLine,
             shouldDisplayNewMarker,
             parentReportAction,
-            reportActions,
-            transactionThreadReport,
         ],
     );
 
diff --git a/src/pages/home/report/ReportActionsListItemRenderer.tsx b/src/pages/home/report/ReportActionsListItemRenderer.tsx
index 263415d90c39..4ea395c61100 100644
--- a/src/pages/home/report/ReportActionsListItemRenderer.tsx
+++ b/src/pages/home/report/ReportActionsListItemRenderer.tsx
@@ -11,9 +11,6 @@ type ReportActionsListItemRendererProps = {
     /** All the data of the action item */
     reportAction: ReportAction;
 
-    /** Array of report actions for the report */
-    reportActions: ReportAction[];
-
     /** The report's parentReportAction */
     parentReportAction: OnyxEntry<ReportAction>;
 
@@ -23,9 +20,6 @@ type ReportActionsListItemRendererProps = {
     /** Report for this action */
     report: Report;
 
-    /** The transaction thread report associated with the report for this action, if any */
-    transactionThreadReport: OnyxEntry<Report>;
-
     /** Should the comment have the appearance of being grouped with the previous comment? */
     displayAsGroup: boolean;
 
@@ -47,11 +41,9 @@ type ReportActionsListItemRendererProps = {
 
 function ReportActionsListItemRenderer({
     reportAction,
-    reportActions = [],
     parentReportAction,
     index,
     report,
-    transactionThreadReport,
     displayAsGroup,
     mostRecentIOUReportActionID = '',
     shouldHideThreadDividerLine,
@@ -135,8 +127,6 @@ function ReportActionsListItemRenderer({
             parentReportAction={parentReportAction}
             reportID={report.reportID}
             report={report}
-            reportActions={reportActions}
-            transactionThreadReport={transactionThreadReport}
             index={index}
         />
     ) : (
@@ -144,9 +134,7 @@ function ReportActionsListItemRenderer({
             shouldHideThreadDividerLine={shouldHideThreadDividerLine}
             parentReportAction={parentReportAction}
             report={report}
-            transactionThreadReport={transactionThreadReport}
             action={action}
-            reportActions={reportActions}
             linkedReportActionID={linkedReportActionID}
             displayAsGroup={displayAsGroup}
             shouldDisplayNewMarker={shouldDisplayNewMarker}
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
index 1b6a9614a466..e81bfa0fcb6d 100755
--- a/src/pages/home/report/ReportActionsView.tsx
+++ b/src/pages/home/report/ReportActionsView.tsx
@@ -28,7 +28,6 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import getInitialPaginationSize from './getInitialPaginationSize';
 import PopoverReactionList from './ReactionList/PopoverReactionList';
 import ReportActionsList from './ReportActionsList';
@@ -36,12 +35,6 @@ import ReportActionsList from './ReportActionsList';
 type ReportActionsViewOnyxProps = {
     /** Session info for the currently logged in user. */
     session: OnyxEntry<OnyxTypes.Session>;
-
-    /** Array of report actions for the transaction thread report associated with the current report */
-    transactionThreadReportActions: OnyxTypes.ReportAction[];
-
-    /** The transaction thread report associated with the current report, if any */
-    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
 };
 
 type ReportActionsViewProps = ReportActionsViewOnyxProps & {
@@ -65,10 +58,6 @@ type ReportActionsViewProps = ReportActionsViewOnyxProps & {
 
     /** Whether the report is ready for comment linking */
     isReadyForCommentLinking?: boolean;
-
-    /** The reportID of the transaction thread report associated with this current report, if any */
-    // eslint-disable-next-line react/no-unused-prop-types
-    transactionThreadReportID?: string | null;
 };
 
 const DIFF_BETWEEN_SCREEN_HEIGHT_AND_LIST = 120;
@@ -78,11 +67,9 @@ let listOldID = Math.round(Math.random() * 100);
 
 function ReportActionsView({
     report,
-    transactionThreadReport,
     session,
     parentReportAction,
     reportActions: allReportActions = [],
-    transactionThreadReportActions = [],
     isLoadingInitialReportActions = false,
     isLoadingOlderReportActions = false,
     isLoadingNewerReportActions = false,
@@ -110,7 +97,24 @@ function ReportActionsView({
     const prevIsSmallScreenWidthRef = useRef(isSmallScreenWidth);
     const reportID = report.reportID;
     const isLoading = (!!reportActionID && isLoadingInitialReportActions) || !isReadyForCommentLinking;
+
+    /**
+     * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
+     * displaying.
+     */
+    const fetchNewerAction = useCallback(
+        (newestReportAction: OnyxTypes.ReportAction) => {
+            if (isLoadingNewerReportActions || isLoadingInitialReportActions) {
+                return;
+            }
+
+            Report.getNewerActions(reportID, newestReportAction.reportActionID);
+        },
+        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportID],
+    );
+
     const isReportFullyVisible = useMemo((): boolean => getIsReportFullyVisible(isFocused), [isFocused]);
+
     const openReportIfNecessary = () => {
         if (!shouldFetchReport(report)) {
             return;
@@ -144,85 +148,32 @@ function ReportActionsView({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [route, isLoadingInitialReportActions]);
 
-    // Get a sorted array of reportActions for both the current report and the transaction thread report associated with this report (if there is one)
-    // so that we display transaction-level and report-level report actions in order in the one-transaction view
-    const combinedReportActions = useMemo(() => {
-        if (isEmptyObject(transactionThreadReportActions)) {
-            return allReportActions;
-        }
-
-        // Filter out the created action from the transaction thread report actions, since we already have the parent report's created action in `reportActions`
-        const filteredTransactionThreadReportActions = transactionThreadReportActions?.filter((action) => action.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED);
-
-        // Filter out "created" IOU report actions because we don't want to show any preview actions for one transaction reports
-        const filteredReportActions = [...allReportActions, ...filteredTransactionThreadReportActions].filter(
-            (action) => ((action as OnyxTypes.OriginalMessageIOU).originalMessage?.type ?? '') !== CONST.IOU.REPORT_ACTION_TYPE.CREATE,
-        );
-        return ReportActionsUtils.getSortedReportActions(filteredReportActions, true);
-    }, [allReportActions, transactionThreadReportActions]);
-
     const indexOfLinkedAction = useMemo(() => {
         if (!reportActionID || isLoading) {
             return -1;
         }
 
-        return combinedReportActions.findIndex((obj) => String(obj.reportActionID) === String(isFirstLinkedActionRender.current ? reportActionID : currentReportActionID));
-    }, [combinedReportActions, currentReportActionID, reportActionID, isLoading]);
+        return allReportActions.findIndex((obj) => String(obj.reportActionID) === String(isFirstLinkedActionRender.current ? reportActionID : currentReportActionID));
+    }, [allReportActions, currentReportActionID, reportActionID, isLoading]);
 
     const reportActions = useMemo(() => {
         if (!reportActionID) {
-            return combinedReportActions;
+            return allReportActions;
         }
-
         if (isLoading || indexOfLinkedAction === -1) {
             return [];
         }
 
         if (isFirstLinkedActionRender.current) {
-            return combinedReportActions.slice(indexOfLinkedAction);
+            return allReportActions.slice(indexOfLinkedAction);
         }
         const paginationSize = getInitialPaginationSize;
-        return combinedReportActions.slice(Math.max(indexOfLinkedAction - paginationSize, 0));
-
+        return allReportActions.slice(Math.max(indexOfLinkedAction - paginationSize, 0));
         // currentReportActionID is needed to trigger batching once the report action has been positioned
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [reportActionID, combinedReportActions, indexOfLinkedAction, isLoading, currentReportActionID]);
+    }, [reportActionID, allReportActions, indexOfLinkedAction, isLoading, currentReportActionID]);
 
-    const reportActionIDMap = useMemo(() => {
-        const reportActionIDs = allReportActions.map((action) => action.reportActionID);
-        return reportActions.map((action) => ({
-            reportActionID: action.reportActionID,
-            reportID: reportActionIDs.includes(action.reportActionID) ? reportID : transactionThreadReport?.reportID,
-        }));
-    }, [allReportActions, reportID, transactionThreadReport, reportActions]);
-
-    /**
-     * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
-     * displaying.
-     */
-    const fetchNewerAction = useCallback(
-        (newestReportAction: OnyxTypes.ReportAction) => {
-            if (isLoadingNewerReportActions || isLoadingInitialReportActions) {
-                return;
-            }
-
-            // If this is a one transaction report, ensure we load newer actions for both this report and the report associated with the transaction
-            if (!isEmptyObject(transactionThreadReport)) {
-                // Get newer actions based on the newest reportAction for the current report
-                const newestActionCurrentReport = reportActionIDMap.find((item) => item.reportID === reportID);
-                Report.getNewerActions(newestActionCurrentReport?.reportID ?? '0', newestActionCurrentReport?.reportActionID ?? '0');
-
-                // Get newer actions based on the newest reportAction for the transaction thread report
-                const newestActionTransactionThreadReport = reportActionIDMap.find((item) => item.reportID === transactionThreadReport.reportID);
-                Report.getNewerActions(newestActionTransactionThreadReport?.reportID ?? '0', newestActionTransactionThreadReport?.reportActionID ?? '0');
-            } else {
-                Report.getNewerActions(reportID, newestReportAction.reportActionID);
-            }
-        },
-        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportID, transactionThreadReport, reportActionIDMap],
-    );
-
-    const hasMoreCached = reportActions.length < combinedReportActions.length;
+    const hasMoreCached = reportActions.length < allReportActions.length;
     const newestReportAction = useMemo(() => reportActions?.[0], [reportActions]);
     const handleReportActionPagination = useCallback(
         ({firstReportActionID}: {firstReportActionID: string}) => {
@@ -241,7 +192,8 @@ function ReportActionsView({
 
     const mostRecentIOUReportActionID = useMemo(() => ReportActionsUtils.getMostRecentIOURequestActionID(reportActions), [reportActions]);
     const hasCachedActionOnFirstRender = useInitialValue(() => reportActions.length > 0);
-    const hasNewestReportAction = reportActions[0]?.created === report.lastVisibleActionCreated || reportActions[0]?.created === transactionThreadReport?.lastVisibleActionCreated;
+    const hasNewestReportAction = reportActions[0]?.created === report.lastVisibleActionCreated;
+
     const oldestReportAction = useMemo(() => reportActions?.at(-1), [reportActions]);
     const hasCreatedAction = oldestReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED;
 
@@ -360,20 +312,9 @@ function ReportActionsView({
         if (!oldestReportAction || hasCreatedAction) {
             return;
         }
-
-        if (!isEmptyObject(transactionThreadReport)) {
-            // Get newer actions based on the newest reportAction for the current report
-            const oldestActionCurrentReport = reportActionIDMap.findLast((item) => item.reportID === reportID);
-            Report.getNewerActions(oldestActionCurrentReport?.reportID ?? '0', oldestActionCurrentReport?.reportActionID ?? '0');
-
-            // Get newer actions based on the newest reportAction for the transaction thread report
-            const oldestActionTransactionThreadReport = reportActionIDMap.findLast((item) => item.reportID === transactionThreadReport.reportID);
-            Report.getNewerActions(oldestActionTransactionThreadReport?.reportID ?? '0', oldestActionTransactionThreadReport?.reportActionID ?? '0');
-        } else {
-            // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
-            Report.getOlderActions(reportID, oldestReportAction.reportActionID);
-        }
-    }, [network.isOffline, isLoadingOlderReportActions, isLoadingInitialReportActions, oldestReportAction, hasCreatedAction, reportID, reportActionIDMap, transactionThreadReport]);
+        // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
+        Report.getOlderActions(reportID, oldestReportAction.reportActionID);
+    }, [network.isOffline, isLoadingOlderReportActions, isLoadingInitialReportActions, oldestReportAction, hasCreatedAction, reportID]);
 
     const loadNewerChats = useCallback(() => {
         if (isLoadingInitialReportActions || isLoadingOlderReportActions || network.isOffline || newestReportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
@@ -541,8 +482,6 @@ function ReportActionsView({
         <>
             <ReportActionsList
                 report={report}
-                transactionThreadReport={transactionThreadReport}
-                reportActions={reportActions}
                 parentReportAction={parentReportAction}
                 onLayout={recordTimeToMeasureItemLayout}
                 sortedReportActions={reportActionsToDisplay}
@@ -572,10 +511,6 @@ function arePropsEqual(oldProps: ReportActionsViewProps, newProps: ReportActions
         return false;
     }
 
-    if (!lodashIsEqual(oldProps.transactionThreadReportActions, newProps.transactionThreadReportActions)) {
-        return false;
-    }
-
     if (!lodashIsEqual(oldProps.parentReportAction, newProps.parentReportAction)) {
         return false;
     }
@@ -606,13 +541,5 @@ export default Performance.withRenderTrace({id: '<ReportActionsView> rendering'}
         session: {
             key: ONYXKEYS.SESSION,
         },
-        transactionThreadReportActions: {
-            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
-            canEvict: false,
-            selector: (reportActions: OnyxEntry<OnyxTypes.ReportActions>) => ReportActionsUtils.getSortedReportActionsForDisplay(reportActions, true),
-        },
-        transactionThreadReport: {
-            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
-        },
     })(MemoizedReportActionsView),
 );
diff --git a/src/pages/reportPropTypes.js b/src/pages/reportPropTypes.js
index 7422bad8061f..3a056ee7c0a3 100644
--- a/src/pages/reportPropTypes.js
+++ b/src/pages/reportPropTypes.js
@@ -73,7 +73,4 @@ export default PropTypes.shape({
 
     /** Custom fields attached to the report */
     reportFields: PropTypes.objectOf(PropTypes.string),
-
-    /** ID of the transaction thread associated with the report, if any */
-    transactionThreadReportID: PropTypes.string,
 });
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index a3357b8982a1..b547f28137b3 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -818,18 +818,21 @@ function getLineHeightStyle(lineHeight: number): TextStyle {
 /**
  * Gets the correct size for the empty state container based on screen dimensions
  */
-function getReportWelcomeContainerStyle(isSmallScreenWidth: boolean, isMoneyOrTaskReport = false, shouldShowAnimatedBackground = true): ViewStyle {
+function getReportWelcomeContainerStyle(isSmallScreenWidth: boolean, isMoneyOrTaskReport = false): ViewStyle {
     const emptyStateBackground = isMoneyOrTaskReport ? CONST.EMPTY_STATE_BACKGROUND.MONEY_OR_TASK_REPORT : CONST.EMPTY_STATE_BACKGROUND;
-    const baseStyles: ViewStyle = {
+    if (isSmallScreenWidth) {
+        return {
+            minHeight: emptyStateBackground.SMALL_SCREEN.CONTAINER_MINHEIGHT,
+            display: 'flex',
+            justifyContent: 'space-between',
+        };
+    }
+
+    return {
+        minHeight: emptyStateBackground.WIDE_SCREEN.CONTAINER_MINHEIGHT,
         display: 'flex',
         justifyContent: 'space-between',
     };
-
-    if (shouldShowAnimatedBackground) {
-        baseStyles.minHeight = isSmallScreenWidth ? emptyStateBackground.SMALL_SCREEN.CONTAINER_MINHEIGHT : emptyStateBackground.WIDE_SCREEN.CONTAINER_MINHEIGHT;
-    }
-
-    return baseStyles;
 }
 
 type GetBaseAutoCompleteSuggestionContainerStyleParams = {
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index ce20462df372..0893fde82c73 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -183,9 +183,7 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Pending members of the report */
         pendingChatMembers?: PendingChatMember[];
 
-        /** The ID of the single transaction thread report associated with this report, if one exists */
-        transactionThreadReportID?: string;
-
+        /** If the report contains reportFields, save the field id and its value */
         fieldList?: Record<string, PolicyReportField>;
     },
     PolicyReportField['fieldID']
diff --git a/tests/actions/EnforceActionExportRestrictions.ts b/tests/actions/EnforceActionExportRestrictions.ts
index f9f77b314476..92d96869d02d 100644
--- a/tests/actions/EnforceActionExportRestrictions.ts
+++ b/tests/actions/EnforceActionExportRestrictions.ts
@@ -10,10 +10,6 @@ describe('ReportUtils', () => {
         // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
         expect(ReportUtils.getParentReport).toBeUndefined();
     });
-    it('does not export isOneTransactionReport', () => {
-        // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
-        expect(ReportUtils.isOneTransactionReport).toBeUndefined();
-    });
 });
 
 describe('Task', () => {
diff --git a/tests/perf-test/ReportActionsList.perf-test.tsx b/tests/perf-test/ReportActionsList.perf-test.tsx
index a952d149a598..012d8dc8b90f 100644
--- a/tests/perf-test/ReportActionsList.perf-test.tsx
+++ b/tests/perf-test/ReportActionsList.perf-test.tsx
@@ -103,8 +103,6 @@ function ReportActionsListWrapper() {
                         listID={1}
                         loadOlderChats={mockLoadChats}
                         loadNewerChats={mockLoadChats}
-                        transactionThreadReport={LHNTestUtilsModule.getFakeReport()}
-                        reportActions={ReportTestUtils.getMockedSortedReportActions(500)}
                     />
                 </ActionListContext.Provider>
             </ReactionListContext.Provider>

From 40322023468e771b8c867d5fd9365731009b4159 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 31 Mar 2024 03:27:53 +0530
Subject: [PATCH 065/383] adds share transaction view

---
 src/CONST.ts                                  |  1 +
 .../CategorizeTrackedExpenseParams.ts         | 12 +++
 .../parameters/ShareTrackedExpenseParams.ts   | 12 +++
 src/libs/API/parameters/index.ts              |  2 +
 src/libs/API/types.ts                         |  2 +
 src/libs/actions/IOU.ts                       | 80 +++++++++++++------
 src/pages/home/report/ReportActionItem.tsx    |  2 +-
 ...yForRefactorRequestParticipantsSelector.js | 25 +++++-
 .../step/withFullTransactionOrNotFound.js     |  2 +-
 9 files changed, 107 insertions(+), 31 deletions(-)
 create mode 100644 src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
 create mode 100644 src/libs/API/parameters/ShareTrackedExpenseParams.ts

diff --git a/src/CONST.ts b/src/CONST.ts
index c5f8f06038d2..c3c93d780d42 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1351,6 +1351,7 @@ const CONST = {
             CREATE: 'create',
             MOVE: 'move',
             CATEGORIZE: 'categorize',
+            SHARE: 'share',
         },
         DEFAULT_AMOUNT: 0,
         TYPE: {
diff --git a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
new file mode 100644
index 000000000000..ce5b6894fe97
--- /dev/null
+++ b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
@@ -0,0 +1,12 @@
+type CategorizeTrackedExpenseParams = {
+    policyID: string;
+    transactionID: string;
+    moneyRequestPreviewReportActionID: string;
+    moneyRequestReportID: string;
+    moneyRequestCreatedReportActionID: string;
+    actionableWhisperReportActionID: string;
+    // making it optional for now
+    modifiedExpenseReportActionID?: string;
+};
+
+export default CategorizeTrackedExpenseParams;
diff --git a/src/libs/API/parameters/ShareTrackedExpenseParams.ts b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
new file mode 100644
index 000000000000..b007206a4e73
--- /dev/null
+++ b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
@@ -0,0 +1,12 @@
+type ShareTrackedExpenseParams = {
+    policyID: string;
+    transactionID: string;
+    moneyRequestPreviewReportActionID: string;
+    moneyRequestReportID: string;
+    moneyRequestCreatedReportActionID: string;
+    actionableWhisperReportActionID: string;
+    // making it optional for now
+    modifiedExpenseReportActionID?: string;
+};
+
+export default ShareTrackedExpenseParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 27d522fb1fef..45fb838a6de7 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -200,3 +200,5 @@ export type {default as SetPolicyCurrencyDefaultParams} from './SetPolicyCurrenc
 export type {default as RenamePolicyTaxParams} from './RenamePolicyTaxParams';
 export type {default as DismissTrackExpenseActionableWhisperParams} from './DismissTrackExpenseActionableWhisperParams';
 export type {default as ConvertTrackedExpenseToRequestParams} from './ConvertTrackedExpenseToRequestParams';
+export type {default as ShareTrackedExpenseParams} from './ShareTrackedExpenseParams';
+export type {default as CategorizeTrackedExpenseParams} from './CategorizeTrackedExpenseParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 9763fb57c54d..20a95d4e1656 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -198,6 +198,7 @@ const WRITE_COMMANDS = {
     DISMISS_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
     CONVERT_TRACKED_EXPENSE_TO_REQUEST: 'ConvertTrackedExpenseToRequest',
     CATEGORIZE_TRACKED_TRANSACTION: 'CategorizeTrackedExpense',
+    SHARE_TRACKED_TRANSACTION: 'ShareTrackedExpense',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -394,6 +395,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
     [WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST]: Parameters.ConvertTrackedExpenseToRequestParams;
     [WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION]: Parameters.CategorizeTrackedExpenseParams;
+    [WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION]: Parameters.ShareTrackedExpenseParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 4aaeb674167a..33e23d2881d4 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -995,7 +995,7 @@ function buildOnyxDataForTrackExpense(
     return [optimisticData, successData, failureData];
 }
 
-function getDeleteTrackExpenseInformation(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction) {
+function getDeleteTrackExpenseInformation(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction, shouldDeleteTransactionFromOnyx = true) {
     // STEP 1: Get all collections we're updating
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -1037,13 +1037,15 @@ function getDeleteTrackExpenseInformation(chatReportID: string, transactionID: s
     const reportLastMessageText = ReportActionsUtils.getLastVisibleMessage(chatReport?.reportID ?? '', updatedReportAction).lastMessageText;
 
     // STEP 4: Build Onyx data
-    const optimisticData: OnyxUpdate[] = [
-        {
+    const optimisticData: OnyxUpdate[] = [];
+
+    if (shouldDeleteTransactionFromOnyx) {
+        optimisticData.push({
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: null,
-        },
-    ];
+        });
+    }
 
     if (Permissions.canUseViolations(betas)) {
         optimisticData.push({
@@ -1097,13 +1099,15 @@ function getDeleteTrackExpenseInformation(chatReportID: string, transactionID: s
         },
     ];
 
-    const failureData: OnyxUpdate[] = [
-        {
+    const failureData: OnyxUpdate[] = [];
+
+    if (shouldDeleteTransactionFromOnyx) {
+        failureData.push({
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: transaction,
-        },
-    ];
+        });
+    }
 
     if (Permissions.canUseViolations(betas)) {
         failureData.push({
@@ -1339,8 +1343,12 @@ function getMoneyRequestInformation(
         optimisticNextStep,
     );
 
-    if(shouldDeleteLinkedTrackedExpense && linkedTrackedExpenseReportAction && linkedTrackedExpenseReportID) {
-        const {optimisticData: deleteOptimisticData, successData: deleteSuccessData, failureData: deleteFailureData} = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, optimisticTransaction.transactionID, linkedTrackedExpenseReportAction);
+    if (shouldDeleteLinkedTrackedExpense && linkedTrackedExpenseReportAction && linkedTrackedExpenseReportID) {
+        const {
+            optimisticData: deleteOptimisticData,
+            successData: deleteSuccessData,
+            failureData: deleteFailureData,
+        } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, optimisticTransaction.transactionID, linkedTrackedExpenseReportAction, false);
         optimisticData.push(...deleteOptimisticData);
         successData.push(...deleteSuccessData);
         failureData.push(...deleteFailureData);
@@ -2259,8 +2267,7 @@ function requestMoney(
     const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
     const moneyRequestReportID = isMoneyRequestReport ? report.reportID : '';
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
-    const isConvertingFromTrackExpenseToRequest = action === CONST.IOU.ACTION.MOVE;
-    const isCategorizing = action === CONST.IOU.ACTION.CATEGORIZE;
+    const isMovingTransactionFromTrackExpense = [CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action);
 
     const {
         payerAccountID,
@@ -2276,7 +2283,7 @@ function requestMoney(
         createdReportActionIDForThread,
         onyxData,
     } = getMoneyRequestInformation(
-        isConvertingFromTrackExpenseToRequest || isCategorizing ? {} : currentChatReport,
+        isMovingTransactionFromTrackExpense ? {} : currentChatReport,
         participant,
         comment,
         amount,
@@ -2284,7 +2291,7 @@ function requestMoney(
         currentCreated,
         merchant,
         receipt,
-        isConvertingFromTrackExpenseToRequest || isCategorizing ? (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID : undefined,
+        isMovingTransactionFromTrackExpense ? (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID : undefined,
         category,
         tag,
         billable,
@@ -2296,7 +2303,7 @@ function requestMoney(
         moneyRequestReportID,
         linkedTrackedExpenseReportAction,
         linkedTrackedExpenseReportID,
-        isConvertingFromTrackExpenseToRequest || isCategorizing,
+        isMovingTransactionFromTrackExpense,
     );
 
     const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
@@ -2305,14 +2312,16 @@ function requestMoney(
         case CONST.IOU.ACTION.MOVE: {
             const parameters = {
                 payerAccountID,
-                iouReportID: iouReport.reportID,
                 chatReportID: chatReport.reportID,
-                transactionID: transaction.transactionID,
-                reportActionID: iouAction.reportActionID,
+                transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,
+                actionableWhisperReportActionID,
                 createdChatReportActionID,
-                createdIOUReportActionID,
-                reportPreviewReportActionID: reportPreviewAction.reportActionID,
+                moneyRequestReportID: iouReport.reportID,
+                moneyRequestCreatedReportActionID: createdIOUReportActionID,
+                moneyRequestPreviewReportActionID: reportPreviewAction.reportActionID,
+                // modifiedExpenseReportActionID - not sure what need to be done here maybe `buildOptimisticModifiedExpenseReportAction` with transaction changes
             };
+
             API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, onyxData);
             break;
         }
@@ -2320,16 +2329,30 @@ function requestMoney(
             const parameters = {
                 policyID: chatReport.policyID,
                 transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,
-                actionableWhisperReportActionID,
+                moneyRequestPreviewReportActionID: reportPreviewAction.reportActionID,
                 moneyRequestReportID: iouReport.reportID,
-                moneyRequestCreatedReportActionID: createdChatReportActionID,
+                moneyRequestCreatedReportActionID: createdIOUReportActionID,
+                actionableWhisperReportActionID,
+                // modifiedExpenseReportActionID - not sure what need to be done here maybe `buildOptimisticModifiedExpenseReportAction` with transaction changes
             };
-
-            console.log('Categorizing tracked expense', parameters);
             // eslint-disable-next-line rulesdir/no-multiple-api-calls
             API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, onyxData);
             break;
         }
+        case CONST.IOU.ACTION.SHARE: {
+            const parameters = {
+                policyID: chatReport.policyID,
+                transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,
+                moneyRequestPreviewReportActionID: reportPreviewAction.reportActionID,
+                moneyRequestReportID: iouReport.reportID,
+                moneyRequestCreatedReportActionID: createdIOUReportActionID,
+                actionableWhisperReportActionID,
+                // modifiedExpenseReportActionID - not sure what need to be done here maybe `buildOptimisticModifiedExpenseReportAction` with transaction changes
+            };
+            // eslint-disable-next-line rulesdir/no-multiple-api-calls
+            API.write(WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION, parameters, onyxData);
+            break;
+        }
         default: {
             const parameters: RequestMoneyParams = {
                 debtorEmail: payerEmail,
@@ -2364,7 +2387,14 @@ function requestMoney(
             resetMoneyRequestInfo();
         }
     }
+
     Navigation.dismissModal(activeReportID);
+    if (action === CONST.IOU.ACTION.SHARE) {
+        // not sure the correct way to navigate to the share should it be instant? todo: ask for clarification
+        setTimeout(() => {
+            Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(activeReportID));
+        }, 1000);
+    }
     Report.notifyNewAction(activeReportID, payeeAccountID);
 }
 
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 06aad0f19a48..8e28ac6e3696 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -392,7 +392,7 @@ function ReportActionItem({
                 {
                     text: 'actionableMentionTrackExpense.share',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-share`,
-                    onPress: () => console.log('Share'),
+                    onPress: () => ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.SHARE, action.reportActionID),
                     isMediumSized: true,
                 },
                 {
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 65d02f757930..2223c45e83cb 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -137,7 +137,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
             // sees the option to request money from their admin on their own Workspace Chat.
             iouType === CONST.IOU.TYPE.REQUEST && iouAction !== CONST.IOU.ACTION.MOVE,
 
-            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && iouAction !== CONST.IOU.ACTION.CATEGORIZE,
+            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && iouAction !== CONST.IOU.ACTION.CATEGORIZE && iouAction !== CONST.IOU.ACTION.SHARE,
             false,
             {},
             [],
@@ -188,7 +188,20 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
         }
 
         return [newSections, chatOptions];
-    }, [didScreenTransitionEnd, reports, personalDetails, betas, debouncedSearchTerm, participants, iouType, canUseP2PDistanceRequests, iouRequestType, maxParticipantsReached, translate, iouAction]);
+    }, [
+        didScreenTransitionEnd,
+        reports,
+        personalDetails,
+        betas,
+        debouncedSearchTerm,
+        participants,
+        iouType,
+        canUseP2PDistanceRequests,
+        iouRequestType,
+        maxParticipantsReached,
+        translate,
+        iouAction,
+    ]);
 
     /**
      * Adds a single participant to the request
@@ -266,7 +279,11 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
     // the app from crashing on native when you try to do this, we'll going to hide the button if you have a workspace and other participants
     const hasPolicyExpenseChatParticipant = _.some(participants, (participant) => participant.isPolicyExpenseChat);
     const shouldShowSplitBillErrorMessage = participants.length > 1 && hasPolicyExpenseChatParticipant;
-    const isAllowedToSplit = (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && iouType !== CONST.IOU.TYPE.SEND;
+    const isAllowedToSplit =
+        (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
+        iouType !== CONST.IOU.TYPE.SEND &&
+        ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(iouAction) &&
+        !shouldShowSplitBillErrorMessage;
 
     const handleConfirmSelection = useCallback(
         (keyEvent, option) => {
@@ -376,7 +393,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
     const isAllSectionsEmpty = _.every(sections, (section) => section.data.length === 0);
 
-    if (iouAction === CONST.IOU.ACTION.CATEGORIZE && isAllSectionsEmpty && didScreenTransitionEnd && searchTerm.trim() === '') {
+    if ([CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction) && isAllSectionsEmpty && didScreenTransitionEnd && searchTerm.trim() === '') {
         return renderEmptyWorkspaceView();
     }
 
diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.js b/src/pages/iou/request/step/withFullTransactionOrNotFound.js
index 1c7b4432254e..a3b028b73578 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.js
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.js
@@ -72,7 +72,7 @@ export default function (WrappedComponent) {
                 const transactionID = lodashGet(route, 'params.transactionID', 0);
                 const userAction = lodashGet(route, 'params.action', CONST.IOU.ACTION.CREATE);
                 return `${
-                    [CONST.IOU.ACTION.CREATE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(userAction)
+                    [CONST.IOU.ACTION.CREATE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(userAction)
                         ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT
                         : ONYXKEYS.COLLECTION.TRANSACTION
                 }${transactionID}`;

From 6f29332104a014e1507cff9ead27739f9fce8f37 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <104348397+ishpaul777@users.noreply.github.com>
Date: Sun, 31 Mar 2024 03:34:13 +0530
Subject: [PATCH 066/383] Revert "Revert "Add One Transaction Report View""

---
 .../ReportActionItem/MoneyRequestView.tsx     |  10 +-
 src/libs/ReportActionsUtils.ts                |  30 ++++
 src/libs/ReportUtils.ts                       |  32 +++++
 src/pages/home/ReportScreen.tsx               |   1 +
 src/pages/home/report/ReportActionItem.tsx    |  56 +++++++-
 .../report/ReportActionItemParentAction.tsx   |  18 ++-
 src/pages/home/report/ReportActionsList.tsx   |  12 ++
 .../report/ReportActionsListItemRenderer.tsx  |  12 ++
 src/pages/home/report/ReportActionsView.tsx   | 131 ++++++++++++++----
 src/pages/reportPropTypes.js                  |   3 +
 src/styles/utils/index.ts                     |  19 ++-
 src/types/onyx/Report.ts                      |   4 +-
 .../EnforceActionExportRestrictions.ts        |   4 +
 .../perf-test/ReportActionsList.perf-test.tsx |   2 +
 14 files changed, 283 insertions(+), 51 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 5c382ca8ee33..37d939e13868 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -70,6 +70,9 @@ type MoneyRequestViewPropsWithoutTransaction = MoneyRequestViewOnyxPropsWithoutT
 
     /** Whether we should display the horizontal rule below the component */
     shouldShowHorizontalRule: boolean;
+
+    /** Whether we should display the animated banner above the component */
+    shouldShowAnimatedBackground: boolean;
 };
 
 type MoneyRequestViewProps = MoneyRequestViewTransactionOnyxProps & MoneyRequestViewPropsWithoutTransaction;
@@ -84,6 +87,7 @@ function MoneyRequestView({
     policyTagList,
     policy,
     transactionViolations,
+    shouldShowAnimatedBackground,
 }: MoneyRequestViewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -237,9 +241,9 @@ function MoneyRequestView({
     );
 
     return (
-        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)]}>
-            <AnimatedEmptyStateBackground />
-            <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
+        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true, shouldShowAnimatedBackground)]}>
+            {shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
+            <View style={shouldShowAnimatedBackground && [StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth, true)]}>
                 {/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
                 {(showMapAsImage || hasReceipt) && (
                     <OfflineWithFeedback
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index aa10105b4217..fb7781870e32 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -213,6 +213,35 @@ function isTransactionThread(parentReportAction: OnyxEntry<ReportAction> | Empty
     );
 }
 
+/**
+ * Returns the reportID for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions with a childReportID. Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
+ */
+function getOneTransactionThreadReportID(reportActions: OnyxEntry<ReportActions> | ReportAction[]): string | null {
+    const reportActionsArray = Object.values(reportActions ?? {});
+
+    if (!reportActionsArray.length) {
+        return null;
+    }
+
+    // Get all IOU report actions for the report.
+    const iouRequestTypes: Array<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>> = [CONST.IOU.REPORT_ACTION_TYPE.CREATE, CONST.IOU.REPORT_ACTION_TYPE.SPLIT, CONST.IOU.REPORT_ACTION_TYPE.PAY];
+    const iouRequestActions = reportActionsArray.filter(
+        (action) =>
+            action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
+            (iouRequestTypes.includes(action.originalMessage.type) ?? []) &&
+            action.childReportID &&
+            action.originalMessage.IOUTransactionID,
+    );
+
+    // If we don't have any IOU request actions, or we have more than one IOU request actions, this isn't a oneTransaction report
+    if (!iouRequestActions.length || iouRequestActions.length > 1) {
+        return null;
+    }
+
+    // Ensure we have a childReportID associated with the IOU report action
+    return iouRequestActions[0].childReportID ?? null;
+}
+
 /**
  * Sort an array of reportActions by their created timestamp first, and reportActionID second
  * This gives us a stable order even in the case of multiple reportActions created on the same millisecond
@@ -1034,6 +1063,7 @@ function getReportActionMessageText(reportAction: OnyxEntry<ReportAction> | Empt
 
 export {
     extractLinksFromMessageHtml,
+    getOneTransactionThreadReportID,
     getAllReportActions,
     getIOUReportIDFromReportActionPreview,
     getLastClosedReportAction,
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index acf02a2f78f5..97e420062ece 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1265,6 +1265,23 @@ function isMoneyRequestReport(reportOrID: OnyxEntry<Report> | EmptyObject | stri
     return isIOUReport(report) || isExpenseReport(report);
 }
 
+/**
+ * Checks if a report has only one transaction associated with it
+ */
+function isOneTransactionReport(reportID: string): boolean {
+    const reportActions = reportActionsByReport?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? ([] as ReportAction[]);
+    return ReportActionsUtils.getOneTransactionThreadReportID(reportActions) !== null;
+}
+
+/**
+ * Checks if a report is a transaction thread associated with a report that has only one transaction
+ */
+function isOneTransactionThread(reportID: string, parentReportID: string): boolean {
+    const parentReportActions = reportActionsByReport?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? ([] as ReportAction[]);
+    const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(parentReportActions);
+    return reportID === transactionThreadReportID;
+}
+
 /**
  * Should return true only for personal 1:1 report
  *
@@ -1795,6 +1812,11 @@ function getIcons(
         };
         const isManager = currentUserAccountID === report?.managerID;
 
+        // For one transaction IOUs, display a simplified report icon
+        if (isOneTransactionReport(report?.reportID ?? '0')) {
+            return [ownerIcon];
+        }
+
         return isManager ? [managerIcon, ownerIcon] : [ownerIcon, managerIcon];
     }
 
@@ -4398,6 +4420,11 @@ function shouldReportBeInOptionList({
         return false;
     }
 
+    // If this is a transaction thread associated with a report that only has one transaction, omit it
+    if (isOneTransactionThread(report.reportID, report.parentReportID ?? '0')) {
+        return false;
+    }
+
     // Include the currently viewed report. If we excluded the currently viewed report, then there
     // would be no way to highlight it in the options list and it would be confusing to users because they lose
     // a sense of context.
@@ -4868,6 +4895,10 @@ function shouldReportShowSubscript(report: OnyxEntry<Report>): boolean {
         return true;
     }
 
+    if (isExpenseReport(report) && isOneTransactionReport(report?.reportID ?? '')) {
+        return true;
+    }
+
     if (isWorkspaceTaskReport(report)) {
         return true;
     }
@@ -5798,6 +5829,7 @@ export {
     hasSingleParticipant,
     getReportRecipientAccountIDs,
     isOneOnOneChat,
+    isOneTransactionThread,
     isPayer,
     goBackToDetailsPage,
     getTransactionReportName,
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index ddff1f15c38f..f1f8eb8047c7 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -635,6 +635,7 @@ function ReportScreen({
                                         isLoadingNewerReportActions={reportMetadata?.isLoadingNewerReportActions}
                                         isLoadingOlderReportActions={reportMetadata?.isLoadingOlderReportActions}
                                         isReadyForCommentLinking={!shouldShowSkeleton}
+                                        transactionThreadReportID={ReportActionsUtils.getOneTransactionThreadReportID(reportActions ?? [])}
                                     />
                                 )}
 
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 8e28ac6e3696..42787e8bfcfc 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -49,6 +49,7 @@ import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SelectionScraper from '@libs/SelectionScraper';
+import * as TransactionUtils from '@libs/TransactionUtils';
 import {ReactionListContext} from '@pages/home/ReportScreenContext';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
@@ -100,12 +101,22 @@ type ReportActionItemOnyxProps = {
 
     /** The policy which the user has access to and which the report is tied to */
     policy: OnyxEntry<OnyxTypes.Policy>;
+
+    /** Transaction associated with this report, if any */
+    transaction: OnyxEntry<OnyxTypes.Transaction>;
 };
 
 type ReportActionItemProps = {
     /** Report for this action */
     report: OnyxTypes.Report;
 
+    /** The transaction thread report associated with the report for this action, if any */
+    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
+
+    /** Array of report actions for the report for this action */
+    // eslint-disable-next-line react/no-unused-prop-types
+    reportActions: OnyxTypes.ReportAction[];
+
     /** Report action belonging to the report's parent */
     parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -142,6 +153,7 @@ const isIOUReport = (actionObj: OnyxEntry<OnyxTypes.ReportAction>): actionObj is
 function ReportActionItem({
     action,
     report,
+    transactionThreadReport,
     linkedReportActionID,
     displayAsGroup,
     emojiReactions,
@@ -155,6 +167,7 @@ function ReportActionItem({
     shouldHideThreadDividerLine = false,
     shouldShowSubscriptAvatar = false,
     policy,
+    transaction,
     onPress = undefined,
 }: ReportActionItemProps) {
     const {translate} = useLocalize();
@@ -180,7 +193,7 @@ function ReportActionItem({
     const originalReportID = ReportUtils.getOriginalReportID(report.reportID, action);
     const originalReport = report.reportID === originalReportID ? report : ReportUtils.getReport(originalReportID);
     const isReportActionLinked = linkedReportActionID && action.reportActionID && linkedReportActionID === action.reportActionID;
-
+    const transactionCurrency = TransactionUtils.getCurrency(transaction);
     const reportScrollManager = useReportScrollManager();
 
     const highlightedBackgroundColorIfNeeded = useMemo(
@@ -743,6 +756,7 @@ function ReportActionItem({
                     <MoneyRequestView
                         report={report}
                         shouldShowHorizontalRule={!shouldHideThreadDividerLine}
+                        shouldShowAnimatedBackground
                     />
                 </ShowContextMenuContext.Provider>
             );
@@ -782,11 +796,30 @@ function ReportActionItem({
         if (ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report)) {
             return (
                 <OfflineWithFeedback pendingAction={action.pendingAction}>
-                    <MoneyReportView
-                        report={report}
-                        policy={policy}
-                        shouldShowHorizontalRule={!shouldHideThreadDividerLine}
-                    />
+                    {transactionThreadReport && !isEmptyObject(transactionThreadReport) ? (
+                        <>
+                            {transactionCurrency !== report.currency && (
+                                <MoneyReportView
+                                    report={report}
+                                    policy={policy}
+                                    shouldShowHorizontalRule={!shouldHideThreadDividerLine}
+                                />
+                            )}
+                            <ShowContextMenuContext.Provider value={contextValue}>
+                                <MoneyRequestView
+                                    report={transactionThreadReport}
+                                    shouldShowHorizontalRule={!shouldHideThreadDividerLine}
+                                    shouldShowAnimatedBackground={transactionCurrency === report.currency}
+                                />
+                            </ShowContextMenuContext.Provider>
+                        </>
+                    ) : (
+                        <MoneyReportView
+                            report={report}
+                            policy={policy}
+                            shouldShowHorizontalRule={!shouldHideThreadDividerLine}
+                        />
+                    )}
                 </OfflineWithFeedback>
             );
         }
@@ -947,6 +980,14 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
     userWallet: {
         key: ONYXKEYS.USER_WALLET,
     },
+    transaction: {
+        key: ({transactionThreadReport, reportActions}) => {
+            const parentReportActionID = isEmptyObject(transactionThreadReport) ? '0' : transactionThreadReport.parentReportActionID;
+            const action = reportActions?.find((reportAction) => reportAction.reportActionID === parentReportActionID);
+            const transactionID = (action as OnyxTypes.OriginalMessageIOU)?.originalMessage.IOUTransactionID ? (action as OnyxTypes.OriginalMessageIOU).originalMessage.IOUTransactionID : 0;
+            return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+        },
+    },
 })(
     memo(ReportActionItem, (prevProps, nextProps) => {
         const prevParentReportAction = prevProps.parentReportAction;
@@ -978,6 +1019,9 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
             prevProps.linkedReportActionID === nextProps.linkedReportActionID &&
             lodashIsEqual(prevProps.report.fieldList, nextProps.report.fieldList) &&
             lodashIsEqual(prevProps.policy, nextProps.policy) &&
+            lodashIsEqual(prevProps.transactionThreadReport, nextProps.transactionThreadReport) &&
+            lodashIsEqual(prevProps.reportActions, nextProps.reportActions) &&
+            lodashIsEqual(prevProps.transaction, nextProps.transaction) &&
             lodashIsEqual(prevParentReportAction, nextParentReportAction)
         );
     }),
diff --git a/src/pages/home/report/ReportActionItemParentAction.tsx b/src/pages/home/report/ReportActionItemParentAction.tsx
index c6bc181bdbe7..3d98973c86c4 100644
--- a/src/pages/home/report/ReportActionItemParentAction.tsx
+++ b/src/pages/home/report/ReportActionItemParentAction.tsx
@@ -31,6 +31,12 @@ type ReportActionItemParentActionProps = {
     /** The current report is displayed */
     report: OnyxEntry<OnyxTypes.Report>;
 
+    /** The transaction thread report associated with the current report, if any */
+    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
+
+    /** Array of report actions for this report */
+    reportActions: OnyxTypes.ReportAction[];
+
     /** Report actions belonging to the report's parent */
     parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -38,7 +44,15 @@ type ReportActionItemParentActionProps = {
     shouldDisplayReplyDivider: boolean;
 };
 
-function ReportActionItemParentAction({report, parentReportAction, index = 0, shouldHideThreadDividerLine = false, shouldDisplayReplyDivider}: ReportActionItemParentActionProps) {
+function ReportActionItemParentAction({
+    report,
+    transactionThreadReport,
+    reportActions,
+    parentReportAction,
+    index = 0,
+    shouldHideThreadDividerLine = false,
+    shouldDisplayReplyDivider,
+}: ReportActionItemParentActionProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {isSmallScreenWidth} = useWindowDimensions();
@@ -92,6 +106,8 @@ function ReportActionItemParentAction({report, parentReportAction, index = 0, sh
                         onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? ''))}
                         parentReportAction={parentReportAction}
                         report={ancestor.report}
+                        reportActions={reportActions}
+                        transactionThreadReport={transactionThreadReport}
                         action={ancestor.reportAction}
                         displayAsGroup={false}
                         isMostRecentIOUReportAction={false}
diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
index 3b001d859ed8..d1b9c420b0af 100644
--- a/src/pages/home/report/ReportActionsList.tsx
+++ b/src/pages/home/report/ReportActionsList.tsx
@@ -41,6 +41,12 @@ type ReportActionsListProps = WithCurrentUserPersonalDetailsProps & {
     /** The report currently being looked at */
     report: OnyxTypes.Report;
 
+    /** The transaction thread report associated with the current report, if any */
+    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
+
+    /** Array of report actions for the current report */
+    reportActions: OnyxTypes.ReportAction[];
+
     /** The report's parentReportAction */
     parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -125,6 +131,8 @@ const onScrollToIndexFailed = () => {};
 
 function ReportActionsList({
     report,
+    transactionThreadReport,
+    reportActions = [],
     parentReportAction,
     isLoadingInitialReportActions = false,
     isLoadingOlderReportActions = false,
@@ -514,9 +522,11 @@ function ReportActionsList({
         ({item: reportAction, index}: ListRenderItemInfo<OnyxTypes.ReportAction>) => (
             <ReportActionsListItemRenderer
                 reportAction={reportAction}
+                reportActions={reportActions}
                 parentReportAction={parentReportAction}
                 index={index}
                 report={report}
+                transactionThreadReport={transactionThreadReport}
                 linkedReportActionID={linkedReportActionID}
                 displayAsGroup={ReportActionsUtils.isConsecutiveActionMadeByPreviousActor(sortedVisibleReportActions, index)}
                 mostRecentIOUReportActionID={mostRecentIOUReportActionID}
@@ -534,6 +544,8 @@ function ReportActionsList({
             shouldHideThreadDividerLine,
             shouldDisplayNewMarker,
             parentReportAction,
+            reportActions,
+            transactionThreadReport,
         ],
     );
 
diff --git a/src/pages/home/report/ReportActionsListItemRenderer.tsx b/src/pages/home/report/ReportActionsListItemRenderer.tsx
index 4ea395c61100..263415d90c39 100644
--- a/src/pages/home/report/ReportActionsListItemRenderer.tsx
+++ b/src/pages/home/report/ReportActionsListItemRenderer.tsx
@@ -11,6 +11,9 @@ type ReportActionsListItemRendererProps = {
     /** All the data of the action item */
     reportAction: ReportAction;
 
+    /** Array of report actions for the report */
+    reportActions: ReportAction[];
+
     /** The report's parentReportAction */
     parentReportAction: OnyxEntry<ReportAction>;
 
@@ -20,6 +23,9 @@ type ReportActionsListItemRendererProps = {
     /** Report for this action */
     report: Report;
 
+    /** The transaction thread report associated with the report for this action, if any */
+    transactionThreadReport: OnyxEntry<Report>;
+
     /** Should the comment have the appearance of being grouped with the previous comment? */
     displayAsGroup: boolean;
 
@@ -41,9 +47,11 @@ type ReportActionsListItemRendererProps = {
 
 function ReportActionsListItemRenderer({
     reportAction,
+    reportActions = [],
     parentReportAction,
     index,
     report,
+    transactionThreadReport,
     displayAsGroup,
     mostRecentIOUReportActionID = '',
     shouldHideThreadDividerLine,
@@ -127,6 +135,8 @@ function ReportActionsListItemRenderer({
             parentReportAction={parentReportAction}
             reportID={report.reportID}
             report={report}
+            reportActions={reportActions}
+            transactionThreadReport={transactionThreadReport}
             index={index}
         />
     ) : (
@@ -134,7 +144,9 @@ function ReportActionsListItemRenderer({
             shouldHideThreadDividerLine={shouldHideThreadDividerLine}
             parentReportAction={parentReportAction}
             report={report}
+            transactionThreadReport={transactionThreadReport}
             action={action}
+            reportActions={reportActions}
             linkedReportActionID={linkedReportActionID}
             displayAsGroup={displayAsGroup}
             shouldDisplayNewMarker={shouldDisplayNewMarker}
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
index e81bfa0fcb6d..1b6a9614a466 100755
--- a/src/pages/home/report/ReportActionsView.tsx
+++ b/src/pages/home/report/ReportActionsView.tsx
@@ -28,6 +28,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import getInitialPaginationSize from './getInitialPaginationSize';
 import PopoverReactionList from './ReactionList/PopoverReactionList';
 import ReportActionsList from './ReportActionsList';
@@ -35,6 +36,12 @@ import ReportActionsList from './ReportActionsList';
 type ReportActionsViewOnyxProps = {
     /** Session info for the currently logged in user. */
     session: OnyxEntry<OnyxTypes.Session>;
+
+    /** Array of report actions for the transaction thread report associated with the current report */
+    transactionThreadReportActions: OnyxTypes.ReportAction[];
+
+    /** The transaction thread report associated with the current report, if any */
+    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
 };
 
 type ReportActionsViewProps = ReportActionsViewOnyxProps & {
@@ -58,6 +65,10 @@ type ReportActionsViewProps = ReportActionsViewOnyxProps & {
 
     /** Whether the report is ready for comment linking */
     isReadyForCommentLinking?: boolean;
+
+    /** The reportID of the transaction thread report associated with this current report, if any */
+    // eslint-disable-next-line react/no-unused-prop-types
+    transactionThreadReportID?: string | null;
 };
 
 const DIFF_BETWEEN_SCREEN_HEIGHT_AND_LIST = 120;
@@ -67,9 +78,11 @@ let listOldID = Math.round(Math.random() * 100);
 
 function ReportActionsView({
     report,
+    transactionThreadReport,
     session,
     parentReportAction,
     reportActions: allReportActions = [],
+    transactionThreadReportActions = [],
     isLoadingInitialReportActions = false,
     isLoadingOlderReportActions = false,
     isLoadingNewerReportActions = false,
@@ -97,24 +110,7 @@ function ReportActionsView({
     const prevIsSmallScreenWidthRef = useRef(isSmallScreenWidth);
     const reportID = report.reportID;
     const isLoading = (!!reportActionID && isLoadingInitialReportActions) || !isReadyForCommentLinking;
-
-    /**
-     * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
-     * displaying.
-     */
-    const fetchNewerAction = useCallback(
-        (newestReportAction: OnyxTypes.ReportAction) => {
-            if (isLoadingNewerReportActions || isLoadingInitialReportActions) {
-                return;
-            }
-
-            Report.getNewerActions(reportID, newestReportAction.reportActionID);
-        },
-        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportID],
-    );
-
     const isReportFullyVisible = useMemo((): boolean => getIsReportFullyVisible(isFocused), [isFocused]);
-
     const openReportIfNecessary = () => {
         if (!shouldFetchReport(report)) {
             return;
@@ -148,32 +144,85 @@ function ReportActionsView({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [route, isLoadingInitialReportActions]);
 
+    // Get a sorted array of reportActions for both the current report and the transaction thread report associated with this report (if there is one)
+    // so that we display transaction-level and report-level report actions in order in the one-transaction view
+    const combinedReportActions = useMemo(() => {
+        if (isEmptyObject(transactionThreadReportActions)) {
+            return allReportActions;
+        }
+
+        // Filter out the created action from the transaction thread report actions, since we already have the parent report's created action in `reportActions`
+        const filteredTransactionThreadReportActions = transactionThreadReportActions?.filter((action) => action.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED);
+
+        // Filter out "created" IOU report actions because we don't want to show any preview actions for one transaction reports
+        const filteredReportActions = [...allReportActions, ...filteredTransactionThreadReportActions].filter(
+            (action) => ((action as OnyxTypes.OriginalMessageIOU).originalMessage?.type ?? '') !== CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+        );
+        return ReportActionsUtils.getSortedReportActions(filteredReportActions, true);
+    }, [allReportActions, transactionThreadReportActions]);
+
     const indexOfLinkedAction = useMemo(() => {
         if (!reportActionID || isLoading) {
             return -1;
         }
 
-        return allReportActions.findIndex((obj) => String(obj.reportActionID) === String(isFirstLinkedActionRender.current ? reportActionID : currentReportActionID));
-    }, [allReportActions, currentReportActionID, reportActionID, isLoading]);
+        return combinedReportActions.findIndex((obj) => String(obj.reportActionID) === String(isFirstLinkedActionRender.current ? reportActionID : currentReportActionID));
+    }, [combinedReportActions, currentReportActionID, reportActionID, isLoading]);
 
     const reportActions = useMemo(() => {
         if (!reportActionID) {
-            return allReportActions;
+            return combinedReportActions;
         }
+
         if (isLoading || indexOfLinkedAction === -1) {
             return [];
         }
 
         if (isFirstLinkedActionRender.current) {
-            return allReportActions.slice(indexOfLinkedAction);
+            return combinedReportActions.slice(indexOfLinkedAction);
         }
         const paginationSize = getInitialPaginationSize;
-        return allReportActions.slice(Math.max(indexOfLinkedAction - paginationSize, 0));
+        return combinedReportActions.slice(Math.max(indexOfLinkedAction - paginationSize, 0));
+
         // currentReportActionID is needed to trigger batching once the report action has been positioned
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [reportActionID, allReportActions, indexOfLinkedAction, isLoading, currentReportActionID]);
+    }, [reportActionID, combinedReportActions, indexOfLinkedAction, isLoading, currentReportActionID]);
 
-    const hasMoreCached = reportActions.length < allReportActions.length;
+    const reportActionIDMap = useMemo(() => {
+        const reportActionIDs = allReportActions.map((action) => action.reportActionID);
+        return reportActions.map((action) => ({
+            reportActionID: action.reportActionID,
+            reportID: reportActionIDs.includes(action.reportActionID) ? reportID : transactionThreadReport?.reportID,
+        }));
+    }, [allReportActions, reportID, transactionThreadReport, reportActions]);
+
+    /**
+     * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
+     * displaying.
+     */
+    const fetchNewerAction = useCallback(
+        (newestReportAction: OnyxTypes.ReportAction) => {
+            if (isLoadingNewerReportActions || isLoadingInitialReportActions) {
+                return;
+            }
+
+            // If this is a one transaction report, ensure we load newer actions for both this report and the report associated with the transaction
+            if (!isEmptyObject(transactionThreadReport)) {
+                // Get newer actions based on the newest reportAction for the current report
+                const newestActionCurrentReport = reportActionIDMap.find((item) => item.reportID === reportID);
+                Report.getNewerActions(newestActionCurrentReport?.reportID ?? '0', newestActionCurrentReport?.reportActionID ?? '0');
+
+                // Get newer actions based on the newest reportAction for the transaction thread report
+                const newestActionTransactionThreadReport = reportActionIDMap.find((item) => item.reportID === transactionThreadReport.reportID);
+                Report.getNewerActions(newestActionTransactionThreadReport?.reportID ?? '0', newestActionTransactionThreadReport?.reportActionID ?? '0');
+            } else {
+                Report.getNewerActions(reportID, newestReportAction.reportActionID);
+            }
+        },
+        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportID, transactionThreadReport, reportActionIDMap],
+    );
+
+    const hasMoreCached = reportActions.length < combinedReportActions.length;
     const newestReportAction = useMemo(() => reportActions?.[0], [reportActions]);
     const handleReportActionPagination = useCallback(
         ({firstReportActionID}: {firstReportActionID: string}) => {
@@ -192,8 +241,7 @@ function ReportActionsView({
 
     const mostRecentIOUReportActionID = useMemo(() => ReportActionsUtils.getMostRecentIOURequestActionID(reportActions), [reportActions]);
     const hasCachedActionOnFirstRender = useInitialValue(() => reportActions.length > 0);
-    const hasNewestReportAction = reportActions[0]?.created === report.lastVisibleActionCreated;
-
+    const hasNewestReportAction = reportActions[0]?.created === report.lastVisibleActionCreated || reportActions[0]?.created === transactionThreadReport?.lastVisibleActionCreated;
     const oldestReportAction = useMemo(() => reportActions?.at(-1), [reportActions]);
     const hasCreatedAction = oldestReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED;
 
@@ -312,9 +360,20 @@ function ReportActionsView({
         if (!oldestReportAction || hasCreatedAction) {
             return;
         }
-        // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
-        Report.getOlderActions(reportID, oldestReportAction.reportActionID);
-    }, [network.isOffline, isLoadingOlderReportActions, isLoadingInitialReportActions, oldestReportAction, hasCreatedAction, reportID]);
+
+        if (!isEmptyObject(transactionThreadReport)) {
+            // Get newer actions based on the newest reportAction for the current report
+            const oldestActionCurrentReport = reportActionIDMap.findLast((item) => item.reportID === reportID);
+            Report.getNewerActions(oldestActionCurrentReport?.reportID ?? '0', oldestActionCurrentReport?.reportActionID ?? '0');
+
+            // Get newer actions based on the newest reportAction for the transaction thread report
+            const oldestActionTransactionThreadReport = reportActionIDMap.findLast((item) => item.reportID === transactionThreadReport.reportID);
+            Report.getNewerActions(oldestActionTransactionThreadReport?.reportID ?? '0', oldestActionTransactionThreadReport?.reportActionID ?? '0');
+        } else {
+            // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
+            Report.getOlderActions(reportID, oldestReportAction.reportActionID);
+        }
+    }, [network.isOffline, isLoadingOlderReportActions, isLoadingInitialReportActions, oldestReportAction, hasCreatedAction, reportID, reportActionIDMap, transactionThreadReport]);
 
     const loadNewerChats = useCallback(() => {
         if (isLoadingInitialReportActions || isLoadingOlderReportActions || network.isOffline || newestReportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
@@ -482,6 +541,8 @@ function ReportActionsView({
         <>
             <ReportActionsList
                 report={report}
+                transactionThreadReport={transactionThreadReport}
+                reportActions={reportActions}
                 parentReportAction={parentReportAction}
                 onLayout={recordTimeToMeasureItemLayout}
                 sortedReportActions={reportActionsToDisplay}
@@ -511,6 +572,10 @@ function arePropsEqual(oldProps: ReportActionsViewProps, newProps: ReportActions
         return false;
     }
 
+    if (!lodashIsEqual(oldProps.transactionThreadReportActions, newProps.transactionThreadReportActions)) {
+        return false;
+    }
+
     if (!lodashIsEqual(oldProps.parentReportAction, newProps.parentReportAction)) {
         return false;
     }
@@ -541,5 +606,13 @@ export default Performance.withRenderTrace({id: '<ReportActionsView> rendering'}
         session: {
             key: ONYXKEYS.SESSION,
         },
+        transactionThreadReportActions: {
+            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+            canEvict: false,
+            selector: (reportActions: OnyxEntry<OnyxTypes.ReportActions>) => ReportActionsUtils.getSortedReportActionsForDisplay(reportActions, true),
+        },
+        transactionThreadReport: {
+            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
+        },
     })(MemoizedReportActionsView),
 );
diff --git a/src/pages/reportPropTypes.js b/src/pages/reportPropTypes.js
index 3a056ee7c0a3..7422bad8061f 100644
--- a/src/pages/reportPropTypes.js
+++ b/src/pages/reportPropTypes.js
@@ -73,4 +73,7 @@ export default PropTypes.shape({
 
     /** Custom fields attached to the report */
     reportFields: PropTypes.objectOf(PropTypes.string),
+
+    /** ID of the transaction thread associated with the report, if any */
+    transactionThreadReportID: PropTypes.string,
 });
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index b547f28137b3..a3357b8982a1 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -818,21 +818,18 @@ function getLineHeightStyle(lineHeight: number): TextStyle {
 /**
  * Gets the correct size for the empty state container based on screen dimensions
  */
-function getReportWelcomeContainerStyle(isSmallScreenWidth: boolean, isMoneyOrTaskReport = false): ViewStyle {
+function getReportWelcomeContainerStyle(isSmallScreenWidth: boolean, isMoneyOrTaskReport = false, shouldShowAnimatedBackground = true): ViewStyle {
     const emptyStateBackground = isMoneyOrTaskReport ? CONST.EMPTY_STATE_BACKGROUND.MONEY_OR_TASK_REPORT : CONST.EMPTY_STATE_BACKGROUND;
-    if (isSmallScreenWidth) {
-        return {
-            minHeight: emptyStateBackground.SMALL_SCREEN.CONTAINER_MINHEIGHT,
-            display: 'flex',
-            justifyContent: 'space-between',
-        };
-    }
-
-    return {
-        minHeight: emptyStateBackground.WIDE_SCREEN.CONTAINER_MINHEIGHT,
+    const baseStyles: ViewStyle = {
         display: 'flex',
         justifyContent: 'space-between',
     };
+
+    if (shouldShowAnimatedBackground) {
+        baseStyles.minHeight = isSmallScreenWidth ? emptyStateBackground.SMALL_SCREEN.CONTAINER_MINHEIGHT : emptyStateBackground.WIDE_SCREEN.CONTAINER_MINHEIGHT;
+    }
+
+    return baseStyles;
 }
 
 type GetBaseAutoCompleteSuggestionContainerStyleParams = {
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index 0893fde82c73..ce20462df372 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -183,7 +183,9 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Pending members of the report */
         pendingChatMembers?: PendingChatMember[];
 
-        /** If the report contains reportFields, save the field id and its value */
+        /** The ID of the single transaction thread report associated with this report, if one exists */
+        transactionThreadReportID?: string;
+
         fieldList?: Record<string, PolicyReportField>;
     },
     PolicyReportField['fieldID']
diff --git a/tests/actions/EnforceActionExportRestrictions.ts b/tests/actions/EnforceActionExportRestrictions.ts
index 92d96869d02d..f9f77b314476 100644
--- a/tests/actions/EnforceActionExportRestrictions.ts
+++ b/tests/actions/EnforceActionExportRestrictions.ts
@@ -10,6 +10,10 @@ describe('ReportUtils', () => {
         // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
         expect(ReportUtils.getParentReport).toBeUndefined();
     });
+    it('does not export isOneTransactionReport', () => {
+        // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
+        expect(ReportUtils.isOneTransactionReport).toBeUndefined();
+    });
 });
 
 describe('Task', () => {
diff --git a/tests/perf-test/ReportActionsList.perf-test.tsx b/tests/perf-test/ReportActionsList.perf-test.tsx
index 012d8dc8b90f..a952d149a598 100644
--- a/tests/perf-test/ReportActionsList.perf-test.tsx
+++ b/tests/perf-test/ReportActionsList.perf-test.tsx
@@ -103,6 +103,8 @@ function ReportActionsListWrapper() {
                         listID={1}
                         loadOlderChats={mockLoadChats}
                         loadNewerChats={mockLoadChats}
+                        transactionThreadReport={LHNTestUtilsModule.getFakeReport()}
+                        reportActions={ReportTestUtils.getMockedSortedReportActions(500)}
                     />
                 </ActionListContext.Provider>
             </ReactionListContext.Provider>

From 05a0e888c1be747e3fee9d0df5bbf0c5134a03db Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Tue, 2 Apr 2024 11:45:46 -0400
Subject: [PATCH 067/383] Fixed animation image increasing the content height
 when SAML is enabled

---
 src/pages/signin/SignInPage.tsx             | 4 ++++
 src/pages/signin/SignInPageLayout/index.tsx | 3 ++-
 src/pages/signin/SignInPageLayout/types.ts  | 4 ++++
 src/styles/variables.ts                     | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 94a4ce1f7951..083fe3f185a3 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -61,6 +61,7 @@ type RenderOption = {
     shouldInitiateSAMLLogin: boolean;
     shouldShowWelcomeHeader: boolean;
     shouldShowWelcomeText: boolean;
+    isSAMLEnabled: boolean;
 };
 
 type GetRenderOptionsParams = {
@@ -123,6 +124,7 @@ function getRenderOptions({
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
+        isSAMLEnabled,
     };
 }
 
@@ -181,6 +183,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
+        isSAMLEnabled,
     } = getRenderOptions({
         hasLogin: !!credentials?.login,
         hasValidateCode: !!credentials?.validateCode,
@@ -260,6 +263,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
                 shouldShowWelcomeText={shouldShowWelcomeText}
                 ref={signInPageLayoutRef}
                 navigateFocus={navigateFocus}
+                isSAMLEnabled={isSAMLEnabled}
             >
                 {/* LoginForm must use the isVisible prop. This keeps it mounted, but visually hidden
              so that password managers can access the values. Conditionally rendering this component will break this feature. */}
diff --git a/src/pages/signin/SignInPageLayout/index.tsx b/src/pages/signin/SignInPageLayout/index.tsx
index 3532c17181db..873588b72e77 100644
--- a/src/pages/signin/SignInPageLayout/index.tsx
+++ b/src/pages/signin/SignInPageLayout/index.tsx
@@ -33,6 +33,7 @@ function SignInPageLayout(
         shouldShowWelcomeText = false,
         navigateFocus = () => {},
         children,
+        isSAMLEnabled = false,
     }: SignInPageLayoutProps,
     ref: ForwardedRef<SignInPageLayoutRef>,
 ) {
@@ -78,7 +79,7 @@ function SignInPageLayout(
 
     const scrollViewStyles = useMemo(() => scrollViewContentContainerStyles(styles), [styles]);
 
-    const backgroundImageHeight = Math.max(variables.signInContentMinHeight, containerHeight);
+    const backgroundImageHeight = Math.max(isSAMLEnabled ? variables.signInSAMLContentMinHeight : variables.signInContentMinHeight, containerHeight);
 
     return (
         <View style={containerStyles}>
diff --git a/src/pages/signin/SignInPageLayout/types.ts b/src/pages/signin/SignInPageLayout/types.ts
index 6a3422f846d1..3eb1dab6d55a 100644
--- a/src/pages/signin/SignInPageLayout/types.ts
+++ b/src/pages/signin/SignInPageLayout/types.ts
@@ -25,6 +25,10 @@ type SignInPageLayoutProps = {
     customHeroBody?: string;
 
     navigateFocus?: () => void;
+
+    /** Whether to use the default minimun content height or the recommened one
+     *  for login with SAML at the login page */
+    isSAMLEnabled?: boolean;
 };
 
 type SignInPageLayoutRef = {
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index ac04a436f72e..1bd37fee4542 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -148,6 +148,7 @@ export default {
     signInContentMaxWidth: 1360,
     signInHeroContextMaxWidth: 680,
     signInContentMinHeight: 800,
+    signInSAMLContentMinHeight: 1000,
     signInLogoHeightSmallScreen: 28,
     signInLogoHeight: 34,
     signInLogoWidth: 120,

From 31cf034a31c79a5493b48e66102ac7560976037c Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 3 Apr 2024 00:18:35 +0530
Subject: [PATCH 068/383] fix conflict after merge

---
 src/libs/ReportUtils.ts                              | 5 +++--
 src/pages/iou/request/step/IOURequestStepCategory.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 2c45d305afbd..8e177666ba46 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5663,10 +5663,11 @@ function hasActionsWithErrors(reportID: string): boolean {
 
 function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>, reportActionID: string): void {
     const transaction = getTransaction(transactionID);
-    if (isEmpty(transaction)) {
+    const reportActions = ReportActionsUtils.getAllReportActions(reportID);
+
+    if (!transaction || !reportActions) {
         return;
     }
-    const reportActions = ReportActionsUtils.getAllReportActions(reportID);
 
     const linkedTrackedExpenseReportAction = Object.values(reportActions).find((action) => (action.originalMessage as IOUMessage)?.IOUTransactionID === transactionID);
 
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.js b/src/pages/iou/request/step/IOURequestStepCategory.js
index 7131ad3d46b2..ebc9db513d59 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.js
+++ b/src/pages/iou/request/step/IOURequestStepCategory.js
@@ -146,7 +146,7 @@ function IOURequestStepCategory({
         IOU.setMoneyRequestCategory(transactionID, updatedCategory);
 
         if (action === CONST.IOU.ACTION.CATEGORIZE) {
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(iouType, transactionID, report.reportID, action));
+            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report.reportID));
             return;
         }
 

From 3dc6e49868f456c1ed255851848cc7c4503332db Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 3 Apr 2024 00:21:27 +0530
Subject: [PATCH 069/383] fixes crashes after merge

---
 .../MoneyTemporaryForRefactorRequestConfirmationList.js     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index c88fa17d1b59..afb23f36cd1d 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -686,13 +686,9 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                             Navigation.navigate(ROUTES.EDIT_SPLIT_BILL.getRoute(reportID, reportActionID, CONST.EDIT_REQUEST_FIELD.AMOUNT));
                             return;
                         }
-<<<<<<< HEAD
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams(), iouAction));
-=======
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(iouAction, CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
                         );
->>>>>>> main
                     }}
                     style={[styles.moneyRequestMenuItem, styles.mt2]}
                     titleStyle={styles.moneyRequestConfirmationAmount}

From 5b0adbc99ba79ef316d3b77226f401d80e06e947 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 2 Apr 2024 12:07:45 -0700
Subject: [PATCH 070/383] chore: add ts type for integration import status

---
 src/ONYXKEYS.ts                                    | 2 ++
 src/types/onyx/WorkspaceIntegrationImportStatus.ts | 7 +++++++
 src/types/onyx/index.ts                            | 2 ++
 3 files changed, 11 insertions(+)
 create mode 100644 src/types/onyx/WorkspaceIntegrationImportStatus.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 28835f80365b..59367b33f605 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -316,6 +316,7 @@ const ONYXKEYS = {
         POLICY_TAGS: 'policyTags_',
         POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
         OLD_POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
+        POLICY_CONNECTION_SYNC_STATUS: 'policyConnectionSyncProgress_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         WORKSPACE_INVITE_MESSAGE_DRAFT: 'workspaceInviteMessageDraft_',
         REPORT: 'report_',
@@ -515,6 +516,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
+    [ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_STATUS]: OnyxTypes.WorkspaceIntegrationImportStatus;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT]: string;
diff --git a/src/types/onyx/WorkspaceIntegrationImportStatus.ts b/src/types/onyx/WorkspaceIntegrationImportStatus.ts
new file mode 100644
index 000000000000..542ede5df282
--- /dev/null
+++ b/src/types/onyx/WorkspaceIntegrationImportStatus.ts
@@ -0,0 +1,7 @@
+type WorkspaceIntegrationImportStatus = {
+    status: 'starting' | 'finished' | 'progress';
+    stageInProgress: string | null;
+    connectionName: 'quickbooksOnline';
+};
+
+export default WorkspaceIntegrationImportStatus;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index c829b9064f2e..121cf8a850ed 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -78,6 +78,7 @@ import type WalletOnfido from './WalletOnfido';
 import type WalletStatement from './WalletStatement';
 import type WalletTerms from './WalletTerms';
 import type WalletTransfer from './WalletTransfer';
+import type WorkspaceIntegrationImportStatus from './WorkspaceIntegrationImportStatus';
 import type WorkspaceRateAndUnit from './WorkspaceRateAndUnit';
 
 export type {
@@ -107,6 +108,7 @@ export type {
     Modal,
     Network,
     OnyxUpdateEvent,
+    WorkspaceIntegrationImportStatus,
     OnyxUpdatesFromServer,
     PersonalBankAccount,
     PersonalDetails,

From 311f96bbf1d5e0856c9ab0a11dddfe4443cacc35 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 3 Apr 2024 13:19:33 +0700
Subject: [PATCH 071/383] add new function

---
 src/libs/DateUtils.ts   | 9 +++++++++
 src/libs/actions/IOU.ts | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index 4d4f8d425681..6a2f5b5c8b7a 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -1,6 +1,7 @@
 import {
     addDays,
     addHours,
+    addMilliseconds,
     addMinutes,
     eachDayOfInterval,
     eachMonthOfInterval,
@@ -392,6 +393,13 @@ function subtractMillisecondsFromDateTime(dateTime: string, milliseconds: number
     return getDBTime(newTimestamp);
 }
 
+function addMillisecondsFromDateTime(dateTime: string, milliseconds: number): string {
+    const date = zonedTimeToUtc(dateTime, 'UTC');
+    const newTimestamp = addMilliseconds(date, milliseconds).valueOf();
+
+    return getDBTime(newTimestamp);
+}
+
 /**
  * @param isoTimestamp example: 2023-05-16 05:34:14.388
  * @returns example: 2023-05-16
@@ -784,6 +792,7 @@ const DateUtils = {
     getDBTimeWithSkew,
     setLocale,
     subtractMillisecondsFromDateTime,
+    addMillisecondsFromDateTime,
     getDateStringFromISOTimestamp,
     getThirtyMinutesFromNow,
     getEndOfToday,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index f6222dc9eca6..56702bb4ffcb 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -5121,8 +5121,8 @@ function setShownHoldUseExplanation() {
  */
 function putOnHold(transactionID: string, comment: string, reportID: string) {
     const currentTime = DateUtils.getDBTime();
-    const createdReportAction = ReportUtils.buildOptimisticHoldReportAction(DateUtils.subtractMillisecondsFromDateTime(currentTime, 1));
-    const createdReportActionComment = ReportUtils.buildOptimisticHoldReportActionComment(comment, currentTime);
+    const createdReportAction = ReportUtils.buildOptimisticHoldReportAction(currentTime);
+    const createdReportActionComment = ReportUtils.buildOptimisticHoldReportActionComment(comment, DateUtils.addMillisecondsFromDateTime(currentTime, 1));
 
     const optimisticData: OnyxUpdate[] = [
         {

From ff3918ebfacd5d6286d26f83c24ef8e4a5940f91 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Wed, 3 Apr 2024 08:34:08 +0200
Subject: [PATCH 072/383] Enable creating tasks with short-mentions using  the
 create task command in the comment

---
 src/libs/ReportUtils.ts                | 39 ++++++++++++++++----------
 src/pages/home/report/ReportFooter.tsx | 13 +++++----
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 8296e38411be..b605e2604e48 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3012,6 +3012,27 @@ function hasReportNameError(report: OnyxEntry<Report>): boolean {
     return !isEmptyObject(report?.errorFields?.reportName);
 }
 
+/**
+ * Adds a domain to a short mention, converting it into a full mention with email or SMS domain.
+ * @param mention The user mention to be converted.
+ * @returns The converted mention as a full mention string or undefined if conversion is not applicable.
+ */
+function addDomainToShortMention(mention: string): string | undefined {
+    if (!Str.isValidEmail(mention) && currentUserPrivateDomain) {
+        const mentionWithEmailDomain = `${mention}@${currentUserPrivateDomain}`;
+        if (allPersonalDetailLogins.includes(mentionWithEmailDomain)) {
+            return mentionWithEmailDomain;
+        }
+    }
+    if (Str.isValidPhone(mention)) {
+        const mentionWithSmsDomain = PhoneNumber.addSMSDomainIfPhoneNumber(mention);
+        if (allPersonalDetailLogins.includes(mentionWithSmsDomain)) {
+            return mentionWithSmsDomain;
+        }
+    }
+    return undefined;
+}
+
 /**
  * For comments shorter than or equal to 10k chars, convert the comment from MD into HTML because that's how it is stored in the database
  * For longer comments, skip parsing, but still escape the text, and display plaintext for performance reasons. It takes over 40s to parse a 100k long string!!
@@ -3020,21 +3041,8 @@ function getParsedComment(text: string): string {
     const parser = new ExpensiMark();
     const textWithMention = text.replace(CONST.REGEX.SHORT_MENTION, (match) => {
         const mention = match.substring(1);
-
-        if (!Str.isValidEmail(mention) && currentUserPrivateDomain) {
-            const mentionWithEmailDomain = `${mention}@${currentUserPrivateDomain}`;
-            if (allPersonalDetailLogins.includes(mentionWithEmailDomain)) {
-                return `@${mentionWithEmailDomain}`;
-            }
-        }
-        if (Str.isValidPhone(mention)) {
-            const mentionWithSmsDomain = PhoneNumber.addSMSDomainIfPhoneNumber(mention);
-            if (allPersonalDetailLogins.includes(mentionWithSmsDomain)) {
-                return `@${mentionWithSmsDomain}`;
-            }
-        }
-
-        return match;
+        const mentionWithDomain = addDomainToShortMention(mention);
+        return mentionWithDomain ? `@${mentionWithDomain}` : match;
     });
 
     return text.length <= CONST.MAX_MARKUP_LENGTH ? parser.replace(textWithMention, {shouldEscapeText: !shouldAllowRawHTMLMessages()}) : lodashEscape(text);
@@ -5802,6 +5810,7 @@ export {
     getDefaultWorkspaceAvatarTestID,
     getCommentLength,
     getParsedComment,
+    addDomainToShortMention,
     getMoneyRequestOptions,
     canCreateRequest,
     hasIOUWaitingOnCurrentUserBankAccount,
diff --git a/src/pages/home/report/ReportFooter.tsx b/src/pages/home/report/ReportFooter.tsx
index bd143f9ef196..04fbd0308390 100644
--- a/src/pages/home/report/ReportFooter.tsx
+++ b/src/pages/home/report/ReportFooter.tsx
@@ -89,10 +89,10 @@ function ReportFooter({
             /**
              * Matching task rule by group
              * Group 1: Start task rule with []
-             * Group 2: Optional email group between \s+....\s* start rule with @+valid email
+             * Group 2: Optional email group between \s+....\s* start rule with @+valid email or short mention
              * Group 3: Title is remaining characters
              */
-            const taskRegex = /^\[\]\s+(?:@([^\s@]+@[\w.-]+\.[a-zA-Z]{2,}))?\s*([\s\S]*)/;
+            const taskRegex = /^\[\]\s+(?:@([^\s@]+(?:@\w+\.\w+)?))?\s*([\s\S]*)/;
 
             const match = text.match(taskRegex);
             if (!match) {
@@ -102,10 +102,13 @@ function ReportFooter({
             if (!title) {
                 return false;
             }
-            const email = match[1] ? match[1].trim() : undefined;
+
+            const mention = match[1] ? match[1].trim() : undefined;
+            const mentionWithDomain = ReportUtils.addDomainToShortMention(mention ?? '') ?? mention;
+
             let assignee: OnyxTypes.PersonalDetails | EmptyObject = {};
-            if (email) {
-                assignee = Object.values(allPersonalDetails).find((value) => value?.login === email) ?? {};
+            if (mentionWithDomain) {
+                assignee = Object.values(allPersonalDetails).find((value) => value?.login === mentionWithDomain) ?? {};
             }
             Task.createTaskAndNavigate(report.reportID, title, '', assignee?.login ?? '', assignee.accountID, undefined, report.policyID);
             return true;

From 3cd0cb1b3e45691245a85fbd36d4d0c3ba58fc65 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 3 Apr 2024 18:23:34 +0800
Subject: [PATCH 073/383] skip whisper when mark as read except
 ACTIONABLEMENTIONWHISPER

---
 src/libs/actions/Report.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index a27f92ef8f57..8df6d1265e11 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1016,7 +1016,12 @@ function markCommentAsUnread(reportID: string, reportActionCreated: string) {
 
     // Find the latest report actions from other users
     const latestReportActionFromOtherUsers = Object.values(reportActions ?? {}).reduce((latest: ReportAction | null, current: ReportAction) => {
-        if (current.actorAccountID !== currentUserAccountID && (!latest || current.created > latest.created)) {
+        if (
+            current.actorAccountID !== currentUserAccountID &&
+            (!latest || current.created > latest.created) &&
+            // Whisper action doesn't affect lastVisibleActionCreated, so skip whisper action except actionable mention whisper
+            (!ReportActionsUtils.isWhisperAction(current) || current.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLEMENTIONWHISPER)
+        ) {
             return current;
         }
         return latest;

From 1f3726e1c47dee757d6fc389709f32223fe9a3e6 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 3 Apr 2024 15:57:50 +0530
Subject: [PATCH 074/383] Renaming money request to expense

---
 src/CONST.ts                                  |  2 +-
 src/ONYXKEYS.ts                               |  4 +-
 src/components/ConfirmedRoute.tsx             |  2 +-
 src/components/DistanceEReceipt.tsx           |  2 +-
 .../DistanceRequest/DistanceRequestFooter.tsx |  2 +-
 .../DistanceRequestRenderItem.tsx             |  2 +-
 src/components/HoldBanner.tsx                 |  2 +-
 src/components/MoneyReportHeader.tsx          |  2 +-
 .../MoneyRequestConfirmationList.tsx          |  2 +-
 src/components/MoneyRequestHeader.tsx         |  8 +-
 ...oraryForRefactorRequestConfirmationList.js | 26 +++---
 .../ReportActionItem/MoneyRequestAction.tsx   |  6 +-
 .../MoneyRequestPreviewContent.tsx            |  2 +-
 .../MoneyRequestPreview/types.ts              |  2 +-
 .../ReportActionItem/MoneyRequestView.tsx     |  4 +-
 .../ReportActionItem/ReportPreview.tsx        | 10 +-
 src/components/SettlementButton.tsx           |  4 +-
 src/components/TagPicker/index.tsx            |  2 +-
 src/components/transactionPropTypes.js        |  2 +-
 src/languages/en.ts                           | 80 ++++++++--------
 src/languages/es.ts                           | 28 +++---
 src/libs/DistanceRequestUtils.ts              | 10 +-
 src/libs/IOUUtils.ts                          |  4 +-
 src/libs/ModifiedExpenseMessage.ts            |  4 +-
 src/libs/MoneyRequestUtils.ts                 |  4 +-
 src/libs/OptionsListUtils.ts                  |  2 +-
 src/libs/ReportActionsUtils.ts                |  4 +-
 src/libs/ReportUtils.ts                       | 93 +++++++++----------
 src/libs/TransactionUtils.ts                  | 10 +-
 src/libs/actions/IOU.ts                       | 66 ++++++-------
 src/libs/actions/Transaction.ts               |  6 +-
 src/libs/actions/User.ts                      |  6 +-
 .../TransactionBackupsToCollection.ts         |  2 +-
 .../PurposeForUsingExpensifyPage.tsx          | 12 +--
 src/pages/home/HeaderView.tsx                 |  2 +-
 src/pages/home/ReportScreen.tsx               |  2 +-
 .../report/ContextMenu/ContextMenuActions.tsx |  4 +-
 .../AttachmentPickerWithMenuItems.tsx         |  6 +-
 src/pages/home/report/ReportActionItem.tsx    | 12 +--
 src/pages/home/report/ReportActionsView.tsx   |  8 +-
 .../FloatingActionButtonAndPopover.js         |  8 +-
 src/pages/iou/HoldReasonPage.tsx              |  4 +-
 src/pages/iou/IOUCurrencySelection.js         | 12 +--
 src/pages/iou/propTypes/index.js              | 14 +--
 .../request/IOURequestRedirectToStartPage.js  |  4 +-
 src/pages/iou/request/IOURequestStartPage.js  | 10 +-
 ...yForRefactorRequestParticipantsSelector.js | 12 +--
 .../iou/request/step/IOURequestStepAmount.js  |  2 +-
 .../request/step/IOURequestStepCategory.js    |  2 +-
 .../step/IOURequestStepConfirmation.js        |  2 +-
 .../request/step/IOURequestStepCurrency.js    |  2 +-
 .../iou/request/step/IOURequestStepDate.js    |  2 +-
 .../request/step/IOURequestStepDescription.js |  2 +-
 .../request/step/IOURequestStepDistance.js    |  4 +-
 .../request/step/IOURequestStepMerchant.js    |  2 +-
 .../step/IOURequestStepParticipants.js        |  6 +-
 .../step/IOURequestStepRoutePropTypes.js      |  2 +-
 .../iou/request/step/IOURequestStepTag.js     |  2 +-
 .../step/IOURequestStepTaxAmountPage.js       |  6 +-
 .../iou/steps/MoneyRequestAmountForm.tsx      |  2 +-
 src/types/onyx/Report.ts                      |  2 +-
 src/types/onyx/Transaction.ts                 |  6 +-
 tests/actions/IOUTest.ts                      | 42 ++++-----
 .../ReportActionCompose.perf-test.tsx         |  2 +-
 tests/unit/ModifiedExpenseMessageTest.ts      |  2 +-
 tests/unit/ReportUtilsTest.js                 |  6 +-
 66 files changed, 302 insertions(+), 309 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 0fa1c64be44d..049b374684df 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1336,7 +1336,7 @@ const CONST = {
     },
 
     IOU: {
-        // This is the transactionID used when going through the create money request flow so that it mimics a real transaction (like the edit flow)
+        // This is the transactionID used when going through the create expense flow so that it mimics a real transaction (like the edit flow)
         OPTIMISTIC_TRANSACTION_ID: '1',
         // Note: These payment types are used when building IOU reportAction message values in the server and should
         // not be changed.
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index c134d2a65db2..e46f6aa5fc46 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -127,7 +127,7 @@ const ONYXKEYS = {
     /** The NVP with the last payment method used per policy */
     NVP_LAST_PAYMENT_METHOD: 'nvp_private_lastPaymentMethod',
 
-    /** This NVP holds to most recent waypoints that a person has used when creating a distance request */
+    /** This NVP holds to most recent waypoints that a person has used when creating a distance expense */
     NVP_RECENT_WAYPOINTS: 'expensify_recentWaypoints',
 
     /** This NVP will be `true` if the user has ever dismissed the engagement modal on either OldDot or NewDot. If it becomes true it should stay true forever. */
@@ -341,7 +341,7 @@ const ONYXKEYS = {
         PRIVATE_NOTES_DRAFT: 'privateNotesDraft_',
         NEXT_STEP: 'reportNextStep_',
 
-        // Manual request tab selector
+        // Manual expense tab selector
         SELECTED_TAB: 'selectedTab_',
 
         /** This is deprecated, but needed for a migration, so we still need to include it here so that it will be initialized in Onyx.init */
diff --git a/src/components/ConfirmedRoute.tsx b/src/components/ConfirmedRoute.tsx
index 17c5097b8154..351129a5ee3e 100644
--- a/src/components/ConfirmedRoute.tsx
+++ b/src/components/ConfirmedRoute.tsx
@@ -24,7 +24,7 @@ type ConfirmedRoutePropsOnyxProps = {
 };
 
 type ConfirmedRouteProps = ConfirmedRoutePropsOnyxProps & {
-    /** Transaction that stores the distance request data */
+    /** Transaction that stores the distance expense data */
     transaction: OnyxEntry<Transaction>;
 };
 
diff --git a/src/components/DistanceEReceipt.tsx b/src/components/DistanceEReceipt.tsx
index 20b927913bfb..f6adac9b6034 100644
--- a/src/components/DistanceEReceipt.tsx
+++ b/src/components/DistanceEReceipt.tsx
@@ -20,7 +20,7 @@ import ScrollView from './ScrollView';
 import Text from './Text';
 
 type DistanceEReceiptProps = {
-    /** The transaction for the distance request */
+    /** The transaction for the distance expense */
     transaction: Transaction;
 };
 
diff --git a/src/components/DistanceRequest/DistanceRequestFooter.tsx b/src/components/DistanceRequest/DistanceRequestFooter.tsx
index 624ea940888b..e21bdc1c9e56 100644
--- a/src/components/DistanceRequest/DistanceRequestFooter.tsx
+++ b/src/components/DistanceRequest/DistanceRequestFooter.tsx
@@ -27,7 +27,7 @@ type DistanceRequestFooterOnyxProps = {
 };
 
 type DistanceRequestFooterProps = DistanceRequestFooterOnyxProps & {
-    /** The waypoints for the distance request */
+    /** The waypoints for the distance expense */
     waypoints?: WaypointCollection;
 
     /** Function to call when the user wants to add a new waypoint */
diff --git a/src/components/DistanceRequest/DistanceRequestRenderItem.tsx b/src/components/DistanceRequest/DistanceRequestRenderItem.tsx
index 57e4fb0b530e..75345f9aa621 100644
--- a/src/components/DistanceRequest/DistanceRequestRenderItem.tsx
+++ b/src/components/DistanceRequest/DistanceRequestRenderItem.tsx
@@ -7,7 +7,7 @@ import type {TranslationPaths} from '@src/languages/types';
 import type {WaypointCollection} from '@src/types/onyx/Transaction';
 
 type DistanceRequestProps = {
-    /** The waypoints for the distance request */
+    /** The waypoints for the distance expense */
     waypoints?: WaypointCollection;
 
     /** The index of the item */
diff --git a/src/components/HoldBanner.tsx b/src/components/HoldBanner.tsx
index af77d9076629..d760d4efbe96 100644
--- a/src/components/HoldBanner.tsx
+++ b/src/components/HoldBanner.tsx
@@ -12,7 +12,7 @@ function HoldBanner() {
     return (
         <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.pb3, styles.ph5, styles.borderBottom]}>
             <TextPill>{translate('iou.hold')}</TextPill>
-            <Text style={[styles.textLabel, styles.pl3, styles.mw100, styles.flexShrink1]}>{translate('iou.requestOnHold')}</Text>
+            <Text style={[styles.textLabel, styles.pl3, styles.mw100, styles.flexShrink1]}>{translate('iou.expenseOnHold')}</Text>
         </View>
     );
 }
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 488dfc574ab2..ede38c75f278 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -38,7 +38,7 @@ type MoneyReportHeaderProps = MoneyReportHeaderOnyxProps & {
     /** The report currently being looked at */
     report: OnyxTypes.Report;
 
-    /** The policy tied to the money request report */
+    /** The policy tied to the expense report */
     policy: OnyxEntry<OnyxTypes.Policy>;
 };
 
diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 2cda2530d769..d92999210114 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -343,7 +343,7 @@ function MoneyRequestConfirmationList({
         if (isSplitBill && iouAmount === 0) {
             text = translate('iou.split');
         } else if ((!!receiptPath && isTypeRequest) || isDistanceRequestWithPendingRoute) {
-            text = translate('iou.request');
+            text = translate('iou.expense');
             if (iouAmount !== 0) {
                 text = translate('iou.requestAmount', {amount: formattedAmount});
             }
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 5d3231ca0a41..8d6826015f0b 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -63,7 +63,7 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
     const isOnHold = TransactionUtils.isOnHold(transaction);
     const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
 
-    // Only the requestor can take delete the request, admins can only edit it.
+    // Only the requestor can take delete the expense, admins can only edit it.
     const isActionOwner = typeof parentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && parentReportAction.actorAccountID === session?.accountID;
     const isPolicyAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isApprover = ReportUtils.isMoneyRequestReport(moneyRequestReport) && (session?.accountID ?? null) === moneyRequestReport?.managerID;
@@ -118,14 +118,14 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
         if (isOnHold && (isHoldCreator || (!isRequestIOU && canModifyStatus))) {
             threeDotsMenuItems.push({
                 icon: Expensicons.Stopwatch,
-                text: translate('iou.unholdRequest'),
+                text: translate('iou.unholdExpense'),
                 onSelected: () => changeMoneyRequestStatus(),
             });
         }
         if (!isOnHold && (isRequestIOU || canModifyStatus)) {
             threeDotsMenuItems.push({
                 icon: Expensicons.Stopwatch,
-                text: translate('iou.holdRequest'),
+                text: translate('iou.holdExpense'),
                 onSelected: () => changeMoneyRequestStatus(),
             });
         }
@@ -196,7 +196,7 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
                 {isOnHold && <HoldBanner />}
             </View>
             <ConfirmModal
-                title={translate('iou.deleteRequest')}
+                title={translate('iou.deleteExpense')}
                 isVisible={isDeleteModalVisible}
                 onConfirm={deleteTransaction}
                 onCancel={() => setIsDeleteModalVisible(false)}
diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 3fd76eea657b..434451af3640 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -93,7 +93,7 @@ const propTypes = {
     /** Selected participants from MoneyRequestModal with login / accountID */
     selectedParticipants: PropTypes.arrayOf(optionPropTypes).isRequired,
 
-    /** Payee of the money request with login */
+    /** Payee of the expense with login */
     payeePersonalDetails: optionPropTypes,
 
     /** Can the participants be modified or not */
@@ -102,7 +102,7 @@ const propTypes = {
     /** Should the list be read only, and not editable? */
     isReadOnly: PropTypes.bool,
 
-    /** Whether the money request is a scan request */
+    /** Whether the expense is a scan expense */
     isScanRequest: PropTypes.bool,
 
     /** Depending on expense report or personal IOU report, respective bank account route */
@@ -115,10 +115,10 @@ const propTypes = {
         email: PropTypes.string.isRequired,
     }),
 
-    /** The policyID of the request */
+    /** The policyID of the expense */
     policyID: PropTypes.string,
 
-    /** The reportID of the request */
+    /** The reportID of the expense */
     reportID: PropTypes.string,
 
     /** File path of the receipt */
@@ -130,25 +130,25 @@ const propTypes = {
     /** List styles for OptionsSelector */
     listStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
-    /** ID of the transaction that represents the money request */
+    /** ID of the transaction that represents the expense */
     transactionID: PropTypes.string,
 
-    /** Unit and rate used for if the money request is a distance request */
+    /** Unit and rate used for if the expense is a distance expense */
     mileageRate: PropTypes.shape({
         /** Unit used to represent distance */
         unit: PropTypes.oneOf([CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]),
 
-        /** Rate used to calculate the distance request amount */
+        /** Rate used to calculate the distance expense amount */
         rate: PropTypes.number,
 
         /** The currency of the rate */
         currency: PropTypes.string,
     }),
 
-    /** Whether the money request is a distance request */
+    /** Whether the expense is a distance expense */
     isDistanceRequest: PropTypes.bool,
 
-    /** Whether we're editing a split bill */
+    /** Whether we're editing a split expense */
     isEditingSplitBill: PropTypes.bool,
 
     /** Whether we should show the amount, date, and merchant fields. */
@@ -168,7 +168,7 @@ const propTypes = {
     /** The policy of the report */
     policy: policyPropTypes.policy,
 
-    /** Transaction that represents the money request */
+    /** Transaction that represents the expense */
     transaction: transactionPropTypes,
 };
 
@@ -265,7 +265,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
     // A flag and a toggler for showing the rest of the form fields
     const [shouldExpandFields, toggleShouldExpandFields] = useReducer((state) => !state, false);
 
-    // Do not hide fields in case of send money request
+    // Do not hide fields in case of paying someone
     const shouldShowAllFields = isDistanceRequest || shouldExpandFields || !shouldShowSmartScanFields || isTypeSend || isEditingSplitBill;
 
     const shouldShowDate = (shouldShowSmartScanFields || isDistanceRequest) && !isTypeSend;
@@ -387,7 +387,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
         } else if (isTypeSplit && iouAmount === 0) {
             text = translate('iou.split');
         } else if ((receiptPath && isTypeRequest) || isDistanceRequestWithPendingRoute) {
-            text = translate('iou.request');
+            text = translate('iou.expense');
             if (iouAmount !== 0) {
                 text = translate('iou.requestAmount', {amount: formattedAmount});
             }
@@ -914,7 +914,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     isThumbnail={isThumbnail}
                     source={receiptThumbnail || receiptImage}
                     // AuthToken is required when retrieving the image from the server
-                    // but we don't need it to load the blob:// or file:// image when starting a money request / split bill
+                    // but we don't need it to load the blob:// or file:// image when starting a submit / split expense
                     // So if we have a thumbnail, it means we're retrieving the image from the server
                     isAuthTokenRequired={!_.isEmpty(receiptThumbnail)}
                     fileExtension={fileExtension}
diff --git a/src/components/ReportActionItem/MoneyRequestAction.tsx b/src/components/ReportActionItem/MoneyRequestAction.tsx
index 7d9ba2697c7a..4f91b2084b45 100644
--- a/src/components/ReportActionItem/MoneyRequestAction.tsx
+++ b/src/components/ReportActionItem/MoneyRequestAction.tsx
@@ -37,7 +37,7 @@ type MoneyRequestActionProps = MoneyRequestActionOnyxProps & {
     /** The ID of the associated chatReport */
     chatReportID: string;
 
-    /** The ID of the associated request report */
+    /** The ID of the associated expense report */
     requestReportID: string;
 
     /** The ID of the current report */
@@ -114,10 +114,8 @@ function MoneyRequestAction({
         let message: TranslationPaths;
         if (isReversedTransaction) {
             message = 'parentReportAction.reversedTransaction';
-        } else if (isTrackExpenseAction) {
-            message = 'parentReportAction.deletedExpense';
         } else {
-            message = 'parentReportAction.deletedRequest';
+            message = 'parentReportAction.deletedExpense';
         }
         return <RenderHTML html={`<comment>${translate(message)}</comment>`} />;
     }
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 2e9f9a553b71..50f736101be3 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -101,7 +101,7 @@ function MoneyRequestPreviewContent({
     /*
      Show the merchant for IOUs and expenses only if:
      - the merchant is not empty, is custom, or is not related to scanning smartscan;
-     - the request is not a distance request with a pending route and amount = 0 - in this case,
+     - the expense is not a distance expense with a pending route and amount = 0 - in this case,
        the merchant says: "Route pending...", which is already shown in the amount field;
     */
     const shouldShowMerchant =
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/types.ts b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
index 3b3eda4ec30a..1c036bc0fbee 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/types.ts
+++ b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
@@ -53,7 +53,7 @@ type MoneyRequestPreviewProps = MoneyRequestPreviewOnyxProps & {
     /** Extra styles to pass to View wrapper */
     containerStyles?: StyleProp<ViewStyle>;
 
-    /** True if this is this IOU is a split instead of a 1:1 request */
+    /** True if this is this IOU is a split instead of a submit expense */
     isBillSplit: boolean;
 
     /** Whether this IOU is a track expense */
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 37d939e13868..0d3ae5d1b037 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -120,7 +120,7 @@ function MoneyRequestView({
     const cardProgramName = isCardTransaction && transactionCardID !== undefined ? CardUtils.getCardDescription(transactionCardID) : '';
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
 
-    // Flags for allowing or disallowing editing a money request
+    // Flags for allowing or disallowing editing an expense
     const isSettled = ReportUtils.isSettled(moneyRequestReport?.reportID);
     const isCancelled = moneyRequestReport && moneyRequestReport.isCancelledIOU;
 
@@ -205,7 +205,7 @@ function MoneyRequestView({
 
     const getErrorForField = useCallback(
         (field: ViolationField, data?: OnyxTypes.TransactionViolation['data']) => {
-            // Checks applied when creating a new money request
+            // Checks applied when creating a new expense
             // NOTE: receipt field can return multiple violations, so we need to handle it separately
             const fieldChecks: Partial<Record<ViolationField, {isError: boolean; translationPath: TranslationPaths}>> = {
                 amount: {
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 8b95474bf2fc..af0b59aa91ba 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -34,7 +34,7 @@ import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import ReportActionItemImages from './ReportActionItemImages';
 
 type ReportPreviewOnyxProps = {
-    /** The policy tied to the money request report */
+    /** The policy tied to the expense report */
     policy: OnyxEntry<Policy>;
 
     /** ChatReport associated with iouReport */
@@ -146,7 +146,7 @@ function ReportPreview({
         // Formatted merchant can be an empty string
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         formattedMerchant ||
-        translate('iou.requestCount', {
+        translate('iou.expenseCount', {
             count: numberOfRequests - numberOfScanningReceipts - numberOfPendingRequests,
             scanningReceipts: numberOfScanningReceipts,
             pendingReceipts: numberOfPendingRequests,
@@ -221,10 +221,10 @@ function ReportPreview({
 
     /*
      Show subtitle if at least one of the money requests is not being smart scanned, and either:
-     - There is more than one money request – in this case, the "X requests, Y scanning" subtitle is shown;
-     - There is only one money request, it has a receipt and is not being smart scanned – in this case, the request merchant is shown;
+     - There is more than one expense – in this case, the "X expenses, Y scanning" subtitle is shown;
+     - There is only one expense, it has a receipt and is not being smart scanned – in this case, the expense merchant is shown;
 
-     * There is an edge case when there is only one distance request with a pending route and amount = 0.
+     * There is an edge case when there is only one distance expense with a pending route and amount = 0.
        In this case, we don't want to show the merchant because it says: "Pending route...", which is already displayed in the amount field.
      */
     const shouldShowSingleRequestMerchant = numberOfRequests === 1 && !!formattedMerchant && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);
diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
index c6d603514014..570208574f54 100644
--- a/src/components/SettlementButton.tsx
+++ b/src/components/SettlementButton.tsx
@@ -177,13 +177,13 @@ function SettlementButton({
         };
         const canUseWallet = !isExpenseReport && currency === CONST.CURRENCY.USD;
 
-        // Only show the Approve button if the user cannot pay the request
+        // Only show the Approve button if the user cannot pay the expense
         if (shouldHidePaymentOptions && shouldShowApproveButton) {
             return [approveButtonOption];
         }
 
         // To achieve the one tap pay experience we need to choose the correct payment type as default.
-        // If the user has previously chosen a specific payment option or paid for some request or expense,
+        // If the user has previously chosen a specific payment option or paid for some expense,
         // let's use the last payment method or use default.
         const paymentMethod = nvpLastPaymentMethod?.[policyID] ?? '';
         if (canUseWallet) {
diff --git a/src/components/TagPicker/index.tsx b/src/components/TagPicker/index.tsx
index af8acd19e8c4..64c1980dc91f 100644
--- a/src/components/TagPicker/index.tsx
+++ b/src/components/TagPicker/index.tsx
@@ -32,7 +32,7 @@ type TagPickerProps = TagPickerOnyxProps & {
     // eslint-disable-next-line react/no-unused-prop-types
     policyID: string;
 
-    /** The selected tag of the money request */
+    /** The selected tag of the expense */
     selectedTag: string;
 
     /** The name of tag list we are getting tags for */
diff --git a/src/components/transactionPropTypes.js b/src/components/transactionPropTypes.js
index 7eb1b776358c..f951837503f3 100644
--- a/src/components/transactionPropTypes.js
+++ b/src/components/transactionPropTypes.js
@@ -39,7 +39,7 @@ export default PropTypes.shape({
             /** The text of the comment */
             comment: PropTypes.string,
 
-            /** The waypoints defining the distance request */
+            /** The waypoints defining the distance expense */
             waypoints: PropTypes.shape({
                 /** The latitude of the waypoint */
                 lat: PropTypes.number,
diff --git a/src/languages/en.ts b/src/languages/en.ts
index d30b62fc50b3..2a79c605120a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -412,7 +412,7 @@ export default {
     },
     login: {
         hero: {
-            header: 'Split bills, request payments, and chat with friends.',
+            header: 'Track, submit, and split expenses, and chat with friends.',
             body: 'Welcome to the future of Expensify, your new go-to place for financial collaboration with friends and teammates alike.',
         },
     },
@@ -465,12 +465,12 @@ export default {
         markAsUnread: 'Mark as unread',
         markAsRead: 'Mark as read',
         editAction: ({action}: EditActionParams) =>
-            `Edit ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? `${action?.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ? 'expense' : 'request'}` : 'comment'}`,
+            `Edit ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'}`,
         deleteAction: ({action}: DeleteActionParams) =>
-            `Delete ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? `${action?.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ? 'expense' : 'request'}` : 'comment'}`,
+            `Delete ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'}`,
         deleteConfirmation: ({action}: DeleteConfirmationParams) =>
             `Are you sure you want to delete this ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? `${action?.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ? 'expense' : 'request'}` : 'comment'
+                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'
             }?`,
         onlyVisible: 'Only visible to',
         replyInThread: 'Reply in thread',
@@ -499,7 +499,7 @@ export default {
         beginningOfChatHistory: 'This is the beginning of your chat with ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: 'Collaboration between ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' and ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, request money and settle up.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, submit expense and settle up.',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         chatWithAccountManager: 'Chat with your account manager here',
         sayHello: 'Say hello!',
@@ -507,9 +507,9 @@ export default {
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`,
         usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nYou can also use the + button to ${additionalText}, or assign a task!`,
         iouTypes: {
-            send: 'send money',
-            split: 'split a bill',
-            request: 'request money',
+            send: 'pay expenses',
+            split: 'split an expense',
+            request: 'submit an expense',
             // eslint-disable-next-line @typescript-eslint/naming-convention
             'track-expense': 'track an expense',
         },
@@ -589,11 +589,11 @@ export default {
     quickAction: {
         scanReceipt: 'Scan Receipt',
         recordDistance: 'Record Distance',
-        requestMoney: 'Request Money',
-        splitBill: 'Split Bill',
+        requestMoney: 'Submit Expense',
+        splitBill: 'Split Expense',
         splitScan: 'Split Receipt',
         splitDistance: 'Split Distance',
-        sendMoney: 'Send Money',
+        sendMoney: 'Pay Someone',
         assignTask: 'Assign Task',
         shortcut: 'Shortcut',
         trackManual: 'Track Manual',
@@ -611,11 +611,12 @@ export default {
         original: 'Original',
         split: 'Split',
         addToSplit: 'Add to split',
-        splitBill: 'Split bill',
-        request: 'Request',
+        splitExpense: 'Split expense',
+        payName: ({name}: {name: string}) => `Pay ${name}`,
+        paySomeone: 'Pay someone',
+        expense: 'Expense',
         participants: 'Participants',
-        requestMoney: 'Request money',
-        sendMoney: 'Send money',
+        submitExpense: 'Submit expense',
         trackExpense: 'Track expense',
         pay: 'Pay',
         cancelPayment: 'Cancel payment',
@@ -634,20 +635,20 @@ export default {
         receiptStatusText: "Only you can see this receipt when it's scanning. Check back later or enter the details now.",
         receiptScanningFailed: 'Receipt scanning failed. Enter the details manually.',
         transactionPendingText: 'It takes a few days from the date the card was used for the transaction to post.',
-        requestCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
-            `${count} ${Str.pluralize('request', 'requests', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}${
+        expenseCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
+            `${count} ${Str.pluralize('expense', 'expenses', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}${
                 pendingReceipts > 0 ? `, ${pendingReceipts} pending` : ''
             }`,
-        deleteRequest: 'Delete request',
-        deleteConfirmation: 'Are you sure that you want to delete this request?',
+        deleteExpense: 'Delete expense',
+        deleteConfirmation: 'Are you sure that you want to delete this expense?',
         settledExpensify: 'Paid',
         settledElsewhere: 'Paid elsewhere',
         settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} with Expensify` : `Pay with Expensify`),
         payElsewhere: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} elsewhere` : `Pay elsewhere`),
         nextStep: 'Next Steps',
         finished: 'Finished',
-        requestAmount: ({amount}: RequestAmountParams) => `request ${amount}`,
-        requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `requested ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
+        requestAmount: ({amount}: RequestAmountParams) => `request ${amount}`, // TODO: Need to update this
+        requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `expense of ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `split ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
@@ -672,14 +673,14 @@ export default {
         paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} using Expensify`,
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
-        changedTheRequest: 'changed the request',
+        changedTheExpense: 'changed the expense',
         setTheRequest: ({valueName, newValueToDisplay}: SetTheRequestParams) => `the ${valueName} to ${newValueToDisplay}`,
         setTheDistance: ({newDistanceToDisplay, newAmountToDisplay}: SetTheDistanceParams) => `set the distance to ${newDistanceToDisplay}, which set the amount to ${newAmountToDisplay}`,
         removedTheRequest: ({valueName, oldValueToDisplay}: RemovedTheRequestParams) => `the ${valueName} (previously ${oldValueToDisplay})`,
         updatedTheRequest: ({valueName, newValueToDisplay, oldValueToDisplay}: UpdatedTheRequestParams) => `the ${valueName} to ${newValueToDisplay} (previously ${oldValueToDisplay})`,
         updatedTheDistance: ({newDistanceToDisplay, oldDistanceToDisplay, newAmountToDisplay, oldAmountToDisplay}: UpdatedTheDistanceParams) =>
             `changed the distance to ${newDistanceToDisplay} (previously ${oldDistanceToDisplay}), which updated the amount to ${newAmountToDisplay} (previously ${oldAmountToDisplay})`,
-        threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${formattedAmount} ${comment ? `for ${comment}` : 'request'}`,
+        threadExpenseReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${formattedAmount} ${comment ? `for ${comment}` : 'expense'}`,
         threadTrackReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Tracking ${formattedAmount} ${comment ? `for ${comment}` : ''}`,
         threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
         tagSelection: 'Select a tag to better organize your spend.',
@@ -690,12 +691,12 @@ export default {
             invalidTaxAmount: ({amount}: RequestAmountParams) => `Maximum tax amount is ${amount}`,
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
-            genericCreateFailureMessage: 'Unexpected error requesting money, please try again later',
+            genericCreateFailureMessage: 'Unexpected error creating the expense, please try again later',
             receiptFailureMessage: "The receipt didn't upload. ",
             saveFileMessage: 'Download the file ',
             loseFileMessage: 'or dismiss this error and lose it',
-            genericDeleteFailureMessage: 'Unexpected error deleting the money request, please try again later',
-            genericEditFailureMessage: 'Unexpected error editing the money request, please try again later',
+            genericDeleteFailureMessage: 'Unexpected error deleting the expense, please try again later',
+            genericEditFailureMessage: 'Unexpected error editing the expense, please try again later',
             genericSmartscanFailureMessage: 'Transaction is missing fields',
             duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
             atLeastTwoDifferentWaypoints: 'Please enter at least two different addresses',
@@ -705,21 +706,21 @@ export default {
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
         enableWallet: 'Enable Wallet',
         hold: 'Hold',
-        holdRequest: 'Hold request',
-        unholdRequest: 'Unhold request',
-        heldRequest: 'held this request',
-        unheldRequest: 'unheld this request',
-        explainHold: "Explain why you're holding this request.",
+        holdExpense: 'Hold expense',
+        unholdExpense: 'Unhold expense',
+        heldExpense: 'held this expense',
+        unheldExpense: 'unheld this expense',
+        explainHold: "Explain why you're holding this expense.",
         reason: 'Reason',
         holdReasonRequired: 'A reason is required when holding.',
-        requestOnHold: 'This request was put on hold. Review the comments for next steps.',
+        expenseOnHold: 'This expense was put on hold. Review the comments for next steps.',
         confirmApprove: 'Confirm what to approve',
         confirmApprovalAmount: 'Approve the entire report total or only the amount not on hold.',
         confirmPay: 'Confirm what to pay',
         confirmPayAmount: 'Pay all out-of-pocket spend or only the amount not on hold.',
         payOnly: 'Pay only',
         approveOnly: 'Approve only',
-        holdEducationalTitle: 'This request is on',
+        holdEducationalTitle: 'This expense is on',
         whatIsHoldTitle: 'What is hold?',
         whatIsHoldExplain: 'Hold is our way of streamlining financial collaboration. "Reject" is so harsh!',
         holdIsTemporaryTitle: 'Hold is usually temporary',
@@ -917,7 +918,7 @@ export default {
         enterMessageHere: 'Enter message here',
         closeAccountWarning: 'Closing your account cannot be undone.',
         closeAccountPermanentlyDeleteData:
-            'This will permanently delete all of your unsubmitted expense data and will cancel and decline any outstanding money requests. Are you sure you want to delete the account?',
+            'This will permanently delete all of your unsubmitted expense data and will cancel and decline any outstanding submitted expenses. Are you sure you want to delete the account?',
         enterDefaultContactToConfirm: 'Please type your default contact method to confirm you wish to close your account. Your default contact method is:',
         enterDefaultContact: 'Enter your default contact method',
         defaultContact: 'Default contact method:',
@@ -2408,7 +2409,6 @@ export default {
     parentReportAction: {
         deletedReport: '[Deleted report]',
         deletedMessage: '[Deleted message]',
-        deletedRequest: '[Deleted request]',
         deletedExpense: '[Deleted expense]',
         reversedTransaction: '[Reversed transaction]',
         deletedTask: '[Deleted task]',
@@ -2530,15 +2530,15 @@ export default {
             body: `Get paid to talk to your friends! Start a chat with a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]: {
-            buttonText1: 'Request money, ',
+            buttonText1: 'Submit expense, ',
             buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`,
-            header: `Request money, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `It pays to get paid! Request money from a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
+            header: `Submit expense, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            body: `It pays to get paid! Submit expense from a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]: {
-            buttonText1: 'Send money, ',
+            buttonText1: 'Pay Someone, ',
             buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`,
-            header: `Send money, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            header: `Pay Someone, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             body: `You gotta send money to make money! Send money to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 30e4717bdf57..d673cd04381b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -607,11 +607,12 @@ export default {
         original: 'Original',
         split: 'Dividir',
         addToSplit: 'Añadir para dividir',
-        splitBill: 'Dividir factura',
-        request: 'Solicitar',
+        splitExpense: 'Dividir factura',
+        expense: 'Solicitar',
         participants: 'Participantes',
-        requestMoney: 'Pedir dinero',
-        sendMoney: 'Enviar dinero',
+        submitExpense: 'Pedir dinero',
+        paySomeone: 'Enviar dinero',
+        payName: ({name}: {name: string}) => `Pay ${name}`,
         trackExpense: 'Seguimiento de gastos',
         pay: 'Pagar',
         cancelPayment: 'Cancelar el pago',
@@ -630,11 +631,11 @@ export default {
         receiptStatusText: 'Solo tú puedes ver este recibo cuando se está escaneando. Vuelve más tarde o introduce los detalles ahora.',
         receiptScanningFailed: 'El escaneo de recibo ha fallado. Introduce los detalles manualmente.',
         transactionPendingText: 'La transacción tarda unos días en contabilizarse desde la fecha en que se utilizó la tarjeta.',
-        requestCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
+        expenseCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
             `${count} ${Str.pluralize('solicitude', 'solicitudes', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}${
                 pendingReceipts > 0 ? `, ${pendingReceipts} pendiente` : ''
             }`,
-        deleteRequest: 'Eliminar solicitud',
+        deleteExpense: 'Eliminar solicitud',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar esta solicitud?',
         settledExpensify: 'Pagado',
         settledElsewhere: 'Pagado de otra forma',
@@ -668,7 +669,7 @@ export default {
         paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount} con Expensify`,
         noReimbursableExpenses: 'El importe de este informe no es válido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
-        changedTheRequest: 'cambió la solicitud',
+        changedTheExpense: 'cambió la solicitud',
         setTheRequest: ({valueName, newValueToDisplay}: SetTheRequestParams) => `${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay}`,
         setTheDistance: ({newDistanceToDisplay, newAmountToDisplay}: SetTheDistanceParams) =>
             `estableció la distancia a ${newDistanceToDisplay}, lo que estableció el importe a ${newAmountToDisplay}`,
@@ -677,7 +678,7 @@ export default {
             `${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay} (previamente ${oldValueToDisplay})`,
         updatedTheDistance: ({newDistanceToDisplay, oldDistanceToDisplay, newAmountToDisplay, oldAmountToDisplay}: UpdatedTheDistanceParams) =>
             `cambió la distancia a ${newDistanceToDisplay} (previamente ${oldDistanceToDisplay}), lo que cambió el importe a ${newAmountToDisplay} (previamente ${oldAmountToDisplay})`,
-        threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${comment ? `${formattedAmount} para ${comment}` : `Solicitud de ${formattedAmount}`}`,
+        threadExpenseReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${comment ? `${formattedAmount} para ${comment}` : `Solicitud de ${formattedAmount}`}`,
         threadTrackReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Seguimiento ${formattedAmount} ${comment ? `para ${comment}` : ''}`,
         threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
         tagSelection: 'Selecciona una etiqueta para organizar mejor tu dinero.',
@@ -702,14 +703,14 @@ export default {
         },
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
         enableWallet: 'Habilitar Billetera',
-        holdRequest: 'Bloquear solicitud',
-        unholdRequest: 'Desbloquear solicitud',
-        heldRequest: 'bloqueó esta solicitud',
-        unheldRequest: 'desbloqueó esta solicitud',
+        holdExpense: 'Bloquear solicitud',
+        unholdExpense: 'Desbloquear solicitud',
+        heldExpense: 'bloqueó esta solicitud',
+        unheldExpense: 'desbloqueó esta solicitud',
         explainHold: 'Explica la razón para bloquear esta solicitud.',
         reason: 'Razón',
         holdReasonRequired: 'Se requiere una razón para bloquear.',
-        requestOnHold: 'Este solicitud está bloqueada. Revisa los comentarios para saber como proceder.',
+        expenseOnHold: 'Este solicitud está bloqueada. Revisa los comentarios para saber como proceder.',
         confirmApprove: 'Confirma que quieres aprobar',
         confirmApprovalAmount: 'Aprobar el total o solo la parte no bloqueada.',
         confirmPay: 'Confirma que quieres pagar',
@@ -2900,7 +2901,6 @@ export default {
     parentReportAction: {
         deletedReport: '[Informe eliminado]',
         deletedMessage: '[Mensaje eliminado]',
-        deletedRequest: '[Solicitud eliminada]',
         deletedExpense: '[Gasto eliminado]',
         reversedTransaction: '[Transacción anulada]',
         deletedTask: '[Tarea eliminada]',
diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
index 9a7e0a568627..12a240ae9041 100644
--- a/src/libs/DistanceRequestUtils.ts
+++ b/src/libs/DistanceRequestUtils.ts
@@ -79,7 +79,7 @@ function getRoundedDistanceInUnits(distanceInMeters: number, unit: Unit): string
 }
 
 /**
- * @param hasRoute Whether the route exists for the distance request
+ * @param hasRoute Whether the route exists for the distance expense
  * @param distanceInMeters Distance traveled
  * @param unit Unit that should be used to display the distance
  * @param rate Expensable amount allowed per unit
@@ -100,7 +100,7 @@ function getDistanceForDisplay(hasRoute: boolean, distanceInMeters: number, unit
 }
 
 /**
- * @param hasRoute Whether the route exists for the distance request
+ * @param hasRoute Whether the route exists for the distance expense
  * @param distanceInMeters Distance traveled
  * @param unit Unit that should be used to display the distance
  * @param rate Expensable amount allowed per unit
@@ -133,12 +133,12 @@ function getDistanceMerchant(
 }
 
 /**
- * Calculates the request amount based on distance, unit, and rate.
+ * Calculates the expense amount based on distance, unit, and rate.
  *
  * @param distance - The distance traveled in meters
  * @param unit - The unit of measurement for the distance
- * @param rate - Rate used for calculating the request amount
- * @returns The computed request amount (rounded) in "cents".
+ * @param rate - Rate used for calculating the expense amount
+ * @returns The computed expense amount (rounded) in "cents".
  */
 function getDistanceRequestAmount(distance: number, unit: Unit, rate: number): number {
     const convertedDistance = convertDistanceUnit(distance, unit);
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index 65390982f18c..70b44564f103 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -52,8 +52,8 @@ function calculateAmount(numberOfParticipants: number, total: number, currency:
  * For example: if user1 owes user2 $10, then we have: {ownerAccountID: user2, managerID: user1, total: $10 (a positive amount, owed to user2)}
  * If user1 requests $17 from user2, then we have: {ownerAccountID: user1, managerID: user2, total: $7 (still a positive amount, but now owed to user1)}
  *
- * @param isDeleting - whether the user is deleting the request
- * @param isUpdating - whether the user is updating the request
+ * @param isDeleting - whether the user is deleting the expense
+ * @param isUpdating - whether the user is updating the expense
  */
 function updateIOUOwnerAndTotal<TReport extends OnyxEntry<Report>>(
     iouReport: TReport,
diff --git a/src/libs/ModifiedExpenseMessage.ts b/src/libs/ModifiedExpenseMessage.ts
index 8f1cb89d695b..d66bf26d57f4 100644
--- a/src/libs/ModifiedExpenseMessage.ts
+++ b/src/libs/ModifiedExpenseMessage.ts
@@ -221,7 +221,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         buildMessageFragmentForValue(
             reportActionOriginalMessage?.billable ?? '',
             reportActionOriginalMessage?.oldBillable ?? '',
-            Localize.translateLocal('iou.request'),
+            Localize.translateLocal('iou.expense'),
             true,
             setFragments,
             removalFragments,
@@ -234,7 +234,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         getMessageLine(`\n${Localize.translateLocal('iou.set')}`, setFragments) +
         getMessageLine(`\n${Localize.translateLocal('iou.removed')}`, removalFragments);
     if (message === '') {
-        return Localize.translateLocal('iou.changedTheRequest');
+        return Localize.translateLocal('iou.changedTheExpense');
     }
     return `${message.substring(1, message.length)}`;
 }
diff --git a/src/libs/MoneyRequestUtils.ts b/src/libs/MoneyRequestUtils.ts
index 1a573ce74628..ec934cb87888 100644
--- a/src/libs/MoneyRequestUtils.ts
+++ b/src/libs/MoneyRequestUtils.ts
@@ -78,14 +78,14 @@ function replaceAllDigits(text: string, convertFn: (char: string) => string): st
 }
 
 /**
- * Check if distance request or not
+ * Check if distance expense or not
  */
 function isDistanceRequest(iouType: ValueOf<typeof CONST.IOU.TYPE>, selectedTab: OnyxEntry<SelectedTabRequest>): boolean {
     return iouType === CONST.IOU.TYPE.REQUEST && selectedTab === CONST.TAB_REQUEST.DISTANCE;
 }
 
 /**
- * Check if scan request or not
+ * Check if scan expense or not
  */
 function isScanRequest(selectedTab: SelectedTabRequest): boolean {
     return selectedTab === CONST.TAB_REQUEST.SCAN;
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 7e4082bff481..2c479cac66bf 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -1493,7 +1493,7 @@ function getOptions(
             return;
         }
 
-        // In case user needs to add credit bank account, don't allow them to request more money from the workspace.
+        // In case user needs to add credit bank account, don't allow them to submit expense from the workspace.
         if (includeOwnedWorkspaceChats && ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(report)) {
             return;
         }
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index c3b377783b13..d5e81316337d 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -482,7 +482,7 @@ function shouldReportActionBeVisible(reportAction: OnyxEntry<ReportAction>, key:
         return false;
     }
 
-    // Ignore markedAsReimbursed action here since we're already display message that explains the request was paid
+    // Ignore markedAsReimbursed action here since we're already display message that explains the expense was paid
     // elsewhere in the IOU reportAction
     if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED) {
         return false;
@@ -951,7 +951,7 @@ function getMemberChangeMessagePlainText(reportAction: OnyxEntry<ReportAction>):
 }
 
 /**
- * Helper method to determine if the provided accountID has made a request on the specified report.
+ * Helper method to determine if the provided accountID has made an expense on the specified report.
  *
  * @param reportID
  * @param currentAccountID
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 9fa28535a7a7..484b7136bf89 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -734,7 +734,7 @@ function hasParticipantInArray(report: Report, policyMemberAccountIDs: number[])
 }
 
 /**
- * Whether the Money Request report is settled
+ * Whether the Expense report is settled
  */
 function isSettled(reportID: string | undefined): boolean {
     if (!allReports || !reportID) {
@@ -1300,7 +1300,7 @@ function isOneOnOneChat(report: OnyxEntry<Report>): boolean {
 }
 
 /**
- * Checks if the current user is a payer of the request
+ * Checks if the current user is a payer of the expense
  */
 
 function isPayer(session: OnyxEntry<Session>, iouReport: OnyxEntry<Report>) {
@@ -2017,7 +2017,7 @@ function isUnreadWithMention(reportOrOption: OnyxEntry<Report> | OptionData): bo
  * Determines if the option requires action from the current user. This can happen when it:
  *  - is unread and the user was mentioned in one of the unread comments
  *  - is for an outstanding task waiting on the user
- *  - has an outstanding child money request that is waiting for an action from the current user (e.g. pay, approve, add bank account)
+ *  - has an outstanding child expense that is waiting for an action from the current user (e.g. pay, approve, add bank account)
  *
  * @param option (report or optionItem)
  * @param parentReportAction (the report action the current report is a thread of)
@@ -2277,7 +2277,7 @@ function getMoneyRequestReportName(report: OnyxEntry<Report>, policy: OnyxEntry<
 }
 
 /**
- * Gets transaction created, amount, currency, comment, and waypoints (for distance request)
+ * Gets transaction created, amount, currency, comment, and waypoints (for distance expense)
  * into a flat object. Used for displaying transactions and sending them in API commands
  */
 
@@ -2363,11 +2363,11 @@ function canEditMoneyRequest(reportAction: OnyxEntry<ReportAction>): boolean {
 }
 
 /**
- * Checks if the current user can edit the provided property of a money request
+ * Checks if the current user can edit the provided property of an expense
  *
  */
 function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, fieldToEdit: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>): boolean {
-    // A list of fields that cannot be edited by anyone, once a money request has been settled
+    // A list of fields that cannot be edited by anyone, once an expense has been settled
     const restrictedFields: string[] = [
         CONST.EDIT_REQUEST_FIELD.AMOUNT,
         CONST.EDIT_REQUEST_FIELD.CURRENCY,
@@ -2421,7 +2421,7 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, field
  *
  * - It was written by the current user
  * - It's an ADDCOMMENT that is not an attachment
- * - It's money request where conditions for editability are defined in canEditMoneyRequest method
+ * - It's an expense where conditions for editability are defined in canEditMoneyRequest method
  * - It's not pending deletion
  */
 function canEditReportAction(reportAction: OnyxEntry<ReportAction>): boolean {
@@ -2451,7 +2451,7 @@ function getTransactionsWithReceipts(iouReportID: string | undefined): Transacti
  * instead of the report total only when we have no report total ready to show. This is the case when
  * all requests are receipts that are being SmartScanned. As soon as we have a non-receipt request,
  * or as soon as one receipt request is done scanning, we have at least one
- * "ready" money request, and we remove this indicator to show the partial report total.
+ * "ready" expense, and we remove this indicator to show the partial report total.
  */
 function areAllRequestsBeingSmartScanned(iouReportID: string, reportPreviewAction: OnyxEntry<ReportAction>): boolean {
     const transactionsWithReceipts = getTransactionsWithReceipts(iouReportID);
@@ -2504,10 +2504,7 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction | Optimis
     }
 
     if (ReportActionsUtils.isDeletedAction(reportAction)) {
-        if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
-            return Localize.translateLocal('parentReportAction.deletedExpense');
-        }
-        return Localize.translateLocal('parentReportAction.deletedRequest');
+        return Localize.translateLocal('parentReportAction.deletedExpense');
     }
 
     const transaction = getLinkedTransaction(reportAction);
@@ -2524,8 +2521,8 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction | Optimis
     }
 
     if (isEmptyObject(transaction)) {
-        // Transaction data might be empty on app's first load, if so we fallback to Request
-        return Localize.translateLocal('iou.request');
+        // Transaction data might be empty on app's first load, if so we fallback to Expense
+        return Localize.translateLocal('iou.expense');
     }
 
     if (TransactionUtils.isFetchingWaypointsFromServer(transaction)) {
@@ -2542,14 +2539,14 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction | Optimis
 
     const transactionDetails = getTransactionDetails(transaction);
 
-    return Localize.translateLocal(ReportActionsUtils.isSentMoneyReportAction(reportAction) ? 'iou.threadSentMoneyReportName' : 'iou.threadRequestReportName', {
+    return Localize.translateLocal(ReportActionsUtils.isSentMoneyReportAction(reportAction) ? 'iou.threadSentMoneyReportName' : 'iou.threadExpenseReportName', {
         formattedAmount: CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency) ?? '',
         comment: (!TransactionUtils.isMerchantMissing(transaction) ? transactionDetails?.merchant : transactionDetails?.comment) ?? '',
     });
 }
 
 /**
- * Get money request message for an IOU report
+ * Get expense message for an IOU report
  *
  * @param [iouReportAction] This is always an IOU action. When necessary, report preview actions will be unwrapped and the child iou report action is passed here (the original report preview
  *     action will be passed as `originalReportAction` in this case).
@@ -2691,7 +2688,7 @@ function getReportPreviewMessage(
         comment = undefined;
     }
 
-    // if we have the amount in the originalMessage and lastActorID, we can use that to display the preview message for the latest request
+    // if we have the amount in the originalMessage and lastActorID, we can use that to display the preview message for the latest expense
     if (amount !== undefined && lastActorID && !isPreviewMessageForParentChatReport) {
         const amountToDisplay = CurrencyUtils.convertToDisplayString(Math.abs(amount), currency);
 
@@ -2708,7 +2705,7 @@ function getReportPreviewMessage(
 }
 
 /**
- * Given the updates user made to the request, compose the originalMessage
+ * Given the updates user made to the expense, compose the originalMessage
  * object of the modified expense action.
  *
  * At the moment, we only allow changing one transaction field at a time.
@@ -3310,7 +3307,7 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
             iouMessage = `submitted ${amount}`;
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
-            iouMessage = `requested ${amount}${comment && ` for ${comment}`}`;
+            iouMessage = `requested ${amount}${comment && ` for ${comment}`}`; // TODO: Recheck this
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.TRACK:
             iouMessage = `tracking ${amount}${comment && ` for ${comment}`}`;
@@ -3319,7 +3316,7 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
             iouMessage = `split ${amount}${comment && ` for ${comment}`}`;
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.DELETE:
-            iouMessage = `deleted the ${amount} request${comment && ` for ${comment}`}`;
+            iouMessage = `deleted the ${amount} expense${comment && ` for ${comment}`}`;
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.PAY:
             iouMessage = isSettlingUp ? `paid ${amount}${paymentMethodMessage}` : `sent ${amount}${comment && ` for ${comment}`}${paymentMethodMessage}`;
@@ -3390,7 +3387,7 @@ function buildOptimisticIOUReportAction(
             originalMessage.IOUDetails = {amount, comment, currency};
             originalMessage.paymentType = paymentType;
         } else {
-            // In case of pay money request action, we dont store the comment
+            // In case of pay someone action, we dont store the comment
             // and there is no single transctionID to link the action to.
             delete originalMessage.IOUTransactionID;
             delete originalMessage.comment;
@@ -3858,7 +3855,7 @@ function buildOptimisticHoldReportAction(created = DateUtils.getDBTime()): Optim
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
                 style: 'normal',
-                text: Localize.translateLocal('iou.heldRequest'),
+                text: Localize.translateLocal('iou.heldExpense'),
             },
         ],
         person: [
@@ -3920,7 +3917,7 @@ function buildOptimisticUnHoldReportAction(created = DateUtils.getDBTime()): Opt
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
                 style: 'normal',
-                text: Localize.translateLocal('iou.unheldRequest'),
+                text: Localize.translateLocal('iou.unheldExpense'),
             },
         ],
         person: [
@@ -4177,7 +4174,7 @@ function buildTransactionThread(reportAction: OnyxEntry<ReportAction | Optimisti
 }
 
 /**
- * Build optimistic money request entities:
+ * Build optimistic expense entities:
  *
  * 1. CREATED action for the chatReport
  * 2. CREATED action for the iouReport
@@ -4321,7 +4318,7 @@ function shouldHideReport(report: OnyxEntry<Report>, currentReportId: string): b
 }
 
 /**
- * Checks to see if a report's parentAction is a money request that contains a violation
+ * Checks to see if a report's parentAction is an expense that contains a violation
  */
 function doesTransactionThreadHaveViolations(report: OnyxEntry<Report>, transactionViolations: OnyxCollection<TransactionViolation[]>, parentReportAction: OnyxEntry<ReportAction>): boolean {
     if (parentReportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
@@ -4341,7 +4338,7 @@ function doesTransactionThreadHaveViolations(report: OnyxEntry<Report>, transact
 }
 
 /**
- * Checks if we should display violation - we display violations when the money request has violation and it is not settled
+ * Checks if we should display violation - we display violations when the expense has violation and it is not settled
  */
 function shouldDisplayTransactionThreadViolations(
     report: OnyxEntry<Report>,
@@ -4486,7 +4483,7 @@ function shouldReportBeInOptionList({
 }
 
 /**
- * Attempts to find a report in onyx with the provided list of participants. Does not include threads, task, money request, room, and policy expense chat.
+ * Attempts to find a report in onyx with the provided list of participants. Does not include threads, task, expense, room, and policy expense chat.
  */
 function getChatByParticipants(newParticipantList: number[], reports: OnyxCollection<Report> = allReports): OnyxEntry<Report> {
     const sortedNewParticipantList = newParticipantList.sort();
@@ -4707,20 +4704,20 @@ function hasIOUWaitingOnCurrentUserBankAccount(chatReport: OnyxEntry<Report>): b
 }
 
 /**
- * Users can request money:
+ * Users can submit expense:
  * - in policy expense chats only if they are in a role of a member in the chat (in other words, if it's their policy expense chat)
  * - in an open or submitted expense report tied to a policy expense chat the user owns
- *     - employee can request money in submitted expense report only if the policy has Instant Submit settings turned on
+ *     - employee can submit expense in submitted expense report only if the policy has Instant Submit settings turned on
  * - in an IOU report, which is not settled yet
  * - in a 1:1 DM chat
  */
 function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, otherParticipants: number[]): boolean {
-    // User cannot request money in chat thread or in task report or in chat room
+    // User cannot submit expense in chat thread or in task report or in chat room
     if (isChatThread(report) || isTaskReport(report) || isChatRoom(report) || isSelfDM(report) || isGroupChat(report)) {
         return false;
     }
 
-    // Users can only request money in DMs if they are a 1:1 DM
+    // Users can only submit expense in DMs if they are a 1:1 DM
     if (isDM(report)) {
         return otherParticipants.length === 1;
     }
@@ -4735,31 +4732,31 @@ function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, o
         isOwnPolicyExpenseChat = Boolean(getParentReport(report)?.isOwnPolicyExpenseChat);
     }
 
-    // In case there are no other participants than the current user and it's not user's own policy expense chat, they can't request money from such report
+    // In case there are no other participants than the current user and it's not user's own policy expense chat, they can't submit expense from such report
     if (otherParticipants.length === 0 && !isOwnPolicyExpenseChat) {
         return false;
     }
 
-    // User can request money in any IOU report, unless paid, but user can only request money in an expense report
+    // User can submit expense in any IOU report, unless paid, but user can only submit expense in an expense report
     // which is tied to their workspace chat.
     if (isMoneyRequestReport(report)) {
         const canAddTransactions = canAddOrDeleteTransactions(report);
         return isGroupPolicy(report) ? isOwnPolicyExpenseChat && canAddTransactions : canAddTransactions;
     }
 
-    // In case of policy expense chat, users can only request money from their own policy expense chat
+    // In case of policy expense chat, users can only submit expense from their own policy expense chat
     return !isPolicyExpenseChat(report) || isOwnPolicyExpenseChat;
 }
 
 /**
- * Helper method to define what money request options we want to show for particular method.
- * There are 4 money request options: Request, Split, Send and Track expense:
- * - Request option should show for:
+ * Helper method to define what expense options we want to show for particular method.
+ * There are 4 expense options: Submit, Split, Pay and Track expense:
+ * - Submit option should show for:
  *     - DMs
  *     - own policy expense chats
  *     - open and processing expense reports tied to own policy expense chat
  *     - unsettled IOU reports
- * - Send option should show for:
+ * - Pay option should show for:
  *     - DMs
  * - Split options should show for:
  *     - chat/ policy rooms with more than 1 participants
@@ -4773,7 +4770,7 @@ function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, o
  * as a participant of the report.
  */
 function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportParticipants: number[], canUseTrackExpense = true): Array<ValueOf<typeof CONST.IOU.TYPE>> {
-    // In any thread or task report, we do not allow any new money requests yet
+    // In any thread or task report, we do not allow any new expenses yet
     if (isChatThread(report) || isTaskReport(report) || (!canUseTrackExpense && isSelfDM(report))) {
         return [];
     }
@@ -4794,10 +4791,10 @@ function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Pol
         options = [CONST.IOU.TYPE.TRACK_EXPENSE];
     }
 
-    // User created policy rooms and default rooms like #admins or #announce will always have the Split Bill option
+    // User created policy rooms and default rooms like #admins or #announce will always have the Split Expense option
     // unless there are no other participants at all (e.g. #admins room for a policy with only 1 admin)
-    // DM chats will have the Split Bill option only when there are at least 2 other people in the chat.
-    // Your own workspace chats will have the split bill option.
+    // DM chats will have the Split Expense option only when there are at least 2 other people in the chat.
+    // Your own workspace chats will have the split expense option.
     if (
         (isChatRoom(report) && otherParticipants.length > 0) ||
         (isDM(report) && hasMultipleOtherParticipants) ||
@@ -4933,7 +4930,7 @@ function getAddWorkspaceRoomOrChatReportErrors(report: OnyxEntry<Report>): Error
 }
 
 /**
- * Return true if the Money Request report is marked for deletion.
+ * Return true if the Submit expense report is marked for deletion.
  */
 function isMoneyRequestReportPendingDeletion(report: OnyxEntry<Report> | EmptyObject): boolean {
     if (!isMoneyRequestReport(report)) {
@@ -4947,7 +4944,7 @@ function isMoneyRequestReportPendingDeletion(report: OnyxEntry<Report> | EmptyOb
 function canUserPerformWriteAction(report: OnyxEntry<Report>) {
     const reportErrors = getAddWorkspaceRoomOrChatReportErrors(report);
 
-    // If the Money Request report is marked for deletion, let us prevent any further write action.
+    // If the Submit Expense report is marked for deletion, let us prevent any further write action.
     if (isMoneyRequestReportPendingDeletion(report)) {
         return false;
     }
@@ -4970,7 +4967,7 @@ function getOriginalReportID(reportID: string, reportAction: OnyxEntry<ReportAct
  *
  * - creating a workspace room
  * - starting a chat
- * - paying the money request
+ * - paying expense
  *
  * while being offline
  */
@@ -4983,7 +4980,7 @@ function getReportOfflinePendingActionAndErrors(report: OnyxEntry<Report>): Repo
 }
 
 /**
- * Check if the report can create the request with type is iouType
+ * Check if the report can create the expense with type is iouType
  */
 function canCreateRequest(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, iouType: (typeof CONST.IOU.TYPE)[keyof typeof CONST.IOU.TYPE]): boolean {
     const participantAccountIDs = report?.participantAccountIDs ?? [];
@@ -5258,7 +5255,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>)
  * A report is a group chat if it meets the following conditions:
  * - Not a chat thread.
  * - Not a task report.
- * - Not a money request / IOU report.
+ * - Not a expense / IOU report.
  * - Not an archived room.
  * - Not a public / admin / announce chat room (chat type doesn't match any of the specified types).
  * - More than 2 participants.
@@ -5641,7 +5638,7 @@ function hasMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, iouReportID:
 }
 
 /**
- * Used from money request actions to decide if we need to build an optimistic money request report.
+ * Used from submit expense actions to decide if we need to build an optimistic submit expense report.
    Create a new report if:
    - we don't have an iouReport set in the chatReport
    - we have one, but it's waiting on the payee adding a bank account
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 907edc208570..224026e17d63 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -33,7 +33,7 @@ Onyx.connect({
 });
 
 function isDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
-    // This is used during the request creation flow before the transaction has been saved to the server
+    // This is used during the expense creation flow before the transaction has been saved to the server
     if (lodashHas(transaction, 'iouRequestType')) {
         return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
     }
@@ -45,7 +45,7 @@ function isDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
 }
 
 function isScanRequest(transaction: Transaction): boolean {
-    // This is used during the request creation flow before the transaction has been saved to the server
+    // This is used during the expense creation flow before the transaction has been saved to the server
     if (lodashHas(transaction, 'iouRequestType')) {
         return transaction.iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN;
     }
@@ -64,7 +64,7 @@ function getRequestType(transaction: Transaction): ValueOf<typeof CONST.IOU.REQU
 }
 
 function isManualRequest(transaction: Transaction): boolean {
-    // This is used during the request creation flow before the transaction has been saved to the server
+    // This is used during the expense creation flow before the transaction has been saved to the server
     if (lodashHas(transaction, 'iouRequestType')) {
         return transaction.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL;
     }
@@ -76,7 +76,7 @@ function isManualRequest(transaction: Transaction): boolean {
  * Optimistically generate a transaction.
  *
  * @param amount – in cents
- * @param [existingTransactionID] When creating a distance request, an empty transaction has already been created with a transactionID. In that case, the transaction here needs to have
+ * @param [existingTransactionID] When creating a distance expense, an empty transaction has already been created with a transactionID. In that case, the transaction here needs to have
  * it's transactionID match what was already generated.
  */
 function buildOptimisticTransaction(
@@ -170,7 +170,7 @@ function areRequiredFieldsEmpty(transaction: OnyxEntry<Transaction>): boolean {
 }
 
 /**
- * Given the edit made to the money request, return an updated transaction object.
+ * Given the edit made to the expnse, return an updated transaction object.
  */
 function getUpdatedTransaction(transaction: Transaction, transactionChanges: TransactionChanges, isFromExpenseReport: boolean, shouldUpdateReceiptState = true): Transaction {
     // Only changing the first level fields so no need for deep clone now
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 8582e9e3f3de..93b0720da1dd 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -254,7 +254,7 @@ Onyx.connect({
 });
 
 /**
- * Initialize money request info
+ * Initialize expense info
  * @param reportID to attach the transaction to
  * @param policy
  * @param isFromGlobalCreate
@@ -268,7 +268,7 @@ function initMoneyRequest(reportID: string, policy: OnyxEntry<OnyxTypes.Policy>,
     const created = currentDate || format(new Date(), 'yyyy-MM-dd');
     const comment: Comment = {};
 
-    // Add initial empty waypoints when starting a distance request
+    // Add initial empty waypoints when starting a distance expense
     if (iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE) {
         comment.waypoints = {
             waypoint0: {},
@@ -302,7 +302,7 @@ function clearMoneyRequest(transactionID: string) {
 }
 
 /**
- * Update money request-related pages IOU type params
+ * Update money expense-related pages IOU type params
  */
 function updateMoneyRequestTypeParams(routes: StackNavigationState<ParamListBase>['routes'] | NavigationPartialRoute[], newIouType: string, tab: string) {
     routes.forEach((route) => {
@@ -318,7 +318,7 @@ function updateMoneyRequestTypeParams(routes: StackNavigationState<ParamListBase
         }
         Navigation.setParams(newParams, route.key ?? '');
 
-        // Recursively update nested money request tab params
+        // Recursively update nested expense tab params
         updateMoneyRequestTypeParams(route.state?.routes ?? [], newIouType, tab);
     });
 }
@@ -406,7 +406,7 @@ function setMoneyRequestReceipt(transactionID: string, source: string, filename:
     });
 }
 
-/** Reset money request info from the store with its initial value */
+/** Reset expense info from the store with its initial value */
 function resetMoneyRequestInfo(id = '') {
     // Disabling this line since currentDate can be an empty string
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -471,7 +471,7 @@ function getOutstandingChildRequest(policy: OnyxEntry<OnyxTypes.Policy> | EmptyO
     };
 }
 
-/** Builds the Onyx data for a money request */
+/** Builds the Onyx data for an expense */
 function buildOnyxDataForMoneyRequest(
     chatReport: OnyxEntry<OnyxTypes.Report>,
     iouReport: OnyxTypes.Report,
@@ -996,7 +996,7 @@ function buildOnyxDataForTrackExpense(
 }
 
 /**
- * Gathers all the data needed to make a money request. It attempts to find existing reports, iouReports, and receipts. If it doesn't find them, then
+ * Gathers all the data needed to make an expense. It attempts to find existing reports, iouReports, and receipts. If it doesn't find them, then
  * it creates optimistic versions of them and uses those instead
  */
 function getMoneyRequestInformation(
@@ -1043,8 +1043,8 @@ function getMoneyRequestInformation(
         chatReport = ReportUtils.buildOptimisticChatReport([payerAccountID]);
     }
 
-    // STEP 2: Get the money request report. If the moneyRequestReportID has been provided, we want to add the transaction to this specific report.
-    // If no such reportID has been provided, let's use the chatReport.iouReportID property. In case that is not present, build a new optimistic money request report.
+    // STEP 2: Get the Expense/IOU report. If the moneyRequestReportID has been provided, we want to add the transaction to this specific report.
+    // If no such reportID has been provided, let's use the chatReport.iouReportID property. In case that is not present, build a new optimistic Expense/IOU report.
     let iouReport: OnyxEntry<OnyxTypes.Report> = null;
     if (moneyRequestReportID) {
         iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID}`] ?? null;
@@ -1238,7 +1238,7 @@ function getTrackExpenseInformation(
         return {};
     }
 
-    // STEP 2: Get the money request report.
+    // STEP 2: Get the Expense report.
     // TODO: This is deferred to later as we are not sure if we create iouReport at all in future.
     // We can build an optimistic iouReport here if needed.
 
@@ -1910,7 +1910,7 @@ function getUpdateTrackExpenseParams(
     };
 }
 
-/** Updates the created date of a money request */
+/** Updates the created date of an expense */
 function updateMoneyRequestDate(
     transactionID: string,
     transactionThreadReportID: string,
@@ -1933,7 +1933,7 @@ function updateMoneyRequestDate(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DATE, params, onyxData);
 }
 
-/** Updates the billable field of a money request */
+/** Updates the billable field of an expense */
 function updateMoneyRequestBillable(
     transactionID: string,
     transactionThreadReportID: string,
@@ -1949,7 +1949,7 @@ function updateMoneyRequestBillable(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_BILLABLE, params, onyxData);
 }
 
-/** Updates the merchant field of a money request */
+/** Updates the merchant field of an expense */
 function updateMoneyRequestMerchant(
     transactionID: string,
     transactionThreadReportID: string,
@@ -1972,7 +1972,7 @@ function updateMoneyRequestMerchant(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_MERCHANT, params, onyxData);
 }
 
-/** Updates the tag of a money request */
+/** Updates the tag of an expense */
 function updateMoneyRequestTag(
     transactionID: string,
     transactionThreadReportID: string,
@@ -1988,7 +1988,7 @@ function updateMoneyRequestTag(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_TAG, params, onyxData);
 }
 
-/** Updates the waypoints of a distance money request */
+/** Updates the waypoints of a distance expense */
 function updateMoneyRequestDistance(
     transactionID: string,
     transactionThreadReportID: string,
@@ -2011,7 +2011,7 @@ function updateMoneyRequestDistance(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DISTANCE, params, onyxData);
 }
 
-/** Updates the category of a money request */
+/** Updates the category of an expense */
 function updateMoneyRequestCategory(
     transactionID: string,
     transactionThreadReportID: string,
@@ -2027,7 +2027,7 @@ function updateMoneyRequestCategory(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_CATEGORY, params, onyxData);
 }
 
-/** Updates the description of a money request */
+/** Updates the description of an expense */
 function updateMoneyRequestDescription(
     transactionID: string,
     transactionThreadReportID: string,
@@ -2050,7 +2050,7 @@ function updateMoneyRequestDescription(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DESCRIPTION, params, onyxData);
 }
 
-/** Edits an existing distance request */
+/** Edits an existing distance expense */
 function updateDistanceRequest(
     transactionID: string,
     transactionThreadReportID: string,
@@ -2064,7 +2064,7 @@ function updateDistanceRequest(
 }
 
 /**
- * Request money from another user
+ * Submit expense to another user
  */
 function requestMoney(
     report: OnyxTypes.Report,
@@ -2315,7 +2315,7 @@ function createSplitsAndOnyxData(
         created,
         '',
         '',
-        merchant || Localize.translateLocal('iou.request'),
+        merchant || Localize.translateLocal('iou.expense'),
         undefined,
         undefined,
         undefined,
@@ -2529,7 +2529,7 @@ function createSplitsAndOnyxData(
             created,
             CONST.IOU.TYPE.SPLIT,
             splitTransaction.transactionID,
-            merchant || Localize.translateLocal('iou.request'),
+            merchant || Localize.translateLocal('iou.expense'),
             undefined,
             undefined,
             undefined,
@@ -2767,7 +2767,7 @@ function splitBillAndOpenReport(
     Report.notifyNewAction(splitData.chatReportID, currentUserAccountID);
 }
 
-/** Used exclusively for starting a split bill request that contains a receipt, the split request will be completed once the receipt is scanned
+/** Used exclusively for starting a split expense request that contains a receipt, the split request will be completed once the receipt is scanned
  *  or user enters details manually.
  *
  * @param existingSplitChatReportID - Either a group DM or a workspace chat
@@ -3573,7 +3573,7 @@ function editMoneyRequest(
     }
 }
 
-/** Updates the amount and currency fields of a money request */
+/** Updates the amount and currency fields of an expense */
 function updateMoneyRequestAmountAndCurrency(
     transactionID: string,
     transactionThreadReportID: string,
@@ -3607,7 +3607,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
 
     // STEP 2: Decide if we need to:
     // 1. Delete the transactionThread - delete if there are no visible comments in the thread
-    // 2. Update the moneyRequestPreview to show [Deleted request] - update if the transactionThread exists AND it isn't being deleted
+    // 2. Update the moneyRequestPreview to show [Deleted expense] - update if the transactionThread exists AND it isn't being deleted
     const shouldDeleteTransactionThread = transactionThreadID ? (reportAction?.childVisibleActionCount ?? 0) === 0 : false;
     const shouldShowDeletedRequestMessage = !!transactionThreadID && !shouldDeleteTransactionThread;
 
@@ -3906,7 +3906,7 @@ function deleteTrackExpense(chatReportID: string, transactionID: string, reportA
 
     // STEP 2: Decide if we need to:
     // 1. Delete the transactionThread - delete if there are no visible comments in the thread
-    // 2. Update the moneyRequestPreview to show [Deleted request] - update if the transactionThread exists AND it isn't being deleted
+    // 2. Update the moneyRequestPreview to show [Deleted expense] - update if the transactionThread exists AND it isn't being deleted
     const shouldDeleteTransactionThread = transactionThreadID ? (reportAction?.childVisibleActionCount ?? 0) === 0 : false;
     const shouldShowDeletedRequestMessage = !!transactionThreadID && !shouldDeleteTransactionThread;
 
@@ -5006,7 +5006,7 @@ function replaceReceipt(transactionID: string, file: File, source: string) {
  * @param report attached to the transaction
  */
 function setMoneyRequestParticipantsFromReport(transactionID: string, report: OnyxTypes.Report) {
-    // If the report is iou or expense report, we should get the chat report to set participant for request money
+    // If the report is iou or expense report, we should get the chat report to set participant for expense
     const chatReport = ReportUtils.isMoneyRequestReport(report) ? ReportUtils.getReport(report.chatReportID) : report;
     const currentUserAccountID = currentUserPersonalDetails.accountID;
     const shouldAddAsReport = !isEmptyObject(chatReport) && ReportUtils.isSelfDM(chatReport);
@@ -5055,8 +5055,8 @@ function navigateToNextPage(iou: OnyxEntry<OnyxTypes.IOU>, iouType: string, repo
     const moneyRequestID = `${iouType}${report?.reportID ?? ''}`;
     const shouldReset = iou?.id !== moneyRequestID && !!report?.reportID;
 
-    // If the money request ID in Onyx does not match the ID from params, we want to start a new request
-    // with the ID from params. We need to clear the participants in case the new request is initiated from FAB.
+    // If the expense ID in Onyx does not match the ID from params, we want to start a new expense
+    // with the ID from params. We need to clear the participants in case the new expense is initiated from FAB.
     if (shouldReset) {
         resetMoneyRequestInfo(moneyRequestID);
     }
@@ -5069,9 +5069,9 @@ function navigateToNextPage(iou: OnyxEntry<OnyxTypes.IOU>, iouType: string, repo
 
     // If a request is initiated on a report, skip the participants selection step and navigate to the confirmation page.
     if (report?.reportID) {
-        // If the report is iou or expense report, we should get the chat report to set participant for request money
+        // If the report is iou or expense report, we should get the chat report to set participant for submit expense
         const chatReport = ReportUtils.isMoneyRequestReport(report) ? ReportUtils.getReport(report.chatReportID) : report;
-        // Reinitialize the participants when the money request ID in Onyx does not match the ID from params
+        // Reinitialize the participants when the expense ID in Onyx does not match the ID from params
         if (!iou?.participants?.length || shouldReset) {
             const currentUserAccountID = currentUserPersonalDetails.accountID;
             const participants: Participant[] = ReportUtils.isPolicyExpenseChat(chatReport)
@@ -5086,7 +5086,7 @@ function navigateToNextPage(iou: OnyxEntry<OnyxTypes.IOU>, iouType: string, repo
 }
 
 /**
- *  When the money request or split bill creation flow is initialized via FAB, the reportID is not passed as a navigation
+ *  When the submit or split expense creation flow is initialized via FAB, the reportID is not passed as a navigation
  * parameter.
  * Gets a report id from the first participant of the IOU object stored in Onyx.
  */
@@ -5097,7 +5097,7 @@ function getIOUReportID(iou?: OnyxTypes.IOU, route?: MoneyRequestRoute): string
 }
 
 /**
- * Put money request on HOLD
+ * Put expense on HOLD
  */
 function putOnHold(transactionID: string, comment: string, reportID: string) {
     const createdReportAction = ReportUtils.buildOptimisticHoldReportAction();
@@ -5160,7 +5160,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string) {
 }
 
 /**
- * Remove money request from HOLD
+ * Remove expense from HOLD
  */
 function unholdRequest(transactionID: string, reportID: string) {
     const createdReportAction = ReportUtils.buildOptimisticUnHoldReportAction();
diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index 123614f2e0bb..6d2fbec54132 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -67,7 +67,7 @@ function saveWaypoint(transactionID: string, index: string, waypoint: RecentWayp
                 [`waypoint${index}`]: waypoint,
             },
         },
-        // We want to reset the amount only for draft transactions (when creating the request).
+        // We want to reset the amount only for draft transactions (when creating the expense).
         // When modifying an existing transaction, the amount will be updated on the actual IOU update operation.
         ...(isDraft && {amount: CONST.IOU.DEFAULT_AMOUNT}),
         // Empty out errors when we're saving a new waypoint as this indicates the user is updating their input
@@ -141,7 +141,7 @@ function removeWaypoint(transaction: OnyxEntry<Transaction>, currentIndex: strin
             ...transaction?.comment,
             waypoints: reIndexedWaypoints,
         },
-        // We want to reset the amount only for draft transactions (when creating the request).
+        // We want to reset the amount only for draft transactions (when creating the expense).
         // When modifying an existing transaction, the amount will be updated on the actual IOU update operation.
         ...(isDraft && {amount: CONST.IOU.DEFAULT_AMOUNT}),
     };
@@ -239,7 +239,7 @@ function updateWaypoints(transactionID: string, waypoints: WaypointCollection, i
         comment: {
             waypoints,
         },
-        // We want to reset the amount only for draft transactions (when creating the request).
+        // We want to reset the amount only for draft transactions (when creating the expense).
         // When modifying an existing transaction, the amount will be updated on the actual IOU update operation.
         ...(isDraft && {amount: CONST.IOU.DEFAULT_AMOUNT}),
         // Empty out errors when we're saving new waypoints as this indicates the user is updating their input
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 2d23edfba93f..5ebaa6b9f630 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -524,7 +524,7 @@ function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
             const types = flatten.map((data) => data?.originalMessage).filter(Boolean) as OriginalMessage[];
 
             for (const message of types) {
-                // someone sent money
+                // someone paid money
                 if ('IOUDetails' in message) {
                     return playSound(SOUNDS.SUCCESS);
                 }
@@ -544,12 +544,12 @@ function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
                     return playSound(SOUNDS.ATTENTION);
                 }
 
-                // request money
+                // submit expense
                 if ('IOUTransactionID' in message) {
                     return playSound(SOUNDS.ATTENTION);
                 }
 
-                // Someone completes a money request
+                // Someone completes an expense
                 if ('IOUReportID' in message) {
                     return playSound(SOUNDS.SUCCESS);
                 }
diff --git a/src/libs/migrations/TransactionBackupsToCollection.ts b/src/libs/migrations/TransactionBackupsToCollection.ts
index 407bc70e1f38..a7167492007a 100644
--- a/src/libs/migrations/TransactionBackupsToCollection.ts
+++ b/src/libs/migrations/TransactionBackupsToCollection.ts
@@ -8,7 +8,7 @@ import type {Transaction} from '@src/types/onyx';
  * This migration moves all the transaction backups stored in the transaction collection, ONYXKEYS.COLLECTION.TRANSACTION, to a reserved collection that only
  * stores draft transactions, ONYXKEYS.COLLECTION.TRANSACTION_DRAFT. The purpose of the migration is that there is a possibility that transaction backups are
  * not filtered by most functions, e.g, getAllReportTransactions (src/libs/TransactionUtils.ts). One problem that arose from storing transaction backups with
- * the other transactions is that for every distance request which have their waypoints updated offline, we expect the ReportPreview component to display the
+ * the other transactions is that for every distance expense which have their waypoints updated offline, we expect the ReportPreview component to display the
  * default image of a pending map. However, due to the presence of the transaction backup, the previous map image will be displayed alongside the pending map.
  * The problem was further discussed in this PR. https://github.com/Expensify/App/pull/30232#issuecomment-178110172
  */
diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
index 3c7520b850b4..65fbd4185cef 100644
--- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
+++ b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
@@ -32,7 +32,7 @@ const messageCopy = {
         '\n' +
         'Next, start adding expenses to your workspace:\n' +
         '\n' +
-        '1. Click the green *+* > *Request money*.\n' +
+        '1. Click the green *+* > *Submit expense*.\n' +
         '2. Add an expense or scan a receipt.\n' +
         '3. Choose your workspace as the destination.\n' +
         '\n' +
@@ -40,7 +40,7 @@ const messageCopy = {
     [CONST.INTRO_CHOICES.SUBMIT]:
         "Here's how to submit expenses for reimbursement:\n" +
         '\n' +
-        '1. Click the green *+* > *Request money*.\n' +
+        '1. Click the green *+* > *Submit expense*.\n' +
         '2. Add an expense or scan a receipt.\n' +
         "3. Enter your reimburser's email or phone number.\n" +
         '\n' +
@@ -49,15 +49,15 @@ const messageCopy = {
     [CONST.INTRO_CHOICES.CHAT_SPLIT]:
         "Here's how to split expenses with friends:\n" +
         '\n' +
-        '1. Tap the green *+* > *Request money*.\n' +
+        '1. Tap the green *+* > *Split expense*.\n' +
         '2. Add an expense or scan a receipt.\n' +
         "3. Enter your friend's email or phone number.\n" +
-        '4. Tap *Split* next to their contact info.\n' +
+        '4. Select the option.\n' +
         '5. Repeat for any additional friends.\n' +
         "6. Tap *Add to split* when you're done.\n" +
-        '7. Review and tap *Split* to send your request(s).\n' +
+        '7. Review and tap *Split* to split your expense(s).\n' +
         '\n' +
-        "We'll send a money request to each of your friends and make sure you get paid back. Let me know how it goes!",
+        "We'll send an expense to each of your friends and make sure you get paid back. Let me know how it goes!",
 };
 
 const menuIcons = {
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 8aa2b855176c..47b1f511a5e9 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -65,7 +65,7 @@ type HeaderViewProps = HeaderViewOnyxProps & {
     /** The report action the transaction is tied to from the parent report */
     parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
-    /** The reportID of the request */
+    /** The reportID of the current report */
     reportID: string;
 };
 
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index f1f8eb8047c7..679cd926f07c 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -467,7 +467,7 @@ function ReportScreen({
                 Navigation.goBack(undefined, false, true);
             }
             if (prevReport.parentReportID) {
-                // Prevent navigation to the Money Request Report if it is pending deletion.
+                // Prevent navigation to the IOU/Expense Report if it is pending deletion.
                 const parentReport = ReportUtils.getReport(prevReport.parentReportID);
                 if (ReportUtils.isMoneyRequestReportPendingDeletion(parentReport)) {
                     return;
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index ea65ab40ac0a..9cbbf9795518 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -379,9 +379,9 @@ const ContextMenuActions: ContextMenuAction[] = [
                     const mentionWhisperMessage = ReportActionsUtils.getActionableMentionWhisperMessage(reportAction);
                     setClipboardMessage(mentionWhisperMessage);
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
-                    Clipboard.setString(Localize.translateLocal('iou.heldRequest'));
+                    Clipboard.setString(Localize.translateLocal('iou.heldExpense'));
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
-                    Clipboard.setString(Localize.translateLocal('iou.unheldRequest'));
+                    Clipboard.setString(Localize.translateLocal('iou.unheldExpense'));
                 } else if (content) {
                     setClipboardMessage(content);
                 } else if (messageText) {
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index 11a84c17f9ee..bf09f39d3f87 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -125,17 +125,17 @@ function AttachmentPickerWithMenuItems({
         const options: MoneyRequestOptions = {
             [CONST.IOU.TYPE.SPLIT]: {
                 icon: Expensicons.Receipt,
-                text: translate('iou.splitBill'),
+                text: translate('iou.splitExpense'),
                 onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, report?.reportID ?? ''),
             },
             [CONST.IOU.TYPE.REQUEST]: {
                 icon: Expensicons.MoneyCircle,
-                text: translate('iou.requestMoney'),
+                text: translate('iou.submitExpense'),
                 onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.REQUEST, report?.reportID ?? ''),
             },
             [CONST.IOU.TYPE.SEND]: {
                 icon: Expensicons.Send,
-                text: translate('iou.sendMoney'),
+                text: translate('iou.payName', {name: report?.reportName ?? ''}),
                 onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.SEND, report?.reportID ?? ''),
             },
             [CONST.IOU.TYPE.TRACK_EXPENSE]: {
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 2716fedcf59a..a3e5eff39dc5 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -419,7 +419,7 @@ function ReportActionItem({
     const renderItemContent = (hovered = false, isWhisper = false, hasErrors = false): React.JSX.Element => {
         let children;
 
-        // Show the MoneyRequestPreview for when request was created, bill was split or money was sent
+        // Show the MoneyRequestPreview for when expense is present
         if (
             isIOUReport(action) &&
             action.originalMessage &&
@@ -433,7 +433,7 @@ function ReportActionItem({
             const iouReportID = action.originalMessage.IOUReportID ? action.originalMessage.IOUReportID.toString() : '0';
             children = (
                 <MoneyRequestAction
-                    // If originalMessage.iouReportID is set, this is a 1:1 money request in a DM chat whose reportID is report.chatReportID
+                    // If originalMessage.iouReportID is set, this is a 1:1 IOU expense in a DM chat whose reportID is report.chatReportID
                     chatReportID={action.originalMessage.IOUReportID ? report.chatReportID ?? '' : report.reportID}
                     requestReportID={iouReportID}
                     reportID={report.reportID}
@@ -530,11 +530,11 @@ function ReportActionItem({
             // This handles all historical actions from OldDot that we just want to display the message text
             children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMessageOfOldDotReportAction(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
-            children = <ReportActionItemBasicMessage message={translate('iou.heldRequest')} />;
+            children = <ReportActionItemBasicMessage message={translate('iou.heldExpense')} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLDCOMMENT) {
             children = <ReportActionItemBasicMessage message={action.message?.[0].text ?? ''} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
-            children = <ReportActionItemBasicMessage message={translate('iou.unheldRequest')} />;
+            children = <ReportActionItemBasicMessage message={translate('iou.unheldExpense')} />;
         } else {
             const hasBeenFlagged =
                 ![CONST.MODERATION.MODERATOR_DECISION_APPROVED, CONST.MODERATION.MODERATOR_DECISION_PENDING].some((item) => item === moderationDecision) &&
@@ -685,10 +685,8 @@ function ReportActionItem({
                 let message: TranslationPaths;
                 if (isReversedTransaction) {
                     message = 'parentReportAction.reversedTransaction';
-                } else if (ReportActionsUtils.isTrackExpenseAction(parentReportAction)) {
-                    message = 'parentReportAction.deletedExpense';
                 } else {
-                    message = 'parentReportAction.deletedRequest';
+                    message = 'parentReportAction.deletedExpense';
                 }
                 return (
                     <View>
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
index 1b6a9614a466..ed05b6849ff5 100755
--- a/src/pages/home/report/ReportActionsView.tsx
+++ b/src/pages/home/report/ReportActionsView.tsx
@@ -476,11 +476,11 @@ function ReportActionsView({
         };
     }, [isTheFirstReportActionIsLinked]);
 
-    // When we are offline before opening a money request report,
-    // the total of the report and sometimes the money request aren't displayed because these actions aren't returned until `OpenReport` API is complete.
+    // When we are offline before opening an IOU/Expense report,
+    // the total of the report and sometimes the expense aren't displayed because these actions aren't returned until `OpenReport` API is complete.
     // We generate a fake created action here if it doesn't exist to display the total whenever possible because the total just depends on report data
-    // and we also generate a money request action if the number of money requests in reportActions is less than the total number of money requests
-    // to display at least one money request action to match the total data.
+    // and we also generate an expense action if the number of expenses in reportActions is less than the total number of money requests
+    // to display at least one expense action to match the total data.
     const reportActionsToDisplay = useMemo(() => {
         if (!ReportUtils.isMoneyRequestReport(report) || !reportActions.length) {
             return reportActions;
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index be8a43b1a483..e41983e68dff 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -282,12 +282,12 @@ function FloatingActionButtonAndPopover(props) {
                     },
                     {
                         icon: Expensicons.MoneyCircle,
-                        text: translate('iou.requestMoney'),
+                        text: translate('iou.submitExpense'),
                         onSelected: () =>
                             interceptAnonymousUser(() =>
                                 IOU.startMoneyRequest(
                                     CONST.IOU.TYPE.REQUEST,
-                                    // When starting to create a money request from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
+                                    // When starting to create an expense from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
                                     // for all of the routes in the creation flow.
                                     ReportUtils.generateReportID(),
                                 ),
@@ -295,12 +295,12 @@ function FloatingActionButtonAndPopover(props) {
                     },
                     {
                         icon: Expensicons.Send,
-                        text: translate('iou.sendMoney'),
+                        text: translate('iou.paySomeone'),
                         onSelected: () =>
                             interceptAnonymousUser(() =>
                                 IOU.startMoneyRequest(
                                     CONST.IOU.TYPE.SEND,
-                                    // When starting to create a send money request from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
+                                    // When starting to pay someone from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
                                     // for all of the routes in the creation flow.
                                     ReportUtils.generateReportID(),
                                 ),
diff --git a/src/pages/iou/HoldReasonPage.tsx b/src/pages/iou/HoldReasonPage.tsx
index 2a5cba810759..8f016ec0d8d9 100644
--- a/src/pages/iou/HoldReasonPage.tsx
+++ b/src/pages/iou/HoldReasonPage.tsx
@@ -91,12 +91,12 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
             testID={HoldReasonPage.displayName}
         >
             <HeaderWithBackButton
-                title={translate('iou.holdRequest')}
+                title={translate('iou.holdExpense')}
                 onBackButtonPress={navigateBack}
             />
             <FormProvider
                 formID="moneyHoldReasonForm"
-                submitButtonText={translate('iou.holdRequest')}
+                submitButtonText={translate('iou.holdExpense')}
                 style={[styles.flexGrow1, styles.ph5]}
                 onSubmit={onSubmit}
                 validate={validate}
diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js
index b939ac9b2af9..68f2ece8bb93 100644
--- a/src/pages/iou/IOUCurrencySelection.js
+++ b/src/pages/iou/IOUCurrencySelection.js
@@ -28,7 +28,7 @@ const propTypes = {
     route: PropTypes.shape({
         /** Params from the route */
         params: PropTypes.shape({
-            /** The type of IOU report, i.e. bill, request, send */
+            /** The type of IOU report, i.e. split, request, send, track */
             iouType: PropTypes.string,
 
             /** The report ID of the IOU */
@@ -56,7 +56,7 @@ const propTypes = {
         }),
     ),
 
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    /** Holds data related to Expense view state, rather than the underlying Expense data. */
     iou: iouPropTypes,
 
     ...withLocalizePropTypes,
@@ -74,7 +74,7 @@ function IOUCurrencySelection(props) {
     const threadReportID = lodashGet(props.route, 'params.threadReportID', '');
     const backTo = lodashGet(props.route, 'params.backTo', '');
 
-    // Decides whether to allow or disallow editing a money request
+    // Decides whether to allow or disallow editing an expense
     useEffect(() => {
         // Do not dismiss the modal, when it is not the edit flow.
         if (!threadReportID) {
@@ -84,12 +84,12 @@ function IOUCurrencySelection(props) {
         const report = ReportUtils.getReport(threadReportID);
         const parentReportAction = ReportActionsUtils.getReportAction(report.parentReportID, report.parentReportActionID);
 
-        // Do not dismiss the modal, when a current user can edit this currency of this money request.
+        // Do not dismiss the modal, when a current user can edit this currency of this expense.
         if (ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.CURRENCY)) {
             return;
         }
 
-        // Dismiss the modal when a current user cannot edit a money request.
+        // Dismiss the modal when a current user cannot edit an expense.
         Navigation.isNavigationReady().then(() => {
             Navigation.dismissModal();
         });
@@ -99,7 +99,7 @@ function IOUCurrencySelection(props) {
         (option) => {
             Keyboard.dismiss();
 
-            // When we refresh the web, the money request route gets cleared from the navigation stack.
+            // When we refresh the web, the expense route gets cleared from the navigation stack.
             // Navigating to "backTo" will result in forward navigation instead, causing disruption to the currency selection.
             // To prevent any negative experience, we have made the decision to simply close the currency selection page.
             if (_.isEmpty(backTo) || props.navigation.getState().routes.length === 1) {
diff --git a/src/pages/iou/propTypes/index.js b/src/pages/iou/propTypes/index.js
index a03ed65dda9c..46abafac23e4 100644
--- a/src/pages/iou/propTypes/index.js
+++ b/src/pages/iou/propTypes/index.js
@@ -3,16 +3,16 @@ import participantPropTypes from '@components/participantPropTypes';
 import CONST from '@src/CONST';
 
 const iouPropTypes = PropTypes.shape({
-    /** ID (iouType + reportID) of the request */
+    /** ID (iouType + reportID) of the expense */
     id: PropTypes.string,
 
-    /** Amount of the request */
+    /** Amount of the expense */
     amount: PropTypes.number,
 
-    /** Currency of the request */
+    /** Currency of the expense */
     currency: PropTypes.string,
 
-    /** Description of the request */
+    /** Description of the expense */
     comment: PropTypes.string,
 
     /** The merchant name */
@@ -21,16 +21,16 @@ const iouPropTypes = PropTypes.shape({
     /** The category name */
     category: PropTypes.string,
 
-    /** Whether the request is billable */
+    /** Whether the expense is billable */
     billable: PropTypes.bool,
 
     /** The tag */
     tag: PropTypes.string,
 
-    /** Date that the request was created */
+    /** Date that the expense was created */
     created: PropTypes.string,
 
-    /** The path to an image of the receipt attached to the request */
+    /** The path to an image of the receipt attached to the expense */
     receiptPath: PropTypes.string,
 
     /** List of the participants */
diff --git a/src/pages/iou/request/IOURequestRedirectToStartPage.js b/src/pages/iou/request/IOURequestRedirectToStartPage.js
index 2da235743705..19b9dddb8d2d 100644
--- a/src/pages/iou/request/IOURequestRedirectToStartPage.js
+++ b/src/pages/iou/request/IOURequestRedirectToStartPage.js
@@ -13,10 +13,10 @@ const propTypes = {
     route: PropTypes.shape({
         /** Route specific parameters used on this screen */
         params: PropTypes.shape({
-            /** The type of IOU report, i.e. bill, request, send */
+            /** The type of IOU report, i.e. split, request, send, track */
             iouType: PropTypes.oneOf(_.values(CONST.IOU.TYPE)).isRequired,
 
-            /** The type of IOU Request, i.e. manual, scan, distance */
+            /** The type of IOU Expense, i.e. manual, scan, distance */
             iouRequestType: PropTypes.oneOf(_.values(CONST.IOU.REQUEST_TYPE)).isRequired,
         }),
     }).isRequired,
diff --git a/src/pages/iou/request/IOURequestStartPage.js b/src/pages/iou/request/IOURequestStartPage.js
index cb078fac133c..1aba56a1e3d9 100644
--- a/src/pages/iou/request/IOURequestStartPage.js
+++ b/src/pages/iou/request/IOURequestStartPage.js
@@ -75,9 +75,9 @@ function IOURequestStartPage({
     const navigation = useNavigation();
     const [isDraggingOver, setIsDraggingOver] = useState(false);
     const tabTitles = {
-        [CONST.IOU.TYPE.REQUEST]: translate('iou.requestMoney'),
-        [CONST.IOU.TYPE.SEND]: translate('iou.sendMoney'),
-        [CONST.IOU.TYPE.SPLIT]: translate('iou.splitBill'),
+        [CONST.IOU.TYPE.REQUEST]: translate('iou.submitExpense'),
+        [CONST.IOU.TYPE.SEND]: translate('iou.paySomeone'),
+        [CONST.IOU.TYPE.SPLIT]: translate('iou.splitExpense'),
         [CONST.IOU.TYPE.TRACK_EXPENSE]: translate('iou.trackExpense'),
     };
     const transactionRequestType = useRef(TransactionUtils.getRequestType(transaction));
@@ -100,7 +100,7 @@ function IOURequestStartPage({
         }, []),
     );
 
-    // Clear out the temporary money request if the reportID in the URL has changed from the transaction's reportID
+    // Clear out the temporary expense if the reportID in the URL has changed from the transaction's reportID
     useEffect(() => {
         if (transaction.reportID === reportID) {
             return;
@@ -112,7 +112,7 @@ function IOURequestStartPage({
     const isExpenseReport = ReportUtils.isExpenseReport(report);
     const shouldDisplayDistanceRequest = iouType !== CONST.IOU.TYPE.TRACK_EXPENSE && (canUseP2PDistanceRequests || isExpenseChat || isExpenseReport || isFromGlobalCreate);
 
-    // Allow the user to create the request if we are creating the request in global menu or the report can create the request
+    // Allow the user to submit the request if we are creating the submitting in global menu or the report can submit the request
     const isAllowedToCreateRequest = _.isEmpty(report.reportID) || ReportUtils.canCreateRequest(report, policy, iouType);
 
     const navigateBack = () => {
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index e0a570e334d5..30289d45b0be 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -55,10 +55,10 @@ const propTypes = {
     /** Padding bottom style of safe area */
     safeAreaPaddingBottomStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
-    /** The type of IOU report, i.e. bill, request, send */
+    /** The type of IOU report, i.e. split, request, send, track */
     iouType: PropTypes.oneOf(_.values(CONST.IOU.TYPE)).isRequired,
 
-    /** The request type, ie. manual, scan, distance */
+    /** The expense type, ie. manual, scan, distance */
     iouRequestType: PropTypes.oneOf(_.values(CONST.IOU.REQUEST_TYPE)).isRequired,
 
     /** Whether the parent screen transition has ended */
@@ -120,8 +120,8 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
             participants,
             CONST.EXPENSIFY_EMAILS,
 
-            // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
-            // sees the option to request money from their admin on their own Workspace Chat.
+            // If we are using this component in the "Submit expense" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
+            // sees the option to submit expense from their admin on their own Workspace Chat.
             iouType === CONST.IOU.TYPE.REQUEST,
 
             canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE,
@@ -178,7 +178,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
     }, [didScreenTransitionEnd, reports, personalDetails, betas, debouncedSearchTerm, participants, iouType, canUseP2PDistanceRequests, iouRequestType, maxParticipantsReached, translate]);
 
     /**
-     * Adds a single participant to the request
+     * Adds a single participant to the expense
      *
      * @param {Object} option
      */
@@ -248,7 +248,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
         [maxParticipantsReached, newChatOptions, participants, debouncedSearchTerm],
     );
 
-    // Right now you can't split a request with a workspace and other additional participants
+    // Right now you can't split an expense with a workspace and other additional participants
     // This is getting properly fixed in https://github.com/Expensify/App/issues/27508, but as a stop-gap to prevent
     // the app from crashing on native when you try to do this, we'll going to hide the button if you have a workspace and other participants
     const hasPolicyExpenseChatParticipant = _.some(participants, (participant) => participant.isPolicyExpenseChat);
diff --git a/src/pages/iou/request/step/IOURequestStepAmount.js b/src/pages/iou/request/step/IOURequestStepAmount.js
index 9fdd2bea24f4..7416895950b3 100644
--- a/src/pages/iou/request/step/IOURequestStepAmount.js
+++ b/src/pages/iou/request/step/IOURequestStepAmount.js
@@ -150,7 +150,7 @@ function IOURequestStepAmount({
         }
 
         // If there was no reportID, then that means the user started this flow from the global + menu
-        // and an optimistic reportID was generated. In that case, the next step is to select the participants for this request.
+        // and an optimistic reportID was generated. In that case, the next step is to select the participants for this expense.
         Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID));
     };
 
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.js b/src/pages/iou/request/step/IOURequestStepCategory.js
index 4f0c77480c04..d4dbef878caf 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.js
+++ b/src/pages/iou/request/step/IOURequestStepCategory.js
@@ -32,7 +32,7 @@ const propTypes = {
     route: IOURequestStepRoutePropTypes.isRequired,
 
     /* Onyx Props */
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    /** Holds data related to Expense view state, rather than the underlying Expense data. */
     transaction: transactionPropTypes,
 
     /** The draft transaction that holds data to be persisted on the current transaction */
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 435121a76028..7d08b71a866b 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -344,7 +344,7 @@ function IOURequestStepConfirmation({
                 return;
             }
 
-            // If the request is created from the global create menu, we also navigate the user to the group report
+            // If the split expense is created from the global create menu, we also navigate the user to the group report
             if (iouType === CONST.IOU.TYPE.SPLIT) {
                 IOU.splitBillAndOpenReport(
                     selectedParticipants,
diff --git a/src/pages/iou/request/step/IOURequestStepCurrency.js b/src/pages/iou/request/step/IOURequestStepCurrency.js
index ba1354b4a2e6..6414b7310e47 100644
--- a/src/pages/iou/request/step/IOURequestStepCurrency.js
+++ b/src/pages/iou/request/step/IOURequestStepCurrency.js
@@ -61,7 +61,7 @@ function IOURequestStepCurrency({
     const optionsSelectorRef = useRef();
 
     const navigateBack = () => {
-        // If the currency selection was done from the confirmation step (eg. + > request money > manual > confirm > amount > currency)
+        // If the currency selection was done from the confirmation step (eg. + > submit expense > manual > confirm > amount > currency)
         // then the user needs taken back to the confirmation page instead of the initial amount page. This is because the route params
         // are only able to handle one backTo param at a time and the user needs to go back to the amount page before going back
         // to the confirmation page
diff --git a/src/pages/iou/request/step/IOURequestStepDate.js b/src/pages/iou/request/step/IOURequestStepDate.js
index f7b8b1ca3869..594192182780 100644
--- a/src/pages/iou/request/step/IOURequestStepDate.js
+++ b/src/pages/iou/request/step/IOURequestStepDate.js
@@ -30,7 +30,7 @@ const propTypes = {
     route: IOURequestStepRoutePropTypes.isRequired,
 
     /** Onyx Props */
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    /** Holds data related to Expense view state, rather than the underlying Expense data. */
     transaction: transactionPropTypes,
 
     /** The draft transaction that holds data to be persisted on the current transaction */
diff --git a/src/pages/iou/request/step/IOURequestStepDescription.js b/src/pages/iou/request/step/IOURequestStepDescription.js
index 8c3327a5ee5c..dbffd5f5ece7 100644
--- a/src/pages/iou/request/step/IOURequestStepDescription.js
+++ b/src/pages/iou/request/step/IOURequestStepDescription.js
@@ -36,7 +36,7 @@ const propTypes = {
     route: IOURequestStepRoutePropTypes.isRequired,
 
     /** Onyx Props */
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    /** Holds data related to Expense view state, rather than the underlying Expense data. */
     transaction: transactionPropTypes,
 
     /** The draft transaction that holds data to be persisted on the current transaction */
diff --git a/src/pages/iou/request/step/IOURequestStepDistance.js b/src/pages/iou/request/step/IOURequestStepDistance.js
index 94b59970b9f3..7b8c3d4cf4bd 100644
--- a/src/pages/iou/request/step/IOURequestStepDistance.js
+++ b/src/pages/iou/request/step/IOURequestStepDistance.js
@@ -139,8 +139,8 @@ function IOURequestStepDistance({
             return;
         }
 
-        // If there was no reportID, then that means the user started this flow from the global + menu
-        // and an optimistic reportID was generated. In that case, the next step is to select the participants for this request.
+        // If there was no reportID, then that means the user started this flow from the global menu
+        // and an optimistic reportID was generated. In that case, the next step is to select the participants for this expense.
         Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID));
     }, [report, iouType, reportID, transactionID, backTo]);
 
diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.js b/src/pages/iou/request/step/IOURequestStepMerchant.js
index 98caea625981..7de0bca2d54f 100644
--- a/src/pages/iou/request/step/IOURequestStepMerchant.js
+++ b/src/pages/iou/request/step/IOURequestStepMerchant.js
@@ -33,7 +33,7 @@ const propTypes = {
     route: IOURequestStepRoutePropTypes.isRequired,
 
     /** Onyx Props */
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    /** Holds data related to Expense view state, rather than the underlying Expense data. */
     transaction: transactionPropTypes,
 
     /** The draft transaction that holds data to be persisted on the current transaction */
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index 5ca465d8fb78..17ed57f240a2 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -59,8 +59,8 @@ function IOURequestStepParticipants({
     const newIouType = useRef();
 
     // When the component mounts, if there is a receipt, see if the image can be read from the disk. If not, redirect the user to the starting step of the flow.
-    // This is because until the request is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
-    // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
+    // This is because until the expense is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
+    // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the expense process.
     useEffect(() => {
         IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, () => {}, iouRequestType, iouType, transactionID, reportID, receiptType);
     }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID]);
@@ -74,7 +74,7 @@ function IOURequestStepParticipants({
             return;
         }
         // Participants can be added as normal or split participants. We want to wait for the participants' data to be updated before
-        // updating the money request type route params reducing the overhead of the thread and preventing possible jitters in UI.
+        // updating the expense type route params reducing the overhead of the thread and preventing possible jitters in UI.
         updateRouteParams();
         newIouType.current = null;
     }, [participants, updateRouteParams]);
diff --git a/src/pages/iou/request/step/IOURequestStepRoutePropTypes.js b/src/pages/iou/request/step/IOURequestStepRoutePropTypes.js
index 8b191fa0b58e..f69e2b122c24 100644
--- a/src/pages/iou/request/step/IOURequestStepRoutePropTypes.js
+++ b/src/pages/iou/request/step/IOURequestStepRoutePropTypes.js
@@ -8,7 +8,7 @@ export default PropTypes.shape({
         /** What action is being performed, ie. create, edit */
         action: PropTypes.oneOf(_.values(CONST.IOU.ACTION)),
 
-        /** The type of IOU report, i.e. bill, request, send */
+        /** The type of IOU report, i.e. split, request, send, track */
         iouType: PropTypes.oneOf(_.values(CONST.IOU.TYPE)).isRequired,
 
         /** The ID of the transaction being configured */
diff --git a/src/pages/iou/request/step/IOURequestStepTag.js b/src/pages/iou/request/step/IOURequestStepTag.js
index ed55628ecaa9..f3edad1b674e 100644
--- a/src/pages/iou/request/step/IOURequestStepTag.js
+++ b/src/pages/iou/request/step/IOURequestStepTag.js
@@ -34,7 +34,7 @@ const propTypes = {
     route: IOURequestStepRoutePropTypes.isRequired,
 
     /* Onyx props */
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    /** Holds data related to Expense view state, rather than the underlying Expense data. */
     transaction: transactionPropTypes,
 
     /** The draft transaction that holds data to be persisted on the current transaction */
diff --git a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.js b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.js
index 7a75e9f48805..c8380e7d3981 100644
--- a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.js
+++ b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.js
@@ -109,8 +109,8 @@ function IOURequestStepTaxAmountPage({
     };
 
     const navigateToCurrencySelectionPage = () => {
-        // If the money request being created is a distance request, don't allow the user to choose the currency.
-        // Only USD is allowed for distance requests.
+        // If the expense being created is a distance expense, don't allow the user to choose the currency.
+        // Only USD is allowed for distance expenses.
         // Remove query from the route and encode it.
         Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CURRENCY.getRoute(iouType, transactionID, reportID, backTo ? 'confirm' : '', Navigation.getActiveRouteWithoutParams()));
     };
@@ -138,7 +138,7 @@ function IOURequestStepTaxAmountPage({
         }
 
         // If there was no reportID, then that means the user started this flow from the global + menu
-        // and an optimistic reportID was generated. In that case, the next step is to select the participants for this request.
+        // and an optimistic reportID was generated. In that case, the next step is to select the participants for this expense.
         Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID));
     };
 
diff --git a/src/pages/iou/steps/MoneyRequestAmountForm.tsx b/src/pages/iou/steps/MoneyRequestAmountForm.tsx
index a010e13ff496..b314c700dda6 100644
--- a/src/pages/iou/steps/MoneyRequestAmountForm.tsx
+++ b/src/pages/iou/steps/MoneyRequestAmountForm.tsx
@@ -40,7 +40,7 @@ type MoneyRequestAmountFormProps = {
     /** Fired when submit button pressed, saves the given amount and navigates to the next page */
     onSubmitButtonPress: ({amount, currency}: {amount: string; currency: string}) => void;
 
-    /** The current tab we have navigated to in the request modal. String that corresponds to the request type. */
+    /** The current tab we have navigated to in the expense modal. String that corresponds to the expense type. */
     selectedTab?: SelectedTabRequest;
 };
 
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index ce20462df372..58c2e558b1f3 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -38,7 +38,7 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The specific type of chat */
         chatType?: ValueOf<typeof CONST.REPORT.CHAT_TYPE>;
 
-        /** Whether the report has a child that is an outstanding money request that is awaiting action from the current user */
+        /** Whether the report has a child that is an outstanding expense that is awaiting action from the current user */
         hasOutstandingChildRequest?: boolean;
 
         /** List of icons for report participants */
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index 4c1d154fc1ad..d4cdb96c062f 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -102,7 +102,7 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The original transaction amount */
         amount: number;
 
-        /** Whether the request is billable */
+        /** Whether the expense is billable */
         billable?: boolean;
 
         /** The category name */
@@ -111,7 +111,7 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The comment object on the transaction */
         comment: Comment;
 
-        /** Date that the request was created */
+        /** Date that the expense was created */
         created: string;
 
         /** The original currency of the transaction */
@@ -144,7 +144,7 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The edited merchant name */
         modifiedMerchant?: string;
 
-        /** The edited waypoints for the distance request */
+        /** The edited waypoints for the distance expense */
         modifiedWaypoints?: WaypointCollection;
 
         /**
diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
index 2ce72a58aead..1df10f72e4cf 100644
--- a/tests/actions/IOUTest.ts
+++ b/tests/actions/IOUTest.ts
@@ -190,7 +190,7 @@ describe('actions/IOU', () => {
                                         // The transaction should be attached to the IOU report
                                         expect(transaction?.reportID).toBe(iouReportID);
 
-                                        // Its amount should match the amount of the request
+                                        // Its amount should match the amount of the expense
                                         expect(transaction?.amount).toBe(amount);
 
                                         // The comment should be correct
@@ -355,7 +355,7 @@ describe('actions/IOU', () => {
                                         // The transaction should be attached to the IOU report
                                         expect(transaction?.reportID).toBe(iouReportID);
 
-                                        // Its amount should match the amount of the request
+                                        // Its amount should match the amount of the expense
                                         expect(transaction?.amount).toBe(amount);
 
                                         // The comment should be correct
@@ -1595,7 +1595,7 @@ describe('actions/IOU', () => {
         });
     });
 
-    describe('edit money request', () => {
+    describe('edit expense', () => {
         const amount = 10000;
         const comment = '💸💸💸💸';
         const merchant = 'NASDAQ';
@@ -2148,7 +2148,7 @@ describe('actions/IOU', () => {
             await waitForBatchedUpdates();
             await TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID);
 
-            // When an IOU request for money is made
+            // When a submit IOU expense is made
             IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', '', TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID, {login: RORY_EMAIL, accountID: RORY_ACCOUNT_ID}, comment, {});
             await waitForBatchedUpdates();
 
@@ -2231,13 +2231,13 @@ describe('actions/IOU', () => {
 
         afterEach(PusherHelper.teardown);
 
-        it('delete a money request (IOU Action and transaction) successfully', async () => {
-            // Given the fetch operations are paused and a money request is initiated
+        it('delete an expense (IOU Action and transaction) successfully', async () => {
+            // Given the fetch operations are paused and an expense is initiated
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
             fetch.pause();
 
             if (transaction && createIOUAction) {
-                // When the money request is deleted
+                // When the expense is deleted
                 IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, true);
             }
             await waitForBatchedUpdates();
@@ -2313,7 +2313,7 @@ describe('actions/IOU', () => {
             fetch.pause();
 
             if (transaction && createIOUAction) {
-                // When the IOU money request is deleted
+                // When the IOU expense is deleted
                 IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, true);
             }
             await waitForBatchedUpdates();
@@ -2348,7 +2348,7 @@ describe('actions/IOU', () => {
                 });
             });
 
-            // Then the report should be falsy so that there is no trace of the money request.
+            // Then the report should be falsy so that there is no trace of the expense.
             expect(report).toBeFalsy();
         });
 
@@ -2385,7 +2385,7 @@ describe('actions/IOU', () => {
             const resultActionAfterUpdate = reportActions?.[reportActionID];
             expect(resultActionAfterUpdate?.pendingAction).toBeUndefined();
 
-            // When we attempt to delete a money request from the IOU report
+            // When we attempt to delete an expense from the IOU report
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
             fetch.pause();
             if (transaction && createIOUAction) {
@@ -2482,7 +2482,7 @@ describe('actions/IOU', () => {
             jest.advanceTimersByTime(10);
 
             if (transaction && createIOUAction) {
-                // When Deleting a money request
+                // When Deleting an expense
                 IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
             }
             await waitForBatchedUpdates();
@@ -2597,7 +2597,7 @@ describe('actions/IOU', () => {
             });
 
             if (transaction && createIOUAction) {
-                // When Deleting a money request
+                // When Deleting an expense
                 IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
             }
             await waitForBatchedUpdates();
@@ -2672,7 +2672,7 @@ describe('actions/IOU', () => {
             fetch.pause();
 
             if (transaction && createIOUAction) {
-                // When deleting money request
+                // When deleting expense
                 IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
             }
             await waitForBatchedUpdates();
@@ -2707,7 +2707,7 @@ describe('actions/IOU', () => {
             });
         });
 
-        it('update the moneyRequestPreview to show [Deleted request] when appropriate', async () => {
+        it('update the moneyRequestPreview to show [Deleted expense] when appropriate', async () => {
             await waitForBatchedUpdates();
 
             // Given a thread report
@@ -2819,12 +2819,12 @@ describe('actions/IOU', () => {
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
             fetch.pause();
             if (transaction && createIOUAction) {
-                // When we delete the money request
+                // When we delete the expense
                 IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
             }
             await waitForBatchedUpdates();
 
-            // Then we expect the moneyRequestPreview to show [Deleted request]
+            // Then we expect the moneyRequestPreview to show [Deleted expense]
 
             await new Promise<void>((resolve) => {
                 const connectionID = Onyx.connect({
@@ -2843,7 +2843,7 @@ describe('actions/IOU', () => {
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
             fetch.resume();
 
-            // Then we expect the moneyRequestPreview to show [Deleted request]
+            // Then we expect the moneyRequestPreview to show [Deleted expense]
 
             await new Promise<void>((resolve) => {
                 const connectionID = Onyx.connect({
@@ -2867,7 +2867,7 @@ describe('actions/IOU', () => {
             });
             await waitForBatchedUpdates();
 
-            // Given a second money request in addition to the first one
+            // Given a second expense in addition to the first one
 
             jest.advanceTimersByTime(10);
             const amount2 = 20000;
@@ -2889,7 +2889,7 @@ describe('actions/IOU', () => {
             expect(ioupreview).toBeTruthy();
             expect(ioupreview?.message?.[0].text).toBe('rory@expensifail.com owes $300.00');
 
-            // When we delete the first money request
+            // When we delete the first expense
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
             fetch.pause();
             jest.advanceTimersByTime(10);
@@ -2980,7 +2980,7 @@ describe('actions/IOU', () => {
 
             await waitForBatchedUpdates();
 
-            // When we delete the money request in SingleTransactionView and we should not delete the IOU report
+            // When we delete the expense in SingleTransactionView and we should not delete the IOU report
 
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
             fetch.pause();
@@ -3034,7 +3034,7 @@ describe('actions/IOU', () => {
 
         it('navigate the user correctly to the chat Report when appropriate', () => {
             if (transaction && createIOUAction) {
-                // When we delete the money request and we should delete the IOU report
+                // When we delete the expense and we should delete the IOU report
                 IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
             }
             // Then we expect to navigate to the chat report
diff --git a/tests/perf-test/ReportActionCompose.perf-test.tsx b/tests/perf-test/ReportActionCompose.perf-test.tsx
index 8d6cb1ac7e57..c61293e4c83d 100644
--- a/tests/perf-test/ReportActionCompose.perf-test.tsx
+++ b/tests/perf-test/ReportActionCompose.perf-test.tsx
@@ -162,7 +162,7 @@ test('[ReportActionCompose] render composer with attachement modal interactions'
     const scenario = async () => {
         const hintAddAttachmentButtonText = Localize.translateLocal('reportActionCompose.addAttachment');
         const hintAssignTaskButtonText = Localize.translateLocal('newTaskPage.assignTask');
-        const hintSplitBillButtonText = Localize.translateLocal('iou.splitBill');
+        const hintSplitBillButtonText = Localize.translateLocal('iou.splitExpense');
 
         // Query for the attachment modal items
         const addAttachmentButton = await screen.findByLabelText(hintAddAttachmentButtonText);
diff --git a/tests/unit/ModifiedExpenseMessageTest.ts b/tests/unit/ModifiedExpenseMessageTest.ts
index 5880f028d216..dd4e4368ed55 100644
--- a/tests/unit/ModifiedExpenseMessageTest.ts
+++ b/tests/unit/ModifiedExpenseMessageTest.ts
@@ -347,7 +347,7 @@ describe('ModifiedExpenseMessage', () => {
             };
 
             it('returns the correct text message', () => {
-                const expectedResult = 'changed the request';
+                const expectedResult = 'changed the expense';
 
                 const result = ModifiedExpenseMessage.getForReportAction(report.reportID, reportAction);
 
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index ffd5c9147dc0..4bd7213879e6 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -312,7 +312,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
-        it('returns true when the report has oustanding child request', () => {
+        it('returns true when the report has oustanding child expense', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
                 ownerAccountID: 99,
@@ -486,7 +486,7 @@ describe('ReportUtils', () => {
             });
         });
 
-        describe('return only money request option if', () => {
+        describe('return only submit expense option if', () => {
             it("it is an expense report tied to user's own policy expense chat", () => {
                 Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}102`, {
                     reportID: '102',
@@ -578,7 +578,7 @@ describe('ReportUtils', () => {
             });
         });
 
-        describe('return multiple money request option if', () => {
+        describe('return multiple expense options if', () => {
             it("it is user's own policy expense chat", () => {
                 const report = {
                     ...LHNTestUtils.getFakeReport(),

From 30eaee6e5a608abc763c90eca2f1a10b71280777 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 3 Apr 2024 16:11:02 +0530
Subject: [PATCH 075/383] Fix translation after merge

---
 src/components/MoneyReportHeader.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 487e1778062e..1ed8f1c24e75 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -288,7 +288,7 @@ function MoneyReportHeader({session, policy, chatReport, nextStep, report: money
                 danger
             />
             <ConfirmModal
-                title={translate('iou.deleteRequest')}
+                title={translate('iou.deleteExpense')}
                 isVisible={isDeleteRequestModalVisible}
                 onConfirm={deleteTransaction}
                 onCancel={() => setIsDeleteRequestModalVisible(false)}

From d2ee607a35ea9cfd3ecb2c7dc6527eda4dc5ddcc Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 3 Apr 2024 16:46:27 +0530
Subject: [PATCH 076/383] More translation fix

---
 ...neyTemporaryForRefactorRequestConfirmationList.js |  6 +++---
 src/languages/en.ts                                  | 12 +++---------
 src/languages/es.ts                                  |  1 -
 src/pages/home/report/ReportActionItemSingle.tsx     |  2 +-
 ...emporaryForRefactorRequestParticipantsSelector.js |  2 +-
 .../iou/request/step/IOURequestStepConfirmation.js   |  4 ++--
 .../iou/request/step/IOURequestStepParticipants.js   |  4 ++--
 .../MoneyRequestParticipantsSelector.js              |  2 +-
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 72d2d132726b..aa300ba39e3b 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -404,9 +404,9 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
         if (isTypeTrackExpense) {
             text = translate('iou.trackExpense');
         } else if (isTypeSplit && iouAmount === 0) {
-            text = translate('iou.split');
+            text = translate('iou.splitExpense');
         } else if ((receiptPath && isTypeRequest) || isDistanceRequestWithPendingRoute) {
-            text = translate('iou.expense');
+            text = translate('iou.submitExpense');
             if (iouAmount !== 0) {
                 text = translate('iou.requestAmount', {amount: formattedAmount});
             }
@@ -592,7 +592,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                 Log.info(`[IOU] Sending money via: ${paymentMethod}`);
                 onSendMoney(paymentMethod);
             } else {
-                // validate the amount for distance requests
+                // validate the amount for distance expenses
                 const decimals = CurrencyUtils.getCurrencyDecimals(iouCurrencyCode);
                 if (isDistanceRequest && !isDistanceRequestWithPendingRoute && !MoneyRequestUtils.validateAmount(String(iouAmount), decimals)) {
                     setFormError('common.error.invalidAmount');
diff --git a/src/languages/en.ts b/src/languages/en.ts
index f32756302007..c48f04f5f1de 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -470,14 +470,9 @@ export default {
         copyEmailToClipboard: 'Copy email to clipboard',
         markAsUnread: 'Mark as unread',
         markAsRead: 'Mark as read',
-        editAction: ({action}: EditActionParams) =>
-            `Edit ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'}`,
-        deleteAction: ({action}: DeleteActionParams) =>
-            `Delete ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'}`,
-        deleteConfirmation: ({action}: DeleteConfirmationParams) =>
-            `Are you sure you want to delete this ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'
-            }?`,
+        editAction: ({action}: EditActionParams) => `Edit ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'}`,
+        deleteAction: ({action}: DeleteActionParams) => `Delete ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'}`,
+        deleteConfirmation: ({action}: DeleteConfirmationParams) => `Are you sure you want to delete this ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'expense' : 'comment'}?`,
         onlyVisible: 'Only visible to',
         replyInThread: 'Reply in thread',
         joinThread: 'Join thread',
@@ -616,7 +611,6 @@ export default {
         card: 'Card',
         original: 'Original',
         split: 'Split',
-        addToSplit: 'Add to split',
         splitExpense: 'Split expense',
         payName: ({name}: {name: string}) => `Pay ${name}`,
         paySomeone: 'Pay someone',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 93e913c84178..a7acaa2d767b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -612,7 +612,6 @@ export default {
         card: 'Tarjeta',
         original: 'Original',
         split: 'Dividir',
-        addToSplit: 'Añadir para dividir',
         splitExpense: 'Dividir factura',
         expense: 'Solicitar',
         participants: 'Participantes',
diff --git a/src/pages/home/report/ReportActionItemSingle.tsx b/src/pages/home/report/ReportActionItemSingle.tsx
index 696cd7a7d850..e3ec0fae5282 100644
--- a/src/pages/home/report/ReportActionItemSingle.tsx
+++ b/src/pages/home/report/ReportActionItemSingle.tsx
@@ -105,7 +105,7 @@ function ReportActionItemSingle({
     let secondaryAvatar: Icon;
     const primaryDisplayName = displayName;
     if (displayAllActors) {
-        // The ownerAccountID and actorAccountID can be the same if the a user requests money back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
+        // The ownerAccountID and actorAccountID can be the same if the a user submits expense back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
         const secondaryAccountId = iouReport?.ownerAccountID === actorAccountID ? iouReport?.managerID : iouReport?.ownerAccountID;
         const secondaryUserAvatar = personalDetails?.[secondaryAccountId ?? -1]?.avatar ?? '';
         const secondaryDisplayName = ReportUtils.getDisplayNameForParticipant(secondaryAccountId);
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index a67c828adac4..2e5cc966fa5c 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -306,7 +306,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
                 {!!participants.length && (
                     <Button
                         success
-                        text={translate('iou.addToSplit')}
+                        text={translate('common.next')}
                         onPress={handleConfirmSelection}
                         pressOnEnter
                         large
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 03e01349379b..4f4a2cfcc4db 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -96,13 +96,13 @@ function IOURequestStepConfirmation({
     const requestType = TransactionUtils.getRequestType(transaction);
     const headerTitle = useMemo(() => {
         if (iouType === CONST.IOU.TYPE.SPLIT) {
-            return translate('iou.split');
+            return translate('iou.splitExpense');
         }
         if (iouType === CONST.IOU.TYPE.TRACK_EXPENSE) {
             return translate('iou.trackExpense');
         }
         if (iouType === CONST.IOU.TYPE.SEND) {
-            return translate('common.send');
+            return translate('iou.paySomeone');
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
     }, [iouType, transaction, translate]);
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index a1f4a7007984..734d1938d8b8 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -45,10 +45,10 @@ function IOURequestStepParticipants({
     const isSplitRequest = iouType === CONST.IOU.TYPE.SPLIT;
     const headerTitle = useMemo(() => {
         if (isSplitRequest) {
-            return translate('iou.split');
+            return translate('iou.splitExpense');
         }
         if (iouType === CONST.IOU.TYPE.SEND) {
-            return translate('common.send');
+            return translate('iou.paySomeone');
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
     }, [iouType, transaction, translate, isSplitRequest]);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
index 05ef5baa8432..ec98bd4eb50f 100755
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -299,7 +299,7 @@ function MoneyRequestParticipantsSelector({
                 {!!participants.length && (
                     <Button
                         success
-                        text={translate('iou.addToSplit')}
+                        text={translate('common.next')}
                         onPress={handleConfirmSelection}
                         pressOnEnter
                         large

From d3d480545fdea6d51ded5866dd407881857bb04a Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 3 Apr 2024 14:53:31 +0200
Subject: [PATCH 077/383] Remove policyMembersDraft and policyMembers part-1

---
 src/ONYXKEYS.ts                               |   2 -
 src/components/Indicator.tsx                  |  13 +-
 src/libs/PolicyUtils.ts                       |  18 +-
 src/libs/WorkspacesSettingsUtils.ts           |  23 +--
 src/libs/actions/Policy.ts                    | 188 +++++++-----------
 src/libs/actions/TeachersUnite.ts             |  24 +--
 src/pages/home/sidebar/AllSettingsScreen.tsx  |  12 +-
 src/pages/settings/InitialSettingsPage.tsx    |  12 +-
 src/pages/workspace/WorkspaceInitialPage.tsx  |   4 +-
 src/pages/workspace/WorkspacesListPage.tsx    |  14 +-
 src/pages/workspace/withPolicy.tsx            |   5 -
 .../withPolicyAndFullscreenLoading.tsx        |   2 -
 12 files changed, 114 insertions(+), 203 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index c134d2a65db2..3ff71362af35 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -309,7 +309,6 @@ const ONYXKEYS = {
         POLICY: 'policy_',
         POLICY_MEMBERS: 'policyMembers_',
         POLICY_DRAFTS: 'policyDrafts_',
-        POLICY_MEMBERS_DRAFTS: 'policyMembersDrafts_',
         POLICY_JOIN_MEMBER: 'policyJoinMember_',
         POLICY_CATEGORIES: 'policyCategories_',
         POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
@@ -513,7 +512,6 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategories;
     [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTagList;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMembers;
-    [ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
diff --git a/src/components/Indicator.tsx b/src/components/Indicator.tsx
index e3d226a17999..8830681bc55f 100644
--- a/src/components/Indicator.tsx
+++ b/src/components/Indicator.tsx
@@ -8,14 +8,11 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import * as UserUtils from '@libs/UserUtils';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {BankAccountList, FundList, LoginList, Policy, PolicyMembers, ReimbursementAccount, UserWallet, WalletTerms} from '@src/types/onyx';
+import type {BankAccountList, FundList, LoginList, Policy, ReimbursementAccount, UserWallet, WalletTerms} from '@src/types/onyx';
 
 type CheckingMethod = () => boolean;
 
 type IndicatorOnyxProps = {
-    /** The employee list of all policies (coming from Onyx) */
-    allPolicyMembers: OnyxCollection<PolicyMembers>;
-
     /** All the user's policies (from Onyx via withFullPolicy) */
     policies: OnyxCollection<Policy>;
 
@@ -40,14 +37,13 @@ type IndicatorOnyxProps = {
 
 type IndicatorProps = IndicatorOnyxProps;
 
-function Indicator({reimbursementAccount, allPolicyMembers, policies, bankAccountList, fundList, userWallet, walletTerms, loginList}: IndicatorOnyxProps) {
+function Indicator({reimbursementAccount, policies, bankAccountList, fundList, userWallet, walletTerms, loginList}: IndicatorOnyxProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
 
     // If a policy was just deleted from Onyx, then Onyx will pass a null value to the props, and
     // those should be cleaned out before doing any error checking
     const cleanPolicies = Object.fromEntries(Object.entries(policies ?? {}).filter(([, policy]) => policy?.id));
-    const cleanAllPolicyMembers = Object.fromEntries(Object.entries(allPolicyMembers ?? {}).filter(([, policyMembers]) => !!policyMembers));
 
     // All of the error & info-checking methods are put into an array. This is so that using _.some() will return
     // early as soon as the first error / info condition is returned. This makes the checks very efficient since
@@ -57,7 +53,7 @@ function Indicator({reimbursementAccount, allPolicyMembers, policies, bankAccoun
         () => PaymentMethods.hasPaymentMethodError(bankAccountList, fundList),
         () => Object.values(cleanPolicies).some(PolicyUtils.hasPolicyError),
         () => Object.values(cleanPolicies).some(PolicyUtils.hasCustomUnitsError),
-        () => Object.values(cleanAllPolicyMembers).some(PolicyUtils.hasPolicyMemberError),
+        () => Object.values(cleanPolicies).some(PolicyUtils.hasEmployeeListError),
         () => Object.keys(reimbursementAccount?.errors ?? {}).length > 0,
         () => !!loginList && UserUtils.hasLoginListError(loginList),
 
@@ -77,9 +73,6 @@ function Indicator({reimbursementAccount, allPolicyMembers, policies, bankAccoun
 Indicator.displayName = 'Indicator';
 
 export default withOnyx<IndicatorProps, IndicatorOnyxProps>({
-    allPolicyMembers: {
-        key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-    },
     policies: {
         key: ONYXKEYS.COLLECTION.POLICY,
     },
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 0a8437a5afaf..7ff74f8af98e 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -26,10 +26,9 @@ function getActivePolicies(policies: OnyxCollection<Policy>): Policy[] | undefin
 
 /**
  * Checks if we have any errors stored within the POLICY_MEMBERS. Determines whether we should show a red brick road error or not.
- * Data structure: {accountID: {role:'user', errors: []}, accountID2: {role:'admin', errors: [{1231312313: 'Unable to do X'}]}, ...}
  */
-function hasPolicyMemberError(policyMembers: OnyxEntry<PolicyMembers>): boolean {
-    return Object.values(policyMembers ?? {}).some((member) => Object.keys(member?.errors ?? {}).length > 0);
+function hasEmployeeListError(policy: OnyxEntry<Policy>): boolean {
+	return Object.values(policy?.employeeList ?? {}).some((employee) => Object.keys(employee?.errors ?? {}).length > 0);
 }
 
 /**
@@ -90,12 +89,11 @@ function getUnitRateValue(toLocaleDigit: (arg: string) => string, customUnitRate
 /**
  * Get the brick road indicator status for a policy. The policy has an error status if there is a policy member error, a custom unit error or a field error.
  */
-function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>, policyMembersCollection: OnyxCollection<PolicyMembers>): ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined {
-    const policyMembers = policyMembersCollection?.[`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policy?.id}`] ?? {};
-    if (hasPolicyMemberError(policyMembers) || hasCustomUnitsError(policy) || hasPolicyErrorFields(policy)) {
-        return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
-    }
-    return undefined;
+function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined {
+	if (hasEmployeeListError(policy) || hasCustomUnitsError(policy) || hasPolicyErrorFields(policy)) {
+					return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
+	}
+	return undefined;
 }
 
 /**
@@ -316,7 +314,7 @@ function getPolicyIDFromNavigationState() {
 export {
     getActivePolicies,
     hasAccountingConnections,
-    hasPolicyMemberError,
+    hasEmployeeListError,
     hasPolicyError,
     hasPolicyErrorFields,
     hasCustomUnitsError,
diff --git a/src/libs/WorkspacesSettingsUtils.ts b/src/libs/WorkspacesSettingsUtils.ts
index 30820fc0c48b..ef35421efb90 100644
--- a/src/libs/WorkspacesSettingsUtils.ts
+++ b/src/libs/WorkspacesSettingsUtils.ts
@@ -4,12 +4,12 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, PolicyMembers, ReimbursementAccount, Report} from '@src/types/onyx';
+import type {Policy, ReimbursementAccount, Report} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
 import * as CurrencyUtils from './CurrencyUtils';
 import type {Phrase, PhraseParameters} from './Localize';
 import * as OptionsListUtils from './OptionsListUtils';
-import {hasCustomUnitsError, hasPolicyError, hasPolicyMemberError, hasTaxRateError} from './PolicyUtils';
+import {hasCustomUnitsError, hasEmployeeListError, hasPolicyError, hasTaxRateError} from './PolicyUtils';
 import * as ReportActionsUtils from './ReportActionsUtils';
 import * as ReportUtils from './ReportUtils';
 
@@ -33,16 +33,6 @@ Onyx.connect({
     callback: (value) => (allPolicies = value),
 });
 
-let allPolicyMembers: OnyxCollection<PolicyMembers>;
-
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-    waitForCollectionCallback: true,
-    callback: (val) => {
-        allPolicyMembers = val;
-    },
-});
-
 let reimbursementAccount: OnyxEntry<ReimbursementAccount>;
 
 Onyx.connect({
@@ -75,17 +65,16 @@ const getBrickRoadForPolicy = (report: Report): BrickRoad => {
     return shouldShowGreenDotIndicator ? CONST.BRICK_ROAD_INDICATOR_STATUS.INFO : undefined;
 };
 
-function hasGlobalWorkspaceSettingsRBR(policies: OnyxCollection<Policy>, policyMembers: OnyxCollection<PolicyMembers>) {
+function hasGlobalWorkspaceSettingsRBR(policies: OnyxCollection<Policy>) {
     // When attempting to open a policy with an invalid policyID, the policy collection is updated to include policy objects with error information.
     // Only policies displayed on the policy list page should be verified. Otherwise, the user will encounter an RBR unrelated to any policies on the list.
     const cleanPolicies = Object.fromEntries(Object.entries(policies ?? {}).filter(([, policy]) => policy?.id));
 
-    const cleanAllPolicyMembers = Object.fromEntries(Object.entries(policyMembers ?? {}).filter(([, policyMemberValues]) => !!policyMemberValues));
     const errorCheckingMethods: CheckingMethod[] = [
         () => Object.values(cleanPolicies).some(hasPolicyError),
         () => Object.values(cleanPolicies).some(hasCustomUnitsError),
         () => Object.values(cleanPolicies).some(hasTaxRateError),
-        () => Object.values(cleanAllPolicyMembers).some(hasPolicyMemberError),
+        () => Object.values(cleanPolicies).some(hasEmployeeListError),
         () => Object.keys(reimbursementAccount?.errors ?? {}).length > 0,
     ];
 
@@ -93,7 +82,7 @@ function hasGlobalWorkspaceSettingsRBR(policies: OnyxCollection<Policy>, policyM
 }
 
 function hasWorkspaceSettingsRBR(policy: Policy) {
-    const policyMemberError = allPolicyMembers ? hasPolicyMemberError(allPolicyMembers[`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policy.id}`]) : false;
+    const policyMemberError = hasEmployeeListError(policy);
     const taxRateError = hasTaxRateError(policy);
 
     return Object.keys(reimbursementAccount?.errors ?? {}).length > 0 || hasPolicyError(policy) || hasCustomUnitsError(policy) || policyMemberError || taxRateError;
@@ -130,7 +119,7 @@ function getChatTabBrickRoad(policyID?: string): BrickRoad | undefined {
 
 function checkIfWorkspaceSettingsTabHasRBR(policyID?: string) {
     if (!policyID) {
-        return hasGlobalWorkspaceSettingsRBR(allPolicies, allPolicyMembers);
+        return hasGlobalWorkspaceSettingsRBR(allPolicies);
     }
     const policy = allPolicies ? allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] : null;
 
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 3c34e823ac9a..356eb440e3ca 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -180,15 +180,6 @@ Onyx.connect({
     callback: (value) => (allReports = value),
 });
 
-let allPolicyMembers: OnyxCollection<PolicyMember>;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-    waitForCollectionCallback: true,
-    callback: (val) => {
-        allPolicyMembers = val;
-    },
-});
-
 let lastAccessedWorkspacePolicyID: OnyxEntry<string> = null;
 Onyx.connect({
     key: ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID,
@@ -820,9 +811,10 @@ function removeMembers(accountIDs: number[], policyID: string) {
         return;
     }
 
-    const membersListKey = `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}` as const;
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
     const policy = ReportUtils.getPolicy(policyID);
     const workspaceChats = ReportUtils.getWorkspaceChats(policyID, accountIDs);
+    const emailList = accountIDs.map((accountID) => allPersonalDetails?.[accountID]?.login).filter((login) => !!login) as string[];
     const optimisticClosedReportActions = workspaceChats.map(() => ReportUtils.buildOptimisticClosedReportAction(sessionEmail, policy.name, CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY));
 
     const announceRoomMembers = removeOptimisticAnnounceRoomMembers(policyID, accountIDs);
@@ -830,17 +822,17 @@ function removeMembers(accountIDs: number[], policyID: string) {
     const optimisticMembersState: OnyxCollection<PolicyMember> = {};
     const successMembersState: OnyxCollection<PolicyMember> = {};
     const failureMembersState: OnyxCollection<PolicyMember> = {};
-    accountIDs.forEach((accountID) => {
-        optimisticMembersState[accountID] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
-        successMembersState[accountID] = null;
-        failureMembersState[accountID] = {errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericRemove')};
+    emailList.forEach((email) => {
+        optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        successMembersState[email] = null;
+        failureMembersState[email] = {errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericRemove')};
     });
 
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
-            value: optimisticMembersState,
+            key: policyKey,
+            value: {employeeList: optimisticMembersState},
         },
         ...announceRoomMembers.onyxOptimisticData,
     ];
@@ -848,8 +840,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
-            value: successMembersState,
+            key: policyKey,
+            value: {employeeList: successMembersState},
         },
         ...announceRoomMembers.onyxSuccessData,
     ];
@@ -857,8 +849,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
-            value: failureMembersState,
+            key: policyKey,
+            value: {employeeList: failureMembersState},
         },
         ...announceRoomMembers.onyxFailureData,
     ];
@@ -905,9 +897,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
     // If we delete all these logins then we should clear the informative messages since they are no longer relevant.
     if (!isEmptyObject(policy?.primaryLoginsInvited ?? {})) {
         // Take the current policy members and remove them optimistically
-        const policyMemberAccountIDs = Object.keys(allPolicyMembers?.[`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`] ?? {}).map((accountID) => Number(accountID));
-        const remainingMemberAccountIDs = policyMemberAccountIDs.filter((accountID) => !accountIDs.includes(accountID));
-        const remainingLogins: string[] = PersonalDetailsUtils.getLoginsByAccountIDs(remainingMemberAccountIDs);
+        const employeeListEmails = Object.keys(allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.employeeList ?? {});
+        const remainingLogins = employeeListEmails.filter((email) => !emailList.includes(email));
         const invitedPrimaryToSecondaryLogins: Record<string, string> = {};
 
         if (policy.primaryLoginsInvited) {
@@ -918,7 +909,7 @@ function removeMembers(accountIDs: number[], policyID: string) {
         if (!remainingLogins.some((remainingLogin) => !!invitedPrimaryToSecondaryLogins[remainingLogin])) {
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
-                key: membersListKey,
+                key: policyKey,
                 value: {
                     primaryLoginsInvited: null,
                 },
@@ -949,7 +940,7 @@ function removeMembers(accountIDs: number[], policyID: string) {
     });
 
     const params: DeleteMembersFromWorkspaceParams = {
-        emailList: accountIDs.map((accountID) => allPersonalDetails?.[accountID]?.login).join(','),
+        emailList: emailList.join(','),
         policyID,
     };
 
@@ -957,7 +948,7 @@ function removeMembers(accountIDs: number[], policyID: string) {
 }
 
 function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newRole: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER) {
-    const previousPolicyMembers = {...allPolicyMembers};
+    const previousEmployeeList = {...allPolicies?.[policyID]?.employeeList};
     const memberRoles: WorkspaceMembersRoleData[] = accountIDs.reduce((result: WorkspaceMembersRoleData[], accountID: number) => {
         if (!allPersonalDetails?.[accountID]?.login) {
             return result;
@@ -975,13 +966,15 @@ function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newR
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                ...memberRoles.reduce((member: Record<number, {role: string; pendingAction: PendingAction}>, current) => {
-                    // eslint-disable-next-line no-param-reassign
-                    member[current.accountID] = {role: current?.role, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
-                    return member;
-                }, {}),
+                employeeList: {
+                    ...memberRoles.reduce((member: Record<string, {role: string; pendingAction: PendingAction}>, current) => {
+                        // eslint-disable-next-line no-param-reassign
+                        member[current.email] = {role: current?.role, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+                        return member;
+                    }, {}),
+                },
                 errors: null,
             },
         },
@@ -990,13 +983,15 @@ function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newR
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                ...memberRoles.reduce((member: Record<number, {role: string; pendingAction: PendingAction}>, current) => {
-                    // eslint-disable-next-line no-param-reassign
-                    member[current.accountID] = {role: current?.role, pendingAction: null};
-                    return member;
-                }, {}),
+                employeeList: {
+                    ...memberRoles.reduce((member: Record<string, {role: string; pendingAction: PendingAction}>, current) => {
+                        // eslint-disable-next-line no-param-reassign
+                        member[current.email] = {role: current?.role, pendingAction: null};
+                        return member;
+                    }, {}),
+                },
                 errors: null,
             },
         },
@@ -1005,9 +1000,9 @@ function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newR
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                ...(previousPolicyMembers[`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`] as Record<string, PolicyMember | null>),
+                employeeList: previousEmployeeList,
                 errors: ErrorUtils.getMicroSecondOnyxError('workspace.editor.genericFailureMessage'),
             },
         },
@@ -1277,7 +1272,7 @@ function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: I
  * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
  */
 function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, welcomeNote: string, policyID: string) {
-    const membersListKey = `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}` as const;
+    const onyxKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
     const logins = Object.keys(invitedEmailsToAccountIDs).map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin));
     const accountIDs = Object.values(invitedEmailsToAccountIDs);
 
@@ -1289,10 +1284,12 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs);
 
     const optimisticMembersState: OnyxCollection<PolicyMember> = {};
+    const successMembersState: OnyxCollection<PolicyMember> = {};
     const failureMembersState: OnyxCollection<PolicyMember> = {};
-    accountIDs.forEach((accountID) => {
-        optimisticMembersState[accountID] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
-        failureMembersState[accountID] = {
+    Object.keys(invitedEmailsToAccountIDs).forEach((email) => {
+        optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
+        successMembersState[email] = {pendingAction: null};
+        failureMembersState[email] = {
             errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericAdd'),
         };
     });
@@ -1300,10 +1297,12 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
+            key: onyxKey,
 
             // Convert to object with each key containing {pendingAction: ‘add’}
-            value: optimisticMembersState,
+            value: {
+                employeeList: optimisticMembersState,
+            },
         },
         ...newPersonalDetailsOnyxData.optimisticData,
         ...membersChats.onyxOptimisticData,
@@ -1313,20 +1312,10 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
-
-            // Convert to object with each key clearing pendingAction, when it is an existing account.
-            // Remove the object, when it is a newly created account.
-            value: accountIDs.reduce((accountIDsWithClearedPendingAction, accountID) => {
-                let value = null;
-                const accountAlreadyExists = !isEmptyObject(allPersonalDetails?.[accountID]);
-
-                if (accountAlreadyExists) {
-                    value = {pendingAction: null, errors: null};
-                }
-
-                return {...accountIDsWithClearedPendingAction, [accountID]: value};
-            }, {}),
+            key: onyxKey,
+            value: {
+                employeeList: successMembersState,
+            },
         },
         ...newPersonalDetailsOnyxData.finallyData,
         ...membersChats.onyxSuccessData,
@@ -1336,7 +1325,7 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
+            key: onyxKey,
 
             // Convert to object with each key containing the error. We don’t
             // need to remove the members since that is handled by onClose of OfflineWithFeedback.
@@ -1938,15 +1927,11 @@ function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', pol
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 customUnits,
                 makeMeAdmin,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS}${policyID}`,
-            value: {
-                [sessionAccountID]: {
-                    role: CONST.POLICY.ROLE.ADMIN,
-                    errors: {},
+                employeeList: {
+                    [sessionEmail]: {
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        errors: {},
+                    },
                 },
             },
         },
@@ -2003,15 +1988,11 @@ function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName
                 areWorkflowsEnabled: false,
                 areReportFieldsEnabled: false,
                 areConnectionsEnabled: false,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-            value: {
-                [sessionAccountID]: {
-                    role: CONST.POLICY.ROLE.ADMIN,
-                    errors: {},
+                employeeList: {
+                    [sessionEmail]: {
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        errors: {},
+                    },
                 },
             },
         },
@@ -2065,11 +2046,6 @@ function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName
             key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
             value: null,
         },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS}${policyID}`,
-            value: null,
-        },
     ];
 
     const successData: OnyxUpdate[] = [
@@ -2140,9 +2116,9 @@ function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName
 
     const failureData: OnyxUpdate[] = [
         {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-            value: null,
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {employeeList: null},
         },
         {
             onyxMethod: Onyx.METHOD.SET,
@@ -2491,6 +2467,16 @@ function createWorkspaceFromIOUPayment(iouReport: Report | EmptyObject): string
         areWorkflowsEnabled: false,
         areReportFieldsEnabled: false,
         areConnectionsEnabled: false,
+        employeeList: {
+            [sessionEmail]: {
+                role: CONST.POLICY.ROLE.ADMIN,
+                errors: {},
+            },
+            [employeeEmail]: {
+                role: CONST.POLICY.ROLE.USER,
+                errors: {},
+            },
+        },
     };
 
     const optimisticData: OnyxUpdate[] = [
@@ -2499,20 +2485,6 @@ function createWorkspaceFromIOUPayment(iouReport: Report | EmptyObject): string
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: newWorkspace,
         },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-            value: {
-                [sessionAccountID]: {
-                    role: CONST.POLICY.ROLE.ADMIN,
-                    errors: {},
-                },
-                [employeeAccountID]: {
-                    role: CONST.POLICY.ROLE.USER,
-                    errors: {},
-                },
-            },
-        },
         {
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
@@ -2568,13 +2540,6 @@ function createWorkspaceFromIOUPayment(iouReport: Report | EmptyObject): string
                 pendingAction: null,
             },
         },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS}${policyID}`,
-            value: {
-                pendingAction: null,
-            },
-        },
         ...employeeWorkspaceChat.onyxOptimisticData,
     ];
 
@@ -2645,13 +2610,6 @@ function createWorkspaceFromIOUPayment(iouReport: Report | EmptyObject): string
     ];
 
     const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-            value: {
-                pendingAction: null,
-            },
-        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
diff --git a/src/libs/actions/TeachersUnite.ts b/src/libs/actions/TeachersUnite.ts
index 1f8b32724bd4..36fd9d340aeb 100644
--- a/src/libs/actions/TeachersUnite.ts
+++ b/src/libs/actions/TeachersUnite.ts
@@ -96,17 +96,13 @@ function addSchoolPrincipal(firstName: string, partnerUserID: string, lastName:
                 role: CONST.POLICY.ROLE.USER,
                 owner: sessionEmail,
                 outputCurrency: allPersonalDetails?.[sessionAccountID]?.localCurrencyCode ?? CONST.CURRENCY.USD,
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-            value: {
-                [sessionAccountID]: {
-                    role: CONST.POLICY.ROLE.USER,
-                    errors: {},
+                employeeList: {
+                    [sessionEmail]: {
+                        role: CONST.POLICY.ROLE.USER,
+                        errors: {},
+                    },
                 },
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
             },
         },
         {
@@ -155,9 +151,11 @@ function addSchoolPrincipal(firstName: string, partnerUserID: string, lastName:
 
     const failureData: OnyxUpdate[] = [
         {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-            value: null,
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                [sessionEmail]: null,
+            },
         },
         {
             onyxMethod: Onyx.METHOD.SET,
diff --git a/src/pages/home/sidebar/AllSettingsScreen.tsx b/src/pages/home/sidebar/AllSettingsScreen.tsx
index 7151cc84e735..8056d9bcc413 100644
--- a/src/pages/home/sidebar/AllSettingsScreen.tsx
+++ b/src/pages/home/sidebar/AllSettingsScreen.tsx
@@ -18,16 +18,15 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy, PolicyMembers} from '@src/types/onyx';
+import type {Policy} from '@src/types/onyx';
 
 type AllSettingsScreenOnyxProps = {
     policies: OnyxCollection<Policy>;
-    policyMembers: OnyxCollection<PolicyMembers>;
 };
 
 type AllSettingsScreenProps = AllSettingsScreenOnyxProps;
 
-function AllSettingsScreen({policies, policyMembers}: AllSettingsScreenProps) {
+function AllSettingsScreen({policies}: AllSettingsScreenProps) {
     const styles = useThemeStyles();
     const waitForNavigate = useWaitForNavigation();
     const {translate} = useLocalize();
@@ -48,7 +47,7 @@ function AllSettingsScreen({policies, policyMembers}: AllSettingsScreenProps) {
                     })();
                 },
                 focused: !isSmallScreenWidth,
-                brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies, policyMembers) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             },
             ...(shouldShowSubscriptionsMenu
                 ? [
@@ -90,7 +89,7 @@ function AllSettingsScreen({policies, policyMembers}: AllSettingsScreenProps) {
             hoverAndPressStyle: styles.hoveredComponentBG,
             brickRoadIndicator: item.brickRoadIndicator,
         }));
-    }, [isSmallScreenWidth, styles.hoveredComponentBG, styles.sectionMenuItem, translate, waitForNavigate, policies, policyMembers]);
+    }, [isSmallScreenWidth, styles.hoveredComponentBG, styles.sectionMenuItem, translate, waitForNavigate, policies]);
 
     return (
         <ScreenWrapper
@@ -126,7 +125,4 @@ export default withOnyx<AllSettingsScreenProps, AllSettingsScreenOnyxProps>({
     policies: {
         key: ONYXKEYS.COLLECTION.POLICY,
     },
-    policyMembers: {
-        key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-    },
 })(AllSettingsScreen);
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 73bd031b5978..b535165e86bc 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -71,9 +71,6 @@ type InitialSettingsPageOnyxProps = {
 
     /** The policies which the user has access to */
     policies: OnyxCollection<OnyxTypes.Policy>;
-
-    /** Members of all the workspaces the user is member of */
-    policyMembers: OnyxCollection<OnyxTypes.PolicyMembers>;
 };
 
 type InitialSettingsPageProps = InitialSettingsPageOnyxProps & WithCurrentUserPersonalDetailsProps;
@@ -98,7 +95,7 @@ type MenuData = {
 
 type Menu = {sectionStyle: StyleProp<ViewStyle>; sectionTranslationKey: TranslationPaths; items: MenuData[]};
 
-function InitialSettingsPage({session, userWallet, bankAccountList, fundList, walletTerms, loginList, currentUserPersonalDetails, policies, policyMembers}: InitialSettingsPageProps) {
+function InitialSettingsPage({session, userWallet, bankAccountList, fundList, walletTerms, loginList, currentUserPersonalDetails, policies}: InitialSettingsPageProps) {
     const network = useNetwork();
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -189,7 +186,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                 translationKey: 'common.workspaces',
                 icon: Expensicons.Building,
                 routeName: ROUTES.SETTINGS_WORKSPACES,
-                brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies, policyMembers) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             },
             {
                 translationKey: 'allSettingsScreen.cardsAndDomains',
@@ -221,7 +218,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
             sectionTranslationKey: 'common.workspaces',
             items,
         };
-    }, [policies, policyMembers, styles.workspaceSettingsSectionContainer]);
+    }, [policies, styles.workspaceSettingsSectionContainer]);
 
     /**
      * Retuns a list of menu items data for general section
@@ -529,8 +526,5 @@ export default withCurrentUserPersonalDetails(
         policies: {
             key: ONYXKEYS.COLLECTION.POLICY,
         },
-        policyMembers: {
-            key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-        },
     })(InitialSettingsPage),
 );
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 0d3bb027b8e6..1eef3ad214c5 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -60,7 +60,7 @@ function dismissError(policyID: string) {
     Policy.removeWorkspace(policyID);
 }
 
-function WorkspaceInitialPage({policyDraft, policy: policyProp, policyMembers, reimbursementAccount, policyCategories}: WorkspaceInitialPageProps) {
+function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAccount, policyCategories}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
     const policy = policyDraft?.id ? policyDraft : policyProp;
     const [isCurrencyModalOpen, setIsCurrencyModalOpen] = useState(false);
@@ -99,7 +99,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, policyMembers, r
         ReimbursementAccount.navigateToBankAccountRoute(policyID);
     }, [policyID, policyName]);
 
-    const hasMembersError = PolicyUtils.hasPolicyMemberError(policyMembers);
+    const hasMembersError = PolicyUtils.hasEmployeeListError(policy);
     const hasPolicyCategoryError = PolicyUtils.hasPolicyCategoriesError(policyCategories);
     const hasGeneralSettingsError = !isEmptyObject(policy?.errorFields?.generalSettings ?? {}) || !isEmptyObject(policy?.errorFields?.avatar ?? {});
     const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policy);
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 549d307b2a2f..721aa41c7675 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -36,7 +36,7 @@ import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PolicyMembers, Policy as PolicyType, ReimbursementAccount, Report} from '@src/types/onyx';
+import type {Policy as PolicyType, ReimbursementAccount, Report} from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
@@ -74,9 +74,6 @@ type WorkspaceListPageOnyxProps = {
     /** Bank account attached to free plan */
     reimbursementAccount: OnyxEntry<ReimbursementAccount>;
 
-    /** A collection of objects for all policies which key policy member objects by accountIDs */
-    allPolicyMembers: OnyxCollection<PolicyMembers>;
-
     /** All reports shared with the user (coming from Onyx) */
     reports: OnyxCollection<Report>;
 };
@@ -114,7 +111,7 @@ function dismissWorkspaceError(policyID: string, pendingAction: OnyxCommon.Pendi
     throw new Error('Not implemented');
 }
 
-function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, reports}: WorkspaceListPageProps) {
+function WorkspacesListPage({policies, reimbursementAccount, reports}: WorkspaceListPageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -322,7 +319,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, r
                     title: policy.name,
                     icon: policy.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
                     action: () => Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policy.id)),
-                    brickRoadIndicator: reimbursementAccountBrickRoadIndicator ?? PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, allPolicyMembers),
+                    brickRoadIndicator: reimbursementAccountBrickRoadIndicator ?? PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy),
                     pendingAction: policy.pendingAction,
                     errors: policy.errors,
                     dismissError: () => {
@@ -344,7 +341,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, r
                 };
             })
             .sort((a, b) => localeCompare(a.title, b.title));
-    }, [reimbursementAccount?.errors, policies, isOffline, theme.textLight, allPolicyMembers, policyRooms]);
+    }, [reimbursementAccount?.errors, policies, isOffline, theme.textLight, policyRooms]);
 
     if (isEmptyObject(workspaces)) {
         return (
@@ -435,9 +432,6 @@ export default withPolicyAndFullscreenLoading(
         policies: {
             key: ONYXKEYS.COLLECTION.POLICY,
         },
-        allPolicyMembers: {
-            key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-        },
         // @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM
         reimbursementAccount: {
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx
index 16af069fa0a2..0f276a9c53e3 100644
--- a/src/pages/workspace/withPolicy.tsx
+++ b/src/pages/workspace/withPolicy.tsx
@@ -94,7 +94,6 @@ type WithPolicyOnyxProps = {
     policy: OnyxEntry<OnyxTypes.Policy>;
     policyMembers: OnyxEntry<OnyxTypes.PolicyMembers>;
     policyDraft: OnyxEntry<OnyxTypes.Policy>;
-    policyMembersDraft: OnyxEntry<OnyxTypes.PolicyMember>;
 };
 
 type WithPolicyProps = WithPolicyOnyxProps & {
@@ -105,7 +104,6 @@ const policyDefaultProps: WithPolicyOnyxProps = {
     policy: {} as OnyxTypes.Policy,
     policyMembers: {},
     policyDraft: {} as OnyxTypes.Policy,
-    policyMembersDraft: {},
 };
 
 /*
@@ -142,9 +140,6 @@ export default function <TProps extends WithPolicyProps, TRef>(WrappedComponent:
         policyDraft: {
             key: (props) => `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${getPolicyIDFromRoute(props.route)}`,
         },
-        policyMembersDraft: {
-            key: (props) => `${ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS}${getPolicyIDFromRoute(props.route)}`,
-        },
     })(forwardRef(WithPolicy));
 }
 
diff --git a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
index 93e10cc1760c..959d6f9290e0 100644
--- a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
+++ b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
@@ -29,7 +29,6 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
             policy = policyDefaultProps.policy,
             policyDraft = policyDefaultProps.policyDraft,
             policyMembers = policyDefaultProps.policyMembers,
-            policyMembersDraft = policyDefaultProps.policyMembersDraft,
             ...rest
         }: TProps,
         ref: ForwardedRef<TRef>,
@@ -46,7 +45,6 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
                 policy={policy}
                 policyDraft={policyDraft}
                 policyMembers={policyMembers}
-                policyMembersDraft={policyMembersDraft}
                 ref={ref}
             />
         );

From aa7017cd6ae558300b5b3f4aa2c67c7a3abaed93 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 3 Apr 2024 18:31:32 +0530
Subject: [PATCH 078/383] More translation fix

---
 src/components/MoneyRequestConfirmationList.tsx             | 4 ++--
 .../MoneyTemporaryForRefactorRequestConfirmationList.js     | 4 ++--
 src/languages/en.ts                                         | 6 +++---
 src/languages/es.ts                                         | 6 +++---
 src/libs/ReportUtils.ts                                     | 4 ++--
 .../MoneyTemporaryForRefactorRequestParticipantsSelector.js | 2 +-
 .../MoneyRequestParticipantsSelector.js                     | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index e9bec06030a6..879136ba2a92 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -345,10 +345,10 @@ function MoneyRequestConfirmationList({
         } else if ((!!receiptPath && isTypeRequest) || isDistanceRequestWithPendingRoute) {
             text = translate('iou.expense');
             if (iouAmount !== 0) {
-                text = translate('iou.requestAmount', {amount: formattedAmount});
+                text = translate('iou.submitAmount', {amount: formattedAmount});
             }
         } else {
-            const translationKey = isSplitBill ? 'iou.splitAmount' : 'iou.requestAmount';
+            const translationKey = isSplitBill ? 'iou.splitAmount' : 'iou.submitAmount';
             text = translate(translationKey, {amount: formattedAmount});
         }
         return [
diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index aa300ba39e3b..878dca79a497 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -408,10 +408,10 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
         } else if ((receiptPath && isTypeRequest) || isDistanceRequestWithPendingRoute) {
             text = translate('iou.submitExpense');
             if (iouAmount !== 0) {
-                text = translate('iou.requestAmount', {amount: formattedAmount});
+                text = translate('iou.submitAmount', {amount: formattedAmount});
             }
         } else {
-            const translationKey = isTypeSplit ? 'iou.splitAmount' : 'iou.requestAmount';
+            const translationKey = isTypeSplit ? 'iou.splitAmount' : 'iou.submitAmount';
             text = translate(translationKey, {amount: formattedAmount});
         }
         return [
diff --git a/src/languages/en.ts b/src/languages/en.ts
index c48f04f5f1de..2370da18f4ef 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -647,8 +647,8 @@ export default {
         payElsewhere: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} elsewhere` : `Pay elsewhere`),
         nextStep: 'Next Steps',
         finished: 'Finished',
-        requestAmount: ({amount}: RequestAmountParams) => `request ${amount}`, // TODO: Need to update this
-        requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `expense of ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
+        submitAmount: ({amount}: RequestAmountParams) => `submit ${amount}`,
+        expensedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `expensed ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `split ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
@@ -700,7 +700,7 @@ export default {
             genericSmartscanFailureMessage: 'Transaction is missing fields',
             duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
             atLeastTwoDifferentWaypoints: 'Please enter at least two different addresses',
-            splitBillMultipleParticipantsErrorMessage: 'Split bill is only allowed between a single workspace or individual users. Please update your selection.',
+            splitExpenseMultipleParticipantsErrorMessage: 'Split expense is only allowed between a single workspace or individual users. Please update your selection.',
             invalidMerchant: 'Please enter a correct merchant.',
         },
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index a7acaa2d767b..be1171ce185c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -648,8 +648,8 @@ export default {
         payElsewhere: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pagar ${formattedAmount} de otra forma` : `Pagar de otra forma`),
         nextStep: 'Pasos Siguientes',
         finished: 'Finalizado',
-        requestAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
-        requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicité ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
+        submitAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
+        expensedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicité ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `seguimiento ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `dividió ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
@@ -703,7 +703,7 @@ export default {
             genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
             duplicateWaypointsErrorMessage: 'Por favor, elimina los puntos de ruta duplicados',
             atLeastTwoDifferentWaypoints: 'Por favor, introduce al menos dos direcciones diferentes',
-            splitBillMultipleParticipantsErrorMessage: 'Solo puedes dividir una cuenta entre un único espacio de trabajo o con usuarios individuales. Por favor, actualiza tu selección.',
+            splitExpenseMultipleParticipantsErrorMessage: 'Solo puedes dividir una cuenta entre un único espacio de trabajo o con usuarios individuales. Por favor, actualiza tu selección.',
             invalidMerchant: 'Por favor, introduce un comerciante correcto.',
         },
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 7cb6469c1c16..38ef04bb49bd 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2636,7 +2636,7 @@ function getReportPreviewMessage(
 
             const transactionDetails = getTransactionDetails(linkedTransaction);
             const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency ?? '');
-            return Localize.translateLocal('iou.trackedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
+            return Localize.translateLocal('iou.expensedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
         }
     }
 
@@ -5281,7 +5281,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>)
     if (ReportActionsUtils.isSplitBillAction(reportAction)) {
         translationKey = 'iou.didSplitAmount';
     } else if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
-        translationKey = 'iou.trackedAmount';
+        translationKey = 'iou.expensedAmount';
     } else {
         translationKey = 'iou.requestedAmount';
     }
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 2e5cc966fa5c..defe593e2fc2 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -299,7 +299,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
                     <FormHelpMessage
                         style={[styles.ph1, styles.mb2]}
                         isError
-                        message="iou.error.splitBillMultipleParticipantsErrorMessage"
+                        message="iou.error.splitExpenseMultipleParticipantsErrorMessage"
                     />
                 )}
 
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
index ec98bd4eb50f..3fdc85791d79 100755
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -292,7 +292,7 @@ function MoneyRequestParticipantsSelector({
                     <FormHelpMessage
                         style={[styles.ph1, styles.mb2]}
                         isError
-                        message="iou.error.splitBillMultipleParticipantsErrorMessage"
+                        message="iou.error.splitExpenseMultipleParticipantsErrorMessage"
                     />
                 )}
 

From 375cd74208b0a2407c71c3f1321a33008aeca548 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 3 Apr 2024 18:37:25 +0530
Subject: [PATCH 079/383] More translation fix

---
 .well-known/apple-app-site-association                    | 8 ++++----
 .../MoneyTemporaryForRefactorRequestConfirmationList.js   | 2 +-
 src/libs/ReportUtils.ts                                   | 6 +++---
 src/libs/actions/IOU.ts                                   | 6 +++---
 src/pages/iou/SplitBillDetailsPage.tsx                    | 2 +-
 src/pages/iou/request/step/IOURequestStepConfirmation.js  | 2 +-
 tests/actions/IOUTest.ts                                  | 2 +-
 tests/unit/ReportUtilsTest.js                             | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
index b3adf0f59b9c..a156d919c020 100644
--- a/.well-known/apple-app-site-association
+++ b/.well-known/apple-app-site-association
@@ -34,7 +34,7 @@
                     },
                     {
                         "/": "/request/*",
-                        "comment": "Money request"
+                        "comment": "Submit Expense"
                     },
                     {
                         "/": "/enable-payments/*",
@@ -54,11 +54,11 @@
                     },
                     {
                         "/": "/split/*",
-                        "comment": "Split Bill"
+                        "comment": "Split Expense"
                     },
                     {
                         "/": "/request/*",
-                        "comment": "Request Money"
+                        "comment": "Submit Expense"
                     },
                     {
                         "/": "/new/*",
@@ -82,7 +82,7 @@
                     },
                     {
                         "/": "/send/*",
-                        "comment": "Send money"
+                        "comment": "Pay Someone"
                     },
                     {
                         "/": "/money2020/*",
diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 878dca79a497..1a9752328f6c 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -394,7 +394,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
         [iouAmount, iouCurrencyCode],
     );
 
-    // If completing a split bill fails, set didConfirm to false to allow the user to edit the fields again
+    // If completing a split expense fails, set didConfirm to false to allow the user to edit the fields again
     if (isEditingSplitBill && didConfirm) {
         setDidConfirm(false);
     }
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 38ef04bb49bd..119b5de07cb3 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2597,7 +2597,7 @@ function getReportPreviewMessage(
     }
 
     if (!isEmptyObject(iouReportAction) && !isIOUReport(report) && iouReportAction && ReportActionsUtils.isSplitBillAction(iouReportAction)) {
-        // This covers group chats where the last action is a split bill action
+        // This covers group chats where the last action is a split expense action
         const linkedTransaction = getLinkedTransaction(iouReportAction);
         if (isEmptyObject(linkedTransaction)) {
             return reportActionMessage;
@@ -3439,7 +3439,7 @@ function buildOptimisticIOUReportAction(
     // IOUs of type split only exist in group DMs and those don't have an iouReport so we need to delete the IOUReportID key
     if (type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT) {
         delete originalMessage.IOUReportID;
-        // Split bill made from a policy expense chat only have the payee's accountID as the participant because the payer could be any policy admin
+        // Split expense made from a policy expense chat only have the payee's accountID as the participant because the payer could be any policy admin
         if (isOwnPolicyExpenseChat) {
             originalMessage.participantAccountIDs = currentUserAccountID ? [currentUserAccountID] : [];
         } else {
@@ -5492,7 +5492,7 @@ function getNonHeldAndFullAmount(iouReport: OnyxEntry<Report>): string[] {
  * Disable reply in thread action if:
  *
  * - The action is listed in the thread-disabled list
- * - The action is a split bill action
+ * - The action is a split expense action
  * - The action is deleted and is not threaded
  * - The report is archived and the action is not threaded
  * - The action is a whisper action and it's neither a report preview nor IOU action
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index cd23e3e3dab3..54f08379074e 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2334,7 +2334,7 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string,
  *      {email: 'user3', amount: 100, iouReportID: '200', chatReportID: '210', transactionID: '220', reportActionID: '230'}
  *  ]
  * @param amount - always in the smallest unit of the currency
- * @param existingSplitChatReportID - the report ID where the split bill happens, could be a group chat or a workspace chat
+ * @param existingSplitChatReportID - the report ID where the split expense happens, could be a group chat or a workspace chat
  */
 function createSplitsAndOnyxData(
     participants: Participant[],
@@ -3103,7 +3103,7 @@ function startSplitBill(
     Report.notifyNewAction(splitChatReport.chatReportID ?? '', currentUserAccountID);
 }
 
-/** Used for editing a split bill while it's still scanning or when SmartScan fails, it completes a split bill started by startSplitBill above.
+/** Used for editing a split expense while it's still scanning or when SmartScan fails, it completes a split expense started by startSplitBill above.
  *
  * @param chatReportID - The group chat or workspace reportID
  * @param reportAction - The split action that lives in the chatReport above
@@ -3205,7 +3205,7 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
         let oneOnOneChatReport: OnyxTypes.Report | null;
         let isNewOneOnOneChatReport = false;
         if (isPolicyExpenseChat) {
-            // The workspace chat reportID is saved in the splits array when starting a split bill with a workspace
+            // The workspace chat reportID is saved in the splits array when starting a split expense with a workspace
             oneOnOneChatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.chatReportID}`] ?? null;
         } else {
             const existingChatReport = ReportUtils.getChatByParticipants(participant.accountID ? [participant.accountID] : []);
diff --git a/src/pages/iou/SplitBillDetailsPage.tsx b/src/pages/iou/SplitBillDetailsPage.tsx
index 91aa37dd01c2..8253eb503289 100644
--- a/src/pages/iou/SplitBillDetailsPage.tsx
+++ b/src/pages/iou/SplitBillDetailsPage.tsx
@@ -60,7 +60,7 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
     const reportAction = useMemo(() => reportActions?.[route.params.reportActionID] ?? ({} as ReportAction), [reportActions, route.params.reportActionID]);
     const participantAccountIDs = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? reportAction?.originalMessage.participantAccountIDs ?? [] : [];
 
-    // In case this is workspace split bill, we manually add the workspace as the second participant of the split bill
+    // In case this is workspace split expense, we manually add the workspace as the second participant of the split expense
     // because we don't save any accountID in the report action's originalMessage other than the payee's accountID
     let participants: Array<Participant | ReportUtils.OptionData>;
     if (ReportUtils.isPolicyExpenseChat(report)) {
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 4f4a2cfcc4db..ef75252ad4f9 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -305,7 +305,7 @@ function IOURequestStepConfirmation({
 
             formHasBeenSubmitted.current = true;
 
-            // If we have a receipt let's start the split bill by creating only the action, the transaction, and the group DM if needed
+            // If we have a receipt let's start the split expense by creating only the action, the transaction, and the group DM if needed
             if (iouType === CONST.IOU.TYPE.SPLIT && receiptFile) {
                 IOU.startSplitBill(
                     selectedParticipants,
diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
index 1df10f72e4cf..30857e2c7ebc 100644
--- a/tests/actions/IOUTest.ts
+++ b/tests/actions/IOUTest.ts
@@ -922,7 +922,7 @@ describe('actions/IOU', () => {
         });
     });
 
-    describe('split bill', () => {
+    describe('split expense', () => {
         it('creates and updates new chats and IOUs as needed', () => {
             jest.setTimeout(10 * 1000);
             /*
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index 4bd7213879e6..17ef39e4b8f9 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -648,7 +648,7 @@ describe('ReportUtils', () => {
             expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
         });
 
-        it('should disable thread on split bill actions', () => {
+        it('should disable thread on split expense actions', () => {
             const reportAction = ReportUtils.buildOptimisticIOUReportAction(
                 CONST.IOU.REPORT_ACTION_TYPE.SPLIT,
                 50000,

From 027421d920ba0b2b7f131376becdc27f9c5578a3 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 3 Apr 2024 18:40:47 +0530
Subject: [PATCH 080/383] Fixing the mistakes

---
 src/libs/ReportUtils.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 119b5de07cb3..82fa7db01a09 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2720,7 +2720,7 @@ function getReportPreviewMessage(
 
         // We only want to show the actor name in the preview if it's not the current user who took the action
         const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : '';
-        return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay, comment})}`;
+        return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.expensedAmount', {formattedAmount: amountToDisplay, comment})}`;
     }
 
     if (containsNonReimbursable) {
@@ -5281,9 +5281,9 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>)
     if (ReportActionsUtils.isSplitBillAction(reportAction)) {
         translationKey = 'iou.didSplitAmount';
     } else if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
-        translationKey = 'iou.expensedAmount';
+        translationKey = 'iou.trackedAmount';
     } else {
-        translationKey = 'iou.requestedAmount';
+        translationKey = 'iou.expensedAmount';
     }
     return Localize.translateLocal(translationKey, {
         formattedAmount,

From 5e84a328e13c1d1e00643cfc7990426231fc11e1 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 3 Apr 2024 17:57:01 +0200
Subject: [PATCH 081/383] Remove policyMembersDraft and policyMembers part-2

---
 src/libs/actions/Policy.ts | 18 ++++++++++++------
 src/types/onyx/Policy.ts   |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 356eb440e3ca..9287d20a7bcc 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -1781,10 +1781,13 @@ function updateWorkspaceCustomUnitAndRate(policyID: string, currentCustomUnit: C
  * Removes an error after trying to delete a member
  */
 function clearDeleteMemberError(policyID: string, accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`, {
-        [accountID]: {
-            pendingAction: null,
-            errors: null,
+    const email = allPersonalDetails?.[accountID]?.login ?? '';
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        employeeList: {
+            [email]: {
+                pendingAction: null,
+                errors: null,
+            },
         },
     });
 }
@@ -1793,8 +1796,11 @@ function clearDeleteMemberError(policyID: string, accountID: number) {
  * Removes an error after trying to add a member
  */
 function clearAddMemberError(policyID: string, accountID: number) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`, {
-        [accountID]: null,
+    const email = allPersonalDetails?.[accountID]?.login ?? '';
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        employeeList: {
+            [email]: null,
+        },
     });
     Onyx.merge(`${ONYXKEYS.PERSONAL_DETAILS_LIST}`, {
         [accountID]: null,
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index ddb0c33c2f0c..4a814938c6ba 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -329,7 +329,7 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         submitsTo?: number;
 
         /** The employee list of the policy */
-        employeeList?: OnyxTypes.PolicyMembers | [];
+        employeeList?: OnyxTypes.PolicyMembers;
 
         /** The reimbursement choice for policy */
         reimbursementChoice?: ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES>;

From 819b7b367c57fae41cd14cc61f03420d39169626 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 3 Apr 2024 22:05:39 +0530
Subject: [PATCH 082/383] fixes lint

---
 .../MoneyTemporaryForRefactorRequestParticipantsSelector.js     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index a2c97a34465c..55e48e00bfb5 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -25,8 +25,6 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as ReportUtils from '@libs/ReportUtils';
-import reportPropTypes from '@pages/reportPropTypes';
 import variables from '@styles/variables';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';

From a76bcb051ca2751fd58d37fc48f231a76b0ade12 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 3 Apr 2024 23:16:04 +0530
Subject: [PATCH 083/383] fixes crash after converting request

---
 ...emporaryForRefactorRequestConfirmationList.js |  9 ++++++++-
 src/libs/ReportUtils.ts                          |  4 ++--
 src/libs/actions/IOU.ts                          |  2 +-
 ...raryForRefactorRequestParticipantsSelector.js | 16 +++++++++++++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index b0218a1f21fc..ee22fb7364a2 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -706,7 +706,14 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                             return;
                         }
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(iouAction, CONST.IOU.ACTION.CREATE, iouType, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(
+                                iouAction,
+                                CONST.IOU.ACTION.CREATE,
+                                iouType,
+                                transaction.transactionID,
+                                reportID,
+                                Navigation.getActiveRouteWithoutParams(),
+                            ),
                         );
                     }}
                     style={[styles.moneyRequestMenuItem, styles.mt2]}
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 45cba0acf99c..bf4d8ec70c6c 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2584,7 +2584,7 @@ function getReportPreviewMessage(
     isForListPreview = false,
     originalReportAction: OnyxEntry<ReportAction> | EmptyObject = iouReportAction,
 ): string {
-    const reportActionMessage = iouReportAction?.message?.[0].html ?? '';
+    const reportActionMessage = iouReportAction?.message?.[0]?.html ?? '';
 
     if (isEmptyObject(report) || !report?.reportID) {
         // The iouReport is not found locally after SignIn because the OpenApp API won't return iouReports if they're settled
@@ -5703,7 +5703,7 @@ function hasActionsWithErrors(reportID: string): boolean {
 }
 
 function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>, reportActionID: string): void {
-    const transaction = getTransaction(transactionID);
+    const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction);
     const reportActions = ReportActionsUtils.getAllReportActions(reportID);
 
     if (!transaction || !reportActions) {
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 1657bbd97a49..78fc2af742dc 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2348,7 +2348,7 @@ function requestMoney(
                 createdChatReportActionID,
                 moneyRequestReportID: iouReport.reportID,
                 moneyRequestCreatedReportActionID: createdIOUReportActionID,
-                moneyRequestPreviewReportActionID: reportPreviewAction.reportActionID,
+                moneyRequestPreviewReportActionID: iouAction.reportActionID,
                 // modifiedExpenseReportActionID - not sure what need to be done here maybe `buildOptimisticModifiedExpenseReportAction` with transaction changes
             };
 
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 55e48e00bfb5..433447484fd1 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -185,7 +185,21 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
         }
 
         return [newSections, chatOptions];
-    }, [areOptionsInitialized, options.reports, options.personalDetails, betas, debouncedSearchTerm, participants, iouType, iouAction, canUseP2PDistanceRequests, iouRequestType, maxParticipantsReached, personalDetails, translate]);
+    }, [
+        areOptionsInitialized,
+        options.reports,
+        options.personalDetails,
+        betas,
+        debouncedSearchTerm,
+        participants,
+        iouType,
+        iouAction,
+        canUseP2PDistanceRequests,
+        iouRequestType,
+        maxParticipantsReached,
+        personalDetails,
+        translate,
+    ]);
 
     /**
      * Adds a single participant to the request

From e154c4a6a634919ab2c0e82f8459040f1bcbc53e Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 3 Apr 2024 21:18:09 +0200
Subject: [PATCH 084/383] Remove policyMembersDraft and policyMembers part-3

---
 src/libs/PolicyUtils.ts                       |  33 ++---
 src/libs/actions/Policy.ts                    |   1 +
 src/pages/workspace/WorkspaceInvitePage.tsx   |  17 +--
 src/pages/workspace/WorkspaceMembersPage.tsx  | 126 +++++++++---------
 .../members/WorkspaceMemberDetailsPage.tsx    |  17 +--
 ...orkspaceMemberDetailsRoleSelectionPage.tsx |   5 +-
 .../withPolicyAndFullscreenLoading.tsx        |  15 ++-
 .../WorkspaceWorkflowsApproverPage.tsx        |  12 +-
 .../workflows/WorkspaceWorkflowsPayerPage.tsx |  22 +--
 9 files changed, 109 insertions(+), 139 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 7ff74f8af98e..d48fdd11527b 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -28,7 +28,7 @@ function getActivePolicies(policies: OnyxCollection<Policy>): Policy[] | undefin
  * Checks if we have any errors stored within the POLICY_MEMBERS. Determines whether we should show a red brick road error or not.
  */
 function hasEmployeeListError(policy: OnyxEntry<Policy>): boolean {
-	return Object.values(policy?.employeeList ?? {}).some((employee) => Object.keys(employee?.errors ?? {}).length > 0);
+    return Object.values(policy?.employeeList ?? {}).some((employee) => Object.keys(employee?.errors ?? {}).length > 0);
 }
 
 /**
@@ -90,10 +90,10 @@ function getUnitRateValue(toLocaleDigit: (arg: string) => string, customUnitRate
  * Get the brick road indicator status for a policy. The policy has an error status if there is a policy member error, a custom unit error or a field error.
  */
 function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined {
-	if (hasEmployeeListError(policy) || hasCustomUnitsError(policy) || hasPolicyErrorFields(policy)) {
-					return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
-	}
-	return undefined;
+    if (hasEmployeeListError(policy) || hasCustomUnitsError(policy) || hasPolicyErrorFields(policy)) {
+        return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
+    }
+    return undefined;
 }
 
 /**
@@ -133,18 +133,19 @@ const isPolicyMember = (policyID: string, policies: OnyxCollection<Policy>): boo
  *
  * We only return members without errors. Otherwise, the members with errors would immediately be removed before the user has a chance to read the error.
  */
-function getMemberAccountIDsForWorkspace(policyMembers: OnyxEntry<PolicyMembers>, personalDetails: OnyxEntry<PersonalDetailsList>): MemberEmailsToAccountIDs {
+function getMemberAccountIDsForWorkspace(policy: OnyxEntry<Policy>, personalDetails: OnyxEntry<PersonalDetailsList>): MemberEmailsToAccountIDs {
+    const members = policy?.employeeList ?? {};
     const memberEmailsToAccountIDs: MemberEmailsToAccountIDs = {};
-    Object.keys(policyMembers ?? {}).forEach((accountID) => {
-        const member = policyMembers?.[accountID];
+    Object.keys(members).forEach((email) => {
+        const member = members?.[email];
         if (Object.keys(member?.errors ?? {})?.length > 0) {
             return;
         }
-        const personalDetail = personalDetails?.[accountID];
+        const personalDetail = Object.values(personalDetails ?? {})?.find((details) => details?.login === email);
         if (!personalDetail?.login) {
             return;
         }
-        memberEmailsToAccountIDs[personalDetail.login] = Number(accountID);
+        memberEmailsToAccountIDs[email] = Number(personalDetail.accountID);
     });
     return memberEmailsToAccountIDs;
 }
@@ -152,19 +153,19 @@ function getMemberAccountIDsForWorkspace(policyMembers: OnyxEntry<PolicyMembers>
 /**
  * Get login list that we should not show in the workspace invite options
  */
-function getIneligibleInvitees(policyMembers: OnyxEntry<PolicyMembers>, personalDetails: OnyxEntry<PersonalDetailsList>): string[] {
+function getIneligibleInvitees(policy: OnyxEntry<Policy>): string[] {
+    const members = policy?.employeeList ?? {};
     const memberEmailsToExclude: string[] = [...CONST.EXPENSIFY_EMAILS];
-    Object.keys(policyMembers ?? {}).forEach((accountID) => {
-        const policyMember = policyMembers?.[accountID];
+    Object.keys(members).forEach((email) => {
+        const policyMember = members?.[email];
         // Policy members that are pending delete or have errors are not valid and we should show them in the invite options (don't exclude them).
         if (policyMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policyMember?.errors ?? {}).length > 0) {
             return;
         }
-        const memberEmail = personalDetails?.[accountID]?.login;
-        if (!memberEmail) {
+        if (!email) {
             return;
         }
-        memberEmailsToExclude.push(memberEmail);
+        memberEmailsToExclude.push(email);
     });
 
     return memberEmailsToExclude;
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 9287d20a7bcc..a718e526bb07 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -1973,6 +1973,7 @@ function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName
         expenseReportActionData,
         expenseCreatedReportActionID,
     } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
+
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.SET,
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index a8354cfd3276..5c53527bf688 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -30,7 +30,7 @@ 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 {Beta, InvitedEmailsToAccountIDs} from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import SearchInputManager from './SearchInputManager';
@@ -40,9 +40,6 @@ import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscree
 type MembersSection = SectionListData<MemberForList, Section<MemberForList>>;
 
 type WorkspaceInvitePageOnyxProps = {
-    /** All of the personal details for everyone */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-
     /** Beta features list */
     betas: OnyxEntry<Beta[]>;
 
@@ -57,7 +54,6 @@ type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
 
 function WorkspaceInvitePage({
     route,
-    policyMembers,
     personalDetails: personalDetailsProp,
     betas,
     invitedEmailsToAccountIDsDraft,
@@ -72,7 +68,7 @@ function WorkspaceInvitePage({
     const [personalDetails, setPersonalDetails] = useState<OptionData[]>([]);
     const [usersToInvite, setUsersToInvite] = useState<OptionData[]>([]);
     const openWorkspaceInvitePage = () => {
-        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policyMembers, personalDetailsProp);
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy, personalDetailsProp);
         Policy.openWorkspaceInvitePage(route.params.policyID, Object.keys(policyMemberEmailsToAccountIDs));
     };
 
@@ -91,7 +87,7 @@ function WorkspaceInvitePage({
 
     useNetwork({onReconnect: openWorkspaceInvitePage});
 
-    const excludedUsers = useMemo(() => PolicyUtils.getIneligibleInvitees(policyMembers, personalDetailsProp), [policyMembers, personalDetailsProp]);
+    const excludedUsers = useMemo(() => PolicyUtils.getIneligibleInvitees(policy), [policy]);
 
     useEffect(() => {
         const newUsersToInviteDict: Record<number, OptionData> = {};
@@ -100,7 +96,7 @@ function WorkspaceInvitePage({
 
         const inviteOptions = OptionsListUtils.getMemberInviteOptions(personalDetailsProp, betas ?? [], searchTerm, excludedUsers, true);
 
-        // Update selectedOptions with the latest personalDetails and policyMembers information
+        // Update selectedOptions with the latest personalDetails and employeeList information
         const detailsMap: Record<string, MemberForList> = {};
         inviteOptions.personalDetails.forEach((detail) => {
             if (!detail.login) {
@@ -150,7 +146,7 @@ function WorkspaceInvitePage({
         setSelectedOptions(Object.values(newSelectedOptionsDict));
 
         // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
-    }, [personalDetailsProp, policyMembers, betas, searchTerm, excludedUsers]);
+    }, [personalDetailsProp, policy?.employeeList, betas, searchTerm, excludedUsers]);
 
     const sections: MembersSection[] = useMemo(() => {
         const sectionsArr: MembersSection[] = [];
@@ -330,9 +326,6 @@ WorkspaceInvitePage.displayName = 'WorkspaceInvitePage';
 export default withNavigationTransitionEnd(
     withPolicyAndFullscreenLoading(
         withOnyx<WorkspaceInvitePageProps, WorkspaceInvitePageOnyxProps>({
-            personalDetails: {
-                key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-            },
             betas: {
                 key: ONYXKEYS.BETAS,
             },
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 7b77f6b60ede..3fae61616f3f 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -49,9 +49,6 @@ import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscree
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
 
 type WorkspaceMembersPageOnyxProps = {
-    /** Personal details of all users */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-
     /** Session info for the currently logged in user. */
     session: OnyxEntry<Session>;
 
@@ -73,37 +70,28 @@ function invertObject(object: Record<string, string>): Record<string, string> {
     return inverted;
 }
 
-type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
-
-function WorkspaceMembersPage({
-    policyMembers,
-    personalDetails,
-    invitedEmailsToAccountIDsDraft,
-    route,
-    policy,
-    session,
-    currentUserPersonalDetails,
-    isLoadingReportData = true,
-}: WorkspaceMembersPageProps) {
+type MemberOption = Omit<ListItem, 'accountID'> & {email: string; accountID: number};
+
+function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft, route, policy, session, currentUserPersonalDetails, isLoadingReportData = true}: WorkspaceMembersPageProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const [selectedEmployees, setSelectedEmployees] = useState<number[]>([]);
+    const [selectedEmployees, setSelectedEmployees] = useState<string[]>([]);
     const [removeMembersConfirmModalVisible, setRemoveMembersConfirmModalVisible] = useState(false);
     const [errors, setErrors] = useState({});
     const {isOffline} = useNetwork();
     const prevIsOffline = usePrevious(isOffline);
-    const accountIDs = useMemo(() => Object.keys(policyMembers ?? {}).map((accountID) => Number(accountID)), [policyMembers]);
-    const prevAccountIDs = usePrevious(accountIDs);
+    const accountEmails = useMemo(() => Object.keys(policy?.employeeList ?? {}).map((email) => email), [policy?.employeeList]);
+    const prevAccountEmails = usePrevious(accountEmails);
     const textInputRef = useRef<TextInput>(null);
-    const isOfflineAndNoMemberDataAvailable = isEmptyObject(policyMembers) && isOffline;
+    const isOfflineAndNoMemberDataAvailable = isEmptyObject(policy?.employeeList ?? {}) && isOffline;
     const prevPersonalDetails = usePrevious(personalDetails);
     const {translate, formatPhoneNumber, preferredLocale} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const dropdownButtonRef = useRef(null);
     const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
     const isLoading = useMemo(
-        () => !isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(personalDetails) || isEmptyObject(policyMembers)),
-        [isOfflineAndNoMemberDataAvailable, personalDetails, policyMembers],
+        () => !isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(personalDetails) || isEmptyObject(policy?.employeeList ?? {})),
+        [isOfflineAndNoMemberDataAvailable, personalDetails, policy?.employeeList],
     );
     const selectionListRef = useRef<SelectionListHandle>(null);
     const isFocused = useIsFocused();
@@ -113,12 +101,13 @@ function WorkspaceMembersPage({
     /**
      * Get filtered personalDetails list with current policyMembers
      */
-    const filterPersonalDetails = (members: OnyxEntry<PolicyMembers>, details: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
+    const filterPersonalDetails = (members: OnyxEntry<PolicyMembers>, personalDetailsList: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
         Object.keys(members ?? {}).reduce((result, key) => {
-            if (details?.[key]) {
+            const details = Object.values(personalDetailsList ?? {}).find((currentDetails) => currentDetails?.login === key);
+            if (details) {
                 return {
                     ...result,
-                    [key]: details[key],
+                    [key]: details,
                 };
             }
             return result;
@@ -128,8 +117,8 @@ function WorkspaceMembersPage({
      * Get members for the current workspace
      */
     const getWorkspaceMembers = useCallback(() => {
-        Policy.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policyMembers, personalDetails)));
-    }, [route.params.policyID, policyMembers, personalDetails]);
+        Policy.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy, personalDetails)));
+    }, [route.params.policyID, policy, personalDetails]);
 
     /**
      * Check if the current selection includes members that cannot be removed
@@ -137,7 +126,8 @@ function WorkspaceMembersPage({
     const validateSelection = useCallback(() => {
         const newErrors: Errors = {};
         selectedEmployees.forEach((member) => {
-            if (member !== policy?.ownerAccountID && member !== session?.accountID) {
+            const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === member);
+            if (details?.accountID !== policy?.ownerAccountID && details?.accountID !== session?.accountID) {
                 return;
             }
             newErrors[member] = translate('workspace.people.error.cannotRemove');
@@ -156,25 +146,25 @@ function WorkspaceMembersPage({
     }, [preferredLocale, validateSelection]);
 
     useEffect(() => {
-        if (removeMembersConfirmModalVisible && !lodashIsEqual(accountIDs, prevAccountIDs)) {
+        if (removeMembersConfirmModalVisible && !lodashIsEqual(accountEmails, prevAccountEmails)) {
             setRemoveMembersConfirmModalVisible(false);
         }
         setSelectedEmployees((prevSelected) => {
             // Filter all personal details in order to use the elements needed for the current workspace
-            const currentPersonalDetails = filterPersonalDetails(policyMembers, personalDetails);
+            const currentPersonalDetails = filterPersonalDetails(policy?.employeeList ?? {}, personalDetails);
             // We need to filter the previous selected employees by the new personal details, since unknown/new user id's change when transitioning from offline to online
-            const prevSelectedElements = prevSelected.map((id) => {
-                const prevItem = prevPersonalDetails?.id;
+            const prevSelectedElements = prevSelected.map((email) => {
+                const prevItem = prevPersonalDetails?.find((item) => item?.login === email);
                 const res = Object.values(currentPersonalDetails).find((item) => prevItem?.login === item?.login);
-                return res?.accountID ?? id;
+                return res?.login ?? email;
             });
             // This is an equivalent of the lodash intersection function. The reduce method below is used to filter the items that exist in both arrays.
-            return [prevSelectedElements, Object.values(PolicyUtils.getMemberAccountIDsForWorkspace(policyMembers, personalDetails))].reduce((prev, members) =>
+            return [prevSelectedElements, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy, personalDetails))].reduce((prev, members) =>
                 prev.filter((item) => members.includes(item)),
             );
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [policyMembers]);
+    }, [policy]);
 
     useEffect(() => {
         const isReconnecting = prevIsOffline && !isOffline;
@@ -201,7 +191,12 @@ function WorkspaceMembersPage({
         }
 
         // Remove the admin from the list
-        const accountIDsToRemove = session?.accountID ? selectedEmployees.filter((id) => id !== session.accountID) : selectedEmployees;
+        const accountIDsToRemove = (session?.accountID ? selectedEmployees.filter((email) => email !== session.email) : selectedEmployees)
+            .map((email) => {
+                const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === email);
+                return details?.accountID;
+            })
+            .filter(Boolean) as number[];
 
         Policy.removeMembers(accountIDsToRemove, route.params.policyID);
         setSelectedEmployees([]);
@@ -223,13 +218,13 @@ function WorkspaceMembersPage({
      */
     const toggleAllUsers = (memberList: MemberOption[]) => {
         const enabledAccounts = memberList.filter((member) => !member.isDisabled && !member.isDisabledCheckbox);
-        const everyoneSelected = enabledAccounts.every((member) => selectedEmployees.includes(member.accountID));
+        const everyoneSelected = enabledAccounts.every((member) => selectedEmployees.includes(member.email));
 
         if (everyoneSelected) {
             setSelectedEmployees([]);
         } else {
-            const everyAccountId = enabledAccounts.map((member) => member.accountID);
-            setSelectedEmployees(everyAccountId);
+            const everyEmail = enabledAccounts.map((member) => member.email);
+            setSelectedEmployees(everyEmail);
         }
 
         validateSelection();
@@ -239,8 +234,8 @@ function WorkspaceMembersPage({
      * Add user from the selectedEmployees list
      */
     const addUser = useCallback(
-        (accountID: number) => {
-            setSelectedEmployees((prevSelected) => [...prevSelected, accountID]);
+        (selectedEmail: string) => {
+            setSelectedEmployees((prevSelected) => [...prevSelected, selectedEmail]);
             validateSelection();
         },
         [validateSelection],
@@ -250,8 +245,8 @@ function WorkspaceMembersPage({
      * Remove user from the selectedEmployees list
      */
     const removeUser = useCallback(
-        (accountID: number) => {
-            setSelectedEmployees((prevSelected) => prevSelected.filter((id) => id !== accountID));
+        (selectedEmail: string) => {
+            setSelectedEmployees((prevSelected) => prevSelected.filter((email) => email !== selectedEmail));
             validateSelection();
         },
         [validateSelection],
@@ -261,16 +256,16 @@ function WorkspaceMembersPage({
      * Toggle user from the selectedEmployees list
      */
     const toggleUser = useCallback(
-        (accountID: number, pendingAction?: PendingAction) => {
+        (email: string, pendingAction?: PendingAction) => {
             if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
                 return;
             }
 
             // Add or remove the user if the checkbox is enabled
-            if (selectedEmployees.includes(accountID)) {
-                removeUser(accountID);
+            if (selectedEmployees.includes(email)) {
+                removeUser(email);
             } else {
-                addUser(accountID);
+                addUser(email);
             }
         },
         [selectedEmployees, addUser, removeUser],
@@ -319,16 +314,15 @@ function WorkspaceMembersPage({
     const getUsers = useCallback((): MemberOption[] => {
         let result: MemberOption[] = [];
 
-        Object.entries(policyMembers ?? {}).forEach(([accountIDKey, policyMember]) => {
-            const accountID = Number(accountIDKey);
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
             if (isDeletedPolicyMember(policyMember)) {
                 return;
             }
 
-            const details = personalDetails?.[accountID];
+            const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === email);
 
             if (!details) {
-                Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with accountID: ${accountID}`);
+                Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with email: ${email}`);
                 return;
             }
 
@@ -341,7 +335,7 @@ function WorkspaceMembersPage({
                 }
             }
 
-            const isSelected = selectedEmployees.includes(accountID);
+            const isSelected = selectedEmployees.includes(email);
 
             const isOwner = policy?.owner === details.login;
             const isAdmin = policyMember.role === CONST.POLICY.ROLE.ADMIN;
@@ -357,9 +351,12 @@ function WorkspaceMembersPage({
                 );
             }
 
+            const accountID = details.accountID ?? 0;
+
             result.push({
-                keyForList: accountIDKey,
+                keyForList: email,
                 accountID,
+                email,
                 isSelected,
                 isDisabledCheckbox: !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID),
                 isDisabled: isPolicyAdmin && (policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyMember.errors)),
@@ -395,7 +392,7 @@ function WorkspaceMembersPage({
         personalDetails,
         policy?.owner,
         policy?.ownerAccountID,
-        policyMembers,
+        policy?.employeeList,
         policyOwner,
         selectedEmployees,
         session?.accountID,
@@ -412,20 +409,20 @@ function WorkspaceMembersPage({
         if (!isFocused) {
             return;
         }
-        if (isEmptyObject(invitedEmailsToAccountIDsDraft) || accountIDs === prevAccountIDs) {
+        if (isEmptyObject(invitedEmailsToAccountIDsDraft) || accountEmails === prevAccountEmails) {
             return;
         }
         const invitedEmails = Object.values(invitedEmailsToAccountIDsDraft).map(String);
         selectionListRef.current?.scrollAndHighlightItem?.(invitedEmails, 1500);
         Policy.setWorkspaceInviteMembersDraft(route.params.policyID, {});
-    }, [invitedEmailsToAccountIDsDraft, route.params.policyID, isFocused, accountIDs, prevAccountIDs]);
+    }, [invitedEmailsToAccountIDsDraft, route.params.policyID, isFocused, accountEmails, prevAccountEmails]);
 
     const getHeaderMessage = () => {
         if (isOfflineAndNoMemberDataAvailable) {
             return translate('workspace.common.mustBeOnlineToViewMembers');
         }
 
-        return !isLoading && isEmptyObject(policyMembers) ? translate('workspace.common.memberNotFound') : '';
+        return !isLoading && isEmptyObject(policy?.employeeList ?? {}) ? translate('workspace.common.memberNotFound') : '';
     };
 
     const getHeaderContent = () => (
@@ -467,7 +464,13 @@ function WorkspaceMembersPage({
             return;
         }
 
-        const accountIDsToUpdate = selectedEmployees.filter((id) => policyMembers?.[id].role !== role);
+        const accountIDsToUpdate = selectedEmployees
+            .filter((email) => policy?.employeeList?.[email].role !== role)
+            .map((email) => {
+                const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === email);
+                return details?.accountID;
+            })
+            .filter(Boolean) as number[];
 
         Policy.updateWorkspaceMembersRole(route.params.policyID, accountIDsToUpdate, role);
         setSelectedEmployees([]);
@@ -484,7 +487,7 @@ function WorkspaceMembersPage({
         ];
 
         if (PolicyUtils.isPaidGroupPolicy(policy)) {
-            if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.ADMIN)) {
+            if (selectedEmployees.find((employee) => policy?.employeeList?.[employee]?.role === CONST.POLICY.ROLE.ADMIN)) {
                 options.push({
                     text: translate('workspace.people.makeMember'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_MEMBER,
@@ -493,7 +496,7 @@ function WorkspaceMembersPage({
                 });
             }
 
-            if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.USER)) {
+            if (selectedEmployees.find((employee) => policy?.employeeList?.[employee]?.role === CONST.POLICY.ROLE.USER)) {
                 options.push({
                     text: translate('workspace.people.makeAdmin'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_ADMIN,
@@ -592,7 +595,7 @@ function WorkspaceMembersPage({
                         headerMessage={getHeaderMessage()}
                         headerContent={getHeaderContent()}
                         onSelectRow={openMemberDetails}
-                        onCheckboxPress={(item) => toggleUser(item.accountID)}
+                        onCheckboxPress={(item) => toggleUser(item.email)}
                         onSelectAll={() => toggleAllUsers(data)}
                         onDismissError={dismissError}
                         showLoadingPlaceholder={isLoading}
@@ -613,9 +616,6 @@ WorkspaceMembersPage.displayName = 'WorkspaceMembersPage';
 export default withCurrentUserPersonalDetails(
     withPolicyAndFullscreenLoading(
         withOnyx<WorkspaceMembersPageProps, WorkspaceMembersPageOnyxProps>({
-            personalDetails: {
-                key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-            },
             invitedEmailsToAccountIDsDraft: {
                 key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`,
             },
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index 4199bb5f432d..f73a799affba 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -2,7 +2,6 @@ import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import Avatar from '@components/Avatar';
 import Button from '@components/Button';
@@ -28,7 +27,6 @@ import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPol
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -41,7 +39,7 @@ type WorkspacePolicyOnyxProps = {
 
 type WorkspaceMemberDetailsPageProps = WithPolicyAndFullscreenLoadingProps & WorkspacePolicyOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.MEMBER_DETAILS>;
 
-function WorkspaceMemberDetailsPage({personalDetails, policyMembers, policy, route}: WorkspaceMemberDetailsPageProps) {
+function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceMemberDetailsPageProps) {
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
@@ -54,14 +52,15 @@ function WorkspaceMemberDetailsPage({personalDetails, policyMembers, policy, rou
     const policyID = route.params.policyID;
     const backTo = route.params.backTo ?? ('' as Route);
 
-    const member = policyMembers?.[accountID];
+    const memberLogin = personalDetails?.[accountID]?.login ?? '';
+    const member = policy?.employeeList?.[memberLogin];
     const details = personalDetails?.[accountID] ?? ({} as PersonalDetails);
     const avatar = details.avatar ?? UserUtils.getDefaultAvatar();
     const fallbackIcon = details.fallbackIcon ?? '';
     const displayName = details.displayName ?? '';
     const isSelectedMemberOwner = policy?.owner === details.login;
     const isSelectedMemberCurrentUser = accountID === currentUserPersonalDetails?.accountID;
-    const isCurrentUserAdmin = policyMembers?.[currentUserPersonalDetails?.accountID]?.role === CONST.POLICY.ROLE.ADMIN;
+    const isCurrentUserAdmin = policy?.employeeList?.[personalDetails?.[currentUserPersonalDetails?.accountID]?.login ?? '']?.role === CONST.POLICY.ROLE.ADMIN;
     const isCurrentUserOwner = policy?.owner === currentUserPersonalDetails?.login;
 
     useEffect(() => {
@@ -184,10 +183,4 @@ function WorkspaceMemberDetailsPage({personalDetails, policyMembers, policy, rou
 
 WorkspaceMemberDetailsPage.displayName = 'WorkspaceMemberDetailsPage';
 
-export default withPolicyAndFullscreenLoading(
-    withOnyx<WorkspaceMemberDetailsPageProps, WorkspacePolicyOnyxProps>({
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-    })(WorkspaceMemberDetailsPage),
-);
+export default withPolicyAndFullscreenLoading(WorkspaceMemberDetailsPage);
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx
index 7958ae93b922..36f24b8922da 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx
@@ -27,14 +27,15 @@ type ListItemType = {
     keyForList: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER;
 };
 
-function WorkspaceMemberDetailsRoleSelectionPage({policyMembers, route}: WorkspaceMemberDetailsPageProps) {
+function WorkspaceMemberDetailsRoleSelectionPage({route, personalDetails, policy}: WorkspaceMemberDetailsPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     const accountID = Number(route.params.accountID) ?? 0;
     const policyID = route.params.policyID;
     const backTo = route.params.backTo ?? ('' as Route);
-    const member = policyMembers?.[accountID];
+    const memberLogin = personalDetails?.[accountID]?.login ?? '';
+    const member = policy?.employeeList?.[memberLogin];
 
     const items: ListItemType[] = [
         {
diff --git a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
index 959d6f9290e0..e5d93dbe36d5 100644
--- a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
+++ b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
@@ -6,12 +6,16 @@ import {withOnyx} from 'react-native-onyx';
 import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import compose from '@libs/compose';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {PersonalDetailsList} from '@src/types/onyx';
 import type {WithPolicyOnyxProps, WithPolicyProps} from './withPolicy';
 import withPolicy, {policyDefaultProps} from './withPolicy';
 
 type WithPolicyAndFullscreenLoadingOnyxProps = {
     /** Indicated whether the report data is loading */
     isLoadingReportData: OnyxEntry<boolean>;
+
+    /** Personal details of all users */
+    personalDetails: OnyxEntry<PersonalDetailsList>;
 };
 
 type WithPolicyAndFullscreenLoadingProps = WithPolicyProps & WithPolicyAndFullscreenLoadingOnyxProps;
@@ -24,13 +28,7 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
     WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>,
 ): ComponentWithPolicyAndFullscreenLoading<TProps, TRef> {
     function WithPolicyAndFullscreenLoading(
-        {
-            isLoadingReportData = true,
-            policy = policyDefaultProps.policy,
-            policyDraft = policyDefaultProps.policyDraft,
-            policyMembers = policyDefaultProps.policyMembers,
-            ...rest
-        }: TProps,
+        {isLoadingReportData = true, policy = policyDefaultProps.policy, policyDraft = policyDefaultProps.policyDraft, policyMembers = policyDefaultProps.policyMembers, ...rest}: TProps,
         ref: ForwardedRef<TRef>,
     ) {
         if (isLoadingReportData && isEmpty(policy) && isEmpty(policyDraft)) {
@@ -57,6 +55,9 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
             isLoadingReportData: {
                 key: ONYXKEYS.IS_LOADING_REPORT_DATA,
             },
+            personalDetails: {
+                key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+            },
         }),
         withPolicy,
     )(forwardRef(WithPolicyAndFullscreenLoading));
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
index 089099d12ce7..51baaca166b5 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
@@ -1,7 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useMemo, useState} from 'react';
 import type {SectionListData} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Badge from '@components/Badge';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
@@ -14,7 +13,6 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
@@ -28,7 +26,6 @@ import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullsc
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetailsList, PolicyMember} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -202,11 +199,4 @@ function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails,
 
 WorkspaceWorkflowsApproverPage.displayName = 'WorkspaceWorkflowsApproverPage';
 
-export default compose(
-    withOnyx<WorkspaceWorkflowsApproverPageProps, WorkspaceWorkflowsApproverPageOnyxProps>({
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-    }),
-    withPolicyAndFullscreenLoading,
-)(WorkspaceWorkflowsApproverPage);
+export default withPolicyAndFullscreenLoading(WorkspaceWorkflowsApproverPage);
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index e96b19ce4442..c9dc4e7e41ca 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -2,7 +2,6 @@ import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useMemo, useState} from 'react';
 import type {SectionListData} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
 import Badge from '@components/Badge';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -14,7 +13,6 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
@@ -29,7 +27,6 @@ import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullsc
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetailsList, PolicyMember} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -45,7 +42,7 @@ type WorkspaceWorkflowsPayerPageProps = WorkspaceWorkflowsPayerPageOnyxProps &
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 type MembersSection = SectionListData<MemberOption, Section<MemberOption>>;
 
-function WorkspaceWorkflowsPayerPage({route, policy, policyMembers, personalDetails, isLoadingReportData = true}: WorkspaceWorkflowsPayerPageProps) {
+function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingReportData = true}: WorkspaceWorkflowsPayerPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -63,8 +60,8 @@ function WorkspaceWorkflowsPayerPage({route, policy, policyMembers, personalDeta
         const policyAdminDetails: MemberOption[] = [];
         const authorizedPayerDetails: MemberOption[] = [];
 
-        Object.entries(policyMembers ?? {}).forEach(([accountIDKey, policyMember]) => {
-            const accountID = Number(accountIDKey);
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
+            const accountID = Object.values(personalDetails ?? {}).find((details) => details?.login === email)?.accountID ?? 0;
             const details = personalDetails?.[accountID];
             if (!details) {
                 Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with accountID: ${accountID}`);
@@ -90,7 +87,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, policyMembers, personalDeta
             const isAuthorizedPayer = policy?.reimburserEmail === details?.login ?? policy?.reimburserAccountID === accountID;
 
             const formattedMember = {
-                keyForList: accountIDKey,
+                keyForList: String(accountID),
                 accountID,
                 isSelected: isAuthorizedPayer,
                 isDisabled: policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyMember.errors),
@@ -118,7 +115,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, policyMembers, personalDeta
         return [policyAdminDetails, authorizedPayerDetails];
     }, [
         personalDetails,
-        policyMembers,
+        policy?.employeeList,
         translate,
         policy?.reimburserEmail,
         isDeletedPolicyMember,
@@ -225,11 +222,4 @@ function WorkspaceWorkflowsPayerPage({route, policy, policyMembers, personalDeta
 
 WorkspaceWorkflowsPayerPage.displayName = 'WorkspaceWorkflowsPayerPage';
 
-export default compose(
-    withOnyx<WorkspaceWorkflowsPayerPageProps, WorkspaceWorkflowsPayerPageOnyxProps>({
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-    }),
-    withPolicyAndFullscreenLoading,
-)(WorkspaceWorkflowsPayerPage);
+export default withPolicyAndFullscreenLoading(WorkspaceWorkflowsPayerPage);

From 1f93ea999341ff389037407adbf99773563d6ba9 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 4 Apr 2024 04:10:36 +0530
Subject: [PATCH 085/383] clean up

---
 src/CONST.ts                                  |   3 +
 .../ConvertTrackedExpenseToRequestParams.ts   |   8 +-
 src/libs/ReportUtils.ts                       |  41 +++
 src/libs/actions/IOU.ts                       | 259 +++++++++++++++---
 src/libs/actions/Report.ts                    |   4 +-
 .../report/ContextMenu/ContextMenuActions.tsx |   2 +-
 src/pages/home/report/ReportActionItem.tsx    |   1 +
 ...yForRefactorRequestParticipantsSelector.js |  14 +-
 .../iou/request/step/IOURequestStepDate.tsx   |   4 +-
 .../step/IOURequestStepDescription.tsx        |   3 +-
 src/types/onyx/OriginalMessage.ts             |   3 +-
 11 files changed, 288 insertions(+), 54 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index d1b619bb89c4..669b3875230a 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -755,6 +755,9 @@ const CONST = {
             INVITE: 'invited',
             NOTHING: 'nothing',
         },
+        ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION: {
+            NOTHING: 'nothing',
+        },
         ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION: {
             ACCEPT: 'accept',
             DECLINE: 'decline',
diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
index 71e58dd812e9..68a0b07cb25a 100644
--- a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -1,10 +1,12 @@
 type ConvertTrackedExpenseToRequestParams = {
     payerAccountID: number;
+    chatReportID: string;
     transactionID: string;
-    reportActionID: string;
+    actionableWhisperReportActionID: string;
     createdChatReportActionID: string;
-    createdIOUReportActionID: string;
-    reportPreviewReportActionID: string;
+    moneyRequestReportID: string;
+    moneyRequestCreatedReportActionID: string;
+    moneyRequestPreviewReportActionID: string;
 };
 
 export default ConvertTrackedExpenseToRequestParams;
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index bf4d8ec70c6c..50b40396b7fd 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3625,6 +3625,8 @@ function buildOptimisticModifiedExpenseReportAction(
     transactionChanges: TransactionChanges,
     isFromExpenseReport: boolean,
     policy: OnyxEntry<Policy>,
+    isMovingTransactionFromTrackedExpense?: boolean,
+    movedToReportID?: string,
 ): OptimisticModifiedExpenseReportAction {
     const originalMessage = getModifiedExpenseOriginalMessage(oldTransaction, transactionChanges, isFromExpenseReport, policy);
     return {
@@ -3657,6 +3659,44 @@ function buildOptimisticModifiedExpenseReportAction(
     };
 }
 
+/**
+ * Builds an optimistic modified expense action for a tracked expense move with a randomly generated reportActionID.
+ * @param transactionThreadID - The reportID of the transaction thread
+ * @param movedToReportID - The reportID of the report the transaction is moved to
+ */
+function buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThreadID: string, movedToReportID: string): OptimisticModifiedExpenseReportAction {
+    return {
+        actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE,
+        actorAccountID: currentUserAccountID,
+        automatic: false,
+        avatar: getCurrentUserAvatarOrDefault(),
+        created: DateUtils.getDBTime(),
+        isAttachment: false,
+        message: [
+            {
+                // Currently we are composing the message from the originalMessage and message is only used in OldDot and not in the App
+                text: 'You',
+                style: 'strong',
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+            },
+        ],
+        originalMessage: {
+            movedToReportID,
+        },
+        person: [
+            {
+                style: 'strong',
+                text: currentUserPersonalDetails?.displayName ?? String(currentUserAccountID),
+                type: 'TEXT',
+            },
+        ],
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        reportActionID: NumberUtils.rand64(),
+        reportID: transactionThreadID,
+        shouldShow: true,
+    };
+}
+
 /**
  * Updates a report preview action that exists for an IOU report.
  *
@@ -5804,6 +5844,7 @@ export {
     buildOptimisticMoneyRequestEntities,
     buildOptimisticReportPreview,
     buildOptimisticModifiedExpenseReportAction,
+    buildOptimisticMovedTrackedExpenseModifiedReportAction,
     buildOptimisticCancelPaymentReportAction,
     updateReportPreview,
     buildOptimisticTaskReportAction,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 78fc2af742dc..ed51ee55dbb3 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -1172,9 +1172,6 @@ function getMoneyRequestInformation(
     payeeAccountID = userAccountID,
     payeeEmail = currentUserEmail,
     moneyRequestReportID = '',
-    linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
-    linkedTrackedExpenseReportID?: string,
-    shouldDeleteLinkedTrackedExpense?: boolean,
 ): MoneyRequestInformation {
     const payerEmail = PhoneNumber.addSMSDomainIfPhoneNumber(participant.login ?? '');
     const payerAccountID = Number(participant.accountID);
@@ -1340,17 +1337,6 @@ function getMoneyRequestInformation(
         optimisticNextStep,
     );
 
-    if (shouldDeleteLinkedTrackedExpense && linkedTrackedExpenseReportAction && linkedTrackedExpenseReportID) {
-        const {
-            optimisticData: deleteOptimisticData,
-            successData: deleteSuccessData,
-            failureData: deleteFailureData,
-        } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, optimisticTransaction.transactionID, linkedTrackedExpenseReportAction, false);
-        optimisticData.push(...deleteOptimisticData);
-        successData.push(...deleteSuccessData);
-        failureData.push(...deleteFailureData);
-    }
-
     return {
         payerAccountID,
         payerEmail,
@@ -2264,6 +2250,200 @@ function updateDistanceRequest(
     API.write(WRITE_COMMANDS.UPDATE_DISTANCE_REQUEST, params, onyxData);
 }
 
+function convertTrackedExpenseToRequest(
+    payerAccountID: number,
+    chatReportID: string,
+    transactionID: string,
+    actionableWhisperReportActionID: string,
+    createdChatReportActionID: string,
+    moneyRequestReportID: string,
+    moneyRequestCreatedReportActionID: string,
+    moneyRequestPreviewReportActionID: string,
+    linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
+    linkedTrackedExpenseReportID: string,
+    transactionThreadReportID: string,
+    onyxData: OnyxData,
+) {
+    const optimisticData = onyxData.optimisticData;
+    const successData = onyxData.successData;
+    const failureData = onyxData.failureData;
+
+    // Delete the transaction from the track expense report
+    const {
+        optimisticData: deleteOptimisticData,
+        successData: deleteSuccessData,
+        failureData: deleteFailureData,
+    } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, transactionID, linkedTrackedExpenseReportAction, false);
+
+    optimisticData?.push(...deleteOptimisticData);
+    successData?.push(...deleteSuccessData);
+    failureData?.push(...deleteFailureData);
+
+    // Build modified expense report action with the transaction changes
+    const modifiedExpenseReportAction = ReportUtils.buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThreadReportID, moneyRequestReportID);
+
+    optimisticData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [modifiedExpenseReportAction.reportActionID]: modifiedExpenseReportAction as OnyxTypes.ReportAction,
+        },
+    });
+    successData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [modifiedExpenseReportAction.reportActionID]: {pendingAction: null},
+        },
+    });
+    failureData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [modifiedExpenseReportAction.reportActionID]: {
+                ...(modifiedExpenseReportAction as OnyxTypes.ReportAction),
+                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
+            },
+        },
+    });
+
+    // Resolve actionable whisper message
+    optimisticData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
+        value: {
+            [actionableWhisperReportActionID]: {
+                originalMessage: {
+                    resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING,
+                },
+            },
+        },
+    });
+
+    failureData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
+        value: {
+            [actionableWhisperReportActionID]: {
+                originalMessage: {
+                    resolution: null,
+                },
+            },
+        },
+    });
+
+    const parameters = {
+        payerAccountID,
+        chatReportID,
+        transactionID,
+        actionableWhisperReportActionID,
+        createdChatReportActionID,
+        moneyRequestReportID,
+        moneyRequestCreatedReportActionID,
+        moneyRequestPreviewReportActionID,
+        transactionThreadReportID,
+        modifiedExpenseReportActionID: modifiedExpenseReportAction.reportActionID,
+    };
+    API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, {optimisticData, successData, failureData});
+}
+
+function categorizeTrackedExpense(
+    policyID: string,
+    transactionID: string,
+    moneyRequestPreviewReportActionID: string,
+    moneyRequestReportID: string,
+    moneyRequestCreatedReportActionID: string,
+    actionableWhisperReportActionID: string,
+    linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
+    linkedTrackedExpenseReportID: string,
+    transactionThreadReportID: string,
+    onyxData: OnyxData,
+) {
+    const optimisticData = onyxData.optimisticData;
+    const successData = onyxData.successData;
+    const failureData = onyxData.failureData;
+
+    // delete the transaction from the track expense report
+    const {
+        optimisticData: deleteOptimisticData,
+        successData: deleteSuccessData,
+        failureData: deleteFailureData,
+    } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, transactionID, linkedTrackedExpenseReportAction, false);
+
+    optimisticData?.push(...deleteOptimisticData);
+    successData?.push(...deleteSuccessData);
+    failureData?.push(...deleteFailureData);
+
+    // Build modified expense report action with the transaction changes
+    const modifiedExpenseReportAction = ReportUtils.buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThreadReportID, moneyRequestReportID);
+
+    optimisticData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [modifiedExpenseReportAction.reportActionID]: modifiedExpenseReportAction as OnyxTypes.ReportAction,
+        },
+    });
+
+    successData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [modifiedExpenseReportAction.reportActionID]: { pendingAction: null },
+        },
+    });
+
+    failureData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [modifiedExpenseReportAction.reportActionID]: {
+                ...(modifiedExpenseReportAction as OnyxTypes.ReportAction),
+                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
+            },
+        },
+    });
+
+    // Resolve actionable whisper message
+    optimisticData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
+        value: {
+            [actionableWhisperReportActionID]: {
+                originalMessage: {
+                    resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING,
+                },
+            },
+        },
+    });
+
+    failureData?.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
+        value: {
+            [actionableWhisperReportActionID]: {
+                originalMessage: {
+                    resolution: null,
+                },
+            },
+        },
+    });
+
+    const parameters = {
+        policyID,
+        transactionID,
+        moneyRequestPreviewReportActionID,
+        moneyRequestReportID,
+        moneyRequestCreatedReportActionID,
+        actionableWhisperReportActionID,
+        modifiedExpenseReportActionID: modifiedExpenseReportAction.reportActionID,
+    };
+
+    API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, { optimisticData, successData, failureData });
+}
+
+
+
 /**
  * Request money from another user
  */
@@ -2297,7 +2477,7 @@ function requestMoney(
     const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
     const moneyRequestReportID = isMoneyRequestReport ? report.reportID : '';
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
-    const isMovingTransactionFromTrackExpense = [CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action);
+    const isMovingTransactionFromTrackExpense = action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE;
 
     const {
         payerAccountID,
@@ -2331,42 +2511,45 @@ function requestMoney(
         payeeAccountID,
         payeeEmail,
         moneyRequestReportID,
-        linkedTrackedExpenseReportAction,
-        linkedTrackedExpenseReportID,
-        isMovingTransactionFromTrackExpense,
     );
 
     const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
 
     switch (action) {
         case CONST.IOU.ACTION.MOVE: {
-            const parameters = {
+            if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
+                return;
+            }
+
+            convertTrackedExpenseToRequest(
                 payerAccountID,
-                chatReportID: chatReport.reportID,
-                transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,
+                chatReport.reportID,
+                transaction.transactionID,
                 actionableWhisperReportActionID,
                 createdChatReportActionID,
-                moneyRequestReportID: iouReport.reportID,
-                moneyRequestCreatedReportActionID: createdIOUReportActionID,
-                moneyRequestPreviewReportActionID: iouAction.reportActionID,
-                // modifiedExpenseReportActionID - not sure what need to be done here maybe `buildOptimisticModifiedExpenseReportAction` with transaction changes
-            };
-
-            API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, onyxData);
+                iouReport.reportID,
+                createdIOUReportActionID,
+                iouAction.reportActionID,
+                linkedTrackedExpenseReportAction,
+                linkedTrackedExpenseReportID,
+                transactionThreadReportID,
+                onyxData,
+            );
             break;
         }
         case CONST.IOU.ACTION.CATEGORIZE: {
-            const parameters = {
-                policyID: chatReport.policyID,
-                transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,
-                moneyRequestPreviewReportActionID: reportPreviewAction.reportActionID,
-                moneyRequestReportID: iouReport.reportID,
-                moneyRequestCreatedReportActionID: createdIOUReportActionID,
+            categorizeTrackedExpense(
+                chatReport.policyID,
+                transaction.transactionID,
+                iouAction.reportActionID,
+                iouReport.reportID,
+                createdIOUReportActionID,
                 actionableWhisperReportActionID,
-                // modifiedExpenseReportActionID - not sure what need to be done here maybe `buildOptimisticModifiedExpenseReportAction` with transaction changes
-            };
-            // eslint-disable-next-line rulesdir/no-multiple-api-calls
-            API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, onyxData);
+                linkedTrackedExpenseReportAction,
+                linkedTrackedExpenseReportID,
+                transactionThreadReportID,
+                onyxData,
+            );
             break;
         }
         case CONST.IOU.ACTION.SHARE: {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 8dd93ccf8c7c..caf6ad59e8f3 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2975,7 +2975,7 @@ function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: On
 
     const updatedMessage: Message = {
         ...message,
-        resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING,
+        resolution: CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
     };
 
     const optimisticData: OnyxUpdate[] = [
@@ -2986,7 +2986,7 @@ function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: On
                 [reportAction.reportActionID]: {
                     message: [updatedMessage],
                     originalMessage: {
-                        resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING,
+                        resolution: CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
                     },
                 },
             },
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index 7aa89cc7912b..dc39175312a8 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -169,7 +169,7 @@ const ContextMenuActions: ContextMenuAction[] = [
         successIcon: Expensicons.Download,
         shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget, isChronosReport, reportID, isPinnedChat, isUnreadChat, isOffline): reportAction is ReportAction => {
             const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
-            const messageHtml = reportAction?.message?.at(0)?.html;
+            const messageHtml = getActionHtml(reportAction);
             return (
                 isAttachment && messageHtml !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && !!reportAction?.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction) && !isOffline
             );
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 42787e8bfcfc..741d39f775dd 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -563,6 +563,7 @@ function ReportActionItem({
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENTDEQUEUED) {
             children = <ReportActionItemBasicMessage message={ReportUtils.getReimbursementDeQueuedActionMessage(action, report)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {
+            console.log('action==========>-', action);
             children = <ReportActionItemBasicMessage message={ModifiedExpenseMessage.getForReportAction(report.reportID, action)} />;
         } else if (ReportActionsUtils.isOldDotReportAction(action)) {
             // This handles all historical actions from OldDot that we just want to display the message text
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 433447484fd1..7f6ad6a3aeb5 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -134,7 +134,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
             // sees the option to request money from their admin on their own Workspace Chat.
             iouType === CONST.IOU.TYPE.REQUEST && iouAction !== CONST.IOU.ACTION.MOVE,
 
-            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && iouAction !== CONST.IOU.ACTION.CATEGORIZE && iouAction !== CONST.IOU.ACTION.SHARE,
+            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && ![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction),
             false,
             {},
             [],
@@ -167,11 +167,13 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
             shouldShow: !_.isEmpty(chatOptions.recentReports),
         });
 
-        newSections.push({
-            title: translate('common.contacts'),
-            data: chatOptions.personalDetails,
-            shouldShow: !_.isEmpty(chatOptions.personalDetails),
-        });
+        if (![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction)) {
+            newSections.push({
+                title: translate('common.contacts'),
+                data: chatOptions.personalDetails,
+                shouldShow: !_.isEmpty(chatOptions.personalDetails),
+            });
+        }
 
         if (chatOptions.userToInvite && !OptionsListUtils.isCurrentUser(chatOptions.userToInvite)) {
             newSections.push({
diff --git a/src/pages/iou/request/step/IOURequestStepDate.tsx b/src/pages/iou/request/step/IOURequestStepDate.tsx
index 682204a4510f..6005d2728504 100644
--- a/src/pages/iou/request/step/IOURequestStepDate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDate.tsx
@@ -79,7 +79,9 @@ function IOURequestStepDate({
             return;
         }
 
-        IOU.setMoneyRequestCreated(transaction?.transactionID ?? '0', newCreated, action === CONST.IOU.ACTION.CREATE);
+        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE;
+
+        IOU.setMoneyRequestCreated(transaction?.transactionID ?? '0', newCreated, isTransactionDraft);
 
         if (isEditing) {
             IOU.updateMoneyRequestDate(transaction?.transactionID ?? '0', reportID, newCreated, policy, policyTags, policyCategories);
diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx
index d075ed81c956..a7f19d2d8776 100644
--- a/src/pages/iou/request/step/IOURequestStepDescription.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx
@@ -124,8 +124,9 @@ function IOURequestStepDescription({
             navigateBack();
             return;
         }
+        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE;
 
-        IOU.setMoneyRequestDescription(transaction?.transactionID ?? '0', newComment, action === CONST.IOU.ACTION.CREATE);
+        IOU.setMoneyRequestDescription(transaction?.transactionID ?? '0', newComment, isTransactionDraft);
 
         if (action === CONST.IOU.ACTION.EDIT) {
             IOU.updateMoneyRequestDescription(transaction?.transactionID ?? '0', reportID, newComment, policy, policyTags, policyCategories);
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 800ef3c1f63e..7ae580006b84 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -290,8 +290,7 @@ type OriginalMessageActionableTrackedExpenseWhisper = {
     originalMessage: {
         transactionID: string;
         lastModified: string;
-        //  todo: add constants for tracking expense whisper resolution
-        resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION>;
+        resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION>;
     };
 };
 

From 0d5b459e04eb397d40053f3700e1edaac70c2fcd Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 4 Apr 2024 04:13:19 +0530
Subject: [PATCH 086/383] adds todo

---
 src/libs/actions/IOU.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index ed51ee55dbb3..987a78df00ae 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2553,6 +2553,7 @@ function requestMoney(
             break;
         }
         case CONST.IOU.ACTION.SHARE: {
+            // todo need to seperate this action into a new function
             const parameters = {
                 policyID: chatReport.policyID,
                 transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,

From 9e63e59ed89bde6675500904eb27b20249dfcebd Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Thu, 4 Apr 2024 20:47:42 +0200
Subject: [PATCH 087/383] Add new case

---
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.js    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index 104deb818067..9a1a26185402 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -198,6 +198,9 @@ function FloatingActionButtonAndPopover(props) {
             case CONST.QUICK_ACTIONS.ASSIGN_TASK:
                 Task.clearOutTaskInfoAndNavigate(props.quickAction.chatReportID, quickActionReport, _.get(props.quickAction, 'targetAccountID', 0));
                 return;
+            case CONST.QUICK_ACTIONS.TRACK_MANUAL:
+                IOU.startMoneyRequest(CONST.IOU.TYPE.SEND, props.quickAction.chatReportID);
+                return;
             default:
                 return '';
         }

From 23702781c6a90ee8786318d43323bb90c9b2326a Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 4 Apr 2024 13:58:32 -0700
Subject: [PATCH 088/383] chore: create a context

---
 src/pages/workspace/withPolicyConnections.tsx | 97 +++++++++----------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 06431c2653ca..2a28832dbaf2 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,73 +1,70 @@
-import {useEffect, useState} from 'react';
-import type {ComponentType} from 'react';
+import {createContext, useContext, useEffect, useState} from 'react';
+import type {ComponentType, PropsWithChildren} from 'react';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import useNetwork from '@hooks/useNetwork';
 import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
-import withPolicy from './withPolicy';
+import type {Policy} from '@src/types/onyx';
 import type {WithPolicyProps} from './withPolicy';
+import withPolicy from './withPolicy';
 
-type WithPolicyConnectionsProps = WithPolicyProps;
+const PolicyWithConnectionsDataContext = createContext<Policy | null>(null);
+
+function usePolicyWithConnectionsData() {
+    const policy = useContext(PolicyWithConnectionsDataContext);
+    if (!policy) {
+        throw new Error('usePolicyWithConnectionsData must be used within a PolicyWithConnectionsDataProvider');
+    }
+    return policy;
+}
 
 /**
- * Higher-order component that fetches the connections data and populates
- * the corresponding field of the policy object if the field is empty. It then passes the policy object
- * to the wrapped component.
- *
- * Use this HOC when you need the policy object with its connections field populated.
- *
- * Only the active policy gets the complete policy data upon app start that includes the connections data.
- * For other policies, the connections data needs to be fetched when it's needed.
+ * A context that provides the policy object and ensures that the `connections` data is fetched once. The context maintains a state to track
+ * whether the `connections` data has been fetched, ensuring the fetch request is made only once per user session.
+ * Note that the policy object provided by this context may not have the `connections` field populated. When the `connections` data is being
+ * fetched, the `connections` field is empty.
+ * For this reason, use the `withPolicyConnections` HOC defined in this file when consuming the policy object. It manages the rendering logic
+ * when the connections field is empty, ensuring that the `policy` object has its `connections` field populated when the wrapped component is
+ * rendered.
  */
-function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
-    function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
-        const {isOffline} = useNetwork();
+function PolicyWithConnectionsDataContextProviderWrapped({policy, children}: PropsWithChildren<WithPolicyProps>) {
+    const [hasFetchedConnectionsData, setHasFetchedConnectionsData] = useState(false);
+
+    useEffect(() => {
+        if (hasFetchedConnectionsData || !policy || policy.connections) {
+            return;
+        }
 
-        // When the accounting feature is enabled, but the user hasn't connected to any accounting software,
-        // the connections data doesn't exist. We don't want to continually attempt to fetch non-existent data.
-        // This state helps us track whether a data fetch attempt has been made.
-        const [wasConnectionsDataFetched, setWasConnectionsDataFetched] = useState(false);
+        openPolicyAccountingPage(policy.id);
+        setHasFetchedConnectionsData(true);
+    }, [policy, hasFetchedConnectionsData]);
 
-        useEffect(() => {
-            // When the accounting feature is not enabled, or if the connections data already exists,
-            // there is no need to fetch the connections data.
-            if (wasConnectionsDataFetched || !policy?.areConnectionsEnabled || !!policy?.connections || !policy?.id) {
-                return;
-            }
+    return <PolicyWithConnectionsDataContext.Provider value={policy}>{children}</PolicyWithConnectionsDataContext.Provider>;
+}
+
+const PolicyWithConnectionsDataContextProvider = withPolicy(PolicyWithConnectionsDataContextProviderWrapped);
 
-            openPolicyAccountingPage(policy.id);
-            setWasConnectionsDataFetched(true);
-        }, [policy, wasConnectionsDataFetched]);
+/**
+ * Higher-order component that provides the policy object which is guaranteed to have the `connections` field populated.
+ * If the `connections` field is absent, it either renders nothing or displays the full offline screen when the device is offline.
+ * Use this HOC when you need the policy object with its connections field populated.
+ */
+function withPolicyConnections(WrappedComponent: ComponentType<{policy: Policy}>) {
+    function WithPolicyConnections() {
+        const {isOffline} = useNetwork();
+        const policy = usePolicyWithConnectionsData();
 
         if (!policy?.connections) {
             if (isOffline) {
-                return (
-                    <FullPageOfflineBlockingView>
-                        <WrappedComponent
-                            policy={policy}
-                            policyMembers={policyMembers}
-                            policyDraft={policyDraft}
-                            policyMembersDraft={policyMembersDraft}
-                            route={route}
-                        />
-                    </FullPageOfflineBlockingView>
-                );
+                return <FullPageOfflineBlockingView>{null}</FullPageOfflineBlockingView>;
             }
 
             return null;
         }
 
-        return (
-            <WrappedComponent
-                policy={policy}
-                policyMembers={policyMembers}
-                policyDraft={policyDraft}
-                policyMembersDraft={policyMembersDraft}
-                route={route}
-            />
-        );
+        return <WrappedComponent policy={policy} />;
     }
 
-    return withPolicy(WithPolicyConnections);
+    return WithPolicyConnections;
 }
 
-export default withPolicyConnections;
+export {PolicyWithConnectionsDataContextProvider, withPolicyConnections};

From db3252e0aca375bd9f38fe40e2af66456135395a Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Thu, 4 Apr 2024 14:04:48 -0700
Subject: [PATCH 089/383] fix: import react

---
 src/pages/workspace/withPolicyConnections.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 2a28832dbaf2..4e9d8776237e 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,4 +1,4 @@
-import {createContext, useContext, useEffect, useState} from 'react';
+import React, {createContext, useContext, useEffect, useState} from 'react';
 import type {ComponentType, PropsWithChildren} from 'react';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import useNetwork from '@hooks/useNetwork';

From 821c0cc4e6bf5f231dac4967e7ee34e21b9f6497 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Fri, 5 Apr 2024 00:47:04 +0200
Subject: [PATCH 090/383] Showing only the first tags policyTagList

---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index d158673b7ae3..5594935a378a 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -81,13 +81,13 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
             fetchTags();
         }, [fetchTags]),
     );
-    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
+    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags).slice(0, 1), [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
         () =>
             policyTagLists
                 .map((policyTagList) =>
                     lodashSortBy(
-                        Object.values(policyTagList.tags || []).filter((value) => PolicyUtils.getCleanedTagName(value.name) === value.name),
+                        policyTagList?.tags ? Object.values(policyTagList.tags) : [],
                         'name',
                         localeCompare,
                     ).map((value) => {

From 07df0acc76e18eb3cd1b64aae5debde59c95caf5 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Fri, 5 Apr 2024 01:19:42 +0200
Subject: [PATCH 091/383] prettier

---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 5594935a378a..db003df6e5b1 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -86,11 +86,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
         () =>
             policyTagLists
                 .map((policyTagList) =>
-                    lodashSortBy(
-                        policyTagList?.tags ? Object.values(policyTagList.tags) : [],
-                        'name',
-                        localeCompare,
-                    ).map((value) => {
+                    lodashSortBy(policyTagList?.tags ? Object.values(policyTagList.tags) : [], 'name', localeCompare).map((value) => {
                         const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
                         const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
                         return {

From fa0336a09f9ff43ecb98ddc055e9b281f987bab5 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 5 Apr 2024 06:55:24 +0530
Subject: [PATCH 092/383] clean up v2

---
 src/libs/ReportUtils.ts                    |  33 ++-
 src/libs/actions/IOU.ts                    | 301 ++++++++++++---------
 src/pages/home/report/ReportActionItem.tsx |   4 +-
 3 files changed, 201 insertions(+), 137 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a21d966c0cb3..365d340a8ebd 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -188,6 +188,8 @@ type OptimisticIOUReportAction = Pick<
     | 'receipt'
     | 'whisperedToAccountIDs'
     | 'childReportID'
+    | 'childVisibleActionCount'
+    | 'childCommenterCount'
 >;
 
 type ReportRouteParams = {
@@ -3406,6 +3408,7 @@ function buildOptimisticIOUReportAction(
     receipt: Receipt = {},
     isOwnPolicyExpenseChat = false,
     created = DateUtils.getDBTime(),
+    linkedExpenseReportAction: ReportAction | EmptyObject = {},
 ): OptimisticIOUReportAction {
     const IOUReportID = iouReportID || generateReportID();
 
@@ -3450,6 +3453,7 @@ function buildOptimisticIOUReportAction(
     }
 
     return {
+        ...linkedExpenseReportAction,
         actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
         actorAccountID: currentUserAccountID,
         automatic: false,
@@ -3629,8 +3633,6 @@ function buildOptimisticModifiedExpenseReportAction(
     transactionChanges: TransactionChanges,
     isFromExpenseReport: boolean,
     policy: OnyxEntry<Policy>,
-    isMovingTransactionFromTrackedExpense?: boolean,
-    movedToReportID?: string,
 ): OptimisticModifiedExpenseReportAction {
     const originalMessage = getModifiedExpenseOriginalMessage(oldTransaction, transactionChanges, isFromExpenseReport, policy);
     return {
@@ -3800,6 +3802,7 @@ function buildOptimisticChatReport(
     parentReportActionID = '',
     parentReportID = '',
     description = '',
+    existingTransactionThreadReportID = '',
 ): OptimisticChatReport {
     const participants = participantList.reduce((reportParticipants: Participants, accountID: number) => {
         const participant: ReportParticipant = {
@@ -3835,7 +3838,7 @@ function buildOptimisticChatReport(
         // For group chats we need to have participants object as we are migrating away from `participantAccountIDs` and `visibleChatMemberAccountIDs`. See https://github.com/Expensify/App/issues/34692
         participants,
         policyID,
-        reportID: generateReportID(),
+        reportID: existingTransactionThreadReportID.toString() || generateReportID(),
         reportName,
         stateNum: 0,
         statusNum: 0,
@@ -4237,8 +4240,13 @@ function buildOptimisticTaskReport(
  * @param reportAction - the parent IOU report action from which to create the thread
  * @param moneyRequestReport - the report which the report action belongs to
  */
-function buildTransactionThread(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>, moneyRequestReport: OnyxEntry<Report>): OptimisticChatReport {
+function buildTransactionThread(
+    reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>,
+    moneyRequestReport: OnyxEntry<Report>,
+    existingTransactionThreadReportID?: string,
+): OptimisticChatReport {
     const participantAccountIDs = [...new Set([currentUserAccountID, Number(reportAction?.actorAccountID)])].filter(Boolean) as number[];
+
     return buildOptimisticChatReport(
         participantAccountIDs,
         getTransactionReportName(reportAction),
@@ -4252,6 +4260,8 @@ function buildTransactionThread(reportAction: OnyxEntry<ReportAction | Optimisti
         CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
         reportAction?.reportActionID,
         moneyRequestReport?.reportID,
+        '',
+        existingTransactionThreadReportID,
     );
 }
 
@@ -4278,12 +4288,15 @@ function buildOptimisticMoneyRequestEntities(
     isSendMoneyFlow = false,
     receipt: Receipt = {},
     isOwnPolicyExpenseChat = false,
-): [OptimisticCreatedReportAction, OptimisticCreatedReportAction, OptimisticIOUReportAction, OptimisticChatReport, OptimisticCreatedReportAction] {
+    existingTransactionThreadReportID?: string,
+    linkedTrackedExpenseReportAction?: ReportAction,
+): [OptimisticCreatedReportAction, OptimisticCreatedReportAction, OptimisticIOUReportAction, OptimisticChatReport, OptimisticCreatedReportAction | EmptyObject] {
     const createdActionForChat = buildOptimisticCreatedReportAction(payeeEmail);
 
     // The `CREATED` action must be optimistically generated before the IOU action so that it won't appear after the IOU action in the chat.
     const iouActionCreationTime = DateUtils.getDBTime();
     const createdActionForIOUReport = buildOptimisticCreatedReportAction(payeeEmail, DateUtils.subtractMillisecondsFromDateTime(iouActionCreationTime, 1));
+
     const iouAction = buildOptimisticIOUReportAction(
         type,
         amount,
@@ -4298,14 +4311,15 @@ function buildOptimisticMoneyRequestEntities(
         receipt,
         isOwnPolicyExpenseChat,
         iouActionCreationTime,
+        linkedTrackedExpenseReportAction,
     );
 
-    // Create optimistic transactionThread and the `CREATED` action for it
-    const transactionThread = buildTransactionThread(iouAction, iouReport);
-    const createdActionForTransactionThread = buildOptimisticCreatedReportAction(payeeEmail);
+    // Create optimistic transactionThread and the `CREATED` action for it, if existingTransactionThreadReportID is undefined
+    const transactionThread = buildTransactionThread(iouAction, iouReport, existingTransactionThreadReportID);
+    const createdActionForTransactionThread = existingTransactionThreadReportID ? {} : buildOptimisticCreatedReportAction(payeeEmail);
 
     // The IOU action and the transactionThread are co-dependent as parent-child, so we need to link them together
-    iouAction.childReportID = transactionThread.reportID;
+    iouAction.childReportID = existingTransactionThreadReportID ?? transactionThread.reportID;
 
     return [createdActionForChat, createdActionForIOUReport, iouAction, transactionThread, createdActionForTransactionThread];
 }
@@ -5751,7 +5765,6 @@ function hasActionsWithErrors(reportID: string): boolean {
     return Object.values(reportActions ?? {}).some((action) => !isEmptyObject(action.errors));
 }
 
-
 function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>, reportActionID: string): void {
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction);
     const reportActions = ReportActionsUtils.getAllReportActions(reportID);
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 0169d7a5f0fd..2c26677dc535 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -460,14 +460,15 @@ function buildOnyxDataForMoneyRequest(
     optimisticPolicyRecentlyUsedCategories: string[],
     optimisticPolicyRecentlyUsedTags: OnyxTypes.RecentlyUsedTags,
     isNewChatReport: boolean,
-    transactionThreadReport: OptimisticChatReport,
-    transactionThreadCreatedReportAction: OptimisticCreatedReportAction,
+    transactionThreadReport: OptimisticChatReport | EmptyObject,
+    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | EmptyObject,
     shouldCreateNewMoneyRequestReport: boolean,
     policy?: OnyxEntry<OnyxTypes.Policy>,
     policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     optimisticNextStep?: OnyxTypes.ReportNextStep | null,
     isOneOnOneSplit = false,
+    existingTransactionThreadReportID?: string,
 ): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
     const isScanRequest = TransactionUtils.isScanRequest(transaction);
     const outstandingChildRequest = ReportUtils.getOutstandingChildRequest(iouReport);
@@ -477,6 +478,7 @@ function buildOnyxDataForMoneyRequest(
     if (TransactionUtils.isDistanceRequest(transaction)) {
         newQuickAction = CONST.QUICK_ACTIONS.REQUEST_DISTANCE;
     }
+    const existingTransactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
 
     if (chatReport) {
         optimisticData.push({
@@ -544,20 +546,11 @@ function buildOnyxDataForMoneyRequest(
                       [iouAction.reportActionID]: iouAction as OnyxTypes.ReportAction,
                   },
               },
-
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
             value: transactionThreadReport,
         },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
-            value: {
-                [transactionThreadCreatedReportAction.reportActionID]: transactionThreadCreatedReportAction,
-            },
-        },
-
         // Remove the temporary transaction used during the creation flow
         {
             onyxMethod: Onyx.METHOD.SET,
@@ -566,6 +559,16 @@ function buildOnyxDataForMoneyRequest(
         },
     );
 
+    if (!isEmptyObject(transactionThreadCreatedReportAction)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            value: {
+                [transactionThreadCreatedReportAction.reportActionID]: transactionThreadCreatedReportAction,
+            },
+        });
+    }
+
     if (!isOneOnOneSplit) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.SET,
@@ -685,7 +688,10 @@ function buildOnyxDataForMoneyRequest(
                 },
             },
         },
-        {
+    );
+
+    if (!isEmptyObject(transactionThreadCreatedReportAction)) {
+        successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
             value: {
@@ -694,8 +700,8 @@ function buildOnyxDataForMoneyRequest(
                     errors: null,
                 },
             },
-        },
-    );
+        });
+    }
 
     const errorKey = DateUtils.getMicroseconds();
 
@@ -731,9 +737,11 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
             value: {
-                errorFields: {
-                    createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                },
+                errorFields: existingTransactionThreadReport
+                    ? null
+                    : {
+                          createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                      },
             },
         },
         {
@@ -769,16 +777,19 @@ function buildOnyxDataForMoneyRequest(
                       }),
             },
         },
-        {
+    ];
+
+    if (!isEmptyObject(transactionThreadCreatedReportAction)) {
+        failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
             value: {
                 [transactionThreadCreatedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage', false, errorKey),
+                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
                 },
             },
-        },
-    ];
+        });
+    }
 
     // We don't need to compute violations unless we're on a paid policy
     if (!policy || !PolicyUtils.isPaidGroupPolicy(policy)) {
@@ -971,7 +982,13 @@ function buildOnyxDataForTrackExpense(
     return [optimisticData, successData, failureData];
 }
 
-function getDeleteTrackExpenseInformation(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction, shouldDeleteTransactionFromOnyx = true) {
+function getDeleteTrackExpenseInformation(
+    chatReportID: string,
+    transactionID: string,
+    reportAction: OnyxTypes.ReportAction,
+    shouldDeleteTransactionFromOnyx = true,
+    isMovingTransactionFromTrackExpense = false,
+) {
     // STEP 1: Get all collections we're updating
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -983,10 +1000,11 @@ function getDeleteTrackExpenseInformation(chatReportID: string, transactionID: s
     }
 
     // STEP 2: Decide if we need to:
-    // 1. Delete the transactionThread - delete if there are no visible comments in the thread
-    // 2. Update the moneyRequestPreview to show [Deleted request] - update if the transactionThread exists AND it isn't being deleted
-    const shouldDeleteTransactionThread = transactionThreadID ? (reportAction?.childVisibleActionCount ?? 0) === 0 : false;
-    const shouldShowDeletedRequestMessage = !!transactionThreadID && !shouldDeleteTransactionThread;
+    // 1. Delete the transactionThread - delete if there are no visible comments in the thread and we're not moving the transaction
+    // 2. Update the moneyRequestPreview to show [Deleted request] - update if the transactionThread exists AND it isn't being deleted and we're not moving the transaction
+    const shouldDeleteTransactionThread = !isMovingTransactionFromTrackExpense && (transactionThreadID ? (reportAction?.childVisibleActionCount ?? 0) === 0 : false);
+
+    const shouldShowDeletedRequestMessage = !isMovingTransactionFromTrackExpense && !!transactionThreadID && !shouldDeleteTransactionThread;
 
     // STEP 3: Update the IOU reportAction.
     const updatedReportAction = {
@@ -1151,6 +1169,7 @@ function getMoneyRequestInformation(
     payeeAccountID = userAccountID,
     payeeEmail = currentUserEmail,
     moneyRequestReportID = '',
+    linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
 ): MoneyRequestInformation {
     const payerEmail = PhoneNumber.addSMSDomainIfPhoneNumber(participant.login ?? '');
     const payerAccountID = Number(participant.accountID);
@@ -1263,6 +1282,8 @@ function getMoneyRequestInformation(
             false,
             receiptObject,
             false,
+            linkedTrackedExpenseReportAction?.childReportID,
+            linkedTrackedExpenseReportAction,
         );
 
     let reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
@@ -1307,8 +1328,8 @@ function getMoneyRequestInformation(
         optimisticPolicyRecentlyUsedCategories,
         optimisticPolicyRecentlyUsedTags,
         isNewChatReport,
-        optimisticTransactionThread,
-        optimisticCreatedActionForTransactionThread,
+        optimisticTransactionThread ?? {},
+        optimisticCreatedActionForTransactionThread ?? {},
         shouldCreateNewMoneyRequestReport,
         policy,
         policyTagList,
@@ -1326,8 +1347,8 @@ function getMoneyRequestInformation(
         createdChatReportActionID: isNewChatReport ? optimisticCreatedActionForChat.reportActionID : '0',
         createdIOUReportActionID: shouldCreateNewMoneyRequestReport ? optimisticCreatedActionForIOUReport.reportActionID : '0',
         reportPreviewAction,
-        transactionThreadReportID: optimisticTransactionThread.reportID,
-        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread.reportActionID,
+        transactionThreadReportID: optimisticTransactionThread?.reportID ?? '0',
+        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '0',
         onyxData: {
             optimisticData,
             successData,
@@ -2230,30 +2251,24 @@ function updateDistanceRequest(
     API.write(WRITE_COMMANDS.UPDATE_DISTANCE_REQUEST, params, onyxData);
 }
 
-function convertTrackedExpenseToRequest(
-    payerAccountID: number,
-    chatReportID: string,
+const getConvertTrackedExpenseInformation = (
     transactionID: string,
     actionableWhisperReportActionID: string,
-    createdChatReportActionID: string,
     moneyRequestReportID: string,
-    moneyRequestCreatedReportActionID: string,
-    moneyRequestPreviewReportActionID: string,
     linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
-    onyxData: OnyxData,
-) {
-    const optimisticData = onyxData.optimisticData;
-    const successData = onyxData.successData;
-    const failureData = onyxData.failureData;
+) => {
+    const optimisticData: OnyxUpdate[] = [];
+    const successData: OnyxUpdate[] = [];
+    const failureData: OnyxUpdate[] = [];
 
     // Delete the transaction from the track expense report
     const {
         optimisticData: deleteOptimisticData,
         successData: deleteSuccessData,
         failureData: deleteFailureData,
-    } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, transactionID, linkedTrackedExpenseReportAction, false);
+    } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, transactionID, linkedTrackedExpenseReportAction, false, true);
 
     optimisticData?.push(...deleteOptimisticData);
     successData?.push(...deleteSuccessData);
@@ -2312,6 +2327,43 @@ function convertTrackedExpenseToRequest(
         },
     });
 
+    return {optimisticData, successData, failureData, modifiedExpenseReportActionID: modifiedExpenseReportAction.reportActionID};
+};
+
+function convertTrackedExpenseToRequest(
+    payerAccountID: number,
+    chatReportID: string,
+    transactionID: string,
+    actionableWhisperReportActionID: string,
+    createdChatReportActionID: string,
+    moneyRequestReportID: string,
+    moneyRequestCreatedReportActionID: string,
+    moneyRequestPreviewReportActionID: string,
+    linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
+    linkedTrackedExpenseReportID: string,
+    transactionThreadReportID: string,
+    onyxData: OnyxData,
+) {
+    const {optimisticData, successData, failureData} = onyxData;
+
+    const {
+        optimisticData: moveTransactionOptimisticData,
+        successData: moveTransactionSuccessData,
+        failureData: moveTransactionFailureData,
+        modifiedExpenseReportActionID,
+    } = getConvertTrackedExpenseInformation(
+        transactionID,
+        actionableWhisperReportActionID,
+        moneyRequestReportID,
+        linkedTrackedExpenseReportAction,
+        linkedTrackedExpenseReportID,
+        transactionThreadReportID,
+    );
+
+    optimisticData?.push(...moveTransactionOptimisticData);
+    successData?.push(...moveTransactionSuccessData);
+    failureData?.push(...moveTransactionFailureData);
+
     const parameters = {
         payerAccountID,
         chatReportID,
@@ -2322,7 +2374,7 @@ function convertTrackedExpenseToRequest(
         moneyRequestCreatedReportActionID,
         moneyRequestPreviewReportActionID,
         transactionThreadReportID,
-        modifiedExpenseReportActionID: modifiedExpenseReportAction.reportActionID,
+        modifiedExpenseReportActionID,
     };
     API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, {optimisticData, successData, failureData});
 }
@@ -2339,75 +2391,70 @@ function categorizeTrackedExpense(
     transactionThreadReportID: string,
     onyxData: OnyxData,
 ) {
-    const optimisticData = onyxData.optimisticData;
-    const successData = onyxData.successData;
-    const failureData = onyxData.failureData;
+    const {optimisticData, successData, failureData} = onyxData;
 
-    // delete the transaction from the track expense report
     const {
-        optimisticData: deleteOptimisticData,
-        successData: deleteSuccessData,
-        failureData: deleteFailureData,
-    } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, transactionID, linkedTrackedExpenseReportAction, false);
-
-    optimisticData?.push(...deleteOptimisticData);
-    successData?.push(...deleteSuccessData);
-    failureData?.push(...deleteFailureData);
+        optimisticData: moveTransactionOptimisticData,
+        successData: moveTransactionSuccessData,
+        failureData: moveTransactionFailureData,
+        modifiedExpenseReportActionID,
+    } = getConvertTrackedExpenseInformation(
+        transactionID,
+        actionableWhisperReportActionID,
+        moneyRequestReportID,
+        linkedTrackedExpenseReportAction,
+        linkedTrackedExpenseReportID,
+        transactionThreadReportID,
+    );
 
-    // Build modified expense report action with the transaction changes
-    const modifiedExpenseReportAction = ReportUtils.buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThreadReportID, moneyRequestReportID);
+    optimisticData?.push(...moveTransactionOptimisticData);
+    successData?.push(...moveTransactionSuccessData);
+    failureData?.push(...moveTransactionFailureData);
 
-    optimisticData?.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
-        value: {
-            [modifiedExpenseReportAction.reportActionID]: modifiedExpenseReportAction as OnyxTypes.ReportAction,
-        },
-    });
+    const parameters = {
+        policyID,
+        transactionID,
+        moneyRequestPreviewReportActionID,
+        moneyRequestReportID,
+        moneyRequestCreatedReportActionID,
+        actionableWhisperReportActionID,
+        modifiedExpenseReportActionID,
+    };
 
-    successData?.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
-        value: {
-            [modifiedExpenseReportAction.reportActionID]: { pendingAction: null },
-        },
-    });
+    API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, {optimisticData, successData, failureData});
+}
 
-    failureData?.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
-        value: {
-            [modifiedExpenseReportAction.reportActionID]: {
-                ...(modifiedExpenseReportAction as OnyxTypes.ReportAction),
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
-            },
-        },
-    });
+function shareTrackedExpense(
+    policyID: string,
+    transactionID: string,
+    moneyRequestPreviewReportActionID: string,
+    moneyRequestReportID: string,
+    moneyRequestCreatedReportActionID: string,
+    actionableWhisperReportActionID: string,
+    linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
+    linkedTrackedExpenseReportID: string,
+    transactionThreadReportID: string,
+    onyxData: OnyxData,
+) {
+    const {optimisticData, successData, failureData} = onyxData;
 
-    // Resolve actionable whisper message
-    optimisticData?.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
-        value: {
-            [actionableWhisperReportActionID]: {
-                originalMessage: {
-                    resolution: CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING,
-                },
-            },
-        },
-    });
+    const {
+        optimisticData: moveTransactionOptimisticData,
+        successData: moveTransactionSuccessData,
+        failureData: moveTransactionFailureData,
+        modifiedExpenseReportActionID,
+    } = getConvertTrackedExpenseInformation(
+        transactionID,
+        actionableWhisperReportActionID,
+        moneyRequestReportID,
+        linkedTrackedExpenseReportAction,
+        linkedTrackedExpenseReportID,
+        transactionThreadReportID,
+    );
 
-    failureData?.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
-        value: {
-            [actionableWhisperReportActionID]: {
-                originalMessage: {
-                    resolution: null,
-                },
-            },
-        },
-    });
+    optimisticData?.push(...moveTransactionOptimisticData);
+    successData?.push(...moveTransactionSuccessData);
+    failureData?.push(...moveTransactionFailureData);
 
     const parameters = {
         policyID,
@@ -2416,14 +2463,12 @@ function categorizeTrackedExpense(
         moneyRequestReportID,
         moneyRequestCreatedReportActionID,
         actionableWhisperReportActionID,
-        modifiedExpenseReportActionID: modifiedExpenseReportAction.reportActionID,
+        modifiedExpenseReportActionID,
     };
 
-    API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, { optimisticData, successData, failureData });
+    API.write(WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION, parameters, {optimisticData, successData, failureData});
 }
 
-
-
 /**
  * Request money from another user
  */
@@ -2491,6 +2536,7 @@ function requestMoney(
         payeeAccountID,
         payeeEmail,
         moneyRequestReportID,
+        linkedTrackedExpenseReportAction,
     );
 
     const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
@@ -2518,8 +2564,11 @@ function requestMoney(
             break;
         }
         case CONST.IOU.ACTION.CATEGORIZE: {
+            if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
+                return;
+            }
             categorizeTrackedExpense(
-                chatReport.policyID,
+                chatReport.policyID ?? '',
                 transaction.transactionID,
                 iouAction.reportActionID,
                 iouReport.reportID,
@@ -2533,18 +2582,21 @@ function requestMoney(
             break;
         }
         case CONST.IOU.ACTION.SHARE: {
-            // todo need to seperate this action into a new function
-            const parameters = {
-                policyID: chatReport.policyID,
-                transactionID: (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID,
-                moneyRequestPreviewReportActionID: reportPreviewAction.reportActionID,
-                moneyRequestReportID: iouReport.reportID,
-                moneyRequestCreatedReportActionID: createdIOUReportActionID,
+            if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
+                return;
+            }
+            shareTrackedExpense(
+                chatReport.policyID ?? '',
+                transaction.transactionID,
+                iouAction.reportActionID,
+                iouReport.reportID,
+                createdIOUReportActionID,
                 actionableWhisperReportActionID,
-                // modifiedExpenseReportActionID - not sure what need to be done here maybe `buildOptimisticModifiedExpenseReportAction` with transaction changes
-            };
-            // eslint-disable-next-line rulesdir/no-multiple-api-calls
-            API.write(WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION, parameters, onyxData);
+                linkedTrackedExpenseReportAction,
+                linkedTrackedExpenseReportID,
+                transactionThreadReportID,
+                onyxData,
+            );
             break;
         }
         default: {
@@ -2582,13 +2634,12 @@ function requestMoney(
         }
     }
 
-    Navigation.dismissModal(activeReportID);
     if (action === CONST.IOU.ACTION.SHARE) {
-        // not sure the correct way to navigate to the share should it be instant? todo: ask for clarification
-        setTimeout(() => {
-            Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(activeReportID));
-        }, 1000);
+        Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(activeReportID));
+    } else {
+        Navigation.dismissModal(activeReportID);
     }
+
     Report.notifyNewAction(activeReportID, payeeAccountID);
 }
 
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 671e78762e86..f423b40fbdd8 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -277,7 +277,7 @@ function ReportActionItem({
 
     // Hide the message if it is being moderated for a higher offense, or is hidden by a moderator
     // Removed messages should not be shown anyway and should not need this flow
-    const latestDecision = action.message?.[0].moderationDecision?.decision ?? '';
+    const latestDecision = action.message?.[0]?.moderationDecision?.decision ?? '';
     useEffect(() => {
         if (action.actionName !== CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT) {
             return;
@@ -563,7 +563,6 @@ function ReportActionItem({
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENTDEQUEUED) {
             children = <ReportActionItemBasicMessage message={ReportUtils.getReimbursementDeQueuedActionMessage(action, report)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {
-            console.log('action==========>-', action);
             children = <ReportActionItemBasicMessage message={ModifiedExpenseMessage.getForReportAction(report.reportID, action)} />;
         } else if (ReportActionsUtils.isOldDotReportAction(action)) {
             // This handles all historical actions from OldDot that we just want to display the message text
@@ -876,6 +875,7 @@ function ReportActionItem({
         ? (Object.values(personalDetails ?? {}).filter((details) => whisperedToAccountIDs.includes(details?.accountID ?? -1)) as OnyxTypes.PersonalDetails[])
         : [];
     const displayNamesWithTooltips = isWhisper ? ReportUtils.getDisplayNamesWithTooltips(whisperedToPersonalDetails, isMultipleParticipant) : [];
+
     return (
         <PressableWithSecondaryInteraction
             ref={popoverAnchorRef}

From bf2ec0240873d7bc631501eec9c64aaa2b973c4a Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 5 Apr 2024 06:59:43 +0530
Subject: [PATCH 093/383] redirect to invite page after share with accountant

---
 src/libs/actions/IOU.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 2c26677dc535..257d9f4fac0f 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2635,7 +2635,7 @@ function requestMoney(
     }
 
     if (action === CONST.IOU.ACTION.SHARE) {
-        Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(activeReportID));
+        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID));
     } else {
         Navigation.dismissModal(activeReportID);
     }

From 993b1ed29a8d3221424a2d20e1d531a9153ff18b Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Fri, 5 Apr 2024 20:15:35 +0200
Subject: [PATCH 094/383] Cleaning tag names

---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index db003df6e5b1..305e0d99b65a 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -91,7 +91,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
                         const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
                         return {
                             value: tag.name,
-                            text: tag.name,
+                            text: PolicyUtils.getCleanedTagName(tag.name),
                             keyForList: tag.name,
                             isSelected: !!selectedTags[tag.name],
                             pendingAction: tag.pendingAction,

From 72a467fe0f0eefd2e2239606c0edadb16c8d1abb Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 20:41:34 +0200
Subject: [PATCH 095/383] Remove policyMembers from
 WorkspaceWorkflowsApproverPage and revert changes from WorkspaceMembersPage

---
 src/libs/PolicyUtils.ts                       |   4 +-
 src/pages/workspace/WorkspaceInvitePage.tsx   |   2 +-
 src/pages/workspace/WorkspaceMembersPage.tsx  | 157 +++++++-----------
 .../WorkspaceWorkflowsApproverPage.tsx        |  13 +-
 4 files changed, 68 insertions(+), 108 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index d48fdd11527b..f54d45987c0c 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -133,8 +133,8 @@ const isPolicyMember = (policyID: string, policies: OnyxCollection<Policy>): boo
  *
  * We only return members without errors. Otherwise, the members with errors would immediately be removed before the user has a chance to read the error.
  */
-function getMemberAccountIDsForWorkspace(policy: OnyxEntry<Policy>, personalDetails: OnyxEntry<PersonalDetailsList>): MemberEmailsToAccountIDs {
-    const members = policy?.employeeList ?? {};
+function getMemberAccountIDsForWorkspace(policyMembers: PolicyMembers | undefined, personalDetails: OnyxEntry<PersonalDetailsList>): MemberEmailsToAccountIDs {
+    const members = policyMembers ?? {};
     const memberEmailsToAccountIDs: MemberEmailsToAccountIDs = {};
     Object.keys(members).forEach((email) => {
         const member = members?.[email];
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 5c53527bf688..90f44d8dd1c1 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -68,7 +68,7 @@ function WorkspaceInvitePage({
     const [personalDetails, setPersonalDetails] = useState<OptionData[]>([]);
     const [usersToInvite, setUsersToInvite] = useState<OptionData[]>([]);
     const openWorkspaceInvitePage = () => {
-        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy, personalDetailsProp);
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetailsProp);
         Policy.openWorkspaceInvitePage(route.params.policyID, Object.keys(policyMemberEmailsToAccountIDs));
     };
 
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 3fae61616f3f..c4828409545c 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -55,12 +55,10 @@ type WorkspaceMembersPageOnyxProps = {
     /** An object containing the accountID for every invited user email */
     invitedEmailsToAccountIDsDraft: OnyxEntry<InvitedEmailsToAccountIDs>;
 };
-
 type WorkspaceMembersPageProps = WithPolicyAndFullscreenLoadingProps &
     WithCurrentUserPersonalDetailsProps &
     WorkspaceMembersPageOnyxProps &
     StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.MEMBERS>;
-
 /**
  * Inverts an object, equivalent of _.invert
  */
@@ -70,55 +68,60 @@ function invertObject(object: Record<string, string>): Record<string, string> {
     return inverted;
 }
 
-type MemberOption = Omit<ListItem, 'accountID'> & {email: string; accountID: number};
-
-function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft, route, policy, session, currentUserPersonalDetails, isLoadingReportData = true}: WorkspaceMembersPageProps) {
+type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
+
+function WorkspaceMembersPage({
+    policyMembers,
+    personalDetails,
+    invitedEmailsToAccountIDsDraft,
+    route,
+    policy,
+    session,
+    currentUserPersonalDetails,
+    isLoadingReportData = true,
+}: WorkspaceMembersPageProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const [selectedEmployees, setSelectedEmployees] = useState<string[]>([]);
+    const [selectedEmployees, setSelectedEmployees] = useState<number[]>([]);
     const [removeMembersConfirmModalVisible, setRemoveMembersConfirmModalVisible] = useState(false);
     const [errors, setErrors] = useState({});
     const {isOffline} = useNetwork();
     const prevIsOffline = usePrevious(isOffline);
-    const accountEmails = useMemo(() => Object.keys(policy?.employeeList ?? {}).map((email) => email), [policy?.employeeList]);
-    const prevAccountEmails = usePrevious(accountEmails);
+    const accountIDs = useMemo(() => Object.keys(policyMembers ?? {}).map((accountID) => Number(accountID)), [policyMembers]);
+    const prevAccountIDs = usePrevious(accountIDs);
     const textInputRef = useRef<TextInput>(null);
-    const isOfflineAndNoMemberDataAvailable = isEmptyObject(policy?.employeeList ?? {}) && isOffline;
+    const isOfflineAndNoMemberDataAvailable = isEmptyObject(policyMembers) && isOffline;
     const prevPersonalDetails = usePrevious(personalDetails);
     const {translate, formatPhoneNumber, preferredLocale} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const dropdownButtonRef = useRef(null);
     const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
     const isLoading = useMemo(
-        () => !isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(personalDetails) || isEmptyObject(policy?.employeeList ?? {})),
-        [isOfflineAndNoMemberDataAvailable, personalDetails, policy?.employeeList],
+        () => !isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(personalDetails) || isEmptyObject(policyMembers)),
+        [isOfflineAndNoMemberDataAvailable, personalDetails, policyMembers],
     );
     const selectionListRef = useRef<SelectionListHandle>(null);
     const isFocused = useIsFocused();
-
     const policyID = route.params.policyID;
-
     /**
      * Get filtered personalDetails list with current policyMembers
      */
-    const filterPersonalDetails = (members: OnyxEntry<PolicyMembers>, personalDetailsList: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
+    const filterPersonalDetails = (members: OnyxEntry<PolicyMembers>, details: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
         Object.keys(members ?? {}).reduce((result, key) => {
-            const details = Object.values(personalDetailsList ?? {}).find((currentDetails) => currentDetails?.login === key);
-            if (details) {
+            if (details?.[key]) {
                 return {
                     ...result,
-                    [key]: details,
+                    [key]: details[key],
                 };
             }
             return result;
         }, {});
-
     /**
      * Get members for the current workspace
      */
     const getWorkspaceMembers = useCallback(() => {
-        Policy.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy, personalDetails)));
-    }, [route.params.policyID, policy, personalDetails]);
+        Policy.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails)));
+    }, [route.params.policyID, policy?.employeeList, personalDetails]);
 
     /**
      * Check if the current selection includes members that cannot be removed
@@ -126,8 +129,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     const validateSelection = useCallback(() => {
         const newErrors: Errors = {};
         selectedEmployees.forEach((member) => {
-            const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === member);
-            if (details?.accountID !== policy?.ownerAccountID && details?.accountID !== session?.accountID) {
+            if (member !== policy?.ownerAccountID && member !== session?.accountID) {
                 return;
             }
             newErrors[member] = translate('workspace.people.error.cannotRemove');
@@ -135,36 +137,34 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         setErrors(newErrors);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [selectedEmployees, policy?.owner, session?.accountID]);
-
     useEffect(() => {
         getWorkspaceMembers();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-
     useEffect(() => {
         validateSelection();
     }, [preferredLocale, validateSelection]);
 
     useEffect(() => {
-        if (removeMembersConfirmModalVisible && !lodashIsEqual(accountEmails, prevAccountEmails)) {
+        if (removeMembersConfirmModalVisible && !lodashIsEqual(accountIDs, prevAccountIDs)) {
             setRemoveMembersConfirmModalVisible(false);
         }
         setSelectedEmployees((prevSelected) => {
             // Filter all personal details in order to use the elements needed for the current workspace
-            const currentPersonalDetails = filterPersonalDetails(policy?.employeeList ?? {}, personalDetails);
+            const currentPersonalDetails = filterPersonalDetails(policyMembers, personalDetails);
             // We need to filter the previous selected employees by the new personal details, since unknown/new user id's change when transitioning from offline to online
-            const prevSelectedElements = prevSelected.map((email) => {
-                const prevItem = prevPersonalDetails?.find((item) => item?.login === email);
+            const prevSelectedElements = prevSelected.map((id) => {
+                const prevItem = prevPersonalDetails?.id;
                 const res = Object.values(currentPersonalDetails).find((item) => prevItem?.login === item?.login);
-                return res?.login ?? email;
+                return res?.accountID ?? id;
             });
             // This is an equivalent of the lodash intersection function. The reduce method below is used to filter the items that exist in both arrays.
-            return [prevSelectedElements, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy, personalDetails))].reduce((prev, members) =>
+            return [prevSelectedElements, Object.values(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails))].reduce((prev, members) =>
                 prev.filter((item) => members.includes(item)),
             );
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [policy]);
+    }, [policyMembers, policy?.employeeList]);
 
     useEffect(() => {
         const isReconnecting = prevIsOffline && !isOffline;
@@ -173,14 +173,12 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         getWorkspaceMembers();
     }, [isOffline, prevIsOffline, getWorkspaceMembers]);
-
     /**
      * Open the modal to invite a user
      */
     const inviteUser = () => {
         Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID));
     };
-
     /**
      * Remove selected users from the workspace
      * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
@@ -191,18 +189,12 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
 
         // Remove the admin from the list
-        const accountIDsToRemove = (session?.accountID ? selectedEmployees.filter((email) => email !== session.email) : selectedEmployees)
-            .map((email) => {
-                const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === email);
-                return details?.accountID;
-            })
-            .filter(Boolean) as number[];
+        const accountIDsToRemove = session?.accountID ? selectedEmployees.filter((id) => id !== session.accountID) : selectedEmployees;
 
         Policy.removeMembers(accountIDsToRemove, route.params.policyID);
         setSelectedEmployees([]);
         setRemoveMembersConfirmModalVisible(false);
     };
-
     /**
      * Show the modal to confirm removal of the selected members
      */
@@ -212,65 +204,60 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         setRemoveMembersConfirmModalVisible(true);
     };
-
     /**
      * Add or remove all users passed from the selectedEmployees list
      */
     const toggleAllUsers = (memberList: MemberOption[]) => {
         const enabledAccounts = memberList.filter((member) => !member.isDisabled && !member.isDisabledCheckbox);
-        const everyoneSelected = enabledAccounts.every((member) => selectedEmployees.includes(member.email));
+        const everyoneSelected = enabledAccounts.every((member) => selectedEmployees.includes(member.accountID));
 
         if (everyoneSelected) {
             setSelectedEmployees([]);
         } else {
-            const everyEmail = enabledAccounts.map((member) => member.email);
-            setSelectedEmployees(everyEmail);
+            const everyAccountId = enabledAccounts.map((member) => member.accountID);
+            setSelectedEmployees(everyAccountId);
         }
 
         validateSelection();
     };
-
     /**
      * Add user from the selectedEmployees list
      */
     const addUser = useCallback(
-        (selectedEmail: string) => {
-            setSelectedEmployees((prevSelected) => [...prevSelected, selectedEmail]);
+        (accountID: number) => {
+            setSelectedEmployees((prevSelected) => [...prevSelected, accountID]);
             validateSelection();
         },
         [validateSelection],
     );
-
     /**
      * Remove user from the selectedEmployees list
      */
     const removeUser = useCallback(
-        (selectedEmail: string) => {
-            setSelectedEmployees((prevSelected) => prevSelected.filter((email) => email !== selectedEmail));
+        (accountID: number) => {
+            setSelectedEmployees((prevSelected) => prevSelected.filter((id) => id !== accountID));
             validateSelection();
         },
         [validateSelection],
     );
-
     /**
      * Toggle user from the selectedEmployees list
      */
     const toggleUser = useCallback(
-        (email: string, pendingAction?: PendingAction) => {
+        (accountID: number, pendingAction?: PendingAction) => {
             if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
                 return;
             }
 
             // Add or remove the user if the checkbox is enabled
-            if (selectedEmployees.includes(email)) {
-                removeUser(email);
+            if (selectedEmployees.includes(accountID)) {
+                removeUser(accountID);
             } else {
-                addUser(email);
+                addUser(accountID);
             }
         },
         [selectedEmployees, addUser, removeUser],
     );
-
     /** Opens the member details page */
     const openMemberDetails = useCallback(
         (item: MemberOption) => {
@@ -278,13 +265,11 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 Navigation.navigate(ROUTES.PROFILE.getRoute(item.accountID));
                 return;
             }
-
             Policy.clearWorkspaceOwnerChangeFlow(policyID);
             Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(route.params.policyID, item.accountID, Navigation.getActiveRoute()));
         },
         [isPolicyAdmin, policy, policyID, route.params.policyID],
     );
-
     /**
      * Dismisses the errors on one item
      */
@@ -298,7 +283,6 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         },
         [route.params.policyID],
     );
-
     /**
      * Check if the policy member is deleted from the workspace
      */
@@ -308,21 +292,20 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     );
     const policyOwner = policy?.owner;
     const currentUserLogin = currentUserPersonalDetails.login;
-
     const invitedPrimaryToSecondaryLogins = invertObject(policy?.primaryLoginsInvited ?? {});
-
     const getUsers = useCallback((): MemberOption[] => {
         let result: MemberOption[] = [];
 
-        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
+        Object.entries(policyMembers ?? {}).forEach(([accountIDKey, policyMember]) => {
+            const accountID = Number(accountIDKey);
             if (isDeletedPolicyMember(policyMember)) {
                 return;
             }
 
-            const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === email);
+            const details = personalDetails?.[accountID];
 
             if (!details) {
-                Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with email: ${email}`);
+                Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with accountID: ${accountID}`);
                 return;
             }
 
@@ -335,11 +318,10 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 }
             }
 
-            const isSelected = selectedEmployees.includes(email);
+            const isSelected = selectedEmployees.includes(accountID);
 
             const isOwner = policy?.owner === details.login;
             const isAdmin = policyMember.role === CONST.POLICY.ROLE.ADMIN;
-
             let roleBadge = null;
             if (isOwner || isAdmin) {
                 roleBadge = (
@@ -351,12 +333,9 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 );
             }
 
-            const accountID = details.accountID ?? 0;
-
             result.push({
-                keyForList: email,
+                keyForList: accountIDKey,
                 accountID,
-                email,
                 isSelected,
                 isDisabledCheckbox: !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID),
                 isDisabled: isPolicyAdmin && (policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyMember.errors)),
@@ -373,14 +352,11 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 ],
                 errors: policyMember.errors,
                 pendingAction: policyMember.pendingAction,
-
                 // Note which secondary login was used to invite this primary login
                 invitedSecondaryLogin: details?.login ? invitedPrimaryToSecondaryLogins[details.login] ?? '' : '',
             });
         });
-
         result = result.sort((a, b) => (a.text ?? '').toLowerCase().localeCompare((b.text ?? '').toLowerCase()));
-
         return result;
     }, [
         StyleUtils,
@@ -392,7 +368,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         personalDetails,
         policy?.owner,
         policy?.ownerAccountID,
-        policy?.employeeList,
+        policyMembers,
         policyOwner,
         selectedEmployees,
         session?.accountID,
@@ -402,27 +378,25 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         styles.textStrong,
         translate,
     ]);
-
     const data = useMemo(() => getUsers(), [getUsers]);
-
     useEffect(() => {
         if (!isFocused) {
             return;
         }
-        if (isEmptyObject(invitedEmailsToAccountIDsDraft) || accountEmails === prevAccountEmails) {
+        if (isEmptyObject(invitedEmailsToAccountIDsDraft) || accountIDs === prevAccountIDs) {
             return;
         }
         const invitedEmails = Object.values(invitedEmailsToAccountIDsDraft).map(String);
         selectionListRef.current?.scrollAndHighlightItem?.(invitedEmails, 1500);
         Policy.setWorkspaceInviteMembersDraft(route.params.policyID, {});
-    }, [invitedEmailsToAccountIDsDraft, route.params.policyID, isFocused, accountEmails, prevAccountEmails]);
+    }, [invitedEmailsToAccountIDsDraft, route.params.policyID, isFocused, accountIDs, prevAccountIDs]);
 
     const getHeaderMessage = () => {
         if (isOfflineAndNoMemberDataAvailable) {
             return translate('workspace.common.mustBeOnlineToViewMembers');
         }
 
-        return !isLoading && isEmptyObject(policy?.employeeList ?? {}) ? translate('workspace.common.memberNotFound') : '';
+        return !isLoading && isEmptyObject(policyMembers) ? translate('workspace.common.memberNotFound') : '';
     };
 
     const getHeaderContent = () => (
@@ -439,7 +413,6 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             )}
         </>
     );
-
     const getCustomListHeader = () => {
         const header = (
             <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween]}>
@@ -451,31 +424,21 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 </View>
             </View>
         );
-
         if (isPolicyAdmin) {
             return header;
         }
-
         return <View style={[styles.peopleRow, styles.userSelectNone, styles.ph9, styles.pv3, styles.pb5]}>{header}</View>;
     };
-
     const changeUserRole = (role: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER) => {
         if (!isEmptyObject(errors)) {
             return;
         }
 
-        const accountIDsToUpdate = selectedEmployees
-            .filter((email) => policy?.employeeList?.[email].role !== role)
-            .map((email) => {
-                const details = Object.values(personalDetails ?? {}).find((currentDetails) => currentDetails?.login === email);
-                return details?.accountID;
-            })
-            .filter(Boolean) as number[];
+        const accountIDsToUpdate = selectedEmployees.filter((id) => policyMembers?.[id].role !== role);
 
         Policy.updateWorkspaceMembersRole(route.params.policyID, accountIDsToUpdate, role);
         setSelectedEmployees([]);
     };
-
     const getBulkActionsButtonOptions = () => {
         const options: Array<DropdownOption<WorkspaceMemberBulkActionType>> = [
             {
@@ -487,7 +450,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         ];
 
         if (PolicyUtils.isPaidGroupPolicy(policy)) {
-            if (selectedEmployees.find((employee) => policy?.employeeList?.[employee]?.role === CONST.POLICY.ROLE.ADMIN)) {
+            if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.ADMIN)) {
                 options.push({
                     text: translate('workspace.people.makeMember'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_MEMBER,
@@ -496,7 +459,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 });
             }
 
-            if (selectedEmployees.find((employee) => policy?.employeeList?.[employee]?.role === CONST.POLICY.ROLE.USER)) {
+            if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.USER)) {
                 options.push({
                     text: translate('workspace.people.makeAdmin'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_ADMIN,
@@ -505,15 +468,12 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 });
             }
         }
-
         return options;
     };
-
     const getHeaderButtons = () => {
         if (!isPolicyAdmin) {
             return null;
         }
-
         return (
             <View style={styles.w100}>
                 {selectedEmployees.length > 0 ? (
@@ -541,7 +501,6 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             </View>
         );
     };
-
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -595,7 +554,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                         headerMessage={getHeaderMessage()}
                         headerContent={getHeaderContent()}
                         onSelectRow={openMemberDetails}
-                        onCheckboxPress={(item) => toggleUser(item.email)}
+                        onCheckboxPress={(item) => toggleUser(item.accountID)}
                         onSelectAll={() => toggleAllUsers(data)}
                         onDismissError={dismissError}
                         showLoadingPlaceholder={isLoading}
@@ -610,9 +569,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         </ScreenWrapper>
     );
 }
-
 WorkspaceMembersPage.displayName = 'WorkspaceMembersPage';
-
 export default withCurrentUserPersonalDetails(
     withPolicyAndFullscreenLoading(
         withOnyx<WorkspaceMembersPageProps, WorkspaceMembersPageOnyxProps>({
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
index 51baaca166b5..d642960255c5 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
@@ -41,7 +41,7 @@ type WorkspaceWorkflowsApproverPageProps = WorkspaceWorkflowsApproverPageOnyxPro
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 type MembersSection = SectionListData<MemberOption, Section<MemberOption>>;
 
-function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails, isLoadingReportData = true, route}: WorkspaceWorkflowsApproverPageProps) {
+function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingReportData = true, route}: WorkspaceWorkflowsApproverPageProps) {
     const {translate} = useLocalize();
     const policyName = policy?.name ?? '';
     const [searchTerm, setSearchTerm] = useState('');
@@ -58,12 +58,15 @@ function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails,
         const policyMemberDetails: MemberOption[] = [];
         const approverDetails: MemberOption[] = [];
 
-        Object.entries(policyMembers ?? {}).forEach(([accountIDKey, policyMember]) => {
-            const accountID = Number(accountIDKey);
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
+
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
             if (isDeletedPolicyMember(policyMember)) {
                 return;
             }
 
+            const accountID = Number(policyMemberEmailsToAccountIDs[email] || '');
+
             const details = personalDetails?.[accountID];
             if (!details) {
                 Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with accountID: ${accountID}`);
@@ -85,7 +88,7 @@ function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails,
             }
 
             const formattedMember = {
-                keyForList: accountIDKey,
+                keyForList: String(accountID),
                 accountID,
                 isSelected: policy?.approver === details.login,
                 isDisabled: policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyMember.errors),
@@ -111,7 +114,7 @@ function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails,
             }
         });
         return [policyMemberDetails, approverDetails];
-    }, [personalDetails, policyMembers, translate, policy?.approver, StyleUtils, isDeletedPolicyMember, policy?.owner, styles]);
+    }, [personalDetails, translate, policy?.approver, StyleUtils, isDeletedPolicyMember, policy?.owner, styles, policy?.employeeList]);
 
     const sections: MembersSection[] = useMemo(() => {
         const sectionsArray: MembersSection[] = [];

From e1e663005a35ebf533b92a8b75bae5d9dc968f29 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Sat, 6 Apr 2024 22:15:18 +0300
Subject: [PATCH 096/383] Update src/pages/workspace/tags/WorkspaceTagsPage.tsx

Co-authored-by: Vinh Hoang <hoangzinhvn@gmail.com>
---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 789d1b02d53f..05a5daa4297d 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -82,7 +82,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
             fetchTags();
         }, [fetchTags]),
     );
-    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags).slice(0, 1), [policyTags]);
+    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
         () =>
             policyTagLists

From 224f2b7c9ed472e8f3c6594f73203c764abe96d4 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 21:21:42 +0200
Subject: [PATCH 097/383] Remove policyMembers from ReportScreenIDSetter and
 refactor PolicyMembersUtils

---
 .../AppNavigator/ReportScreenIDSetter.ts      | 19 +++++++++---------
 src/libs/PolicyMembersUtils.ts                | 20 +++++++++++++------
 src/libs/PolicyUtils.ts                       | 12 +++++------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
index 529f0f3d31a7..a9fbf19b4477 100644
--- a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
+++ b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
@@ -6,7 +6,7 @@ import usePermissions from '@hooks/usePermissions';
 import {getPolicyMembersByIdWithoutCurrentUser} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, PolicyMembers, Report, ReportMetadata} from '@src/types/onyx';
+import type {PersonalDetailsList, Policy, Report, ReportMetadata} from '@src/types/onyx';
 import type {ReportScreenWrapperProps} from './ReportScreenWrapper';
 
 type ReportScreenIDSetterComponentProps = {
@@ -16,8 +16,8 @@ type ReportScreenIDSetterComponentProps = {
     /** The policies which the user has access to */
     policies: OnyxCollection<Policy>;
 
-    /** Members of all the workspaces the user is member of */
-    policyMembers: OnyxCollection<PolicyMembers>;
+    /** The personal details of the person who is logged in */
+    personalDetails: OnyxEntry<PersonalDetailsList>;
 
     /** Whether user is a new user */
     isFirstTimeNewExpensifyUser: OnyxEntry<boolean>;
@@ -58,7 +58,7 @@ const getLastAccessedReportID = (
 };
 
 // This wrapper is reponsible for opening the last accessed report if there is no reportID specified in the route params
-function ReportScreenIDSetter({route, reports, policies, policyMembers = {}, navigation, isFirstTimeNewExpensifyUser = false, reportMetadata, accountID}: ReportScreenIDSetterProps) {
+function ReportScreenIDSetter({route, reports, policies, navigation, isFirstTimeNewExpensifyUser = false, reportMetadata, accountID, personalDetails}: ReportScreenIDSetterProps) {
     const {canUseDefaultRooms} = usePermissions();
     const {activeWorkspaceID} = useActiveWorkspace();
 
@@ -73,7 +73,7 @@ function ReportScreenIDSetter({route, reports, policies, policyMembers = {}, nav
             return;
         }
 
-        const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policyMembers, activeWorkspaceID, accountID);
+        const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policies, personalDetails, activeWorkspaceID, accountID);
 
         // If there is no reportID in route, try to find last accessed and use it for setParams
         const reportID = getLastAccessedReportID(
@@ -92,7 +92,7 @@ function ReportScreenIDSetter({route, reports, policies, policyMembers = {}, nav
         if (reportID) {
             navigation.setParams({reportID: String(reportID)});
         }
-    }, [route, navigation, reports, canUseDefaultRooms, policies, isFirstTimeNewExpensifyUser, reportMetadata, activeWorkspaceID, policyMembers, accountID]);
+    }, [route, navigation, reports, canUseDefaultRooms, policies, isFirstTimeNewExpensifyUser, reportMetadata, activeWorkspaceID, personalDetails, accountID]);
 
     // The ReportScreen without the reportID set will display a skeleton
     // until the reportID is loaded and set in the route param
@@ -110,10 +110,6 @@ export default withOnyx<ReportScreenIDSetterProps, ReportScreenIDSetterComponent
         key: ONYXKEYS.COLLECTION.POLICY,
         allowStaleData: true,
     },
-    policyMembers: {
-        key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-        allowStaleData: true,
-    },
     isFirstTimeNewExpensifyUser: {
         key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
         initialValue: false,
@@ -126,4 +122,7 @@ export default withOnyx<ReportScreenIDSetterProps, ReportScreenIDSetterComponent
         key: ONYXKEYS.SESSION,
         selector: (session) => session?.accountID,
     },
+    personalDetails: {
+        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    },
 })(ReportScreenIDSetter);
diff --git a/src/libs/PolicyMembersUtils.ts b/src/libs/PolicyMembersUtils.ts
index 4376de150f17..59d1bff22597 100644
--- a/src/libs/PolicyMembersUtils.ts
+++ b/src/libs/PolicyMembersUtils.ts
@@ -1,15 +1,23 @@
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyMembers} from '@src/types/onyx';
+import type {PersonalDetailsList, Policy} from '@src/types/onyx';
 import {getCurrentUserAccountID} from './actions/Report';
 import {getPolicyMembersByIdWithoutCurrentUser} from './PolicyUtils';
 
-let policyMembers: OnyxCollection<PolicyMembers>;
+let policies: OnyxCollection<Policy>;
 Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
+    key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
-    callback: (value) => (policyMembers = value),
+    callback: (value) => (policies = value),
+});
+
+let allPersonalDetails: OnyxEntry<PersonalDetailsList> = {};
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    callback: (val) => {
+        allPersonalDetails = val;
+    },
 });
 
 function getPolicyMemberAccountIDs(policyID?: string) {
@@ -19,7 +27,7 @@ function getPolicyMemberAccountIDs(policyID?: string) {
 
     const currentUserAccountID = getCurrentUserAccountID();
 
-    return getPolicyMembersByIdWithoutCurrentUser(policyMembers, policyID, currentUserAccountID);
+    return getPolicyMembersByIdWithoutCurrentUser(policies, allPersonalDetails, policyID, currentUserAccountID);
 }
 
 export default getPolicyMemberAccountIDs;
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index f54d45987c0c..43445db90fdf 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -273,12 +273,12 @@ function getPathWithoutPolicyID(path: string) {
     return path.replace(CONST.REGEX.PATH_WITHOUT_POLICY_ID, '/');
 }
 
-function getPolicyMembersByIdWithoutCurrentUser(policyMembers: OnyxCollection<PolicyMembers>, currentPolicyID?: string, currentUserAccountID?: number) {
-    return policyMembers
-        ? Object.keys(policyMembers[`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${currentPolicyID}`] ?? {})
-              .map((policyMemberAccountID) => Number(policyMemberAccountID))
-              .filter((policyMemberAccountID) => policyMemberAccountID !== currentUserAccountID)
-        : [];
+function getPolicyMembersByIdWithoutCurrentUser(policies: OnyxCollection<Policy>, personalDetails: OnyxEntry<PersonalDetailsList>, currentPolicyID?: string, currentUserAccountID?: number) {
+    const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${currentPolicyID}`] ?? null;
+    const policyMemberEmailsToAccountIDs = getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
+    return Object.values(policyMemberEmailsToAccountIDs)
+        .map((policyMemberAccountID) => Number(policyMemberAccountID))
+        .filter((policyMemberAccountID) => policyMemberAccountID !== currentUserAccountID);
 }
 
 function goBackFromInvalidPolicy() {

From 99c6a2809649f0dfcd340f325a3de3dbca2c15f9 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 21:27:04 +0200
Subject: [PATCH 098/383] Remove policyMembers from SidebarLinksData

---
 src/pages/home/sidebar/SidebarLinksData.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarLinksData.js b/src/pages/home/sidebar/SidebarLinksData.js
index 0c1f8b8c5972..016435f42fa5 100644
--- a/src/pages/home/sidebar/SidebarLinksData.js
+++ b/src/pages/home/sidebar/SidebarLinksData.js
@@ -65,9 +65,6 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     policies: PropTypes.object,
 
-    // eslint-disable-next-line react/forbid-prop-types
-    policyMembers: PropTypes.object,
-
     /** All of the transaction violations */
     transactionViolations: PropTypes.shape({
         violations: PropTypes.arrayOf(
@@ -102,7 +99,6 @@ const defaultProps = {
     priorityMode: CONST.PRIORITY_MODE.DEFAULT,
     betas: [],
     policies: {},
-    policyMembers: {},
     transactionViolations: {},
     allReportActions: {},
     ...withCurrentUserPersonalDetailsDefaultProps,
@@ -120,7 +116,6 @@ function SidebarLinksData({
     policies,
     priorityMode,
     network,
-    policyMembers,
     transactionViolations,
     currentUserPersonalDetails,
 }) {
@@ -129,7 +124,7 @@ function SidebarLinksData({
     const {translate} = useLocalize();
     const prevPriorityMode = usePrevious(priorityMode);
 
-    const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policyMembers, activeWorkspaceID, currentUserPersonalDetails.accountID);
+    const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policies, activeWorkspaceID, currentUserPersonalDetails.accountID);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     useEffect(() => Policy.openWorkspace(activeWorkspaceID, policyMemberAccountIDs), [activeWorkspaceID]);
@@ -322,9 +317,6 @@ export default compose(
             selector: policySelector,
             initialValue: {},
         },
-        policyMembers: {
-            key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-        },
         transactionViolations: {
             key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
             initialValue: {},
@@ -348,7 +340,6 @@ export default compose(
             prevProps.network.isOffline === nextProps.network.isOffline &&
             _.isEqual(prevProps.insets, nextProps.insets) &&
             prevProps.onLinkClick === nextProps.onLinkClick &&
-            _.isEqual(prevProps.policyMembers, nextProps.policyMembers) &&
             _.isEqual(prevProps.transactionViolations, nextProps.transactionViolations) &&
             _.isEqual(prevProps.currentUserPersonalDetails, nextProps.currentUserPersonalDetails) &&
             prevProps.currentReportID === nextProps.currentReportID,

From 23235b6b57b1d4505900121a25f81297c4b40616 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 21:55:53 +0200
Subject: [PATCH 099/383] Remove policyMembers from WorkspaceMembersPage

---
 src/pages/workspace/WorkspaceMembersPage.tsx  | 43 ++++++++-----------
 src/pages/workspace/withPolicy.tsx            |  5 ---
 .../withPolicyAndFullscreenLoading.tsx        |  3 +-
 3 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index c4828409545c..762e68f6befb 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -70,16 +70,8 @@ function invertObject(object: Record<string, string>): Record<string, string> {
 
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 
-function WorkspaceMembersPage({
-    policyMembers,
-    personalDetails,
-    invitedEmailsToAccountIDsDraft,
-    route,
-    policy,
-    session,
-    currentUserPersonalDetails,
-    isLoadingReportData = true,
-}: WorkspaceMembersPageProps) {
+function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft, route, policy, session, currentUserPersonalDetails, isLoadingReportData = true}: WorkspaceMembersPageProps) {
+    const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const [selectedEmployees, setSelectedEmployees] = useState<number[]>([]);
@@ -87,18 +79,18 @@ function WorkspaceMembersPage({
     const [errors, setErrors] = useState({});
     const {isOffline} = useNetwork();
     const prevIsOffline = usePrevious(isOffline);
-    const accountIDs = useMemo(() => Object.keys(policyMembers ?? {}).map((accountID) => Number(accountID)), [policyMembers]);
+    const accountIDs = useMemo(() => Object.values(policyMemberEmailsToAccountIDs ?? {}).map((accountID) => Number(accountID)), [policyMemberEmailsToAccountIDs]);
     const prevAccountIDs = usePrevious(accountIDs);
     const textInputRef = useRef<TextInput>(null);
-    const isOfflineAndNoMemberDataAvailable = isEmptyObject(policyMembers) && isOffline;
+    const isOfflineAndNoMemberDataAvailable = isEmptyObject(policy?.employeeList) && isOffline;
     const prevPersonalDetails = usePrevious(personalDetails);
     const {translate, formatPhoneNumber, preferredLocale} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const dropdownButtonRef = useRef(null);
     const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
     const isLoading = useMemo(
-        () => !isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(personalDetails) || isEmptyObject(policyMembers)),
-        [isOfflineAndNoMemberDataAvailable, personalDetails, policyMembers],
+        () => !isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(personalDetails) || isEmptyObject(policy?.employeeList)),
+        [isOfflineAndNoMemberDataAvailable, personalDetails, policy?.employeeList],
     );
     const selectionListRef = useRef<SelectionListHandle>(null);
     const isFocused = useIsFocused();
@@ -111,7 +103,7 @@ function WorkspaceMembersPage({
             if (details?.[key]) {
                 return {
                     ...result,
-                    [key]: details[key],
+                    [key]: details[policyMemberEmailsToAccountIDs[key] ?? ''],
                 };
             }
             return result;
@@ -151,7 +143,7 @@ function WorkspaceMembersPage({
         }
         setSelectedEmployees((prevSelected) => {
             // Filter all personal details in order to use the elements needed for the current workspace
-            const currentPersonalDetails = filterPersonalDetails(policyMembers, personalDetails);
+            const currentPersonalDetails = filterPersonalDetails(policy?.employeeList ?? {}, personalDetails);
             // We need to filter the previous selected employees by the new personal details, since unknown/new user id's change when transitioning from offline to online
             const prevSelectedElements = prevSelected.map((id) => {
                 const prevItem = prevPersonalDetails?.id;
@@ -164,7 +156,7 @@ function WorkspaceMembersPage({
             );
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [policyMembers, policy?.employeeList]);
+    }, [policy?.employeeList]);
 
     useEffect(() => {
         const isReconnecting = prevIsOffline && !isOffline;
@@ -296,8 +288,8 @@ function WorkspaceMembersPage({
     const getUsers = useCallback((): MemberOption[] => {
         let result: MemberOption[] = [];
 
-        Object.entries(policyMembers ?? {}).forEach(([accountIDKey, policyMember]) => {
-            const accountID = Number(accountIDKey);
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
+            const accountID = Number(policyMemberEmailsToAccountIDs[email] ?? '');
             if (isDeletedPolicyMember(policyMember)) {
                 return;
             }
@@ -334,7 +326,7 @@ function WorkspaceMembersPage({
             }
 
             result.push({
-                keyForList: accountIDKey,
+                keyForList: String(accountID),
                 accountID,
                 isSelected,
                 isDisabledCheckbox: !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID),
@@ -368,7 +360,8 @@ function WorkspaceMembersPage({
         personalDetails,
         policy?.owner,
         policy?.ownerAccountID,
-        policyMembers,
+        policy?.employeeList,
+        policyMemberEmailsToAccountIDs,
         policyOwner,
         selectedEmployees,
         session?.accountID,
@@ -396,7 +389,7 @@ function WorkspaceMembersPage({
             return translate('workspace.common.mustBeOnlineToViewMembers');
         }
 
-        return !isLoading && isEmptyObject(policyMembers) ? translate('workspace.common.memberNotFound') : '';
+        return !isLoading && isEmptyObject(policy?.employeeList) ? translate('workspace.common.memberNotFound') : '';
     };
 
     const getHeaderContent = () => (
@@ -434,7 +427,7 @@ function WorkspaceMembersPage({
             return;
         }
 
-        const accountIDsToUpdate = selectedEmployees.filter((id) => policyMembers?.[id].role !== role);
+        const accountIDsToUpdate = selectedEmployees.filter((id) => policy?.employeeList?.[policyMemberEmailsToAccountIDs[id]]?.role !== role);
 
         Policy.updateWorkspaceMembersRole(route.params.policyID, accountIDsToUpdate, role);
         setSelectedEmployees([]);
@@ -450,7 +443,7 @@ function WorkspaceMembersPage({
         ];
 
         if (PolicyUtils.isPaidGroupPolicy(policy)) {
-            if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.ADMIN)) {
+            if (selectedEmployees.find((employee) => policy?.employeeList?.[policyMemberEmailsToAccountIDs[employee]]?.role === CONST.POLICY.ROLE.ADMIN)) {
                 options.push({
                     text: translate('workspace.people.makeMember'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_MEMBER,
@@ -459,7 +452,7 @@ function WorkspaceMembersPage({
                 });
             }
 
-            if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.USER)) {
+            if (selectedEmployees.find((employee) => policy?.employeeList?.[policyMemberEmailsToAccountIDs[employee]]?.role === CONST.POLICY.ROLE.USER)) {
                 options.push({
                     text: translate('workspace.people.makeAdmin'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_ADMIN,
diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx
index 0f276a9c53e3..9262a1b0f727 100644
--- a/src/pages/workspace/withPolicy.tsx
+++ b/src/pages/workspace/withPolicy.tsx
@@ -92,7 +92,6 @@ const policyPropTypes = {
 
 type WithPolicyOnyxProps = {
     policy: OnyxEntry<OnyxTypes.Policy>;
-    policyMembers: OnyxEntry<OnyxTypes.PolicyMembers>;
     policyDraft: OnyxEntry<OnyxTypes.Policy>;
 };
 
@@ -102,7 +101,6 @@ type WithPolicyProps = WithPolicyOnyxProps & {
 
 const policyDefaultProps: WithPolicyOnyxProps = {
     policy: {} as OnyxTypes.Policy,
-    policyMembers: {},
     policyDraft: {} as OnyxTypes.Policy,
 };
 
@@ -134,9 +132,6 @@ export default function <TProps extends WithPolicyProps, TRef>(WrappedComponent:
         policy: {
             key: (props) => `${ONYXKEYS.COLLECTION.POLICY}${getPolicyIDFromRoute(props.route)}`,
         },
-        policyMembers: {
-            key: (props) => `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${getPolicyIDFromRoute(props.route)}`,
-        },
         policyDraft: {
             key: (props) => `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${getPolicyIDFromRoute(props.route)}`,
         },
diff --git a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
index e5d93dbe36d5..161320441843 100644
--- a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
+++ b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
@@ -28,7 +28,7 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
     WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>,
 ): ComponentWithPolicyAndFullscreenLoading<TProps, TRef> {
     function WithPolicyAndFullscreenLoading(
-        {isLoadingReportData = true, policy = policyDefaultProps.policy, policyDraft = policyDefaultProps.policyDraft, policyMembers = policyDefaultProps.policyMembers, ...rest}: TProps,
+        {isLoadingReportData = true, policy = policyDefaultProps.policy, policyDraft = policyDefaultProps.policyDraft, ...rest}: TProps,
         ref: ForwardedRef<TRef>,
     ) {
         if (isLoadingReportData && isEmpty(policy) && isEmpty(policyDraft)) {
@@ -42,7 +42,6 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
                 isLoadingReportData={isLoadingReportData}
                 policy={policy}
                 policyDraft={policyDraft}
-                policyMembers={policyMembers}
                 ref={ref}
             />
         );

From b3cc1d0882d38437a5fdb133893b0bb89c0b37d2 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 22:01:37 +0200
Subject: [PATCH 100/383] Remove POLICY_MEMBERS from utils

---
 src/ONYXKEYS.ts                    | 2 --
 src/libs/PolicyUtils.ts            | 2 +-
 src/pages/workspace/withPolicy.tsx | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 3ff71362af35..c4d83acf24c1 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -307,7 +307,6 @@ const ONYXKEYS = {
     COLLECTION: {
         DOWNLOAD: 'download_',
         POLICY: 'policy_',
-        POLICY_MEMBERS: 'policyMembers_',
         POLICY_DRAFTS: 'policyDrafts_',
         POLICY_JOIN_MEMBER: 'policyJoinMember_',
         POLICY_CATEGORIES: 'policyCategories_',
@@ -511,7 +510,6 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_DRAFTS]: OnyxTypes.Policy;
     [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategories;
     [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTagList;
-    [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 43445db90fdf..79bfd723eb76 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -25,7 +25,7 @@ function getActivePolicies(policies: OnyxCollection<Policy>): Policy[] | undefin
 }
 
 /**
- * Checks if we have any errors stored within the POLICY_MEMBERS. Determines whether we should show a red brick road error or not.
+ * Checks if we have any errors stored within the policy?.employeeList. Determines whether we should show a red brick road error or not.
  */
 function hasEmployeeListError(policy: OnyxEntry<Policy>): boolean {
     return Object.values(policy?.employeeList ?? {}).some((employee) => Object.keys(employee?.errors ?? {}).length > 0);
diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx
index 9262a1b0f727..3bdff65e2c66 100644
--- a/src/pages/workspace/withPolicy.tsx
+++ b/src/pages/workspace/withPolicy.tsx
@@ -9,7 +9,6 @@ import type {ValueOf} from 'type-fest';
 import taxPropTypes from '@components/taxPropTypes';
 import {translatableTextPropTypes} from '@libs/Localize';
 import type {CentralPaneNavigatorParamList, FullScreenNavigatorParamList, SettingsNavigatorParamList, WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
-import policyMemberPropType from '@pages/policyMemberPropType';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -85,9 +84,6 @@ const policyPropTypes = {
         /** Collection of tax rates attached to a policy */
         taxRates: taxPropTypes,
     }),
-
-    /** The employee list of this policy */
-    policyMembers: PropTypes.objectOf(policyMemberPropType),
 };
 
 type WithPolicyOnyxProps = {

From fbe42b21d8e4749d3ac7f9d0df337333d728ac6f Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 22:10:24 +0200
Subject: [PATCH 101/383] Make a little code refactoring

---
 src/libs/PolicyUtils.ts                      |  4 ++--
 src/pages/workspace/WorkspaceMembersPage.tsx |  2 +-
 tests/actions/PolicyTest.ts                  | 16 +---------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 79bfd723eb76..8dc61755186b 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -133,8 +133,8 @@ const isPolicyMember = (policyID: string, policies: OnyxCollection<Policy>): boo
  *
  * We only return members without errors. Otherwise, the members with errors would immediately be removed before the user has a chance to read the error.
  */
-function getMemberAccountIDsForWorkspace(policyMembers: PolicyMembers | undefined, personalDetails: OnyxEntry<PersonalDetailsList>): MemberEmailsToAccountIDs {
-    const members = policyMembers ?? {};
+function getMemberAccountIDsForWorkspace(employeeList: PolicyMembers | undefined, personalDetails: OnyxEntry<PersonalDetailsList>): MemberEmailsToAccountIDs {
+    const members = employeeList ?? {};
     const memberEmailsToAccountIDs: MemberEmailsToAccountIDs = {};
     Object.keys(members).forEach((email) => {
         const member = members?.[email];
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 762e68f6befb..a49267f37b41 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -96,7 +96,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     const isFocused = useIsFocused();
     const policyID = route.params.policyID;
     /**
-     * Get filtered personalDetails list with current policyMembers
+     * Get filtered personalDetails list with current employeeList
      */
     const filterPersonalDetails = (members: OnyxEntry<PolicyMembers>, details: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
         Object.keys(members ?? {}).reduce((result, key) => {
diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
index dfb8ae81d104..1ca2edec0de7 100644
--- a/tests/actions/PolicyTest.ts
+++ b/tests/actions/PolicyTest.ts
@@ -4,7 +4,7 @@ import CONST from '@src/CONST';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
 import * as Policy from '@src/libs/actions/Policy';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyMembers, Policy as PolicyType, Report, ReportAction, ReportActions} from '@src/types/onyx';
+import type {Policy as PolicyType, Report, ReportAction, ReportActions} from '@src/types/onyx';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
@@ -61,20 +61,6 @@ describe('actions/Policy', () => {
             expect(policy?.isPolicyExpenseChatEnabled).toBe(true);
             expect(policy?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-            const policyMembers: OnyxCollection<PolicyMembers> = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-                    waitForCollectionCallback: true,
-                    callback: (members) => {
-                        Onyx.disconnect(connectionID);
-                        resolve(members);
-                    },
-                });
-            });
-
-            // check if the user was added as an admin to the policy
-            expect(policyMembers?.[ESH_ACCOUNT_ID]?.role).toBe(CONST.POLICY.ROLE.ADMIN);
-
             let allReports: OnyxCollection<Report> = await new Promise((resolve) => {
                 const connectionID = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,

From a9c77e9e1f6b10333683addf134376f88e433f3c Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 22:27:41 +0200
Subject: [PATCH 102/383] Fix ts issue

---
 tests/utils/LHNTestUtils.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utils/LHNTestUtils.tsx b/tests/utils/LHNTestUtils.tsx
index 50a495f39d51..b7a8aa4f1616 100644
--- a/tests/utils/LHNTestUtils.tsx
+++ b/tests/utils/LHNTestUtils.tsx
@@ -248,7 +248,7 @@ function getFakePolicy(id = '1', name = 'Workspace-Test-001'): Policy {
         owner: 'myuser@gmail.com',
         outputCurrency: 'BRL',
         avatar: '',
-        employeeList: [],
+        employeeList: {},
         isPolicyExpenseChatEnabled: true,
         lastModified: '1697323926777105',
         autoReporting: true,

From 1bc67dca62985794b58c360abef45110c32d5792 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sat, 6 Apr 2024 23:02:36 +0200
Subject: [PATCH 103/383] Refactor code and fix some issues

---
 src/libs/PolicyUtils.ts                       |  4 +--
 src/pages/workspace/WorkspaceInvitePage.tsx   |  2 +-
 src/pages/workspace/WorkspaceMembersPage.tsx  | 28 ++++++++++++++++---
 .../WorkspaceWorkflowsApproverPage.tsx        |  2 +-
 .../workflows/WorkspaceWorkflowsPayerPage.tsx |  4 ++-
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 0bd7cd65b176..135a0f96d684 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -153,8 +153,8 @@ function getMemberAccountIDsForWorkspace(employeeList: PolicyMembers | undefined
 /**
  * Get login list that we should not show in the workspace invite options
  */
-function getIneligibleInvitees(policy: OnyxEntry<Policy>): string[] {
-    const members = policy?.employeeList ?? {};
+function getIneligibleInvitees(employeeList?: PolicyMembers): string[] {
+    const members = employeeList ?? {};
     const memberEmailsToExclude: string[] = [...CONST.EXPENSIFY_EMAILS];
     Object.keys(members).forEach((email) => {
         const policyMember = members?.[email];
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index a263db558632..108da0c4c3c8 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -91,7 +91,7 @@ function WorkspaceInvitePage({
 
     useNetwork({onReconnect: openWorkspaceInvitePage});
 
-    const excludedUsers = useMemo(() => PolicyUtils.getIneligibleInvitees(policy), [policy]);
+    const excludedUsers = useMemo(() => PolicyUtils.getIneligibleInvitees(policy?.employeeList), [policy?.employeeList]);
 
     useEffect(() => {
         const newUsersToInviteDict: Record<number, OptionData> = {};
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 1ccb838bdf7c..5b7631b69682 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -71,7 +71,7 @@ function invertObject(object: Record<string, string>): Record<string, string> {
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 
 function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft, route, policy, session, currentUserPersonalDetails, isLoadingReportData = true}: WorkspaceMembersPageProps) {
-    const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
+    const policyMemberEmailsToAccountIDs = useMemo(() => PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails), [policy?.employeeList, personalDetails]);
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const [selectedEmployees, setSelectedEmployees] = useState<number[]>([]);
@@ -100,10 +100,10 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
      */
     const filterPersonalDetails = (members: OnyxEntry<PolicyMembers>, details: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
         Object.keys(members ?? {}).reduce((result, key) => {
-            if (details?.[key]) {
+            if (details?.[policyMemberEmailsToAccountIDs[key] ?? '']) {
                 return {
                     ...result,
-                    [key]: details[policyMemberEmailsToAccountIDs[key] ?? ''],
+                    [policyMemberEmailsToAccountIDs[key] ?? '']: details[policyMemberEmailsToAccountIDs[key] ?? ''],
                 };
             }
             return result;
@@ -162,7 +162,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             );
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [policy?.employeeList]);
+    }, [policy?.employeeList, policyMemberEmailsToAccountIDs]);
 
     useEffect(() => {
         const isReconnecting = prevIsOffline && !isOffline;
@@ -171,12 +171,14 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         getWorkspaceMembers();
     }, [isOffline, prevIsOffline, getWorkspaceMembers]);
+
     /**
      * Open the modal to invite a user
      */
     const inviteUser = () => {
         Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID));
     };
+
     /**
      * Remove selected users from the workspace
      * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
@@ -193,6 +195,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         setSelectedEmployees([]);
         setRemoveMembersConfirmModalVisible(false);
     };
+
     /**
      * Show the modal to confirm removal of the selected members
      */
@@ -202,6 +205,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         setRemoveMembersConfirmModalVisible(true);
     };
+
     /**
      * Add or remove all users passed from the selectedEmployees list
      */
@@ -218,6 +222,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
 
         validateSelection();
     };
+
     /**
      * Add user from the selectedEmployees list
      */
@@ -228,6 +233,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         },
         [validateSelection],
     );
+
     /**
      * Remove user from the selectedEmployees list
      */
@@ -238,6 +244,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         },
         [validateSelection],
     );
+
     /**
      * Toggle user from the selectedEmployees list
      */
@@ -256,6 +263,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         },
         [selectedEmployees, addUser, removeUser],
     );
+
     /** Opens the member details page */
     const openMemberDetails = useCallback(
         (item: MemberOption) => {
@@ -268,6 +276,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         },
         [isPolicyAdmin, policy, policyID, route.params.policyID],
     );
+
     /**
      * Dismisses the errors on one item
      */
@@ -281,6 +290,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         },
         [route.params.policyID],
     );
+
     /**
      * Check if the policy member is deleted from the workspace
      */
@@ -288,6 +298,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         (policyMember: PolicyMember): boolean => !isOffline && policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyMember.errors),
         [isOffline],
     );
+
     const policyOwner = policy?.owner;
     const currentUserLogin = currentUserPersonalDetails.login;
     const invitedPrimaryToSecondaryLogins = invertObject(policy?.primaryLoginsInvited ?? {});
@@ -377,7 +388,9 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         styles.textStrong,
         translate,
     ]);
+
     const data = useMemo(() => getUsers(), [getUsers]);
+
     useEffect(() => {
         if (!isFocused) {
             return;
@@ -412,6 +425,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             )}
         </>
     );
+
     const getCustomListHeader = () => {
         const header = (
             <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween]}>
@@ -428,6 +442,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         return <View style={[styles.peopleRow, styles.userSelectNone, styles.ph9, styles.pv3, styles.pb5]}>{header}</View>;
     };
+
     const changeUserRole = (role: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER) => {
         if (!isEmptyObject(errors)) {
             return;
@@ -438,6 +453,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         Policy.updateWorkspaceMembersRole(route.params.policyID, accountIDsToUpdate, role);
         setSelectedEmployees([]);
     };
+
     const getBulkActionsButtonOptions = () => {
         const options: Array<DropdownOption<WorkspaceMemberBulkActionType>> = [
             {
@@ -469,6 +485,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         return options;
     };
+
     const getHeaderButtons = () => {
         if (!isPolicyAdmin) {
             return null;
@@ -500,6 +517,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             </View>
         );
     };
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -568,7 +586,9 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         </ScreenWrapper>
     );
 }
+
 WorkspaceMembersPage.displayName = 'WorkspaceMembersPage';
+
 export default withCurrentUserPersonalDetails(
     withPolicyAndFullscreenLoading(
         withOnyx<WorkspaceMembersPageProps, WorkspaceMembersPageOnyxProps>({
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
index d642960255c5..230c3595bf4b 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
@@ -65,7 +65,7 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
                 return;
             }
 
-            const accountID = Number(policyMemberEmailsToAccountIDs[email] || '');
+            const accountID = Number(policyMemberEmailsToAccountIDs[email] ?? '');
 
             const details = personalDetails?.[accountID];
             if (!details) {
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index d0d12dad3fdf..51d956a7614d 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -60,8 +60,10 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
         const policyAdminDetails: MemberOption[] = [];
         const authorizedPayerDetails: MemberOption[] = [];
 
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
+
         Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
-            const accountID = Object.values(personalDetails ?? {}).find((details) => details?.login === email)?.accountID ?? 0;
+            const accountID = policyMemberEmailsToAccountIDs?.[email] ?? '';
             const details = personalDetails?.[accountID];
             if (!details) {
                 Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with accountID: ${accountID}`);

From 3bccbe80c890f7e2e8ca93823ee7b93f7f17bf58 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Sun, 7 Apr 2024 00:36:13 +0200
Subject: [PATCH 104/383] Refactoring Hello...

---
 .../workspace/tags/WorkspaceTagsPage.tsx      | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 05a5daa4297d..030eff519880 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -25,7 +25,6 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
@@ -82,29 +81,25 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
             fetchTags();
         }, [fetchTags]),
     );
-    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
+    // We currently don't support multi level tags, so let's only get the first level tags.
+    const policyTagList = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
-        () =>
-            policyTagLists
-                .map((policyTagList) =>
-                    lodashSortBy(policyTagList?.tags ? Object.values(policyTagList.tags) : [], 'name', localeCompare).map((value) => {
-                        const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
-                        const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                        return {
-                            value: tag.name,
-                            text: PolicyUtils.getCleanedTagName(tag.name),
-                            keyForList: tag.name,
-                            isSelected: !!selectedTags[tag.name],
-                            pendingAction: tag.pendingAction,
-                            errors: tag.errors ?? undefined,
-                            enabled: tag.enabled,
-                            isDisabled,
-                            rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
-                        };
-                    }),
-                )
-                .flat(),
-        [policyTagLists, selectedTags],
+        () => lodashSortBy(policyTagList.tags).map((value) => {
+            const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
+            const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+            return {
+                value: tag.name,
+                text: PolicyUtils.getCleanedTagName(tag.name),
+                keyForList: tag.name,
+                isSelected: !!selectedTags[tag.name],
+                pendingAction: tag.pendingAction,
+                errors: tag.errors ?? undefined,
+                enabled: tag.enabled,
+                isDisabled,
+                rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
+            };
+        }),
+        [policyTagList.tags, selectedTags],
     );
 
     const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {

From 8cd8d170358cf25f0e03580a5a0f6b892e634f84 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Sun, 7 Apr 2024 01:44:50 +0200
Subject: [PATCH 105/383] Prettier..

---
 .../workspace/tags/WorkspaceTagsPage.tsx      | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 030eff519880..aa718f09b466 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -84,21 +84,22 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
     // We currently don't support multi level tags, so let's only get the first level tags.
     const policyTagList = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
-        () => lodashSortBy(policyTagList.tags).map((value) => {
-            const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
-            const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-            return {
-                value: tag.name,
-                text: PolicyUtils.getCleanedTagName(tag.name),
-                keyForList: tag.name,
-                isSelected: !!selectedTags[tag.name],
-                pendingAction: tag.pendingAction,
-                errors: tag.errors ?? undefined,
-                enabled: tag.enabled,
-                isDisabled,
-                rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
-            };
-        }),
+        () =>
+            lodashSortBy(policyTagList.tags).map((value) => {
+                const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
+                const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                return {
+                    value: tag.name,
+                    text: PolicyUtils.getCleanedTagName(tag.name),
+                    keyForList: tag.name,
+                    isSelected: !!selectedTags[tag.name],
+                    pendingAction: tag.pendingAction,
+                    errors: tag.errors ?? undefined,
+                    enabled: tag.enabled,
+                    isDisabled,
+                    rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
+                };
+            }),
         [policyTagList.tags, selectedTags],
     );
 

From 505162ba3555edd723a7aa38177a6d2a97ff267f Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 8 Apr 2024 03:11:00 +0530
Subject: [PATCH 106/383] resolve issue with move scan request

---
 ...oneyTemporaryForRefactorRequestConfirmationList.js | 10 +++++++---
 src/libs/actions/IOU.ts                               |  3 +--
 src/libs/actions/Report.ts                            |  2 +-
 .../iou/request/step/IOURequestStepConfirmation.js    | 11 ++++++++---
 .../iou/request/step/IOURequestStepParticipants.js    |  6 +++++-
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 489906f30ecb..c34d9656674d 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -27,6 +27,7 @@ import * as ReceiptUtils from '@libs/ReceiptUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
 import * as TransactionUtils from '@libs/TransactionUtils';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
 import {policyPropTypes} from '@pages/workspace/withPolicy';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
@@ -935,11 +936,14 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
         isLocalFile,
     } = receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, receiptPath, receiptFilename) : {};
 
+    const resolvedThumbnail = isLocalFile ? receiptThumbnail : tryResolveUrlFromApiRoot(receiptThumbnail);
+    const resolvedReceiptImage = isLocalFile ? receiptImage : tryResolveUrlFromApiRoot(receiptImage);
+
     const receiptThumbnailContent = useMemo(
         () =>
             isLocalFile && Str.isPDF(receiptFilename) ? (
                 <PDFThumbnail
-                    previewSourceURL={receiptImage}
+                    previewSourceURL={resolvedThumbnail}
                     style={styles.moneyRequestImage}
                     // We don't support scaning password protected PDF receipt
                     enabled={!isAttachmentInvalid}
@@ -949,7 +953,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                 <ReceiptImage
                     style={styles.moneyRequestImage}
                     isThumbnail={isThumbnail}
-                    source={receiptThumbnail || receiptImage}
+                    source={resolvedThumbnail || resolvedReceiptImage}
                     // AuthToken is required when retrieving the image from the server
                     // but we don't need it to load the blob:// or file:// image when starting a money request / split bill
                     // So if we have a thumbnail, it means we're retrieving the image from the server
@@ -957,7 +961,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     fileExtension={fileExtension}
                 />
             ),
-        [isLocalFile, receiptFilename, receiptImage, styles.moneyRequestImage, isAttachmentInvalid, isThumbnail, receiptThumbnail, fileExtension],
+        [isLocalFile, receiptFilename, resolvedThumbnail, styles.moneyRequestImage, isAttachmentInvalid, isThumbnail, resolvedReceiptImage, receiptThumbnail, fileExtension],
     );
 
     return (
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 2d6acc5b9507..868b01f8658d 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -1219,7 +1219,6 @@ function getMoneyRequestInformation(
     } else {
         iouReport = IOUUtils.updateIOUOwnerAndTotal(iouReport, payeeAccountID, amount, currency);
     }
-
     // STEP 3: Build optimistic receipt and transaction
     const receiptObject: Receipt = {};
     let filename;
@@ -2521,7 +2520,7 @@ function requestMoney(
         isMovingTransactionFromTrackExpense ? {} : currentChatReport,
         participant,
         comment,
-        amount,
+        isMovingTransactionFromTrackExpense ? Math.abs(amount) : amount,
         currency,
         currentCreated,
         merchant,
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 53582891302e..417a562cb13a 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -3011,7 +3011,7 @@ function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEnt
     API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, {optimisticData, failureData});
 }
 
-function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: OnyxEntry<ReportAction>) {
+function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: OnyxEntry<ReportAction>): void {
     const message = reportAction?.message?.[0];
     if (!message) {
         return;
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index f525ad8c2265..d57a2a0bfcef 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -179,13 +179,18 @@ function IOURequestStepConfirmation({
     }, [transaction, iouType, requestType, transactionID, reportID, iouAction]);
 
     const navigateToAddReceipt = useCallback(() => {
-        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
-    }, [iouType, transactionID, reportID]);
+        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(iouAction, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
+    }, [iouType, transactionID, reportID, iouAction]);
 
     // When the component mounts, if there is a receipt, see if the image can be read from the disk. If not, redirect the user to the starting step of the flow.
     // This is because until the request is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
     // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
+    // skip this in case user is moving the transaction as the receipt path will be valid in that case
     useEffect(() => {
+        if ([CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction)) {
+            return;
+        }
+
         const onSuccess = (file) => {
             const receipt = file;
             receipt.state = file && requestType === CONST.IOU.REQUEST_TYPE.MANUAL ? CONST.IOU.RECEIPT_STATE.OPEN : CONST.IOU.RECEIPT_STATE.SCANREADY;
@@ -193,7 +198,7 @@ function IOURequestStepConfirmation({
         };
 
         IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, onSuccess, requestType, iouType, transactionID, reportID, receiptType);
-    }, [receiptType, receiptPath, receiptFilename, requestType, iouType, transactionID, reportID]);
+    }, [receiptType, receiptPath, receiptFilename, requestType, iouType, transactionID, reportID, iouAction]);
 
     /**
      * @param {Array} selectedParticipants
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index c531fe577dc3..58099c4e36a2 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -67,9 +67,13 @@ function IOURequestStepParticipants({
     // When the component mounts, if there is a receipt, see if the image can be read from the disk. If not, redirect the user to the starting step of the flow.
     // This is because until the request is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
     // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
+    // skip this in case user is moving the transaction as the receipt path will be valid in that case
     useEffect(() => {
+        if ([CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction)) {
+            return;
+        }
         IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, () => {}, iouRequestType, iouType, transactionID, reportID, receiptType);
-    }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID]);
+    }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID, iouAction]);
 
     const updateRouteParams = useCallback(() => {
         IOU.updateMoneyRequestTypeParams(navigation.getState().routes, newIouType.current);

From c721c6e9b06e97fd5520aedb93d48d0f81667c84 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 8 Apr 2024 04:26:04 +0530
Subject: [PATCH 107/383] fixes lint error

---
 src/libs/Permissions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 0aa3e5953909..1973e665b20f 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -3,7 +3,7 @@ import CONST from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return true;
+    return !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {

From afa82392be784a00edf3cbbf1683f160de223dfb Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 8 Apr 2024 09:41:23 +0200
Subject: [PATCH 108/383] Update PolicyMembersUtils

---
 src/libs/PolicyMembersUtils.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libs/PolicyMembersUtils.ts b/src/libs/PolicyMembersUtils.ts
index 59d1bff22597..43464fca1a18 100644
--- a/src/libs/PolicyMembersUtils.ts
+++ b/src/libs/PolicyMembersUtils.ts
@@ -5,7 +5,7 @@ import type {PersonalDetailsList, Policy} from '@src/types/onyx';
 import {getCurrentUserAccountID} from './actions/Report';
 import {getPolicyMembersByIdWithoutCurrentUser} from './PolicyUtils';
 
-let policies: OnyxCollection<Policy>;
+let policies: OnyxCollection<Policy> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
@@ -15,9 +15,7 @@ Onyx.connect({
 let allPersonalDetails: OnyxEntry<PersonalDetailsList> = {};
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (val) => {
-        allPersonalDetails = val;
-    },
+    callback: (val) => (allPersonalDetails = val),
 });
 
 function getPolicyMemberAccountIDs(policyID?: string) {

From a07438f6e3d04e9cc670e92a44b1845bb8370a7e Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 8 Apr 2024 15:52:30 +0700
Subject: [PATCH 109/383] fix: message next steps

---
 src/libs/NextStepUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index 8b0afe2d24c3..7146c6253e26 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -102,7 +102,7 @@ function buildNextStep(
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: managerDisplayName,
                         type: 'strong',
                     },
                     {

From d682d3278e13430f64554640b188369a679d0191 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 8 Apr 2024 11:50:12 +0200
Subject: [PATCH 110/383] Fix bug with selected item on
 WorkspaceMemberDetailsRoleSelectionPage

---
 .../members/WorkspaceMemberDetailsRoleSelectionPage.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx
index 36f24b8922da..c591d47975b7 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage.tsx
@@ -47,7 +47,7 @@ function WorkspaceMemberDetailsRoleSelectionPage({route, personalDetails, policy
         {
             value: CONST.POLICY.ROLE.USER,
             text: translate('common.member'),
-            isSelected: member?.role === CONST.POLICY.ROLE.USER,
+            isSelected: member?.role !== CONST.POLICY.ROLE.ADMIN,
             keyForList: CONST.POLICY.ROLE.USER,
         },
     ];

From 5887f83ba4490c7e42116cce2e94a05aaa45dca4 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 8 Apr 2024 15:32:59 +0200
Subject: [PATCH 111/383] change card.isVirtual references to
 card.nameValuePairs?.isVirtual

---
 src/libs/CardUtils.ts                                  | 2 +-
 src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx | 4 ++--
 src/pages/settings/Wallet/ExpensifyCardPage.tsx        | 4 ++--
 src/types/onyx/Card.ts                                 | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index c4d67adcd54a..9e3a7f66131a 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -127,7 +127,7 @@ function maskCard(lastFour = ''): string {
  * @returns a physical card object (or undefined if none is found)
  */
 function findPhysicalCard(cards: Card[]) {
-    return cards.find((card) => !card.isVirtual);
+    return cards.find((card) => !card.nameValuePairs?.isVirtual);
 }
 
 /**
diff --git a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
index bcd1c1096b0e..9498b116cda9 100644
--- a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
+++ b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
@@ -115,7 +115,7 @@ function BaseGetPhysicalCard({
         }
 
         const domainCards = CardUtils.getDomainCards(cardList)[domain] || [];
-        const physicalCard = domainCards.find((card) => !card?.isVirtual);
+        const physicalCard = domainCards.find((card) => !card?.nameValuePairs?.isVirtual);
 
         // When there are no cards for the specified domain, user is redirected to the wallet page
         if (domainCards.length === 0) {
@@ -148,7 +148,7 @@ 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 = domainCards.find((card) => !card?.isVirtual);
+            const physicalCard = domainCards.find((card) => !card?.nameValuePairs?.isVirtual);
             const cardID = physicalCard?.cardID ?? 0;
 
             Wallet.requestPhysicalExpensifyCard(cardID, session?.authToken ?? '', updatedPrivatePersonalDetails);
diff --git a/src/pages/settings/Wallet/ExpensifyCardPage.tsx b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
index 4c8b02eabdc6..d96574063ac7 100644
--- a/src/pages/settings/Wallet/ExpensifyCardPage.tsx
+++ b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
@@ -64,8 +64,8 @@ function ExpensifyCardPage({
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
     const domainCards = useMemo(() => cardList && CardUtils.getDomainCards(cardList)[domain], [cardList, domain]);
-    const virtualCard = useMemo(() => domainCards?.find((card) => card.isVirtual), [domainCards]);
-    const physicalCard = useMemo(() => domainCards?.find((card) => !card.isVirtual), [domainCards]);
+    const virtualCard = useMemo(() => domainCards?.find((card) => card.nameValuePairs?.isVirtual), [domainCards]);
+    const physicalCard = useMemo(() => domainCards?.find((card) => !card.nameValuePairs?.isVirtual), [domainCards]);
 
     const [isLoading, setIsLoading] = useState(false);
     const [isNotFound, setIsNotFound] = useState(false);
diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 11cc8dc26b4c..50403b982c0d 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -9,7 +9,6 @@ type Card = {
     availableSpend: number;
     domainName: string;
     lastFourPAN?: string;
-    isVirtual: boolean; // Deprecating, use nameValuePairs.isVirtual
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
     errors?: OnyxCommon.Errors;
     isLoading?: boolean;

From f209268d8d7f946a7ac42d62d593c80b19900255 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 8 Apr 2024 17:13:22 +0200
Subject: [PATCH 112/383] add onyx migration of card.isVirtual to
 card.nameValuePairs.isVirtual

---
 src/libs/migrateOnyx.ts                    |  2 +
 src/libs/migrations/RenameCardIsVirtual.ts | 54 ++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 src/libs/migrations/RenameCardIsVirtual.ts

diff --git a/src/libs/migrateOnyx.ts b/src/libs/migrateOnyx.ts
index d827d9936fd1..13539de76027 100644
--- a/src/libs/migrateOnyx.ts
+++ b/src/libs/migrateOnyx.ts
@@ -3,6 +3,7 @@ import CheckForPreviousReportActionID from './migrations/CheckForPreviousReportA
 import KeyReportActionsDraftByReportActionID from './migrations/KeyReportActionsDraftByReportActionID';
 import NVPMigration from './migrations/NVPMigration';
 import RemoveEmptyReportActionsDrafts from './migrations/RemoveEmptyReportActionsDrafts';
+import RenameCardIsVirtual from './migrations/RenameCardIsVirtual';
 import RenameReceiptFilename from './migrations/RenameReceiptFilename';
 import TransactionBackupsToCollection from './migrations/TransactionBackupsToCollection';
 
@@ -13,6 +14,7 @@ export default function () {
     return new Promise<void>((resolve) => {
         // Add all migrations to an array so they are executed in order
         const migrationPromises = [
+            RenameCardIsVirtual,
             CheckForPreviousReportActionID,
             RenameReceiptFilename,
             KeyReportActionsDraftByReportActionID,
diff --git a/src/libs/migrations/RenameCardIsVirtual.ts b/src/libs/migrations/RenameCardIsVirtual.ts
new file mode 100644
index 000000000000..c9cfb0190464
--- /dev/null
+++ b/src/libs/migrations/RenameCardIsVirtual.ts
@@ -0,0 +1,54 @@
+import Onyx from 'react-native-onyx';
+import type {NullishDeep, OnyxEntry} from 'react-native-onyx';
+import Log from '@libs/Log';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Card} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type OldCard = Card & {isVirtual?: string};
+
+// This migration changes the property name on each card from card list from isVirtual to nameValuePairs.isVirtual so that it matches what is stored in the database
+export default function () {
+    return new Promise<void>((resolve) => {
+        // Connect to the CARD_LIST key in Onyx to get all of the stored cards.
+        // Go through each card and change the property name
+        const connectionID = Onyx.connect({
+            key: ONYXKEYS.CARD_LIST,
+            callback: (cardList: OnyxEntry<Record<string, OldCard>>) => {
+                Onyx.disconnect(connectionID);
+
+                if (!cardList || isEmptyObject(cardList)) {
+                    Log.info('[Migrate Onyx] Skipped migration RenameCardIsVirtual because there are no cards linked to an account');
+                    return resolve();
+                }
+                const cardsWithIsVirtualProp = Object.values(cardList).filter((card) => card.isVirtual !== undefined);
+                if (!cardsWithIsVirtualProp.length) {
+                    Log.info('[Migrate Onyx] Skipped migration RenameCardIsVirtual because there were no cards with the isVirtual property');
+                    return resolve();
+                }
+
+                Log.info('[Migrate Onyx] Running  RenameCardIsVirtual migration');
+                const dataToSave: Record<string, NullishDeep<OldCard>> = cardsWithIsVirtualProp.reduce((result, card) => {
+                    if (!card) {
+                        return result;
+                    }
+                    return {
+                        ...result,
+                        [`${card.cardID}`]: {
+                            nameValuePairs: {
+                                isVirtual: card.isVirtual,
+                            },
+                            isVirtual: null,
+                        },
+                    };
+                }, {});
+
+                // eslint-disable-next-line rulesdir/prefer-actions-set-data
+                Onyx.merge(ONYXKEYS.CARD_LIST, dataToSave).then(() => {
+                    Log.info(`[Migrate Onyx] Ran migration RenameCardIsVirtual and renamed ${Object.keys(dataToSave)?.length} properties`);
+                    resolve();
+                });
+            },
+        });
+    });
+}

From a6c8b0962eb4f97970377e15db4c2ff70c9fdf9e Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 8 Apr 2024 17:25:12 +0200
Subject: [PATCH 113/383] correct comments in new RenameCardIsVirtual

---
 src/libs/migrations/RenameCardIsVirtual.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libs/migrations/RenameCardIsVirtual.ts b/src/libs/migrations/RenameCardIsVirtual.ts
index c9cfb0190464..e36863e1fe85 100644
--- a/src/libs/migrations/RenameCardIsVirtual.ts
+++ b/src/libs/migrations/RenameCardIsVirtual.ts
@@ -7,18 +7,16 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type OldCard = Card & {isVirtual?: string};
 
-// This migration changes the property name on each card from card list from isVirtual to nameValuePairs.isVirtual so that it matches what is stored in the database
+// This migration changes the property name on each card from card list from isVirtual to nameValuePairs.isVirtual
 export default function () {
     return new Promise<void>((resolve) => {
-        // Connect to the CARD_LIST key in Onyx to get all of the stored cards.
-        // Go through each card and change the property name
         const connectionID = Onyx.connect({
             key: ONYXKEYS.CARD_LIST,
             callback: (cardList: OnyxEntry<Record<string, OldCard>>) => {
                 Onyx.disconnect(connectionID);
 
                 if (!cardList || isEmptyObject(cardList)) {
-                    Log.info('[Migrate Onyx] Skipped migration RenameCardIsVirtual because there are no cards linked to an account');
+                    Log.info('[Migrate Onyx] Skipped migration RenameCardIsVirtual because there are no cards linked to the account');
                     return resolve();
                 }
                 const cardsWithIsVirtualProp = Object.values(cardList).filter((card) => card.isVirtual !== undefined);

From 0106a06d733ccadaf0257c42d2e29b5dc6e95763 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 8 Apr 2024 17:45:37 +0200
Subject: [PATCH 114/383] fix type errors

---
 src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx   | 2 +-
 src/pages/settings/Wallet/PaymentMethodList.tsx          | 2 +-
 src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx b/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx
index d5b1230fd216..a031cf6363f4 100644
--- a/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx
+++ b/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx
@@ -56,7 +56,7 @@ function ActivatePhysicalCardPage({
     const [lastPressedDigit, setLastPressedDigit] = useState('');
 
     const domainCards = CardUtils.getDomainCards(cardList)[domain] ?? [];
-    const physicalCard = domainCards.find((card) => !card.isVirtual);
+    const physicalCard = domainCards.find((card) => !card.nameValuePairs?.isVirtual);
     const cardID = physicalCard?.cardID ?? 0;
     const cardError = ErrorUtils.getLatestErrorMessage(physicalCard ?? {});
 
diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index 2bbc73355d68..c897f07ce853 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -197,7 +197,7 @@ function PaymentMethodList({
         if (shouldShowAssignedCards) {
             const assignedCards = Object.values(cardList ?? {})
                 // Filter by physical, active cards associated with a domain
-                .filter((card) => !card.isVirtual && !!card.domainName && CONST.EXPENSIFY_CARD.ACTIVE_STATES.includes(card.state ?? 0));
+                .filter((card) => !card.nameValuePairs?.isVirtual && !!card.domainName && CONST.EXPENSIFY_CARD.ACTIVE_STATES.includes(card.state ?? 0));
 
             const numberPhysicalExpensifyCards = assignedCards.filter((card) => CardUtils.isExpensifyCard(card.cardID)).length;
 
diff --git a/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx b/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
index 40a3eacb4ed9..7a6460029a8e 100644
--- a/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
+++ b/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
@@ -44,7 +44,7 @@ function ReportVirtualCardFraudPage({
     const {translate} = useLocalize();
 
     const domainCards = CardUtils.getDomainCards(cardList)[domain];
-    const virtualCard = domainCards?.find((card) => card.isVirtual);
+    const virtualCard = domainCards?.find((card) => card.nameValuePairs?.isVirtual);
     const virtualCardError = ErrorUtils.getLatestErrorMessage(virtualCard?.errors ?? {});
 
     const prevIsLoading = usePrevious(formData?.isLoading);

From 657e5ec3264c3083345fab1591696af55273fc7d Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 8 Apr 2024 18:26:40 +0200
Subject: [PATCH 115/383] Fix comments

---
 .../AppNavigator/ReportScreenIDSetter.ts         |  2 +-
 src/libs/PolicyMembersUtils.ts                   | 16 +++++-----------
 src/libs/PolicyUtils.ts                          | 11 ++++++-----
 src/libs/actions/Policy.ts                       |  2 +-
 src/pages/workspace/WorkspaceInvitePage.tsx      |  3 +--
 src/pages/workspace/WorkspaceMembersPage.tsx     | 12 ++++++------
 .../workflows/WorkspaceWorkflowsApproverPage.tsx |  2 +-
 .../workflows/WorkspaceWorkflowsPayerPage.tsx    |  2 +-
 8 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
index a9fbf19b4477..56efcdcf75e3 100644
--- a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
+++ b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
@@ -73,7 +73,7 @@ function ReportScreenIDSetter({route, reports, policies, navigation, isFirstTime
             return;
         }
 
-        const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policies, personalDetails, activeWorkspaceID, accountID);
+        const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
 
         // If there is no reportID in route, try to find last accessed and use it for setParams
         const reportID = getLastAccessedReportID(
diff --git a/src/libs/PolicyMembersUtils.ts b/src/libs/PolicyMembersUtils.ts
index 43464fca1a18..f826f4fd257a 100644
--- a/src/libs/PolicyMembersUtils.ts
+++ b/src/libs/PolicyMembersUtils.ts
@@ -1,21 +1,15 @@
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Policy} from '@src/types/onyx';
+import type {Policy} from '@src/types/onyx';
 import {getCurrentUserAccountID} from './actions/Report';
 import {getPolicyMembersByIdWithoutCurrentUser} from './PolicyUtils';
 
-let policies: OnyxCollection<Policy> = {};
+let allPolicies: OnyxCollection<Policy> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
-    callback: (value) => (policies = value),
-});
-
-let allPersonalDetails: OnyxEntry<PersonalDetailsList> = {};
-Onyx.connect({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (val) => (allPersonalDetails = val),
+    callback: (value) => (allPolicies = value),
 });
 
 function getPolicyMemberAccountIDs(policyID?: string) {
@@ -25,7 +19,7 @@ function getPolicyMemberAccountIDs(policyID?: string) {
 
     const currentUserAccountID = getCurrentUserAccountID();
 
-    return getPolicyMembersByIdWithoutCurrentUser(policies, allPersonalDetails, policyID, currentUserAccountID);
+    return getPolicyMembersByIdWithoutCurrentUser(allPolicies, policyID, currentUserAccountID);
 }
 
 export default getPolicyMemberAccountIDs;
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 135a0f96d684..643a13f114ff 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -4,13 +4,14 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetailsList, Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
+import type { Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
 import type {PolicyFeatureName, Rate} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import getPolicyIDFromState from './Navigation/getPolicyIDFromState';
 import Navigation, {navigationRef} from './Navigation/Navigation';
 import type {RootStackParamList, State} from './Navigation/types';
+import {getPersonalDetailByEmail} from './PersonalDetailsUtils';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
 
@@ -133,7 +134,7 @@ const isPolicyMember = (policyID: string, policies: OnyxCollection<Policy>): boo
  *
  * We only return members without errors. Otherwise, the members with errors would immediately be removed before the user has a chance to read the error.
  */
-function getMemberAccountIDsForWorkspace(employeeList: PolicyMembers | undefined, personalDetails: OnyxEntry<PersonalDetailsList>): MemberEmailsToAccountIDs {
+function getMemberAccountIDsForWorkspace(employeeList: PolicyMembers | undefined): MemberEmailsToAccountIDs {
     const members = employeeList ?? {};
     const memberEmailsToAccountIDs: MemberEmailsToAccountIDs = {};
     Object.keys(members).forEach((email) => {
@@ -141,7 +142,7 @@ function getMemberAccountIDsForWorkspace(employeeList: PolicyMembers | undefined
         if (Object.keys(member?.errors ?? {})?.length > 0) {
             return;
         }
-        const personalDetail = Object.values(personalDetails ?? {})?.find((details) => details?.login === email);
+        const personalDetail = getPersonalDetailByEmail(email);
         if (!personalDetail?.login) {
             return;
         }
@@ -277,9 +278,9 @@ function getPathWithoutPolicyID(path: string) {
     return path.replace(CONST.REGEX.PATH_WITHOUT_POLICY_ID, '/');
 }
 
-function getPolicyMembersByIdWithoutCurrentUser(policies: OnyxCollection<Policy>, personalDetails: OnyxEntry<PersonalDetailsList>, currentPolicyID?: string, currentUserAccountID?: number) {
+function getPolicyMembersByIdWithoutCurrentUser(policies: OnyxCollection<Policy>, currentPolicyID?: string, currentUserAccountID?: number) {
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${currentPolicyID}`] ?? null;
-    const policyMemberEmailsToAccountIDs = getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
+    const policyMemberEmailsToAccountIDs = getMemberAccountIDsForWorkspace(policy?.employeeList);
     return Object.values(policyMemberEmailsToAccountIDs)
         .map((policyMemberAccountID) => Number(policyMemberAccountID))
         .filter((policyMemberAccountID) => policyMemberAccountID !== currentUserAccountID);
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 19a47d9663a7..af685c517a57 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -1275,7 +1275,7 @@ function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: I
  * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
  */
 function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, welcomeNote: string, policyID: string) {
-    const onyxKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
     const logins = Object.keys(invitedEmailsToAccountIDs).map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin));
     const accountIDs = Object.values(invitedEmailsToAccountIDs);
 
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 108da0c4c3c8..7ba9cf10bba0 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -55,7 +55,6 @@ type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
 
 function WorkspaceInvitePage({
     route,
-    personalDetails: personalDetailsProp,
     betas,
     invitedEmailsToAccountIDsDraft,
     policy,
@@ -69,7 +68,7 @@ function WorkspaceInvitePage({
     const [personalDetails, setPersonalDetails] = useState<OptionData[]>([]);
     const [usersToInvite, setUsersToInvite] = useState<OptionData[]>([]);
     const openWorkspaceInvitePage = () => {
-        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetailsProp);
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
         Policy.openWorkspaceInvitePage(route.params.policyID, Object.keys(policyMemberEmailsToAccountIDs));
     };
     const {options, areOptionsInitialized} = useOptionsList({
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 5b7631b69682..5458079f5d92 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -71,7 +71,7 @@ function invertObject(object: Record<string, string>): Record<string, string> {
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 
 function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft, route, policy, session, currentUserPersonalDetails, isLoadingReportData = true}: WorkspaceMembersPageProps) {
-    const policyMemberEmailsToAccountIDs = useMemo(() => PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails), [policy?.employeeList, personalDetails]);
+    const policyMemberEmailsToAccountIDs = useMemo(() => PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList), [policy?.employeeList]);
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const [selectedEmployees, setSelectedEmployees] = useState<number[]>([]);
@@ -112,8 +112,8 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
      * Get members for the current workspace
      */
     const getWorkspaceMembers = useCallback(() => {
-        Policy.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails)));
-    }, [route.params.policyID, policy?.employeeList, personalDetails]);
+        Policy.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList)));
+    }, [route.params.policyID, policy?.employeeList]);
 
     /**
      * Check if the current selection includes members that cannot be removed
@@ -157,7 +157,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 return res?.accountID ?? id;
             });
             // This is an equivalent of the lodash intersection function. The reduce method below is used to filter the items that exist in both arrays.
-            return [prevSelectedElements, Object.values(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails))].reduce((prev, members) =>
+            return [prevSelectedElements, Object.values(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList))].reduce((prev, members) =>
                 prev.filter((item) => members.includes(item)),
             );
         });
@@ -465,7 +465,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         ];
 
         if (PolicyUtils.isPaidGroupPolicy(policy)) {
-            if (selectedEmployees.find((employee) => policy?.employeeList?.[policyMemberEmailsToAccountIDs[employee]]?.role === CONST.POLICY.ROLE.ADMIN)) {
+            if (selectedEmployees.find((employeeEmail) => policy?.employeeList?.[policyMemberEmailsToAccountIDs[employeeEmail]]?.role === CONST.POLICY.ROLE.ADMIN)) {
                 options.push({
                     text: translate('workspace.people.makeMember'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_MEMBER,
@@ -474,7 +474,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 });
             }
 
-            if (selectedEmployees.find((employee) => policy?.employeeList?.[policyMemberEmailsToAccountIDs[employee]]?.role === CONST.POLICY.ROLE.USER)) {
+            if (selectedEmployees.find((employeeEmail) => policy?.employeeList?.[policyMemberEmailsToAccountIDs[employeeEmail]]?.role === CONST.POLICY.ROLE.USER)) {
                 options.push({
                     text: translate('workspace.people.makeAdmin'),
                     value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_ADMIN,
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
index 230c3595bf4b..ccf446ab077b 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
@@ -58,7 +58,7 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
         const policyMemberDetails: MemberOption[] = [];
         const approverDetails: MemberOption[] = [];
 
-        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
 
         Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
             if (isDeletedPolicyMember(policyMember)) {
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index 51d956a7614d..6691fc7f002c 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -60,7 +60,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
         const policyAdminDetails: MemberOption[] = [];
         const authorizedPayerDetails: MemberOption[] = [];
 
-        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, personalDetails);
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
 
         Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
             const accountID = policyMemberEmailsToAccountIDs?.[email] ?? '';

From 57ae55de808f961e0e4c965f5009a85100cde179 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 8 Apr 2024 18:34:57 +0200
Subject: [PATCH 116/383] Fix eslint issues

---
 src/libs/actions/Policy.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index af685c517a57..3d7b5e667b4b 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -1300,7 +1300,7 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: onyxKey,
+            key: policyKey,
 
             // Convert to object with each key containing {pendingAction: ‘add’}
             value: {
@@ -1315,7 +1315,7 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: onyxKey,
+            key: policyKey,
             value: {
                 employeeList: successMembersState,
             },
@@ -1328,7 +1328,7 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: onyxKey,
+            key: policyKey,
 
             // Convert to object with each key containing the error. We don’t
             // need to remove the members since that is handled by onClose of OfflineWithFeedback.

From fd47bb46c2c295d95ba1145b9a586235eeb709f6 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 8 Apr 2024 18:54:29 +0200
Subject: [PATCH 117/383] Fix ts and eslint issues

---
 src/libs/PolicyUtils.ts                     |  2 +-
 src/pages/workspace/WorkspaceInvitePage.tsx |  9 +--------
 tests/perf-test/PolicyUtils.perf-test.ts    | 12 ++++--------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 643a13f114ff..45539796a7bd 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -4,7 +4,7 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type { Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
 import type {PolicyFeatureName, Rate} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 7ba9cf10bba0..660f7b2e1ed8 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -53,14 +53,7 @@ type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
     WorkspaceInvitePageOnyxProps &
     StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVITE>;
 
-function WorkspaceInvitePage({
-    route,
-    betas,
-    invitedEmailsToAccountIDsDraft,
-    policy,
-    isLoadingReportData = true,
-    didScreenTransitionEnd,
-}: WorkspaceInvitePageProps) {
+function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, policy, isLoadingReportData = true, didScreenTransitionEnd}: WorkspaceInvitePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [searchTerm, setSearchTerm] = useState('');
diff --git a/tests/perf-test/PolicyUtils.perf-test.ts b/tests/perf-test/PolicyUtils.perf-test.ts
index 98403b310f25..4f882ae9f057 100644
--- a/tests/perf-test/PolicyUtils.perf-test.ts
+++ b/tests/perf-test/PolicyUtils.perf-test.ts
@@ -1,33 +1,29 @@
 import {measureFunction} from 'reassure';
 import {getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils';
-import type {PersonalDetails, PolicyMember} from '@src/types/onyx';
 import createCollection from '../utils/collections/createCollection';
-import createPersonalDetails from '../utils/collections/personalDetails';
 import createRandomPolicyMember from '../utils/collections/policyMembers';
 
 describe('PolicyUtils', () => {
     describe('getMemberAccountIDsForWorkspace', () => {
         test('500 policy members with personal details', async () => {
-            const policyMembers = createCollection<PolicyMember>(
+            const policyMembers = createCollection(
                 (_, index) => index,
                 () => createRandomPolicyMember(),
             );
-            const personalDetails = createCollection<PersonalDetails>((_, index) => index, createPersonalDetails);
 
-            await measureFunction(() => getMemberAccountIDsForWorkspace(policyMembers, personalDetails));
+            await measureFunction(() => getMemberAccountIDsForWorkspace(policyMembers));
         });
 
         test('500 policy members with errors and personal details', async () => {
-            const policyMembers = createCollection<PolicyMember>(
+            const policyMembers = createCollection(
                 (_, index) => index,
                 () => ({
                     ...createRandomPolicyMember(),
                     errors: {error: 'Error message'},
                 }),
             );
-            const personalDetails = createCollection<PersonalDetails>((_, index) => index, createPersonalDetails);
 
-            await measureFunction(() => getMemberAccountIDsForWorkspace(policyMembers, personalDetails));
+            await measureFunction(() => getMemberAccountIDsForWorkspace(policyMembers));
         });
     });
 });

From a8429942d2896c79e47ef0f3d1e2276eb0f4192c Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 9 Apr 2024 00:06:12 +0700
Subject: [PATCH 118/383] fix: add self review

---
 src/libs/NextStepUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index 7146c6253e26..d42babc4af6f 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -213,7 +213,7 @@ function buildNextStep(
                         text: ' is waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: managerDisplayName,
                         type: 'strong',
                     },
                     {
@@ -230,7 +230,7 @@ function buildNextStep(
             };
 
             // Self review & another reviewer
-            if (isOwner) {
+            if (!isSelfApproval) {
                 optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',

From e3dcd852dd89f548ac27dd3788257e24d36007fd Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 9 Apr 2024 00:12:09 +0700
Subject: [PATCH 119/383] remove useless code

---
 src/libs/NextStepUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index d42babc4af6f..ede9746c6314 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -102,7 +102,7 @@ function buildNextStep(
                         text: 'Waiting for ',
                     },
                     {
-                        text: managerDisplayName,
+                        text: 'you',
                         type: 'strong',
                     },
                     {

From 6a6a6fa93c646ee0751e9a5d66f19339a7e3b403 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 8 Apr 2024 14:56:16 -0700
Subject: [PATCH 120/383] Update type name

---
 src/ONYXKEYS.ts                                      | 4 ++--
 src/types/onyx/WorkspaceIntegrationImportProgress.ts | 6 ++++++
 src/types/onyx/WorkspaceIntegrationImportStatus.ts   | 7 -------
 src/types/onyx/index.ts                              | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 src/types/onyx/WorkspaceIntegrationImportProgress.ts
 delete mode 100644 src/types/onyx/WorkspaceIntegrationImportStatus.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index abc4795efee8..ef53cba25132 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -319,7 +319,7 @@ const ONYXKEYS = {
         POLICY_TAGS: 'policyTags_',
         POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
         OLD_POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
-        POLICY_CONNECTION_SYNC_STATUS: 'policyConnectionSyncProgress_',
+        POLICY_CONNECTION_SYNC_PROGRESS: 'policyConnectionSyncProgress_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         WORKSPACE_INVITE_MESSAGE_DRAFT: 'workspaceInviteMessageDraft_',
         REPORT: 'report_',
@@ -522,7 +522,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
-    [ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_STATUS]: OnyxTypes.WorkspaceIntegrationImportStatus;
+    [ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS]: OnyxTypes.WorkspaceIntegrationImportProgress;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT]: string;
diff --git a/src/types/onyx/WorkspaceIntegrationImportProgress.ts b/src/types/onyx/WorkspaceIntegrationImportProgress.ts
new file mode 100644
index 000000000000..0d1845402772
--- /dev/null
+++ b/src/types/onyx/WorkspaceIntegrationImportProgress.ts
@@ -0,0 +1,6 @@
+type WorkspaceIntegrationImportProgress = {
+    stageInProgress: string | null;
+    connectionName: 'quickbooksOnline';
+};
+
+export default WorkspaceIntegrationImportProgress;
diff --git a/src/types/onyx/WorkspaceIntegrationImportStatus.ts b/src/types/onyx/WorkspaceIntegrationImportStatus.ts
deleted file mode 100644
index 542ede5df282..000000000000
--- a/src/types/onyx/WorkspaceIntegrationImportStatus.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type WorkspaceIntegrationImportStatus = {
-    status: 'starting' | 'finished' | 'progress';
-    stageInProgress: string | null;
-    connectionName: 'quickbooksOnline';
-};
-
-export default WorkspaceIntegrationImportStatus;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index f0a8eff8c491..288357012067 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -79,7 +79,7 @@ import type WalletOnfido from './WalletOnfido';
 import type WalletStatement from './WalletStatement';
 import type WalletTerms from './WalletTerms';
 import type WalletTransfer from './WalletTransfer';
-import type WorkspaceIntegrationImportStatus from './WorkspaceIntegrationImportStatus';
+import type WorkspaceIntegrationImportProgress from './WorkspaceIntegrationImportProgress';
 import type WorkspaceRateAndUnit from './WorkspaceRateAndUnit';
 
 export type {
@@ -109,7 +109,7 @@ export type {
     Modal,
     Network,
     OnyxUpdateEvent,
-    WorkspaceIntegrationImportStatus,
+    WorkspaceIntegrationImportProgress,
     OnyxUpdatesFromServer,
     PersonalBankAccount,
     PersonalDetails,

From 07d2cbd4bd7b5bd582db030bb0bc4427f936e94b Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Tue, 9 Apr 2024 00:07:36 +0200
Subject: [PATCH 121/383] reverted sort logic..

---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index aa718f09b466..1f240af5336e 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -39,6 +39,7 @@ import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import localeCompare from '@libs/LocaleCompare';
 
 type PolicyForList = {
     value: string;
@@ -85,7 +86,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
     const policyTagList = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
         () =>
-            lodashSortBy(policyTagList.tags).map((value) => {
+            lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => {
                 const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
                 const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
                 return {

From 80c9fa99af85d0d0f871e340001484085f52e819 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Tue, 9 Apr 2024 04:44:14 +0200
Subject: [PATCH 122/383] cleaning tag name ...

---
 src/pages/workspace/tags/WorkspaceEditTagsPage.tsx | 2 +-
 src/pages/workspace/tags/WorkspaceTagsPage.tsx     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index 0072d37ef631..bb7f2e3eba91 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -81,7 +81,7 @@ function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps)
                                     inputID={INPUT_IDS.POLICY_TAGS_NAME}
                                     label={translate(`workspace.tags.customTagName`)}
                                     accessibilityLabel={translate(`workspace.tags.customTagName`)}
-                                    defaultValue={taglistName}
+                                    defaultValue={PolicyUtils.getCleanedTagName(taglistName)}
                                     role={CONST.ROLE.PRESENTATION}
                                     ref={inputCallbackRef}
                                 />
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 1f240af5336e..442c98ba2326 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -83,10 +83,10 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
         }, [fetchTags]),
     );
     // We currently don't support multi level tags, so let's only get the first level tags.
-    const policyTagList = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
+    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
         () =>
-            lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => {
+            lodashSortBy(Object.values(policyTagLists.tags || []), 'name', localeCompare).map((value) => {
                 const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
                 const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
                 return {
@@ -101,7 +101,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
                     rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
                 };
             }),
-        [policyTagList.tags, selectedTags],
+        [policyTagLists, selectedTags],
     );
 
     const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {

From 81c4ea9c6cb86efeb5d317dda29ac0434fac3d04 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 9 Apr 2024 09:48:35 +0700
Subject: [PATCH 123/383] remove useless code

---
 src/libs/NextStepUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index ede9746c6314..ea8c8b71e0c1 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -289,7 +289,7 @@ function buildNextStep(
                         text: 'Waiting for ',
                     },
                     {
-                        text: managerDisplayName,
+                        text: 'you',
                         type: 'strong',
                     },
                     {

From a4998225cea10eb456724ec386af536816ef8691 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 9 Apr 2024 09:50:58 +0700
Subject: [PATCH 124/383] Change optimistic next step

---
 src/libs/NextStepUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index ea8c8b71e0c1..1b57f6aa0526 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -213,7 +213,7 @@ function buildNextStep(
                         text: ' is waiting for ',
                     },
                     {
-                        text: managerDisplayName,
+                        text: 'you',
                         type: 'strong',
                     },
                     {
@@ -289,7 +289,7 @@ function buildNextStep(
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: managerDisplayName,
                         type: 'strong',
                     },
                     {

From a75b0d50707b7c3c2a323214abb4b8c9c4b7e344 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Tue, 9 Apr 2024 05:14:20 +0200
Subject: [PATCH 125/383] Cleaning tag names

---
 src/pages/workspace/tags/TagSettingsPage.tsx       | 4 ++--
 src/pages/workspace/tags/WorkspaceEditTagsPage.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index 107689bc46b9..b68a67675201 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -79,7 +79,7 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
                         testID={TagSettingsPage.displayName}
                     >
                         <HeaderWithBackButton
-                            title={route.params.tagName}
+                            title={PolicyUtils.getCleanedTagName(route.params.tagName)}
                             shouldShowThreeDotsButton
                             shouldSetModalVisibility={false}
                             threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
@@ -121,7 +121,7 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
                                 </View>
                             </OfflineWithFeedback>
                             <MenuItemWithTopDescription
-                                title={currentPolicyTag.name}
+                                title={PolicyUtils.getCleanedTagName(currentPolicyTag.name)}
                                 description={translate(`workspace.tags.tagName`)}
                                 onPress={navigateToEditTag}
                                 shouldShowRightIcon
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index bb7f2e3eba91..a20dc0dd2fd1 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -43,7 +43,7 @@ const validateTagName = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG
 function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const taglistName = useMemo(() => PolicyUtils.getTagLists(policyTags)[0].name, [policyTags]);
+    const taglistName = useMemo(() => PolicyUtils.getCleanedTagName(PolicyUtils.getTagLists(policyTags)[0].name), [policyTags]);
     const {inputCallbackRef} = useAutoFocusInput();
 
     const updateTaglistName = useCallback(
@@ -81,7 +81,7 @@ function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps)
                                     inputID={INPUT_IDS.POLICY_TAGS_NAME}
                                     label={translate(`workspace.tags.customTagName`)}
                                     accessibilityLabel={translate(`workspace.tags.customTagName`)}
-                                    defaultValue={PolicyUtils.getCleanedTagName(taglistName)}
+                                    defaultValue={taglistName}
                                     role={CONST.ROLE.PRESENTATION}
                                     ref={inputCallbackRef}
                                 />

From 9bcd1c420c18e95da4608f80a003c19b5706ba88 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Tue, 9 Apr 2024 05:20:30 +0200
Subject: [PATCH 126/383] revert and prettier..

---
 src/pages/workspace/tags/WorkspaceEditTagsPage.tsx | 2 +-
 src/pages/workspace/tags/WorkspaceTagsPage.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index a20dc0dd2fd1..0072d37ef631 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -43,7 +43,7 @@ const validateTagName = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG
 function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const taglistName = useMemo(() => PolicyUtils.getCleanedTagName(PolicyUtils.getTagLists(policyTags)[0].name), [policyTags]);
+    const taglistName = useMemo(() => PolicyUtils.getTagLists(policyTags)[0].name, [policyTags]);
     const {inputCallbackRef} = useAutoFocusInput();
 
     const updateTaglistName = useCallback(
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 442c98ba2326..1563c3e63eeb 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -25,6 +25,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
@@ -39,7 +40,6 @@ import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
-import localeCompare from '@libs/LocaleCompare';
 
 type PolicyForList = {
     value: string;

From c2f2cec528980bde4baa3b48eb5750426e4facef Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 9 Apr 2024 15:35:03 +0700
Subject: [PATCH 127/383] Fix request preview isn't crossed out when deleting
 in offline

---
 src/libs/ReportActionsUtils.ts  | 4 ++--
 src/pages/home/ReportScreen.tsx | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 21e452de4730..655c23e2fd0a 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -216,7 +216,7 @@ function isTransactionThread(parentReportAction: OnyxEntry<ReportAction> | Empty
 /**
  * Returns the reportID for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions with a childReportID. Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
  */
-function getOneTransactionThreadReportID(reportActions: OnyxEntry<ReportActions> | ReportAction[]): string | null {
+function getOneTransactionThreadReportID(reportActions: OnyxEntry<ReportActions> | ReportAction[], isOffline: boolean | undefined = undefined): string | null {
     const reportActionsArray = Object.values(reportActions ?? {});
 
     if (!reportActionsArray.length) {
@@ -235,7 +235,7 @@ function getOneTransactionThreadReportID(reportActions: OnyxEntry<ReportActions>
             action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
             (iouRequestTypes.includes(action.originalMessage.type) ?? []) &&
             action.childReportID &&
-            action.originalMessage.IOUTransactionID,
+            (Boolean(action.originalMessage.IOUTransactionID) || (action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && (isOffline ?? isNetworkOffline))),
     );
 
     // If we don't have any IOU request actions, or we have more than one IOU request actions, this isn't a oneTransaction report
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 940cba181db7..44ce936d0f78 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -22,6 +22,7 @@ import withCurrentReportID from '@components/withCurrentReportID';
 import type {CurrentReportIDContextValue} from '@components/withCurrentReportID';
 import useAppFocusEvent from '@hooks/useAppFocusEvent';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useViewportOffsetTop from '@hooks/useViewportOffsetTop';
@@ -158,6 +159,7 @@ function ReportScreen({
     const firstRenderRef = useRef(true);
     const flatListRef = useRef<FlatList>(null);
     const reactionListRef = useRef<ReactionListRef>(null);
+    const {isOffline} = useNetwork();
     /**
      * Create a lightweight Report so as to keep the re-rendering as light as possible by
      * passing in only the required props.
@@ -333,7 +335,7 @@ function ReportScreen({
         );
     }
 
-    const transactionThreadReportID = useMemo(() => ReportActionsUtils.getOneTransactionThreadReportID(reportActions ?? []), [reportActions]);
+    const transactionThreadReportID = useMemo(() => ReportActionsUtils.getOneTransactionThreadReportID(reportActions ?? [], isOffline), [reportActions, isOffline]);
     if (ReportUtils.isMoneyRequestReport(report)) {
         headerView = (
             <MoneyReportHeader

From 3bead8e5558a10842604c97cfe0282f2ce5b2dd9 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 9 Apr 2024 19:19:34 +0800
Subject: [PATCH 128/383] use selection end for the prefix

---
 src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx
index 0ae45d2d705d..b23c0be72592 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx
@@ -227,7 +227,7 @@ function SuggestionEmoji(
         <EmojiSuggestions
             highlightedEmojiIndex={highlightedEmojiIndex}
             emojis={suggestionValues.suggestedEmojis}
-            prefix={value.slice(suggestionValues.colonIndex + 1, selection.start)}
+            prefix={value.slice(suggestionValues.colonIndex + 1, selection.end)}
             onSelect={insertSelectedEmoji}
             preferredSkinToneIndex={preferredSkinTone}
             isEmojiPickerLarge={!!isAutoSuggestionPickerLarge}

From 898262f6c5e7a6135571ada82ad74ad8795134f7 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 9 Apr 2024 19:23:58 +0800
Subject: [PATCH 129/383] use selection change to calculate the mention and
 prefix

---
 .../ReportActionCompose/SuggestionMention.tsx | 50 ++++++++++++-------
 .../ReportActionCompose/Suggestions.tsx       |  3 +-
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 5bf172e82388..55ac4641057d 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -2,6 +2,7 @@ import Str from 'expensify-common/lib/str';
 import lodashSortBy from 'lodash/sortBy';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import type {NativeSyntheticEvent, TextInputSelectionChangeEventData} from 'react-native';
 import * as Expensicons from '@components/Icon/Expensicons';
 import type {Mention} from '@components/MentionSuggestions';
 import MentionSuggestions from '@components/MentionSuggestions';
@@ -56,6 +57,7 @@ function SuggestionMention(
 
     // Used to store the selection index of the last inserted mention
     const suggestionInsertionIndexRef = useRef<number | null>(null);
+    const calculateMentionSuggestionRef = useRef<(selectionEnd: number) => void>();
 
     // Used to detect if the selection has changed since the last suggestion insertion
     // If so, we reset the suggestionInsertionIndexRef
@@ -219,19 +221,8 @@ function SuggestionMention(
                 return;
             }
 
-            const valueAfterTheCursor = value.substring(selectionEnd);
-            const indexOfFirstSpecialCharOrEmojiAfterTheCursor = valueAfterTheCursor.search(CONST.REGEX.MENTION_BREAKER);
-
-            let suggestionEndIndex;
-            if (indexOfFirstSpecialCharOrEmojiAfterTheCursor === -1) {
-                // We didn't find a special char/whitespace/emoji after the cursor, so we will use the entire string
-                suggestionEndIndex = value.length;
-            } else {
-                suggestionEndIndex = indexOfFirstSpecialCharOrEmojiAfterTheCursor + selectionEnd;
-            }
-
             const afterLastBreakLineIndex = value.lastIndexOf('\n', selectionEnd - 1) + 1;
-            const leftString = value.substring(afterLastBreakLineIndex, suggestionEndIndex);
+            const leftString = value.substring(afterLastBreakLineIndex, selectionEnd);
             const words = leftString.split(CONST.REGEX.SPACE_OR_EMOJI);
             const lastWord: string = words.at(-1) ?? '';
             const secondToLastWord = words[words.length - 3];
@@ -261,9 +252,7 @@ function SuggestionMention(
                 mentionPrefix: prefix,
             };
 
-            const isCursorBeforeTheMention = valueAfterTheCursor.startsWith(suggestionWord);
-
-            if (!isCursorBeforeTheMention && isMentionCode(suggestionWord)) {
+            if (isMentionCode(suggestionWord)) {
                 const suggestions = getMentionOptions(personalDetails, prefix);
                 nextState.suggestedMentions = suggestions;
                 nextState.shouldShowSuggestionMenu = !!suggestions.length;
@@ -279,8 +268,15 @@ function SuggestionMention(
     );
 
     useEffect(() => {
-        calculateMentionSuggestion(selection.end);
-    }, [selection, calculateMentionSuggestion]);
+        calculateMentionSuggestionRef.current = calculateMentionSuggestion;
+    }, [calculateMentionSuggestion]);
+
+    useEffect(() => {
+        if (!isComposerFocused) {
+            return;
+        }
+        calculateMentionSuggestionRef.current?.(selection.end);
+    }, [isComposerFocused]);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         setSuggestionValues((prevState) => {
@@ -300,16 +296,34 @@ function SuggestionMention(
 
     const getSuggestions = useCallback(() => suggestionValues.suggestedMentions, [suggestionValues]);
 
+    const onSelectionChange = useCallback(
+        (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
+            /**
+             * we pass here e.nativeEvent.selection.end directly to calculateEmojiSuggestion
+             * because in other case calculateEmojiSuggestion will have an old calculation value
+             * of suggestion instead of current one
+             */
+            const selectionEnd = e.nativeEvent.selection.end;
+            // On iOS, onSelectionChange is called before onChangeText, so it's possible we calculate the mention suggestion with a new selection value but with an old composer value
+            // We use setTimeout to delay the calculation so both selection and value is matched correctly
+            setTimeout(() => {
+                calculateMentionSuggestionRef.current?.(selectionEnd);
+            }, 1);
+        },
+        [calculateMentionSuggestion],
+    );
+
     useImperativeHandle(
         ref,
         () => ({
             resetSuggestions,
             triggerHotkeyActions,
             setShouldBlockSuggestionCalc,
+            onSelectionChange,
             updateShouldShowSuggestionMenuToFalse,
             getSuggestions,
         }),
-        [resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions],
+        [onSelectionChange, resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions],
     );
 
     if (!isMentionSuggestionsMenuVisible) {
diff --git a/src/pages/home/report/ReportActionCompose/Suggestions.tsx b/src/pages/home/report/ReportActionCompose/Suggestions.tsx
index 61026a792919..dd6fec77f38a 100644
--- a/src/pages/home/report/ReportActionCompose/Suggestions.tsx
+++ b/src/pages/home/report/ReportActionCompose/Suggestions.tsx
@@ -111,7 +111,8 @@ function Suggestions(
 
     const onSelectionChange = useCallback((e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
         const emojiHandler = suggestionEmojiRef.current?.onSelectionChange?.(e);
-        return emojiHandler;
+        const mentionHandler = suggestionMentionRef.current?.onSelectionChange?.(e);
+        return emojiHandler ?? mentionHandler;
     }, []);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {

From 957686520763101c7afca84c807ff3cbd5864c89 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 9 Apr 2024 19:47:15 +0800
Subject: [PATCH 130/383] suppress lint

---
 .../home/report/ReportActionCompose/SuggestionMention.tsx    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 55ac4641057d..46f7a0f196e0 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -252,6 +252,8 @@ function SuggestionMention(
                 mentionPrefix: prefix,
             };
 
+            console.log('is mention', value, selectionEnd)
+
             if (isMentionCode(suggestionWord)) {
                 const suggestions = getMentionOptions(personalDetails, prefix);
                 nextState.suggestedMentions = suggestions;
@@ -276,6 +278,7 @@ function SuggestionMention(
             return;
         }
         calculateMentionSuggestionRef.current?.(selection.end);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isComposerFocused]);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
@@ -310,7 +313,7 @@ function SuggestionMention(
                 calculateMentionSuggestionRef.current?.(selectionEnd);
             }, 1);
         },
-        [calculateMentionSuggestion],
+        [],
     );
 
     useImperativeHandle(

From 6bcc48b19157f323fa6edd12544c0f68c01eae53 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 9 Apr 2024 19:49:48 +0800
Subject: [PATCH 131/383] remove log

---
 src/pages/home/report/ReportActionCompose/SuggestionMention.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 46f7a0f196e0..8496d0895434 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -252,8 +252,6 @@ function SuggestionMention(
                 mentionPrefix: prefix,
             };
 
-            console.log('is mention', value, selectionEnd)
-
             if (isMentionCode(suggestionWord)) {
                 const suggestions = getMentionOptions(personalDetails, prefix);
                 nextState.suggestedMentions = suggestions;

From 8de7fc69751fee321b877bb98656a6146f2104ca Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 9 Apr 2024 15:18:44 +0200
Subject: [PATCH 132/383] fix types

---
 src/libs/migrations/RenameCardIsVirtual.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/migrations/RenameCardIsVirtual.ts b/src/libs/migrations/RenameCardIsVirtual.ts
index e36863e1fe85..490f5944dabf 100644
--- a/src/libs/migrations/RenameCardIsVirtual.ts
+++ b/src/libs/migrations/RenameCardIsVirtual.ts
@@ -5,7 +5,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {Card} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-type OldCard = Card & {isVirtual?: string};
+type OldCard = Card & {isVirtual?: boolean};
 
 // This migration changes the property name on each card from card list from isVirtual to nameValuePairs.isVirtual
 export default function () {
@@ -32,7 +32,7 @@ export default function () {
                     }
                     return {
                         ...result,
-                        [`${card.cardID}`]: {
+                        [card.cardID]: {
                             nameValuePairs: {
                                 isVirtual: card.isVirtual,
                             },

From 9809d4503db916deb65d0e73fb2f076852954b38 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Tue, 9 Apr 2024 20:28:12 +0200
Subject: [PATCH 133/383] Fix bug and rename policyMembers

---
 src/ONYXKEYS.ts                               |  2 +-
 .../AppNavigator/ReportScreenIDSetter.ts      |  4 +-
 src/libs/Navigation/dismissModalWithReport.ts |  4 +-
 ...bscribeToReportCommentPushNotifications.ts |  6 +--
 ...ersUtils.ts => PolicyEmployeeListUtils.ts} |  8 ++--
 src/libs/PolicyUtils.ts                       | 22 +++++------
 src/libs/ReportUtils.ts                       |  4 +-
 src/libs/actions/Policy.ts                    | 14 +++----
 src/libs/actions/Report.ts                    |  6 +--
 src/pages/ReportDetailsPage.tsx               | 12 +++---
 src/pages/RoomInvitePage.tsx                  |  4 +-
 src/pages/RoomMembersPage.tsx                 |  6 +--
 src/pages/home/HeaderView.tsx                 |  6 +--
 src/pages/home/sidebar/SidebarLinksData.js    |  4 +-
 src/pages/workspace/WorkspaceInvitePage.tsx   |  2 +-
 src/pages/workspace/WorkspaceMembersPage.tsx  | 38 ++++++++++---------
 .../WorkspaceWorkflowsApproverPage.tsx        | 28 +++++++-------
 .../workflows/WorkspaceWorkflowsPayerPage.tsx | 20 +++++-----
 src/types/onyx/Policy.ts                      |  2 +-
 .../{PolicyMember.ts => PolicyEmployee.ts}    |  8 ++--
 src/types/onyx/index.ts                       |  8 ++--
 tests/perf-test/PolicyUtils.perf-test.ts      | 14 +++----
 tests/utils/collections/policyEmployeeList.ts |  9 +++++
 tests/utils/collections/policyMembers.ts      |  9 -----
 24 files changed, 122 insertions(+), 118 deletions(-)
 rename src/libs/{PolicyMembersUtils.ts => PolicyEmployeeListUtils.ts} (65%)
 rename src/types/onyx/{PolicyMember.ts => PolicyEmployee.ts} (73%)
 create mode 100644 tests/utils/collections/policyEmployeeList.ts
 delete mode 100644 tests/utils/collections/policyMembers.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index bc3b2da49ecd..6df9a534d689 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -517,7 +517,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategories;
     [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTagList;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
-    [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
+    [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyEmployeeList;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT]: string;
     [ONYXKEYS.COLLECTION.REPORT]: OnyxTypes.Report;
diff --git a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
index 56efcdcf75e3..5407a451682a 100644
--- a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
+++ b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
@@ -3,7 +3,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import usePermissions from '@hooks/usePermissions';
-import {getPolicyMembersByIdWithoutCurrentUser} from '@libs/PolicyUtils';
+import {getPolicyEmployeeListByIdWithoutCurrentUser} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalDetailsList, Policy, Report, ReportMetadata} from '@src/types/onyx';
@@ -73,7 +73,7 @@ function ReportScreenIDSetter({route, reports, policies, navigation, isFirstTime
             return;
         }
 
-        const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
+        const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
 
         // If there is no reportID in route, try to find last accessed and use it for setParams
         const reportID = getLastAccessedReportID(
diff --git a/src/libs/Navigation/dismissModalWithReport.ts b/src/libs/Navigation/dismissModalWithReport.ts
index 2622cc2b9855..c0405c2c9da0 100644
--- a/src/libs/Navigation/dismissModalWithReport.ts
+++ b/src/libs/Navigation/dismissModalWithReport.ts
@@ -3,7 +3,7 @@ import type {NavigationContainerRef} from '@react-navigation/native';
 import {StackActions} from '@react-navigation/native';
 import {findLastIndex} from 'lodash';
 import Log from '@libs/Log';
-import getPolicyMemberAccountIDs from '@libs/PolicyMembersUtils';
+import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
 import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ROUTES from '@src/ROUTES';
@@ -47,7 +47,7 @@ function dismissModalWithReport(targetReport: Report | EmptyObject, navigationRe
             if (targetReport.reportID !== getTopmostReportId(state)) {
                 const reportState = getStateFromPath(ROUTES.REPORT_WITH_ID.getRoute(targetReport.reportID));
                 const policyID = getPolicyIDFromState(state as State<RootStackParamList>);
-                const policyMemberAccountIDs = getPolicyMemberAccountIDs(policyID);
+                const policyMemberAccountIDs = getPolicyEmployeeAccountIDs(policyID);
                 const shouldOpenAllWorkspace = isEmptyObject(targetReport) ? true : !doesReportBelongToWorkspace(targetReport, policyMemberAccountIDs, policyID);
 
                 if (shouldOpenAllWorkspace) {
diff --git a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.ts b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.ts
index 71f68d69acc7..7b8340c76c73 100644
--- a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.ts
+++ b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.ts
@@ -2,7 +2,7 @@ import Onyx from 'react-native-onyx';
 import * as OnyxUpdates from '@libs/actions/OnyxUpdates';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
-import getPolicyMemberAccountIDs from '@libs/PolicyMembersUtils';
+import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
 import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
 import {doesReportBelongToWorkspace, getReport} from '@libs/ReportUtils';
 import Visibility from '@libs/Visibility';
@@ -60,9 +60,9 @@ export default function subscribeToReportCommentPushNotifications() {
 
         const policyID = lastVisitedPath && extractPolicyIDFromPath(lastVisitedPath);
         const report = getReport(reportID.toString());
-        const policyMembersAccountIDs = policyID ? getPolicyMemberAccountIDs(policyID) : [];
+        const policyEmployeeAccountIDs = policyID ? getPolicyEmployeeAccountIDs(policyID) : [];
 
-        const reportBelongsToWorkspace = policyID && !isEmptyObject(report) && doesReportBelongToWorkspace(report, policyMembersAccountIDs, policyID);
+        const reportBelongsToWorkspace = policyID && !isEmptyObject(report) && doesReportBelongToWorkspace(report, policyEmployeeAccountIDs, policyID);
 
         Log.info('[PushNotification] onSelected() - called', false, {reportID, reportActionID});
         Navigation.isNavigationReady()
diff --git a/src/libs/PolicyMembersUtils.ts b/src/libs/PolicyEmployeeListUtils.ts
similarity index 65%
rename from src/libs/PolicyMembersUtils.ts
rename to src/libs/PolicyEmployeeListUtils.ts
index f826f4fd257a..305ffda87e28 100644
--- a/src/libs/PolicyMembersUtils.ts
+++ b/src/libs/PolicyEmployeeListUtils.ts
@@ -3,7 +3,7 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy} from '@src/types/onyx';
 import {getCurrentUserAccountID} from './actions/Report';
-import {getPolicyMembersByIdWithoutCurrentUser} from './PolicyUtils';
+import {getPolicyEmployeeListByIdWithoutCurrentUser} from './PolicyUtils';
 
 let allPolicies: OnyxCollection<Policy> = {};
 Onyx.connect({
@@ -12,14 +12,14 @@ Onyx.connect({
     callback: (value) => (allPolicies = value),
 });
 
-function getPolicyMemberAccountIDs(policyID?: string) {
+function getPolicyEmployeeAccountIDs(policyID?: string) {
     if (!policyID) {
         return [];
     }
 
     const currentUserAccountID = getCurrentUserAccountID();
 
-    return getPolicyMembersByIdWithoutCurrentUser(allPolicies, policyID, currentUserAccountID);
+    return getPolicyEmployeeListByIdWithoutCurrentUser(allPolicies, policyID, currentUserAccountID);
 }
 
-export default getPolicyMemberAccountIDs;
+export default getPolicyEmployeeAccountIDs;
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 45539796a7bd..f3bc13295530 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -4,7 +4,7 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyEmployeeList, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
 import type {PolicyFeatureName, Rate} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -127,14 +127,14 @@ const isPolicyAdmin = (policy: OnyxEntry<Policy> | EmptyObject): boolean => poli
  */
 const isFreeGroupPolicy = (policy: OnyxEntry<Policy> | EmptyObject): boolean => policy?.type === CONST.POLICY.TYPE.FREE;
 
-const isPolicyMember = (policyID: string, policies: OnyxCollection<Policy>): boolean => Object.values(policies ?? {}).some((policy) => policy?.id === policyID);
+const isPolicyEmployee = (policyID: string, policies: OnyxCollection<Policy>): boolean => Object.values(policies ?? {}).some((policy) => policy?.id === policyID);
 
 /**
  * Create an object mapping member emails to their accountIDs. Filter for members without errors, and get the login email from the personalDetail object using the accountID.
  *
  * We only return members without errors. Otherwise, the members with errors would immediately be removed before the user has a chance to read the error.
  */
-function getMemberAccountIDsForWorkspace(employeeList: PolicyMembers | undefined): MemberEmailsToAccountIDs {
+function getMemberAccountIDsForWorkspace(employeeList: PolicyEmployeeList | undefined): MemberEmailsToAccountIDs {
     const members = employeeList ?? {};
     const memberEmailsToAccountIDs: MemberEmailsToAccountIDs = {};
     Object.keys(members).forEach((email) => {
@@ -154,13 +154,13 @@ function getMemberAccountIDsForWorkspace(employeeList: PolicyMembers | undefined
 /**
  * Get login list that we should not show in the workspace invite options
  */
-function getIneligibleInvitees(employeeList?: PolicyMembers): string[] {
-    const members = employeeList ?? {};
+function getIneligibleInvitees(employeeList?: PolicyEmployeeList): string[] {
+    const policyEmployeeList = employeeList ?? {};
     const memberEmailsToExclude: string[] = [...CONST.EXPENSIFY_EMAILS];
-    Object.keys(members).forEach((email) => {
-        const policyMember = members?.[email];
+    Object.keys(policyEmployeeList).forEach((email) => {
+        const policyEmployee = policyEmployeeList?.[email];
         // Policy members that are pending delete or have errors are not valid and we should show them in the invite options (don't exclude them).
-        if (policyMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policyMember?.errors ?? {}).length > 0) {
+        if (policyEmployee?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policyEmployee?.errors ?? {}).length > 0) {
             return;
         }
         if (!email) {
@@ -278,7 +278,7 @@ function getPathWithoutPolicyID(path: string) {
     return path.replace(CONST.REGEX.PATH_WITHOUT_POLICY_ID, '/');
 }
 
-function getPolicyMembersByIdWithoutCurrentUser(policies: OnyxCollection<Policy>, currentPolicyID?: string, currentUserAccountID?: number) {
+function getPolicyEmployeeListByIdWithoutCurrentUser(policies: OnyxCollection<Policy>, currentPolicyID?: string, currentUserAccountID?: number) {
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${currentPolicyID}`] ?? null;
     const policyMemberEmailsToAccountIDs = getMemberAccountIDsForWorkspace(policy?.employeeList);
     return Object.values(policyMemberEmailsToAccountIDs)
@@ -344,11 +344,11 @@ export {
     getCleanedTagName,
     getCountOfEnabledTagsOfList,
     isPendingDeletePolicy,
-    isPolicyMember,
+    isPolicyEmployee,
     isPaidGroupPolicy,
     extractPolicyIDFromPath,
     getPathWithoutPolicyID,
-    getPolicyMembersByIdWithoutCurrentUser,
+    getPolicyEmployeeListByIdWithoutCurrentUser,
     goBackFromInvalidPolicy,
     isPolicyFeatureEnabled,
     hasTaxRateError,
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index c2bb77bd97ce..933198231a88 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4887,7 +4887,7 @@ function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Pol
  * `dm` - Nobody can leave (it's auto-shared with users)
  * `private` - Anybody can leave (though you can only be invited to join)
  */
-function canLeaveRoom(report: OnyxEntry<Report>, isPolicyMember: boolean): boolean {
+function canLeaveRoom(report: OnyxEntry<Report>, isPolicyEmployee: boolean): boolean {
     if (!report?.visibility) {
         if (
             report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS ||
@@ -4900,7 +4900,7 @@ function canLeaveRoom(report: OnyxEntry<Report>, isPolicyMember: boolean): boole
             // DM chats don't have a chatType
             return false;
         }
-    } else if (isPublicAnnounceRoom(report) && isPolicyMember) {
+    } else if (isPublicAnnounceRoom(report) && isPolicyEmployee) {
         return false;
     }
     return true;
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 1a63be771680..e79d02914935 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -77,7 +77,7 @@ import type {
     Policy,
     PolicyCategories,
     PolicyCategory,
-    PolicyMember,
+    PolicyEmployee,
     PolicyOwnershipChangeChecks,
     PolicyTag,
     PolicyTagList,
@@ -824,9 +824,9 @@ function removeMembers(accountIDs: number[], policyID: string) {
 
     const announceRoomMembers = removeOptimisticAnnounceRoomMembers(policyID, accountIDs);
 
-    const optimisticMembersState: OnyxCollection<PolicyMember> = {};
-    const successMembersState: OnyxCollection<PolicyMember> = {};
-    const failureMembersState: OnyxCollection<PolicyMember> = {};
+    const optimisticMembersState: OnyxCollection<PolicyEmployee> = {};
+    const successMembersState: OnyxCollection<PolicyEmployee> = {};
+    const failureMembersState: OnyxCollection<PolicyEmployee> = {};
     emailList.forEach((email) => {
         optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
         successMembersState[email] = null;
@@ -1286,9 +1286,9 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
     // create onyx data for policy expense chats for each new member
     const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs);
 
-    const optimisticMembersState: OnyxCollection<PolicyMember> = {};
-    const successMembersState: OnyxCollection<PolicyMember> = {};
-    const failureMembersState: OnyxCollection<PolicyMember> = {};
+    const optimisticMembersState: OnyxCollection<PolicyEmployee> = {};
+    const successMembersState: OnyxCollection<PolicyEmployee> = {};
+    const failureMembersState: OnyxCollection<PolicyEmployee> = {};
     Object.keys(invitedEmailsToAccountIDs).forEach((email) => {
         optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, role: CONST.POLICY.ROLE.USER};
         successMembersState[email] = {pendingAction: null};
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 91128ac89178..fd44f976055f 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -53,7 +53,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import LocalNotification from '@libs/Notification/LocalNotification';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PhoneNumber from '@libs/PhoneNumber';
-import getPolicyMemberAccountIDs from '@libs/PolicyMembersUtils';
+import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
 import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
 import processReportIDDeeplink from '@libs/processReportIDDeeplink';
 import * as Pusher from '@libs/Pusher/pusher';
@@ -2137,8 +2137,8 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
     const onClick = () =>
         Modal.close(() => {
             const policyID = lastVisitedPath && extractPolicyIDFromPath(lastVisitedPath);
-            const policyMembersAccountIDs = policyID ? getPolicyMemberAccountIDs(policyID) : [];
-            const reportBelongsToWorkspace = policyID ? doesReportBelongToWorkspace(report, policyMembersAccountIDs, policyID) : false;
+            const policyEmployeeAccountIDs = policyID ? getPolicyEmployeeAccountIDs(policyID) : [];
+            const reportBelongsToWorkspace = policyID ? doesReportBelongToWorkspace(report, policyEmployeeAccountIDs, policyID) : false;
             if (!reportBelongsToWorkspace) {
                 Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
             }
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 9093bf32b9dd..b4e74252fd61 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -65,7 +65,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const route = useRoute();
     const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
     const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy ?? null), [policy]);
-    const isPolicyMember = useMemo(() => PolicyUtils.isPolicyMember(report?.policyID ?? '', policies), [report?.policyID, policies]);
+    const isPolicyEmployee = useMemo(() => PolicyUtils.isPolicyEmployee(report?.policyID ?? '', policies), [report?.policyID, policies]);
     const shouldUseFullTitle = useMemo(() => ReportUtils.shouldUseFullTitleToDisplay(report), [report]);
     const isChatRoom = useMemo(() => ReportUtils.isChatRoom(report), [report]);
     const isUserCreatedPolicyRoom = useMemo(() => ReportUtils.isUserCreatedPolicyRoom(report), [report]);
@@ -122,9 +122,9 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc
         // - The report is a user created room and the room and the current user is a workspace member i.e. non-workspace members should not see this option.
         if (
-            ((isDefaultRoom && isChatThread && isPolicyMember) ||
+            ((isDefaultRoom && isChatThread && isPolicyEmployee) ||
                 (!isUserCreatedPolicyRoom && participants.length) ||
-                (isUserCreatedPolicyRoom && (isPolicyMember || (isChatThread && !ReportUtils.isPublicRoom(report))))) &&
+                (isUserCreatedPolicyRoom && (isPolicyEmployee || (isChatThread && !ReportUtils.isPublicRoom(report))))) &&
             !ReportUtils.isConciergeChatReport(report)
         ) {
             items.push({
@@ -142,8 +142,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 },
             });
         } else if (
-            (isUserCreatedPolicyRoom && (!participants.length || !isPolicyMember)) ||
-            ((isDefaultRoom || ReportUtils.isPolicyExpenseChat(report)) && isChatThread && !isPolicyMember)
+            (isUserCreatedPolicyRoom && (!participants.length || !isPolicyEmployee)) ||
+            ((isDefaultRoom || ReportUtils.isPolicyExpenseChat(report)) && isChatThread && !isPolicyEmployee)
         ) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.INVITE,
@@ -179,7 +179,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         }
 
         return items;
-    }, [isArchivedRoom, participants.length, isChatThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyMember, isUserCreatedPolicyRoom, session, isSelfDM, isDefaultRoom]);
+    }, [isArchivedRoom, participants.length, isChatThread, isMoneyRequestReport, report, isGroupDMChat, isPolicyEmployee, isUserCreatedPolicyRoom, session, isSelfDM, isDefaultRoom]);
 
     const displayNamesWithTooltips = useMemo(() => {
         const hasMultipleParticipants = participants.length > 1;
diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
index 49e53381e040..45a66d14e944 100644
--- a/src/pages/RoomInvitePage.tsx
+++ b/src/pages/RoomInvitePage.tsx
@@ -146,8 +146,8 @@ function RoomInvitePage({betas, report, policies}: RoomInvitePageProps) {
 
     // Non policy members should not be able to view the participants of a room
     const reportID = report?.reportID;
-    const isPolicyMember = useMemo(() => (report?.policyID ? PolicyUtils.isPolicyMember(report.policyID, policies as Record<string, Policy>) : false), [report?.policyID, policies]);
-    const backRoute = useMemo(() => reportID && (isPolicyMember ? ROUTES.ROOM_MEMBERS.getRoute(reportID) : ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID)), [isPolicyMember, reportID]);
+    const isPolicyEmployee = useMemo(() => (report?.policyID ? PolicyUtils.isPolicyEmployee(report.policyID, policies as Record<string, Policy>) : false), [report?.policyID, policies]);
+    const backRoute = useMemo(() => reportID && (isPolicyEmployee ? ROUTES.ROOM_MEMBERS.getRoute(reportID) : ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID)), [isPolicyEmployee, reportID]);
     const reportName = useMemo(() => ReportUtils.getReportName(report), [report]);
     const inviteUsers = useCallback(() => {
         if (!validate()) {
diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx
index d025a3bde265..009eaaf15a3c 100644
--- a/src/pages/RoomMembersPage.tsx
+++ b/src/pages/RoomMembersPage.tsx
@@ -224,11 +224,11 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
         return result;
     };
 
-    const isPolicyMember = useMemo(() => {
+    const isPolicyEmployee = useMemo(() => {
         if (!report?.policyID || policies === null) {
             return false;
         }
-        return PolicyUtils.isPolicyMember(report.policyID, policies);
+        return PolicyUtils.isPolicyEmployee(report.policyID, policies);
     }, [report?.policyID, policies]);
     const data = getMemberOptions();
     const headerMessage = searchValue.trim() && !data.length ? translate('roomMembersPage.memberNotFound') : '';
@@ -240,7 +240,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
         >
             <FullPageNotFoundView
                 shouldShow={
-                    isEmptyObject(report) || (!ReportUtils.isChatThread(report) && ((ReportUtils.isUserCreatedPolicyRoom(report) && !isPolicyMember) || ReportUtils.isDefaultRoom(report)))
+                    isEmptyObject(report) || (!ReportUtils.isChatThread(report) && ((ReportUtils.isUserCreatedPolicyRoom(report) && !isPolicyEmployee) || ReportUtils.isDefaultRoom(report)))
                 }
                 subtitleKey={isEmptyObject(report) ? undefined : 'roomMembersPage.notAuthorized'}
                 onBackButtonPress={() => {
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 1b8957b833b0..ae2e78ff4af5 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -94,8 +94,8 @@ function HeaderView({report, personalDetails, parentReport, parentReportAction,
     const isCanceledTaskReport = ReportUtils.isCanceledTaskReport(report, parentReportAction);
     const isWhisperAction = ReportActionsUtils.isWhisperAction(parentReportAction);
     const isUserCreatedPolicyRoom = ReportUtils.isUserCreatedPolicyRoom(report);
-    const isPolicyMember = useMemo(() => !isEmptyObject(policy), [policy]);
-    const canLeaveRoom = ReportUtils.canLeaveRoom(report, isPolicyMember);
+    const isPolicyEmployee = useMemo(() => !isEmptyObject(policy), [policy]);
+    const canLeaveRoom = ReportUtils.canLeaveRoom(report, isPolicyEmployee);
     const reportDescription = ReportUtils.getReportDescriptionText(report);
     const policyName = ReportUtils.getPolicyName(report, true);
     const policyDescription = ReportUtils.getPolicyDescriptionText(policy);
@@ -152,7 +152,7 @@ function HeaderView({report, personalDetails, parentReport, parentReportAction,
             onSelected: join,
         });
     } else if (canLeave) {
-        const isWorkspaceMemberLeavingWorkspaceRoom = !isChatThread && report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED && isPolicyMember;
+        const isWorkspaceMemberLeavingWorkspaceRoom = !isChatThread && report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED && isPolicyEmployee;
         threeDotMenuItems.push({
             icon: Expensicons.ChatBubbles,
             text: translate('common.leave'),
diff --git a/src/pages/home/sidebar/SidebarLinksData.js b/src/pages/home/sidebar/SidebarLinksData.js
index 792e0f9ad7be..d2d02960186f 100644
--- a/src/pages/home/sidebar/SidebarLinksData.js
+++ b/src/pages/home/sidebar/SidebarLinksData.js
@@ -16,7 +16,7 @@ import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
 import useThemeStyles from '@hooks/useThemeStyles';
 import compose from '@libs/compose';
-import {getPolicyMembersByIdWithoutCurrentUser} from '@libs/PolicyUtils';
+import {getPolicyEmployeeListByIdWithoutCurrentUser} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SidebarUtils from '@libs/SidebarUtils';
 import reportPropTypes from '@pages/reportPropTypes';
@@ -128,7 +128,7 @@ function SidebarLinksData({
     const {translate} = useLocalize();
     const prevPriorityMode = usePrevious(priorityMode);
 
-    const policyMemberAccountIDs = getPolicyMembersByIdWithoutCurrentUser(policies, activeWorkspaceID, currentUserPersonalDetails.accountID);
+    const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, currentUserPersonalDetails.accountID);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     useEffect(() => Policy.openWorkspace(activeWorkspaceID, policyMemberAccountIDs), [activeWorkspaceID]);
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 660f7b2e1ed8..4ca2ebab80b2 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -91,7 +91,7 @@ function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, poli
         const newSelectedOptionsDict: Record<number, MemberForList> = {};
 
         const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], searchTerm, excludedUsers, true);
-        // Update selectedOptions with the latest personalDetails and policyMembers information
+        // Update selectedOptions with the latest personalDetails and policyEmployeeList information
         const detailsMap: Record<string, MemberForList> = {};
         inviteOptions.personalDetails.forEach((detail) => {
             if (!detail.login) {
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index c796113208d2..adbd06d6a32e 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -42,7 +42,7 @@ 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, PolicyMember, PolicyMembers, Session} from '@src/types/onyx';
+import type {InvitedEmailsToAccountIDs, PersonalDetailsList, PolicyEmployee, PolicyEmployeeList, Session} from '@src/types/onyx';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
@@ -98,12 +98,13 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     /**
      * Get filtered personalDetails list with current employeeList
      */
-    const filterPersonalDetails = (members: OnyxEntry<PolicyMembers>, details: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
+    const filterPersonalDetails = (members: OnyxEntry<PolicyEmployeeList>, details: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
         Object.keys(members ?? {}).reduce((result, key) => {
-            if (details?.[policyMemberEmailsToAccountIDs[key] ?? '']) {
+            const memberAccountIdKey = policyMemberEmailsToAccountIDs[key] ?? '';
+            if (details?.[memberAccountIdKey]) {
                 return {
                     ...result,
-                    [policyMemberEmailsToAccountIDs[key] ?? '']: details[policyMemberEmailsToAccountIDs[key] ?? ''],
+                    [memberAccountIdKey]: details[memberAccountIdKey],
                 };
             }
             return result;
@@ -130,7 +131,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [selectedEmployees, policy?.owner, session?.accountID]);
 
-    // useFocusEffect would make getWorkspaceMembers get called twice on fresh login because policyMember is a dependency of getWorkspaceMembers.
+    // useFocus would make getWorkspaceMembers get called twice on fresh login because policyEmployee is a dependency of getWorkspaceMembers.
     useEffect(() => {
         if (!isFocused) {
             return;
@@ -156,10 +157,13 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 const res = Object.values(currentPersonalDetails).find((item) => prevItem?.login === item?.login);
                 return res?.accountID ?? id;
             });
+
+            const currentSelectedElements = Object.entries(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList))
+                .filter((employee) => policy?.employeeList?.[employee[0]]?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+                .map((employee) => employee[1]);
+
             // This is an equivalent of the lodash intersection function. The reduce method below is used to filter the items that exist in both arrays.
-            return [prevSelectedElements, Object.values(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList))].reduce((prev, members) =>
-                prev.filter((item) => members.includes(item)),
-            );
+            return [prevSelectedElements, currentSelectedElements].reduce((prev, members) => prev.filter((item) => members.includes(item)));
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [policy?.employeeList, policyMemberEmailsToAccountIDs]);
@@ -294,8 +298,8 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     /**
      * Check if the policy member is deleted from the workspace
      */
-    const isDeletedPolicyMember = useCallback(
-        (policyMember: PolicyMember): boolean => !isOffline && policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyMember.errors),
+    const isDeletedPolicyEmployee = useCallback(
+        (policyEmployee: PolicyEmployee): boolean => !isOffline && policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyEmployee.errors),
         [isOffline],
     );
 
@@ -305,9 +309,9 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     const getUsers = useCallback((): MemberOption[] => {
         let result: MemberOption[] = [];
 
-        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyEmployee]) => {
             const accountID = Number(policyMemberEmailsToAccountIDs[email] ?? '');
-            if (isDeletedPolicyMember(policyMember)) {
+            if (isDeletedPolicyEmployee(policyEmployee)) {
                 return;
             }
 
@@ -330,7 +334,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             const isSelected = selectedEmployees.includes(accountID);
 
             const isOwner = policy?.owner === details.login;
-            const isAdmin = policyMember.role === CONST.POLICY.ROLE.ADMIN;
+            const isAdmin = policyEmployee.role === CONST.POLICY.ROLE.ADMIN;
             let roleBadge = null;
             if (isOwner || isAdmin) {
                 roleBadge = (
@@ -347,7 +351,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 accountID,
                 isSelected,
                 isDisabledCheckbox: !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID),
-                isDisabled: isPolicyAdmin && (policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyMember.errors)),
+                isDisabled: isPolicyAdmin && (policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors)),
                 text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
                 alternateText: formatPhoneNumber(details?.login ?? ''),
                 rightElement: roleBadge,
@@ -359,8 +363,8 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                         id: accountID,
                     },
                 ],
-                errors: policyMember.errors,
-                pendingAction: policyMember.pendingAction,
+                errors: policyEmployee.errors,
+                pendingAction: policyEmployee.pendingAction,
                 // Note which secondary login was used to invite this primary login
                 invitedSecondaryLogin: details?.login ? invitedPrimaryToSecondaryLogins[details.login] ?? '' : '',
             });
@@ -372,7 +376,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         currentUserLogin,
         formatPhoneNumber,
         invitedPrimaryToSecondaryLogins,
-        isDeletedPolicyMember,
+        isDeletedPolicyEmployee,
         isPolicyAdmin,
         personalDetails,
         policy?.owner,
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
index ccf446ab077b..d32218616662 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
@@ -27,7 +27,7 @@ import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPol
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
-import type {PersonalDetailsList, PolicyMember} from '@src/types/onyx';
+import type {PersonalDetailsList, PolicyEmployee} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type WorkspaceWorkflowsApproverPageOnyxProps = {
@@ -49,19 +49,19 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
 
-    const isDeletedPolicyMember = useCallback(
-        (policyMember: PolicyMember) => !isOffline && policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyMember.errors),
+    const isDeletedPolicyEmployee = useCallback(
+        (policyEmployee: PolicyEmployee) => !isOffline && policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyEmployee.errors),
         [isOffline],
     );
 
-    const [formattedPolicyMembers, formattedApprover] = useMemo(() => {
+    const [formattedPolicyEmployeeList, formattedApprover] = useMemo(() => {
         const policyMemberDetails: MemberOption[] = [];
         const approverDetails: MemberOption[] = [];
 
         const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
 
-        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
-            if (isDeletedPolicyMember(policyMember)) {
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyEmployee]) => {
+            if (isDeletedPolicyEmployee(policyEmployee)) {
                 return;
             }
 
@@ -74,7 +74,7 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
             }
 
             const isOwner = policy?.owner === details.login;
-            const isAdmin = policyMember.role === CONST.POLICY.ROLE.ADMIN;
+            const isAdmin = policyEmployee.role === CONST.POLICY.ROLE.ADMIN;
 
             let roleBadge = null;
             if (isOwner || isAdmin) {
@@ -91,7 +91,7 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
                 keyForList: String(accountID),
                 accountID,
                 isSelected: policy?.approver === details.login,
-                isDisabled: policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyMember.errors),
+                isDisabled: policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors),
                 text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
                 alternateText: formatPhoneNumber(details?.login ?? ''),
                 rightElement: roleBadge,
@@ -103,8 +103,8 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
                         id: accountID,
                     },
                 ],
-                errors: policyMember.errors,
-                pendingAction: policyMember.pendingAction,
+                errors: policyEmployee.errors,
+                pendingAction: policyEmployee.pendingAction,
             };
 
             if (policy?.approver === details.login) {
@@ -114,13 +114,13 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
             }
         });
         return [policyMemberDetails, approverDetails];
-    }, [personalDetails, translate, policy?.approver, StyleUtils, isDeletedPolicyMember, policy?.owner, styles, policy?.employeeList]);
+    }, [personalDetails, translate, policy?.approver, StyleUtils, isDeletedPolicyEmployee, policy?.owner, styles, policy?.employeeList]);
 
     const sections: MembersSection[] = useMemo(() => {
         const sectionsArray: MembersSection[] = [];
 
         if (searchTerm !== '') {
-            const filteredOptions = [...formattedApprover, ...formattedPolicyMembers].filter((option) => {
+            const filteredOptions = [...formattedApprover, ...formattedPolicyEmployeeList].filter((option) => {
                 const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(searchTerm);
                 return !!option.text?.toLowerCase().includes(searchValue) || !!option.login?.toLowerCase().includes(searchValue);
             });
@@ -141,12 +141,12 @@ function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingRepor
 
         sectionsArray.push({
             title: translate('common.all'),
-            data: formattedPolicyMembers,
+            data: formattedPolicyEmployeeList,
             shouldShow: true,
         });
 
         return sectionsArray;
-    }, [formattedPolicyMembers, formattedApprover, searchTerm, translate]);
+    }, [formattedPolicyEmployeeList, formattedApprover, searchTerm, translate]);
 
     const headerMessage = useMemo(
         () => (searchTerm && !sections[0].data.length ? translate('common.noResultsFound') : ''),
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index 6691fc7f002c..da51b2c3e8e3 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -28,7 +28,7 @@ import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPol
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
-import type {PersonalDetailsList, PolicyMember} from '@src/types/onyx';
+import type {PersonalDetailsList, PolicyEmployee} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type WorkspaceWorkflowsPayerPageOnyxProps = {
@@ -51,8 +51,8 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
 
     const [searchTerm, setSearchTerm] = useState('');
 
-    const isDeletedPolicyMember = useCallback(
-        (policyMember: PolicyMember) => !isOffline && policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyMember.errors),
+    const isDeletedPolicyEmployee = useCallback(
+        (policyEmployee: PolicyEmployee) => !isOffline && policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyEmployee.errors),
         [isOffline],
     );
 
@@ -62,7 +62,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
 
         const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
 
-        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyMember]) => {
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyEmployee]) => {
             const accountID = policyMemberEmailsToAccountIDs?.[email] ?? '';
             const details = personalDetails?.[accountID];
             if (!details) {
@@ -71,8 +71,8 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
             }
 
             const isOwner = policy?.owner === details?.login;
-            const isAdmin = policyMember.role === CONST.POLICY.ROLE.ADMIN;
-            const shouldSkipMember = isDeletedPolicyMember(policyMember) || PolicyUtils.isExpensifyTeam(details?.login) || (!isOwner && !isAdmin);
+            const isAdmin = policyEmployee.role === CONST.POLICY.ROLE.ADMIN;
+            const shouldSkipMember = isDeletedPolicyEmployee(policyEmployee) || PolicyUtils.isExpensifyTeam(details?.login) || (!isOwner && !isAdmin);
 
             if (shouldSkipMember) {
                 return;
@@ -92,7 +92,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                 keyForList: String(accountID),
                 accountID,
                 isSelected: isAuthorizedPayer,
-                isDisabled: policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyMember.errors),
+                isDisabled: policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors),
                 text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
                 alternateText: formatPhoneNumber(details?.login ?? ''),
                 rightElement: roleBadge,
@@ -104,8 +104,8 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                         id: accountID,
                     },
                 ],
-                errors: policyMember.errors,
-                pendingAction: policyMember.pendingAction ?? isAuthorizedPayer ? policy?.pendingFields?.reimburser : null,
+                errors: policyEmployee.errors,
+                pendingAction: policyEmployee.pendingAction ?? isAuthorizedPayer ? policy?.pendingFields?.reimburser : null,
             };
 
             if (isAuthorizedPayer) {
@@ -115,7 +115,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
             }
         });
         return [policyAdminDetails, authorizedPayerDetails];
-    }, [personalDetails, policy?.employeeList, translate, policy?.achAccount?.reimburser, isDeletedPolicyMember, policy?.owner, styles, StyleUtils, policy?.pendingFields?.reimburser]);
+    }, [personalDetails, policy?.employeeList, translate, policy?.achAccount?.reimburser, isDeletedPolicyEmployee, policy?.owner, styles, StyleUtils, policy?.pendingFields?.reimburser]);
 
     const sections: MembersSection[] = useMemo(() => {
         const sectionsArray: MembersSection[] = [];
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index cdfe92b3d09d..1e00bc645aee 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -327,7 +327,7 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         submitsTo?: number;
 
         /** The employee list of the policy */
-        employeeList?: OnyxTypes.PolicyMembers;
+        employeeList?: OnyxTypes.PolicyEmployeeList;
 
         /** The reimbursement choice for policy */
         reimbursementChoice?: ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES>;
diff --git a/src/types/onyx/PolicyMember.ts b/src/types/onyx/PolicyEmployee.ts
similarity index 73%
rename from src/types/onyx/PolicyMember.ts
rename to src/types/onyx/PolicyEmployee.ts
index 366a7ef7d530..4a5f374de44a 100644
--- a/src/types/onyx/PolicyMember.ts
+++ b/src/types/onyx/PolicyEmployee.ts
@@ -1,6 +1,6 @@
 import type * as OnyxCommon from './OnyxCommon';
 
-type PolicyMember = OnyxCommon.OnyxValueWithOfflineFeedback<{
+type PolicyEmployee = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Role of the user in the policy */
     role?: string;
 
@@ -20,7 +20,7 @@ type PolicyMember = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errors?: OnyxCommon.Errors;
 }>;
 
-type PolicyMembers = Record<string, PolicyMember>;
+type PolicyEmployeeList = Record<string, PolicyEmployee>;
 
-export default PolicyMember;
-export type {PolicyMembers};
+export default PolicyEmployee;
+export type {PolicyEmployeeList};
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index e56066440d80..bcac6a541798 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -38,8 +38,8 @@ import type Policy from './Policy';
 import type {PolicyReportField, TaxRate, TaxRates, TaxRatesWithDefault} from './Policy';
 import type {PolicyCategories, PolicyCategory} from './PolicyCategory';
 import type PolicyJoinMember from './PolicyJoinMember';
-import type {PolicyMembers} from './PolicyMember';
-import type PolicyMember from './PolicyMember';
+import type {PolicyEmployeeList} from './PolicyEmployee';
+import type PolicyEmployee from './PolicyEmployee';
 import type PolicyOwnershipChangeChecks from './PolicyOwnershipChangeChecks';
 import type {PolicyTag, PolicyTagList, PolicyTags} from './PolicyTag';
 import type PreferredTheme from './PreferredTheme';
@@ -117,8 +117,8 @@ export type {
     Policy,
     PolicyCategories,
     PolicyCategory,
-    PolicyMember,
-    PolicyMembers,
+    PolicyEmployee,
+    PolicyEmployeeList,
     PolicyOwnershipChangeChecks,
     PolicyTag,
     PolicyTags,
diff --git a/tests/perf-test/PolicyUtils.perf-test.ts b/tests/perf-test/PolicyUtils.perf-test.ts
index 4f882ae9f057..0fc0a71bef03 100644
--- a/tests/perf-test/PolicyUtils.perf-test.ts
+++ b/tests/perf-test/PolicyUtils.perf-test.ts
@@ -1,29 +1,29 @@
 import {measureFunction} from 'reassure';
 import {getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils';
 import createCollection from '../utils/collections/createCollection';
-import createRandomPolicyMember from '../utils/collections/policyMembers';
+import createRandomPolicyEmployeeList from '../utils/collections/policyEmployeeList';
 
 describe('PolicyUtils', () => {
     describe('getMemberAccountIDsForWorkspace', () => {
         test('500 policy members with personal details', async () => {
-            const policyMembers = createCollection(
+            const policyEmployeeList = createCollection(
                 (_, index) => index,
-                () => createRandomPolicyMember(),
+                () => createRandomPolicyEmployeeList(),
             );
 
-            await measureFunction(() => getMemberAccountIDsForWorkspace(policyMembers));
+            await measureFunction(() => getMemberAccountIDsForWorkspace(policyEmployeeList));
         });
 
         test('500 policy members with errors and personal details', async () => {
-            const policyMembers = createCollection(
+            const policyEmployeeList = createCollection(
                 (_, index) => index,
                 () => ({
-                    ...createRandomPolicyMember(),
+                    ...createRandomPolicyEmployeeList(),
                     errors: {error: 'Error message'},
                 }),
             );
 
-            await measureFunction(() => getMemberAccountIDsForWorkspace(policyMembers));
+            await measureFunction(() => getMemberAccountIDsForWorkspace(policyEmployeeList));
         });
     });
 });
diff --git a/tests/utils/collections/policyEmployeeList.ts b/tests/utils/collections/policyEmployeeList.ts
new file mode 100644
index 000000000000..9e04c71748b7
--- /dev/null
+++ b/tests/utils/collections/policyEmployeeList.ts
@@ -0,0 +1,9 @@
+import {randWord} from '@ngneat/falso';
+import type {PolicyEmployee} from '@src/types/onyx';
+
+export default function createRandomPolicyEmployeeList(): PolicyEmployee {
+    return {
+        role: randWord(),
+        errors: {},
+    };
+}
diff --git a/tests/utils/collections/policyMembers.ts b/tests/utils/collections/policyMembers.ts
deleted file mode 100644
index 076c8ddb2d3d..000000000000
--- a/tests/utils/collections/policyMembers.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {randWord} from '@ngneat/falso';
-import type {PolicyMember} from '@src/types/onyx';
-
-export default function createRandomPolicyMember(): PolicyMember {
-    return {
-        role: randWord(),
-        errors: {},
-    };
-}

From 851ee9b3e85f6540c0835ffaa106394d4087a80a Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Tue, 9 Apr 2024 23:46:07 +0200
Subject: [PATCH 134/383] Fix eslint issue

---
 src/types/onyx/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 0088b8f2644b..ea0870a7b8c6 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -37,9 +37,9 @@ import type PlaidData from './PlaidData';
 import type Policy from './Policy';
 import type {PolicyConnectionSyncProgress, PolicyReportField, TaxRate, TaxRates, TaxRatesWithDefault} from './Policy';
 import type {PolicyCategories, PolicyCategory} from './PolicyCategory';
-import type PolicyJoinMember from './PolicyJoinMember';
 import type {PolicyEmployeeList} from './PolicyEmployee';
 import type PolicyEmployee from './PolicyEmployee';
+import type PolicyJoinMember from './PolicyJoinMember';
 import type PolicyOwnershipChangeChecks from './PolicyOwnershipChangeChecks';
 import type {PolicyTag, PolicyTagList, PolicyTags} from './PolicyTag';
 import type PreferredTheme from './PreferredTheme';

From 019b2f796dba4c7eb3777140fcffb11f48ecaa98 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 10 Apr 2024 00:43:36 +0200
Subject: [PATCH 135/383] WorkspaceTagsPage...

---
 .../workspace/tags/WorkspaceTagsPage.tsx      | 171 +++++++++---------
 1 file changed, 88 insertions(+), 83 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 1563c3e63eeb..b6601490cb8a 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -52,106 +52,111 @@ type PolicyForList = {
 
 type PolicyOption = ListItem & {
     /** Tag name is used as a key for the selectedTags state */
-    keyForList: string;
-};
+        keyForList: string;
+    };
 
-type WorkspaceTagsOnyxProps = {
-    /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
-};
+    type WorkspaceTagsOnyxProps = {
+        /** Collection of tags attached to a policy */
+        policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    };
 
-type WorkspaceTagsPageProps = WorkspaceTagsOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS>;
+    type WorkspaceTagsPageProps = WorkspaceTagsOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS>;
 
-function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const styles = useThemeStyles();
-    const theme = useTheme();
-    const {translate} = useLocalize();
-    const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
-    const dropdownButtonRef = useRef(null);
-    const [deleteTagsConfirmModalVisible, setDeleteTagsConfirmModalVisible] = useState(false);
+    function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
+        const {isSmallScreenWidth} = useWindowDimensions();
+        const styles = useThemeStyles();
+        const theme = useTheme();
+        const {translate} = useLocalize();
+        const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
+        const dropdownButtonRef = useRef(null);
+        const [deleteTagsConfirmModalVisible, setDeleteTagsConfirmModalVisible] = useState(false);
 
-    const fetchTags = useCallback(() => {
-        Policy.openPolicyTagsPage(route.params.policyID);
-    }, [route.params.policyID]);
+        const fetchTags = useCallback(() => {
+            Policy.openPolicyTagsPage(route.params.policyID);
+        }, [route.params.policyID]);
 
-    const {isOffline} = useNetwork({onReconnect: fetchTags});
+        const {isOffline} = useNetwork({onReconnect: fetchTags});
 
-    useFocusEffect(
-        useCallback(() => {
-            fetchTags();
-        }, [fetchTags]),
-    );
-    // We currently don't support multi level tags, so let's only get the first level tags.
-    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags)[0], [policyTags]);
-    const tagList = useMemo<PolicyForList[]>(
-        () =>
-            lodashSortBy(Object.values(policyTagLists.tags || []), 'name', localeCompare).map((value) => {
-                const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
-                const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                return {
-                    value: tag.name,
-                    text: PolicyUtils.getCleanedTagName(tag.name),
-                    keyForList: tag.name,
-                    isSelected: !!selectedTags[tag.name],
-                    pendingAction: tag.pendingAction,
-                    errors: tag.errors ?? undefined,
-                    enabled: tag.enabled,
-                    isDisabled,
-                    rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
-                };
-            }),
-        [policyTagLists, selectedTags],
-    );
+        useFocusEffect(
+            useCallback(() => {
+                fetchTags();
+            }, [fetchTags]),
+        );
+        
+        // We currently don't support multi level tags, so let's only get the first level tags.
+        const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
+        const tagList = useMemo<PolicyForList[]>(
+            () =>
+                policyTagLists
+                    .map((policyTagList) =>
+                        lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => {
+                            const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
+                            const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                            return {
+                                value: tag.name,
+                                text: tag.name,
+                                keyForList: tag.name,
+                                isSelected: !!selectedTags[tag.name],
+                                pendingAction: tag.pendingAction,
+                                errors: tag.errors ?? undefined,
+                                enabled: tag.enabled,
+                                isDisabled,
+                                rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
+                            };
+                        }),
+                    )
+                    .flat(),
+            [policyTagLists, selectedTags],
+        );
 
-    const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {
-        acc[tag.value] = tag;
-        return acc;
-    }, {});
+        const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {
+            acc[tag.value] = tag;
+            return acc;
+        }, {});
 
-    const toggleTag = (tag: PolicyForList) => {
-        setSelectedTags((prev) => ({
-            ...prev,
-            [tag.value]: !prev[tag.value],
-        }));
-    };
+        const toggleTag = (tag: PolicyForList) => {
+            setSelectedTags((prev) => ({
+                ...prev,
+                [tag.value]: !prev[tag.value],
+            }));
+        };
 
-    const toggleAllTags = () => {
-        const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]);
-        setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true])));
-    };
+        const toggleAllTags = () => {
+            const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]);
+            setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true])));
+        };
 
-    const getCustomListHeader = () => (
-        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
-            <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
-            <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
-        </View>
-    );
+        const getCustomListHeader = () => (
+            <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
+                <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
+                <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
+            </View>
+        );
 
-    const navigateToTagsSettings = () => {
-        Navigation.navigate(ROUTES.WORKSPACE_TAGS_SETTINGS.getRoute(route.params.policyID));
-    };
+        const navigateToTagsSettings = () => {
+            Navigation.navigate(ROUTES.WORKSPACE_TAGS_SETTINGS.getRoute(route.params.policyID));
+        };
 
-    const navigateToCreateTagPage = () => {
-        Navigation.navigate(ROUTES.WORKSPACE_TAG_CREATE.getRoute(route.params.policyID));
-    };
+        const navigateToCreateTagPage = () => {
+            Navigation.navigate(ROUTES.WORKSPACE_TAG_CREATE.getRoute(route.params.policyID));
+        };
 
-    const navigateToTagSettings = (tag: PolicyOption) => {
-        setSelectedTags({});
-        Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route.params.policyID, tag.keyForList));
-    };
+        const navigateToTagSettings = (tag: PolicyOption) => {
+            setSelectedTags({});
+            Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route.params.policyID, tag.keyForList));
+        };
 
-    const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]);
+        const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]);
 
-    const handleDeleteTags = () => {
-        setSelectedTags({});
-        Policy.deletePolicyTags(route.params.policyID, selectedTagsArray);
-        setDeleteTagsConfirmModalVisible(false);
-    };
+        const handleDeleteTags = () => {
+            setSelectedTags({});
+            Policy.deletePolicyTags(route.params.policyID, selectedTagsArray);
+            setDeleteTagsConfirmModalVisible(false);
+        };
 
-    const isLoading = !isOffline && policyTags === undefined;
+        const isLoading = !isOffline && policyTags === undefined;
 
-    const getHeaderButtons = () => {
+        const getHeaderButtons = () => {
         const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.TAGS_BULK_ACTION_TYPES>>> = [];
 
         if (selectedTagsArray.length > 0) {

From 879064dbb2fb50c4b7e5637364b57c782c24df90 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 10 Apr 2024 00:51:10 +0200
Subject: [PATCH 136/383] prettier and reverted...

---
 src/pages/workspace/tags/TagSettingsPage.tsx  |   2 +-
 .../workspace/tags/WorkspaceTagsPage.tsx      | 176 +++++++++---------
 2 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index b68a67675201..b09552f412e7 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -79,7 +79,7 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
                         testID={TagSettingsPage.displayName}
                     >
                         <HeaderWithBackButton
-                            title={PolicyUtils.getCleanedTagName(route.params.tagName)}
+                            title={route.params.tagName}
                             shouldShowThreeDotsButton
                             shouldSetModalVisibility={false}
                             threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index b6601490cb8a..5e0bec54f3cf 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -52,111 +52,111 @@ type PolicyForList = {
 
 type PolicyOption = ListItem & {
     /** Tag name is used as a key for the selectedTags state */
-        keyForList: string;
-    };
+    keyForList: string;
+};
 
-    type WorkspaceTagsOnyxProps = {
-        /** Collection of tags attached to a policy */
-        policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
-    };
+type WorkspaceTagsOnyxProps = {
+    /** Collection of tags attached to a policy */
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+};
 
-    type WorkspaceTagsPageProps = WorkspaceTagsOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS>;
+type WorkspaceTagsPageProps = WorkspaceTagsOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS>;
 
-    function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
-        const {isSmallScreenWidth} = useWindowDimensions();
-        const styles = useThemeStyles();
-        const theme = useTheme();
-        const {translate} = useLocalize();
-        const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
-        const dropdownButtonRef = useRef(null);
-        const [deleteTagsConfirmModalVisible, setDeleteTagsConfirmModalVisible] = useState(false);
+function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
+    const {isSmallScreenWidth} = useWindowDimensions();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
+    const dropdownButtonRef = useRef(null);
+    const [deleteTagsConfirmModalVisible, setDeleteTagsConfirmModalVisible] = useState(false);
 
-        const fetchTags = useCallback(() => {
-            Policy.openPolicyTagsPage(route.params.policyID);
-        }, [route.params.policyID]);
+    const fetchTags = useCallback(() => {
+        Policy.openPolicyTagsPage(route.params.policyID);
+    }, [route.params.policyID]);
 
-        const {isOffline} = useNetwork({onReconnect: fetchTags});
+    const {isOffline} = useNetwork({onReconnect: fetchTags});
 
-        useFocusEffect(
-            useCallback(() => {
-                fetchTags();
-            }, [fetchTags]),
-        );
-        
-        // We currently don't support multi level tags, so let's only get the first level tags.
-        const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
-        const tagList = useMemo<PolicyForList[]>(
-            () =>
-                policyTagLists
-                    .map((policyTagList) =>
-                        lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => {
-                            const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
-                            const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                            return {
-                                value: tag.name,
-                                text: tag.name,
-                                keyForList: tag.name,
-                                isSelected: !!selectedTags[tag.name],
-                                pendingAction: tag.pendingAction,
-                                errors: tag.errors ?? undefined,
-                                enabled: tag.enabled,
-                                isDisabled,
-                                rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
-                            };
-                        }),
-                    )
-                    .flat(),
-            [policyTagLists, selectedTags],
-        );
+    useFocusEffect(
+        useCallback(() => {
+            fetchTags();
+        }, [fetchTags]),
+    );
+
+    // We currently don't support multi level tags, so let's only get the first level tags.
+    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
+    const tagList = useMemo<PolicyForList[]>(
+        () =>
+            policyTagLists
+                .map((policyTagList) =>
+                    lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => {
+                        const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
+                        const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                        return {
+                            value: tag.name,
+                            text: tag.name,
+                            keyForList: tag.name,
+                            isSelected: !!selectedTags[tag.name],
+                            pendingAction: tag.pendingAction,
+                            errors: tag.errors ?? undefined,
+                            enabled: tag.enabled,
+                            isDisabled,
+                            rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
+                        };
+                    }),
+                )
+                .flat(),
+        [policyTagLists, selectedTags],
+    );
 
-        const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {
-            acc[tag.value] = tag;
-            return acc;
-        }, {});
+    const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {
+        acc[tag.value] = tag;
+        return acc;
+    }, {});
 
-        const toggleTag = (tag: PolicyForList) => {
-            setSelectedTags((prev) => ({
-                ...prev,
-                [tag.value]: !prev[tag.value],
-            }));
-        };
+    const toggleTag = (tag: PolicyForList) => {
+        setSelectedTags((prev) => ({
+            ...prev,
+            [tag.value]: !prev[tag.value],
+        }));
+    };
 
-        const toggleAllTags = () => {
-            const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]);
-            setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true])));
-        };
+    const toggleAllTags = () => {
+        const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]);
+        setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true])));
+    };
 
-        const getCustomListHeader = () => (
-            <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
-                <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
-                <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
-            </View>
-        );
+    const getCustomListHeader = () => (
+        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
+            <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
+            <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
+        </View>
+    );
 
-        const navigateToTagsSettings = () => {
-            Navigation.navigate(ROUTES.WORKSPACE_TAGS_SETTINGS.getRoute(route.params.policyID));
-        };
+    const navigateToTagsSettings = () => {
+        Navigation.navigate(ROUTES.WORKSPACE_TAGS_SETTINGS.getRoute(route.params.policyID));
+    };
 
-        const navigateToCreateTagPage = () => {
-            Navigation.navigate(ROUTES.WORKSPACE_TAG_CREATE.getRoute(route.params.policyID));
-        };
+    const navigateToCreateTagPage = () => {
+        Navigation.navigate(ROUTES.WORKSPACE_TAG_CREATE.getRoute(route.params.policyID));
+    };
 
-        const navigateToTagSettings = (tag: PolicyOption) => {
-            setSelectedTags({});
-            Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route.params.policyID, tag.keyForList));
-        };
+    const navigateToTagSettings = (tag: PolicyOption) => {
+        setSelectedTags({});
+        Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route.params.policyID, tag.keyForList));
+    };
 
-        const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]);
+    const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]);
 
-        const handleDeleteTags = () => {
-            setSelectedTags({});
-            Policy.deletePolicyTags(route.params.policyID, selectedTagsArray);
-            setDeleteTagsConfirmModalVisible(false);
-        };
+    const handleDeleteTags = () => {
+        setSelectedTags({});
+        Policy.deletePolicyTags(route.params.policyID, selectedTagsArray);
+        setDeleteTagsConfirmModalVisible(false);
+    };
 
-        const isLoading = !isOffline && policyTags === undefined;
+    const isLoading = !isOffline && policyTags === undefined;
 
-        const getHeaderButtons = () => {
+    const getHeaderButtons = () => {
         const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.TAGS_BULK_ACTION_TYPES>>> = [];
 
         if (selectedTagsArray.length > 0) {

From 401f5bf73f1503a8f0b94a44dc9561cd92f05fcf Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 10 Apr 2024 01:46:30 +0200
Subject: [PATCH 137/383] Slicing the policyTagLists to get the first policy
 tag

---
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 5e0bec54f3cf..94aa28f644bb 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -84,7 +84,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
     );
 
     // We currently don't support multi level tags, so let's only get the first level tags.
-    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
+    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags).slice(0, 1), [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
         () =>
             policyTagLists

From b638a4e00a5fab47dfde71bb4880370b368c8a23 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 10 Apr 2024 03:11:12 +0200
Subject: [PATCH 138/383] cleaning tags

---
 src/pages/workspace/tags/TagSettingsPage.tsx   | 4 ++--
 src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index a643797eac1e..3e0b8eae30ee 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -79,7 +79,7 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
                         testID={TagSettingsPage.displayName}
                     >
                         <HeaderWithBackButton
-                            title={route.params.tagName}
+                            title={PolicyUtils.getCleanedTagName(route.params.tagName)}
                             shouldShowThreeDotsButton
                             shouldSetModalVisibility={false}
                             threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
@@ -122,7 +122,7 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
                             </OfflineWithFeedback>
                             <OfflineWithFeedback pendingAction={currentPolicyTag.pendingFields?.name}>
                                 <MenuItemWithTopDescription
-                                    title={currentPolicyTag.name}
+                                    title={PolicyUtils.getCleanedTagName(currentPolicyTag.name)}
                                     description={translate(`workspace.tags.tagName`)}
                                     onPress={navigateToEditTag}
                                     shouldShowRightIcon
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 94aa28f644bb..a0ac676c173c 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -94,7 +94,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
                         const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
                         return {
                             value: tag.name,
-                            text: tag.name,
+                            text: PolicyUtils.getCleanedTagName(tag.name),
                             keyForList: tag.name,
                             isSelected: !!selectedTags[tag.name],
                             pendingAction: tag.pendingAction,

From b31929c592adce0cfd87ea952954936a3f830f81 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Wed, 10 Apr 2024 04:37:02 +0200
Subject: [PATCH 139/383] Refactoring...

---
 src/pages/workspace/tags/WorkspaceEditTagsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index 0072d37ef631..bb7f2e3eba91 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -81,7 +81,7 @@ function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps)
                                     inputID={INPUT_IDS.POLICY_TAGS_NAME}
                                     label={translate(`workspace.tags.customTagName`)}
                                     accessibilityLabel={translate(`workspace.tags.customTagName`)}
-                                    defaultValue={taglistName}
+                                    defaultValue={PolicyUtils.getCleanedTagName(taglistName)}
                                     role={CONST.ROLE.PRESENTATION}
                                     ref={inputCallbackRef}
                                 />

From 89ed46c41fbcfab91ccc51aa1afd09410094cf2f Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 9 Apr 2024 21:09:10 -0700
Subject: [PATCH 140/383] Rename Workspace to Policy

---
 src/ROUTES.ts                                    | 14 +++++++-------
 src/SCREENS.ts                                   | 16 +++++++++-------
 .../WorkspaceSettingsModalStackNavigator.tsx     |  6 +++---
 src/libs/Navigation/linkingConfig/config.ts      | 16 ++++++++--------
 src/libs/Navigation/types.ts                     |  4 ++--
 .../connections/getQuickBooksOnlineSetupLink.ts  |  2 +-
 src/pages/workspace/WorkspaceInitialPage.tsx     |  6 +++---
 ...countingPage.tsx => PolicyAccountingPage.tsx} | 10 +++++-----
 .../accounting/qbo/QuickbooksImportPage.tsx      | 10 +++++-----
 9 files changed, 43 insertions(+), 41 deletions(-)
 rename src/pages/workspace/accounting/{WorkspaceAccountingPage.tsx => PolicyAccountingPage.tsx} (97%)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 60fca9fac87b..677a7fbe2264 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -554,7 +554,7 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/members',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/members` as const,
     },
-    WORKSPACE_ACCOUNTING: {
+    POLICY_ACCOUNTING: {
         route: 'settings/workspaces/:policyID/accounting',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting` as const,
     },
@@ -698,27 +698,27 @@ const ROUTES = {
         route: 'r/:reportID/transaction/:transactionID/receipt',
         getRoute: (reportID: string, transactionID: string) => `r/${reportID}/transaction/${transactionID}/receipt` as const,
     },
-    WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT: {
+    POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import` as const,
     },
-    WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS: {
+    POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import/accounts',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/accounts` as const,
     },
-    WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES: {
+    POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import/classes',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/classes` as const,
     },
-    WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS: {
+    POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import/customers',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/customers` as const,
     },
-    WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS: {
+    POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import/locations',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/locations` as const,
     },
-    WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES: {
+    POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import/taxes',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/taxes` as const,
     },
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index b3c2012e90d2..e817bc5b4d48 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -202,6 +202,15 @@ const SCREENS = {
     },
 
     WORKSPACE: {
+        ACCOUNTING: {
+            ROOT: 'Policy_Accounting',
+            QUICKBOOKS_ONLINE_IMPORT: 'Policy_Accounting_Quickbooks_Online_Import',
+            QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS: 'Policy_Accounting_Quickbooks_Online_Import_Chart_Of_Accounts',
+            QUICKBOOKS_ONLINE_CLASSES: 'Policy_Accounting_Quickbooks_Online_Import_Classes',
+            QUICKBOOKS_ONLINE_CUSTOMERS: 'Policy_Accounting_Quickbooks_Online_Import_Customers',
+            QUICKBOOKS_ONLINE_LOCATIONS: 'Policy_Accounting_Quickbooks_Online_Import_Locations',
+            QUICKBOOKS_ONLINE_TAXES: 'Policy_Accounting_Quickbooks_Online_Import_Taxes',
+        },
         INITIAL: 'Workspace_Initial',
         PROFILE: 'Workspace_Profile',
         CARD: 'Workspace_Card',
@@ -213,7 +222,6 @@ const SCREENS = {
         INVOICES: 'Workspace_Invoices',
         TRAVEL: 'Workspace_Travel',
         MEMBERS: 'Workspace_Members',
-        ACCOUNTING: 'Workspace_Accounting',
         INVITE: 'Workspace_Invite',
         INVITE_MESSAGE: 'Workspace_Invite_Message',
         CATEGORIES: 'Workspace_Categories',
@@ -253,12 +261,6 @@ const SCREENS = {
         DISTANCE_RATES: 'Distance_Rates',
         CREATE_DISTANCE_RATE: 'Create_Distance_Rate',
         DISTANCE_RATES_SETTINGS: 'Distance_Rates_Settings',
-        QUICKBOOKS_ONLINE_IMPORT: 'Workspace_Accounting_Quickbooks_Online_Import',
-        QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS: 'Workspace_Accounting_Quickbooks_Online_Import_Chart_Of_Accounts',
-        QUICKBOOKS_ONLINE_CLASSES: 'Workspace_Accounting_Quickbooks_Online_Import_Classes',
-        QUICKBOOKS_ONLINE_CUSTOMERS: 'Workspace_Accounting_Quickbooks_Online_Import_Customers',
-        QUICKBOOKS_ONLINE_LOCATIONS: 'Workspace_Accounting_Quickbooks_Online_Import_Locations',
-        QUICKBOOKS_ONLINE_TAXES: 'Workspace_Accounting_Quickbooks_Online_Import_Taxes',
         DISTANCE_RATE_DETAILS: 'Distance_Rate_Details',
         DISTANCE_RATE_EDIT: 'Distance_Rate_Edit',
     },
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/WorkspaceSettingsModalStackNavigator.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/WorkspaceSettingsModalStackNavigator.tsx
index 2dce4247c7ae..172b62239131 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/WorkspaceSettingsModalStackNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/WorkspaceSettingsModalStackNavigator.tsx
@@ -52,9 +52,9 @@ function WorkspaceSettingsModalStackNavigator() {
             />
 
             <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.ACCOUNTING}
-                name={SCREENS.WORKSPACE.ACCOUNTING}
-                getComponent={() => require('@pages/workspace/accounting/WorkspaceAccountingPage').default as React.ComponentType}
+                key={SCREENS.WORKSPACE.ACCOUNTING.ROOT}
+                name={SCREENS.WORKSPACE.ACCOUNTING.ROOT}
+                getComponent={() => require('@pages/workspace/accounting/PolicyAccountingPage').default as React.ComponentType}
             />
 
             <StackNavigator.Screen
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index f7cdc54335ab..b8c3267b92e7 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -263,12 +263,12 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.CURRENCY]: {
                             path: ROUTES.WORKSPACE_PROFILE_CURRENCY.route,
                         },
-                        [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_IMPORT]: {path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.route},
-                        [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: {path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS.route},
-                        [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CLASSES]: {path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES.route},
-                        [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CUSTOMERS]: {path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS.route},
-                        [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_LOCATIONS]: {path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS.route},
-                        [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_TAXES]: {path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CLASSES]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CUSTOMERS]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_LOCATIONS]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_TAXES]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.route},
                         [SCREENS.WORKSPACE.DESCRIPTION]: {
                             path: ROUTES.WORKSPACE_PROFILE_DESCRIPTION.route,
                         },
@@ -662,8 +662,8 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.MEMBERS]: {
                             path: ROUTES.WORKSPACE_MEMBERS.route,
                         },
-                        [SCREENS.WORKSPACE.ACCOUNTING]: {
-                            path: ROUTES.WORKSPACE_ACCOUNTING.route,
+                        [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: {
+                            path: ROUTES.POLICY_ACCOUNTING.route,
                         },
                         [SCREENS.WORKSPACE.CATEGORIES]: {
                             path: ROUTES.WORKSPACE_CATEGORIES.route,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index ed34b8ee3856..ff4bdf9c706c 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -628,7 +628,7 @@ type WorkspacesCentralPaneNavigatorParamList = {
     [SCREENS.WORKSPACE.MEMBERS]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.ACCOUNTING]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: {
         policyID: string;
     };
     [SCREENS.WORKSPACE.CATEGORIES]: {
@@ -647,7 +647,7 @@ type WorkspacesCentralPaneNavigatorParamList = {
     [SCREENS.WORKSPACE.DISTANCE_RATES]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.ACCOUNTING]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: {
         policyID: string;
     };
 };
diff --git a/src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts b/src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts
index a93ebbdae9b2..d130675ceab2 100644
--- a/src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts
+++ b/src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts
@@ -3,7 +3,7 @@ import CONFIG from '@src/CONFIG';
 import ROUTES from '@src/ROUTES';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
-    const callbackPath = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID)}`;
+    const callbackPath = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}`;
     const params = new URLSearchParams({callbackPath, policyID});
     const commandURL = getCommandURL({command: 'ConnectToQuickbooksOnline'});
 
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 2e9094f565de..ce43a7d3b332 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -43,7 +43,7 @@ type WorkspaceMenuItem = {
     icon: IconAsset;
     action: () => void;
     brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
-    routeName?: ValueOf<typeof SCREENS.WORKSPACE>;
+    routeName?: ValueOf<typeof SCREENS.WORKSPACE> | ValueOf<typeof SCREENS.WORKSPACE.ACCOUNTING>;
 };
 
 type WorkspaceInitialPageOnyxProps = {
@@ -204,10 +204,10 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, policyMembers, r
         protectedCollectPolicyMenuItems.push({
             translationKey: 'workspace.common.accounting',
             icon: Expensicons.Sync,
-            action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID)))),
+            action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING.getRoute(policyID)))),
             // brickRoadIndicator should be set when API will be ready
             brickRoadIndicator: undefined,
-            routeName: SCREENS.WORKSPACE.ACCOUNTING,
+            routeName: SCREENS.WORKSPACE.ACCOUNTING.ROOT,
         });
     }
 
diff --git a/src/pages/workspace/accounting/WorkspaceAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
similarity index 97%
rename from src/pages/workspace/accounting/WorkspaceAccountingPage.tsx
rename to src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 6fada466e2bb..cb38faf214c0 100644
--- a/src/pages/workspace/accounting/WorkspaceAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -28,7 +28,7 @@ import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
-function WorkspaceAccountingPage({policy}: WithPolicyProps) {
+function PolicyAccountingPage({policy}: WithPolicyProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -143,7 +143,7 @@ function WorkspaceAccountingPage({policy}: WithPolicyProps) {
                           shouldShowRightIcon: true,
                           title: translate('workspace.accounting.import'),
                           wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          onPress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
+                          onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
                       },
                       {
                           icon: Expensicons.Send,
@@ -189,7 +189,7 @@ function WorkspaceAccountingPage({policy}: WithPolicyProps) {
                     featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
                 >
                     <ScreenWrapper
-                        testID={WorkspaceAccountingPage.displayName}
+                        testID={PolicyAccountingPage.displayName}
                         includeSafeAreaPaddingBottom={false}
                         shouldShowOfflineIndicatorInWideScreen
                     >
@@ -235,6 +235,6 @@ function WorkspaceAccountingPage({policy}: WithPolicyProps) {
     );
 }
 
-WorkspaceAccountingPage.displayName = 'WorkspaceAccountingPage';
+PolicyAccountingPage.displayName = 'PolicyAccountingPage';
 
-export default withPolicy(WorkspaceAccountingPage);
+export default withPolicy(PolicyAccountingPage);
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksImportPage.tsx
index 531b413c9d08..c5003dcdd246 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksImportPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksImportPage.tsx
@@ -32,35 +32,35 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
     const sections = [
         {
             description: translate('workspace.qbo.accounts'),
-            action: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS.getRoute(policyID)),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS.getRoute(policyID)),
             hasError: Boolean(policy?.errors?.enableNewCategories),
             title: enableNewCategories,
             pendingAction: pendingFields?.enableNewCategories,
         },
         {
             description: translate('workspace.qbo.classes'),
-            action: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES.getRoute(policyID)),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES.getRoute(policyID)),
             hasError: Boolean(policy?.errors?.syncClasses),
             title: syncClasses,
             pendingAction: pendingFields?.syncClasses,
         },
         {
             description: translate('workspace.qbo.customers'),
-            action: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS.getRoute(policyID)),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS.getRoute(policyID)),
             hasError: Boolean(policy?.errors?.syncCustomers),
             title: syncCustomers,
             pendingAction: pendingFields?.syncCustomers,
         },
         {
             description: translate('workspace.qbo.locations'),
-            action: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS.getRoute(policyID)),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS.getRoute(policyID)),
             hasError: Boolean(policy?.errors?.syncLocations),
             title: syncLocations,
             pendingAction: pendingFields?.syncLocations,
         },
         {
             description: translate('workspace.qbo.taxes'),
-            action: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)),
             hasError: Boolean(policy?.errors?.syncTaxes),
             title: syncTaxes,
             pendingAction: pendingFields?.syncTaxes,

From 2d8185e63f71a11383e2dc121117bbc1570bbfee Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 9 Apr 2024 21:17:36 -0700
Subject: [PATCH 141/383] Update QBO Setup button

---
 .../index.native.tsx                          | 91 +++++++++++++------
 .../ConnectToQuickbooksOnlineButton/index.tsx |  3 +-
 .../actions/connections/QuickBooksOnline.ts   |  8 +-
 3 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index 6bffaa1f607c..e29206fd4f5b 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -1,42 +1,81 @@
-import React, {useState} from 'react';
-import {Button, Modal} from 'react-native';
-import WebView from 'react-native-webview';
-import {useSession} from '@components/OnyxProvider';
-import useEnvironment from '@hooks/useEnvironment';
+import React, {useCallback, useRef, useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import type {WebViewNavigation} from 'react-native-webview';
+import {WebView} from 'react-native-webview';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import Button from '@components/Button';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import Modal from '@components/Modal';
 import useLocalize from '@hooks/useLocalize';
 import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Session} from '@src/types/onyx';
 import type {ConnectToQuickbooksOnlineButtonProps} from './types';
 
-function ConnectToQuickbooksOnlineButton({policyID}: ConnectToQuickbooksOnlineButtonProps) {
+type ConnectToQuickbooksOnlineButtonOnyxProps = {
+    /** Session info for the currently logged in user. */
+    session: OnyxEntry<Session>;
+};
+
+const renderLoading = () => <FullScreenLoadingIndicator />;
+
+function ConnectToQuickbooksOnlineButton({policyID, session}: ConnectToQuickbooksOnlineButtonProps & ConnectToQuickbooksOnlineButtonOnyxProps) {
     const [isWebViewOpen, setWebViewOpen] = useState<boolean>(false);
-    const session = useSession();
+    const [isQuickbooksOnlineReady, setIsQuickbooksOnlineReady] = useState<boolean>(false);
     const {translate} = useLocalize();
-    const {environmentURL} = useEnvironment();
+    const webViewRef = useRef<WebView>(null);
+    const authToken = session?.authToken ?? null;
+
+    const handleNavigationStateChange = useCallback(({url, loading}: WebViewNavigation) => {
+        if (loading || !url.startsWith('https://accounts.intuit.com/app/sign-in')) {
+            return;
+        }
+        setIsQuickbooksOnlineReady(true);
+    }, []);
 
     return (
         <>
             <Button
                 onPress={() => setWebViewOpen(true)}
-                title={translate('workspace.accounting.setup')}
+                text={translate('workspace.accounting.setup')}
             />
-            <Modal
-                onDismiss={() => setWebViewOpen(false)}
-                presentationStyle="fullScreen"
-                visible={isWebViewOpen}
-            >
-                <WebView
-                    source={{
-                        uri: `${environmentURL}${getQuickBooksOnlineSetupLink(policyID)}`,
-                        headers: {
-                            Cookie: `authToken=${session.authToken}`,
-                        },
-                    }}
-                    incognito
-                    startInLoadingState={false}
-                />
-            </Modal>
+            {isWebViewOpen && (
+                <FullPageOfflineBlockingView>
+                    <Modal
+                        onClose={() => {
+                            setWebViewOpen(false);
+                            setIsQuickbooksOnlineReady(false);
+                        }}
+                        fullscreen
+                        isVisible
+                        type="centered"
+                    >
+                        {!isQuickbooksOnlineReady && <FullScreenLoadingIndicator />}
+                        <WebView
+                            ref={webViewRef}
+                            source={{
+                                uri: getQuickBooksOnlineSetupLink(policyID),
+                                headers: {
+                                    Cookie: `authToken=${authToken}`,
+                                },
+                            }}
+                            incognito // 'incognito' prop required for Android, issue here https://github.com/react-native-webview/react-native-webview/issues/1352
+                            startInLoadingState={false}
+                            renderLoading={renderLoading}
+                            onNavigationStateChange={handleNavigationStateChange}
+                        />
+                    </Modal>
+                </FullPageOfflineBlockingView>
+            )}
         </>
     );
 }
 
-export default ConnectToQuickbooksOnlineButton;
+ConnectToQuickbooksOnlineButton.displayName = 'ConnectToQuickbooksOnlineButton';
+
+export default withOnyx<ConnectToQuickbooksOnlineButtonProps & ConnectToQuickbooksOnlineButtonOnyxProps, ConnectToQuickbooksOnlineButtonOnyxProps>({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(ConnectToQuickbooksOnlineButton);
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index b77a42aca5b1..6f9ba241dd13 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -9,11 +9,10 @@ import type {ConnectToQuickbooksOnlineButtonProps} from './types';
 function ConnectToQuickbooksOnlineButton({policyID}: ConnectToQuickbooksOnlineButtonProps) {
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
-
     return (
         <Button
             onPress={() => {
-                Link.openLink(`${environmentURL}${getQuickBooksOnlineSetupLink(policyID)}`, environmentURL, false);
+                Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL, false);
             }}
             text={translate('workspace.accounting.setup')}
         />
diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index b27100290413..6bfb2ea5b182 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -1,11 +1,9 @@
 import {getCommandURL} from '@libs/ApiUtils';
-import CONFIG from '@src/CONFIG';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
-    const callbackPath = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}/workspace/${policyID}/accounting`;
-    const otherParams = new URLSearchParams({callbackPath, policyID}).toString();
-    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'});
-    return `${commandURL}&${otherParams}`;
+    const otherParams = new URLSearchParams({policyID}).toString();
+    const commandUrl = `${getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'})}&${otherParams}`;
+    return commandUrl;
 }
 
 // More action functions will be added later

From 3c5896dee6a3db006ead82314557f378bb3c002f Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 9 Apr 2024 21:37:29 -0700
Subject: [PATCH 142/383] WIP: Connect accounting page to sync progress /
 update types

---
 src/CONST.ts                                  |  6 +-
 src/ONYXKEYS.ts                               |  2 +-
 .../accounting/PolicyAccountingPage.tsx       | 67 ++++++++-----------
 src/types/onyx/Policy.ts                      |  1 -
 .../WorkspaceIntegrationImportProgress.ts     |  6 --
 src/types/onyx/index.ts                       |  2 -
 6 files changed, 31 insertions(+), 53 deletions(-)
 delete mode 100644 src/types/onyx/WorkspaceIntegrationImportProgress.ts

diff --git a/src/CONST.ts b/src/CONST.ts
index b07b622cec05..cf99b4475733 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1589,11 +1589,6 @@ const CONST = {
             GENERAL_SETTINGS: 'generalSettings',
         },
         CONNECTIONS: {
-            SYNC_STATUS: {
-                STARTING: 'starting',
-                FINISHED: 'finished',
-                PROGRESS: 'progress',
-            },
             NAME: {
                 // Here we will add other connections names when we add support for them
                 QBO: 'quickbooksOnline',
@@ -1608,6 +1603,7 @@ const CONST = {
                 QBO_PROCESSING: 'quickbooksOnlineImportProcessing',
                 QBO_PAYMENTS: 'quickbooksOnlineSyncBillPayments',
                 QBO_TAX_CODES: 'quickbooksOnlineSyncTaxCodes',
+                JOB_DONE: 'jobDone',
             },
         },
     },
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 5f74e3a971a5..3703783ee417 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -524,7 +524,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
-    [ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS]: OnyxTypes.WorkspaceIntegrationImportProgress;
+    [ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS]: OnyxTypes.PolicyConnectionSyncProgress;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT]: string;
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index cb38faf214c0..db65d6664b6e 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -1,8 +1,7 @@
 import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
-// import ConnectToQuickbooksOnlineButton from './qboConnectionButton';
-import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
+import ConnectToQuickbooksOnlineButton from '@components/ConnectToQuickbooksOnlineButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
@@ -22,41 +21,40 @@ import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
-import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
+import type { OnyxEntry } from 'react-native-onyx';
+import { withOnyx } from 'react-native-onyx';
+import type { Policy, PolicyConnectionSyncProgress } from '@src/types/onyx';
+import type { WithPolicyAndFullscreenLoadingProps } from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import ONYXKEYS from '@src/ONYXKEYS';
 
-function PolicyAccountingPage({policy}: WithPolicyProps) {
+type PolicyAccountingPageOnyxProps = {
+    /** From Onyx */
+    /** Bank account attached to free plan */
+    connectionSyncProgress: OnyxEntry<PolicyConnectionSyncProgress>;
+};
+
+type PolicyAccountingPageProps = WithPolicyAndFullscreenLoadingProps & PolicyAccountingPageOnyxProps & {
+    /** Policy values needed in the component */
+    policy: OnyxEntry<Policy>;
+};
+
+function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccountingPageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    // const {environmentURL} = useEnvironment();
     // const waitForNavigate = useWaitForNavigation();
     const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
-
     const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
-
-    // TODO
-    const [policyIsConnectedToAccountingSystem, setPolicyIsConnectedToAccountingSystem] = useState(false);
-
-    // TODO
-    const [isSyncInProgress, setIsSyncInProgress] = useState(false);
-
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
     const threeDotsMenuContainerRef = useRef<View>(null);
+    const isSyncInProgress = connectionSyncProgress?.stageInProgress && connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE;
 
     const policyID = policy?.id ?? '';
 
-    // TODO remove
-    // fake a QBO connection sync
-    const openQBOsync = useCallback(() => {
-        setIsSyncInProgress(true);
-        setTimeout(() => setIsSyncInProgress(false), 5000);
-        setPolicyIsConnectedToAccountingSystem(true);
-    }, []);
-
     const connectionsMenuItems: MenuItemProps[] = useMemo(
         () => [
             {
@@ -66,23 +64,10 @@ function PolicyAccountingPage({policy}: WithPolicyProps) {
                 wrapperStyle: [styles.sectionMenuItemTopDescription],
                 shouldShowRightComponent: true,
                 title: translate('workspace.accounting.qbo'),
-                rightComponent: (
-                    // TODO use ConnectToQuickbooksOnlineButton instead
-                    // <ConnectToQuickbooksOnlineButton
-                    //     policyID={policyID}
-                    //     environmentURL={environmentURL}
-                    // />
-
-                    <Button
-                        onPress={openQBOsync}
-                        text={translate('workspace.accounting.setup')}
-                        style={styles.justifyContentCenter}
-                        small
-                    />
-                ),
+                rightComponent: <ConnectToQuickbooksOnlineButton policyID={policyID} />,
             },
         ],
-        [styles.sectionMenuItemTopDescription, translate, openQBOsync, styles.justifyContentCenter],
+        [styles.sectionMenuItemTopDescription, translate, isSyncInProgress, styles.justifyContentCenter],
     );
 
     const overflowMenu: ThreeDotsMenuProps['menuItems'] = useMemo(
@@ -237,4 +222,10 @@ function PolicyAccountingPage({policy}: WithPolicyProps) {
 
 PolicyAccountingPage.displayName = 'PolicyAccountingPage';
 
-export default withPolicy(PolicyAccountingPage);
+export default withPolicyAndFullscreenLoading(
+    withOnyx<PolicyAccountingPageProps, PolicyAccountingPageOnyxProps>({
+        connectionSyncProgress: {
+            key: (props) => `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${props.route.params.policyID}`,
+        },
+    })(PolicyAccountingPage),
+);
\ No newline at end of file
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index a21e98f4bfec..ab07dddec5ac 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -444,7 +444,6 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
 type PolicyConnectionSyncStage = ValueOf<typeof CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME>;
 type PolicyConnectionName = ValueOf<typeof CONST.POLICY.CONNECTIONS.NAME>;
 type PolicyConnectionSyncProgress = {
-    status: ValueOf<typeof CONST.POLICY.CONNECTIONS.SYNC_STATUS>;
     stageInProgress: PolicyConnectionSyncStage;
     connectionName: PolicyConnectionName;
 };
diff --git a/src/types/onyx/WorkspaceIntegrationImportProgress.ts b/src/types/onyx/WorkspaceIntegrationImportProgress.ts
deleted file mode 100644
index 0d1845402772..000000000000
--- a/src/types/onyx/WorkspaceIntegrationImportProgress.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-type WorkspaceIntegrationImportProgress = {
-    stageInProgress: string | null;
-    connectionName: 'quickbooksOnline';
-};
-
-export default WorkspaceIntegrationImportProgress;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 4dd31f30bd6f..f6d96a2ee85e 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -79,7 +79,6 @@ import type WalletOnfido from './WalletOnfido';
 import type WalletStatement from './WalletStatement';
 import type WalletTerms from './WalletTerms';
 import type WalletTransfer from './WalletTransfer';
-import type WorkspaceIntegrationImportProgress from './WorkspaceIntegrationImportProgress';
 import type WorkspaceRateAndUnit from './WorkspaceRateAndUnit';
 
 export type {
@@ -109,7 +108,6 @@ export type {
     Modal,
     Network,
     OnyxUpdateEvent,
-    WorkspaceIntegrationImportProgress,
     OnyxUpdatesFromServer,
     PersonalBankAccount,
     PersonalDetails,

From a4c72ec77cac52c363c381f3e24c2b9ce06405fd Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 10 Apr 2024 10:00:14 +0200
Subject: [PATCH 143/383] Fix bug with paddingTop on RoleModal

---
 .../members/WorkspaceMemberDetailsRoleSelectionModal.tsx     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx
index 9613a697013e..f1d4334f7069 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx
@@ -43,7 +43,10 @@ function WorkspaceMemberDetailsRoleSelectionModal({isVisible, items, onRoleChang
             hideModalContentWhileAnimating
             useNativeDriver
         >
-            <ScreenWrapper testID={WorkspaceMemberDetailsRoleSelectionModal.displayName}>
+            <ScreenWrapper
+                testID={WorkspaceMemberDetailsRoleSelectionModal.displayName}
+                includePaddingTop={false}
+            >
                 <HeaderWithBackButton
                     title={translate('common.role')}
                     onBackButtonPress={onClose}

From ca7c6aabf6fdd44db08eb3bf78fa9c8d22f8be15 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 10 Apr 2024 16:43:50 +0800
Subject: [PATCH 144/383] remove the workaround

---
 .../ReportActionCompose/SuggestionMention.tsx    | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 8496d0895434..91a6b57f6ced 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -57,7 +57,6 @@ function SuggestionMention(
 
     // Used to store the selection index of the last inserted mention
     const suggestionInsertionIndexRef = useRef<number | null>(null);
-    const calculateMentionSuggestionRef = useRef<(selectionEnd: number) => void>();
 
     // Used to detect if the selection has changed since the last suggestion insertion
     // If so, we reset the suggestionInsertionIndexRef
@@ -267,15 +266,11 @@ function SuggestionMention(
         [getMentionOptions, personalDetails, resetSuggestions, setHighlightedMentionIndex, value, isComposerFocused],
     );
 
-    useEffect(() => {
-        calculateMentionSuggestionRef.current = calculateMentionSuggestion;
-    }, [calculateMentionSuggestion]);
-
     useEffect(() => {
         if (!isComposerFocused) {
             return;
         }
-        calculateMentionSuggestionRef.current?.(selection.end);
+        calculateMentionSuggestion(selection.end);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isComposerFocused]);
 
@@ -304,14 +299,9 @@ function SuggestionMention(
              * because in other case calculateEmojiSuggestion will have an old calculation value
              * of suggestion instead of current one
              */
-            const selectionEnd = e.nativeEvent.selection.end;
-            // On iOS, onSelectionChange is called before onChangeText, so it's possible we calculate the mention suggestion with a new selection value but with an old composer value
-            // We use setTimeout to delay the calculation so both selection and value is matched correctly
-            setTimeout(() => {
-                calculateMentionSuggestionRef.current?.(selectionEnd);
-            }, 1);
+            calculateMentionSuggestion(e.nativeEvent.selection.end)
         },
-        [],
+        [calculateMentionSuggestion],
     );
 
     useImperativeHandle(

From a33064da2a9e5106df7c440b11f1e0a8398d8253 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 10 Apr 2024 16:53:16 +0800
Subject: [PATCH 145/383] prettier

---
 src/pages/home/report/ReportActionCompose/SuggestionMention.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 91a6b57f6ced..7905d55247bb 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -299,7 +299,7 @@ function SuggestionMention(
              * because in other case calculateEmojiSuggestion will have an old calculation value
              * of suggestion instead of current one
              */
-            calculateMentionSuggestion(e.nativeEvent.selection.end)
+            calculateMentionSuggestion(e.nativeEvent.selection.end);
         },
         [calculateMentionSuggestion],
     );

From 751e9a705b4eb684669afa4f3d38839551c3b49e Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 10 Apr 2024 16:08:12 +0700
Subject: [PATCH 146/383] fix thread shows expensify.sms in header

---
 src/libs/ReportUtils.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 85f5c414dbe4..d22ac77bcb09 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2871,10 +2871,16 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         }
 
         const isAttachment = ReportActionsUtils.isReportActionAttachment(!isEmptyObject(parentReportAction) ? parentReportAction : null);
+        const parser = new ExpensiMark();
         const parentReportActionMessage = (
             ReportActionsUtils.isApprovedOrSubmittedReportAction(parentReportAction)
                 ? ReportActionsUtils.getReportActionMessageText(parentReportAction)
-                : parentReportAction?.message?.[0]?.text ?? ''
+                : parser.htmlToText(
+                      (parentReportAction?.message?.[0]?.html ?? '').replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, function (match, openTag, content, closeTag) {
+                          content = Str.removeSMSDomain(content);
+                          return openTag + content + closeTag;
+                      }),
+                  )
         ).replace(/(\r\n|\n|\r)/gm, ' ');
         if (isAttachment && parentReportActionMessage) {
             return `[${Localize.translateLocal('common.attachment')}]`;

From b84da76c5c3bc20ccf8a1fa43bae62220385f4f7 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 10 Apr 2024 16:24:56 +0700
Subject: [PATCH 147/383] fix lint

---
 src/libs/ReportUtils.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index d22ac77bcb09..128d105b4d7f 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2876,9 +2876,9 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
             ReportActionsUtils.isApprovedOrSubmittedReportAction(parentReportAction)
                 ? ReportActionsUtils.getReportActionMessageText(parentReportAction)
                 : parser.htmlToText(
-                      (parentReportAction?.message?.[0]?.html ?? '').replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, function (match, openTag, content, closeTag) {
-                          content = Str.removeSMSDomain(content);
-                          return openTag + content + closeTag;
+                      (parentReportAction?.message?.[0]?.html ?? '').replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag, content, closeTag) => {
+                          const innerContent = Str.removeSMSDomain(content);
+                          return openTag + innerContent + closeTag;
                       }),
                   )
         ).replace(/(\r\n|\n|\r)/gm, ' ');

From c0e80f7d1e43a9ca5eae47fc185ad4cd06cc2ae2 Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Wed, 10 Apr 2024 16:58:04 +0200
Subject: [PATCH 148/383] Add Track functionality

---
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 852274a25749..36eb630fb931 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -182,7 +182,10 @@ function FloatingActionButtonAndPopover(
                 Task.clearOutTaskInfoAndNavigate(quickAction?.chatReportID, quickActionReport, quickAction.targetAccountID ?? 0);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_MANUAL:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.REQUEST, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.MANUAL);
+                IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK_EXPENSE, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.MANUAL);
+                break;
+            case CONST.QUICK_ACTIONS.TRACK_SCAN:
+                IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK_EXPENSE, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.SCAN);
                 break;
             default:
         }

From cfdfca18de9a5bcb07806f829884ca397f921be3 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 11 Apr 2024 01:19:57 +0530
Subject: [PATCH 149/383] fix conflicts

---
 .../request/step/IOURequestStepCategory.tsx   | 24 ++++++++++++++++++-
 .../step/withFullTransactionOrNotFound.tsx    |  2 +-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index 26b918e0c999..0a9a3e4ac36c 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -1,5 +1,5 @@
 import lodashIsEmpty from 'lodash/isEmpty';
-import React from 'react';
+import React, {useEffect} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import CategoryPicker from '@components/CategoryPicker';
@@ -7,6 +7,7 @@ import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useNetwork from '@hooks/useNetwork';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -14,8 +15,10 @@ import * as TransactionUtils from '@libs/TransactionUtils';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {Policy, PolicyCategories, PolicyTagList, ReportActions, Session, Transaction} from '@src/types/onyx';
+import * as PolicyActions from '@userActions/Policy';
 import StepScreenWrapper from './StepScreenWrapper';
 import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
@@ -77,6 +80,20 @@ function IOURequestStepCategory({
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage = !shouldShowCategory || (isEditing && (isSplitBill ? !canEditSplitBill : !ReportUtils.canEditMoneyRequest(reportAction)));
 
+    const fetchData = () => {
+        if (policy && policyCategories) {
+            return;
+        }
+
+        PolicyActions.openDraftWorkspaceRequest(report?.policyID ?? '');
+    };
+    useNetwork({onReconnect: fetchData});
+
+    useEffect(() => {
+        fetchData();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
     const navigateBack = () => {
         Navigation.goBack(backTo);
     };
@@ -103,6 +120,11 @@ function IOURequestStepCategory({
 
         IOU.setMoneyRequestCategory(transactionID, updatedCategory);
 
+        if (action === CONST.IOU.ACTION.CATEGORIZE) {
+            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report.reportID));
+            return;
+        }
+
         navigateBack();
     };
 
diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
index 3d741725032b..20589cb3c16b 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
@@ -63,7 +63,7 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
                 const transactionID = route.params.transactionID ?? 0;
                 const userAction = 'action' in route.params && route.params.action ? route.params.action : CONST.IOU.ACTION.CREATE;
 
-                if (userAction === CONST.IOU.ACTION.CREATE) {
+                if(userAction === CONST.IOU.ACTION.CREATE || userAction === CONST.IOU.ACTION.MOVE ||  userAction === CONST.IOU.ACTION.CATEGORIZE || userAction === CONST.IOU.ACTION.SHARE) {
                     return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`;
                 }
                 return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;

From a998fac850f115d215b2a75bd217d7d0fd0ab71b Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 11 Apr 2024 01:34:23 +0530
Subject: [PATCH 150/383] fix type and lint checks

---
 src/libs/IOUUtils.ts                          | 26 +++++++++++++++++--
 src/libs/actions/IOU.ts                       |  4 +--
 ...yForRefactorRequestParticipantsSelector.js |  3 ++-
 .../request/step/IOURequestStepCategory.tsx   |  6 ++---
 .../iou/request/step/IOURequestStepDate.tsx   |  2 +-
 .../step/IOURequestStepDescription.tsx        |  3 ++-
 .../step/IOURequestStepParticipants.tsx       |  2 +-
 .../step/withFullTransactionOrNotFound.tsx    |  3 ++-
 8 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index a920a8dab86c..b2553d12ea95 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -8,7 +8,13 @@ import * as CurrencyUtils from './CurrencyUtils';
 import Navigation from './Navigation/Navigation';
 import * as TransactionUtils from './TransactionUtils';
 
-function navigateToStartMoneyRequestStep(requestType: IOURequestType, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, iouAction?: ValueOf<typeof CONST.IOU.ACTION>): void {
+function navigateToStartMoneyRequestStep(
+    requestType: IOURequestType,
+    iouType: ValueOf<typeof CONST.IOU.TYPE>,
+    transactionID: string,
+    reportID: string,
+    iouAction?: ValueOf<typeof CONST.IOU.ACTION>,
+): void {
     if (iouAction === CONST.IOU.ACTION.CATEGORIZE || iouAction === CONST.IOU.ACTION.MOVE) {
         Navigation.goBack();
         return;
@@ -128,4 +134,20 @@ function insertTagIntoTransactionTagsString(transactionTags: string, tag: string
     return tagArray.join(CONST.COLON).replace(/:*$/, '');
 }
 
-export {calculateAmount, updateIOUOwnerAndTotal, isIOUReportPendingCurrencyConversion, isValidMoneyRequestType, navigateToStartMoneyRequestStep, insertTagIntoTransactionTagsString};
+function isMovingTransactionFromTrackExpense(action: ValueOf<typeof CONST.IOU.ACTION>) {
+    if (action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE) {
+        return true;
+    }
+
+    return false;
+}
+
+export {
+    calculateAmount,
+    updateIOUOwnerAndTotal,
+    isIOUReportPendingCurrencyConversion,
+    isValidMoneyRequestType,
+    navigateToStartMoneyRequestStep,
+    insertTagIntoTransactionTagsString,
+    isMovingTransactionFromTrackExpense,
+};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 38d0fbaf3ac8..9b6bc7046517 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2681,7 +2681,7 @@ function requestMoney(
     const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report?.chatReportID) : report;
     const moneyRequestReportID = isMoneyRequestReport ? report?.reportID : '';
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
-    const isMovingTransactionFromTrackExpense = action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE;
+    const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
 
     const {
         payerAccountID,
@@ -2813,7 +2813,7 @@ function requestMoney(
     }
 
     if (action === CONST.IOU.ACTION.SHARE) {
-        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? ''))
+        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? ''));
     } else {
         Navigation.dismissModal(activeReportID);
     }
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 227e32098cd8..3dc1fb15af96 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -286,7 +286,8 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
     // canUseP2PDistanceRequests is true if the iouType is track expense, but we don't want to allow splitting distance with track expense yet
     const isAllowedToSplit =
-        (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE || ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(iouAction));
+        (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
+        (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE || ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(iouAction));
 
     const handleConfirmSelection = useCallback(
         (keyEvent, option) => {
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index 0a9a3e4ac36c..e0c6f84bc4f6 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -6,19 +6,19 @@ import CategoryPicker from '@components/CategoryPicker';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
 import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import * as IOU from '@userActions/IOU';
+import * as PolicyActions 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 {Policy, PolicyCategories, PolicyTagList, ReportActions, Session, Transaction} from '@src/types/onyx';
-import * as PolicyActions from '@userActions/Policy';
 import StepScreenWrapper from './StepScreenWrapper';
 import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
@@ -121,7 +121,7 @@ function IOURequestStepCategory({
         IOU.setMoneyRequestCategory(transactionID, updatedCategory);
 
         if (action === CONST.IOU.ACTION.CATEGORIZE) {
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report.reportID));
+            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report?.reportID));
             return;
         }
 
diff --git a/src/pages/iou/request/step/IOURequestStepDate.tsx b/src/pages/iou/request/step/IOURequestStepDate.tsx
index 6005d2728504..1b108b8f3597 100644
--- a/src/pages/iou/request/step/IOURequestStepDate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDate.tsx
@@ -79,7 +79,7 @@ function IOURequestStepDate({
             return;
         }
 
-        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE;
+        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || IOUUtils.isMovingTransactionFromTrackExpense(action);
 
         IOU.setMoneyRequestCreated(transaction?.transactionID ?? '0', newCreated, isTransactionDraft);
 
diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx
index a7f19d2d8776..410fd24aa488 100644
--- a/src/pages/iou/request/step/IOURequestStepDescription.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx
@@ -12,6 +12,7 @@ import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
@@ -124,7 +125,7 @@ function IOURequestStepDescription({
             navigateBack();
             return;
         }
-        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE;
+        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || IOUUtils.isMovingTransactionFromTrackExpense(action);
 
         IOU.setMoneyRequestDescription(transaction?.transactionID ?? '0', newComment, isTransactionDraft);
 
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
index 85d46478aec2..930cdde4ee1a 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -76,7 +76,7 @@ function IOURequestStepParticipants({
             return;
         }
         IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename ?? '', receiptPath ?? '', () => {}, iouRequestType, iouType, transactionID, reportID, receiptType ?? '');
-    }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID, iouAction])
+    }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID, iouAction]);
 
     const updateRouteParams = useCallback(() => {
         const navigationState = navigation.getState();
diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
index 20589cb3c16b..5aedc1456522 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
@@ -6,6 +6,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
+import * as IOUUtils from '@libs/IOUUtils';
 import type {MoneyRequestNavigatorParamList} from '@libs/Navigation/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -63,7 +64,7 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
                 const transactionID = route.params.transactionID ?? 0;
                 const userAction = 'action' in route.params && route.params.action ? route.params.action : CONST.IOU.ACTION.CREATE;
 
-                if(userAction === CONST.IOU.ACTION.CREATE || userAction === CONST.IOU.ACTION.MOVE ||  userAction === CONST.IOU.ACTION.CATEGORIZE || userAction === CONST.IOU.ACTION.SHARE) {
+                if (userAction === CONST.IOU.ACTION.CREATE || IOUUtils.isMovingTransactionFromTrackExpense(userAction)) {
                     return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`;
                 }
                 return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;

From 78bd97422839fa8ee108d88c8f2e4d331f425187 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 13:05:47 -0700
Subject: [PATCH 151/383] Refactor connection actions. Add remove connection
 code.

---
 .../RemovePolicyConnectionParams.ts           |   8 +
 src/libs/API/parameters/index.ts              |   1 +
 src/libs/API/types.ts                         |   2 +
 src/libs/actions/Policy.ts                    |  72 -------
 .../getQuickBooksOnlineSetupLink.ts           |  13 --
 src/libs/actions/connections/index.ts         | 112 +++++++++++
 .../accounting/PolicyAccountingPage.tsx       | 176 +++++++++---------
 src/types/onyx/Policy.ts                      |   1 +
 8 files changed, 215 insertions(+), 170 deletions(-)
 create mode 100644 src/libs/API/parameters/RemovePolicyConnectionParams.ts
 delete mode 100644 src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts
 create mode 100644 src/libs/actions/connections/index.ts

diff --git a/src/libs/API/parameters/RemovePolicyConnectionParams.ts b/src/libs/API/parameters/RemovePolicyConnectionParams.ts
new file mode 100644
index 000000000000..5e5e2c1189d2
--- /dev/null
+++ b/src/libs/API/parameters/RemovePolicyConnectionParams.ts
@@ -0,0 +1,8 @@
+import type { PolicyConnectionName } from "@src/types/onyx/Policy";
+
+type RemovePolicyConnectionParams = {
+    policyID: string;
+    connectionName: PolicyConnectionName;
+};
+
+export default RemovePolicyConnectionParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 6f5505b263fb..46944c1d16d1 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -198,4 +198,5 @@ export type {default as SetPolicyCustomTaxNameParams} from './SetPolicyCustomTax
 export type {default as SetPolicyForeignCurrencyDefaultParams} from './SetPolicyForeignCurrencyDefaultParams';
 export type {default as SetPolicyCurrencyDefaultParams} from './SetPolicyCurrencyDefaultParams';
 export type {default as UpdatePolicyConnectionConfigParams} from './UpdatePolicyConnectionConfigParams';
+export type {default as RemovePolicyConnectionParams} from './RemovePolicyConnectionParams';
 export type {default as RenamePolicyTaxParams} from './RenamePolicyTaxParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index fc19ba60693c..ed199553b90a 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -186,6 +186,7 @@ const WRITE_COMMANDS = {
     DECLINE_JOIN_REQUEST: 'DeclineJoinRequest',
     CREATE_POLICY_TAX: 'CreatePolicyTax',
     UPDATE_POLICY_CONNECTION_CONFIG: 'UpdatePolicyConnectionConfig',
+    REMOVE_POLICY_CONNECTION: 'RemovePolicyConnection',
     SET_POLICY_TAXES_ENABLED: 'SetPolicyTaxesEnabled',
     DELETE_POLICY_TAXES: 'DeletePolicyTaxes',
     UPDATE_POLICY_TAX_VALUE: 'UpdatePolicyTaxValue',
@@ -391,6 +392,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_UNIT]: Parameters.SetPolicyDistanceRatesUnitParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY]: Parameters.SetPolicyDistanceRatesDefaultCategoryParams;
     [WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG]: Parameters.UpdatePolicyConnectionConfigParams;
+    [WRITE_COMMANDS.REMOVE_POLICY_CONNECTION]: Parameters.UpdatePolicyConnectionConfigParams;
     [WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED]: Parameters.SetPolicyDistanceRatesEnabledParams;
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index d6ab203e85a4..d99ccccf1596 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -3721,77 +3721,6 @@ function openPolicyDistanceRatesPage(policyID?: string) {
     API.read(READ_COMMANDS.OPEN_POLICY_DISTANCE_RATES_PAGE, params);
 }
 
-function updatePolicyConnectionConfig(policyID: string, settingName: ValueOf<typeof CONST.QUICK_BOOKS_IMPORTS>, settingValue: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>) {
-    const parameters = {policyID, connectionName: CONST.QUICK_BOOKS_ONLINE, settingName, settingValue, idempotencyKey: settingName};
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                connections: {
-                    quickbooksOnline: {
-                        config: {
-                            [settingName]: settingValue,
-                            pendingFields: {
-                                [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                            },
-                            errorFields: {
-                                [settingName]: null,
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                connections: {
-                    quickbooksOnline: {
-                        config: {
-                            [settingName]: settingValue,
-                            pendingFields: {
-                                [settingName]: null,
-                            },
-                            errorFields: {
-                                [settingName]: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage'),
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                connections: {
-                    quickbooksOnline: {
-                        config: {
-                            [settingName]: settingValue,
-                            pendingFields: {
-                                [settingName]: null,
-                            },
-                            errorFields: {
-                                [settingName]: null,
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    API.write(WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG, parameters, {optimisticData, failureData, successData});
-}
-
 function navigateWhenEnableFeature(policyID: string, featureRoute: Route) {
     const isNarrowLayout = getIsNarrowLayout();
     if (isNarrowLayout) {
@@ -5066,7 +4995,6 @@ export {
     setWorkspaceTagEnabled,
     setWorkspaceCurrencyDefault,
     setForeignCurrencyDefault,
-    updatePolicyConnectionConfig,
     setPolicyCustomTaxName,
     clearPolicyErrorField,
     isCurrencySupportedForDirectReimbursement,
diff --git a/src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts b/src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts
deleted file mode 100644
index d130675ceab2..000000000000
--- a/src/libs/actions/connections/getQuickBooksOnlineSetupLink.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {getCommandURL} from '@libs/ApiUtils';
-import CONFIG from '@src/CONFIG';
-import ROUTES from '@src/ROUTES';
-
-function getQuickBooksOnlineSetupLink(policyID: string) {
-    const callbackPath = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}`;
-    const params = new URLSearchParams({callbackPath, policyID});
-    const commandURL = getCommandURL({command: 'ConnectToQuickbooksOnline'});
-
-    return commandURL + params.toString();
-}
-
-export default getQuickBooksOnlineSetupLink;
diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
new file mode 100644
index 000000000000..2f7b84c77086
--- /dev/null
+++ b/src/libs/actions/connections/index.ts
@@ -0,0 +1,112 @@
+import * as API from '@libs/API';
+import { WRITE_COMMANDS } from '@libs/API/types';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type { PolicyConnectionName } from '@src/types/onyx/Policy';
+import Onyx from 'react-native-onyx';
+import type { OnyxUpdate } from 'react-native-onyx';
+import type { ValueOf } from 'type-fest';
+
+function removePolicyConnection(policyID: string, connectionName: PolicyConnectionName) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [connectionName]: null,
+                }
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
+            value: null,
+        },
+    ];
+    const failureData: OnyxUpdate[] = [
+        // {
+        //     onyxMethod: Onyx.METHOD.MERGE,
+        //     key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+        //     value: {
+        //         errorFields: {
+        //             avatar: ErrorUtils.getMicroSecondOnyxError('avatarWithImagePicker.deleteWorkspaceError'),
+        //         },
+        //     },
+        // },
+    ];
+    API.write(WRITE_COMMANDS.REMOVE_POLICY_CONNECTION, {policyID, connectionName}, {optimisticData, failureData});
+}
+
+function updatePolicyConnectionConfig(policyID: string, settingName: ValueOf<typeof CONST.QUICK_BOOKS_IMPORTS>, settingValue: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>) {
+    const parameters = {policyID, connectionName: CONST.QUICK_BOOKS_ONLINE, settingName, settingValue, idempotencyKey: settingName};
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    quickbooksOnline: {
+                        config: {
+                            [settingName]: settingValue,
+                            pendingFields: {
+                                [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    quickbooksOnline: {
+                        config: {
+                            [settingName]: settingValue,
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    quickbooksOnline: {
+                        config: {
+                            [settingName]: settingValue,
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG, parameters, {optimisticData, failureData, successData});
+}
+
+export {removePolicyConnection, updatePolicyConnectionConfig};
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index db65d6664b6e..9c95f1ac1907 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useMemo, useRef, useState} from 'react';
+import React, {useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import ConfirmModal from '@components/ConfirmModal';
 import ConnectToQuickbooksOnlineButton from '@components/ConnectToQuickbooksOnlineButton';
@@ -30,6 +30,7 @@ import type { Policy, PolicyConnectionSyncProgress } from '@src/types/onyx';
 import type { WithPolicyAndFullscreenLoadingProps } from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import ONYXKEYS from '@src/ONYXKEYS';
+import { removePolicyConnection } from '@libs/actions/connections';
 
 type PolicyAccountingPageOnyxProps = {
     /** From Onyx */
@@ -39,7 +40,7 @@ type PolicyAccountingPageOnyxProps = {
 
 type PolicyAccountingPageProps = WithPolicyAndFullscreenLoadingProps & PolicyAccountingPageOnyxProps & {
     /** Policy values needed in the component */
-    policy: OnyxEntry<Policy>;
+    policy: Policy;
 };
 
 function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccountingPageProps) {
@@ -52,23 +53,11 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
     const threeDotsMenuContainerRef = useRef<View>(null);
     const isSyncInProgress = connectionSyncProgress?.stageInProgress && connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE;
-
-    const policyID = policy?.id ?? '';
-
-    const connectionsMenuItems: MenuItemProps[] = useMemo(
-        () => [
-            {
-                icon: Expensicons.QBOSquare,
-                iconType: 'avatar',
-                interactive: false,
-                wrapperStyle: [styles.sectionMenuItemTopDescription],
-                shouldShowRightComponent: true,
-                title: translate('workspace.accounting.qbo'),
-                rightComponent: <ConnectToQuickbooksOnlineButton policyID={policyID} />,
-            },
-        ],
-        [styles.sectionMenuItemTopDescription, translate, isSyncInProgress, styles.justifyContentCenter],
-    );
+    const policyIsConnectedToAccountingSystem = Object.keys(policy.connections ?? {}).length > 0;
+    const policyID = policy.id ?? '';
+    console.log('PolicyAccountingPage connectionSyncProgress', connectionSyncProgress);
+    console.log('PolicyAccountingPage policyIsConnectedToAccountingSystem', policyIsConnectedToAccountingSystem);
+    console.log('PolicyAccountingPage policy.connections', policy.connections);
 
     const overflowMenu: ThreeDotsMenuProps['menuItems'] = useMemo(
         () => [
@@ -80,76 +69,93 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
             {
                 icon: Expensicons.Trashcan,
                 text: translate('workspace.accounting.disconnect'),
-                onSelected: () => setIsDisconnectModalOpen(true),
+                onSelected: () => {
+                    setIsDisconnectModalOpen(true);
+                    removePolicyConnection(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO);
+                },
             },
         ],
-        [translate],
+        [translate, policyID],
     );
 
-    const qboConnectionMenuItems: MenuItemProps[] = useMemo(
-        () => [
-            {
-                icon: Expensicons.QBOSquare,
-                iconType: 'avatar',
-                interactive: false,
-                wrapperStyle: [styles.sectionMenuItemTopDescription],
-                shouldShowRightComponent: true,
-                title: translate('workspace.accounting.qbo'),
-                description: isSyncInProgress ? translate('workspace.accounting.connections.syncStageName', 'quickbooksOnlineImportCustomers') : translate('workspace.accounting.lastSync'),
-                rightComponent: isSyncInProgress ? (
-                    <ActivityIndicator
-                        style={[styles.popoverMenuIcon]}
-                        color={theme.spinner}
-                    />
-                ) : (
-                    <View ref={threeDotsMenuContainerRef}>
-                        <ThreeDotsMenu
-                            onIconPress={() => {
-                                threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
-                                    setThreeDotsMenuPosition({
-                                        horizontal: x + width,
-                                        vertical: y + height,
-                                    });
-                                });
-                            }}
-                            menuItems={overflowMenu}
-                            anchorPosition={threeDotsMenuPosition}
-                            anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+    const menuItems: MenuItemProps[] = useMemo(
+        () =>  {
+            if (!policyIsConnectedToAccountingSystem) {
+                return [
+                    {
+                        icon: Expensicons.QBOSquare,
+                        iconType: 'avatar',
+                        interactive: false,
+                        wrapperStyle: [styles.sectionMenuItemTopDescription],
+                        shouldShowRightComponent: true,
+                        title: translate('workspace.accounting.qbo'),
+                        rightComponent: <ConnectToQuickbooksOnlineButton policyID={policyID} />,
+                    },
+                ];
+            }
+            return [
+                {
+                    icon: Expensicons.QBOSquare,
+                    iconType: 'avatar',
+                    interactive: false,
+                    wrapperStyle: [styles.sectionMenuItemTopDescription],
+                    shouldShowRightComponent: true,
+                    title: translate('workspace.accounting.qbo'),
+                    description: isSyncInProgress ? translate('workspace.accounting.connections.syncStageName', 'quickbooksOnlineImportCustomers') : translate('workspace.accounting.lastSync'),
+                    rightComponent: isSyncInProgress ? (
+                        <ActivityIndicator
+                            style={[styles.popoverMenuIcon]}
+                            color={theme.spinner}
                         />
-                    </View>
-                ),
-            },
-            ...(isSyncInProgress
-                ? []
-                : [
-                      {
-                          icon: Expensicons.Pencil,
-                          iconRight: Expensicons.ArrowRight,
-                          shouldShowRightIcon: true,
-                          title: translate('workspace.accounting.import'),
-                          wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
-                      },
-                      {
-                          icon: Expensicons.Send,
-                          iconRight: Expensicons.ArrowRight,
-                          shouldShowRightIcon: true,
-                          title: translate('workspace.accounting.export'),
-                          wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          onPress: () => {},
-                      },
-                      {
-                          icon: Expensicons.Gear,
-                          iconRight: Expensicons.ArrowRight,
-                          shouldShowRightIcon: true,
-                          title: translate('workspace.accounting.advanced'),
-                          wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          onPress: () => {},
-                      },
-                  ]),
-        ],
-        [styles.sectionMenuItemTopDescription, styles.popoverMenuIcon, translate, isSyncInProgress, theme.spinner, overflowMenu, threeDotsMenuPosition, policyID],
-    );
+                    ) : (
+                        <View ref={threeDotsMenuContainerRef}>
+                            <ThreeDotsMenu
+                                onIconPress={() => {
+                                    threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+                                        setThreeDotsMenuPosition({
+                                            horizontal: x + width,
+                                            vertical: y + height,
+                                        });
+                                    });
+                                }}
+                                menuItems={overflowMenu}
+                                anchorPosition={threeDotsMenuPosition}
+                                anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                            />
+                        </View>
+                    ),
+                },
+                ...(policyIsConnectedToAccountingSystem
+                    ? []
+                    : [
+                          {
+                              icon: Expensicons.Pencil,
+                              iconRight: Expensicons.ArrowRight,
+                              shouldShowRightIcon: true,
+                              title: translate('workspace.accounting.import'),
+                              wrapperStyle: [styles.sectionMenuItemTopDescription],
+                              onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
+                          },
+                          {
+                              icon: Expensicons.Send,
+                              iconRight: Expensicons.ArrowRight,
+                              shouldShowRightIcon: true,
+                              title: translate('workspace.accounting.export'),
+                              wrapperStyle: [styles.sectionMenuItemTopDescription],
+                              onPress: () => {},
+                          },
+                          {
+                              icon: Expensicons.Gear,
+                              iconRight: Expensicons.ArrowRight,
+                              shouldShowRightIcon: true,
+                              title: translate('workspace.accounting.advanced'),
+                              wrapperStyle: [styles.sectionMenuItemTopDescription],
+                              onPress: () => {},
+                          },
+                      ]),
+            ];
+            
+        }, [isSyncInProgress, overflowMenu, policyID, policyIsConnectedToAccountingSystem, styles.popoverMenuIcon, styles.sectionMenuItemTopDescription, theme.spinner, threeDotsMenuPosition, translate]);
 
     const headerThreeDotsMenuItems: ThreeDotsMenuProps['menuItems'] = [
         {
@@ -197,7 +203,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                                     childrenStyles={styles.pt5}
                                 >
                                     <MenuItemList
-                                        menuItems={policyIsConnectedToAccountingSystem ? qboConnectionMenuItems : connectionsMenuItems}
+                                        menuItems={menuItems}
                                         shouldUseSingleExecution
                                     />
                                 </Section>
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index ab07dddec5ac..eb9b2918299d 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -463,6 +463,7 @@ export type {
     IntegrationEntityMap,
     PolicyFeatureName,
     PendingJoinRequestPolicy,
+    PolicyConnectionName,
     PolicyConnectionSyncStage,
     PolicyConnectionSyncProgress,
 };

From 613bde452d525ae60bd9f5e5857d98a477702a12 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 13:08:44 -0700
Subject: [PATCH 152/383] Fix remove connection

---
 src/libs/API/types.ts                                   | 2 +-
 src/pages/workspace/accounting/PolicyAccountingPage.tsx | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index ed199553b90a..41818a9a0a83 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -392,7 +392,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_UNIT]: Parameters.SetPolicyDistanceRatesUnitParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY]: Parameters.SetPolicyDistanceRatesDefaultCategoryParams;
     [WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG]: Parameters.UpdatePolicyConnectionConfigParams;
-    [WRITE_COMMANDS.REMOVE_POLICY_CONNECTION]: Parameters.UpdatePolicyConnectionConfigParams;
+    [WRITE_COMMANDS.REMOVE_POLICY_CONNECTION]: Parameters.RemovePolicyConnectionParams;
     [WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED]: Parameters.SetPolicyDistanceRatesEnabledParams;
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 9c95f1ac1907..ddf7a97a0f84 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -71,11 +71,10 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                 text: translate('workspace.accounting.disconnect'),
                 onSelected: () => {
                     setIsDisconnectModalOpen(true);
-                    removePolicyConnection(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO);
                 },
             },
         ],
-        [translate, policyID],
+        [translate],
     );
 
     const menuItems: MenuItemProps[] = useMemo(
@@ -212,7 +211,10 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                         <ConfirmModal
                             title={translate('workspace.accounting.disconnectTitle')}
                             isVisible={isDisconnectModalOpen}
-                            onConfirm={() => {}}
+                            onConfirm={() => {
+                                removePolicyConnection(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO);
+                                setIsDisconnectModalOpen(false);
+                            }}
                             onCancel={() => setIsDisconnectModalOpen(false)}
                             prompt={translate('workspace.accounting.disconnectPrompt')}
                             confirmText={translate('workspace.accounting.disconnect')}

From 62ea47451ce2d039e1f67e7c1816dee4f3466946 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 11 Apr 2024 01:42:45 +0530
Subject: [PATCH 153/383] fix type checks

---
 src/libs/IOUUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index b2553d12ea95..27af031d19a8 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -134,7 +134,7 @@ function insertTagIntoTransactionTagsString(transactionTags: string, tag: string
     return tagArray.join(CONST.COLON).replace(/:*$/, '');
 }
 
-function isMovingTransactionFromTrackExpense(action: ValueOf<typeof CONST.IOU.ACTION>) {
+function isMovingTransactionFromTrackExpense(action?: ValueOf<typeof CONST.IOU.ACTION>) {
     if (action === CONST.IOU.ACTION.MOVE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE) {
         return true;
     }

From 9b7bb84fcc25f6944426abfb1071a297693b3296 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 13:19:13 -0700
Subject: [PATCH 154/383] Style

---
 .../RemovePolicyConnectionParams.ts           |   2 +-
 src/libs/actions/connections/index.ts         |  12 +-
 .../accounting/PolicyAccountingPage.tsx       | 173 ++++++++++--------
 3 files changed, 100 insertions(+), 87 deletions(-)

diff --git a/src/libs/API/parameters/RemovePolicyConnectionParams.ts b/src/libs/API/parameters/RemovePolicyConnectionParams.ts
index 5e5e2c1189d2..a9a640bc8426 100644
--- a/src/libs/API/parameters/RemovePolicyConnectionParams.ts
+++ b/src/libs/API/parameters/RemovePolicyConnectionParams.ts
@@ -1,4 +1,4 @@
-import type { PolicyConnectionName } from "@src/types/onyx/Policy";
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 
 type RemovePolicyConnectionParams = {
     policyID: string;
diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index 2f7b84c77086..0df16b4a3631 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -1,11 +1,11 @@
+import Onyx from 'react-native-onyx';
+import type {OnyxUpdate} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
-import { WRITE_COMMANDS } from '@libs/API/types';
+import {WRITE_COMMANDS} from '@libs/API/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type { PolicyConnectionName } from '@src/types/onyx/Policy';
-import Onyx from 'react-native-onyx';
-import type { OnyxUpdate } from 'react-native-onyx';
-import type { ValueOf } from 'type-fest';
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 
 function removePolicyConnection(policyID: string, connectionName: PolicyConnectionName) {
     const optimisticData: OnyxUpdate[] = [
@@ -15,7 +15,7 @@ function removePolicyConnection(policyID: string, connectionName: PolicyConnecti
             value: {
                 connections: {
                     [connectionName]: null,
-                }
+                },
             },
         },
         {
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index ddf7a97a0f84..e47bc1e90e99 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -1,5 +1,7 @@
 import React, {useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import ConfirmModal from '@components/ConfirmModal';
 import ConnectToQuickbooksOnlineButton from '@components/ConnectToQuickbooksOnlineButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -17,20 +19,18 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 // import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
-import type { OnyxEntry } from 'react-native-onyx';
-import { withOnyx } from 'react-native-onyx';
-import type { Policy, PolicyConnectionSyncProgress } from '@src/types/onyx';
-import type { WithPolicyAndFullscreenLoadingProps } from '@pages/workspace/withPolicyAndFullscreenLoading';
-import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import ONYXKEYS from '@src/ONYXKEYS';
-import { removePolicyConnection } from '@libs/actions/connections';
+import ROUTES from '@src/ROUTES';
+import type {Policy, PolicyConnectionSyncProgress} from '@src/types/onyx';
 
 type PolicyAccountingPageOnyxProps = {
     /** From Onyx */
@@ -38,10 +38,11 @@ type PolicyAccountingPageOnyxProps = {
     connectionSyncProgress: OnyxEntry<PolicyConnectionSyncProgress>;
 };
 
-type PolicyAccountingPageProps = WithPolicyAndFullscreenLoadingProps & PolicyAccountingPageOnyxProps & {
-    /** Policy values needed in the component */
-    policy: Policy;
-};
+type PolicyAccountingPageProps = WithPolicyAndFullscreenLoadingProps &
+    PolicyAccountingPageOnyxProps & {
+        /** Policy values needed in the component */
+        policy: Policy;
+    };
 
 function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccountingPageProps) {
     const theme = useTheme();
@@ -58,6 +59,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     console.log('PolicyAccountingPage connectionSyncProgress', connectionSyncProgress);
     console.log('PolicyAccountingPage policyIsConnectedToAccountingSystem', policyIsConnectedToAccountingSystem);
     console.log('PolicyAccountingPage policy.connections', policy.connections);
+    console.log('PolicyAccountingPage isSyncInProgress', isSyncInProgress);
 
     const overflowMenu: ThreeDotsMenuProps['menuItems'] = useMemo(
         () => [
@@ -77,21 +79,8 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
         [translate],
     );
 
-    const menuItems: MenuItemProps[] = useMemo(
-        () =>  {
-            if (!policyIsConnectedToAccountingSystem) {
-                return [
-                    {
-                        icon: Expensicons.QBOSquare,
-                        iconType: 'avatar',
-                        interactive: false,
-                        wrapperStyle: [styles.sectionMenuItemTopDescription],
-                        shouldShowRightComponent: true,
-                        title: translate('workspace.accounting.qbo'),
-                        rightComponent: <ConnectToQuickbooksOnlineButton policyID={policyID} />,
-                    },
-                ];
-            }
+    const menuItems: MenuItemProps[] = useMemo(() => {
+        if (!policyIsConnectedToAccountingSystem) {
             return [
                 {
                     icon: Expensicons.QBOSquare,
@@ -100,61 +89,85 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                     wrapperStyle: [styles.sectionMenuItemTopDescription],
                     shouldShowRightComponent: true,
                     title: translate('workspace.accounting.qbo'),
-                    description: isSyncInProgress ? translate('workspace.accounting.connections.syncStageName', 'quickbooksOnlineImportCustomers') : translate('workspace.accounting.lastSync'),
-                    rightComponent: isSyncInProgress ? (
-                        <ActivityIndicator
-                            style={[styles.popoverMenuIcon]}
-                            color={theme.spinner}
-                        />
-                    ) : (
-                        <View ref={threeDotsMenuContainerRef}>
-                            <ThreeDotsMenu
-                                onIconPress={() => {
-                                    threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
-                                        setThreeDotsMenuPosition({
-                                            horizontal: x + width,
-                                            vertical: y + height,
-                                        });
-                                    });
-                                }}
-                                menuItems={overflowMenu}
-                                anchorPosition={threeDotsMenuPosition}
-                                anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
-                            />
-                        </View>
-                    ),
+                    rightComponent: <ConnectToQuickbooksOnlineButton policyID={policyID} />,
                 },
-                ...(policyIsConnectedToAccountingSystem
-                    ? []
-                    : [
-                          {
-                              icon: Expensicons.Pencil,
-                              iconRight: Expensicons.ArrowRight,
-                              shouldShowRightIcon: true,
-                              title: translate('workspace.accounting.import'),
-                              wrapperStyle: [styles.sectionMenuItemTopDescription],
-                              onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
-                          },
-                          {
-                              icon: Expensicons.Send,
-                              iconRight: Expensicons.ArrowRight,
-                              shouldShowRightIcon: true,
-                              title: translate('workspace.accounting.export'),
-                              wrapperStyle: [styles.sectionMenuItemTopDescription],
-                              onPress: () => {},
-                          },
-                          {
-                              icon: Expensicons.Gear,
-                              iconRight: Expensicons.ArrowRight,
-                              shouldShowRightIcon: true,
-                              title: translate('workspace.accounting.advanced'),
-                              wrapperStyle: [styles.sectionMenuItemTopDescription],
-                              onPress: () => {},
-                          },
-                      ]),
             ];
-            
-        }, [isSyncInProgress, overflowMenu, policyID, policyIsConnectedToAccountingSystem, styles.popoverMenuIcon, styles.sectionMenuItemTopDescription, theme.spinner, threeDotsMenuPosition, translate]);
+        }
+        return [
+            {
+                icon: Expensicons.QBOSquare,
+                iconType: 'avatar',
+                interactive: false,
+                wrapperStyle: [styles.sectionMenuItemTopDescription],
+                shouldShowRightComponent: true,
+                title: translate('workspace.accounting.qbo'),
+                description: isSyncInProgress
+                    ? translate('workspace.accounting.connections.syncStageName', connectionSyncProgress.stageInProgress)
+                    : translate('workspace.accounting.lastSync'),
+                rightComponent: isSyncInProgress ? (
+                    <ActivityIndicator
+                        style={[styles.popoverMenuIcon]}
+                        color={theme.spinner}
+                    />
+                ) : (
+                    <View ref={threeDotsMenuContainerRef}>
+                        <ThreeDotsMenu
+                            onIconPress={() => {
+                                threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+                                    setThreeDotsMenuPosition({
+                                        horizontal: x + width,
+                                        vertical: y + height,
+                                    });
+                                });
+                            }}
+                            menuItems={overflowMenu}
+                            anchorPosition={threeDotsMenuPosition}
+                            anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                        />
+                    </View>
+                ),
+            },
+            ...(policyIsConnectedToAccountingSystem
+                ? []
+                : [
+                      {
+                          icon: Expensicons.Pencil,
+                          iconRight: Expensicons.ArrowRight,
+                          shouldShowRightIcon: true,
+                          title: translate('workspace.accounting.import'),
+                          wrapperStyle: [styles.sectionMenuItemTopDescription],
+                          onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
+                      },
+                      {
+                          icon: Expensicons.Send,
+                          iconRight: Expensicons.ArrowRight,
+                          shouldShowRightIcon: true,
+                          title: translate('workspace.accounting.export'),
+                          wrapperStyle: [styles.sectionMenuItemTopDescription],
+                          onPress: () => {},
+                      },
+                      {
+                          icon: Expensicons.Gear,
+                          iconRight: Expensicons.ArrowRight,
+                          shouldShowRightIcon: true,
+                          title: translate('workspace.accounting.advanced'),
+                          wrapperStyle: [styles.sectionMenuItemTopDescription],
+                          onPress: () => {},
+                      },
+                  ]),
+        ];
+    }, [
+        connectionSyncProgress?.stageInProgress,
+        isSyncInProgress,
+        overflowMenu,
+        policyID,
+        policyIsConnectedToAccountingSystem,
+        styles.popoverMenuIcon,
+        styles.sectionMenuItemTopDescription,
+        theme.spinner,
+        threeDotsMenuPosition,
+        translate,
+    ]);
 
     const headerThreeDotsMenuItems: ThreeDotsMenuProps['menuItems'] = [
         {
@@ -236,4 +249,4 @@ export default withPolicyAndFullscreenLoading(
             key: (props) => `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${props.route.params.policyID}`,
         },
     })(PolicyAccountingPage),
-);
\ No newline at end of file
+);

From 1cee264ebbfdeb06ed946782eaa5d455a1b37e7f Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 18:05:35 -0700
Subject: [PATCH 155/383] Finish Authentication flow

---
 src/libs/actions/connections/QuickBooksOnline.ts   |  3 +--
 .../workspace/accounting/PolicyAccountingPage.tsx  | 14 +++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index 6bfb2ea5b182..636537a879b6 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -2,8 +2,7 @@ import {getCommandURL} from '@libs/ApiUtils';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
     const otherParams = new URLSearchParams({policyID}).toString();
-    const commandUrl = `${getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'})}&${otherParams}`;
-    return commandUrl;
+    return `${getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'})}&${otherParams}`;
 }
 
 // More action functions will be added later
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index e47bc1e90e99..728a5c8ea318 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -53,13 +53,9 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
     const threeDotsMenuContainerRef = useRef<View>(null);
-    const isSyncInProgress = connectionSyncProgress?.stageInProgress && connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE;
+    const isSyncInProgress = !!connectionSyncProgress?.stageInProgress && connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE;
     const policyIsConnectedToAccountingSystem = Object.keys(policy.connections ?? {}).length > 0;
     const policyID = policy.id ?? '';
-    console.log('PolicyAccountingPage connectionSyncProgress', connectionSyncProgress);
-    console.log('PolicyAccountingPage policyIsConnectedToAccountingSystem', policyIsConnectedToAccountingSystem);
-    console.log('PolicyAccountingPage policy.connections', policy.connections);
-    console.log('PolicyAccountingPage isSyncInProgress', isSyncInProgress);
 
     const overflowMenu: ThreeDotsMenuProps['menuItems'] = useMemo(
         () => [
@@ -80,7 +76,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     );
 
     const menuItems: MenuItemProps[] = useMemo(() => {
-        if (!policyIsConnectedToAccountingSystem) {
+        if (!policyIsConnectedToAccountingSystem && !isSyncInProgress) {
             return [
                 {
                     icon: Expensicons.QBOSquare,
@@ -128,8 +124,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                 ),
             },
             ...(policyIsConnectedToAccountingSystem
-                ? []
-                : [
+                ? [
                       {
                           icon: Expensicons.Pencil,
                           iconRight: Expensicons.ArrowRight,
@@ -154,7 +149,8 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                           wrapperStyle: [styles.sectionMenuItemTopDescription],
                           onPress: () => {},
                       },
-                  ]),
+                  ]
+                : []),
         ];
     }, [
         connectionSyncProgress?.stageInProgress,

From 879a7470dbc050dd34cea38b556ab9df3a94adf0 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 18:22:15 -0700
Subject: [PATCH 156/383] Add stages transalations

---
 src/languages/en.ts |  8 ++++++++
 src/languages/es.ts | 14 +++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 3b670f7b6ebc..52e02d2c40f1 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2099,6 +2099,14 @@ export default {
                             return 'Importing accounts';
                         case 'quickbooksOnlineImportClasses':
                             return 'Importing classes';
+                        case 'quickbooksOnlineImportLocations':
+                            return 'Importing locations';
+                        case 'quickbooksOnlineImportProcessing':
+                            return 'Processing imported data';
+                        case 'quickbooksOnlineSyncBillPayments':
+                            return 'Synchronizing reimbursed reports and Bill Payments';
+                        case 'quickbooksOnlineSyncTaxCodes':
+                            return 'Importing Tax Codes';
 
                         default: {
                             return `Translation missing for stage: ${stage}`;
diff --git a/src/languages/es.ts b/src/languages/es.ts
index c53759ccc403..44b0f60081e0 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2089,11 +2089,19 @@ export default {
                         case 'quickbooksOnlineImportCustomers':
                             return 'Importando clientes';
                         case 'quickbooksOnlineImportEmployees':
-                            return 'Importing employees';
+                            return 'Importando empleados';
                         case 'quickbooksOnlineImportAccounts':
-                            return 'Importing accounts';
+                            return 'Importando cuentas';
                         case 'quickbooksOnlineImportClasses':
-                            return 'Importing classes';
+                            return 'Importando clases';
+                        case 'quickbooksOnlineImportLocations':
+                            return 'Importando localidades';
+                        case 'quickbooksOnlineImportProcessing':
+                            return 'Procesando datos importados';
+                        case 'quickbooksOnlineSyncBillPayments':
+                            return 'Sincronizando reportes reembolsados y facturas pagadas';
+                        case 'quickbooksOnlineSyncTaxCodes':
+                            return 'Importando tipos de impuestos';
 
                         default: {
                             return `Translation missing for stage: ${stage}`;

From 7f030dd996c8137427986d1771feb1f4fd3699a5 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 18:41:36 -0700
Subject: [PATCH 157/383] Fix type errors and others

---
 src/ONYXKEYS.ts                                |  2 --
 src/languages/es.ts                            |  3 ---
 .../ModalStackNavigators/index.tsx             | 13 +++++++------
 .../FULL_SCREEN_TO_RHP_MAPPING.ts              | 14 +++++++-------
 src/libs/actions/connections/index.ts          |  1 +
 src/pages/workspace/WorkspaceInitialPage.tsx   | 18 +++++++++++++++++-
 .../qbo/QuickbooksChartOfAccountsPage.tsx      |  4 ++--
 .../accounting/qbo/QuickbooksClassesPage.tsx   |  4 ++--
 .../accounting/qbo/QuickbooksCustomersPage.tsx |  4 ++--
 .../accounting/qbo/QuickbooksLocationsPage.tsx |  4 ++--
 .../accounting/qbo/QuickbooksTaxesPage.tsx     |  4 ++--
 .../accounting/qboConnectionButton/index.tsx   |  2 +-
 12 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 3703783ee417..e348ad37e3f9 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -350,8 +350,6 @@ const ONYXKEYS = {
 
         /** This is deprecated, but needed for a migration, so we still need to include it here so that it will be initialized in Onyx.init */
         DEPRECATED_POLICY_MEMBER_LIST: 'policyMemberList_',
-
-        POLICY_CONNECTION_SYNC_PROGRESS: 'policyConnectionSyncProgress_',
     },
 
     /** List of Form ids */
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 44b0f60081e0..530f33d004cd 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2143,9 +2143,6 @@ export default {
             invalidRateError: 'Por favor, introduce una tarifa válida',
             lowRateError: 'La tarifa debe ser mayor que 0',
         },
-        accounting: {
-            setup: 'Wait for the translation here -> https://github.com/Expensify/App/pull/38283/files#r1543793379',
-        },
         bills: {
             manageYourBills: 'Gestiona tus facturas',
             askYourVendorsBeforeEmail: 'Pide a tus proveedores que envíen sus facturas a ',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index b4c97ed40556..62b9c58ca668 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -260,12 +260,13 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.EXIT_SURVEY.REASON]: () => require('../../../../pages/settings/ExitSurvey/ExitSurveyReasonPage').default as React.ComponentType,
     [SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE]: () => require('../../../../pages/settings/ExitSurvey/ExitSurveyResponsePage').default as React.ComponentType,
     [SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM]: () => require('../../../../pages/settings/ExitSurvey/ExitSurveyConfirmPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_IMPORT]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksImportPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CUSTOMERS]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksCustomersPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_TAXES]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksTaxesPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_LOCATIONS]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksLocationsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CLASSES]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksClassesPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksImportPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: () =>
+        require('../../../../pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CUSTOMERS]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksCustomersPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_TAXES]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksTaxesPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_LOCATIONS]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksLocationsPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CLASSES]: () => require('../../../../pages/workspace/accounting/qbo/QuickbooksClassesPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () =>
         require('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default as React.ComponentType,
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index 14e007c4c6d5..af57b4e77693 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -18,13 +18,13 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET,
         SCREENS.WORKSPACE.WORKFLOWS_PAYER,
     ],
-    [SCREENS.WORKSPACE.ACCOUNTING]: [
-        SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_IMPORT,
-        SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS,
-        SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CLASSES,
-        SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_TAXES,
-        SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_LOCATIONS,
-        SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CUSTOMERS,
+    [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: [
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS,
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CLASSES,
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_TAXES,
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_LOCATIONS,
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CUSTOMERS,
     ],
     [SCREENS.WORKSPACE.TAXES]: [
         SCREENS.WORKSPACE.TAXES_SETTINGS,
diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index 0df16b4a3631..2e8f7d541ca4 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -3,6 +3,7 @@ import type {OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
 import {WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PolicyConnectionName} from '@src/types/onyx/Policy';
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index ce43a7d3b332..f14052958010 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -43,7 +43,23 @@ type WorkspaceMenuItem = {
     icon: IconAsset;
     action: () => void;
     brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
-    routeName?: ValueOf<typeof SCREENS.WORKSPACE> | ValueOf<typeof SCREENS.WORKSPACE.ACCOUNTING>;
+    routeName?:
+        | typeof SCREENS.WORKSPACE.ACCOUNTING.ROOT
+        | typeof SCREENS.WORKSPACE.INITIAL
+        | typeof SCREENS.WORKSPACE.CARD
+        | typeof SCREENS.WORKSPACE.REIMBURSE
+        | typeof SCREENS.WORKSPACE.BILLS
+        | typeof SCREENS.WORKSPACE.INVOICES
+        | typeof SCREENS.WORKSPACE.TRAVEL
+        | typeof SCREENS.WORKSPACE.DISTANCE_RATES
+        | typeof SCREENS.WORKSPACE.WORKFLOWS
+        | typeof SCREENS.WORKSPACE.CATEGORIES
+        | typeof SCREENS.WORKSPACE.TAGS
+        | typeof SCREENS.WORKSPACE.TAXES
+        | typeof SCREENS.WORKSPACE.ACCOUNTING
+        | typeof SCREENS.WORKSPACE.MORE_FEATURES
+        | typeof SCREENS.WORKSPACE.PROFILE
+        | typeof SCREENS.WORKSPACE.MEMBERS;
 };
 
 type WorkspaceInitialPageOnyxProps = {
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
index 593e5f9dc00a..d4ba46e4b46e 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
@@ -8,12 +8,12 @@ import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import variables from '@styles/variables';
-import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 
 function QuickbooksChartOfAccountsPage({policy}: WithPolicyProps) {
@@ -47,7 +47,7 @@ function QuickbooksChartOfAccountsPage({policy}: WithPolicyProps) {
                                         accessibilityLabel={translate('workspace.qbo.accounts')}
                                         isOn={isSwitchOn}
                                         onToggle={() =>
-                                            Policy.updatePolicyConnectionConfig(
+                                            Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.QUICK_BOOKS_IMPORTS.ENABLE_NEW_CATEGORIES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
index f8c631b31476..ffa2e54c421e 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
@@ -9,12 +9,12 @@ import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import variables from '@styles/variables';
-import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 
 function QuickbooksClassesPage({policy}: WithPolicyProps) {
@@ -49,7 +49,7 @@ function QuickbooksClassesPage({policy}: WithPolicyProps) {
                                         accessibilityLabel={translate('workspace.qbo.classes')}
                                         isOn={isSwitchOn}
                                         onToggle={() =>
-                                            Policy.updatePolicyConnectionConfig(
+                                            Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_CLASSES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
index 27fde14081e7..f321bf9b49a7 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
@@ -9,12 +9,12 @@ import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import variables from '@styles/variables';
-import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 
 function QuickbooksCustomersPage({policy}: WithPolicyProps) {
@@ -48,7 +48,7 @@ function QuickbooksCustomersPage({policy}: WithPolicyProps) {
                                         accessibilityLabel={translate('workspace.qbo.customers')}
                                         isOn={isSwitchOn}
                                         onToggle={() =>
-                                            Policy.updatePolicyConnectionConfig(
+                                            Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_CUSTOMERS,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
index 21da79587c0c..728db13a7f36 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
@@ -9,12 +9,12 @@ import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import variables from '@styles/variables';
-import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 
 function QuickbooksLocationsPage({policy}: WithPolicyProps) {
@@ -49,7 +49,7 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
                                         accessibilityLabel={translate('workspace.qbo.locations')}
                                         isOn={isSwitchOn}
                                         onToggle={() =>
-                                            Policy.updatePolicyConnectionConfig(
+                                            Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_LOCATIONS,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
index 293d6518baa0..a2d41969fb27 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
@@ -8,12 +8,12 @@ import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import variables from '@styles/variables';
-import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 
 function QuickbooksTaxesPage({policy}: WithPolicyProps) {
@@ -46,7 +46,7 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
                                         accessibilityLabel={translate('workspace.qbo.taxes')}
                                         isOn={isSwitchOn}
                                         onToggle={() =>
-                                            Policy.updatePolicyConnectionConfig(
+                                            Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_TAXES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
diff --git a/src/pages/workspace/accounting/qboConnectionButton/index.tsx b/src/pages/workspace/accounting/qboConnectionButton/index.tsx
index 893b74f403e4..0bc06b4b92b3 100644
--- a/src/pages/workspace/accounting/qboConnectionButton/index.tsx
+++ b/src/pages/workspace/accounting/qboConnectionButton/index.tsx
@@ -3,7 +3,7 @@ import {withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import getQuickBooksOnlineSetupLink from '@libs/actions/connections/getQuickBooksOnlineSetupLink';
+import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
 import * as Link from '@userActions/Link';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ConnectToQuickbooksOnlineButtonOnyxProps, ConnectToQuickbooksOnlineButtonProps} from './types';

From 5b36cf4a109596e30399d743743ba0b5a77bef66 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 18:46:34 -0700
Subject: [PATCH 158/383] Remvoe duplicated component

---
 .../qboConnectionButton/index.native.tsx      | 71 -------------------
 .../accounting/qboConnectionButton/index.tsx  | 29 --------
 .../accounting/qboConnectionButton/types.ts   | 14 ----
 3 files changed, 114 deletions(-)
 delete mode 100644 src/pages/workspace/accounting/qboConnectionButton/index.native.tsx
 delete mode 100644 src/pages/workspace/accounting/qboConnectionButton/index.tsx
 delete mode 100644 src/pages/workspace/accounting/qboConnectionButton/types.ts

diff --git a/src/pages/workspace/accounting/qboConnectionButton/index.native.tsx b/src/pages/workspace/accounting/qboConnectionButton/index.native.tsx
deleted file mode 100644
index e499e5dd2e0e..000000000000
--- a/src/pages/workspace/accounting/qboConnectionButton/index.native.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, {useCallback, useRef, useState} from 'react';
-import {withOnyx} from 'react-native-onyx';
-import WebView from 'react-native-webview';
-import type {WebViewNavigation} from 'react-native-webview';
-import Button from '@components/Button';
-import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import Modal from '@components/Modal';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import getQuickBooksOnlineSetupLink from '@libs/actions/connections/getQuickBooksOnlineSetupLink';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {ConnectToQuickbooksOnlineButtonOnyxProps, ConnectToQuickbooksOnlineButtonProps} from './types';
-
-type WebViewNavigationEvent = WebViewNavigation;
-
-function ConnectToQuickbooksOnlineButton({policyID, session}: ConnectToQuickbooksOnlineButtonProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const webViewRef = useRef<WebView>(null);
-    const [isWebViewOpen, setWebViewOpen] = useState<boolean>(false);
-
-    const authToken = session?.authToken ?? null;
-
-    const renderLoading = () => <FullScreenLoadingIndicator />;
-
-    /**
-     * Handles in-app navigation for webview links
-     */
-    const handleNavigationStateChange = useCallback(({url}: WebViewNavigationEvent) => !!url, []);
-
-    return (
-        <>
-            <Button
-                onPress={() => setWebViewOpen(true)}
-                text={translate('workspace.accounting.setup')}
-                style={styles.justifyContentCenter}
-                small
-            />
-            {isWebViewOpen && (
-                <Modal
-                    onClose={() => setWebViewOpen(false)}
-                    fullscreen
-                    isVisible
-                    type="centered"
-                >
-                    <WebView
-                        ref={webViewRef}
-                        source={{
-                            uri: getQuickBooksOnlineSetupLink(policyID),
-                            headers: {
-                                Cookie: `authToken=${authToken}`,
-                            },
-                        }}
-                        incognito
-                        startInLoadingState
-                        renderLoading={renderLoading}
-                        onNavigationStateChange={handleNavigationStateChange}
-                    />
-                </Modal>
-            )}
-        </>
-    );
-}
-
-ConnectToQuickbooksOnlineButton.displayName = 'ConnectToQuickbooksOnlineButton';
-
-export default withOnyx<ConnectToQuickbooksOnlineButtonProps, ConnectToQuickbooksOnlineButtonOnyxProps>({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(ConnectToQuickbooksOnlineButton);
diff --git a/src/pages/workspace/accounting/qboConnectionButton/index.tsx b/src/pages/workspace/accounting/qboConnectionButton/index.tsx
deleted file mode 100644
index 0bc06b4b92b3..000000000000
--- a/src/pages/workspace/accounting/qboConnectionButton/index.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import {withOnyx} from 'react-native-onyx';
-import Button from '@components/Button';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
-import * as Link from '@userActions/Link';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {ConnectToQuickbooksOnlineButtonOnyxProps, ConnectToQuickbooksOnlineButtonProps} from './types';
-
-function ConnectToQuickbooksOnlineButton({policyID, environmentURL}: ConnectToQuickbooksOnlineButtonProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-
-    return (
-        <Button
-            onPress={() => Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL)}
-            text={translate('workspace.accounting.setup')}
-            style={styles.justifyContentCenter}
-            small
-        />
-    );
-}
-
-export default withOnyx<ConnectToQuickbooksOnlineButtonProps, ConnectToQuickbooksOnlineButtonOnyxProps>({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(ConnectToQuickbooksOnlineButton);
diff --git a/src/pages/workspace/accounting/qboConnectionButton/types.ts b/src/pages/workspace/accounting/qboConnectionButton/types.ts
deleted file mode 100644
index ade3856a14ae..000000000000
--- a/src/pages/workspace/accounting/qboConnectionButton/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {OnyxEntry} from 'react-native-onyx';
-import type {Session} from '@src/types/onyx';
-
-type ConnectToQuickbooksOnlineButtonOnyxProps = {
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-};
-
-type ConnectToQuickbooksOnlineButtonProps = ConnectToQuickbooksOnlineButtonOnyxProps & {
-    policyID: string;
-    environmentURL: string;
-};
-
-export type {ConnectToQuickbooksOnlineButtonOnyxProps, ConnectToQuickbooksOnlineButtonProps};

From 56675fe839574b92ece822039c3a01cc38a0a729 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 18:46:39 -0700
Subject: [PATCH 159/383] Fix types

---
 src/libs/Navigation/types.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index ff4bdf9c706c..6a8f20724d35 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -241,22 +241,22 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_IMPORT]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_LOCATIONS]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_LOCATIONS]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CLASSES]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CLASSES]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_CUSTOMERS]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CUSTOMERS]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.QUICKBOOKS_ONLINE_TAXES]: {
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_TAXES]: {
         policyID: string;
     };
     [SCREENS.GET_ASSISTANCE]: {

From c6deef6476b81c3a446c0e1860932d9f8c558a7e Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 10 Apr 2024 18:49:23 -0700
Subject: [PATCH 160/383] Fix more types

---
 src/pages/workspace/WorkspaceInitialPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index f14052958010..a5609cdfd9c9 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -56,7 +56,6 @@ type WorkspaceMenuItem = {
         | typeof SCREENS.WORKSPACE.CATEGORIES
         | typeof SCREENS.WORKSPACE.TAGS
         | typeof SCREENS.WORKSPACE.TAXES
-        | typeof SCREENS.WORKSPACE.ACCOUNTING
         | typeof SCREENS.WORKSPACE.MORE_FEATURES
         | typeof SCREENS.WORKSPACE.PROFILE
         | typeof SCREENS.WORKSPACE.MEMBERS;

From c13c8981d5e26c712cab1c23a8841fa9cf9eadd1 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 11 Apr 2024 11:22:02 +0800
Subject: [PATCH 161/383] update comment

---
 .../home/report/ReportActionCompose/SuggestionMention.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 7905d55247bb..035681071248 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -295,8 +295,8 @@ function SuggestionMention(
     const onSelectionChange = useCallback(
         (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
             /**
-             * we pass here e.nativeEvent.selection.end directly to calculateEmojiSuggestion
-             * because in other case calculateEmojiSuggestion will have an old calculation value
+             * we pass here e.nativeEvent.selection.end directly to calculateMentionSuggestion
+             * because in other case calculateMentionSuggestion will have an old calculation value
              * of suggestion instead of current one
              */
             calculateMentionSuggestion(e.nativeEvent.selection.end);

From e59be1982915dfe3854786e5f77cfd3ac4b8a4e3 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 11 Apr 2024 11:38:54 +0700
Subject: [PATCH 162/383] Refactor layout of WorkspaceListRow

---
 src/pages/workspace/WorkspacesListRow.tsx | 197 ++++++++++------------
 1 file changed, 93 insertions(+), 104 deletions(-)

diff --git a/src/pages/workspace/WorkspacesListRow.tsx b/src/pages/workspace/WorkspacesListRow.tsx
index 54717b032ebe..1a6ef8c20577 100644
--- a/src/pages/workspace/WorkspacesListRow.tsx
+++ b/src/pages/workspace/WorkspacesListRow.tsx
@@ -21,6 +21,7 @@ import type {AnchorPosition} from '@styles/index';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import type IconAsset from '@src/types/utils/IconAsset';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 
 type WorkspacesListRowProps = WithCurrentUserPersonalDetailsProps & {
     /** Name of the workspace */
@@ -108,6 +109,7 @@ function WorkspacesListRow({
     const {translate} = useLocalize();
     const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
     const threeDotsMenuContainerRef = useRef<View>(null);
+    const {isSmallScreenWidth} = useWindowDimensions();
 
     const ownerDetails = ownerAccountID && PersonalDetailsUtils.getPersonalDetailsByIDs([ownerAccountID], currentUserPersonalDetails.accountID)[0];
 
@@ -136,124 +138,111 @@ function WorkspacesListRow({
     const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedback.deleted) : false;
 
     return (
-        <View style={[isWide ? styles.flexRow : styles.flexColumn, isWide && styles.gap5, styles.highlightBG, styles.br3, styles.pv5, styles.pl5, rowStyles, style]}>
-            <View style={[styles.flexRow, isWide && styles.flex1, styles.gap3, isNarrow && [styles.mb3, styles.mr5], styles.alignItemsCenter]}>
-                <Avatar
-                    imageStyles={[styles.alignSelfCenter]}
-                    size={CONST.AVATAR_SIZE.DEFAULT}
-                    source={workspaceIcon}
-                    fallbackIcon={fallbackWorkspaceIcon}
-                    name={title}
-                    type={CONST.ICON_TYPE_WORKSPACE}
-                />
-                <Text
-                    numberOfLines={1}
-                    style={[styles.flex1, styles.flexGrow1, styles.textStrong, isDeleted ? styles.offlineFeedback.deleted : {}]}
-                >
-                    {title}
-                </Text>
-                {isNarrow &&
-                    (!isJoinRequestPending ? (
+        <View style={[styles.flexRow, styles.highlightBG, rowStyles, style, isWide && styles.gap5, styles.br3, styles.pv5, styles.pl5]}>
+            <View style={[isWide ? styles.flexRow : styles.flexColumn, styles.flex1, isWide && styles.gap5]}>
+                <View style={[styles.flexRow, isWide && styles.flex1, styles.gap3, isNarrow && styles.mb3, styles.alignItemsCenter]}>
+                    <Avatar
+                        imageStyles={[styles.alignSelfCenter]}
+                        size={CONST.AVATAR_SIZE.DEFAULT}
+                        source={workspaceIcon}
+                        fallbackIcon={fallbackWorkspaceIcon}
+                        name={title}
+                        type={CONST.ICON_TYPE_WORKSPACE}
+                    />
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.flex1, styles.flexGrow1, styles.textStrong, isDeleted ? styles.offlineFeedback.deleted : {}]}
+                    >
+                        {title}
+                    </Text>
+                </View>
+                <View style={[styles.flexRow, isWide && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
+                    {!!ownerDetails && (
                         <>
-                            <BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
-                            <ThreeDotsMenu
-                                menuItems={menuItems}
-                                anchorPosition={{horizontal: 0, vertical: 0}}
-                                disabled={shouldDisableThreeDotsMenu}
+                            <Avatar
+                                source={ownerDetails.avatar}
+                                size={CONST.AVATAR_SIZE.SMALL}
+                                containerStyles={styles.workspaceOwnerAvatarWrapper}
                             />
+                            <View style={styles.flex1}>
+                                <Text
+                                    numberOfLines={1}
+                                    style={[styles.labelStrong, isDeleted ? styles.offlineFeedback.deleted : {}]}
+                                >
+                                    {PersonalDetailsUtils.getDisplayNameOrDefault(ownerDetails)}
+                                </Text>
+                                <Text
+                                    numberOfLines={1}
+                                    style={[styles.textMicro, styles.textSupporting, isDeleted ? styles.offlineFeedback.deleted : {}]}
+                                >
+                                    {ownerDetails.login}
+                                </Text>
+                            </View>
                         </>
-                    ) : (
+                    )}
+                </View>
+                <View style={[styles.flexRow, isWide && !isJoinRequestPending && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
+                    <Icon
+                        src={workspaceTypeIcon(workspaceType)}
+                        width={variables.workspaceTypeIconWidth}
+                        height={variables.workspaceTypeIconWidth}
+                        additionalStyles={styles.workspaceTypeWrapper}
+                    />
+                    <View>
+                        <Text
+                            numberOfLines={1}
+                            style={[styles.labelStrong, isDeleted ? styles.offlineFeedback.deleted : {}]}
+                        >
+                            {userFriendlyWorkspaceType}
+                        </Text>
+                        <Text
+                            numberOfLines={1}
+                            style={[styles.textMicro, styles.textSupporting, isDeleted ? styles.offlineFeedback.deleted : {}]}
+                        >
+                            {translate('workspace.common.plan')}
+                        </Text>
+                    </View>
+                </View>
+            </View>
+            <View style={[isNarrow && styles.mr5]}>
+                {isJoinRequestPending && (
+                    <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.flex1, styles.justifyContentEnd, styles.mln6, styles.pr4]}>
                         <Badge
                             text={translate('workspace.common.requested')}
                             textStyles={styles.textStrong}
                             badgeStyles={[styles.alignSelfCenter, styles.badgeBordered]}
                             icon={Expensicons.Hourglass}
                         />
-                    ))}
-            </View>
-            <View style={[styles.flexRow, isWide && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
-                {!!ownerDetails && (
+                    </View>
+                )}
+                {!isJoinRequestPending && (
                     <>
-                        <Avatar
-                            source={ownerDetails.avatar}
-                            size={CONST.AVATAR_SIZE.SMALL}
-                            containerStyles={styles.workspaceOwnerAvatarWrapper}
-                        />
-                        <View style={styles.flex1}>
-                            <Text
-                                numberOfLines={1}
-                                style={[styles.labelStrong, isDeleted ? styles.offlineFeedback.deleted : {}]}
-                            >
-                                {PersonalDetailsUtils.getDisplayNameOrDefault(ownerDetails)}
-                            </Text>
-                            <Text
-                                numberOfLines={1}
-                                style={[styles.textMicro, styles.textSupporting, isDeleted ? styles.offlineFeedback.deleted : {}]}
-                            >
-                                {ownerDetails.login}
-                            </Text>
+                        <View style={[styles.flexRow, styles.flex0, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
+                            <BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
+                        </View>
+                        <View ref={threeDotsMenuContainerRef}>
+                            <ThreeDotsMenu
+                                onIconPress={() => {
+                                    if (isSmallScreenWidth) {
+                                        return;
+                                    }
+                                    threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+                                        setThreeDotsMenuPosition({
+                                            horizontal: x + width,
+                                            vertical: y + height,
+                                        });
+                                    });
+                                }}
+                                menuItems={menuItems}
+                                anchorPosition={threeDotsMenuPosition}
+                                anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                                shouldOverlay
+                                disabled={shouldDisableThreeDotsMenu}
+                            />
                         </View>
                     </>
                 )}
             </View>
-            <View style={[styles.flexRow, isWide && !isJoinRequestPending && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
-                <Icon
-                    src={workspaceTypeIcon(workspaceType)}
-                    width={variables.workspaceTypeIconWidth}
-                    height={variables.workspaceTypeIconWidth}
-                    additionalStyles={styles.workspaceTypeWrapper}
-                />
-                <View>
-                    <Text
-                        numberOfLines={1}
-                        style={[styles.labelStrong, isDeleted ? styles.offlineFeedback.deleted : {}]}
-                    >
-                        {userFriendlyWorkspaceType}
-                    </Text>
-                    <Text
-                        numberOfLines={1}
-                        style={[styles.textMicro, styles.textSupporting, isDeleted ? styles.offlineFeedback.deleted : {}]}
-                    >
-                        {translate('workspace.common.plan')}
-                    </Text>
-                </View>
-            </View>
-            {isJoinRequestPending && !isNarrow && (
-                <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.flex1, styles.justifyContentEnd, styles.mln6, styles.pr4]}>
-                    <Badge
-                        text={translate('workspace.common.requested')}
-                        textStyles={styles.textStrong}
-                        badgeStyles={[styles.alignSelfCenter, styles.badgeBordered]}
-                        icon={Expensicons.Hourglass}
-                    />
-                </View>
-            )}
-
-            {isWide && !isJoinRequestPending && (
-                <>
-                    <View style={[styles.flexRow, styles.flex0, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
-                        <BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
-                    </View>
-                    <View ref={threeDotsMenuContainerRef}>
-                        <ThreeDotsMenu
-                            onIconPress={() => {
-                                threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
-                                    setThreeDotsMenuPosition({
-                                        horizontal: x + width,
-                                        vertical: y + height,
-                                    });
-                                });
-                            }}
-                            menuItems={menuItems}
-                            anchorPosition={threeDotsMenuPosition}
-                            anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
-                            iconStyles={[styles.mr2]}
-                            shouldOverlay
-                            disabled={shouldDisableThreeDotsMenu}
-                        />
-                    </View>
-                </>
-            )}
         </View>
     );
 }

From 789607a1deee28fd1e2a68485c8427c0a1c90acd Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 11 Apr 2024 11:55:38 +0700
Subject: [PATCH 163/383] fix lint

---
 src/pages/workspace/WorkspacesListRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspacesListRow.tsx b/src/pages/workspace/WorkspacesListRow.tsx
index 1a6ef8c20577..e9963e5469c2 100644
--- a/src/pages/workspace/WorkspacesListRow.tsx
+++ b/src/pages/workspace/WorkspacesListRow.tsx
@@ -15,13 +15,13 @@ import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalD
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import type {AvatarSource} from '@libs/UserUtils';
 import type {AnchorPosition} from '@styles/index';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import type IconAsset from '@src/types/utils/IconAsset';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 
 type WorkspacesListRowProps = WithCurrentUserPersonalDetailsProps & {
     /** Name of the workspace */

From c7b23f0afb9d440dbba80b68fd50a15c424b6f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Thu, 11 Apr 2024 12:03:06 +0200
Subject: [PATCH 164/383] merge fixes

---
 .../SelectionList/BaseSelectionList.tsx       |   9 +-
 src/components/SelectionList/types.ts         |   6 +-
 src/libs/getSectionsWithIndexOffset.ts        |   2 +-
 src/pages/WorkspaceSwitcherPage.tsx           | 289 ------------------
 src/pages/WorkspaceSwitcherPage/index.tsx     |  47 +--
 5 files changed, 10 insertions(+), 343 deletions(-)
 delete mode 100644 src/pages/WorkspaceSwitcherPage.tsx

diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index d902e33629ad..9faab237778d 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -2,7 +2,7 @@ import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import isEmpty from 'lodash/isEmpty';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
-import type {LayoutChangeEvent, SectionList as RNSectionList, TextInput as RNTextInput, SectionListRenderItemInfo} from 'react-native';
+import type {LayoutChangeEvent, SectionList as RNSectionList, TextInput as RNTextInput, SectionListData, SectionListRenderItemInfo} from 'react-native';
 import {View} from 'react-native';
 import ArrowKeyFocusManager from '@components/ArrowKeyFocusManager';
 import Button from '@components/Button';
@@ -298,7 +298,7 @@ function BaseSelectionList<TItem extends ListItem>(
      *
      *     [{header}, {sectionHeader}, {item}, {item}, {sectionHeader}, {item}, {item}, {footer}]
      */
-    const getItemLayout = (data: Array<SectionListDataType<TItem>> | null, flatDataArrayIndex: number) => {
+    const getItemLayout = (data: Array<SectionListData<TItem, SectionWithIndexOffset<TItem>>> | null, flatDataArrayIndex: number) => {
         const targetItem = flattenedSections.itemLayouts[flatDataArrayIndex];
 
         if (!targetItem) {
@@ -320,6 +320,7 @@ function BaseSelectionList<TItem extends ListItem>(
         if (section.CustomSectionHeader) {
             return <section.CustomSectionHeader section={section} />;
         }
+
         if (!section.title || isEmptyObject(section.data)) {
             return null;
         }
@@ -336,7 +337,7 @@ function BaseSelectionList<TItem extends ListItem>(
     };
 
     const renderItem = ({item, index, section}: SectionListRenderItemInfo<TItem, SectionWithIndexOffset<TItem>>) => {
-        const normalizedIndex = index + section.indexOffset;
+        const normalizedIndex = index + (section?.indexOffset ?? 0);
         const isDisabled = !!section.isDisabled || item.isDisabled;
         const isItemFocused = !isDisabled && (focusedIndex === normalizedIndex || itemsToHighlight?.has(item.keyForList ?? ''));
         // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
@@ -602,7 +603,7 @@ function BaseSelectionList<TItem extends ListItem>(
                                     viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
                                     testID="selection-list"
                                     onLayout={onSectionListLayout}
-                                    style={(!maxToRenderPerBatch || isInitialSectionListRender) && styles.opacity0}
+                                    style={(!maxToRenderPerBatch || (shouldHideListOnInitialRender && isInitialSectionListRender)) && styles.opacity0}
                                     ListFooterComponent={listFooterContent ?? ShowMoreButtonInstance}
                                 />
                                 {children}
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 20dd6291f578..2d8b99ae62ab 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -185,7 +185,7 @@ type SectionWithIndexOffset<TItem extends ListItem> = Section<TItem> & {
 
 type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Sections for the section list */
-    sections: Array<SectionListData<TItem, Section<TItem>>> | typeof CONST.EMPTY_ARRAY;
+    sections: Array<SectionListDataType<TItem>> | typeof CONST.EMPTY_ARRAY;
 
     /** Default renderer for every item in the list */
     ListItem: ValidListItem;
@@ -339,11 +339,11 @@ type FlattenedSectionsReturn<TItem extends ListItem> = {
 
 type ButtonOrCheckBoxRoles = 'button' | 'checkbox';
 
-type ExtendedSectionListData<TItem extends ListItem, TSection extends Section<TItem>> = SectionListData<TItem, TSection> & {
+type ExtendedSectionListData<TItem extends ListItem, TSection extends SectionWithIndexOffset<TItem>> = SectionListData<TItem, TSection> & {
     CustomSectionHeader?: ({section}: {section: TSection}) => ReactElement;
 };
 
-type SectionListDataType<TItem extends ListItem> = ExtendedSectionListData<TItem, Section<TItem>>;
+type SectionListDataType<TItem extends ListItem> = ExtendedSectionListData<TItem, SectionWithIndexOffset<TItem>>;
 
 export type {
     BaseSelectionListProps,
diff --git a/src/libs/getSectionsWithIndexOffset.ts b/src/libs/getSectionsWithIndexOffset.ts
index 7de78d048a4d..3237651a0385 100644
--- a/src/libs/getSectionsWithIndexOffset.ts
+++ b/src/libs/getSectionsWithIndexOffset.ts
@@ -3,7 +3,7 @@ import type {SectionListData} from 'react-native';
 /**
  * Returns a list of sections with indexOffset
  */
-export default function getSectionsWithIndexOffset<ItemT, SectionT>(sections: Array<SectionListData<ItemT, SectionT>>): Array<SectionListData<ItemT, SectionT & {indexOffset: number}>> {
+export default function getSectionsWithIndexOffset<ItemT, SectionT>(sections: Array<SectionListData<ItemT, SectionT>>): Array<SectionListData<ItemT, SectionT & {indexOffset?: number}>> {
     return sections.map((section, index) => {
         const indexOffset = [...sections].splice(0, index).reduce((acc, curr) => acc + (curr.data?.length ?? 0), 0);
         return {...section, indexOffset};
diff --git a/src/pages/WorkspaceSwitcherPage.tsx b/src/pages/WorkspaceSwitcherPage.tsx
deleted file mode 100644
index 631d377e34cd..000000000000
--- a/src/pages/WorkspaceSwitcherPage.tsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import React, {useCallback, useMemo, useState} from 'react';
-import {View} from 'react-native';
-import type {OnyxCollection} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import Icon from '@components/Icon';
-import * as Expensicons from '@components/Icon/Expensicons';
-import {MagnifyingGlass} from '@components/Icon/Expensicons';
-import OptionRow from '@components/OptionRow';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import UserListItem from '@components/SelectionList/UserListItem';
-import Text from '@components/Text';
-import Tooltip from '@components/Tooltip';
-import useActiveWorkspace from '@hooks/useActiveWorkspace';
-import useAutoFocusInput from '@hooks/useAutoFocusInput';
-import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import interceptAnonymousUser from '@libs/interceptAnonymousUser';
-import Navigation from '@libs/Navigation/Navigation';
-import * as PolicyUtils from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
-import {getWorkspacesBrickRoads, getWorkspacesUnreadStatuses} from '@libs/WorkspacesSettingsUtils';
-import * as App from '@userActions/App';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy} from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import WorkspaceCardCreateAWorkspace from './workspace/card/WorkspaceCardCreateAWorkspace';
-
-type SimpleWorkspaceItem = {
-    text?: string;
-    policyID?: string;
-    isPolicyAdmin?: boolean;
-};
-
-const sortWorkspacesBySelected = (workspace1: SimpleWorkspaceItem, workspace2: SimpleWorkspaceItem, selectedWorkspaceID: string | undefined): number => {
-    if (workspace1.policyID === selectedWorkspaceID) {
-        return -1;
-    }
-    if (workspace2.policyID === selectedWorkspaceID) {
-        return 1;
-    }
-    return workspace1.text?.toLowerCase().localeCompare(workspace2.text?.toLowerCase() ?? '') ?? 0;
-};
-
-type WorkspaceSwitcherPageOnyxProps = {
-    /** The list of this user's policies */
-    policies: OnyxCollection<Policy>;
-};
-
-type WorkspaceSwitcherPageProps = WorkspaceSwitcherPageOnyxProps;
-
-function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const {isOffline} = useNetwork();
-    const [searchTerm, setSearchTerm] = useState('');
-    const {inputCallbackRef} = useAutoFocusInput();
-    const {translate} = useLocalize();
-    const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace();
-
-    const brickRoadsForPolicies = useMemo(() => getWorkspacesBrickRoads(), []);
-    const unreadStatusesForPolicies = useMemo(() => getWorkspacesUnreadStatuses(), []);
-
-    const getIndicatorTypeForPolicy = useCallback(
-        (policyId?: string) => {
-            if (policyId && policyId !== activeWorkspaceID) {
-                return brickRoadsForPolicies[policyId];
-            }
-
-            if (Object.values(brickRoadsForPolicies).includes(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR)) {
-                return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
-            }
-
-            if (Object.values(brickRoadsForPolicies).includes(CONST.BRICK_ROAD_INDICATOR_STATUS.INFO)) {
-                return CONST.BRICK_ROAD_INDICATOR_STATUS.INFO;
-            }
-
-            return undefined;
-        },
-        [activeWorkspaceID, brickRoadsForPolicies],
-    );
-
-    const hasUnreadData = useCallback(
-        // TO DO: Implement checking if policy has some unread data
-        (policyId?: string) => {
-            if (policyId) {
-                return unreadStatusesForPolicies[policyId];
-            }
-
-            return Object.values(unreadStatusesForPolicies).some((status) => status);
-        },
-        [unreadStatusesForPolicies],
-    );
-
-    const selectPolicy = useCallback(
-        (option?: SimpleWorkspaceItem) => {
-            if (!option) {
-                return;
-            }
-
-            const {policyID} = option;
-
-            setActiveWorkspaceID(policyID);
-            Navigation.goBack();
-            if (policyID !== activeWorkspaceID) {
-                Navigation.navigateWithSwitchPolicyID({policyID});
-            }
-        },
-        [activeWorkspaceID, setActiveWorkspaceID],
-    );
-
-    const usersWorkspaces = useMemo(() => {
-        if (!policies || isEmptyObject(policies)) {
-            return [];
-        }
-
-        return Object.values(policies)
-            .filter((policy) => PolicyUtils.shouldShowPolicy(policy, !!isOffline))
-            .map((policy) => ({
-                text: policy?.name,
-                policyID: policy?.id,
-                brickRoadIndicator: getIndicatorTypeForPolicy(policy?.id),
-                icons: [
-                    {
-                        source: policy?.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy?.name),
-                        fallbackIcon: Expensicons.FallbackWorkspaceAvatar,
-                        name: policy?.name,
-                        type: CONST.ICON_TYPE_WORKSPACE,
-                    },
-                ],
-                boldStyle: hasUnreadData(policy?.id),
-                keyForList: policy?.id,
-                isPolicyAdmin: PolicyUtils.isPolicyAdmin(policy),
-                isSelected: policy?.id === activeWorkspaceID,
-            }));
-    }, [policies, getIndicatorTypeForPolicy, hasUnreadData, isOffline, activeWorkspaceID]);
-
-    const filteredAndSortedUserWorkspaces = useMemo(
-        () =>
-            usersWorkspaces
-                .filter((policy) => policy.text?.toLowerCase().includes(searchTerm?.toLowerCase() ?? ''))
-                .sort((policy1, policy2) => sortWorkspacesBySelected(policy1, policy2, activeWorkspaceID)),
-        [searchTerm, usersWorkspaces, activeWorkspaceID],
-    );
-
-    const usersWorkspacesSectionData = useMemo(
-        () => ({
-            data: filteredAndSortedUserWorkspaces,
-            shouldShow: true,
-        }),
-        [filteredAndSortedUserWorkspaces],
-    );
-
-    const everythingSection = useMemo(() => {
-        const option = {
-            reportID: '',
-            text: CONST.WORKSPACE_SWITCHER.NAME,
-            icons: [
-                {
-                    source: Expensicons.ExpensifyAppIcon,
-                    name: CONST.WORKSPACE_SWITCHER.NAME,
-                    type: CONST.ICON_TYPE_AVATAR,
-                },
-            ],
-            brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
-            boldStyle: hasUnreadData(undefined),
-        };
-
-        return (
-            <>
-                <View style={[styles.mh4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb3]}>
-                    <Text
-                        style={styles.label}
-                        color={theme.textSupporting}
-                    >
-                        {translate('workspace.switcher.everythingSection')}
-                    </Text>
-                </View>
-                <View>
-                    <OptionRow
-                        option={option}
-                        onSelectRow={selectPolicy}
-                        showTitleTooltip={false}
-                        highlightSelected
-                        isSelected={!activeWorkspaceID}
-                        optionIsFocused={!activeWorkspaceID}
-                    />
-                </View>
-            </>
-        );
-    }, [activeWorkspaceID, getIndicatorTypeForPolicy, hasUnreadData, selectPolicy, styles, theme.textSupporting, translate]);
-
-    const headerMessage = filteredAndSortedUserWorkspaces.length === 0 ? translate('common.noResultsFound') : '';
-
-    const workspacesSection = useMemo(
-        () => (
-            <>
-                <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, ...(usersWorkspaces.length > 0 ? [styles.mb1] : [styles.mb3])]}>
-                    <View>
-                        <Text
-                            style={styles.label}
-                            color={theme.textSupporting}
-                        >
-                            {translate('common.workspaces')}
-                        </Text>
-                    </View>
-                    <Tooltip text={translate('workspace.new.newWorkspace')}>
-                        <PressableWithFeedback
-                            accessible={false}
-                            role={CONST.ROLE.BUTTON}
-                            onPress={() => {
-                                Navigation.goBack();
-                                interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
-                            }}
-                        >
-                            {({hovered}) => (
-                                <Icon
-                                    src={Expensicons.Plus}
-                                    width={12}
-                                    height={12}
-                                    additionalStyles={[styles.buttonDefaultBG, styles.borderRadiusNormal, styles.p2, hovered && styles.buttonHoveredBG]}
-                                    fill={theme.icon}
-                                />
-                            )}
-                        </PressableWithFeedback>
-                    </Tooltip>
-                </View>
-
-                {usersWorkspaces.length > 0 ? (
-                    <SelectionList
-                        ListItem={UserListItem}
-                        textInputPlaceholder={translate('workspace.switcher.placeholder')}
-                        textInputRef={inputCallbackRef}
-                        sections={[usersWorkspacesSectionData]}
-                        textInputValue={searchTerm}
-                        onChangeText={setSearchTerm}
-                        onSelectRow={selectPolicy}
-                        shouldPreventDefaultFocusOnSelectRow
-                        headerMessage={headerMessage}
-                        containerStyle={[styles.pt0, styles.mt0]}
-                        textInputIconLeft={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH ? MagnifyingGlass : undefined}
-                        initiallyFocusedOptionKey={activeWorkspaceID}
-                        textInputAutoFocus={false}
-                    />
-                ) : (
-                    <WorkspaceCardCreateAWorkspace />
-                )}
-            </>
-        ),
-        [
-            inputCallbackRef,
-            setSearchTerm,
-            searchTerm,
-            selectPolicy,
-            styles,
-            theme.textSupporting,
-            translate,
-            usersWorkspaces.length,
-            usersWorkspacesSectionData,
-            activeWorkspaceID,
-            theme.icon,
-            headerMessage,
-        ],
-    );
-
-    return (
-        <ScreenWrapper testID={WorkspaceSwitcherPage.displayName}>
-            <HeaderWithBackButton
-                title={translate('workspace.switcher.headerTitle')}
-                onBackButtonPress={Navigation.goBack}
-            />
-            {everythingSection}
-            {workspacesSection}
-        </ScreenWrapper>
-    );
-}
-
-WorkspaceSwitcherPage.displayName = 'WorkspaceSwitcherPage';
-
-export default withOnyx<WorkspaceSwitcherPageProps, WorkspaceSwitcherPageOnyxProps>({
-    policies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-})(WorkspaceSwitcherPage);
diff --git a/src/pages/WorkspaceSwitcherPage/index.tsx b/src/pages/WorkspaceSwitcherPage/index.tsx
index 2e2a4293b95e..050c2d1a962a 100644
--- a/src/pages/WorkspaceSwitcherPage/index.tsx
+++ b/src/pages/WorkspaceSwitcherPage/index.tsx
@@ -1,9 +1,7 @@
 import React, {useCallback, useMemo} from 'react';
-import {View} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
@@ -13,8 +11,6 @@ import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -54,8 +50,6 @@ type WorkspaceSwitcherPageProps = WorkspaceSwitcherPageOnyxProps;
 const WorkspaceCardCreateAWorkspaceInstance = <WorkspaceCardCreateAWorkspace />;
 
 function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const {translate} = useLocalize();
@@ -176,44 +170,6 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
     const headerMessage = filteredAndSortedUserWorkspaces.length === 0 ? translate('common.noResultsFound') : '';
     const shouldShowCreateWorkspace = usersWorkspaces.length === 0;
 
-    const renderRightHandSideComponent = useCallback(
-        (item: WorkspaceListItem) => {
-            if (item.isSelected) {
-                return (
-                    <View style={styles.defaultCheckmarkWrapper}>
-                        <Icon
-                            src={Expensicons.Checkmark}
-                            fill={theme.iconSuccessFill}
-                        />
-                    </View>
-                );
-            }
-
-            if (item.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR) {
-                return (
-                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
-                        <Icon
-                            src={Expensicons.DotIndicator}
-                            fill={theme.danger}
-                        />
-                    </View>
-                );
-            }
-            if (item.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO) {
-                return (
-                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
-                        <Icon
-                            src={Expensicons.DotIndicator}
-                            fill={theme.iconSuccessFill}
-                        />
-                    </View>
-                );
-            }
-            return null;
-        },
-        [styles, theme],
-    );
-
     return (
         <ScreenWrapper
             testID={WorkspaceSwitcherPage.displayName}
@@ -225,7 +181,7 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                         title={translate('workspace.switcher.headerTitle')}
                         onBackButtonPress={Navigation.goBack}
                     />
-                    <SelectionList
+                    <SelectionList<WorkspaceListItem>
                         ListItem={UserListItem}
                         sections={didScreenTransitionEnd ? sections : CONST.EMPTY_ARRAY}
                         onSelectRow={selectPolicy}
@@ -233,7 +189,6 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                         textInputValue={searchTerm}
                         onChangeText={setSearchTerm}
                         headerMessage={headerMessage}
-                        rightHandSideComponent={renderRightHandSideComponent}
                         listFooterContent={shouldShowCreateWorkspace ? WorkspaceCardCreateAWorkspaceInstance : null}
                         initiallyFocusedOptionKey={activeWorkspaceID ?? CONST.WORKSPACE_SWITCHER.NAME}
                         showLoadingPlaceholder

From dc9ea0ec22746425392aa5b15dec7af307f2de6f Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Thu, 11 Apr 2024 20:53:25 +0700
Subject: [PATCH 165/383] fix: missing title on disabled input

---
 src/styles/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/styles/index.ts b/src/styles/index.ts
index f165974119ff..17876c4a49da 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -1092,6 +1092,7 @@ const styles = (theme: ThemeColors) =>
             color: theme.textSupporting,
             fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
             width: '100%',
+            zIndex: 1,
         },
 
         textInputLabelBackground: {

From 148676b6974810b2b39de9cc719cd803e567c9bf Mon Sep 17 00:00:00 2001
From: GandalfGwaihir <whogandalf@gmail.com>
Date: Thu, 11 Apr 2024 21:41:20 +0530
Subject: [PATCH 166/383] use useAutoFocusInput

---
 src/pages/EditReportFieldText.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/EditReportFieldText.tsx b/src/pages/EditReportFieldText.tsx
index d89724f0228b..ebb5c0acb188 100644
--- a/src/pages/EditReportFieldText.tsx
+++ b/src/pages/EditReportFieldText.tsx
@@ -3,8 +3,8 @@ import {View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
@@ -30,7 +30,7 @@ type EditReportFieldTextPageProps = {
 function EditReportFieldTextPage({fieldName, onSubmit, fieldValue, isRequired, fieldKey}: EditReportFieldTextPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const inputRef = useRef<AnimatedTextInputRef>(null);
+    const {inputCallbackRef} = useAutoFocusInput();
 
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM>) => {
@@ -61,7 +61,7 @@ function EditReportFieldTextPage({fieldName, onSubmit, fieldValue, isRequired, f
                     label={fieldName}
                     accessibilityLabel={fieldName}
                     role={CONST.ROLE.PRESENTATION}
-                    ref={inputRef}
+                    ref={inputCallbackRef}
                 />
             </View>
         </FormProvider>

From 46b6a09f211f3306f50c5e5d7d29c796823eae5c Mon Sep 17 00:00:00 2001
From: Adam Grzybowski <adam.grzybowski@swmansion.com>
Date: Thu, 11 Apr 2024 17:45:46 +0200
Subject: [PATCH 167/383] migrate search page to chat finder page

---
 src/CONST.ts                                  |  3 +-
 src/ROUTES.ts                                 |  2 +-
 src/SCREENS.ts                                |  4 +-
 src/libs/E2E/reactNativeLaunchingTest.ts      |  3 +-
 ...t.e2e.ts => openChatFinderPageTest.e2e.ts} | 10 ++---
 .../Navigation/AppNavigator/AuthScreens.tsx   |  2 +-
 .../ModalStackNavigators/index.tsx            |  8 ++--
 .../Navigators/LeftModalNavigator.tsx         |  4 +-
 .../createCustomBottomTabNavigator/TopBar.tsx |  2 +-
 src/libs/Navigation/linkingConfig/config.ts   |  4 +-
 src/libs/Navigation/types.ts                  | 10 ++---
 .../ChatFinderPageFooter.tsx}                 |  6 +--
 .../{SearchPage => ChatFinderPage}/index.tsx  | 39 ++++++++++---------
 tests/e2e/config.ts                           |  7 ++--
 tests/perf-test/SearchPage.perf-test.tsx      | 32 +++++++--------
 15 files changed, 71 insertions(+), 65 deletions(-)
 rename src/libs/E2E/tests/{openSearchPageTest.e2e.ts => openChatFinderPageTest.e2e.ts} (85%)
 rename src/pages/{SearchPage/SearchPageFooter.tsx => ChatFinderPage/ChatFinderPageFooter.tsx} (77%)
 rename src/pages/{SearchPage => ChatFinderPage}/index.tsx (85%)

diff --git a/src/CONST.ts b/src/CONST.ts
index 39c3d9d3109b..7b48698f55a6 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -873,7 +873,8 @@ const CONST = {
     },
     TIMING: {
         CALCULATE_MOST_RECENT_LAST_MODIFIED_ACTION: 'calc_most_recent_last_modified_action',
-        SEARCH_RENDER: 'search_render',
+        // ASK: Should we also update this name?
+        CHAT_FINDER_RENDER: 'chat_finder',
         CHAT_RENDER: 'chat_render',
         OPEN_REPORT: 'open_report',
         HOMEPAGE_INITIAL_RENDER: 'homepage_initial_render',
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 77b5ffd2c80f..be447acb5d6a 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -28,7 +28,7 @@ const ROUTES = {
         route: 'flag/:reportID/:reportActionID',
         getRoute: (reportID: string, reportActionID: string) => `flag/${reportID}/${reportActionID}` as const,
     },
-    SEARCH: 'search',
+    CHAT_FINDER: 'chat-finder',
     DETAILS: {
         route: 'details',
         getRoute: (login: string) => `details?login=${encodeURIComponent(login)}` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index b3c2012e90d2..79693f6fee5d 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -95,7 +95,7 @@ const SCREENS = {
         ROOT: 'SaveTheWorld_Root',
     },
     LEFT_MODAL: {
-        SEARCH: 'Search',
+        CHAT_FINDER: 'ChatFinder',
         WORKSPACE_SWITCHER: 'WorkspaceSwitcher',
     },
     WORKSPACE_SWITCHER: {
@@ -312,7 +312,7 @@ const SCREENS = {
     REPORT_PARTICIPANTS_ROOT: 'ReportParticipants_Root',
     ROOM_MEMBERS_ROOT: 'RoomMembers_Root',
     ROOM_INVITE_ROOT: 'RoomInvite_Root',
-    SEARCH_ROOT: 'Search_Root',
+    CHAT_FINDER_ROOT: 'ChatFinder_Root',
     FLAG_COMMENT_ROOT: 'FlagComment_Root',
     REIMBURSEMENT_ACCOUNT: 'ReimbursementAccount',
     GET_ASSISTANCE: 'GetAssistance',
diff --git a/src/libs/E2E/reactNativeLaunchingTest.ts b/src/libs/E2E/reactNativeLaunchingTest.ts
index 776e3de74f06..0a685a2788d1 100644
--- a/src/libs/E2E/reactNativeLaunchingTest.ts
+++ b/src/libs/E2E/reactNativeLaunchingTest.ts
@@ -35,7 +35,8 @@ if (!appInstanceId) {
 // import your test here, define its name and config first in e2e/config.js
 const tests: Tests = {
     [E2EConfig.TEST_NAMES.AppStartTime]: require('./tests/appStartTimeTest.e2e').default,
-    [E2EConfig.TEST_NAMES.OpenSearchPage]: require('./tests/openSearchPageTest.e2e').default,
+    // ASK: Should we also update this name?
+    [E2EConfig.TEST_NAMES.OpenChatFinderPage]: require('./tests/openChatFinderPageTest.e2e').default,
     [E2EConfig.TEST_NAMES.ChatOpening]: require('./tests/chatOpeningTest.e2e').default,
     [E2EConfig.TEST_NAMES.ReportTyping]: require('./tests/reportTypingTest.e2e').default,
     [E2EConfig.TEST_NAMES.Linking]: require('./tests/linkingTest.e2e').default,
diff --git a/src/libs/E2E/tests/openSearchPageTest.e2e.ts b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
similarity index 85%
rename from src/libs/E2E/tests/openSearchPageTest.e2e.ts
rename to src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
index 86da851396f6..549cb7b8c2c9 100644
--- a/src/libs/E2E/tests/openSearchPageTest.e2e.ts
+++ b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
@@ -9,7 +9,7 @@ import ROUTES from '@src/ROUTES';
 
 const test = () => {
     // check for login (if already logged in the action will simply resolve)
-    console.debug('[E2E] Logging in for search');
+    console.debug('[E2E] Logging in for chat finding');
 
     E2ELogin().then((neededLogin: boolean): Promise<Response> | undefined => {
         if (neededLogin) {
@@ -19,12 +19,12 @@ const test = () => {
             );
         }
 
-        console.debug('[E2E] Logged in, getting search metrics and submitting them…');
+        console.debug('[E2E] Logged in, getting chat finding metrics and submitting them…');
 
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
-                console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
-                Navigation.navigate(ROUTES.SEARCH);
+                console.debug(`[E2E] Sidebar loaded, navigating to chat finder route…`);
+                Navigation.navigate(ROUTES.CHAT_FINDER);
                 return;
             }
 
@@ -36,7 +36,7 @@ const test = () => {
             console.debug(`[E2E] Submitting!`);
             E2EClient.submitTestResults({
                 branch: Config.E2E_BRANCH,
-                name: 'Open Search Page TTI',
+                name: 'Open Chat Finder Page TTI',
                 duration: entry.duration,
             })
                 .then(() => {
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index fde0202d3d2f..9157d7486c9e 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -238,7 +238,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
         const unsubscribeSearchShortcut = KeyboardShortcut.subscribe(
             searchShortcutConfig.shortcutKey,
             () => {
-                Modal.close(Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.SEARCH)));
+                Modal.close(Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.CHAT_FINDER)));
             },
             shortcutsOverviewShortcutConfig.descriptionKey,
             shortcutsOverviewShortcutConfig.modifiers,
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index c251f8143631..504dfe534d72 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -4,6 +4,7 @@ import {createStackNavigator} from '@react-navigation/stack';
 import React from 'react';
 import type {
     AddPersonalBankAccountNavigatorParamList,
+    ChatFinderNavigatorParamList,
     DetailsNavigatorParamList,
     EditRequestNavigatorParamList,
     EnablePaymentsNavigatorParamList,
@@ -22,7 +23,6 @@ import type {
     ReportSettingsNavigatorParamList,
     RoomInviteNavigatorParamList,
     RoomMembersNavigatorParamList,
-    SearchNavigatorParamList,
     SettingsNavigatorParamList,
     SignInNavigatorParamList,
     SplitDetailsNavigatorParamList,
@@ -143,8 +143,8 @@ const RoomInviteModalStackNavigator = createModalStackNavigator<RoomInviteNaviga
     [SCREENS.ROOM_INVITE_ROOT]: () => require('../../../../pages/RoomInvitePage').default as React.ComponentType,
 });
 
-const SearchModalStackNavigator = createModalStackNavigator<SearchNavigatorParamList>({
-    [SCREENS.SEARCH_ROOT]: () => require('../../../../pages/SearchPage').default as React.ComponentType,
+const ChatFinderModalStackNavigator = createModalStackNavigator<ChatFinderNavigatorParamList>({
+    [SCREENS.CHAT_FINDER_ROOT]: () => require('../../../../pages/ChatFinderPage').default as React.ComponentType,
 });
 
 const NewChatModalStackNavigator = createModalStackNavigator<NewChatNavigatorParamList>({
@@ -338,7 +338,7 @@ export {
     ReportDescriptionModalStackNavigator,
     RoomInviteModalStackNavigator,
     RoomMembersModalStackNavigator,
-    SearchModalStackNavigator,
+    ChatFinderModalStackNavigator,
     SettingsModalStackNavigator,
     SignInModalStackNavigator,
     SplitDetailsModalStackNavigator,
diff --git a/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx
index 8f76d8fbdd7b..159430a66a43 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx
@@ -32,8 +32,8 @@ function LeftModalNavigator({navigation}: LeftModalNavigatorProps) {
             <View style={styles.LHPNavigatorContainer(isSmallScreenWidth)}>
                 <Stack.Navigator screenOptions={screenOptions}>
                     <Stack.Screen
-                        name={SCREENS.LEFT_MODAL.SEARCH}
-                        component={ModalStackNavigators.SearchModalStackNavigator}
+                        name={SCREENS.LEFT_MODAL.CHAT_FINDER}
+                        component={ModalStackNavigators.ChatFinderModalStackNavigator}
                     />
                     <Stack.Screen
                         name={SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER}
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
index fd5282a8cfcd..a06c9d08c529 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
@@ -66,7 +66,7 @@ function TopBar({policy, session}: TopBarProps) {
                         <PressableWithoutFeedback
                             accessibilityLabel={translate('sidebarScreen.buttonSearch')}
                             style={[styles.flexRow, styles.mr2]}
-                            onPress={Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.SEARCH))}
+                            onPress={Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.CHAT_FINDER))}
                         >
                             <Icon
                                 src={Expensicons.MagnifyingGlass}
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 95294b7711b5..769116d72c3d 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -67,9 +67,9 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
         [SCREENS.NOT_FOUND]: '*',
         [NAVIGATORS.LEFT_MODAL_NAVIGATOR]: {
             screens: {
-                [SCREENS.LEFT_MODAL.SEARCH]: {
+                [SCREENS.LEFT_MODAL.CHAT_FINDER]: {
                     screens: {
-                        [SCREENS.SEARCH_ROOT]: ROUTES.SEARCH,
+                        [SCREENS.CHAT_FINDER_ROOT]: ROUTES.CHAT_FINDER,
                     },
                 },
                 [SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER]: {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 3976d12a9537..5d4a614909c9 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -294,8 +294,8 @@ type NewChatNavigatorParamList = {
     [SCREENS.NEW_CHAT.ROOT]: undefined;
 };
 
-type SearchNavigatorParamList = {
-    [SCREENS.SEARCH_ROOT]: undefined;
+type ChatFinderNavigatorParamList = {
+    [SCREENS.CHAT_FINDER_ROOT]: undefined;
 };
 
 type DetailsNavigatorParamList = {
@@ -568,7 +568,7 @@ type PrivateNotesNavigatorParamList = {
 };
 
 type LeftModalNavigatorParamList = {
-    [SCREENS.LEFT_MODAL.SEARCH]: NavigatorScreenParams<SearchNavigatorParamList>;
+    [SCREENS.LEFT_MODAL.CHAT_FINDER]: NavigatorScreenParams<ChatFinderNavigatorParamList>;
     [SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER]: NavigatorScreenParams<WorkspaceSwitcherNavigatorParamList>;
 };
 
@@ -744,7 +744,7 @@ type AuthScreensParamList = SharedScreensParamList & {
     };
 };
 
-type RootStackParamList = PublicScreensParamList & AuthScreensParamList & SearchNavigatorParamList;
+type RootStackParamList = PublicScreensParamList & AuthScreensParamList & ChatFinderNavigatorParamList;
 
 type BottomTabName = keyof BottomTabNavigatorParamList;
 
@@ -788,7 +788,7 @@ export type {
     ParticipantsNavigatorParamList,
     RoomMembersNavigatorParamList,
     RoomInviteNavigatorParamList,
-    SearchNavigatorParamList,
+    ChatFinderNavigatorParamList,
     NewChatNavigatorParamList,
     NewTaskNavigatorParamList,
     TeachersUniteNavigatorParamList,
diff --git a/src/pages/SearchPage/SearchPageFooter.tsx b/src/pages/ChatFinderPage/ChatFinderPageFooter.tsx
similarity index 77%
rename from src/pages/SearchPage/SearchPageFooter.tsx
rename to src/pages/ChatFinderPage/ChatFinderPageFooter.tsx
index 3d5ebfd2c193..ce7b4f3003df 100644
--- a/src/pages/SearchPage/SearchPageFooter.tsx
+++ b/src/pages/ChatFinderPage/ChatFinderPageFooter.tsx
@@ -4,7 +4,7 @@ import ReferralProgramCTA from '@components/ReferralProgramCTA';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 
-function SearchPageFooter() {
+function ChatFinderPageFooter() {
     const themeStyles = useThemeStyles();
 
     return (
@@ -14,6 +14,6 @@ function SearchPageFooter() {
     );
 }
 
-SearchPageFooter.displayName = 'SearchPageFooter';
+ChatFinderPageFooter.displayName = 'ChatFinderPageFooter';
 
-export default SearchPageFooter;
+export default ChatFinderPageFooter;
diff --git a/src/pages/SearchPage/index.tsx b/src/pages/ChatFinderPage/index.tsx
similarity index 85%
rename from src/pages/SearchPage/index.tsx
rename to src/pages/ChatFinderPage/index.tsx
index 7d2a5bfecbb8..80c64de1c69b 100644
--- a/src/pages/SearchPage/index.tsx
+++ b/src/pages/ChatFinderPage/index.tsx
@@ -25,9 +25,9 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
-import SearchPageFooter from './SearchPageFooter';
+import ChatFinderPageFooter from './ChatFinderPageFooter';
 
-type SearchPageOnyxProps = {
+type ChatFinderPageOnyxProps = {
     /** Beta features list */
     betas: OnyxEntry<OnyxTypes.Beta[]>;
 
@@ -35,25 +35,26 @@ type SearchPageOnyxProps = {
     isSearchingForReports: OnyxEntry<boolean>;
 };
 
-type SearchPageProps = SearchPageOnyxProps & StackScreenProps<RootStackParamList, typeof SCREENS.SEARCH_ROOT>;
+type ChatFinderPageProps = ChatFinderPageOnyxProps & StackScreenProps<RootStackParamList, typeof SCREENS.CHAT_FINDER_ROOT>;
 
 type Options = OptionsListUtils.Options & {headerMessage: string};
 
-type SearchPageSectionItem = {
+type ChatFinderPageSectionItem = {
     data: OptionData[];
     shouldShow: boolean;
 };
 
-type SearchPageSectionList = SearchPageSectionItem[];
+type ChatFinderPageSectionList = ChatFinderPageSectionItem[];
 
 const setPerformanceTimersEnd = () => {
-    Timing.end(CONST.TIMING.SEARCH_RENDER);
-    Performance.markEnd(CONST.TIMING.SEARCH_RENDER);
+    // ASK: Should we also update this name?
+    Timing.end(CONST.TIMING.CHAT_FINDER_RENDER);
+    Performance.markEnd(CONST.TIMING.CHAT_FINDER_RENDER);
 };
 
-const SearchPageFooterInstance = <SearchPageFooter />;
+const ChatFinderPageFooterInstance = <ChatFinderPageFooter />;
 
-function SearchPage({betas, isSearchingForReports, navigation}: SearchPageProps) {
+function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPageProps) {
     const [isScreenTransitionEnd, setIsScreenTransitionEnd] = useState(false);
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -67,8 +68,9 @@ function SearchPage({betas, isSearchingForReports, navigation}: SearchPageProps)
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
 
     useEffect(() => {
-        Timing.start(CONST.TIMING.SEARCH_RENDER);
-        Performance.markStart(CONST.TIMING.SEARCH_RENDER);
+        // ASK: Should we also update this name?
+        Timing.start(CONST.TIMING.CHAT_FINDER_RENDER);
+        Performance.markStart(CONST.TIMING.CHAT_FINDER_RENDER);
     }, []);
 
     useEffect(() => {
@@ -115,8 +117,8 @@ function SearchPage({betas, isSearchingForReports, navigation}: SearchPageProps)
 
     const {recentReports, personalDetails: localPersonalDetails, userToInvite, headerMessage} = debouncedSearchValue.trim() !== '' ? filteredOptions : searchOptions;
 
-    const sections = useMemo((): SearchPageSectionList => {
-        const newSections: SearchPageSectionList = [];
+    const sections = useMemo((): ChatFinderPageSectionList => {
+        const newSections: ChatFinderPageSectionList = [];
 
         if (recentReports?.length > 0) {
             newSections.push({
@@ -162,7 +164,7 @@ function SearchPage({betas, isSearchingForReports, navigation}: SearchPageProps)
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
-            testID={SearchPage.displayName}
+            testID={ChatFinderPage.displayName}
             onEntryTransitionEnd={handleScreenTransitionEnd}
             shouldEnableMaxHeight
             navigation={navigation}
@@ -170,6 +172,7 @@ function SearchPage({betas, isSearchingForReports, navigation}: SearchPageProps)
             {({safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
+                        // ASK: What text do we want to use for the title?
                         title={translate('common.search')}
                         onBackButtonPress={Navigation.goBack}
                     />
@@ -186,7 +189,7 @@ function SearchPage({betas, isSearchingForReports, navigation}: SearchPageProps)
                             onLayout={setPerformanceTimersEnd}
                             onSelectRow={selectReport}
                             showLoadingPlaceholder={!areOptionsInitialized}
-                            footerContent={SearchPageFooterInstance}
+                            footerContent={ChatFinderPageFooterInstance}
                             isLoadingNewOptions={isSearchingForReports ?? undefined}
                         />
                     </View>
@@ -196,9 +199,9 @@ function SearchPage({betas, isSearchingForReports, navigation}: SearchPageProps)
     );
 }
 
-SearchPage.displayName = 'SearchPage';
+ChatFinderPage.displayName = 'ChatFinderPage';
 
-export default withOnyx<SearchPageProps, SearchPageOnyxProps>({
+export default withOnyx<ChatFinderPageProps, ChatFinderPageOnyxProps>({
     betas: {
         key: ONYXKEYS.BETAS,
     },
@@ -206,4 +209,4 @@ export default withOnyx<SearchPageProps, SearchPageOnyxProps>({
         key: ONYXKEYS.IS_SEARCHING_FOR_REPORTS,
         initWithStoredValues: false,
     },
-})(SearchPage);
+})(ChatFinderPage);
diff --git a/tests/e2e/config.ts b/tests/e2e/config.ts
index d6d097b6c346..63469454a1ac 100644
--- a/tests/e2e/config.ts
+++ b/tests/e2e/config.ts
@@ -4,7 +4,8 @@ const OUTPUT_DIR = process.env.WORKING_DIRECTORY || './tests/e2e/results';
 // add your test name here …
 const TEST_NAMES = {
     AppStartTime: 'App start time',
-    OpenSearchPage: 'Open search page TTI',
+    // ASK: Should we also update this name?
+    OpenChatFinderPage: 'Open chat finder page TTI',
     ReportTyping: 'Report typing',
     ChatOpening: 'Chat opening',
     Linking: 'Linking',
@@ -71,8 +72,8 @@ export default {
 
             // ... any additional config you might need
         },
-        [TEST_NAMES.OpenSearchPage]: {
-            name: TEST_NAMES.OpenSearchPage,
+        [TEST_NAMES.OpenChatFinderPage]: {
+            name: TEST_NAMES.OpenChatFinderPage,
         },
         // TODO: Fix text and enable again
         // [TEST_NAMES.ReportTyping]: {
diff --git a/tests/perf-test/SearchPage.perf-test.tsx b/tests/perf-test/SearchPage.perf-test.tsx
index ea759a1201b2..c5bbd0eb1266 100644
--- a/tests/perf-test/SearchPage.perf-test.tsx
+++ b/tests/perf-test/SearchPage.perf-test.tsx
@@ -12,7 +12,7 @@ import OptionListContextProvider, {OptionsListContext} from '@components/OptionL
 import type {WithNavigationFocusProps} from '@components/withNavigationFocus';
 import type {RootStackParamList} from '@libs/Navigation/types';
 import {createOptionList} from '@libs/OptionsListUtils';
-import SearchPage from '@pages/SearchPage';
+import ChatFinderPage from '@pages/ChatFinderPage';
 import ComposeProviders from '@src/components/ComposeProviders';
 import OnyxProvider from '@src/components/OnyxProvider';
 import CONST from '@src/CONST';
@@ -116,16 +116,16 @@ afterEach(() => {
     PusherHelper.teardown();
 });
 
-type SearchPageProps = StackScreenProps<RootStackParamList, typeof SCREENS.SEARCH_ROOT> & {
+type ChatFinderPageProps = StackScreenProps<RootStackParamList, typeof SCREENS.CHAT_FINDER_ROOT> & {
     betas: OnyxEntry<Beta[]>;
     reports: OnyxCollection<Report>;
     isSearchingForReports: OnyxEntry<boolean>;
 };
 
-function SearchPageWrapper(args: SearchPageProps) {
+function ChatFinderPageWrapper(args: ChatFinderPageProps) {
     return (
         <ComposeProviders components={[OnyxProvider, LocaleContextProvider, OptionListContextProvider]}>
-            <SearchPage
+            <ChatFinderPage
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...args}
                 navigation={args.navigation}
@@ -134,11 +134,11 @@ function SearchPageWrapper(args: SearchPageProps) {
     );
 }
 
-function SearchPageWithCachedOptions(args: SearchPageProps) {
+function ChatFinderPageWithCachedOptions(args: ChatFinderPageProps) {
     return (
         <ComposeProviders components={[OnyxProvider, LocaleContextProvider]}>
             <OptionsListContext.Provider value={useMemo(() => ({options: mockedOptions, initializeOptions: () => {}, areOptionsInitialized: true}), [])}>
-                <SearchPage
+                <ChatFinderPage
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...args}
                     navigation={args.navigation}
@@ -152,7 +152,7 @@ test('[Search Page] should render list with cached options', async () => {
     const {addListener} = TestHelper.createAddListenerMock();
 
     const scenario = async () => {
-        await screen.findByTestId('SearchPage');
+        await screen.findByTestId('ChatFinderPage');
     };
 
     const navigation = {addListener};
@@ -168,7 +168,7 @@ test('[Search Page] should render list with cached options', async () => {
                 }),
             )
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            .then(() => measurePerformance(<SearchPageWithCachedOptions navigation={navigation} />, {scenario}))
+            .then(() => measurePerformance(<ChatFinderPageWithCachedOptions navigation={navigation} />, {scenario}))
     );
 });
 
@@ -176,7 +176,7 @@ test('[Search Page] should interact when text input changes', async () => {
     const {addListener} = TestHelper.createAddListenerMock();
 
     const scenario = async () => {
-        await screen.findByTestId('SearchPage');
+        await screen.findByTestId('ChatFinderPage');
 
         const input = screen.getByTestId('selection-list-text-input');
         fireEvent.changeText(input, 'Email Four');
@@ -197,7 +197,7 @@ test('[Search Page] should interact when text input changes', async () => {
                 }),
             )
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            .then(() => measurePerformance(<SearchPageWrapper navigation={navigation} />, {scenario}))
+            .then(() => measurePerformance(<ChatFinderPageWrapper navigation={navigation} />, {scenario}))
     );
 });
 
@@ -206,7 +206,7 @@ test.skip('[Search Page] should render selection list', async () => {
     const smallMockedPersonalDetails = getMockedPersonalDetails(5);
 
     const scenario = async () => {
-        await screen.findByTestId('SearchPage');
+        await screen.findByTestId('ChatFinderPage');
         await waitFor(triggerTransitionEnd as Awaited<() => Promise<void>>);
         await screen.findByTestId('selection-list');
         await screen.findByText(smallMockedPersonalDetails['1'].login as TextMatch);
@@ -226,7 +226,7 @@ test.skip('[Search Page] should render selection list', async () => {
                 }),
             )
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            .then(() => measurePerformance(<SearchPageWrapper navigation={navigation} />, {scenario}))
+            .then(() => measurePerformance(<ChatFinderPageWrapper navigation={navigation} />, {scenario}))
     );
 });
 
@@ -234,7 +234,7 @@ test('[Search Page] should search in selection list', async () => {
     const {triggerTransitionEnd, addListener} = TestHelper.createAddListenerMock();
 
     const scenario = async () => {
-        await screen.findByTestId('SearchPage');
+        await screen.findByTestId('ChatFinderPage');
         await waitFor(triggerTransitionEnd as Awaited<() => Promise<void>>);
 
         const input = screen.getByTestId('selection-list-text-input');
@@ -257,7 +257,7 @@ test('[Search Page] should search in selection list', async () => {
                 }),
             )
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            .then(() => measurePerformance(<SearchPageWrapper navigation={navigation} />, {scenario}))
+            .then(() => measurePerformance(<ChatFinderPageWrapper navigation={navigation} />, {scenario}))
     );
 });
 
@@ -265,7 +265,7 @@ test('[Search Page] should click on list item', async () => {
     const {triggerTransitionEnd, addListener} = TestHelper.createAddListenerMock();
 
     const scenario = async () => {
-        await screen.findByTestId('SearchPage');
+        await screen.findByTestId('ChatFinderPage');
         const input = screen.getByTestId('selection-list-text-input');
         await waitFor(triggerTransitionEnd as Awaited<() => Promise<void>>);
 
@@ -288,6 +288,6 @@ test('[Search Page] should click on list item', async () => {
                 }),
             )
             // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            .then(() => measurePerformance(<SearchPageWrapper navigation={navigation} />, {scenario}))
+            .then(() => measurePerformance(<ChatFinderPageWrapper navigation={navigation} />, {scenario}))
     );
 });

From 4be2d73f69cb457e32babed0101d66ed7a16bef4 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Thu, 11 Apr 2024 22:08:11 +0530
Subject: [PATCH 168/383] Fixing translations

---
 src/CONST.ts                                  |  2 +-
 ...raryForRefactorRequestConfirmationList.tsx |  2 +-
 .../MoneyRequestPreview/types.ts              |  2 +-
 .../ReportActionItemImages.tsx                |  2 +-
 src/languages/en.ts                           | 37 ++++++-------------
 src/languages/es.ts                           | 15 +-------
 src/libs/IOUUtils.ts                          |  2 +-
 src/libs/ReportActionsUtils.ts                |  2 +-
 src/libs/ReportUtils.ts                       |  8 ++--
 src/pages/home/report/ReportActionsView.tsx   |  4 +-
 .../request/step/IOURequestStepMerchant.tsx   |  2 +-
 .../step/IOURequestStepScan/index.native.tsx  |  2 +-
 .../request/step/IOURequestStepScan/index.tsx |  2 +-
 .../step/IOURequestStepTaxAmountPage.tsx      |  4 +-
 tests/unit/ReportUtilsTest.ts                 |  4 +-
 15 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 29817a4bb955..3c5bef7a1eb1 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1357,7 +1357,7 @@ const CONST = {
     },
 
     KYC_WALL_SOURCE: {
-        REPORT: 'REPORT', // The user attempted to pay a money request
+        REPORT: 'REPORT', // The user attempted to pay an expense
         ENABLE_WALLET: 'ENABLE_WALLET', // The user clicked on the `Enable wallet` button on the Wallet page
         TRANSFER_BALANCE: 'TRANSFER_BALANCE', // The user attempted to transfer their wallet balance to their bank account or debit card
     },
diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
index 19c08baa310e..e982f3d5f03b 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
@@ -64,7 +64,7 @@ type MoneyRequestConfirmationListOnyxProps = {
     /** The session of the logged in user */
     session: OnyxEntry<OnyxTypes.Session>;
 
-    /** Unit and rate used for if the money request is a distance request */
+    /** Unit and rate used for if the expense is a distance expense */
     mileageRate: OnyxEntry<DefaultMileageRate>;
 };
 
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/types.ts b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
index 1c036bc0fbee..dc709c16aede 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/types.ts
+++ b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
@@ -62,7 +62,7 @@ type MoneyRequestPreviewProps = MoneyRequestPreviewOnyxProps & {
     /** True if the IOU Preview card is hovered */
     isHovered?: boolean;
 
-    /** Whether or not an IOU report contains money requests in a different currency
+    /** Whether or not an IOU report contains expenses in a different currency
      * that are either created or cancelled offline, and thus haven't been converted to the report's currency yet
      */
     shouldShowPendingConversionMessage?: boolean;
diff --git a/src/components/ReportActionItem/ReportActionItemImages.tsx b/src/components/ReportActionItem/ReportActionItemImages.tsx
index ee8cb0849ca0..e2bcce9b9f1b 100644
--- a/src/components/ReportActionItem/ReportActionItemImages.tsx
+++ b/src/components/ReportActionItem/ReportActionItemImages.tsx
@@ -30,7 +30,7 @@ type ReportActionItemImagesProps = {
 
 /**
  * This component displays a row of images in a report action item like a card, such
- * as report previews or money request previews which contain receipt images. The maximum of images
+ * as report previews or expense previews which contain receipt images. The maximum of images
  * shown in this row is dictated by the size prop, which, if not passed, is just the number of images.
  * Otherwise, if size is passed and the number of images is over size, we show a small overlay on the
  * last image of how many additional images there are. If passed, total prop can be used to change how this
diff --git a/src/languages/en.ts b/src/languages/en.ts
index dc4225187744..82d62af3135d 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -419,7 +419,7 @@ export default {
     },
     login: {
         hero: {
-            header: 'Track, submit, and split expenses, and chat with friends.',
+            header: 'Manage spend, split expenses, and chat with your team.',
             body: 'Welcome to the future of Expensify, your new go-to place for financial collaboration with friends and teammates alike.',
         },
     },
@@ -501,7 +501,7 @@ export default {
         beginningOfChatHistory: 'This is the beginning of your chat with ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: 'Collaboration between ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' and ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, submit expense and settle up.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, submit expenses and settle up.',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         chatWithAccountManager: 'Chat with your account manager here',
         sayHello: 'Say hello!',
@@ -649,7 +649,7 @@ export default {
         nextStep: 'Next Steps',
         finished: 'Finished',
         submitAmount: ({amount}: RequestAmountParams) => `submit ${amount}`,
-        expensedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `expensed ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
+        submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `submitted ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `split ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
@@ -692,7 +692,7 @@ export default {
             invalidTaxAmount: ({amount}: RequestAmountParams) => `Maximum tax amount is ${amount}`,
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
-            genericCreateFailureMessage: 'Unexpected error creating the expense, please try again later',
+            genericCreateFailureMessage: 'Unexpected error submitting this expense. Please try again later.',
             receiptFailureMessage: "The receipt didn't upload. ",
             saveFileMessage: 'Download the file ',
             loseFileMessage: 'or dismiss this error and lose it',
@@ -701,7 +701,7 @@ export default {
             genericSmartscanFailureMessage: 'Transaction is missing fields',
             duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
             atLeastTwoDifferentWaypoints: 'Please enter at least two different addresses',
-            splitExpenseMultipleParticipantsErrorMessage: 'Split expense is only allowed between a single workspace or individual users. Please update your selection.',
+            splitExpenseMultipleParticipantsErrorMessage: 'An expense cannot be split between a workspace and other members. Please update your selection.',
             invalidMerchant: 'Please enter a correct merchant.',
         },
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
@@ -1247,19 +1247,6 @@ export default {
         },
         chooseThemeBelowOrSync: 'Choose a theme below, or sync with your device settings.',
     },
-    signInPage: {
-        expensifyDotCash: 'New Expensify',
-        theCode: 'the code',
-        openJobs: 'open jobs',
-        heroHeading: 'Split bills\nand chat with friends.',
-        heroDescription: {
-            phrase1: "Money talks. And now that chat and payments are in one place, it's also easy. Your payments get to you as fast as you can get your point across.",
-            phrase2: 'The New Expensify is open source. View',
-            phrase3: 'the code',
-            phrase4: 'View',
-            phrase5: 'open jobs',
-        },
-    },
     termsOfUse: {
         phrase1: 'By logging in, you agree to the',
         phrase2: 'Terms of Service',
@@ -1325,7 +1312,7 @@ export default {
             [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Get paid back by my employer',
             [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: "Manage my team's expenses",
             [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: 'Track and budget personal spend',
-            [CONST.ONBOARDING_CHOICES.CHAT_SPLIT]: 'Chat and split bills with friends',
+            [CONST.ONBOARDING_CHOICES.CHAT_SPLIT]: 'Chat and split expenses with friends',
             [CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: "I'm just looking around",
         },
         error: {
@@ -2629,25 +2616,25 @@ export default {
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]: {
             buttonText1: 'Submit expense, ',
             buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`,
-            header: `Submit expense, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `It pays to get paid! Submit expense from a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
+            header: `Submit an expense, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            body: `It pays to get paid! Submit an expense to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]: {
             buttonText1: 'Pay Someone, ',
             buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`,
             header: `Pay Someone, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `You gotta send money to make money! Send money to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
+            body: `You gotta spend money to make money! Pay someone with Expensify and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]: {
             buttonText1: 'Invite a friend, ',
             buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`,
             header: `Get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `Be the first to chat, send or request money, split a bill, or share your invite link with a friend, and you'll get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. You can post your invite link on social media, too!`,
+            body: `Chat, pay, submit, or split an expense with a friend and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. Otherwise, just share your invite link!`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]: {
             buttonText1: `Get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             header: `Get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `Be the first to chat, send or request money, split a bill, or share your invite link with a friend, and you'll get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. You can post your invite link on social media, too!`,
+            body: `Chat, pay, submit, or split an expense with a friend and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. Otherwise, just share your invite link!`,
         },
         copyReferralLink: 'Copy invite link',
     },
@@ -2655,7 +2642,7 @@ export default {
         [CONST.INTRO_CHOICES.TRACK]: 'Track business spend for taxes',
         [CONST.INTRO_CHOICES.SUBMIT]: 'Get paid back by my employer',
         [CONST.INTRO_CHOICES.MANAGE_TEAM]: "Manage my team's expenses",
-        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chat and split bills with friends',
+        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chat and split expenses with friends',
         welcomeMessage: 'Welcome to Expensify',
         welcomeSubtitle: 'What would you like to do?',
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 07447c9a5521..8be29cf0ad28 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -650,7 +650,7 @@ export default {
         nextStep: 'Pasos Siguientes',
         finished: 'Finalizado',
         submitAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
-        expensedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicité ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
+        submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicité ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `seguimiento ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `dividió ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
@@ -1254,19 +1254,6 @@ export default {
         },
         chooseThemeBelowOrSync: 'Elige un tema a continuación o sincronízalo con los ajustes de tu dispositivo.',
     },
-    signInPage: {
-        expensifyDotCash: 'Nuevo Expensify',
-        theCode: 'el código',
-        openJobs: 'trabajos disponibles',
-        heroHeading: 'Dividir cuentas\ny chatear con amigos.',
-        heroDescription: {
-            phrase1: 'El dinero habla. Y ahora que el chat y los pagos están en un solo lugar, también es fácil. Tus pagos te llegan tan rápido como puedes hacer llegar tu mensaje',
-            phrase2: 'Nuevo Expensify es de código abierto. Vista',
-            phrase3: 'el código',
-            phrase4: 'Vista',
-            phrase5: 'vacantes',
-        },
-    },
     termsOfUse: {
         phrase1: 'Al iniciar sesión, estás accediendo a los',
         phrase2: 'Términos de Servicio',
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index f4769de0f2dd..8729e62c8720 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -92,7 +92,7 @@ function updateIOUOwnerAndTotal<TReport extends OnyxEntry<Report>>(
 }
 
 /**
- * Returns whether or not an IOU report contains money requests in a different currency
+ * Returns whether or not an IOU report contains expenses in a different currency
  * that are either created or cancelled offline, and thus haven't been converted to the report's currency yet
  */
 function isIOUReportPendingCurrencyConversion(iouReport: Report): boolean {
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 7e32b66734af..86e059d720a9 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -773,7 +773,7 @@ function isMessageDeleted(reportAction: OnyxEntry<ReportAction>): boolean {
 }
 
 /**
- * Returns the number of money requests associated with a report preview
+ * Returns the number of expenses associated with a report preview
  */
 function getNumberOfMoneyRequests(reportPreviewAction: OnyxEntry<ReportAction>): number {
     return reportPreviewAction?.childMoneyRequestCount ?? 0;
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 131fd300a850..e698e70b0a18 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2639,7 +2639,7 @@ function getReportPreviewMessage(
 
             const transactionDetails = getTransactionDetails(linkedTransaction);
             const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency ?? '');
-            return Localize.translateLocal('iou.expensedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
+            return Localize.translateLocal('iou.submittedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
         }
     }
 
@@ -2723,7 +2723,7 @@ function getReportPreviewMessage(
 
         // We only want to show the actor name in the preview if it's not the current user who took the action
         const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : '';
-        return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.expensedAmount', {formattedAmount: amountToDisplay, comment})}`;
+        return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.submittedAmount', {formattedAmount: amountToDisplay, comment})}`;
     }
 
     if (containsNonReimbursable) {
@@ -3708,7 +3708,7 @@ function updateReportPreview(iouReport: OnyxEntry<Report>, reportPreviewAction:
                   ...previousTransactions,
               }
             : recentReceiptTransactions,
-        // As soon as we add a transaction without a receipt to the report, it will have ready money requests,
+        // As soon as we add a transaction without a receipt to the report, it will have ready expenses,
         // so we remove the whisper
         whisperedToAccountIDs: hasReceipt ? reportPreviewAction?.whisperedToAccountIDs : [],
     };
@@ -5307,7 +5307,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
     } else if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
         translationKey = 'iou.trackedAmount';
     } else {
-        translationKey = 'iou.expensedAmount';
+        translationKey = 'iou.submittedAmount';
     }
     return Localize.translateLocal(translationKey, {
         formattedAmount,
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
index edaf98c0b6cf..098a3b8bb429 100755
--- a/src/pages/home/report/ReportActionsView.tsx
+++ b/src/pages/home/report/ReportActionsView.tsx
@@ -145,7 +145,7 @@ function ReportActionsView({
         // Filter out the created action from the transaction thread report actions, since we already have the parent report's created action in `reportActions`
         const filteredTransactionThreadReportActions = transactionThreadReportActions?.filter((action) => action.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED);
 
-        // Filter out the money request actions because we don't want to show any preview actions for one-transaction reports
+        // Filter out the expense actions because we don't want to show any preview actions for one-transaction reports
         const filteredReportActions = [...allReportActions, ...filteredTransactionThreadReportActions].filter((action) => {
             const actionType = (action as OnyxTypes.OriginalMessageIOU).originalMessage?.type ?? '';
             return actionType !== CONST.IOU.REPORT_ACTION_TYPE.CREATE && actionType !== CONST.IOU.REPORT_ACTION_TYPE.TRACK && !ReportActionsUtils.isSentMoneyReportAction(action);
@@ -444,7 +444,7 @@ function ReportActionsView({
     // When we are offline before opening an IOU/Expense report,
     // the total of the report and sometimes the expense aren't displayed because these actions aren't returned until `OpenReport` API is complete.
     // We generate a fake created action here if it doesn't exist to display the total whenever possible because the total just depends on report data
-    // and we also generate an expense action if the number of expenses in reportActions is less than the total number of money requests
+    // and we also generate an expense action if the number of expenses in reportActions is less than the total number of expenses
     // to display at least one expense action to match the total data.
     const reportActionsToDisplay = useMemo(() => {
         if (!ReportUtils.isMoneyRequestReport(report) || !reportActions.length) {
diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
index 901edfbab562..02bdf0a086ca 100644
--- a/src/pages/iou/request/step/IOURequestStepMerchant.tsx
+++ b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
@@ -99,7 +99,7 @@ function IOURequestStepMerchant({
         }
         IOU.setMoneyRequestMerchant(transactionID, newMerchant ?? '', !isEditing);
         if (isEditing) {
-            // When creating new money requests newMerchant can be blank so we fall back on PARTIAL_TRANSACTION_MERCHANT
+            // When creating new expense newMerchant can be blank so we fall back on PARTIAL_TRANSACTION_MERCHANT
             IOU.updateMoneyRequestMerchant(transactionID, reportID, newMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, policy, policyTags, policyCategories);
         }
         navigateBack();
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
index e084a3db7422..543cc09dc7ab 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
@@ -40,7 +40,7 @@ import type IOURequestStepOnyxProps from './types';
 
 type IOURequestStepScanProps = IOURequestStepOnyxProps &
     WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_SCAN> & {
-        /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+        /** Holds data related to Expense view state, rather than the underlying Expense data. */
         transaction: OnyxEntry<OnyxTypes.Transaction>;
     };
 
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
index b9c4f866d493..49bc5337011f 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -40,7 +40,7 @@ import type IOURequestStepOnyxProps from './types';
 
 type IOURequestStepScanProps = IOURequestStepOnyxProps &
     WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_SCAN> & {
-        /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+        /** Holds data related to Expense view state, rather than the underlying Expense data. */
         transaction: OnyxEntry<OnyxTypes.Transaction>;
     };
 
diff --git a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
index f7bef7671804..456db728e2b6 100644
--- a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
+++ b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
@@ -102,8 +102,8 @@ function IOURequestStepTaxAmountPage({
     };
 
     const navigateToCurrencySelectionPage = () => {
-        // If the money request being created is a distance request, don't allow the user to choose the currency.
-        // Only USD is allowed for distance requests.
+        // If the expense being created is a distance expense, don't allow the user to choose the currency.
+        // Only USD is allowed for distance expenses.
         // Remove query from the route and encode it.
         Navigation.navigate(
             ROUTES.MONEY_REQUEST_STEP_CURRENCY.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, backTo ? 'confirm' : '', Navigation.getActiveRouteWithoutParams()),
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index 102fd2c98b4f..d1be9a347831 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -538,7 +538,7 @@ describe('ReportUtils', () => {
             });
         });
 
-        describe('return only money request and track expense options if', () => {
+        describe('return only submit expense and track expense options if', () => {
             it("it is an expense report tied to user's own policy expense chat", () => {
                 Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}102`, {
                     reportID: '102',
@@ -658,9 +658,7 @@ describe('ReportUtils', () => {
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.REQUEST)).toBe(true);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SEND)).toBe(true);
             });
-        });
 
-        describe('return multiple money request options and the track expense option if', () => {
             it("it is user's own policy expense chat", () => {
                 const report = {
                     ...LHNTestUtils.getFakeReport(),

From ee08c768ca50b2f4eb26444151d6de2a58b200f5 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Thu, 11 Apr 2024 22:13:07 +0530
Subject: [PATCH 169/383] Fixed wrong translation

---
 src/languages/en.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 82d62af3135d..d9f3d9a3b774 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -924,8 +924,7 @@ export default {
         reasonForLeavingPrompt: 'We’d hate to see you go! Would you kindly tell us why, so we can improve?',
         enterMessageHere: 'Enter message here',
         closeAccountWarning: 'Closing your account cannot be undone.',
-        closeAccountPermanentlyDeleteData:
-            'This will permanently delete all of your unsubmitted expense data and will cancel and decline any outstanding submitted expenses. Are you sure you want to delete the account?',
+        closeAccountPermanentlyDeleteData: 'Are you sure you want to delete your account? This will permanently delete any outstanding expenses.',
         enterDefaultContactToConfirm: 'Please type your default contact method to confirm you wish to close your account. Your default contact method is:',
         enterDefaultContact: 'Enter your default contact method',
         defaultContact: 'Default contact method:',

From ff152a3639286bff5991e16474a602041a89887c Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Thu, 11 Apr 2024 22:37:04 +0530
Subject: [PATCH 170/383] Fixed message

---
 src/libs/ReportUtils.ts                                         | 2 +-
 .../ReportActionCompose/AttachmentPickerWithMenuItems.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index e698e70b0a18..c2becaf781a6 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3354,7 +3354,7 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
             iouMessage = `submitted ${amount}`;
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
-            iouMessage = `requested ${amount}${comment && ` for ${comment}`}`; // TODO: Recheck this
+            iouMessage = `submitted ${amount}${comment && ` for ${comment}`}`; // TODO: Recheck this
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.TRACK:
             iouMessage = `tracking ${amount}${comment && ` for ${comment}`}`;
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index bf09f39d3f87..4e268a8ad906 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -135,7 +135,7 @@ function AttachmentPickerWithMenuItems({
             },
             [CONST.IOU.TYPE.SEND]: {
                 icon: Expensicons.Send,
-                text: translate('iou.payName', {name: report?.reportName ?? ''}),
+                text: translate('iou.payName', {name: ReportUtils.getReportName(report)}),
                 onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.SEND, report?.reportID ?? ''),
             },
             [CONST.IOU.TYPE.TRACK_EXPENSE]: {

From ecb1e4f65f752983cdb6d0e7e1c36f292a74d740 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 12 Apr 2024 00:45:33 +0700
Subject: [PATCH 171/383] fix: inconsistent group chat name

---
 src/libs/ReportUtils.ts                          | 4 ++++
 src/pages/home/HeaderView.tsx                    | 2 +-
 src/pages/settings/Report/ReportSettingsPage.tsx | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 924a621b5d6c..7eb2b9310a7d 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2918,6 +2918,10 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         return Localize.translateLocal('parentReportAction.deletedTask');
     }
 
+    if (isGroupChat(report)) {
+        return getGroupChatName(report?.participantAccountIDs ?? [], true) ?? '';
+    }
+
     if (isChatRoom(report) || isTaskReport(report)) {
         formattedName = report?.reportName;
     }
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 1164666e4992..d0ee317e205d 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -87,7 +87,7 @@ function HeaderView({report, personalDetails, parentReport, parentReportAction,
     const isTaskReport = ReportUtils.isTaskReport(report);
     const reportHeaderData = !isTaskReport && !isChatThread && report.parentReportID ? parentReport : report;
     // Use sorted display names for the title for group chats on native small screen widths
-    const title = isGroupChat ? ReportUtils.getGroupChatName(report.participantAccountIDs ?? [], true) : ReportUtils.getReportName(reportHeaderData);
+    const title = ReportUtils.getReportName(reportHeaderData);
     const subtitle = ReportUtils.getChatRoomSubtitle(reportHeaderData);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(reportHeaderData);
     const isConcierge = ReportUtils.hasSingleParticipant(report) && participants.includes(CONST.ACCOUNT_ID.CONCIERGE);
diff --git a/src/pages/settings/Report/ReportSettingsPage.tsx b/src/pages/settings/Report/ReportSettingsPage.tsx
index f1c4047ae33e..9b56bacb5793 100644
--- a/src/pages/settings/Report/ReportSettingsPage.tsx
+++ b/src/pages/settings/Report/ReportSettingsPage.tsx
@@ -47,8 +47,7 @@ function ReportSettingsPage({report, policies}: ReportSettingsPageProps) {
 
     const shouldShowNotificationPref = !isMoneyRequestReport && report?.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
     const roomNameLabel = translate(isMoneyRequestReport ? 'workspace.editor.nameInputLabel' : 'newRoomPage.roomName');
-    const reportName =
-        ReportUtils.isDeprecatedGroupDM(report) || ReportUtils.isGroupChat(report) ? ReportUtils.getGroupChatName(report.participantAccountIDs ?? []) : ReportUtils.getReportName(report);
+    const reportName = ReportUtils.getReportName(report);
 
     const shouldShowWriteCapability = !isMoneyRequestReport;
 

From ddc621e77ed113eef6081a0dd12c05bc86419374 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Thu, 11 Apr 2024 23:31:36 +0530
Subject: [PATCH 172/383] Fixed jest tests

---
 tests/actions/IOUTest.ts   | 8 ++++----
 tests/unit/IOUUtilsTest.ts | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
index 93be3783483a..aa0af7e5f037 100644
--- a/tests/actions/IOUTest.ts
+++ b/tests/actions/IOUTest.ts
@@ -1740,8 +1740,8 @@ describe('actions/IOU', () => {
                                         expect.objectContaining({
                                             total: 20000,
                                             cachedTotal: '$200.00',
-                                            lastMessageHtml: 'requested $200.00',
-                                            lastMessageText: 'requested $200.00',
+                                            lastMessageHtml: 'submitted $200.00',
+                                            lastMessageText: 'submitted $200.00',
                                         }),
                                     );
                                     expect(updatedChatReport).toEqual(
@@ -1894,8 +1894,8 @@ describe('actions/IOU', () => {
                                         expect.objectContaining({
                                             total: 10000,
                                             cachedTotal: '$100.00',
-                                            lastMessageHtml: `requested $${amount / 100}.00 for ${comment}`,
-                                            lastMessageText: `requested $${amount / 100}.00 for ${comment}`,
+                                            lastMessageHtml: `submitted $${amount / 100}.00 for ${comment}`,
+                                            lastMessageText: `submitted $${amount / 100}.00 for ${comment}`,
                                         }),
                                     );
                                     expect(updatedChatReport).toEqual(
diff --git a/tests/unit/IOUUtilsTest.ts b/tests/unit/IOUUtilsTest.ts
index 33dd1ff05e13..363f327bbca8 100644
--- a/tests/unit/IOUUtilsTest.ts
+++ b/tests/unit/IOUUtilsTest.ts
@@ -25,7 +25,7 @@ describe('IOUUtils', () => {
             });
         });
 
-        test('Requesting money offline in a different currency will show the pending conversion message', () => {
+        test('Submitting expense offline in a different currency will show the pending conversion message', () => {
             const iouReport = ReportUtils.buildOptimisticIOUReport(1, 2, 100, '1', 'USD');
             const usdPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'USD', iouReport.reportID);
             const aedPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'AED', iouReport.reportID);
@@ -34,12 +34,12 @@ describe('IOUUtils', () => {
             MergeQueries[`${ONYXKEYS.COLLECTION.TRANSACTION}${aedPendingTransaction.transactionID}`] = aedPendingTransaction;
 
             return Onyx.mergeCollection(ONYXKEYS.COLLECTION.TRANSACTION, MergeQueries).then(() => {
-                // We requested money offline in a different currency, we don't know the total of the iouReport until we're back online
+                // We submitted expense offline in a different currency, we don't know the total of the iouReport until we're back online
                 expect(IOUUtils.isIOUReportPendingCurrencyConversion(iouReport)).toBe(true);
             });
         });
 
-        test('Requesting money online in a different currency will not show the pending conversion message', () => {
+        test('Submitting expense online in a different currency will not show the pending conversion message', () => {
             const iouReport = ReportUtils.buildOptimisticIOUReport(2, 3, 100, '1', 'USD');
             const usdPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'USD', iouReport.reportID);
             const aedPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'AED', iouReport.reportID);
@@ -55,7 +55,7 @@ describe('IOUUtils', () => {
             };
 
             return Onyx.mergeCollection(ONYXKEYS.COLLECTION.TRANSACTION, MergeQueries).then(() => {
-                // We requested money online in a different currency, we know the iouReport total and there's no need to show the pending conversion message
+                // We submitted expense online in a different currency, we know the iouReport total and there's no need to show the pending conversion message
                 expect(IOUUtils.isIOUReportPendingCurrencyConversion(iouReport)).toBe(false);
             });
         });

From 45526c914e7d834a538a4c0c8d901f4d3fd917cd Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Fri, 12 Apr 2024 00:21:02 +0530
Subject: [PATCH 173/383] fix: Web - Persistence of Tax Selection When
 Navigating to Other Pages and Returning

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/workspace/WorkspaceMembersPage.tsx              | 8 +++++++-
 .../workspace/categories/WorkspaceCategoriesPage.tsx      | 1 +
 .../workspace/distanceRates/PolicyDistanceRatesPage.tsx   | 1 +
 src/pages/workspace/tags/WorkspaceTagsPage.tsx            | 1 +
 src/pages/workspace/taxes/WorkspaceTaxesPage.tsx          | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index dfaf50c0bcf6..e97f4359dff5 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -1,4 +1,4 @@
-import {useIsFocused} from '@react-navigation/native';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import lodashIsEqual from 'lodash/isEqual';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
@@ -144,6 +144,12 @@ function WorkspaceMembersPage({policyMembers, personalDetails, invitedEmailsToAc
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isFocused]);
 
+    useFocusEffect(
+        useCallback(() => {
+            setSelectedEmployees([]);
+        }, []),
+    );
+
     useEffect(() => {
         validateSelection();
     }, [preferredLocale, validateSelection]);
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 5c2dbe6de352..df25ab254496 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -72,6 +72,7 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
 
     useFocusEffect(
         useCallback(() => {
+            setSelectedCategories({});
             fetchCategories();
         }, [fetchCategories]),
     );
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index 37c827ebdf31..27e6611062e2 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -89,6 +89,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
 
     useFocusEffect(
         useCallback(() => {
+            setSelectedDistanceRates([]);
             fetchDistanceRates();
         }, [fetchDistanceRates]),
     );
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index eed0015a9aa4..e4286eb9df0d 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -79,6 +79,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
 
     useFocusEffect(
         useCallback(() => {
+            setSelectedTags({});
             fetchTags();
         }, [fetchTags]),
     );
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index 7628bf25a1b8..0b9c1274c94c 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -62,6 +62,7 @@ function WorkspaceTaxesPage({
 
     useFocusEffect(
         useCallback(() => {
+            setSelectedTaxesIDs([]);
             fetchTaxes();
         }, [fetchTaxes]),
     );

From 09d0b17a05b786e1222d40aa93d5f6a0ad9caca3 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 12 Apr 2024 00:21:18 +0530
Subject: [PATCH 174/383] fix type errors

---
 ...raryForRefactorRequestConfirmationList.tsx | 18 ++++++------
 src/libs/Navigation/types.ts                  |  1 +
 ...yForRefactorRequestParticipantsSelector.js | 18 ++++++------
 .../step/IOURequestStepConfirmation.tsx       | 28 +++++++++----------
 .../step/IOURequestStepParticipants.tsx       | 26 ++++++++---------
 5 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
index 85db13e38572..ce0aab10e552 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
@@ -162,7 +162,7 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
 
     reportActionID?: string;
 
-    iouAction?: ValueOf<typeof CONST.IOU.ACTION>;
+    action?: ValueOf<typeof CONST.IOU.ACTION>;
 };
 
 const getTaxAmount = (transaction: OnyxEntry<OnyxTypes.Transaction>, defaultTaxValue: string) => {
@@ -208,7 +208,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
     onToggleBillable,
     hasSmartScanFailed,
     reportActionID,
-    iouAction = CONST.IOU.ACTION.CREATE,
+    action = CONST.IOU.ACTION.CREATE,
 }: MoneyRequestConfirmationListProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -661,7 +661,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                             return;
                         }
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(iouAction, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         );
                     }}
                     style={[styles.moneyRequestMenuItem, styles.mt2]}
@@ -685,7 +685,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     onPress={() => {
                         Navigation.navigate(
                             ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(
-                                iouAction,
+                                action,
                                 iouType,
                                 transaction?.transactionID ?? '',
                                 reportID,
@@ -715,7 +715,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     onPress={() =>
                         Navigation.navigate(
                             ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(
-                                iouAction,
+                                action,
                                 iouType,
                                 transaction?.transactionID ?? '',
                                 reportID,
@@ -743,7 +743,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     onPress={() => {
                         Navigation.navigate(
                             ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(
-                                iouAction,
+                                action,
                                 iouType,
                                 transaction?.transactionID ?? '',
                                 reportID,
@@ -773,7 +773,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() => {
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(iouAction, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
+                            ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         );
                     }}
                     disabled={didConfirm}
@@ -796,7 +796,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     onPress={() =>
                         Navigation.navigate(
                             ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(
-                                iouAction,
+                                action,
                                 iouType,
                                 transaction?.transactionID ?? '',
                                 reportID,
@@ -812,7 +812,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                 />
             ),
             shouldShow: shouldShowCategories,
-            isSupplementary: iouAction === CONST.IOU.ACTION.CATEGORIZE ? false : !isCategoryRequired,
+            isSupplementary: action === CONST.IOU.ACTION.CATEGORIZE ? false : !isCategoryRequired,
         },
         ...policyTagLists.map(({name, required}, index) => {
             const isTagRequired = required === undefined ? false : canUseViolations && required;
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 3976d12a9537..cf89724fcf07 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -442,6 +442,7 @@ type MoneyRequestNavigatorParamList = {
         reportID: string;
     };
     [SCREENS.MONEY_REQUEST.STEP_PARTICIPANTS]: {
+        action: ValueOf<typeof CONST.IOU.ACTION>;
         iouType: ValueOf<typeof CONST.IOU.TYPE>;
         transactionID: string;
         reportID: string;
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 3dc1fb15af96..5b41c7c9e837 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -68,7 +68,7 @@ const propTypes = {
     didScreenTransitionEnd: PropTypes.bool,
 
     /** The action of the IOU, i.e. create, split, move */
-    iouAction: PropTypes.oneOf(_.values(CONST.IOU.ACTION)),
+    action: PropTypes.oneOf(_.values(CONST.IOU.ACTION)),
 };
 
 const defaultProps = {
@@ -77,7 +77,7 @@ const defaultProps = {
     betas: [],
     dismissedReferralBanners: {},
     didScreenTransitionEnd: false,
-    iouAction: CONST.IOU.ACTION.CREATE,
+    action: CONST.IOU.ACTION.CREATE,
 };
 
 function MoneyTemporaryForRefactorRequestParticipantsSelector({
@@ -90,7 +90,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
     iouRequestType,
     dismissedReferralBanners,
     didScreenTransitionEnd,
-    iouAction,
+    action,
 }) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -132,9 +132,9 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
             // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
             // sees the option to request money from their admin on their own Workspace Chat.
-            iouType === CONST.IOU.TYPE.REQUEST && iouAction !== CONST.IOU.ACTION.MOVE,
+            iouType === CONST.IOU.TYPE.REQUEST && action !== CONST.IOU.ACTION.MOVE,
 
-            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && ![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction),
+            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && ![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action),
             false,
             {},
             [],
@@ -167,7 +167,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
             shouldShow: !_.isEmpty(chatOptions.recentReports),
         });
 
-        if (![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction)) {
+        if (![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action)) {
             newSections.push({
                 title: translate('common.contacts'),
                 data: chatOptions.personalDetails,
@@ -195,7 +195,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
         debouncedSearchTerm,
         participants,
         iouType,
-        iouAction,
+        action,
         canUseP2PDistanceRequests,
         iouRequestType,
         maxParticipantsReached,
@@ -287,7 +287,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
     // canUseP2PDistanceRequests is true if the iouType is track expense, but we don't want to allow splitting distance with track expense yet
     const isAllowedToSplit =
         (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
-        (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE || ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(iouAction));
+        (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE || ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action));
 
     const handleConfirmSelection = useCallback(
         (keyEvent, option) => {
@@ -395,7 +395,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({
 
     const isAllSectionsEmpty = _.every(sections, (section) => section.data.length === 0);
 
-    if ([CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction) && isAllSectionsEmpty && didScreenTransitionEnd && searchTerm.trim() === '') {
+    if ([CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action) && isAllSectionsEmpty && didScreenTransitionEnd && searchTerm.trim() === '') {
         return renderEmptyWorkspaceView();
     }
 
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 756cdfddf19f..fb55f8d2fd68 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -57,7 +57,7 @@ function IOURequestStepConfirmation({
     policyCategories,
     report,
     route: {
-        params: {iouType, reportID, transactionID, action: iouAction},
+        params: {iouType, reportID, transactionID, action},
     },
     transaction,
 }: IOURequestStepConfirmationProps) {
@@ -80,10 +80,10 @@ function IOURequestStepConfirmation({
     const requestType = TransactionUtils.getRequestType(transaction);
 
     const headerTitle = useMemo(() => {
-        if (iouAction === CONST.IOU.ACTION.CATEGORIZE) {
+        if (action === CONST.IOU.ACTION.CATEGORIZE) {
             return translate('iou.categorize');
         }
-        if (iouAction === CONST.IOU.ACTION.MOVE) {
+        if (action === CONST.IOU.ACTION.MOVE) {
             return translate('iou.request');
         }
         if (iouType === CONST.IOU.TYPE.SPLIT) {
@@ -96,7 +96,7 @@ function IOURequestStepConfirmation({
             return translate('common.send');
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
-    }, [iouType, transaction, translate, iouAction]);
+    }, [iouType, transaction, translate, action]);
 
     const participants = useMemo(
         () =>
@@ -155,22 +155,22 @@ function IOURequestStepConfirmation({
         // If there is not a report attached to the IOU with a reportID, then the participants were manually selected and the user needs taken
         // back to the participants step
         if (!transaction?.participantsAutoAssigned) {
-            Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID, undefined, iouAction));
+            Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID, undefined, action));
             return;
         }
-        IOUUtils.navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID, iouAction);
-    }, [transaction, iouType, requestType, transactionID, reportID, iouAction]);
+        IOUUtils.navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID, action);
+    }, [transaction, iouType, requestType, transactionID, reportID, action]);
 
     const navigateToAddReceipt = useCallback(() => {
-        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(iouAction, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
-    }, [iouType, transactionID, reportID, iouAction]);
+        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
+    }, [iouType, transactionID, reportID, action]);
 
     // When the component mounts, if there is a receipt, see if the image can be read from the disk. If not, redirect the user to the starting step of the flow.
     // This is because until the request is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
     // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
     // skip this in case user is moving the transaction as the receipt path will be valid in that case
     useEffect(() => {
-        if ([CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction)) {
+        if (IOUUtils.isMovingTransactionFromTrackExpense(action)) {
             return;
         }
 
@@ -181,7 +181,7 @@ function IOURequestStepConfirmation({
         };
 
         IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, onSuccess, requestType, iouType, transactionID, reportID, receiptType);
-    }, [receiptType, receiptPath, receiptFilename, requestType, iouType, transactionID, reportID, iouAction]);
+    }, [receiptType, receiptPath, receiptFilename, requestType, iouType, transactionID, reportID, action]);
 
     const requestMoney = useCallback(
         (selectedParticipants: Participant[], trimmedComment: string, receiptObj?: Receipt, gpsPoints?: IOU.GpsPoint) => {
@@ -209,7 +209,7 @@ function IOURequestStepConfirmation({
                 policyTags,
                 policyCategories,
                 gpsPoints,
-                iouAction,
+                action,
                 transaction.actionableWhisperReportActionID,
                 transaction.linkedTrackedExpenseReportAction,
                 transaction.linkedTrackedExpenseReportID,
@@ -225,7 +225,7 @@ function IOURequestStepConfirmation({
             policy,
             policyTags,
             policyCategories,
-            iouAction,
+            action,
         ],
     );
 
@@ -544,7 +544,7 @@ function IOURequestStepConfirmation({
                             iouCreated={transaction?.created}
                             isDistanceRequest={requestType === CONST.IOU.REQUEST_TYPE.DISTANCE}
                             shouldShowSmartScanFields={requestType !== CONST.IOU.REQUEST_TYPE.SCAN}
-                            iouAction={iouAction}
+                            action={action}
                         />
                     </View>
                 </View>
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
index 930cdde4ee1a..c89a52cfaf04 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -35,7 +35,7 @@ type IOURef = IOUValueType | null;
 
 function IOURequestStepParticipants({
     route: {
-        params: {iouType, reportID, transactionID, action: iouAction},
+        params: {iouType, reportID, transactionID, action},
     },
     transaction,
 }: IOURequestStepParticipantsProps) {
@@ -47,10 +47,10 @@ function IOURequestStepParticipants({
     const iouRequestType = TransactionUtils.getRequestType(transaction);
     const isSplitRequest = iouType === CONST.IOU.TYPE.SPLIT;
     const headerTitle = useMemo(() => {
-        if (iouAction === CONST.IOU.ACTION.CATEGORIZE) {
+        if (action === CONST.IOU.ACTION.CATEGORIZE) {
             return translate('iou.categorize');
         }
-        if (iouAction === CONST.IOU.ACTION.MOVE) {
+        if (action === CONST.IOU.ACTION.MOVE) {
             return translate('iou.request');
         }
         if (isSplitRequest) {
@@ -60,7 +60,7 @@ function IOURequestStepParticipants({
             return translate('common.send');
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
-    }, [iouType, transaction, translate, isSplitRequest, iouAction]);
+    }, [iouType, transaction, translate, isSplitRequest, action]);
 
     const receiptFilename = transaction?.filename;
     const receiptPath = transaction?.receipt?.source;
@@ -72,11 +72,11 @@ function IOURequestStepParticipants({
     // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
     // skip this in case user is moving the transaction as the receipt path will be valid in that case
     useEffect(() => {
-        if ([CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(iouAction)) {
+        if (IOUUtils.isMovingTransactionFromTrackExpense(action)) {
             return;
         }
         IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename ?? '', receiptPath ?? '', () => {}, iouRequestType, iouType, transactionID, reportID, receiptType ?? '');
-    }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID, iouAction]);
+    }, [receiptType, receiptPath, receiptFilename, iouRequestType, iouType, transactionID, reportID, action]);
 
     const updateRouteParams = useCallback(() => {
         const navigationState = navigation.getState();
@@ -143,23 +143,23 @@ function IOURequestStepParticipants({
                 nextStepIOUType = CONST.IOU.TYPE.SEND;
             }
 
-            const isCategorizing = iouAction === CONST.IOU.ACTION.CATEGORIZE;
+            const isCategorizing = action === CONST.IOU.ACTION.CATEGORIZE;
 
             IOU.setMoneyRequestTag(transactionID, '');
             IOU.setMoneyRequestCategory(transactionID, '');
-            const iouConfirmationPageRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(iouAction, nextStepIOUType, transactionID, selectedReportID.current || reportID);
+            const iouConfirmationPageRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, nextStepIOUType, transactionID, selectedReportID.current || reportID);
             if (isCategorizing) {
-                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(iouAction, nextStepIOUType, transactionID, selectedReportID.current || reportID, iouConfirmationPageRoute));
+                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, nextStepIOUType, transactionID, selectedReportID.current || reportID, iouConfirmationPageRoute));
             } else {
                 Navigation.navigate(iouConfirmationPageRoute);
             }
         },
-        [iouType, transactionID, reportID, iouAction],
+        [iouType, transactionID, reportID, action],
     );
 
     const navigateBack = useCallback(() => {
-        IOUUtils.navigateToStartMoneyRequestStep(iouRequestType, iouType, transactionID, reportID, iouAction);
-    }, [iouRequestType, iouType, transactionID, reportID, iouAction]);
+        IOUUtils.navigateToStartMoneyRequestStep(iouRequestType, iouType, transactionID, reportID, action);
+    }, [iouRequestType, iouType, transactionID, reportID, action]);
 
     return (
         <StepScreenWrapper
@@ -177,7 +177,7 @@ function IOURequestStepParticipants({
                     iouType={iouType}
                     iouRequestType={iouRequestType}
                     didScreenTransitionEnd={didScreenTransitionEnd}
-                    iouAction={iouAction}
+                    action={action}
                 />
             )}
         </StepScreenWrapper>

From 2492c2e9cfc6f8a47c83056f7432fa421af1354e Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 12 Apr 2024 00:23:19 +0530
Subject: [PATCH 175/383] code formatting

---
 ...raryForRefactorRequestConfirmationList.tsx | 40 +++----------------
 .../step/IOURequestStepConfirmation.tsx       | 13 +-----
 2 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
index ce0aab10e552..db5a2867f600 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
@@ -660,9 +660,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                             Navigation.navigate(ROUTES.EDIT_SPLIT_BILL.getRoute(reportID, reportActionID ?? '', CONST.EDIT_REQUEST_FIELD.AMOUNT));
                             return;
                         }
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
-                        );
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()));
                     }}
                     style={[styles.moneyRequestMenuItem, styles.mt2]}
                     titleStyle={styles.moneyRequestConfirmationAmount}
@@ -684,13 +682,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     description={translate('common.description')}
                     onPress={() => {
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(
-                                action,
-                                iouType,
-                                transaction?.transactionID ?? '',
-                                reportID,
-                                Navigation.getActiveRouteWithoutParams(),
-                            ),
+                            ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         );
                     }}
                     style={[styles.moneyRequestMenuItem]}
@@ -714,13 +706,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() =>
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(
-                                action,
-                                iouType,
-                                transaction?.transactionID ?? '',
-                                reportID,
-                                Navigation.getActiveRouteWithoutParams(),
-                            ),
+                            ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         )
                     }
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -742,13 +728,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() => {
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(
-                                action,
-                                iouType,
-                                transaction?.transactionID ?? '',
-                                reportID,
-                                Navigation.getActiveRouteWithoutParams(),
-                            ),
+                            ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         );
                     }}
                     disabled={didConfirm}
@@ -772,9 +752,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
                     onPress={() => {
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
-                        );
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()));
                     }}
                     disabled={didConfirm}
                     interactive={!isReadOnly}
@@ -795,13 +773,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     numberOfLinesTitle={2}
                     onPress={() =>
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(
-                                action,
-                                iouType,
-                                transaction?.transactionID ?? '',
-                                reportID,
-                                Navigation.getActiveRouteWithoutParams(),
-                            ),
+                            ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         )
                     }
                     style={[styles.moneyRequestMenuItem]}
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index fb55f8d2fd68..9473d42f81ed 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -215,18 +215,7 @@ function IOURequestStepConfirmation({
                 transaction.linkedTrackedExpenseReportID,
             );
         },
-        [
-            report,
-            transaction,
-            transactionTaxCode,
-            transactionTaxAmount,
-            currentUserPersonalDetails.login,
-            currentUserPersonalDetails.accountID,
-            policy,
-            policyTags,
-            policyCategories,
-            action,
-        ],
+        [report, transaction, transactionTaxCode, transactionTaxAmount, currentUserPersonalDetails.login, currentUserPersonalDetails.accountID, policy, policyTags, policyCategories, action],
     );
 
     const trackExpense = useCallback(

From 82f8a9d8106ff5bd900c8aae6808615a0a182348 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 11 Apr 2024 12:00:52 -0700
Subject: [PATCH 176/383] Remove useless stuff, some refactor and minor
 improvements

---
 .../index.native.tsx                                | 13 ++++++-------
 .../ConnectToQuickbooksOnlineButton/index.tsx       | 10 +++++++---
 src/libs/actions/connections/QuickBooksOnline.ts    |  5 +++--
 src/libs/actions/connections/index.ts               |  7 ++++++-
 .../workspace/accounting/PolicyAccountingPage.tsx   |  4 +---
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index e29206fd4f5b..1c84e92a9367 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -9,6 +9,7 @@ import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import Modal from '@components/Modal';
 import useLocalize from '@hooks/useLocalize';
 import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Session} from '@src/types/onyx';
 import type {ConnectToQuickbooksOnlineButtonProps} from './types';
@@ -21,11 +22,9 @@ type ConnectToQuickbooksOnlineButtonOnyxProps = {
 const renderLoading = () => <FullScreenLoadingIndicator />;
 
 function ConnectToQuickbooksOnlineButton({policyID, session}: ConnectToQuickbooksOnlineButtonProps & ConnectToQuickbooksOnlineButtonOnyxProps) {
-    const [isWebViewOpen, setWebViewOpen] = useState<boolean>(false);
-    const [isQuickbooksOnlineReady, setIsQuickbooksOnlineReady] = useState<boolean>(false);
+    const [isWebViewOpen, setWebViewOpen] = useState(false);
+    const [isQuickbooksOnlineReady, setIsQuickbooksOnlineReady] = useState(false);
     const {translate} = useLocalize();
-    const webViewRef = useRef<WebView>(null);
-    const authToken = session?.authToken ?? null;
 
     const handleNavigationStateChange = useCallback(({url, loading}: WebViewNavigation) => {
         if (loading || !url.startsWith('https://accounts.intuit.com/app/sign-in')) {
@@ -39,6 +38,7 @@ function ConnectToQuickbooksOnlineButton({policyID, session}: ConnectToQuickbook
             <Button
                 onPress={() => setWebViewOpen(true)}
                 text={translate('workspace.accounting.setup')}
+                small
             />
             {isWebViewOpen && (
                 <FullPageOfflineBlockingView>
@@ -49,15 +49,14 @@ function ConnectToQuickbooksOnlineButton({policyID, session}: ConnectToQuickbook
                         }}
                         fullscreen
                         isVisible
-                        type="centered"
+                        type={CONST.MODAL.MODAL_TYPE.CENTERED}
                     >
                         {!isQuickbooksOnlineReady && <FullScreenLoadingIndicator />}
                         <WebView
-                            ref={webViewRef}
                             source={{
                                 uri: getQuickBooksOnlineSetupLink(policyID),
                                 headers: {
-                                    Cookie: `authToken=${authToken}`,
+                                    Cookie: `authToken=${session?.authToken}`,
                                 },
                             }}
                             incognito // 'incognito' prop required for Android, issue here https://github.com/react-native-webview/react-native-webview/issues/1352
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index 6f9ba241dd13..5fe1a71c9037 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import Button from '@components/Button';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
 import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
 import * as Link from '@userActions/Link';
 import type {ConnectToQuickbooksOnlineButtonProps} from './types';
@@ -9,14 +10,17 @@ import type {ConnectToQuickbooksOnlineButtonProps} from './types';
 function ConnectToQuickbooksOnlineButton({policyID}: ConnectToQuickbooksOnlineButtonProps) {
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
+    const styles = useThemeStyles();
     return (
         <Button
-            onPress={() => {
-                Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL, false);
-            }}
+            onPress={() => Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL, false)}
             text={translate('workspace.accounting.setup')}
+            style={styles.justifyContentCenter}
+            small
         />
     );
 }
 
+ConnectToQuickbooksOnlineButton.displayName = 'ConnectToQuickbooksOnlineButton';
+
 export default ConnectToQuickbooksOnlineButton;
diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index 636537a879b6..d1e27f9e04f1 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -1,8 +1,9 @@
 import {getCommandURL} from '@libs/ApiUtils';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
-    const otherParams = new URLSearchParams({policyID}).toString();
-    return `${getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'})}&${otherParams}`;
+    const params = new URLSearchParams({policyID});
+    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'});
+    return commandURL + params.toString();
 }
 
 // More action functions will be added later
diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index 2e8f7d541ca4..b6d02cf2b879 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -2,6 +2,7 @@ import Onyx from 'react-native-onyx';
 import type {OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
+import {RemovePolicyConnectionParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import CONST from '@src/CONST';
@@ -36,7 +37,11 @@ function removePolicyConnection(policyID: string, connectionName: PolicyConnecti
         //     },
         // },
     ];
-    API.write(WRITE_COMMANDS.REMOVE_POLICY_CONNECTION, {policyID, connectionName}, {optimisticData, failureData});
+    const parameters: RemovePolicyConnectionParams = {
+        policyID,
+        connectionName,
+    };
+    API.write(WRITE_COMMANDS.REMOVE_POLICY_CONNECTION, parameters, {optimisticData, failureData});
 }
 
 function updatePolicyConnectionConfig(policyID: string, settingName: ValueOf<typeof CONST.QUICK_BOOKS_IMPORTS>, settingValue: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>) {
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 728a5c8ea318..5b5d6ab663ca 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -67,9 +67,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
             {
                 icon: Expensicons.Trashcan,
                 text: translate('workspace.accounting.disconnect'),
-                onSelected: () => {
-                    setIsDisconnectModalOpen(true);
-                },
+                onSelected: () => setIsDisconnectModalOpen(true),
             },
         ],
         [translate],

From a286940faf657fef50c4fba9fd7fb3edbd607f6b Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 11 Apr 2024 12:01:46 -0700
Subject: [PATCH 177/383] Complete translations and qbo import stages

---
 src/languages/en.ts | 9 ++++++---
 src/languages/es.ts | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 52e02d2c40f1..0c9205bea7f4 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2104,10 +2104,13 @@ export default {
                         case 'quickbooksOnlineImportProcessing':
                             return 'Processing imported data';
                         case 'quickbooksOnlineSyncBillPayments':
-                            return 'Synchronizing reimbursed reports and Bill Payments';
+                            return 'Synchronizing reimbursed reports and bill Payments';
                         case 'quickbooksOnlineSyncTaxCodes':
-                            return 'Importing Tax Codes';
-
+                            return 'Importing tax codes';
+                        case 'quickbooksOnlineCheckConnection':
+                            return 'Checking QuickBooks Online connection';
+                        case 'quickbooksOnlineImportMain':
+                            return 'Importing your QuickBooks Online data';
                         default: {
                             return `Translation missing for stage: ${stage}`;
                         }
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 530f33d004cd..282ad563be59 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2102,7 +2102,10 @@ export default {
                             return 'Sincronizando reportes reembolsados y facturas pagadas';
                         case 'quickbooksOnlineSyncTaxCodes':
                             return 'Importando tipos de impuestos';
-
+                        case 'quickbooksOnlineCheckConnection':
+                            return 'Revisando conexión a QuickBooks Online';
+                        case 'quickbooksOnlineImportMain':
+                            return 'Importando datos desde QuickBooks Online';
                         default: {
                             return `Translation missing for stage: ${stage}`;
                         }

From 70e771cb3feb3d4ea88898e6bb4d56851758e15a Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 12 Apr 2024 00:48:50 +0530
Subject: [PATCH 178/383] fix conflict error

---
 src/libs/ReportUtils.ts |  4 ++--
 src/libs/actions/IOU.ts | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index d9f1fde9232a..209cbc4e56a1 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -54,7 +54,7 @@ import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
 import * as store from './actions/ReimbursementAccount/store';
-import * as TransactionEdit from './actions/TransactionEdit';
+import * as IOU from './actions/IOU';
 import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
@@ -5821,7 +5821,7 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
 
     const linkedTrackedExpenseReportAction = Object.values(reportActions).find((action) => (action.originalMessage as IOUMessage)?.IOUTransactionID === transactionID);
 
-    TransactionEdit.createBackupTransaction({
+    IOU.createDraftTransaction({
         ...transaction,
         actionableWhisperReportActionID: reportActionID,
         linkedTrackedExpenseReportAction,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 6c55f89d10cd..35f9f7106e64 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -312,6 +312,18 @@ function initMoneyRequest(reportID: string, policy: OnyxEntry<OnyxTypes.Policy>,
     });
 }
 
+function createDraftTransaction(transaction: OnyxTypes.Transaction) {
+    if (!transaction) {
+        return;
+    }
+
+    const newTransaction = {
+        ...transaction,
+    };
+
+    Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transaction.transactionID}`, newTransaction);
+}
+
 function clearMoneyRequest(transactionID: string) {
     Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, null);
 }
@@ -5861,4 +5873,5 @@ export {
     trackExpense,
     canIOUBePaid,
     canApproveIOU,
+    createDraftTransaction,
 };

From 828c85f4cd9e45971ea5fb0ddf6e86de127fe4dc Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 11 Apr 2024 12:18:50 -0700
Subject: [PATCH 179/383] Style

---
 src/components/ConnectToQuickbooksOnlineButton/index.native.tsx | 2 +-
 src/libs/actions/connections/index.ts                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index 1c84e92a9367..f8c1dac8c2ea 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useRef, useState} from 'react';
+import React, {useCallback, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {WebViewNavigation} from 'react-native-webview';
diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index b6d02cf2b879..a93d9635ff24 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -2,7 +2,7 @@ import Onyx from 'react-native-onyx';
 import type {OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
-import {RemovePolicyConnectionParams} from '@libs/API/parameters';
+import type {RemovePolicyConnectionParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import CONST from '@src/CONST';

From 2e8b99e31970890bfcd9822a5c6a2b784ee0c2ed Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 12 Apr 2024 01:05:17 +0530
Subject: [PATCH 180/383] resolve lint

---
 src/libs/ReportUtils.ts                               | 2 +-
 src/pages/iou/request/step/IOURequestStepCategory.tsx | 2 +-
 src/types/onyx/Transaction.ts                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 209cbc4e56a1..41679dd399b0 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -53,8 +53,8 @@ import type {Receipt, TransactionChanges, WaypointCollection} from '@src/types/o
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
-import * as store from './actions/ReimbursementAccount/store';
 import * as IOU from './actions/IOU';
+import * as store from './actions/ReimbursementAccount/store';
 import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index e0c6f84bc4f6..a571192f7a47 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -121,7 +121,7 @@ function IOURequestStepCategory({
         IOU.setMoneyRequestCategory(transactionID, updatedCategory);
 
         if (action === CONST.IOU.ACTION.CATEGORIZE) {
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report?.reportID));
+            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report?.reportID ?? ''));
             return;
         }
 
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index b6f72d37c80c..cf997d703680 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -2,11 +2,11 @@ import type {KeysOfUnion, ValueOf} from 'type-fest';
 import type {IOURequestType} from '@libs/actions/IOU';
 import type CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
-import type * as OnyxTypes from '@src/types/onyx';
 import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
 import type {Participant, Split} from './IOU';
 import type * as OnyxCommon from './OnyxCommon';
 import type RecentWaypoint from './RecentWaypoint';
+import type ReportAction from './ReportAction';
 
 type Waypoint = {
     /** The name associated with the address of the waypoint */
@@ -221,7 +221,7 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         actionableWhisperReportActionID?: string;
 
         /** The linked reportAction id for the tracked expense */
-        linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction;
+        linkedTrackedExpenseReportAction?: ReportAction;
 
         /** The linked report id for the tracked expense */
         linkedTrackedExpenseReportID?: string;

From d5778687b33a014d5860f9fe901832ff6fbb11d1 Mon Sep 17 00:00:00 2001
From: GandalfGwaihir <whogandalf@gmail.com>
Date: Fri, 12 Apr 2024 01:42:51 +0530
Subject: [PATCH 181/383] Fix lint

---
 src/pages/EditReportFieldText.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/EditReportFieldText.tsx b/src/pages/EditReportFieldText.tsx
index ebb5c0acb188..0649d59cd2ee 100644
--- a/src/pages/EditReportFieldText.tsx
+++ b/src/pages/EditReportFieldText.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useRef} from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';

From 40a85a6f8ce0157dfc63af9b4ae020e1b8f74e7f Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Fri, 12 Apr 2024 01:48:20 +0530
Subject: [PATCH 182/383] added more params to ConvertTrackedExpenseToRequest

---
 src/libs/actions/IOU.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 35f9f7106e64..1020c6089950 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2523,6 +2523,10 @@ const getConvertTrackedExpenseInformation = (
 
 function convertTrackedExpenseToRequest(
     payerAccountID: number,
+    amount: number,
+    currency: string,
+    comment: string,
+    created: string,
     chatReportID: string,
     transactionID: string,
     actionableWhisperReportActionID: string,
@@ -2556,6 +2560,10 @@ function convertTrackedExpenseToRequest(
     failureData?.push(...moveTransactionFailureData);
 
     const parameters = {
+        amount,
+        currency,
+        comment,
+        created,
         payerAccountID,
         chatReportID,
         transactionID,
@@ -2739,6 +2747,10 @@ function requestMoney(
 
             convertTrackedExpenseToRequest(
                 payerAccountID,
+                amount,
+                currency,
+                comment,
+                currentCreated,
                 chatReport.reportID,
                 transaction.transactionID,
                 actionableWhisperReportActionID,

From e00c83c344c0072cb3801c6557a395dca62942d6 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Thu, 11 Apr 2024 22:47:53 +0200
Subject: [PATCH 183/383] Cleaning TagName WorkspaceEditTagsPage

---
 src/pages/workspace/tags/EditTagPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index fbde96eb2b91..ed55155a3dcf 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -96,7 +96,7 @@ function EditTagPage({route, policyTags}: EditTagPageProps) {
                             <InputWrapper
                                 InputComponent={TextInput}
                                 maxLength={CONST.TAG_NAME_LIMIT}
-                                defaultValue={currentTagName}
+                                defaultValue={PolicyUtils.getCleanedTagName(currentTagName)}
                                 label={translate('common.name')}
                                 accessibilityLabel={translate('common.name')}
                                 inputID={INPUT_IDS.TAG_NAME}

From f8bbc251d31a447e002a69e8b2a2d7e90d187e74 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Thu, 11 Apr 2024 19:26:35 -0400
Subject: [PATCH 184/383] Undo the change to fix animation image increasing the
 content height when SAML is enabled

---
 src/pages/signin/SignInPage.tsx             | 6 +-----
 src/pages/signin/SignInPageLayout/index.tsx | 3 +--
 src/pages/signin/SignInPageLayout/types.ts  | 4 ----
 src/styles/variables.ts                     | 1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 083fe3f185a3..8bafaeca97b8 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -61,7 +61,6 @@ type RenderOption = {
     shouldInitiateSAMLLogin: boolean;
     shouldShowWelcomeHeader: boolean;
     shouldShowWelcomeText: boolean;
-    isSAMLEnabled: boolean;
 };
 
 type GetRenderOptionsParams = {
@@ -93,7 +92,7 @@ function getRenderOptions({
     shouldShowAnotherLoginPageOpenedMessage,
 }: GetRenderOptionsParams): RenderOption {
     const hasAccount = !isEmptyObject(account);
-    const isSAMLEnabled = !!account?.isSAMLEnabled;
+    const isSAMLEnabled = true; //!!account?.isSAMLEnabled;
     const isSAMLRequired = !!account?.isSAMLRequired;
     const hasEmailDeliveryFailure = !!account?.hasEmailDeliveryFailure;
 
@@ -124,7 +123,6 @@ function getRenderOptions({
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
-        isSAMLEnabled,
     };
 }
 
@@ -183,7 +181,6 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
-        isSAMLEnabled,
     } = getRenderOptions({
         hasLogin: !!credentials?.login,
         hasValidateCode: !!credentials?.validateCode,
@@ -263,7 +260,6 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
                 shouldShowWelcomeText={shouldShowWelcomeText}
                 ref={signInPageLayoutRef}
                 navigateFocus={navigateFocus}
-                isSAMLEnabled={isSAMLEnabled}
             >
                 {/* LoginForm must use the isVisible prop. This keeps it mounted, but visually hidden
              so that password managers can access the values. Conditionally rendering this component will break this feature. */}
diff --git a/src/pages/signin/SignInPageLayout/index.tsx b/src/pages/signin/SignInPageLayout/index.tsx
index 873588b72e77..3532c17181db 100644
--- a/src/pages/signin/SignInPageLayout/index.tsx
+++ b/src/pages/signin/SignInPageLayout/index.tsx
@@ -33,7 +33,6 @@ function SignInPageLayout(
         shouldShowWelcomeText = false,
         navigateFocus = () => {},
         children,
-        isSAMLEnabled = false,
     }: SignInPageLayoutProps,
     ref: ForwardedRef<SignInPageLayoutRef>,
 ) {
@@ -79,7 +78,7 @@ function SignInPageLayout(
 
     const scrollViewStyles = useMemo(() => scrollViewContentContainerStyles(styles), [styles]);
 
-    const backgroundImageHeight = Math.max(isSAMLEnabled ? variables.signInSAMLContentMinHeight : variables.signInContentMinHeight, containerHeight);
+    const backgroundImageHeight = Math.max(variables.signInContentMinHeight, containerHeight);
 
     return (
         <View style={containerStyles}>
diff --git a/src/pages/signin/SignInPageLayout/types.ts b/src/pages/signin/SignInPageLayout/types.ts
index 3eb1dab6d55a..6a3422f846d1 100644
--- a/src/pages/signin/SignInPageLayout/types.ts
+++ b/src/pages/signin/SignInPageLayout/types.ts
@@ -25,10 +25,6 @@ type SignInPageLayoutProps = {
     customHeroBody?: string;
 
     navigateFocus?: () => void;
-
-    /** Whether to use the default minimun content height or the recommened one
-     *  for login with SAML at the login page */
-    isSAMLEnabled?: boolean;
 };
 
 type SignInPageLayoutRef = {
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 974f66860b27..ff1b20893110 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -148,7 +148,6 @@ export default {
     signInContentMaxWidth: 1360,
     signInHeroContextMaxWidth: 680,
     signInContentMinHeight: 800,
-    signInSAMLContentMinHeight: 1000,
     signInLogoHeightSmallScreen: 28,
     signInLogoHeight: 34,
     signInLogoWidth: 120,

From 3525b1a9408ccee03e2c0c6c6e5fd04e2ffae27c Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Fri, 12 Apr 2024 11:34:10 +0700
Subject: [PATCH 185/383] Don't show GBR to AM/guides for managed customer
 employee invitations

---
 src/libs/ReportUtils.ts  | 6 ++++++
 src/libs/SidebarUtils.ts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 6197a29cd4a6..aa2f36f1cb12 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1168,6 +1168,12 @@ function isJoinRequestInAdminRoom(report: OnyxEntry<Report>): boolean {
     if (!report) {
         return false;
     }
+    if (report.policyID) {
+        const policy = getPolicy(report.policyID);
+        if (!PolicyUtils.isExpensifyTeam(policy.owner) && PolicyUtils.isExpensifyTeam(currentUserPersonalDetails?.login)) {
+            return false;
+        }
+    }
     return ReportActionsUtils.isActionableJoinRequestPending(report.reportID);
 }
 
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index c5439d687089..574039d16108 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -393,7 +393,7 @@ function getOptionData({
 
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result as Report);
 
-    if (ReportActionsUtils.isActionableJoinRequestPending(report.reportID)) {
+    if (ReportUtils.isJoinRequestInAdminRoom(report)) {
         result.isPinned = true;
         result.isUnread = true;
         result.brickRoadIndicator = CONST.BRICK_ROAD_INDICATOR_STATUS.INFO;

From 10bd5bb49fb8e815313a8f781c0a2cabe7baa8a7 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Fri, 12 Apr 2024 09:38:01 +0200
Subject: [PATCH 186/383] Enable creating a group chat with one other
 participant

---
 src/pages/NewChatPage.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 97f14fd5d0a4..519b2687e72e 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -281,9 +281,9 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                             shouldShowConfirmButton
                             shouldShowReferralCTA={!dismissedReferralBanners?.[CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT]}
                             referralContentType={CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT}
-                            confirmButtonText={selectedOptions.length > 1 ? translate('common.next') : translate('newChatPage.createChat')}
+                            confirmButtonText={translate('common.next')}
                             textInputAlert={isOffline ? [`${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}`, {isTranslated: true}] : ''}
-                            onConfirmSelection={selectedOptions.length > 1 ? navigateToConfirmPage : createChat}
+                            onConfirmSelection={selectedOptions.length > 0 ? navigateToConfirmPage : createChat}
                             textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                             isLoadingNewOptions={isSearchingForReports}

From f0e52093bfe2184449816f80d5cb1cb2035666e1 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Fri, 12 Apr 2024 09:46:21 +0200
Subject: [PATCH 187/383] Fixing not here page in empty notes

---
 .../home/report/withReportAndPrivateNotesOrNotFound.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx b/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx
index 2c0edc77aad9..468e4264bb3c 100644
--- a/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx
+++ b/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx
@@ -40,7 +40,7 @@ export default function (pageTitle: TranslationPaths) {
             const isReconnecting = prevIsOffline && !isOffline;
             const isOtherUserNote = !!accountID && Number(session?.accountID) !== Number(accountID);
             const isPrivateNotesFetchFinished = isPrivateNotesFetchTriggered && !report.isLoadingPrivateNotes;
-            const isPrivateNotesEmpty = accountID ? !report?.privateNotes?.[Number(accountID)]?.note : isEmptyObject(report?.privateNotes);
+            const isPrivateNotesUndefined = accountID ? report?.privateNotes?.[Number(accountID)]?.note === undefined : isEmptyObject(report?.privateNotes);
 
             useEffect(() => {
                 // Do not fetch private notes if isLoadingPrivateNotes is already defined, or if network is offline.
@@ -62,13 +62,13 @@ export default function (pageTitle: TranslationPaths) {
                 }
 
                 // Don't show not found view if the notes are still loading, or if the notes are non-empty.
-                if (shouldShowFullScreenLoadingIndicator || !isPrivateNotesEmpty || isReconnecting) {
+                if (shouldShowFullScreenLoadingIndicator || !isPrivateNotesUndefined || isReconnecting) {
                     return false;
                 }
 
                 // As notes being empty and not loading is a valid case, show not found view only in offline mode.
                 return isOffline;
-            }, [report, isOtherUserNote, shouldShowFullScreenLoadingIndicator, isPrivateNotesEmpty, isReconnecting, isOffline]);
+            }, [report, isOtherUserNote, shouldShowFullScreenLoadingIndicator, isPrivateNotesUndefined, isReconnecting, isOffline]);
 
             if (shouldShowFullScreenLoadingIndicator) {
                 return <LoadingPage title={translate(pageTitle)} />;

From 1826769c69d2068c4d7f3c47c8632469732423fc Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Fri, 12 Apr 2024 13:39:27 +0530
Subject: [PATCH 188/383] policy pages: clear seleted options when focus is
 removed from page.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/workspace/WorkspaceMembersPage.tsx      |  9 ++-------
 .../categories/WorkspaceCategoriesPage.tsx        | 14 ++++++++++----
 .../distanceRates/PolicyDistanceRatesPage.tsx     | 14 ++++++++++----
 src/pages/workspace/tags/WorkspaceTagsPage.tsx    | 15 +++++++++++----
 src/pages/workspace/taxes/WorkspaceTaxesPage.tsx  | 14 ++++++++++----
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index e97f4359dff5..a66a8dd74cce 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -1,4 +1,4 @@
-import {useFocusEffect, useIsFocused} from '@react-navigation/native';
+import {useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import lodashIsEqual from 'lodash/isEqual';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
@@ -138,18 +138,13 @@ function WorkspaceMembersPage({policyMembers, personalDetails, invitedEmailsToAc
     // useFocusEffect would make getWorkspaceMembers get called twice on fresh login because policyMember is a dependency of getWorkspaceMembers.
     useEffect(() => {
         if (!isFocused) {
+            setSelectedEmployees([]);
             return;
         }
         getWorkspaceMembers();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isFocused]);
 
-    useFocusEffect(
-        useCallback(() => {
-            setSelectedEmployees([]);
-        }, []),
-    );
-
     useEffect(() => {
         validateSelection();
     }, [preferredLocale, validateSelection]);
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index df25ab254496..80394623dba8 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -1,6 +1,6 @@
-import {useFocusEffect} from '@react-navigation/native';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -63,6 +63,7 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
     const [selectedCategories, setSelectedCategories] = useState<Record<string, boolean>>({});
     const dropdownButtonRef = useRef(null);
     const [deleteCategoriesConfirmModalVisible, setDeleteCategoriesConfirmModalVisible] = useState(false);
+    const isFocused = useIsFocused();
 
     const fetchCategories = useCallback(() => {
         Policy.openPolicyCategoriesPage(route.params.policyID);
@@ -72,11 +73,17 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
 
     useFocusEffect(
         useCallback(() => {
-            setSelectedCategories({});
             fetchCategories();
         }, [fetchCategories]),
     );
 
+    useEffect(() => {
+        if (isFocused) {
+            return;
+        }
+        setSelectedCategories({});
+    }, [isFocused]);
+
     const categoryList = useMemo<PolicyOption[]>(
         () =>
             Object.values(policyCategories ?? {})
@@ -120,7 +127,6 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
     );
 
     const navigateToCategorySettings = (category: PolicyOption) => {
-        setSelectedCategories({});
         Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, category.keyForList));
     };
 
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index 27e6611062e2..ea35526bcdfa 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -1,6 +1,6 @@
-import {useFocusEffect} from '@react-navigation/native';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -56,6 +56,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const dropdownButtonRef = useRef(null);
     const policyID = route.params.policyID;
+    const isFocused = useIsFocused();
 
     const customUnit: CustomUnit | undefined = useMemo(
         () => (policy?.customUnits !== undefined ? policy?.customUnits[Object.keys(policy?.customUnits)[0]] : undefined),
@@ -89,11 +90,17 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
 
     useFocusEffect(
         useCallback(() => {
-            setSelectedDistanceRates([]);
             fetchDistanceRates();
         }, [fetchDistanceRates]),
     );
 
+    useEffect(() => {
+        if (isFocused) {
+            return;
+        }
+        setSelectedDistanceRates([]);
+    }, [isFocused]);
+
     const distanceRatesList = useMemo<RateForList[]>(
         () =>
             Object.values(customUnitRates).map((value) => ({
@@ -120,7 +127,6 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     };
 
     const openRateDetails = (rate: RateForList) => {
-        setSelectedDistanceRates([]);
         Navigation.navigate(ROUTES.WORKSPACE_DISTANCE_RATE_DETAILS.getRoute(policyID, rate.value));
     };
 
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index e4286eb9df0d..a46e32d5371e 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -1,7 +1,7 @@
-import {useFocusEffect} from '@react-navigation/native';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import lodashSortBy from 'lodash/sortBy';
-import React, {useCallback, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -70,6 +70,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
     const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
     const dropdownButtonRef = useRef(null);
     const [deleteTagsConfirmModalVisible, setDeleteTagsConfirmModalVisible] = useState(false);
+    const isFocused = useIsFocused();
 
     const fetchTags = useCallback(() => {
         Policy.openPolicyTagsPage(route.params.policyID);
@@ -79,10 +80,17 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
 
     useFocusEffect(
         useCallback(() => {
-            setSelectedTags({});
             fetchTags();
         }, [fetchTags]),
     );
+
+    useEffect(() => {
+        if (isFocused) {
+            return;
+        }
+        setSelectedTags({});
+    }, [isFocused]);
+
     const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
     const tagList = useMemo<PolicyForList[]>(
         () =>
@@ -141,7 +149,6 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
     };
 
     const navigateToTagSettings = (tag: PolicyOption) => {
-        setSelectedTags({});
         Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route.params.policyID, tag.keyForList));
     };
 
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index 0b9c1274c94c..ac2c3cb0a294 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -1,6 +1,6 @@
-import {useFocusEffect} from '@react-navigation/native';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
@@ -53,6 +53,7 @@ function WorkspaceTaxesPage({
     const defaultExternalID = policy?.taxRates?.defaultExternalID;
     const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
     const dropdownButtonRef = useRef(null);
+    const isFocused = useIsFocused();
 
     const fetchTaxes = useCallback(() => {
         openPolicyTaxesPage(policyID);
@@ -62,11 +63,17 @@ function WorkspaceTaxesPage({
 
     useFocusEffect(
         useCallback(() => {
-            setSelectedTaxesIDs([]);
             fetchTaxes();
         }, [fetchTaxes]),
     );
 
+    useEffect(() => {
+        if (isFocused) {
+            return;
+        }
+        setSelectedTaxesIDs([]);
+    }, [isFocused]);
+
     const textForDefault = useCallback(
         (taxID: string): string => {
             if (taxID === defaultExternalID && taxID === foreignTaxDefault) {
@@ -160,7 +167,6 @@ function WorkspaceTaxesPage({
         if (!taxRate.keyForList) {
             return;
         }
-        setSelectedTaxesIDs([]);
         Navigation.navigate(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID, taxRate.keyForList));
     };
 

From 08a2a48efe568b02fb9398ef9b867e733f5b19c7 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Fri, 12 Apr 2024 18:04:14 +0530
Subject: [PATCH 189/383] Apply suggestions from code review

Co-authored-by: G T <75031127+getusha@users.noreply.github.com>
---
 src/languages/en.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index d9f3d9a3b774..ecf3ed30b52f 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -696,8 +696,8 @@ export default {
             receiptFailureMessage: "The receipt didn't upload. ",
             saveFileMessage: 'Download the file ',
             loseFileMessage: 'or dismiss this error and lose it',
-            genericDeleteFailureMessage: 'Unexpected error deleting the expense, please try again later',
-            genericEditFailureMessage: 'Unexpected error editing the expense, please try again later',
+            genericDeleteFailureMessage: 'Unexpected error deleting this expense, please try again later',
+            genericEditFailureMessage: 'Unexpected error editing this expense, please try again later',
             genericSmartscanFailureMessage: 'Transaction is missing fields',
             duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
             atLeastTwoDifferentWaypoints: 'Please enter at least two different addresses',

From a0c1b0f627e416e37e51b7daf913505b1a5d0223 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Fri, 12 Apr 2024 18:20:10 +0530
Subject: [PATCH 190/383] Fixed translations

---
 src/languages/en.ts                                           | 4 ++--
 src/languages/es.ts                                           | 4 ++--
 src/languages/types.ts                                        | 3 +++
 .../ReportActionCompose/AttachmentPickerWithMenuItems.tsx     | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index ecf3ed30b52f..17fb4f395f67 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -50,6 +50,7 @@ import type {
     PayerPaidAmountParams,
     PayerPaidParams,
     PayerSettledParams,
+    PaySomeoneParams,
     RemovedTheRequestParams,
     RenamedRoomActionParams,
     ReportArchiveReasonsClosedParams,
@@ -613,8 +614,7 @@ export default {
         original: 'Original',
         split: 'Split',
         splitExpense: 'Split expense',
-        payName: ({name}: {name: string}) => `Pay ${name}`,
-        paySomeone: 'Pay someone',
+        paySomeone: ({name}: PaySomeoneParams) => `Pay ${name ?? 'someone'}`,
         expense: 'Expense',
         participants: 'Participants',
         submitExpense: 'Submit expense',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 8be29cf0ad28..335ffb2e97c7 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -49,6 +49,7 @@ import type {
     PayerPaidAmountParams,
     PayerPaidParams,
     PayerSettledParams,
+    PaySomeoneParams,
     RemovedTheRequestParams,
     RenamedRoomActionParams,
     ReportArchiveReasonsClosedParams,
@@ -617,8 +618,7 @@ export default {
         expense: 'Solicitar',
         participants: 'Participantes',
         submitExpense: 'Pedir dinero',
-        paySomeone: 'Enviar dinero',
-        payName: ({name}: {name: string}) => `Pay ${name}`,
+        paySomeone: ({name}: PaySomeoneParams) => `Pay ${name ?? 'someone'}`,
         trackExpense: 'Seguimiento de gastos',
         pay: 'Pagar',
         cancelPayment: 'Cancelar el pago',
diff --git a/src/languages/types.ts b/src/languages/types.ts
index c365363f84af..30b7f842db4c 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -247,6 +247,8 @@ type ViolationsTagOutOfPolicyParams = {tagName?: string};
 
 type ViolationsTaxOutOfPolicyParams = {taxName?: string};
 
+type PaySomeoneParams = {name?: string};
+
 type TaskCreatedActionParams = {title: string};
 
 /* Translation Object types */
@@ -400,4 +402,5 @@ export type {
     ZipCodeExampleFormatParams,
     LogSizeParams,
     HeldRequestParams,
+    PaySomeoneParams,
 };
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index 4e268a8ad906..39cbfd060471 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -135,7 +135,7 @@ function AttachmentPickerWithMenuItems({
             },
             [CONST.IOU.TYPE.SEND]: {
                 icon: Expensicons.Send,
-                text: translate('iou.payName', {name: ReportUtils.getReportName(report)}),
+                text: translate('iou.paySomeone', {name: ReportUtils.getReportName(report)}),
                 onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.SEND, report?.reportID ?? ''),
             },
             [CONST.IOU.TYPE.TRACK_EXPENSE]: {

From 54453702795db355b53bf9cc33ab9c295f1602f3 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Fri, 12 Apr 2024 08:58:28 -0400
Subject: [PATCH 191/383] Fixed lint error

---
 src/pages/signin/SignInPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 8bafaeca97b8..94a4ce1f7951 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -92,7 +92,7 @@ function getRenderOptions({
     shouldShowAnotherLoginPageOpenedMessage,
 }: GetRenderOptionsParams): RenderOption {
     const hasAccount = !isEmptyObject(account);
-    const isSAMLEnabled = true; //!!account?.isSAMLEnabled;
+    const isSAMLEnabled = !!account?.isSAMLEnabled;
     const isSAMLRequired = !!account?.isSAMLRequired;
     const hasEmailDeliveryFailure = !!account?.hasEmailDeliveryFailure;
 

From 86e92d2b01be898c8a14434818f990cac018d818 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Fri, 12 Apr 2024 18:32:11 +0530
Subject: [PATCH 192/383] Fixed paySomeone

---
 .../PurposeForUsingExpensifyPage.tsx               | 14 ++++----------
 .../FloatingActionButtonAndPopover.tsx             |  2 +-
 src/pages/iou/request/IOURequestStartPage.js       |  2 +-
 .../request/step/IOURequestStepConfirmation.tsx    |  2 +-
 .../request/step/IOURequestStepParticipants.tsx    |  2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
index 65fbd4185cef..d1bcedadb508 100644
--- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
+++ b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
@@ -26,17 +26,11 @@ const messageCopy = {
     [CONST.INTRO_CHOICES.TRACK]:
         "Here's how to start tracking business spend for taxes:\n" +
         '\n' +
-        '1. Click the green *+* > *New workspace*.\n' +
-        '2. Your new workspace is now active.\n' +
-        '3. To update your workspace name, click *Profile* > *Name*.\n' +
+        '1. Click the green *+* > *Track expense*.\n' +
+        '2. Scan a receipt, enter an amount, or log your trip.\n' +
+        '3. Click *Track*.\n' +
         '\n' +
-        'Next, start adding expenses to your workspace:\n' +
-        '\n' +
-        '1. Click the green *+* > *Submit expense*.\n' +
-        '2. Add an expense or scan a receipt.\n' +
-        '3. Choose your workspace as the destination.\n' +
-        '\n' +
-        'Be sure to track all of your expenses in your new workspace to keep everything organized. Let me know how it goes!',
+        "And that's it. Every expense will drop into your personal space, neatly organized for tax season. Let me know how it goes!",
     [CONST.INTRO_CHOICES.SUBMIT]:
         "Here's how to submit expenses for reimbursement:\n" +
         '\n' +
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index a95d5b1ea874..92b639a8cd3e 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -298,7 +298,7 @@ function FloatingActionButtonAndPopover(
                     },
                     {
                         icon: Expensicons.Send,
-                        text: translate('iou.paySomeone'),
+                        text: translate('iou.paySomeone', {name: undefined}),
                         onSelected: () =>
                             interceptAnonymousUser(() =>
                                 IOU.startMoneyRequest(
diff --git a/src/pages/iou/request/IOURequestStartPage.js b/src/pages/iou/request/IOURequestStartPage.js
index b2248b1f6222..2de82f6fdbe2 100644
--- a/src/pages/iou/request/IOURequestStartPage.js
+++ b/src/pages/iou/request/IOURequestStartPage.js
@@ -76,7 +76,7 @@ function IOURequestStartPage({
     const [isDraggingOver, setIsDraggingOver] = useState(false);
     const tabTitles = {
         [CONST.IOU.TYPE.REQUEST]: translate('iou.submitExpense'),
-        [CONST.IOU.TYPE.SEND]: translate('iou.paySomeone'),
+        [CONST.IOU.TYPE.SEND]: translate('iou.paySomeone', {name: undefined}),
         [CONST.IOU.TYPE.SPLIT]: translate('iou.splitExpense'),
         [CONST.IOU.TYPE.TRACK_EXPENSE]: translate('iou.trackExpense'),
     };
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 25e3a10436e9..04e739adecb9 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -87,7 +87,7 @@ function IOURequestStepConfirmation({
             return translate('iou.trackExpense');
         }
         if (iouType === CONST.IOU.TYPE.SEND) {
-            return translate('iou.paySomeone');
+            return translate('iou.paySomeone', {name: undefined});
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
     }, [iouType, transaction, translate]);
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
index 3a06306d2b06..d5f3d6bf34a5 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -51,7 +51,7 @@ function IOURequestStepParticipants({
             return translate('iou.splitExpense');
         }
         if (iouType === CONST.IOU.TYPE.SEND) {
-            return translate('iou.paySomeone');
+            return translate('iou.paySomeone', {name: undefined});
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
     }, [iouType, transaction, translate, isSplitRequest]);

From 4db9c263090b692a2ed574a4330818d1c67c2853 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Fri, 12 Apr 2024 18:51:49 +0530
Subject: [PATCH 193/383] Apply suggestions from code review

---
 src/components/ReportActionItem/MoneyRequestPreview/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/types.ts b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
index dc709c16aede..0e3eb37ce6e3 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/types.ts
+++ b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
@@ -53,7 +53,7 @@ type MoneyRequestPreviewProps = MoneyRequestPreviewOnyxProps & {
     /** Extra styles to pass to View wrapper */
     containerStyles?: StyleProp<ViewStyle>;
 
-    /** True if this is this IOU is a split instead of a submit expense */
+    /** True if this IOU has a type of split */
     isBillSplit: boolean;
 
     /** Whether this IOU is a track expense */

From b01588886d114bdd85f44ba816593256591f1791 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Fri, 12 Apr 2024 18:52:59 +0530
Subject: [PATCH 194/383] Removed extra TODO

---
 src/libs/ReportUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 932f260712d2..b1645eb6c131 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3384,7 +3384,7 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
             iouMessage = `submitted ${amount}`;
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
-            iouMessage = `submitted ${amount}${comment && ` for ${comment}`}`; // TODO: Recheck this
+            iouMessage = `submitted ${amount}${comment && ` for ${comment}`}`;
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.TRACK:
             iouMessage = `tracking ${amount}${comment && ` for ${comment}`}`;

From 27f72545aec93f4dd81fdf3de0f41e095340522f Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 12 Apr 2024 22:03:31 +0800
Subject: [PATCH 195/383] calculate suggestion when selection state is updated

---
 .../ReportActionCompose/SuggestionMention.tsx   | 17 ++---------------
 .../report/ReportActionCompose/Suggestions.tsx  |  3 +--
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 035681071248..ce824826d784 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -272,7 +272,7 @@ function SuggestionMention(
         }
         calculateMentionSuggestion(selection.end);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isComposerFocused]);
+    }, [selection, isComposerFocused]);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         setSuggestionValues((prevState) => {
@@ -292,29 +292,16 @@ function SuggestionMention(
 
     const getSuggestions = useCallback(() => suggestionValues.suggestedMentions, [suggestionValues]);
 
-    const onSelectionChange = useCallback(
-        (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
-            /**
-             * we pass here e.nativeEvent.selection.end directly to calculateMentionSuggestion
-             * because in other case calculateMentionSuggestion will have an old calculation value
-             * of suggestion instead of current one
-             */
-            calculateMentionSuggestion(e.nativeEvent.selection.end);
-        },
-        [calculateMentionSuggestion],
-    );
-
     useImperativeHandle(
         ref,
         () => ({
             resetSuggestions,
             triggerHotkeyActions,
             setShouldBlockSuggestionCalc,
-            onSelectionChange,
             updateShouldShowSuggestionMenuToFalse,
             getSuggestions,
         }),
-        [onSelectionChange, resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions],
+        [resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions],
     );
 
     if (!isMentionSuggestionsMenuVisible) {
diff --git a/src/pages/home/report/ReportActionCompose/Suggestions.tsx b/src/pages/home/report/ReportActionCompose/Suggestions.tsx
index dd6fec77f38a..61026a792919 100644
--- a/src/pages/home/report/ReportActionCompose/Suggestions.tsx
+++ b/src/pages/home/report/ReportActionCompose/Suggestions.tsx
@@ -111,8 +111,7 @@ function Suggestions(
 
     const onSelectionChange = useCallback((e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
         const emojiHandler = suggestionEmojiRef.current?.onSelectionChange?.(e);
-        const mentionHandler = suggestionMentionRef.current?.onSelectionChange?.(e);
-        return emojiHandler ?? mentionHandler;
+        return emojiHandler;
     }, []);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {

From 1ea2c63a4cf900eccd28f83e040b72fcc4d305e0 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 12 Apr 2024 22:10:02 +0800
Subject: [PATCH 196/383] remove unused import

---
 src/pages/home/report/ReportActionCompose/SuggestionMention.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index ce824826d784..4748f94df145 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -2,7 +2,6 @@ import Str from 'expensify-common/lib/str';
 import lodashSortBy from 'lodash/sortBy';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
-import type {NativeSyntheticEvent, TextInputSelectionChangeEventData} from 'react-native';
 import * as Expensicons from '@components/Icon/Expensicons';
 import type {Mention} from '@components/MentionSuggestions';
 import MentionSuggestions from '@components/MentionSuggestions';

From 1b09ba0f25e3c0d8e7a4b71d28c9dae86533ac02 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Fri, 12 Apr 2024 11:33:07 -0700
Subject: [PATCH 197/383] chore: remove the context

---
 src/pages/workspace/withPolicyConnections.tsx | 97 ++++++++++---------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 4e9d8776237e..06431c2653ca 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,70 +1,73 @@
-import React, {createContext, useContext, useEffect, useState} from 'react';
-import type {ComponentType, PropsWithChildren} from 'react';
+import {useEffect, useState} from 'react';
+import type {ComponentType} from 'react';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import useNetwork from '@hooks/useNetwork';
 import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
-import type {Policy} from '@src/types/onyx';
-import type {WithPolicyProps} from './withPolicy';
 import withPolicy from './withPolicy';
+import type {WithPolicyProps} from './withPolicy';
 
-const PolicyWithConnectionsDataContext = createContext<Policy | null>(null);
-
-function usePolicyWithConnectionsData() {
-    const policy = useContext(PolicyWithConnectionsDataContext);
-    if (!policy) {
-        throw new Error('usePolicyWithConnectionsData must be used within a PolicyWithConnectionsDataProvider');
-    }
-    return policy;
-}
+type WithPolicyConnectionsProps = WithPolicyProps;
 
 /**
- * A context that provides the policy object and ensures that the `connections` data is fetched once. The context maintains a state to track
- * whether the `connections` data has been fetched, ensuring the fetch request is made only once per user session.
- * Note that the policy object provided by this context may not have the `connections` field populated. When the `connections` data is being
- * fetched, the `connections` field is empty.
- * For this reason, use the `withPolicyConnections` HOC defined in this file when consuming the policy object. It manages the rendering logic
- * when the connections field is empty, ensuring that the `policy` object has its `connections` field populated when the wrapped component is
- * rendered.
+ * Higher-order component that fetches the connections data and populates
+ * the corresponding field of the policy object if the field is empty. It then passes the policy object
+ * to the wrapped component.
+ *
+ * Use this HOC when you need the policy object with its connections field populated.
+ *
+ * Only the active policy gets the complete policy data upon app start that includes the connections data.
+ * For other policies, the connections data needs to be fetched when it's needed.
  */
-function PolicyWithConnectionsDataContextProviderWrapped({policy, children}: PropsWithChildren<WithPolicyProps>) {
-    const [hasFetchedConnectionsData, setHasFetchedConnectionsData] = useState(false);
-
-    useEffect(() => {
-        if (hasFetchedConnectionsData || !policy || policy.connections) {
-            return;
-        }
-
-        openPolicyAccountingPage(policy.id);
-        setHasFetchedConnectionsData(true);
-    }, [policy, hasFetchedConnectionsData]);
+function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
+    function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
+        const {isOffline} = useNetwork();
 
-    return <PolicyWithConnectionsDataContext.Provider value={policy}>{children}</PolicyWithConnectionsDataContext.Provider>;
-}
+        // When the accounting feature is enabled, but the user hasn't connected to any accounting software,
+        // the connections data doesn't exist. We don't want to continually attempt to fetch non-existent data.
+        // This state helps us track whether a data fetch attempt has been made.
+        const [wasConnectionsDataFetched, setWasConnectionsDataFetched] = useState(false);
 
-const PolicyWithConnectionsDataContextProvider = withPolicy(PolicyWithConnectionsDataContextProviderWrapped);
+        useEffect(() => {
+            // When the accounting feature is not enabled, or if the connections data already exists,
+            // there is no need to fetch the connections data.
+            if (wasConnectionsDataFetched || !policy?.areConnectionsEnabled || !!policy?.connections || !policy?.id) {
+                return;
+            }
 
-/**
- * Higher-order component that provides the policy object which is guaranteed to have the `connections` field populated.
- * If the `connections` field is absent, it either renders nothing or displays the full offline screen when the device is offline.
- * Use this HOC when you need the policy object with its connections field populated.
- */
-function withPolicyConnections(WrappedComponent: ComponentType<{policy: Policy}>) {
-    function WithPolicyConnections() {
-        const {isOffline} = useNetwork();
-        const policy = usePolicyWithConnectionsData();
+            openPolicyAccountingPage(policy.id);
+            setWasConnectionsDataFetched(true);
+        }, [policy, wasConnectionsDataFetched]);
 
         if (!policy?.connections) {
             if (isOffline) {
-                return <FullPageOfflineBlockingView>{null}</FullPageOfflineBlockingView>;
+                return (
+                    <FullPageOfflineBlockingView>
+                        <WrappedComponent
+                            policy={policy}
+                            policyMembers={policyMembers}
+                            policyDraft={policyDraft}
+                            policyMembersDraft={policyMembersDraft}
+                            route={route}
+                        />
+                    </FullPageOfflineBlockingView>
+                );
             }
 
             return null;
         }
 
-        return <WrappedComponent policy={policy} />;
+        return (
+            <WrappedComponent
+                policy={policy}
+                policyMembers={policyMembers}
+                policyDraft={policyDraft}
+                policyMembersDraft={policyMembersDraft}
+                route={route}
+            />
+        );
     }
 
-    return WithPolicyConnections;
+    return withPolicy(WithPolicyConnections);
 }
 
-export {PolicyWithConnectionsDataContextProvider, withPolicyConnections};
+export default withPolicyConnections;

From 32e979b3253f73813afd5a8a918f2461085bc542 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Fri, 12 Apr 2024 11:36:32 -0700
Subject: [PATCH 198/383] chore: use withPolicyConnectionsHOC

---
 src/pages/workspace/accounting/WorkspaceAccountingPage.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/accounting/WorkspaceAccountingPage.tsx b/src/pages/workspace/accounting/WorkspaceAccountingPage.tsx
index 6fada466e2bb..412d82d6375a 100644
--- a/src/pages/workspace/accounting/WorkspaceAccountingPage.tsx
+++ b/src/pages/workspace/accounting/WorkspaceAccountingPage.tsx
@@ -22,8 +22,8 @@ import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -237,4 +237,4 @@ function WorkspaceAccountingPage({policy}: WithPolicyProps) {
 
 WorkspaceAccountingPage.displayName = 'WorkspaceAccountingPage';
 
-export default withPolicy(WorkspaceAccountingPage);
+export default withPolicyConnections(WorkspaceAccountingPage);

From 575fc22852c8922a7c1ae8878e9b26df1e7a9b36 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 00:44:05 +0530
Subject: [PATCH 199/383] fixes wrong date format in confirmation page

---
 src/libs/ReportUtils.ts                              |  7 ++++++-
 src/pages/home/report/ReportActionItem.tsx           | 12 +++++++++---
 .../Profile/PersonalDetails/CountrySelectionPage.tsx |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 066c3a4c0097..8e2766c52b4f 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5835,7 +5835,7 @@ function getReportActionActorAccountID(reportAction: OnyxEntry<ReportAction>, io
 
 function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>, reportActionID: string): void {
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction);
-    const reportActions = ReportActionsUtils.getAllReportActions(reportID);
+    const reportActions = reportActionsByReport?.[reportID] ?? ([] as ReportAction[]);
 
     if (!transaction || !reportActions) {
         return;
@@ -5843,11 +5843,16 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
 
     const linkedTrackedExpenseReportAction = Object.values(reportActions).find((action) => (action.originalMessage as IOUMessage)?.IOUTransactionID === transactionID);
 
+    const transactionAmount = Math.abs(transaction.amount);
+    const transactionCreated = format(new Date(transaction.created), CONST.DATE.FNS_FORMAT_STRING);
+
     IOU.createDraftTransaction({
         ...transaction,
         actionableWhisperReportActionID: reportActionID,
         linkedTrackedExpenseReportAction,
         linkedTrackedExpenseReportID: reportID,
+        amount: transactionAmount,
+        created: transactionCreated,
     } as Transaction);
 
     Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.REQUEST, transactionID, reportID, undefined, actionName));
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 2398ffacb9a6..3beccdf486e2 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -400,19 +400,25 @@ function ReportActionItem({
                 {
                     text: 'actionableMentionTrackExpense.categorize',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`,
-                    onPress: () => ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID),
+                    onPress: () => {
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID);
+                    },
                     isMediumSized: true,
                 },
                 {
                     text: 'actionableMentionTrackExpense.share',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-share`,
-                    onPress: () => ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.SHARE, action.reportActionID),
+                    onPress: () => {
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.SHARE, action.reportActionID);
+                    },
                     isMediumSized: true,
                 },
                 {
                     text: 'actionableMentionTrackExpense.nothing',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-nothing`,
-                    onPress: () => Report.dismissTrackExpenseActionableWhisper(report.reportID, action),
+                    onPress: () => {
+                        Report.dismissTrackExpenseActionableWhisper(report.reportID, action);
+                    },
                     isMediumSized: true,
                 },
             ];
diff --git a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
index 8bed21f322ec..c0d980083ddf 100644
--- a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
@@ -68,7 +68,7 @@ function CountrySelectionPage({route, navigation}: CountrySelectionPageProps) {
                 shouldShowBackButton
                 onBackButtonPress={() => {
                     const backTo = route.params.backTo ?? '';
-                    const backToRoute = backTo ? (`${backTo}?country=${currentCountry}` as const) : '';
+                    const backToRoute = backTo ? `${backTo}?country=${currentCountry}` : '';
                     Navigation.goBack(backToRoute as Route);
                 }}
             />

From ada170ded0c5c8a135e8f57dd007f3386c6b9f66 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Fri, 12 Apr 2024 23:13:12 +0300
Subject: [PATCH 200/383] fix delete menu item appering bug for iou type parent
 report action

---
 src/libs/ReportUtils.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 6197a29cd4a6..b94923089f5c 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1438,9 +1438,10 @@ function canDeleteReportAction(reportAction: OnyxEntry<ReportAction>, reportID:
             return false;
         }
 
+        const linkedReport = isChatThread(report) ? getReport(report?.parentReportID) : report;
         if (isActionOwner) {
-            if (!isEmptyObject(report) && isMoneyRequestReport(report)) {
-                return canAddOrDeleteTransactions(report);
+            if (!isEmptyObject(linkedReport) && isMoneyRequestReport(linkedReport)) {
+                return canAddOrDeleteTransactions(linkedReport);
             }
             return true;
         }

From cc30eba3bc75c05651a049c6f847a635bfc848f7 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Fri, 12 Apr 2024 22:28:31 +0200
Subject: [PATCH 201/383] feat: change new arch flash list to interop

---
 ios/Podfile.lock                        |   19 +-
 patches/@shopify+flash-list+1.6.3.patch | 1360 -----------------------
 react-native.config.js                  |    7 +-
 3 files changed, 6 insertions(+), 1380 deletions(-)
 delete mode 100644 patches/@shopify+flash-list+1.6.3.patch

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index f9244c515a2c..46df966d80d3 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1794,24 +1794,7 @@ PODS:
     - React-Core
     - RNFBApp
   - RNFlashList (1.6.3):
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Codegen
     - React-Core
-    - React-debug
-    - React-Fabric
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-rendererdebug
-    - React-utils
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - Yoga
   - RNFS (2.20.0):
     - React-Core
   - RNGestureHandler (2.14.1):
@@ -2561,7 +2544,7 @@ SPEC CHECKSUMS:
   RNFBApp: 729c0666395b1953198dc4a1ec6deb8fbe1c302e
   RNFBCrashlytics: 2061ca863e8e2fa1aae9b12477d7dfa8e88ca0f9
   RNFBPerf: 389914cda4000fe0d996a752532a591132cbf3f9
-  RNFlashList: 5b0e8311e4cf1ad91e410fd7c8526a89fb5826d1
+  RNFlashList: 4b4b6b093afc0df60ae08f9cbf6ccd4c836c667a
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 1190c218cdaaf029ee1437076a3fbbc3297d89fb
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
diff --git a/patches/@shopify+flash-list+1.6.3.patch b/patches/@shopify+flash-list+1.6.3.patch
deleted file mode 100644
index 4910bb20b4ec..000000000000
--- a/patches/@shopify+flash-list+1.6.3.patch
+++ /dev/null
@@ -1,1360 +0,0 @@
-diff --git a/node_modules/@shopify/flash-list/CHANGELOG.md b/node_modules/@shopify/flash-list/CHANGELOG.md
-deleted file mode 100644
-index 9c6bc58..0000000
---- a/node_modules/@shopify/flash-list/CHANGELOG.md
-+++ /dev/null
-@@ -1,279 +0,0 @@
--# Changelog
--
--All notable changes to this project will be documented in this file.
--
--The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
--and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
--
--## [Unreleased]
--
--## [1.6.3] - 2023-11-09
--
--- Changes for RN 0.73 support
--  - https://github.com/Shopify/flash-list/pull/930
--
--## [1.6.2] - 2023-10-19
--
--- Move shouldRefreshWithAnchoring configuration so it is possible to disable it from outside FlashList by invalidating layout
--  - https://github.com/Shopify/flash-list/pull/935
--
--## [1.6.1] - 2023-09-14
--
--- Prevent an expired layout provider from being used again
--  - https://github.com/Shopify/flash-list/pull/915
--
--## [1.6.0] - 2023-09-13
--
--- Update types to match `react-native@0.72` view types.
--  - https://github.com/Shopify/flash-list/pull/890
--- Add option to clear cached layouts on update
--  - https://github.com/Shopify/flash-list/pull/910
--
--## [1.5.0] - 2023-07-12
--
--- Update kotlin version to 1.8.10 for RN 0.72 compatibility
--  - https://github.com/Shopify/flash-list/pull/865
--
--## [1.4.3] - 2023-04-24
--
--- Fix definition conflicts with previous value
--  - https://github.com/Shopify/flash-list/pull/795
--- Fix Android unit test
--  - https://github.com/Shopify/flash-list/pull/815
--- Fix performance issues with inverted lists on Android
--  - https://github.com/Shopify/flash-list/pull/819
--
--## [1.4.2] - 2023-03-20
--
--- Apply layout correction only to consecutive cells
--  - https://github.com/Shopify/flash-list/pull/788
--
--## [1.4.1] - 2023-01-24
--
--- Prevent overflow of sticky headers
--  - https://github.com/Shopify/flash-list/pull/714
--- Skip footer correction when layout correction is skipped
--  - https://github.com/Shopify/flash-list/pull/743
--
--## [1.4.0] - 2022-11-07
--
--- Add content padding support to FlashList
--  - https://github.com/Shopify/flash-list/pull/626
--- Upgrade recyclerlistview to v4.2.0
--  - https://github.com/Shopify/flash-list/pull/660
--
--## [1.3.1] - 2022-10-11
--
--- Expose `columnIndex` and `columnSpan` to `MasonryFlashList.renderItem`
--  - https://github.com/Shopify/flash-list/pull/625
--
--## [1.3.0] - 2022-09-26
--
--- Added `MasonryFlashList` which adds support for rendering masonry layouts
--  - https://github.com/Shopify/flash-list/pull/587
--
--## [1.2.2] - 2022-09-06
--
--- Fixes type checking error in `AutoLayoutView` due to `children` not being an explicit type
--  - https://github.com/Shopify/flash-list/pull/567
--
--## [1.2.1] - 2022-08-03
--
--- Fixed crash when `estimatedListSize` is used in an empty list
--  - https://github.com/Shopify/flash-list/pull/546
--
--## [1.2.0] - 2022-07-18
--
--- Fixed out of bound read from data
--  - https://github.com/Shopify/flash-list/pull/523
--- Added JS only fallbacks for unsupported platforms
--  - https://github.com/Shopify/flash-list/pull/518
--- Added footer correction in AutoLayoutView
--  - https://github.com/Shopify/flash-list/pull/519
--- Added `viewPosition` and `viewOffset` support scrollTo methods
--  - https://github.com/Shopify/flash-list/pull/521
--- Fix inverted mode while being horizontal
--  - https://github.com/Shopify/flash-list/pull/520
--- Upgrade recyclerlistview to v4.1.1
--  - https://github.com/Shopify/flash-list/pull/526
--
--## [1.1.0] - 2022-07-06
--
--- Added render target info to `renderItem` callback
--  - https://github.com/Shopify/flash-list/pull/454
--- Add Apple TV support
--  - https://github.com/Shopify/flash-list/pull/511
--- Clarify installation instructions in Expo projects
--  - https://github.com/Shopify/flash-list/pull/497
--- Upgrade recyclerlistview to v4.0.1
--  - https://github.com/Shopify/flash-list/pull/507
--- Add tslib as a dependency
--  - https://github.com/Shopify/flash-list/pull/514
--
--## [1.0.4] - 2022-07-02
--
--- Build fix for Android projects having `kotlinVersion` defined in `build.gradle`.
--- Allow providing an external scrollview.
--  - https://github.com/Shopify/flash-list/pull/502
--
--## [1.0.3] - 2022-07-01
--
--- Add kotlin-gradle-plugin to buildscript in project build.gradle
--  - https://github.com/Shopify/flash-list/pull/481
--
--## [1.0.2] - 2022-06-30
--
--- Minor changes
--
--## [1.0.1] - 2022-06-30
--
--- `data` prop change will force update items only if `renderItem` is also updated
--  - https://github.com/Shopify/flash-list/pull/453
--
--## [1.0.0] - 2022-06-17
--
--- Upgrade recyclerlistview to v3.3.0-beta.2
--  - https://github.com/Shopify/flash-list/pull/445
--- Added web support
--  - https://github.com/Shopify/flash-list/pull/444
--- Added `disableAutoLayout` prop to prevent conflicts with custom `CellRendererComponent`
--  - https://github.com/Shopify/flash-list/pull/452
--
--## [0.6.1] - 2022-05-26
--
--- Fix amending layout on iOS
--  - https://github.com/Shopify/flash-list/pull/412
--- Define `FlashList` props previously inherited from `VirtualizedList` and `FlatList` explicitly
--  - https://github.com/Shopify/flash-list/pull/386
--- Make `estimatedItemSize` optional
--  - https://github.com/Shopify/flash-list/pull/378
--- Change `overrideItemType` prop name to `getItemType`
--  - https://github.com/Shopify/flash-list/pull/369
--- Added `useBlankAreaTracker` hook for tracking blank area in production
--  - https://github.com/Shopify/flash-list/pull/411
--- Added `CellRendererComponent` prop
--  - https://github.com/Shopify/flash-list/pull/362
--- Added automatic height measurement for horizontal lists even when parent isn't deterministic
--  - https://github.com/Shopify/flash-list/pull/409
--
--## [0.5.0] - 2022-04-29
--
--- Fix finding props with testId
--  - https://github.com/Shopify/flash-list/pull/357
--- Reuse cached layouts on orientation change
--  - https://github.com/Shopify/flash-list/pull/319
--
--## [0.4.6] - 2022-04-13
--
--- Match FlashList's empty list behavior with FlatList
--  - https://github.com/Shopify/flash-list/pull/312
--
--## [0.4.5] - 2022-04-13
--
--- Upgrade recyclerlistview to v3.2.0-beta.4
--
--  - https://github.com/Shopify/flash-list/pull/315
--
--- Add viewability callbacks
--
--  - https://github.com/Shopify/flash-list/pull/301
--
--- Calculate average item sizes automatically
--  - https://github.com/Shopify/flash-list/pull/296
--
--## [0.4.4] - 2022-04-06
--
--- Fix `FlashList` mock when no data is provided
--  - https://github.com/Shopify/flash-list/pull/295
--
--## [0.4.3] - 2022-04-04
--
--- Reduce number of render item calls
--
--  - https://github.com/Shopify/flash-list/pull/253
--
--- Upgrade recyclerlistview to v3.2.0-beta.2
--  - https://github.com/Shopify/flash-list/pull/284
--
--## [0.4.2] - 2022-04-04
--
--- Minor changes
--
--## [0.4.1] - 2022-03-29
--
--- Crash fix for android activity switching (#256)
--
--  - https://github.com/Shopify/flash-list/pull/257
--
--- initialScrollIndex, scrollTo methods will now account for size of header
--
--  - https://github.com/Shopify/flash-list/pull/194
--
--- Added a new mock for easier testing of components with `FlashList`
--  - https://github.com/Shopify/flash-list/pull/236
--
--## [0.4.0] - 2022-03-23
--
--- Add support for layout animations
--
--  - https://github.com/Shopify/flash-list/pull/183
--
--- Suppress recyclerlistview's bounded size exception for some missing cases.
--
--  - https://github.com/Shopify/flash-list/pull/192
--
--- Expose reference to recyclerlistview and firstItemOffset
--
--  - https://github.com/Shopify/flash-list/pull/217
--
--- recyclerlistview upgraded to v3.1.0-alpha.9
--  - https://github.com/Shopify/flash-list/pull/227
--
--## [0.3.3] - 2022-03-16
--
--- Prevent implicit scroll to top on device orientation change
--- Change recyclerlistview's bounded size exception to a warning
--  - https://github.com/Shopify/flash-list/pull/187
--
--## [0.3.2] - 2022-03-15
--
--- Minor changes
--
--## [0.3.1] - 2022-03-15
--
--- Revert react-native-safe-area upgrade and minSdkVersion bump
--  - https://github.com/Shopify/flash-list/pull/184
--
--## [0.3.0] - 2022-03-15
--
--- Fixed untranspiled library code by enforcing stricter TS rules.
--  - https://github.com/Shopify/flash-list/pull/181
--
--## [0.2.4] - 2022-03-14
--
--- Added `onLoad` event that is called once the list has rendered items. This is required because FlashList doesn't render items in the first cycle.
--  - https://github.com/Shopify/flash-list/pull/180
--
--## [0.2.3] - 2022-03-10
--
--- Fixing publish steps for transpiled code
--  - https://github.com/Shopify/flash-list/pull/150
--
--## [0.2.2] - 2022-03-10
--
--- Fixing publish steps for transpiled code
--  - https://github.com/Shopify/flash-list/pull/149
--
--## [0.2.1] - 2022-03-09
--
--- Bug fix for style and last separator
--  - https://github.com/Shopify/flash-list/pull/141
--
--## [0.2.0] - 2022-03-08
--
--- Rename the component from `RecyclerFlatList` to `FlashList`
--  - https://github.com/Shopify/flash-list/pull/140
--
--## [0.1.0] - 2022-03-02
--
--- Initial release
-diff --git a/node_modules/@shopify/flash-list/RNFlashList.podspec b/node_modules/@shopify/flash-list/RNFlashList.podspec
-index 38ff029..a749f6c 100644
---- a/node_modules/@shopify/flash-list/RNFlashList.podspec
-+++ b/node_modules/@shopify/flash-list/RNFlashList.podspec
-@@ -9,14 +9,20 @@ Pod::Spec.new do |s|
-   s.homepage         = package['homepage']
-   s.license          = package['license']
-   s.author           = package['author']
--  s.platforms        = { :ios => '11.0', :tvos => '12.0' }
-   s.source           = { git: 'https://github.com/shopify/flash-list.git', tag: "v#{s.version}" }
-   s.source_files     = 'ios/Sources/**/*'
-   s.requires_arc     = true
-   s.swift_version    = '5.0'
-+  s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D RCT_NEW_ARCH_ENABLED', }
- 
--  # Dependencies
--  s.dependency 'React-Core'
-+  if defined?(install_modules_dependencies()) != nil
-+    install_modules_dependencies(s)
-+    s.ios.deployment_target = "12.4"
-+    s.platforms        = { :ios => '12.4', :tvos => '12.0' }
-+  else
-+    s.dependency "React-Core"
-+    s.platforms        = { :ios => '11.0', :tvos => '12.0' }
-+  end
- 
-   # Tests spec
-   s.test_spec 'Tests' do |test_spec|
-diff --git a/node_modules/@shopify/flash-list/android/build.gradle b/node_modules/@shopify/flash-list/android/build.gradle
-index bed08cd..bad4465 100644
---- a/node_modules/@shopify/flash-list/android/build.gradle
-+++ b/node_modules/@shopify/flash-list/android/build.gradle
-@@ -1,7 +1,14 @@
--apply plugin: 'com.android.library'
-+def isNewArchitectureEnabled() {
-+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-+}
- 
-+apply plugin: 'com.android.library'
- apply plugin: 'kotlin-android'
- 
-+if (isNewArchitectureEnabled()) {
-+    apply plugin: 'com.facebook.react'
-+}
-+
- def _ext = rootProject.ext
- 
- def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+'
-@@ -40,11 +47,19 @@ android {
-         debug.java.srcDirs += 'src/debug/kotlin'
-         test.java.srcDirs += 'src/test/kotlin'
-         androidTest.java.srcDirs += 'src/androidTest/kotlin'
-+
-+        if (isNewArchitectureEnabled()) {
-+            main.java.srcDirs += ["${project.buildDir}/generated/source/codegen/java"]
-+            main.java.srcDirs += ["src/fabric/java"]
-+        } else {
-+            main.java.srcDirs += ['src/paper/java']
-+        }
-     }
- 
-     defaultConfig {
-         minSdkVersion _minSdkVersion
-         targetSdkVersion _targetSdkVersion
-+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-         versionCode 1
-         versionName "1.0"
-         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-@@ -61,7 +76,7 @@ android {
- 
- dependencies {
-     compileOnly "com.facebook.react:react-native:${_reactNativeVersion}"
--    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${_kotlinVersion}"
-+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${_kotlinVersion}"
-     testImplementation "junit:junit:${_junitVersion}"
-     testImplementation "org.mockito.kotlin:mockito-kotlin:${_mockitoVersion}"
-     testImplementation "org.mockito:mockito-inline:${_mockitoVersion}"
-diff --git a/node_modules/@shopify/flash-list/android/src/fabric/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt b/node_modules/@shopify/flash-list/android/src/fabric/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
-new file mode 100644
-index 0000000..6e850fe
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/android/src/fabric/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
-@@ -0,0 +1,12 @@
-+package com.shopify.reactnative.flash_list
-+
-+import com.facebook.react.bridge.ReactContext
-+import com.facebook.react.fabric.FabricUIManager
-+import com.facebook.react.uimanager.UIManagerHelper
-+import com.facebook.react.uimanager.common.UIManagerType
-+import com.facebook.react.bridge.WritableMap
-+
-+fun ReactContext.dispatchEvent(nativeTag: Int, eventName: String, event: WritableMap) {
-+    val fabricUIManager = UIManagerHelper.getUIManager(this, UIManagerType.FABRIC) as FabricUIManager
-+    fabricUIManager.receiveEvent(nativeTag, eventName, event)
-+}
-diff --git a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt
-index 4571798..c6c3cce 100644
---- a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt
-+++ b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt
-@@ -2,8 +2,6 @@ package com.shopify.reactnative.flash_list
- 
- import android.content.Context
- import android.graphics.Canvas
--import android.util.DisplayMetrics
--import android.util.Log
- import android.view.View
- import android.view.ViewGroup
- import android.widget.HorizontalScrollView
-@@ -11,7 +9,6 @@ import android.widget.ScrollView
- import com.facebook.react.bridge.Arguments
- import com.facebook.react.bridge.ReactContext
- import com.facebook.react.bridge.WritableMap
--import com.facebook.react.uimanager.events.RCTEventEmitter
- import com.facebook.react.views.view.ReactViewGroup
- 
- 
-@@ -142,9 +139,8 @@ class AutoLayoutView(context: Context) : ReactViewGroup(context) {
-         val event: WritableMap = Arguments.createMap()
-         event.putDouble("offsetStart", alShadow.blankOffsetAtStart / pixelDensity)
-         event.putDouble("offsetEnd", alShadow.blankOffsetAtEnd / pixelDensity)
-+
-         val reactContext = context as ReactContext
--        reactContext
--                .getJSModule(RCTEventEmitter::class.java)
--                .receiveEvent(id, "onBlankAreaEvent", event)
-+        reactContext.dispatchEvent(id, "onBlankAreaEvent", event)
-     }
- }
-diff --git a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt
-index b646f09..7bda0ea 100644
---- a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt
-+++ b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt
-@@ -3,15 +3,22 @@ package com.shopify.reactnative.flash_list
- import com.facebook.react.module.annotations.ReactModule
- import com.facebook.react.uimanager.ThemedReactContext
- import com.facebook.react.uimanager.annotations.ReactProp
--import com.facebook.react.views.view.ReactViewGroup
--import com.facebook.react.views.view.ReactViewManager
-+import com.facebook.react.uimanager.ViewGroupManager
-+import com.facebook.react.uimanager.ViewManagerDelegate
-+import com.facebook.react.viewmanagers.AutoLayoutViewManagerDelegate
-+import com.facebook.react.viewmanagers.AutoLayoutViewManagerInterface
- import com.facebook.react.common.MapBuilder
- import kotlin.math.roundToInt
- 
- /** ViewManager for AutoLayoutView - Container for all RecyclerListView children. Automatically removes all gaps and overlaps for GridLayouts with flexible spans.
-  * Note: This cannot work for masonry layouts i.e, pinterest like layout */
- @ReactModule(name = AutoLayoutViewManager.REACT_CLASS)
--class AutoLayoutViewManager: ReactViewManager() {
-+class AutoLayoutViewManager: ViewGroupManager<AutoLayoutView>(), AutoLayoutViewManagerInterface<AutoLayoutView> {
-+    private val mDelegate: ViewManagerDelegate<AutoLayoutView>
-+
-+    init {
-+        mDelegate = AutoLayoutViewManagerDelegate(this)
-+    }
- 
-     companion object {
-         const val REACT_CLASS = "AutoLayoutView"
-@@ -21,45 +28,42 @@ class AutoLayoutViewManager: ReactViewManager() {
-         return REACT_CLASS
-     }
- 
--    override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
-+    override fun createViewInstance(context: ThemedReactContext): AutoLayoutView {
-         return AutoLayoutView(context).also { it.pixelDensity = context.resources.displayMetrics.density.toDouble() }
-     }
- 
--    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
--        return MapBuilder.builder<String, Any>().put(
--                "onBlankAreaEvent",
--                MapBuilder.of(
--                        "registrationName", "onBlankAreaEvent")
--        ).build();
--    }
-+    override fun getExportedCustomDirectEventTypeConstants() = mutableMapOf(
-+        "onBlankAreaEvent" to mutableMapOf("registrationName" to "onBlankAreaEvent"),
-+        "topOnBlankAreaEvent" to mutableMapOf("registrationName" to "onBlankAreaEvent"),
-+    )
- 
-     @ReactProp(name = "horizontal")
--    fun setHorizontal(view: AutoLayoutView, isHorizontal: Boolean) {
-+    override fun setHorizontal(view: AutoLayoutView, isHorizontal: Boolean) {
-         view.alShadow.horizontal = isHorizontal
-     }
- 
-     @ReactProp(name = "disableAutoLayout")
--    fun setDisableAutoLayout(view: AutoLayoutView, disableAutoLayout: Boolean) {
-+    override fun setDisableAutoLayout(view: AutoLayoutView, disableAutoLayout: Boolean) {
-         view.disableAutoLayout = disableAutoLayout
-     }
- 
-     @ReactProp(name = "scrollOffset")
--    fun setScrollOffset(view: AutoLayoutView, scrollOffset: Double) {
-+    override fun setScrollOffset(view: AutoLayoutView, scrollOffset: Double) {
-         view.alShadow.scrollOffset = convertToPixelLayout(scrollOffset, view.pixelDensity)
-     }
- 
-     @ReactProp(name = "windowSize")
--    fun setWindowSize(view: AutoLayoutView, windowSize: Double) {
-+    override fun setWindowSize(view: AutoLayoutView, windowSize: Double) {
-         view.alShadow.windowSize = convertToPixelLayout(windowSize, view.pixelDensity)
-     }
- 
-     @ReactProp(name = "renderAheadOffset")
--    fun setRenderAheadOffset(view: AutoLayoutView, renderOffset: Double) {
-+    override fun setRenderAheadOffset(view: AutoLayoutView, renderOffset: Double) {
-         view.alShadow.renderOffset = convertToPixelLayout(renderOffset, view.pixelDensity)
-     }
- 
-     @ReactProp(name = "enableInstrumentation")
--    fun setEnableInstrumentation(view: AutoLayoutView, enableInstrumentation: Boolean) {
-+    override fun setEnableInstrumentation(view: AutoLayoutView, enableInstrumentation: Boolean) {
-         view.enableInstrumentation = enableInstrumentation
-     }
- 
-diff --git a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt
-index 1434caa..590ba1d 100644
---- a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt
-+++ b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt
-@@ -2,12 +2,20 @@ package com.shopify.reactnative.flash_list
- 
- import com.facebook.react.module.annotations.ReactModule
- import com.facebook.react.uimanager.ThemedReactContext
-+import com.facebook.react.uimanager.ViewGroupManager
-+import com.facebook.react.uimanager.ViewManagerDelegate
- import com.facebook.react.uimanager.annotations.ReactProp
--import com.facebook.react.views.view.ReactViewGroup
--import com.facebook.react.views.view.ReactViewManager
-+import com.facebook.react.viewmanagers.CellContainerManagerDelegate
-+import com.facebook.react.viewmanagers.CellContainerManagerInterface
- 
- @ReactModule(name = AutoLayoutViewManager.REACT_CLASS)
--class CellContainerManager: ReactViewManager() {
-+class CellContainerManager: ViewGroupManager<CellContainerImpl>(), CellContainerManagerInterface<CellContainerImpl> {
-+    private val mDelegate: ViewManagerDelegate<CellContainerImpl>
-+
-+    init {
-+        mDelegate = CellContainerManagerDelegate(this);
-+    }
-+
-     companion object {
-         const val REACT_CLASS = "CellContainer"
-     }
-@@ -16,12 +24,12 @@ class CellContainerManager: ReactViewManager() {
-         return REACT_CLASS
-     }
- 
--    override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
-+    override fun createViewInstance(context: ThemedReactContext): CellContainerImpl {
-         return CellContainerImpl(context)
-     }
- 
-     @ReactProp(name = "index")
--    fun setIndex(view: CellContainerImpl, index: Int) {
-+    override fun setIndex(view: CellContainerImpl, index: Int) {
-         view.index = index
-     }
- }
-diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
-new file mode 100644
-index 0000000..4c90807
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
-@@ -0,0 +1,46 @@
-+/**
-+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-+*
-+* Do not edit this file as changes may cause incorrect behavior and will be lost
-+* once the code is regenerated.
-+*
-+* @generated by codegen project: GeneratePropsJavaDelegate.js
-+*/
-+
-+package com.facebook.react.viewmanagers;
-+
-+import android.view.View;
-+import androidx.annotation.Nullable;
-+import com.facebook.react.uimanager.BaseViewManagerDelegate;
-+import com.facebook.react.uimanager.BaseViewManagerInterface;
-+
-+public class AutoLayoutViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AutoLayoutViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-+  public AutoLayoutViewManagerDelegate(U viewManager) {
-+    super(viewManager);
-+  }
-+  @Override
-+  public void setProperty(T view, String propName, @Nullable Object value) {
-+    switch (propName) {
-+      case "horizontal":
-+        mViewManager.setHorizontal(view, value == null ? false : (boolean) value);
-+        break;
-+      case "scrollOffset":
-+        mViewManager.setScrollOffset(view, value == null ? 0f : ((Double) value).doubleValue());
-+        break;
-+      case "windowSize":
-+        mViewManager.setWindowSize(view, value == null ? 0f : ((Double) value).doubleValue());
-+        break;
-+      case "renderAheadOffset":
-+        mViewManager.setRenderAheadOffset(view, value == null ? 0f : ((Double) value).doubleValue());
-+        break;
-+      case "enableInstrumentation":
-+        mViewManager.setEnableInstrumentation(view, value == null ? false : (boolean) value);
-+        break;
-+      case "disableAutoLayout":
-+        mViewManager.setDisableAutoLayout(view, value == null ? false : (boolean) value);
-+        break;
-+      default:
-+        super.setProperty(view, propName, value);
-+    }
-+  }
-+}
-diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerInterface.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerInterface.java
-new file mode 100644
-index 0000000..8ad2622
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerInterface.java
-@@ -0,0 +1,21 @@
-+/**
-+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-+*
-+* Do not edit this file as changes may cause incorrect behavior and will be lost
-+* once the code is regenerated.
-+*
-+* @generated by codegen project: GeneratePropsJavaInterface.js
-+*/
-+
-+package com.facebook.react.viewmanagers;
-+
-+import android.view.View;
-+
-+public interface AutoLayoutViewManagerInterface<T extends View> {
-+  void setHorizontal(T view, boolean value);
-+  void setScrollOffset(T view, double value);
-+  void setWindowSize(T view, double value);
-+  void setRenderAheadOffset(T view, double value);
-+  void setEnableInstrumentation(T view, boolean value);
-+  void setDisableAutoLayout(T view, boolean value);
-+}
-diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
-new file mode 100644
-index 0000000..2b64af7
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
-@@ -0,0 +1,31 @@
-+/**
-+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-+*
-+* Do not edit this file as changes may cause incorrect behavior and will be lost
-+* once the code is regenerated.
-+*
-+* @generated by codegen project: GeneratePropsJavaDelegate.js
-+*/
-+
-+package com.facebook.react.viewmanagers;
-+
-+import android.view.View;
-+import androidx.annotation.Nullable;
-+import com.facebook.react.uimanager.BaseViewManagerDelegate;
-+import com.facebook.react.uimanager.BaseViewManagerInterface;
-+
-+public class CellContainerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & CellContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-+  public CellContainerManagerDelegate(U viewManager) {
-+    super(viewManager);
-+  }
-+  @Override
-+  public void setProperty(T view, String propName, @Nullable Object value) {
-+    switch (propName) {
-+      case "index":
-+        mViewManager.setIndex(view, value == null ? 0 : ((Double) value).intValue());
-+        break;
-+      default:
-+        super.setProperty(view, propName, value);
-+    }
-+  }
-+}
-diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerInterface.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerInterface.java
-new file mode 100644
-index 0000000..b37ddbd
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerInterface.java
-@@ -0,0 +1,16 @@
-+/**
-+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-+*
-+* Do not edit this file as changes may cause incorrect behavior and will be lost
-+* once the code is regenerated.
-+*
-+* @generated by codegen project: GeneratePropsJavaInterface.js
-+*/
-+
-+package com.facebook.react.viewmanagers;
-+
-+import android.view.View;
-+
-+public interface CellContainerManagerInterface<T extends View> {
-+  void setIndex(T view, int value);
-+}
-diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt b/node_modules/@shopify/flash-list/android/src/paper/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
-new file mode 100644
-index 0000000..b867c18
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
-@@ -0,0 +1,10 @@
-+package com.shopify.reactnative.flash_list
-+
-+import com.facebook.react.bridge.ReactContext
-+import com.facebook.react.uimanager.events.RCTEventEmitter
-+import com.facebook.react.bridge.WritableMap
-+
-+fun ReactContext.dispatchEvent(nativeTag: Int, eventName: String, event: WritableMap) {
-+    this.getJSModule(RCTEventEmitter::class.java)
-+        .receiveEvent(nativeTag, eventName, event)
-+}
-diff --git a/node_modules/@shopify/flash-list/dist/FlashList.d.ts b/node_modules/@shopify/flash-list/dist/FlashList.d.ts
-index ed81d7d..1e24103 100644
---- a/node_modules/@shopify/flash-list/dist/FlashList.d.ts
-+++ b/node_modules/@shopify/flash-list/dist/FlashList.d.ts
-@@ -103,6 +103,7 @@ declare class FlashList<T> extends React.PureComponent<FlashListProps<T>, FlashL
-         offset: number;
-     }): void;
-     getScrollableNode(): number | null;
-+    getNativeScrollRef(): number | null;
-     /**
-      * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
-      * Warning: We may swap recyclerlistview for something else in the future. Use with caution.
-diff --git a/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map b/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map
-index 97c8cc6..a915a05 100644
---- a/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map
-+++ b/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map
-@@ -1 +1 @@
--{"version":3,"file":"FlashList.d.ts","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAEL,YAAY,EAEZ,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAKxE,OAAO,EACL,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAoB1B,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9C;AAED,UAAU,SAAS,CAAC,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,CAAC;CACX;AAED,cAAM,SAAS,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,aAAa,CAC5C,cAAc,CAAC,CAAC,CAAC,EACjB,cAAc,CAAC,CAAC,CAAC,CAClB;IACC,OAAO,CAAC,MAAM,CAAC,CAA+C;IAC9D,OAAO,CAAC,yBAAyB,CAAC,CAAuB;IACzD,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,wBAAwB,CACkB;IAElD,OAAO,CAAC,kBAAkB,CAAK;IAC/B,OAAO,CAAC,YAAY,CAKlB;IAEF,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,sBAAsB,CAQ5B;IAEF,OAAO,CAAC,iBAAiB,CAAC,CAAgC;IAC1D,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,kBAAkB,CAAwB;IAElD,OAAO,CAAC,YAAY,CAAC,CAAmB;IAExC,MAAM,CAAC,YAAY;;;MAGjB;gBAEU,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;IAmBpC,OAAO,CAAC,aAAa;IAgCrB,MAAM,CAAC,wBAAwB,CAAC,CAAC,EAC/B,SAAS,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EACtC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,GAC3B,cAAc,CAAC,CAAC,CAAC;IAqCpB,OAAO,CAAC,MAAM,CAAC,sBAAsB;IA2BrC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IA0ChC,OAAO,CAAC,YAAY,CAElB;IAEF,OAAO,CAAC,iBAAiB,CAUvB;IAEF,iBAAiB;IAMjB,oBAAoB;IAQpB,MAAM;IAmGN,OAAO,CAAC,iBAAiB,CAKvB;IAEF,OAAO,CAAC,QAAQ,CAId;IAEF,OAAO,CAAC,gCAAgC;IAaxC,OAAO,CAAC,8BAA8B;IAOtC,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,gBAAgB,CAetB;IAEF,OAAO,CAAC,SAAS,CAsCf;IAEF,OAAO,CAAC,aAAa,CAwBnB;IAEF,OAAO,CAAC,wBAAwB,CAU9B;IAEF,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,SAAS,CAqBf;IAEF,OAAO,CAAC,MAAM,CAiBZ;IAEF,OAAO,CAAC,MAAM,CAqBZ;IAEF,OAAO,CAAC,gCAAgC,CAYtC;IAEF,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,qBAAqB,CAO3B;IAEF,OAAO,CAAC,iBAAiB,CAEvB;IAEF,OAAO,CAAC,oBAAoB,CAQ1B;IAEF;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,qBAAqB,CAgB3B;IAEF,OAAO,CAAC,WAAW,CAEjB;IAEF,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,yBAAyB,CAc/B;IAEF,OAAO,KAAK,eAAe,GAG1B;IAED,OAAO,CAAC,YAAY,CAIlB;IAEF,OAAO,CAAC,wBAAwB,CAQ9B;IAEF,OAAO,CAAC,cAAc,CAqBpB;IAEF,OAAO,CAAC,oBAAoB,CAK1B;IAEF;;;;;OAKG;IACI,+BAA+B,IAAI,IAAI;IAWvC,WAAW,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE;IAI9D,aAAa,CAAC,MAAM,EAAE;QAC3B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACnC;IAwBM,YAAY,CAAC,MAAM,EAAE;QAC1B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,IAAI,EAAE,GAAG,CAAC;QACV,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IAOM,cAAc,CAAC,MAAM,EAAE;QAC5B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,MAAM,EAAE,MAAM,CAAC;KAChB;IAMM,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIzC;;;OAGG;IAEH,IAAW,uBAAuB,6DAEjC;IAED;;OAEG;IACH,IAAW,eAAe,WAEzB;IAED;;OAEG;IACI,wBAAwB;IAI/B;;;OAGG;IACI,iBAAiB,aAEtB;CACH;AAED,eAAe,SAAS,CAAC"}
-\ No newline at end of file
-+{"version":3,"file":"FlashList.d.ts","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAEL,YAAY,EAEZ,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAKxE,OAAO,EACL,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAoB1B,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9C;AAED,UAAU,SAAS,CAAC,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,CAAC;CACX;AAED,cAAM,SAAS,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,aAAa,CAC5C,cAAc,CAAC,CAAC,CAAC,EACjB,cAAc,CAAC,CAAC,CAAC,CAClB;IACC,OAAO,CAAC,MAAM,CAAC,CAA+C;IAC9D,OAAO,CAAC,yBAAyB,CAAC,CAAuB;IACzD,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,wBAAwB,CACkB;IAElD,OAAO,CAAC,kBAAkB,CAAK;IAC/B,OAAO,CAAC,YAAY,CAKlB;IAEF,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,sBAAsB,CAQ5B;IAEF,OAAO,CAAC,iBAAiB,CAAC,CAAgC;IAC1D,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,kBAAkB,CAAwB;IAElD,OAAO,CAAC,YAAY,CAAC,CAAmB;IAExC,MAAM,CAAC,YAAY;;;MAGjB;gBAEU,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;IAmBpC,OAAO,CAAC,aAAa;IAgCrB,MAAM,CAAC,wBAAwB,CAAC,CAAC,EAC/B,SAAS,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EACtC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,GAC3B,cAAc,CAAC,CAAC,CAAC;IAqCpB,OAAO,CAAC,MAAM,CAAC,sBAAsB;IA2BrC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IA0ChC,OAAO,CAAC,YAAY,CAElB;IAEF,OAAO,CAAC,iBAAiB,CAUvB;IAEF,iBAAiB;IAMjB,oBAAoB;IAQpB,MAAM;IAmGN,OAAO,CAAC,iBAAiB,CAKvB;IAEF,OAAO,CAAC,QAAQ,CAId;IAEF,OAAO,CAAC,gCAAgC;IAaxC,OAAO,CAAC,8BAA8B;IAOtC,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,gBAAgB,CAetB;IAEF,OAAO,CAAC,SAAS,CAsCf;IAEF,OAAO,CAAC,aAAa,CAwBnB;IAEF,OAAO,CAAC,wBAAwB,CAU9B;IAEF,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,SAAS,CAqBf;IAEF,OAAO,CAAC,MAAM,CAiBZ;IAEF,OAAO,CAAC,MAAM,CAqBZ;IAEF,OAAO,CAAC,gCAAgC,CAYtC;IAEF,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,qBAAqB,CAO3B;IAEF,OAAO,CAAC,iBAAiB,CAEvB;IAEF,OAAO,CAAC,oBAAoB,CAQ1B;IAEF;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,qBAAqB,CAgB3B;IAEF,OAAO,CAAC,WAAW,CAEjB;IAEF,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,yBAAyB,CAc/B;IAEF,OAAO,KAAK,eAAe,GAG1B;IAED,OAAO,CAAC,YAAY,CAIlB;IAEF,OAAO,CAAC,wBAAwB,CAQ9B;IAEF,OAAO,CAAC,cAAc,CAqBpB;IAEF,OAAO,CAAC,oBAAoB,CAK1B;IAEF;;;;;OAKG;IACI,+BAA+B,IAAI,IAAI;IAWvC,WAAW,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE;IAI9D,aAAa,CAAC,MAAM,EAAE;QAC3B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACnC;IAwBM,YAAY,CAAC,MAAM,EAAE;QAC1B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,IAAI,EAAE,GAAG,CAAC;QACV,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IAOM,cAAc,CAAC,MAAM,EAAE;QAC5B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,MAAM,EAAE,MAAM,CAAC;KAChB;IAMM,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIlC,kBAAkB,IAAI,MAAM,GAAG,IAAI;IAM1C;;;OAGG;IAEH,IAAW,uBAAuB,6DAEjC;IAED;;OAEG;IACH,IAAW,eAAe,WAEzB;IAED;;OAEG;IACI,wBAAwB;IAI/B;;;OAGG;IACI,iBAAiB,aAEtB;CACH;AAED,eAAe,SAAS,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/FlashList.js b/node_modules/@shopify/flash-list/dist/FlashList.js
-index 1a5d026..37852b8 100644
---- a/node_modules/@shopify/flash-list/dist/FlashList.js
-+++ b/node_modules/@shopify/flash-list/dist/FlashList.js
-@@ -478,6 +478,12 @@ var FlashList = /** @class */ (function (_super) {
-         var _a, _b;
-         return ((_b = (_a = this.rlvRef) === null || _a === void 0 ? void 0 : _a.getScrollableNode) === null || _b === void 0 ? void 0 : _b.call(_a)) || null;
-     };
-+    FlashList.prototype.getNativeScrollRef = function () {
-+        var _a, _b;
-+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-+        // @ts-ignore
-+        return ((_b = (_a = this.rlvRef) === null || _a === void 0 ? void 0 : _a.getNativeScrollRef) === null || _b === void 0 ? void 0 : _b.call(_a)) || null;
-+    };
-     Object.defineProperty(FlashList.prototype, "recyclerlistview_unsafe", {
-         /**
-          * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
-diff --git a/node_modules/@shopify/flash-list/dist/FlashList.js.map b/node_modules/@shopify/flash-list/dist/FlashList.js.map
-index 375f7fc..8fc9c3f 100644
---- a/node_modules/@shopify/flash-list/dist/FlashList.js.map
-+++ b/node_modules/@shopify/flash-list/dist/FlashList.js.map
-@@ -1 +1 @@
--{"version":3,"file":"FlashList.js","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":";;;AAAA,wDAA0B;AAC1B,6CAOsB;AACtB,qDAO0B;AAC1B,2EAAgF;AAEhF,+FAAiE;AACjE,gGAAkE;AAClE,+DAA8D;AAC9D,sGAAwE;AACxE,6EAA+C;AAC/C,iFAAmD;AACnD,uEAA4C;AAC5C,gGAAkE;AAClE,mDAI0B;AAC1B,iEAKwC;AACxC,uEAKuC;AAKvC,IAAM,qBAAqB,GACzB,gBAAoD,CAAC;AAevD;IAA2B,qCAG1B;IAyCC,mBAAY,KAAwB;QAApC,iBAiBC;;gBAhBC,kBAAM,KAAK,CAAC;QAvCN,4BAAsB,GAAG,CAAC,CAAC;QAC3B,oBAAc,GAAG,+BAAc,CAAC,sBAAsB,CAAC;QACvD,8BAAwB,GAC9B,+BAAc,CAAC,gCAAgC,CAAC;QAE1C,wBAAkB,GAAG,CAAC,CAAC;QACvB,kBAAY,GAAyB;YAC3C,aAAa,EAAE,CAAC;YAChB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;SAChB,CAAC;QAEM,mBAAa,GAAG,CAAC,CAAC;QAClB,kBAAY,GAAG,KAAK,CAAC;QACrB,4BAAsB,GAA2B;YACvD,KAAK,EAAE;gBACL,WAAW,EAAE,CAAC;gBACd,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,CAAC;aACjB;YACD,iBAAiB,EAAE,IAAI;YACvB,oBAAoB,EAAE,IAAI;SAC3B,CAAC;QAKM,iBAAW,GAAG,KAAK,CAAC;QA0KpB,kBAAY,GAAG;;YACrB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,YAAY,kDAAI,CAAC;QAC9B,CAAC,CAAC;QAEM,uBAAiB,GAAG;YAC1B,IAAI,KAAI,CAAC,KAAK,CAAC,SAAS,EAAE;gBACxB,OAAO,CACL,8BAAC,6BAAc,IACb,UAAU,EAAE,OAAO,CAAC,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1C,kBAAkB,EAAE,KAAI,CAAC,KAAK,CAAC,kBAAkB,EACjD,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,GAC/B,CACH,CAAC;aACH;QACH,CAAC,CAAC;QAmHM,uBAAiB,GAAG,UAC1B,KAA8C;;YAE9C,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,iBAAiB,mDAAG,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC;QAEM,cAAQ,GAAG,UAAC,KAA8C;;YAChE,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;YAC9C,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,QAAQ,mDAAG,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;QA6BM,sBAAgB,GAAG,UAAC,KAAwB;;YAClD,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAM,OAAO,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACnC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM;gBACjC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,IAAM,OAAO,GAAG,KAAI,CAAC,sBAAsB,CAAC;YAC5C,KAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC;YAEtC,qEAAqE;YACrE,IAAI,OAAO,GAAG,CAAC,IAAI,OAAO,KAAK,OAAO,EAAE;gBACtC,MAAA,KAAI,CAAC,MAAM,0CAAE,aAAa,EAAE,CAAC;aAC9B;YACD,IAAI,KAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACvB,KAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC;QAEM,eAAS,GAAG,UAAC,KAAa,EAAE,QAA2B;YAC7D,KAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,OAAO,CACL;gBACE,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACF,8BAAC,wBAAc,uBACT,KAAK,IACT,gBAAgB,EAAE,KAAI,CAAC,KAAK,CAAC,WAAW,EACxC,QAAQ,EAAE,KAAI,CAAC,wBAAwB,EACvC,iBAAiB,EAAE,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAE9C,QAAQ,CACM;gBAChB,KAAI,CAAC,WAAW;oBACf,CAAC,CAAC,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;oBACvD,CAAC,CAAC,IAAI;gBACR,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACD,KAAI,CAAC,gCAAgC,EAAE,CACvC,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,mBAAa,GAAG,UAAC,KAAU,EAAE,WAAgB;;YACnD,IAAM,qBAAqB,GACzB,MAAA,KAAI,CAAC,KAAK,CAAC,qBAAqB,mCAAI,uBAAa,CAAC;YACpD,OAAO,CACL,8BAAC,qBAAqB,uBAChB,KAAK,IACT,KAAK,0EACA,KAAK,CAAC,KAAK,KACd,aAAa,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EACvD,UAAU,EAAE,SAAS,KAClB,KAAI,CAAC,YAAY,EAAE,GACnB,IAAA,+CAA8B,EAAC,KAAI,CAAC,KAAK,CAAC,QAAU,EAAE,WAAW,CAAC,GAEvE,KAAK,EAAE,WAAW,CAAC,KAAK;gBAExB,8BAAC,2CAAoB,IACnB,aAAa,EAAE,WAAW,CAAC,aAAa,EACxC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,EAC9C,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,GAAG,EAAE,WAAW,CAAC,KAAK,EACtB,QAAQ,EAAE,KAAI,CAAC,qBAAqB,GACpC,CACoB,CACzB,CAAC;QACJ,CAAC,CAAC;QAEM,8BAAwB,GAAG,UAAC,KAAwB;YAC1D,IAAM,qBAAqB,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACjD,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAE/B,IAAI,KAAI,CAAC,kBAAkB,KAAK,qBAAqB,EAAE;gBACrD,KAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC;gBAChD,KAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;gBACzE,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;aAC/C;QACH,CAAC,CAAC;QASM,eAAS,GAAG,UAAC,KAAa;YAChC,sDAAsD;YACtD,IACE,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI;gBACxB,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;gBAC7B,KAAK,GAAG,CAAC,IAAI,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EACnC;gBACA,OAAO,IAAI,CAAC;aACb;YAED,IAAM,WAAW,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAM,YAAY,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAEhD,IAAM,KAAK,GAAG;gBACZ,WAAW,aAAA;gBACX,YAAY,cAAA;gBACZ,+HAA+H;gBAC/H,6IAA6I;aAC9I,CAAC;YACF,IAAM,SAAS,GAAG,KAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;YACpD,OAAO,SAAS,IAAI,8BAAC,SAAS,uBAAK,KAAK,EAAI,CAAC;QAC/C,CAAC,CAAC;QAEM,YAAM,GAAG;YACf,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,UAAU,EAAE,KAAI,CAAC,YAAY,CAAC,UAAU;wBACxC,WAAW,EAAE,KAAI,CAAC,YAAY,CAAC,WAAW;qBAC3C,GACD;gBAEF,8BAAC,mBAAI,IACH,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAClD,CACN,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,YAAM,GAAG;;YACf;;gCAEoB;YACpB,IAAM,eAAe,GAAG,MAAA,IAAA,mCAAkB,GAAE,mCAAI,uBAAa,CAAC;YAC9D,OAAO,CACL;gBACE,8BAAC,eAAe,IACd,KAAK,EAAE,CAAC,CAAC,EACT,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CACvC;gBAClB,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EAAE,KAAI,CAAC,YAAY,CAAC,aAAa;wBAC9C,YAAY,EAAE,KAAI,CAAC,YAAY,CAAC,YAAY;qBAC7C,GACD,CACD,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,sCAAgC,GAAG;YACzC,OAAO,KAAI,CAAC,KAAK,CAAC,UAAU;gBAC1B,CAAC,KAAI,CAAC,KAAK,CAAC,sCAAsC;gBAClD,CAAC,KAAI,CAAC,YAAY;gBAClB,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CACxC,8BAAC,mBAAI,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,aAAa,EAAC,MAAM,IAC9C,KAAI,CAAC,oBAAoB,CACxB,IAAI,CAAC,GAAG,CAAC,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAClD,oCAAmB,CAAC,WAAW,CAChC,CACI,CACR,CAAC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CAAC;QAaM,2BAAqB,GAAG,UAC9B,CAAM,EACN,EAAO,EACP,gBAAyC;;YAEzC,gBAAgB,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;YACxD,MAAA,KAAI,CAAC,yBAAyB,0CAAE,UAAU,CAAC,KAAI,CAAC,eAAe,CAAC,CAAC;QACnE,CAAC,CAAC;QAEM,uBAAiB,GAAG,UAAC,KAAa;YACxC,OAAO,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,YAAY,CAAC,CAAC;QAC5E,CAAC,CAAC;QAEM,0BAAoB,GAAG,UAAC,KAAa,EAAE,MAAoB;;YACjE,wEAAwE;YACxE,OAAO,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,UAAU,mDAAG;gBAC7B,IAAI,EAAE,KAAI,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC;gBAC7B,KAAK,OAAA;gBACL,MAAM,QAAA;gBACN,SAAS,EAAE,MAAA,KAAI,CAAC,KAAK,CAAC,SAAS,0CAAE,KAAK;aACvC,CAAgB,CAAC;QACpB,CAAC,CAAC;QAEF;;;;WAIG;QACK,sBAAgB,GAAG;YACzB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEM,2BAAqB,GAAG,UAAC,KAAa;YAC5C,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EACX,KAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC;4BAClD,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,KAAK;qBACZ,IAEA,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,IAAI,CAAC,CACtD;gBACN,KAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CACrB,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,iBAAW,GAAG,UAAC,GAAQ;YAC7B,KAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC;QAEM,sBAAgB,GAAG,UAAC,GAAQ;YAClC,KAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;QACvC,CAAC,CAAC;QAEM,+BAAyB,GAAG,UAClC,CAAM,EACN,EAAO,EACP,KAAa,EACb,GAAQ;YAER,OAAO,CACL,8BAAC,2CAAoB,IACnB,GAAG,EAAE,KAAI,CAAC,gBAAgB,EAC1B,OAAO,EAAE,KAAI,CAAC,eAAe,EAC7B,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,KAAI,CAAC,iBAAiB,GAChC,CACH,CAAC;QACJ,CAAC,CAAC;QAOM,kBAAY,GAAG,UAAC,KAAa;YACnC,oIAAoI;YACpI,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAClD,KAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,CAAC,CAAC;QAEM,8BAAwB,GAAG;;YACjC,IAAI,CAAC,KAAI,CAAC,YAAY,EAAE;gBACtB,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,MAAM,mDAAG;oBAClB,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAI,CAAC,aAAa;iBACjD,CAAC,CAAC;gBACH,KAAI,CAAC,cAAc,EAAE,CAAC;aACvB;QACH,CAAC,CAAC;QAEM,oBAAc,GAAG;YACvB,IAAI,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBAC9C,KAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC;oBACrC,IAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAChC,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAC1C,CAAC;oBACF,OAAO,CAAC,IAAI,CACV,kBAAW,CAAC,+BAA+B,CAAC,OAAO,CACjD,OAAO,EACP,eAAe,CAAC,QAAQ,EAAE,CAC3B,CACF,CAAC;gBACJ,CAAC,EAAE,IAAI,CAAC,CAAC;aACV;YACD,KAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;gBAClC,6IAA6I;gBAC7I,sIAAsI;gBACtI,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAI,CAAC,WAAW,EAAE,CAAC;iBACpB;YACH,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,CAAC;QAEM,0BAAoB,GAAG;YAC7B,IAAI,KAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBACxC,YAAY,CAAC,KAAI,CAAC,iBAAiB,CAAC,CAAC;gBACrC,KAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;aACpC;QACH,CAAC,CAAC;QAoGF;;;WAGG;QACI,uBAAiB,GAAG;YACzB,KAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QAC9C,CAAC,CAAC;QA5uBA,KAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,KAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,iBAAiB,EAAE;YAC3B,IAAI,KAAK,CAAC,UAAU,EAAE;gBACpB,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC;aAC9D;iBAAM;gBACL,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC;aAC7D;SACF;QACD,KAAI,CAAC,kBAAkB;YACrB,MAAA,KAAK,CAAC,wBAAwB,mCAAI,CAAC,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5E,sDAAsD;QACtD,KAAI,CAAC,KAAK,GAAG,SAAS,CAAC,sBAAsB,CAAC,KAAI,CAAC,CAAC;QACpD,KAAI,CAAC,kBAAkB,GAAG,IAAI,4BAAkB,CAAC,KAAI,CAAC,CAAC;QACvD,KAAI,CAAC,YAAY,GAAG,IAAA,gCAAe,GAAE,CAAC;;IACxC,CAAC;IAEO,iCAAa,GAArB;;QACE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE;YACtE,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,qBAAqB,CAAC,CAAC;SAC5D;QACD,IACE,MAAM,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,mBAAmB,0CAAE,MAAM,CAAC,GAAG,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,iCAAiC,CAAC,CAAC;SACxE;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YAC9D,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,kCAAkC,CAAC,CAAC;SACzE;QAED,wIAAwI;QACxI,sIAAsI;QACtI,IACE,OAAO;YACP,MAAM,CAAC,IAAI,CAAC,yBAAU,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAClE;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gBAAgB,CAAC,CAAC;SAC5C;QACD,IACE,IAAA,iEAAyC,EACvC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CACjC,EACD;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gCAAgC,CAAC,CAAC;SAC5D;IACH,CAAC;IAED,+DAA+D;IACxD,kCAAwB,GAA/B,UACE,SAAsC,EACtC,SAA4B;;QAE5B,IAAM,QAAQ,wBAAQ,SAAS,CAAE,CAAC;QAClC,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;YACjD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,CAAC,CAAC;YAChD,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;aAAM,IAAI,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE;YACrE,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;QAED,8EAA8E;QAC9E,sDAAsD;QACtD,QAAQ,CAAC,cAAc,CAAC,0BAA0B,GAAG,OAAO,CAC1D,CAAC,CAAA,MAAA,SAAS,CAAC,cAAc,0CAAE,UAAU,CAAA,CACtC,CAAC;QAEF,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE;YACrC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;YAC/B,QAAQ,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,CAC1D,SAAS,CAAC,IAAa,CACxB,CAAC;YACF,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;gBACjD,QAAQ,CAAC,SAAS,wBAAQ,SAAS,CAAC,SAAS,CAAE,CAAC;aACjD;SACF;QACD,IAAI,SAAS,CAAC,SAAS,MAAK,MAAA,SAAS,CAAC,SAAS,0CAAE,KAAK,CAAA,EAAE;YACtD,QAAQ,CAAC,SAAS,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;SACrD;QACD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QAC3C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEc,gCAAsB,GAArC,UACE,SAAuB;QAEvB,IAAI,WAAoD,CAAC;QACzD,IACE,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YACrC,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAC1C;YACA,WAAW,GAAG,UAAC,KAAK;gBAClB,+GAA+G;gBAC/G,mFAAmF;gBACnF,OAAA,SAAS,CAAC,KAAK,CAAC,YAAa,CAC3B,SAAS,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC,EAC5B,KAAK,CACN,CAAC,QAAQ,EAAE;YAHZ,CAGY,CAAC;SAChB;QACD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,cAAc,EAAE,IAAM;YACtB,YAAY,EAAE,IAAI,+BAAY,CAAC,UAAC,EAAE,EAAE,EAAE;gBACpC,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,CAAC,EAAE,WAAW,CAAC;YACf,UAAU,EAAE,CAAC;SACd,CAAC;IACJ,CAAC;IAED,2HAA2H;IAC5G,2BAAiB,GAAhC,UACE,UAAkB,EAClB,cAAiC;QAEjC,OAAO,IAAI,qCAA2B;QACpC,6BAA6B;QAC7B,UAAU,EACV,UAAC,KAAK,EAAE,KAAK;;YACX,mCAAmC;YACnC,IAAM,IAAI,GAAG,MAAA,KAAK,CAAC,WAAW,sDAC5B,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,IAAI,IAAI,CAAC,CAAC;QACnB,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,gFAAgF;YAChF,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,mCAAI,CAAC,CAAC;QAClC,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,4CAA4C;YAC5C,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC;QAC7B,CAAC,EACD,cAAc,CACf,CAAC;IACJ,CAAC;IAkBD,qCAAiB,GAAjB;;QACE,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,MAAM,MAAK,CAAC,EAAE;YACjC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACjC;IACH,CAAC;IAED,wCAAoB,GAApB;QACE,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC3C,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACzC;IACH,CAAC;IAED,0BAAM,GAAN;QACE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAA,0CAAkB,EAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAExE,IAAM,KAYF,IAAI,CAAC,KAAK,EAXZ,YAAY,kBAAA,EACZ,qBAAqB,2BAAA,EACrB,mBAAmB,yBAAA,EACnB,UAAU,gBAAA,EACV,qBAAqB,2BAAA,EACrB,iBAAiB,uBAAA,EACjB,kBAAkB,wBAAA,EAClB,KAAK,WAAA,EACL,qBAAqB,2BAAA,EACrB,qBAAqB,2BAAA,EAClB,SAAS,sBAXR,6MAYL,CAAa,CAAC;QAEf,0GAA0G;QAC1G,gEAAgE;QAChE,IAAM,aAAa,GACjB,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC;YAClE,SAAS,CAAC;QACZ,IAAM,iBAAiB,GACrB,YAAY,KAAK,SAAS;YACxB,CAAC,CAAC,+BAAc,CAAC,mBAAmB;YACpC,CAAC,CAAC,YAAY,CAAC;QAEnB,OAAO,CACL,8BAAC,qBAAqB,IACpB,mBAAmB,EAAE,IAAI,CAAC,yBAAyB,EACnD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EACjD,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EACH,IAAI,CAAC,KAAK,CAAC,UAAU;gBACnB,CAAC,sBAAM,IAAI,CAAC,YAAY,EAAE,EAC1B,CAAC,oBAAG,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,IAAK,IAAI,CAAC,YAAY,EAAE,CAAE;YAG7D,8BAAC,sCAAmB,uBACd,SAAS,IACb,GAAG,EAAE,IAAI,CAAC,WAAW,EACrB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,EACzC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EACrC,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAClC,aAAa,QACb,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,EACjC,eAAe,qBACb,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EACzC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAC/B,cAAc,EACZ,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBAEvD,gEAAgE;oBAChE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EACpC,qBAAqB,qBACnB,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;wBAElD,6FAA6F;wBAC7F,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,IAER,IAAA,kDAA0B,EAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,KAE3D,IAAI,CAAC,KAAK,CAAC,aAAa,GAE7B,8BAA8B,QAC9B,mBAAmB,EAAE,IAAI,CAAC,aAAa,EACvC,sBAAsB,EAAE,IAAI,CAAC,SAAS,EACtC,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,6BAA6B,EAAE,qBAAqB,IAAI,SAAS,EACjE,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EACnC,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,CAAC,GAAG,iBAAiB,EACrC,sBAAsB,EAAE,iBAAiB,EACzC,eAAe,EAAE,iBAAiB,EAClC,kBAAkB,EAChB,CAAC,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,kBAAkB,CAAC;oBAC9D,SAAS,EAEX,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,uBAAuB,EACrB,IAAI,CAAC,kBAAkB,CAAC,4BAA4B;oBAClD,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,uBAAuB;oBACjD,CAAC,CAAC,SAAS,EAEf,sBAAsB,EAAE,IAAI,CAAC,gCAAgC,EAAE,EAC/D,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,4BAA4B,QAC5B,kBAAkB,EAChB,qBAAoE,IAEtE,CACoB,CACzB,CAAC;IACJ,CAAC;IAeO,oDAAgC,GAAxC;QACE,4IAA4I;QAC5I,iFAAiF;QACjF,8HAA8H;QAC9H,IAAI,IAAI,CAAC,8BAA8B,EAAE,EAAE;YACzC,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,KAAK,CAAC;SAC1D;aAAM;YACL,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,IAAI,CAAC;SACzD;QACD,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC;QACzE,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAEO,kDAA8B,GAAtC;;QACE,OAAO,CACL,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,kBAAkB,mCAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;IACJ,CAAC;IAEO,oCAAgB,GAAxB,UAAyB,KAAwB;QACzC,IAAA,KAAoB,KAAK,CAAC,WAAW,CAAC,MAAM,EAA1C,MAAM,YAAA,EAAE,KAAK,WAA6B,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACrD,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,oBAAoB,CAAC,CAAC;SAChD;IACH,CAAC;IAiGO,gCAAY,GAApB;QACE,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;YAC1C,CAAC,CAAC,IAAI,CAAC,wBAAwB;YAC/B,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,SAAS,CAAC;IAC9D,CAAC;IAiFO,qCAAiB,GAAzB,UACE,SAAsE;QAEtE,IAAM,eAAe,GAAG,SAAS,CAAC;QAClC,OAAO,CACL,CAAC,eAAK,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC;YAC1D,CAAC,eAAe,IAAI,8BAAC,eAAe,OAAG,CAAC;YACxC,IAAI,CACL,CAAC;IACJ,CAAC;IA4ED,sBAAY,sCAAe;aAA3B;;YACE,IAAM,aAAa,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,sBAAsB,EAAE,KAAI,CAAC,CAAC;YACjE,OAAO,aAAa,IAAI,IAAI,CAAC,kBAAkB,CAAC;QAClD,CAAC;;;OAAA;IAgDD;;;;;OAKG;IACI,mDAA+B,GAAtC;;QACE,IACE,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YAChC,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EACrC;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,mBAAmB,CAAC,CAAC;SAC/C;aAAM;YACL,MAAA,IAAI,CAAC,MAAM,0CAAE,+BAA+B,EAAE,CAAC;SAChD;IACH,CAAC;IAEM,+BAAW,GAAlB,UAAmB,MAAkD;;QACnE,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,CAAC,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,iCAAa,GAApB,UAAqB,MAKpB;;QACC,IAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,eAAe,EAAE,CAAC;QAEhD,IAAI,MAAM,IAAI,QAAQ,EAAE;YACtB,IAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;gBAC1C,CAAC,CAAC,QAAQ,CAAC,KAAK;gBAChB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACtE,IAAM,YAAY,GAChB,IAAI,CAAC,GAAG,CACN,CAAC,EACD,UAAU,GAAG,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,CAAC,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,CAAC,CACtE,GAAG,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,CAAC,CAAC,CAAC;YAC/B,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CACzB,YAAY,EACZ,YAAY,EACZ,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EACxB,IAAI,CACL,CAAC;SACH;IACH,CAAC;IAEM,gCAAY,GAAnB,UAAoB,MAKnB;;QACC,IAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAI,CAAC,CAAC,CAAC;QAC1D,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,aAAa,uCAAM,MAAM,KAAE,KAAK,OAAA,IAAG,CAAC;SAC1C;IACH,CAAC;IAEM,kCAAc,GAArB,UAAsB,MAGrB;;QACC,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QACpD,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,qCAAiB,GAAxB;;QACE,OAAO,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,iBAAiB,kDAAI,KAAI,IAAI,CAAC;IACpD,CAAC;IAOD,sBAAW,8CAAuB;QALlC;;;WAGG;QACH,yDAAyD;aACzD;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAKD,sBAAW,sCAAe;QAH1B;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACjC,CAAC;;;OAAA;IAED;;OAEG;IACI,4CAAwB,GAA/B;QACE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IA3uBM,sBAAY,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC;KACd,CAAC;IAivBJ,gBAAC;CAAA,AA3xBD,CAA2B,eAAK,CAAC,aAAa,GA2xB7C;AAED,kBAAe,SAAS,CAAC"}
-\ No newline at end of file
-+{"version":3,"file":"FlashList.js","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":";;;AAAA,wDAA0B;AAC1B,6CAOsB;AACtB,qDAO0B;AAC1B,2EAAgF;AAEhF,+FAAiE;AACjE,gGAAkE;AAClE,+DAA8D;AAC9D,sGAAwE;AACxE,6EAA+C;AAC/C,iFAAmD;AACnD,uEAA4C;AAC5C,gGAAkE;AAClE,mDAI0B;AAC1B,iEAKwC;AACxC,uEAKuC;AAKvC,IAAM,qBAAqB,GACzB,gBAAoD,CAAC;AAevD;IAA2B,qCAG1B;IAyCC,mBAAY,KAAwB;QAApC,iBAiBC;;gBAhBC,kBAAM,KAAK,CAAC;QAvCN,4BAAsB,GAAG,CAAC,CAAC;QAC3B,oBAAc,GAAG,+BAAc,CAAC,sBAAsB,CAAC;QACvD,8BAAwB,GAC9B,+BAAc,CAAC,gCAAgC,CAAC;QAE1C,wBAAkB,GAAG,CAAC,CAAC;QACvB,kBAAY,GAAyB;YAC3C,aAAa,EAAE,CAAC;YAChB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;SAChB,CAAC;QAEM,mBAAa,GAAG,CAAC,CAAC;QAClB,kBAAY,GAAG,KAAK,CAAC;QACrB,4BAAsB,GAA2B;YACvD,KAAK,EAAE;gBACL,WAAW,EAAE,CAAC;gBACd,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,CAAC;aACjB;YACD,iBAAiB,EAAE,IAAI;YACvB,oBAAoB,EAAE,IAAI;SAC3B,CAAC;QAKM,iBAAW,GAAG,KAAK,CAAC;QA0KpB,kBAAY,GAAG;;YACrB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,YAAY,kDAAI,CAAC;QAC9B,CAAC,CAAC;QAEM,uBAAiB,GAAG;YAC1B,IAAI,KAAI,CAAC,KAAK,CAAC,SAAS,EAAE;gBACxB,OAAO,CACL,8BAAC,6BAAc,IACb,UAAU,EAAE,OAAO,CAAC,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1C,kBAAkB,EAAE,KAAI,CAAC,KAAK,CAAC,kBAAkB,EACjD,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,GAC/B,CACH,CAAC;aACH;QACH,CAAC,CAAC;QAmHM,uBAAiB,GAAG,UAC1B,KAA8C;;YAE9C,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,iBAAiB,mDAAG,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC;QAEM,cAAQ,GAAG,UAAC,KAA8C;;YAChE,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;YAC9C,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,QAAQ,mDAAG,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;QA6BM,sBAAgB,GAAG,UAAC,KAAwB;;YAClD,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAM,OAAO,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACnC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM;gBACjC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,IAAM,OAAO,GAAG,KAAI,CAAC,sBAAsB,CAAC;YAC5C,KAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC;YAEtC,qEAAqE;YACrE,IAAI,OAAO,GAAG,CAAC,IAAI,OAAO,KAAK,OAAO,EAAE;gBACtC,MAAA,KAAI,CAAC,MAAM,0CAAE,aAAa,EAAE,CAAC;aAC9B;YACD,IAAI,KAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACvB,KAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC;QAEM,eAAS,GAAG,UAAC,KAAa,EAAE,QAA2B;YAC7D,KAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,OAAO,CACL;gBACE,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACF,8BAAC,wBAAc,uBACT,KAAK,IACT,gBAAgB,EAAE,KAAI,CAAC,KAAK,CAAC,WAAW,EACxC,QAAQ,EAAE,KAAI,CAAC,wBAAwB,EACvC,iBAAiB,EAAE,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAE9C,QAAQ,CACM;gBAChB,KAAI,CAAC,WAAW;oBACf,CAAC,CAAC,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;oBACvD,CAAC,CAAC,IAAI;gBACR,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACD,KAAI,CAAC,gCAAgC,EAAE,CACvC,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,mBAAa,GAAG,UAAC,KAAU,EAAE,WAAgB;;YACnD,IAAM,qBAAqB,GACzB,MAAA,KAAI,CAAC,KAAK,CAAC,qBAAqB,mCAAI,uBAAa,CAAC;YACpD,OAAO,CACL,8BAAC,qBAAqB,uBAChB,KAAK,IACT,KAAK,0EACA,KAAK,CAAC,KAAK,KACd,aAAa,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EACvD,UAAU,EAAE,SAAS,KAClB,KAAI,CAAC,YAAY,EAAE,GACnB,IAAA,+CAA8B,EAAC,KAAI,CAAC,KAAK,CAAC,QAAU,EAAE,WAAW,CAAC,GAEvE,KAAK,EAAE,WAAW,CAAC,KAAK;gBAExB,8BAAC,2CAAoB,IACnB,aAAa,EAAE,WAAW,CAAC,aAAa,EACxC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,EAC9C,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,GAAG,EAAE,WAAW,CAAC,KAAK,EACtB,QAAQ,EAAE,KAAI,CAAC,qBAAqB,GACpC,CACoB,CACzB,CAAC;QACJ,CAAC,CAAC;QAEM,8BAAwB,GAAG,UAAC,KAAwB;YAC1D,IAAM,qBAAqB,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACjD,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAE/B,IAAI,KAAI,CAAC,kBAAkB,KAAK,qBAAqB,EAAE;gBACrD,KAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC;gBAChD,KAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;gBACzE,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;aAC/C;QACH,CAAC,CAAC;QASM,eAAS,GAAG,UAAC,KAAa;YAChC,sDAAsD;YACtD,IACE,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI;gBACxB,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;gBAC7B,KAAK,GAAG,CAAC,IAAI,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EACnC;gBACA,OAAO,IAAI,CAAC;aACb;YAED,IAAM,WAAW,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAM,YAAY,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAEhD,IAAM,KAAK,GAAG;gBACZ,WAAW,aAAA;gBACX,YAAY,cAAA;gBACZ,+HAA+H;gBAC/H,6IAA6I;aAC9I,CAAC;YACF,IAAM,SAAS,GAAG,KAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;YACpD,OAAO,SAAS,IAAI,8BAAC,SAAS,uBAAK,KAAK,EAAI,CAAC;QAC/C,CAAC,CAAC;QAEM,YAAM,GAAG;YACf,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,UAAU,EAAE,KAAI,CAAC,YAAY,CAAC,UAAU;wBACxC,WAAW,EAAE,KAAI,CAAC,YAAY,CAAC,WAAW;qBAC3C,GACD;gBAEF,8BAAC,mBAAI,IACH,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAClD,CACN,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,YAAM,GAAG;;YACf;;gCAEoB;YACpB,IAAM,eAAe,GAAG,MAAA,IAAA,mCAAkB,GAAE,mCAAI,uBAAa,CAAC;YAC9D,OAAO,CACL;gBACE,8BAAC,eAAe,IACd,KAAK,EAAE,CAAC,CAAC,EACT,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CACvC;gBAClB,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EAAE,KAAI,CAAC,YAAY,CAAC,aAAa;wBAC9C,YAAY,EAAE,KAAI,CAAC,YAAY,CAAC,YAAY;qBAC7C,GACD,CACD,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,sCAAgC,GAAG;YACzC,OAAO,KAAI,CAAC,KAAK,CAAC,UAAU;gBAC1B,CAAC,KAAI,CAAC,KAAK,CAAC,sCAAsC;gBAClD,CAAC,KAAI,CAAC,YAAY;gBAClB,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CACxC,8BAAC,mBAAI,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,aAAa,EAAC,MAAM,IAC9C,KAAI,CAAC,oBAAoB,CACxB,IAAI,CAAC,GAAG,CAAC,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAClD,oCAAmB,CAAC,WAAW,CAChC,CACI,CACR,CAAC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CAAC;QAaM,2BAAqB,GAAG,UAC9B,CAAM,EACN,EAAO,EACP,gBAAyC;;YAEzC,gBAAgB,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;YACxD,MAAA,KAAI,CAAC,yBAAyB,0CAAE,UAAU,CAAC,KAAI,CAAC,eAAe,CAAC,CAAC;QACnE,CAAC,CAAC;QAEM,uBAAiB,GAAG,UAAC,KAAa;YACxC,OAAO,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,YAAY,CAAC,CAAC;QAC5E,CAAC,CAAC;QAEM,0BAAoB,GAAG,UAAC,KAAa,EAAE,MAAoB;;YACjE,wEAAwE;YACxE,OAAO,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,UAAU,mDAAG;gBAC7B,IAAI,EAAE,KAAI,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC;gBAC7B,KAAK,OAAA;gBACL,MAAM,QAAA;gBACN,SAAS,EAAE,MAAA,KAAI,CAAC,KAAK,CAAC,SAAS,0CAAE,KAAK;aACvC,CAAgB,CAAC;QACpB,CAAC,CAAC;QAEF;;;;WAIG;QACK,sBAAgB,GAAG;YACzB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEM,2BAAqB,GAAG,UAAC,KAAa;YAC5C,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EACX,KAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC;4BAClD,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,KAAK;qBACZ,IAEA,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,IAAI,CAAC,CACtD;gBACN,KAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CACrB,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,iBAAW,GAAG,UAAC,GAAQ;YAC7B,KAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC;QAEM,sBAAgB,GAAG,UAAC,GAAQ;YAClC,KAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;QACvC,CAAC,CAAC;QAEM,+BAAyB,GAAG,UAClC,CAAM,EACN,EAAO,EACP,KAAa,EACb,GAAQ;YAER,OAAO,CACL,8BAAC,2CAAoB,IACnB,GAAG,EAAE,KAAI,CAAC,gBAAgB,EAC1B,OAAO,EAAE,KAAI,CAAC,eAAe,EAC7B,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,KAAI,CAAC,iBAAiB,GAChC,CACH,CAAC;QACJ,CAAC,CAAC;QAOM,kBAAY,GAAG,UAAC,KAAa;YACnC,oIAAoI;YACpI,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAClD,KAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,CAAC,CAAC;QAEM,8BAAwB,GAAG;;YACjC,IAAI,CAAC,KAAI,CAAC,YAAY,EAAE;gBACtB,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,MAAM,mDAAG;oBAClB,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAI,CAAC,aAAa;iBACjD,CAAC,CAAC;gBACH,KAAI,CAAC,cAAc,EAAE,CAAC;aACvB;QACH,CAAC,CAAC;QAEM,oBAAc,GAAG;YACvB,IAAI,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBAC9C,KAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC;oBACrC,IAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAChC,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAC1C,CAAC;oBACF,OAAO,CAAC,IAAI,CACV,kBAAW,CAAC,+BAA+B,CAAC,OAAO,CACjD,OAAO,EACP,eAAe,CAAC,QAAQ,EAAE,CAC3B,CACF,CAAC;gBACJ,CAAC,EAAE,IAAI,CAAC,CAAC;aACV;YACD,KAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;gBAClC,6IAA6I;gBAC7I,sIAAsI;gBACtI,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAI,CAAC,WAAW,EAAE,CAAC;iBACpB;YACH,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,CAAC;QAEM,0BAAoB,GAAG;YAC7B,IAAI,KAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBACxC,YAAY,CAAC,KAAI,CAAC,iBAAiB,CAAC,CAAC;gBACrC,KAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;aACpC;QACH,CAAC,CAAC;QA0GF;;;WAGG;QACI,uBAAiB,GAAG;YACzB,KAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QAC9C,CAAC,CAAC;QAlvBA,KAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,KAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,iBAAiB,EAAE;YAC3B,IAAI,KAAK,CAAC,UAAU,EAAE;gBACpB,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC;aAC9D;iBAAM;gBACL,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC;aAC7D;SACF;QACD,KAAI,CAAC,kBAAkB;YACrB,MAAA,KAAK,CAAC,wBAAwB,mCAAI,CAAC,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5E,sDAAsD;QACtD,KAAI,CAAC,KAAK,GAAG,SAAS,CAAC,sBAAsB,CAAC,KAAI,CAAC,CAAC;QACpD,KAAI,CAAC,kBAAkB,GAAG,IAAI,4BAAkB,CAAC,KAAI,CAAC,CAAC;QACvD,KAAI,CAAC,YAAY,GAAG,IAAA,gCAAe,GAAE,CAAC;;IACxC,CAAC;IAEO,iCAAa,GAArB;;QACE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE;YACtE,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,qBAAqB,CAAC,CAAC;SAC5D;QACD,IACE,MAAM,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,mBAAmB,0CAAE,MAAM,CAAC,GAAG,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,iCAAiC,CAAC,CAAC;SACxE;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YAC9D,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,kCAAkC,CAAC,CAAC;SACzE;QAED,wIAAwI;QACxI,sIAAsI;QACtI,IACE,OAAO;YACP,MAAM,CAAC,IAAI,CAAC,yBAAU,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAClE;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gBAAgB,CAAC,CAAC;SAC5C;QACD,IACE,IAAA,iEAAyC,EACvC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CACjC,EACD;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gCAAgC,CAAC,CAAC;SAC5D;IACH,CAAC;IAED,+DAA+D;IACxD,kCAAwB,GAA/B,UACE,SAAsC,EACtC,SAA4B;;QAE5B,IAAM,QAAQ,wBAAQ,SAAS,CAAE,CAAC;QAClC,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;YACjD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,CAAC,CAAC;YAChD,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;aAAM,IAAI,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE;YACrE,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;QAED,8EAA8E;QAC9E,sDAAsD;QACtD,QAAQ,CAAC,cAAc,CAAC,0BAA0B,GAAG,OAAO,CAC1D,CAAC,CAAA,MAAA,SAAS,CAAC,cAAc,0CAAE,UAAU,CAAA,CACtC,CAAC;QAEF,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE;YACrC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;YAC/B,QAAQ,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,CAC1D,SAAS,CAAC,IAAa,CACxB,CAAC;YACF,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;gBACjD,QAAQ,CAAC,SAAS,wBAAQ,SAAS,CAAC,SAAS,CAAE,CAAC;aACjD;SACF;QACD,IAAI,SAAS,CAAC,SAAS,MAAK,MAAA,SAAS,CAAC,SAAS,0CAAE,KAAK,CAAA,EAAE;YACtD,QAAQ,CAAC,SAAS,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;SACrD;QACD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QAC3C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEc,gCAAsB,GAArC,UACE,SAAuB;QAEvB,IAAI,WAAoD,CAAC;QACzD,IACE,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YACrC,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAC1C;YACA,WAAW,GAAG,UAAC,KAAK;gBAClB,+GAA+G;gBAC/G,mFAAmF;gBACnF,OAAA,SAAS,CAAC,KAAK,CAAC,YAAa,CAC3B,SAAS,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC,EAC5B,KAAK,CACN,CAAC,QAAQ,EAAE;YAHZ,CAGY,CAAC;SAChB;QACD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,cAAc,EAAE,IAAM;YACtB,YAAY,EAAE,IAAI,+BAAY,CAAC,UAAC,EAAE,EAAE,EAAE;gBACpC,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,CAAC,EAAE,WAAW,CAAC;YACf,UAAU,EAAE,CAAC;SACd,CAAC;IACJ,CAAC;IAED,2HAA2H;IAC5G,2BAAiB,GAAhC,UACE,UAAkB,EAClB,cAAiC;QAEjC,OAAO,IAAI,qCAA2B;QACpC,6BAA6B;QAC7B,UAAU,EACV,UAAC,KAAK,EAAE,KAAK;;YACX,mCAAmC;YACnC,IAAM,IAAI,GAAG,MAAA,KAAK,CAAC,WAAW,sDAC5B,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,IAAI,IAAI,CAAC,CAAC;QACnB,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,gFAAgF;YAChF,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,mCAAI,CAAC,CAAC;QAClC,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,4CAA4C;YAC5C,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC;QAC7B,CAAC,EACD,cAAc,CACf,CAAC;IACJ,CAAC;IAkBD,qCAAiB,GAAjB;;QACE,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,MAAM,MAAK,CAAC,EAAE;YACjC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACjC;IACH,CAAC;IAED,wCAAoB,GAApB;QACE,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC3C,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACzC;IACH,CAAC;IAED,0BAAM,GAAN;QACE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAA,0CAAkB,EAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAExE,IAAM,KAYF,IAAI,CAAC,KAAK,EAXZ,YAAY,kBAAA,EACZ,qBAAqB,2BAAA,EACrB,mBAAmB,yBAAA,EACnB,UAAU,gBAAA,EACV,qBAAqB,2BAAA,EACrB,iBAAiB,uBAAA,EACjB,kBAAkB,wBAAA,EAClB,KAAK,WAAA,EACL,qBAAqB,2BAAA,EACrB,qBAAqB,2BAAA,EAClB,SAAS,sBAXR,6MAYL,CAAa,CAAC;QAEf,0GAA0G;QAC1G,gEAAgE;QAChE,IAAM,aAAa,GACjB,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC;YAClE,SAAS,CAAC;QACZ,IAAM,iBAAiB,GACrB,YAAY,KAAK,SAAS;YACxB,CAAC,CAAC,+BAAc,CAAC,mBAAmB;YACpC,CAAC,CAAC,YAAY,CAAC;QAEnB,OAAO,CACL,8BAAC,qBAAqB,IACpB,mBAAmB,EAAE,IAAI,CAAC,yBAAyB,EACnD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EACjD,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EACH,IAAI,CAAC,KAAK,CAAC,UAAU;gBACnB,CAAC,sBAAM,IAAI,CAAC,YAAY,EAAE,EAC1B,CAAC,oBAAG,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,IAAK,IAAI,CAAC,YAAY,EAAE,CAAE;YAG7D,8BAAC,sCAAmB,uBACd,SAAS,IACb,GAAG,EAAE,IAAI,CAAC,WAAW,EACrB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,EACzC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EACrC,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAClC,aAAa,QACb,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,EACjC,eAAe,qBACb,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EACzC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAC/B,cAAc,EACZ,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBAEvD,gEAAgE;oBAChE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EACpC,qBAAqB,qBACnB,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;wBAElD,6FAA6F;wBAC7F,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,IAER,IAAA,kDAA0B,EAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,KAE3D,IAAI,CAAC,KAAK,CAAC,aAAa,GAE7B,8BAA8B,QAC9B,mBAAmB,EAAE,IAAI,CAAC,aAAa,EACvC,sBAAsB,EAAE,IAAI,CAAC,SAAS,EACtC,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,6BAA6B,EAAE,qBAAqB,IAAI,SAAS,EACjE,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EACnC,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,CAAC,GAAG,iBAAiB,EACrC,sBAAsB,EAAE,iBAAiB,EACzC,eAAe,EAAE,iBAAiB,EAClC,kBAAkB,EAChB,CAAC,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,kBAAkB,CAAC;oBAC9D,SAAS,EAEX,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,uBAAuB,EACrB,IAAI,CAAC,kBAAkB,CAAC,4BAA4B;oBAClD,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,uBAAuB;oBACjD,CAAC,CAAC,SAAS,EAEf,sBAAsB,EAAE,IAAI,CAAC,gCAAgC,EAAE,EAC/D,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,4BAA4B,QAC5B,kBAAkB,EAChB,qBAAoE,IAEtE,CACoB,CACzB,CAAC;IACJ,CAAC;IAeO,oDAAgC,GAAxC;QACE,4IAA4I;QAC5I,iFAAiF;QACjF,8HAA8H;QAC9H,IAAI,IAAI,CAAC,8BAA8B,EAAE,EAAE;YACzC,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,KAAK,CAAC;SAC1D;aAAM;YACL,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,IAAI,CAAC;SACzD;QACD,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC;QACzE,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAEO,kDAA8B,GAAtC;;QACE,OAAO,CACL,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,kBAAkB,mCAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;IACJ,CAAC;IAEO,oCAAgB,GAAxB,UAAyB,KAAwB;QACzC,IAAA,KAAoB,KAAK,CAAC,WAAW,CAAC,MAAM,EAA1C,MAAM,YAAA,EAAE,KAAK,WAA6B,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACrD,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,oBAAoB,CAAC,CAAC;SAChD;IACH,CAAC;IAiGO,gCAAY,GAApB;QACE,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;YAC1C,CAAC,CAAC,IAAI,CAAC,wBAAwB;YAC/B,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,SAAS,CAAC;IAC9D,CAAC;IAiFO,qCAAiB,GAAzB,UACE,SAAsE;QAEtE,IAAM,eAAe,GAAG,SAAS,CAAC;QAClC,OAAO,CACL,CAAC,eAAK,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC;YAC1D,CAAC,eAAe,IAAI,8BAAC,eAAe,OAAG,CAAC;YACxC,IAAI,CACL,CAAC;IACJ,CAAC;IA4ED,sBAAY,sCAAe;aAA3B;;YACE,IAAM,aAAa,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,sBAAsB,EAAE,KAAI,CAAC,CAAC;YACjE,OAAO,aAAa,IAAI,IAAI,CAAC,kBAAkB,CAAC;QAClD,CAAC;;;OAAA;IAgDD;;;;;OAKG;IACI,mDAA+B,GAAtC;;QACE,IACE,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YAChC,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EACrC;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,mBAAmB,CAAC,CAAC;SAC/C;aAAM;YACL,MAAA,IAAI,CAAC,MAAM,0CAAE,+BAA+B,EAAE,CAAC;SAChD;IACH,CAAC;IAEM,+BAAW,GAAlB,UAAmB,MAAkD;;QACnE,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,CAAC,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,iCAAa,GAApB,UAAqB,MAKpB;;QACC,IAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,eAAe,EAAE,CAAC;QAEhD,IAAI,MAAM,IAAI,QAAQ,EAAE;YACtB,IAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;gBAC1C,CAAC,CAAC,QAAQ,CAAC,KAAK;gBAChB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACtE,IAAM,YAAY,GAChB,IAAI,CAAC,GAAG,CACN,CAAC,EACD,UAAU,GAAG,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,CAAC,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,CAAC,CACtE,GAAG,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,CAAC,CAAC,CAAC;YAC/B,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CACzB,YAAY,EACZ,YAAY,EACZ,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EACxB,IAAI,CACL,CAAC;SACH;IACH,CAAC;IAEM,gCAAY,GAAnB,UAAoB,MAKnB;;QACC,IAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAI,CAAC,CAAC,CAAC;QAC1D,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,aAAa,uCAAM,MAAM,KAAE,KAAK,OAAA,IAAG,CAAC;SAC1C;IACH,CAAC;IAEM,kCAAc,GAArB,UAAsB,MAGrB;;QACC,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QACpD,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,qCAAiB,GAAxB;;QACE,OAAO,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,iBAAiB,kDAAI,KAAI,IAAI,CAAC;IACpD,CAAC;IAEM,sCAAkB,GAAzB;;QACE,6DAA6D;QAC7D,aAAa;QACb,OAAO,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,kBAAkB,kDAAI,KAAI,IAAI,CAAC;IACrD,CAAC;IAOD,sBAAW,8CAAuB;QALlC;;;WAGG;QACH,yDAAyD;aACzD;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAKD,sBAAW,sCAAe;QAH1B;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACjC,CAAC;;;OAAA;IAED;;OAEG;IACI,4CAAwB,GAA/B;QACE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAjvBM,sBAAY,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC;KACd,CAAC;IAuvBJ,gBAAC;CAAA,AAjyBD,CAA2B,eAAK,CAAC,aAAa,GAiyB7C;AAED,kBAAe,SAAS,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts
-new file mode 100644
-index 0000000..661dc81
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts
-@@ -0,0 +1,18 @@
-+import type { ViewProps } from "react-native";
-+import type { Int32, Double, DirectEventHandler } from "react-native/Libraries/Types/CodegenTypes";
-+declare type BlankAreaEvent = Readonly<{
-+    offsetStart: Int32;
-+    offsetEnd: Int32;
-+}>;
-+interface NativeProps extends ViewProps {
-+    horizontal?: boolean;
-+    scrollOffset?: Double;
-+    windowSize?: Double;
-+    renderAheadOffset?: Double;
-+    enableInstrumentation?: boolean;
-+    disableAutoLayout?: boolean;
-+    onBlankAreaEvent?: DirectEventHandler<BlankAreaEvent>;
-+}
-+declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
-+export default _default;
-+//# sourceMappingURL=AutoLayoutNativeComponent.d.ts.map
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts.map b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts.map
-new file mode 100644
-index 0000000..25297b9
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"AutoLayoutNativeComponent.d.ts","sourceRoot":"","sources":["../../src/fabric/AutoLayoutNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EACV,KAAK,EACL,MAAM,EACN,kBAAkB,EACnB,MAAM,2CAA2C,CAAC;AAEnD,aAAK,cAAc,GAAG,QAAQ,CAAC;IAC7B,WAAW,EAAE,KAAK,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC;CAClB,CAAC,CAAC;AAEH,UAAU,WAAY,SAAQ,SAAS;IACrC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;CACvD;;AAED,wBAAqE"}
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js
-new file mode 100644
-index 0000000..c69ba24
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js
-@@ -0,0 +1,6 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+var tslib_1 = require("tslib");
-+var codegenNativeComponent_1 = tslib_1.__importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
-+exports.default = (0, codegenNativeComponent_1.default)("AutoLayoutView");
-+//# sourceMappingURL=AutoLayoutNativeComponent.js.map
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js.map b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js.map
-new file mode 100644
-index 0000000..890db63
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"AutoLayoutNativeComponent.js","sourceRoot":"","sources":["../../src/fabric/AutoLayoutNativeComponent.ts"],"names":[],"mappings":";;;AAAA,2HAA6F;AAuB7F,kBAAe,IAAA,gCAAsB,EAAc,gBAAgB,CAAC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts
-new file mode 100644
-index 0000000..bb8f63b
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts
-@@ -0,0 +1,8 @@
-+import type { Int32 } from "react-native/Libraries/Types/CodegenTypes";
-+import type { ViewProps } from "react-native";
-+interface NativeProps extends ViewProps {
-+    index?: Int32;
-+}
-+declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
-+export default _default;
-+//# sourceMappingURL=CellContainerNativeComponent.d.ts.map
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts.map b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts.map
-new file mode 100644
-index 0000000..993a2c3
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"CellContainerNativeComponent.d.ts","sourceRoot":"","sources":["../../src/fabric/CellContainerNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,UAAU,WAAY,SAAQ,SAAS;IACrC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;;AAED,wBAAoE"}
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js
-new file mode 100644
-index 0000000..b21acb7
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js
-@@ -0,0 +1,6 @@
-+"use strict";
-+Object.defineProperty(exports, "__esModule", { value: true });
-+var tslib_1 = require("tslib");
-+var codegenNativeComponent_1 = tslib_1.__importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
-+exports.default = (0, codegenNativeComponent_1.default)("CellContainer");
-+//# sourceMappingURL=CellContainerNativeComponent.js.map
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js.map b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js.map
-new file mode 100644
-index 0000000..d7c2469
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js.map
-@@ -0,0 +1 @@
-+{"version":3,"file":"CellContainerNativeComponent.js","sourceRoot":"","sources":["../../src/fabric/CellContainerNativeComponent.ts"],"names":[],"mappings":";;;AAAA,2HAA6F;AAQ7F,kBAAe,IAAA,gCAAsB,EAAc,eAAe,CAAC,CAAC"}
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/dist/tsconfig.tsbuildinfo b/node_modules/@shopify/flash-list/dist/tsconfig.tsbuildinfo
-deleted file mode 100644
-index 023b94a..0000000
---- a/node_modules/@shopify/flash-list/dist/tsconfig.tsbuildinfo
-+++ /dev/null
-@@ -1 +0,0 @@
--{"program":{"fileNames":["../node_modules/typescript/lib/lib.es5.d.ts","../node_modules/typescript/lib/lib.es2015.d.ts","../node_modules/typescript/lib/lib.es2016.d.ts","../node_modules/typescript/lib/lib.es2017.d.ts","../node_modules/typescript/lib/lib.es2018.d.ts","../node_modules/typescript/lib/lib.es2019.d.ts","../node_modules/typescript/lib/lib.es2020.d.ts","../node_modules/typescript/lib/lib.dom.d.ts","../node_modules/typescript/lib/lib.dom.iterable.d.ts","../node_modules/typescript/lib/lib.es2015.core.d.ts","../node_modules/typescript/lib/lib.es2015.collection.d.ts","../node_modules/typescript/lib/lib.es2015.generator.d.ts","../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../node_modules/typescript/lib/lib.es2015.promise.d.ts","../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../node_modules/typescript/lib/lib.es2017.object.d.ts","../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../node_modules/typescript/lib/lib.es2017.string.d.ts","../node_modules/typescript/lib/lib.es2017.intl.d.ts","../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../node_modules/typescript/lib/lib.es2018.intl.d.ts","../node_modules/typescript/lib/lib.es2018.promise.d.ts","../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../node_modules/typescript/lib/lib.es2019.array.d.ts","../node_modules/typescript/lib/lib.es2019.object.d.ts","../node_modules/typescript/lib/lib.es2019.string.d.ts","../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../node_modules/typescript/lib/lib.es2020.date.d.ts","../node_modules/typescript/lib/lib.es2020.promise.d.ts","../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../node_modules/typescript/lib/lib.es2020.string.d.ts","../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../node_modules/typescript/lib/lib.es2020.intl.d.ts","../node_modules/typescript/lib/lib.es2020.number.d.ts","../node_modules/typescript/lib/lib.esnext.intl.d.ts","../node_modules/tslib/tslib.d.ts","../node_modules/@types/react-native/modules/BatchedBridge.d.ts","../node_modules/@types/react-native/modules/Codegen.d.ts","../node_modules/@types/react-native/modules/Devtools.d.ts","../node_modules/@types/react-native/modules/globals.d.ts","../node_modules/@types/react-native/modules/LaunchScreen.d.ts","../node_modules/@types/react/global.d.ts","../node_modules/csstype/index.d.ts","../node_modules/@types/prop-types/index.d.ts","../node_modules/@types/scheduler/tracing.d.ts","../node_modules/@types/react/index.d.ts","../node_modules/@types/react-native/private/Utilities.d.ts","../node_modules/@types/react-native/public/Insets.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/RendererProxy.d.ts","../node_modules/@types/react-native/public/ReactNativeTypes.d.ts","../node_modules/@types/react-native/Libraries/Types/CoreEventTypes.d.ts","../node_modules/@types/react-native/public/ReactNativeRenderer.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/Touchable.d.ts","../node_modules/@types/react-native/Libraries/Components/View/ViewAccessibility.d.ts","../node_modules/@types/react-native/Libraries/Components/View/ViewPropTypes.d.ts","../node_modules/@types/react-native/Libraries/Components/RefreshControl/RefreshControl.d.ts","../node_modules/@types/react-native/Libraries/Components/ScrollView/ScrollView.d.ts","../node_modules/@types/react-native/Libraries/Components/View/View.d.ts","../node_modules/@types/react-native/Libraries/Image/ImageResizeMode.d.ts","../node_modules/@types/react-native/Libraries/Image/ImageSource.d.ts","../node_modules/@types/react-native/Libraries/Image/Image.d.ts","../node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.d.ts","../node_modules/@react-native/virtualized-lists/index.d.ts","../node_modules/@types/react-native/Libraries/Lists/FlatList.d.ts","../node_modules/@types/react-native/Libraries/Lists/SectionList.d.ts","../node_modules/@types/react-native/Libraries/Text/Text.d.ts","../node_modules/@types/react-native/Libraries/Animated/Animated.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/StyleSheet.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/processColor.d.ts","../node_modules/@types/react-native/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts","../node_modules/@types/react-native/Libraries/Alert/Alert.d.ts","../node_modules/@types/react-native/Libraries/Animated/Easing.d.ts","../node_modules/@types/react-native/Libraries/Animated/useAnimatedValue.d.ts","../node_modules/@types/react-native/Libraries/vendor/emitter/EventEmitter.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/AppState/AppState.d.ts","../node_modules/@types/react-native/Libraries/BatchedBridge/NativeModules.d.ts","../node_modules/@types/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts","../node_modules/@types/react-native/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts","../node_modules/@types/react-native/Libraries/Components/Clipboard/Clipboard.d.ts","../node_modules/@types/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/NativeEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/Components/Keyboard/Keyboard.d.ts","../node_modules/@types/react-native/private/TimerMixin.d.ts","../node_modules/@types/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts","../node_modules/@types/react-native/Libraries/Components/Pressable/Pressable.d.ts","../node_modules/@types/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts","../node_modules/@types/react-native/Libraries/Components/SafeAreaView/SafeAreaView.d.ts","../node_modules/@types/react-native/Libraries/Components/StatusBar/StatusBar.d.ts","../node_modules/@types/react-native/Libraries/Components/Switch/Switch.d.ts","../node_modules/@types/react-native/Libraries/Components/TextInput/InputAccessoryView.d.ts","../node_modules/@types/react-native/Libraries/Components/TextInput/TextInput.d.ts","../node_modules/@types/react-native/Libraries/Components/ToastAndroid/ToastAndroid.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableHighlight.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableOpacity.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts","../node_modules/@types/react-native/Libraries/Components/Button.d.ts","../node_modules/@types/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.d.ts","../node_modules/@types/react-native/Libraries/Interaction/InteractionManager.d.ts","../node_modules/@types/react-native/Libraries/Interaction/PanResponder.d.ts","../node_modules/@types/react-native/Libraries/LayoutAnimation/LayoutAnimation.d.ts","../node_modules/@types/react-native/Libraries/Linking/Linking.d.ts","../node_modules/@types/react-native/Libraries/LogBox/LogBox.d.ts","../node_modules/@types/react-native/Libraries/Modal/Modal.d.ts","../node_modules/@types/react-native/Libraries/Performance/Systrace.d.ts","../node_modules/@types/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.d.ts","../node_modules/@types/react-native/Libraries/PushNotificationIOS/PushNotificationIOS.d.ts","../node_modules/@types/react-native/Libraries/Utilities/IPerformanceLogger.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/AppRegistry.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/I18nManager.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/RootTag.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/UIManager.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/requireNativeComponent.d.ts","../node_modules/@types/react-native/Libraries/Settings/Settings.d.ts","../node_modules/@types/react-native/Libraries/Share/Share.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/PlatformColorValueTypesIOS.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/PlatformColorValueTypes.d.ts","../node_modules/@types/react-native/Libraries/TurboModule/RCTExport.d.ts","../node_modules/@types/react-native/Libraries/TurboModule/TurboModuleRegistry.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Appearance.d.ts","../node_modules/@types/react-native/Libraries/Utilities/BackHandler.d.ts","../node_modules/@types/react-native/Libraries/Utilities/DevSettings.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Dimensions.d.ts","../node_modules/@types/react-native/Libraries/Utilities/PixelRatio.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Platform.d.ts","../node_modules/@types/react-native/Libraries/Vibration/Vibration.d.ts","../node_modules/@types/react-native/Libraries/YellowBox/YellowBoxDeprecated.d.ts","../node_modules/@types/react-native/Libraries/vendor/core/ErrorUtils.d.ts","../node_modules/@types/react-native/public/DeprecatedPropertiesAlias.d.ts","../node_modules/@types/react-native/index.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/ContextProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/DataProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/layoutmanager/LayoutManager.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/LayoutProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/GridLayoutProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/scrollcomponent/BaseScrollView.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ViewabilityTracker.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/VirtualRenderer.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ItemAnimator.d.ts","../node_modules/recyclerlistview/dist/reactnative/utils/ComponentCompat.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/RecyclerListView.d.ts","../node_modules/recyclerlistview/dist/reactnative/utils/AutoScroll.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/layoutmanager/GridLayoutManager.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ProgressiveListView.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/devutils/debughandlers/resize/ResizeDebugHandler.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/devutils/debughandlers/DebugHandlers.d.ts","../node_modules/recyclerlistview/dist/reactnative/index.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/StickyContainer.d.ts","../node_modules/recyclerlistview/sticky/index.d.ts","../src/native/auto-layout/AutoLayoutViewNativeComponentProps.ts","../src/native/auto-layout/AutoLayoutViewNativeComponent.ts","../src/native/auto-layout/AutoLayoutView.tsx","../src/native/cell-container/CellContainer.tsx","../src/PureComponentWrapper.tsx","../src/viewability/ViewToken.ts","../src/FlashListProps.ts","../src/utils/AverageWindow.ts","../src/utils/ContentContainerUtils.ts","../src/GridLayoutProviderWithProps.ts","../src/errors/CustomError.ts","../src/errors/ExceptionList.ts","../src/errors/Warnings.ts","../src/viewability/ViewabilityHelper.ts","../src/viewability/ViewabilityManager.ts","../node_modules/recyclerlistview/dist/reactnative/platform/reactnative/itemanimators/defaultjsanimator/DefaultJSItemAnimator.d.ts","../src/native/config/PlatformHelper.ts","../src/FlashList.tsx","../src/AnimatedFlashList.ts","../src/MasonryFlashList.tsx","../src/benchmark/AutoScrollHelper.ts","../src/benchmark/roundToDecimalPlaces.ts","../src/benchmark/JSFPSMonitor.ts","../src/benchmark/useBlankAreaTracker.ts","../src/benchmark/useBenchmark.ts","../src/benchmark/useDataMultiplier.ts","../src/benchmark/useFlatListBenchmark.ts","../src/index.ts","../src/__tests__/AverageWindow.test.ts","../src/__tests__/ContentContainerUtils.test.ts","../node_modules/@quilted/react-testing/build/typescript/types.d.ts","../node_modules/@quilted/react-testing/build/typescript/matchers/index.d.ts","../node_modules/@quilted/react-testing/build/typescript/environment.d.ts","../node_modules/@quilted/react-testing/build/typescript/implementations/test-renderer.d.ts","../node_modules/@quilted/react-testing/build/typescript/index.d.ts","../src/__tests__/helpers/mountFlashList.tsx","../src/__tests__/FlashList.test.tsx","../src/__tests__/GridLayoutProviderWithProps.test.ts","../src/__tests__/helpers/mountMasonryFlashList.tsx","../src/__tests__/MasonryFlashList.test.ts","../src/native/config/PlatformHelper.web.ts","../src/__tests__/PlatformHelper.web.test.ts","../src/__tests__/ViewabilityHelper.test.ts","../src/__tests__/useBlankAreaTracker.test.tsx","../src/native/auto-layout/AutoLayoutViewNativeComponent.android.ts","../src/native/auto-layout/AutoLayoutViewNativeComponent.ios.ts","../src/native/cell-container/CellContainer.android.ts","../src/native/cell-container/CellContainer.ios.ts","../src/native/cell-container/CellContainer.web.tsx","../src/native/config/PlatformHelper.android.ts","../src/native/config/PlatformHelper.ios.ts","../node_modules/@babel/types/lib/index.d.ts","../node_modules/@types/babel__generator/index.d.ts","../node_modules/@babel/parser/typings/babel-parser.d.ts","../node_modules/@types/babel__template/index.d.ts","../node_modules/@types/babel__traverse/index.d.ts","../node_modules/@types/babel__core/index.d.ts","../node_modules/@types/node/assert.d.ts","../node_modules/@types/node/assert/strict.d.ts","../node_modules/@types/node/globals.d.ts","../node_modules/@types/node/async_hooks.d.ts","../node_modules/@types/node/buffer.d.ts","../node_modules/@types/node/child_process.d.ts","../node_modules/@types/node/cluster.d.ts","../node_modules/@types/node/console.d.ts","../node_modules/@types/node/constants.d.ts","../node_modules/@types/node/crypto.d.ts","../node_modules/@types/node/dgram.d.ts","../node_modules/@types/node/diagnostics_channel.d.ts","../node_modules/@types/node/dns.d.ts","../node_modules/@types/node/dns/promises.d.ts","../node_modules/@types/node/domain.d.ts","../node_modules/@types/node/events.d.ts","../node_modules/@types/node/fs.d.ts","../node_modules/@types/node/fs/promises.d.ts","../node_modules/@types/node/http.d.ts","../node_modules/@types/node/http2.d.ts","../node_modules/@types/node/https.d.ts","../node_modules/@types/node/inspector.d.ts","../node_modules/@types/node/module.d.ts","../node_modules/@types/node/net.d.ts","../node_modules/@types/node/os.d.ts","../node_modules/@types/node/path.d.ts","../node_modules/@types/node/perf_hooks.d.ts","../node_modules/@types/node/process.d.ts","../node_modules/@types/node/punycode.d.ts","../node_modules/@types/node/querystring.d.ts","../node_modules/@types/node/readline.d.ts","../node_modules/@types/node/repl.d.ts","../node_modules/@types/node/stream.d.ts","../node_modules/@types/node/stream/promises.d.ts","../node_modules/@types/node/stream/consumers.d.ts","../node_modules/@types/node/stream/web.d.ts","../node_modules/@types/node/string_decoder.d.ts","../node_modules/@types/node/timers.d.ts","../node_modules/@types/node/timers/promises.d.ts","../node_modules/@types/node/tls.d.ts","../node_modules/@types/node/trace_events.d.ts","../node_modules/@types/node/tty.d.ts","../node_modules/@types/node/url.d.ts","../node_modules/@types/node/util.d.ts","../node_modules/@types/node/v8.d.ts","../node_modules/@types/node/vm.d.ts","../node_modules/@types/node/wasi.d.ts","../node_modules/@types/node/worker_threads.d.ts","../node_modules/@types/node/zlib.d.ts","../node_modules/@types/node/globals.global.d.ts","../node_modules/@types/node/index.d.ts","../node_modules/@types/graceful-fs/index.d.ts","../node_modules/@types/istanbul-lib-coverage/index.d.ts","../node_modules/@types/istanbul-lib-report/index.d.ts","../node_modules/@types/istanbul-reports/index.d.ts","../node_modules/chalk/index.d.ts","../node_modules/@sinclair/typebox/typebox.d.ts","../node_modules/@jest/schemas/build/index.d.ts","../node_modules/pretty-format/build/index.d.ts","../node_modules/jest-diff/build/index.d.ts","../node_modules/jest-matcher-utils/build/index.d.ts","../node_modules/@types/jest/index.d.ts","../node_modules/@types/json-schema/index.d.ts","../node_modules/@types/json5/index.d.ts","../node_modules/@types/parse-json/index.d.ts","../node_modules/@types/prettier/index.d.ts","../node_modules/@types/react-test-renderer/index.d.ts","../node_modules/@types/scheduler/index.d.ts","../node_modules/@types/stack-utils/index.d.ts","../node_modules/@types/websocket/index.d.ts","../node_modules/@types/yargs-parser/index.d.ts","../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f5c28122bee592cfaf5c72ed7bcc47f453b79778ffa6e301f45d21a0970719d4","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","e6b724280c694a9f588847f754198fb96c43d805f065c3a5b28bbc9594541c84","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3f149f903dd20dfeb7c80e228b659f0e436532de772469980dbd00702cc05cc1","affectsGlobalScope":true},{"version":"1272277fe7daa738e555eb6cc45ded42cc2d0f76c07294142283145d49e96186","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"43fb1d932e4966a39a41b464a12a81899d9ae5f2c829063f5571b6b87e6d2f9c","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"0d5f52b3174bee6edb81260ebcd792692c32c81fd55499d69531496f3f2b25e7","affectsGlobalScope":true},{"version":"810627a82ac06fb5166da5ada4159c4ec11978dfbb0805fe804c86406dab8357","affectsGlobalScope":true},{"version":"181f1784c6c10b751631b24ce60c7f78b20665db4550b335be179217bacc0d5f","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"75ec0bdd727d887f1b79ed6619412ea72ba3c81d92d0787ccb64bab18d261f14","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"12a310447c5d23c7d0d5ca2af606e3bd08afda69100166730ab92c62999ebb9d","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"cd483c056da900716879771893a3c9772b66c3c88f8943b4205aec738a94b1d0","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"c37f8a49593a0030eecb51bbfa270e709bec9d79a6cc3bb851ef348d4e6b26f8","affectsGlobalScope":true},"14a84fbe4ec531dcbaf5d2594fd95df107258e60ae6c6a076404f13c3f66f28e",{"version":"1c0e04c54479b57b49fec4e93556974b3d071b65d0b750897e07b3b7d2145fc5","affectsGlobalScope":true},"bc1852215dc1488e6747ca43ae0605041de22ab9a6eeef39542d29837919c414","ae6da60c852e7bacc4a49ff14a42dc1a3fdbb44e11bd9b4acb1bf3d58866ee71",{"version":"0dab023e564abb43c817779fff766e125017e606db344f9633fdba330c970532","affectsGlobalScope":true},"4cbd76eafece5844dc0a32807e68047aecbdd8d863edba651f34c050624f18df",{"version":"ecf78e637f710f340ec08d5d92b3f31b134a46a4fcf2e758690d8c46ce62cba6","affectsGlobalScope":true},"ea0aa24a32c073b8639aa1f3130ba0add0f0f2f76b314d9ba988a5cb91d7e3c4","f7b46d22a307739c145e5fddf537818038fdfffd580d79ed717f4d4d37249380","f5a8b384f182b3851cec3596ccc96cb7464f8d3469f48c74bf2befb782a19de5",{"version":"29b8a3a533884705024eab54e56465614ad167f5dd87fdc2567d8e451f747224","affectsGlobalScope":true},"4f2490e3f420ea6345cade9aee5eada76888848e053726956aaf2af8705477ea","b3ac03d0c853c0ac076a10cfef4dc21d810f54dac5899ade2b1c628c35263533","d17a689ac1bd689f37d6f0d3d9a21afac349e60633844044f7a7b7b9d6f7fd83","019650941b03d4978f62d21ae874788a665c02b54e3268ef2029b02d3b4f7561","ae591c8a4d5c7f7fa44b6965016391457d9c1fd763475f68340599a2a2987a24","fbdef0c642b82cc1713b965f07b4da8005bbbb2c026039bfdc15ca2d20769e38","c2c004e7f1a150541d06bc4a408b96e45ac1f08e0b1b35dfd07fc0f678205f95","1f2081eb2cbeb0828f9baa1dd12cf6d207f8104ae0b085ab9975d11adc7f7e6f","cda9069fc4c312ff484c1373455e4297a02d38ae3bd7d0959aad772a2809623c","c028d20108bcaa3b1fdf3514956a8a90ccf680f18672fa3c92ce5acf81d7ab23","1054f6e8774a75aaf17e7cfea4899344f69590b2db1e06da21048ed1e063c693","9533301b8f75664e1b40a8484a4fd9c77efc04aef526409c2447aab7d12ddc63","b78b5b3fdb4e30976c4263c66c0ad38fb81edcc8075a4160a39d99c6dedd35be","032b51d656feaece529823992f5a39fe9e24d44dfa21b3a149982f7787fc7bdf","5bbfdfb694b019cb2a2022fba361a7a857efc1fc2b77a892c92ebc1349b7e984","46bc25e3501d321a70d0878e82a1d47b16ab77bdf017c8fecc76343f50806a0d","42bacb33cddecbcfe3e043ee1117ba848801749e44f947626765b3e0aec74b1c","49dba0d7a37268e6ae2026e84ad4362eac7e776d816756abf649be7fa177dcd5","5f2b5ab209daae571eb9acc1fd2067ccc94e2a13644579a245875bc4f02b562f","f072acf9547f89b814b9fdb3e72f4ebb1649191591cec99db43d35383906f87f","42450dba65ba1307f27c914a8e45e0b602c6f8f78773c052e42b0b87562f081e","f5870d0ca7b0dfb7e2b9ba9abad3a2e2bffe5c711b53dab2e6e76ca2df58302b","aeb20169389e9f508b1a4eb2a30371b64d64bb7c8543120bc39a3c6b78adfcc9","2a3d3acbab8567057a943f9f56113c0144f5fc561623749fbd6bb5c2b33bf738","9cf21fdcd1beb5142a514887133fa59057e06275bb3070713f3b6d51e830ffa0","0ad4f0b67db47064b404df89c50f99552ce12d6c4bb6154255be61eb6beed094","f8a464b9999126fe1095968c266c0d9c6174612cf256379a1ed1993a87bccdc6","49f981ca657ac160b5de5919ee5602d48bc8f8aac0805107c2ce4fd41dc9a2a1","56e4e08d95a3a7886266a2b4f66b67065c340480d9f1beb73ed7578aa83c639a","eb4360d3818dcd879ee965ae2f4b3fdfdc4149db921b6be338cb7dc7c2bd6710","1c1275f325f13af001aa5873418cb497a26b4b8271f9ad20a45e33f61ea3f9d9","b33e8426136c4f9b349b02c940d23310d350179f790899733aa097ed76457061","05aab001669a230a88820be09a54031c45d9af2488b27d53d4a9c8880ce73e8f","d93a066d4b8b33335dfff910fb25abb8979f8814f8ba45ea902a1360907da1f6","41e97e42d182b4d5f0733ebaad69294faaa507d95e595f317168b8f2325da9ca","debc734fc99b6e1684ed565946bad008913c769d4d2e400d8722c0c23d079c06","5a9f7e087aacb01fa0cdbc36b703a60367239f62beed2507a507199e4c417549","c7c23798fbf564983ed69c1ced3371970d986aaed4801a6e0fb41862550dc034","921f5bce372610ae8948ade7d82decbd2cf56d263de578976189585edd0abac0","ac11f8b13beef593e2f097450a7e214b23dca0d428babd570a2f39582f10e9ab","2499beb5d3e2b4c606977bcc2e08b6ef77b2ecda70e78e0622f5af3bed95c9ba","a11057410396907b84051cbdb8b0cd7f7049d72b58d2b6ac1c14ac2608191a52","bb630c26d487cc45ed107f4f2d3c2a95434716f6367f059de734c40d288c31eb","67cbce0ccdfa96b25de478a93cc493266c152e256c3c96b3d16d1f811e3d881f","19905c928bc4c016d05d915625bb08568447266c4661232faf89f7ddc4417ccc","26204eb4c326e8c975f1b789cbf345c6820205bded6d72e57246a83918d3bc84","618f25b2d41a99216e71817a3bc578991eee86c858c3f0f62a9e70707f4d279d","4cd2947878536ec078e4115b7d53cdcd4dcecd3a8288760caa79098db4f8f61f","2129e984399e94c82b77a32b975f3371ca5ee96341ab9f123474f1a5a1a9921f","798120aaa4952d68cd4b43d6625524c62a135c2f5a3eb705caee98de2355230d","6047365397173788c34bd71fea2bf07a9036d981212efd059b33e52d2c405e97","d7e25d7c03ccf8b10972c2a3a57e29a8d9024e6dbc4ac223baf633a6e8c7145c","6c2e2dead2d80007ee44c429b925d0a7b86f8f3d4c237b2197f7db9f39545dc6","38fbc8f9610fbf4bf619854b26e28c4fbbab16dc1944c4317a4af9bf1ac08d8e","1bd0470a72e6869c330e6e978f15ef32ba2c245249aca097b410448152e8a06b","dd05d7970a92b789f7df3b2252574b2e60f1b9a3758e2839e167b498b8f77159","7092be1889127b2f319efd5d9bdcc0b5cf6fe0740e47247ed039446045518898","0a3d5dbf7c2091017e697ebf9af0a727571f5d99cb4c19e6856212a745c6c355","d05f9c767924db6fb89f6075acb64c042cebdb12779bbd1aaca12c850b772d49","d032678e20ff0f4b8ef6f1e4823b6ae37931b776e8381676dc9141999909b3d7","3e4ab0e8e96e968ac84a2484104892c881ded1757acd81b5e969b6229851f54c","d43a36641f5812794a3b4a941e3dfb5fa070f9fff64cfd6daf5291cb962c8b05","32468df81188116040636844517fbe4f67fc37af4fe565c7592353df8e11d2f3","c12b5f9bf412c891cad443ef00a378ad2d3f1301f140943414308665a7d90af8","cf1b65c20036885ed99ce1c18aa0a0ed66f42acd6d415e99b48a8fa4105c23ed","173aec8be1be982c8244df6f94880d77a9b766c8c1ec3eb0af662c8dc6da7f2e","08188020373062e07955835a996fda1aff97a89e57d469edc6b9210bd9c8926f","cad5c2c0085a3e3b74f58aa199944b25ed8d24f93f51c99ebe2463e4f1694785","3e2d93a797c41ab081fbcd80e959b7c30d5d1c358f091c22a6ebe416ef7c5e19","c440df5735a3305e7db118bf821efb597c8318910861f735372846db9f7b506b","d6d8de719a75e5d2ed9dd9d6a99296d1337259e1c96166579db50797edd72ede","32b4c732e183bf5d123f88d526ac21b71a681089c18d2d761be342df31179d94","212d16020e7dce1b5509f3b9813de73612de57c6a3d74536714eb88787b96dc3","1a63d5212341783aa49cf78d667bf2a6cd03208ea09620b2fc3e647ae07f4e0d","84ea58841272970e6e3247cba4dbb326cf22764c2f4bbcb03f1c634315bbbcb5","86f9fbecdd848d02c90f861cc9839d8f3449c518a77e77ea65362f6a4126c63b","ecdaf317a4a1e7e3540e2f1b6aae38acd78dd99d564b52f98eea7358ac74416d","c30430960f1a0552b3cdaf1ef8164fdd4f289c782a8912df5180d57bc9ddfc03","a348081c01502c9f87d39d9e4b5dd58e1111b34c62686d6e569c595a0417bb35","eff69aee13c76502a16b756cde9c451fb4b5c4234052f3b3bee9dbfe92e1b1d5","9943f44400939f4ff008a882ff71162f70ba0c2f735c9743fd4645ef5c925fc4","b7836eba6c5173a1683aee8aa1771ff339e795cb9c21411590edb910274febe4","6fe447aa7e6fabc4f6c536f2997e3b1116b7f73dbe5bf3fc8d958bad434e4a84","15d3908d453d14be4dae760122ed5d74ad789a19f1fec2edd4034e57217436e9","ef00bc701f382da70870ab7721ed8f6552a38e332e60370b93cf340b6470845c","18891a02fa046e57b43a543dddc7212086fcb04ae6c8e8f28f8605dd3ccf57ed",{"version":"5980a888624dce1b0937a0d21c623f97056501bb61a8da29cbe07f1a0be2c9a8","affectsGlobalScope":true},"590a41ccab332c66a6aa62746612b03ceb2e92cc1da58c140e90fb7ff6e8c851","dc1d2996f23fe7f0da0b2c843e05c0ac170a36b51da11e58de089d344de93c3b","78ff01b50e7e9761f239527ec70b96171bccc28a08d909243e193db03b6f6983","ed18472ee2247563a26d754dd4c8bd66383013df13ce7c2927b03cab1a27b7e8","28ac9ac1fa163e5f2321fafa49b9931908c0076216ed3c82646d79abdf79775e","07dd4bed8ddab685f82a2125bf3aa41b42e36f28c16a5aec7357b727649076fb","fc15a2216f29b825747c0c3a54d6989518dd0f4aa0b580520e5526b4a47bec8f","c656d5baf3d4a8f358fc083db04b0fda8cb8503a613a9ba42327ecbd7909773c","397c2c81eaeae1388f7459699d7606feecfc304b212eb9113407c1315746a578","c2d923e9adc26a3efe5186f3a4a72413d24c80f03b306c68c30fa146690fb101","d34782833b7d5f72486a5fb926d3d96198706ed76aeaf1d435c748ebcf9169fc","b093e56054755189dd891ea832dec40d729d110a0a3f432fff5ea5ab1078cdde","98affe620e6230a3888b445c32376e4edbf6b1b376a71f2bf9c07bee11fcdd65","1e05491bef32ff48393d605d557152735899da3d9b111ba3588a1800f2927f4a","1ff7813974b1b9a0524c1e5a99aa52a05e79fc7df7749ada75ded8c53fe1b7e0","cd8c517f54d4ff3475755b290d741c8799df3265ce73d454d8fafe423f8ff749","bf431147b104ae92d61de6b43e9f25d27e8d3eaeaffd612e0c0d3bb8e2423926","f0f21604ae8f880c0ab529f00303806fdeadc943e32a25ca063fc8fea0fa063c","8dc4f45212fba9381e1674e8bd934a588730efbb8a6681b661cad8cd09b081c5",{"version":"52bf774bd30177ebb3e450c808d8d46f67896848a942e6203ae78b65b33d0106","signature":"688c437017a53e69ff66aac2036a0d7f6263082f676a408c9998cbd87ea2ec73"},{"version":"8b6ee36fd764378c62dca37041c5a12fd5a77b9e853c78908b7ed1c90dc149e4","signature":"03846acca031c757d910dbc017d846c87574faf90bde82316fb9b8537896d5ee"},{"version":"0d089d33f31b56697d142aa7395738c0323cf761b4c79fd6bf65a54ab1ddf02f","signature":"027c87e1cb049497d4f185bc9b922ce91cad59832da8faf3411e6b298b9deb78"},{"version":"ec0982b9e7d6c1b6c80e2829c5909eefb9ecee687e60621e0bb937e8ad5d1d43","signature":"8478b617a5be940f1b4b4d19d2fc6149c21ac69c4a7e00c8a7db2c2c21aa2274"},{"version":"84c5fc9d0d22f4566791b88d5fc2c24f56508b50c9ce894ac549ebaa158b1fca","signature":"677ea66c6fa02f1cebf82df19f416a8302c7a7d10e2de265b162760fcd865eef"},{"version":"8455135ea42310a73404fa2513e212d170af1191584061f583ec1e0f6b75dd91","signature":"83e4298f0b6834e955ee6a76569d3e5b3192065d47f1daf4535bb9edb16e88cb"},{"version":"73529962207605bdc5285d5e745919b8d57b776daa0f22a14b75cd8a92d63af9","signature":"422fcd2a7fd87f05efdfaa6eab382ca607d5d54e1f175ba2efccd4aacd5433ef"},{"version":"ebe927d8a9739c9d32ef4df28c1c36cf82daa9abba7cdf3f79e320c5e99e99d8","signature":"2421f9c6b1ecedd50818719090a77e9d2748c2339c33f3d4817beebf7a39d211"},{"version":"165c56632fea46c85e2a62f1b4eae600b846ea0deacd3c137fde9bacb845c30e","signature":"79bf9e3846b43e706d181c00f3c1c50ae8fc60e587c97a16e521adc150317624"},{"version":"866e1d2cf16a41851b056a2cc0cdc5f0f00df0435376cc2c723a8c609f61fbd0","signature":"5f5bbca60f0bfed6ff714163c4e962a5e260e59db754c89ee2063403accd03e3"},{"version":"ecfa1b63e3829b310ac968b2cc1cc7016ba76ffb8532439aebecbcbc57173b99","signature":"2f1dda63ade2bd085704674523b56ede942bc8c2c37fe8ed9b9b0fdfd69b1262"},{"version":"51d2f746d7e599a5549f5a946565934b4556bb9155be1eed2c474e25f1474872","signature":"c15585fe8935ed5cfedec39b7d41ec49990973f40faaba4b3e14278861643d79"},{"version":"b1d1378906c54a2f4d230ad69d212beedd2552afe3f7ad171b7eacb4cecc26d7","signature":"f9e60e8f79a7f606f19e02e2d39a24995719767dbe587f564f970bb24e3ca29d"},{"version":"f5a156e5b3783ea0399ac0326b7ab31a00e8874c5fa9b5e26fac217da8b5adfd","signature":"cfa7179e0306fc04d93f062c96e7ae8bad58d0cc4a7aa0dd4494ff9d262b101c"},{"version":"3c9fefca9303bcfd5712de11a3cbda20b3d6e85f29019bc75cab24690fb0f90d","signature":"306683152ff5a6038cf05b03ddff85a15b1bc8e18ef268aad26b02fd8e0e8b9d"},"a11c3e55d22d6379fe0949793e2638a6b43aa6e9def4f7452c3e352a296ef8da",{"version":"2770956c9437d7d66650084891c559ff6bb94200b7e2820940fd5d5dd0efa489","signature":"2faaf4f254008bf5be0e145be10dba35dccfac7116e9083f9d697a476a8e7076"},{"version":"ceee917fd557b841b93f7e13103dfdad79d38fe9962408f538f27db03dc9368d","signature":"15003ff6ed10d259dca775c7e5f7a64b272a9c370b6085db2d42a2d4a1d81579"},{"version":"a1691ae6d70af82f3e26d9e2e021dc5063021bd9c335bfdb40dc97d3574d1b3f","signature":"cd1c566b611a70ff987a79d0465da67649a8ed7e7668feddfcdf6dceb01c09a8"},{"version":"a105417dd540f1a400f0665c877e5d7e48e2efe08f01c2e5c7272256e644faa5","signature":"b3a6ee392811d6cddb38378ebaa373d4a39aa7dc4ecac73497c6b33627e6430b"},{"version":"581b44cf6122e3ad267d6bda2428c214fef3d38b6d7249df9fa6bc240a880a78","signature":"0ca09d92d6469d906a3d1c7192a6294c7f65b75f4f7eb8072bbd1b68c7f021e1"},{"version":"2e6426c1a1ff8561aa5f01d9398426bf06e55307f688464939de3196f0d4c143","signature":"5357bd09c9816a9765e617f86a9b49f85133d0bc0f9c5e29e834f2f8e6d52acb"},{"version":"508279c48de5627ae6c30a0aee01f4391bf32450335d7f09d5dd82acbc4d13c5","signature":"11d546a505f70f9c5f8092916027d8045c280a817b709fcaf2c4e63fa026c89c"},{"version":"557f2e0a4e5ac8a59b7c3068b2b30162fb963d72d50152482ab8c414e81caf37","signature":"008eaae28119118f1c589a1e29ea7fd17277f2280d2d3bfddeacd71fd1671bb5"},{"version":"f45c172ca54fb28d64b2dd04e495f17038034e20f37bd286a9f3eeb286cf1388","signature":"75a8761564c8fc5581b062dd339ea698921baf60e52eae055c8177dfa89eba90"},{"version":"ea696a0517ad69afea472e47eb1f904aba1667f54d4557eb98b8c766469d56a2","signature":"7e125d9abc19f62d1480f6c04a45d7bb2c89153316245ae8b8e5a0234b078c4e"},{"version":"902937c505f88d8b5b32829b4c14243eb740013fd0e2f58e6485324bbfe197a6","signature":"dc7de7650e5a64fc010387db18e84d48fe8f562dbd9caac01e54f83681ac976b"},{"version":"842accda78bb1b6f494f264aae307b84d933486d607e91f6e1d3a4d2e4851783","signature":"430d9683c8e5aaab71f0e3b271c4240cd5120a91191f953722985499af51d7e6"},{"version":"45b1a895868587c78a2ddff937967669b4e1968ea72c01e1c2b6dd5993f53b36","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"99cab9373415bac71e9d2c84279782c0a361b59551d0ca8dfaee8d4c08ed3247","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},"ba1fed463e8a21ffddb67a53df3f0d818b351991723736e167d065e2de1c7183",{"version":"22e311fec88bcc49b2b1fb3c9a7c082cd84b3388c9bcc7b9ef08253f6fa74e26","affectsGlobalScope":true},"c186097fd9b86681981cdeba08c0b6bbfcd8b562ab490c25656d85fef8f10c79","0b0c483e991e81c3f26e5f2da53ff26a15994c98c8b89cda1e4156dfc2428111","3340eb7b30bdee5f0349107d4068fd6f2f4712e11a2ba68e203b2f2489350317",{"version":"2000d60bd5195730ffff0d4ce9389003917928502c455ed2a9e296d3bf1a4b42","signature":"56335d3c9b867cc8654c05e633c508dd8de0038157f9958eb8794b7c123bb90e"},{"version":"dfceb5b9355a4a9002a7c291b1c3315511977c73cb23d9c123a72567783a18c0","signature":"b1802850887a3ea11a06df1fc1c65c6579332eefba1e63b3967a73dc937a2574"},{"version":"384fc0e3fa5966f524c96f1782b9d7a005346ba1621c43d0d1d819bf39077fbc","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"7fde517b3f03bb21ec3a46ba5f85c6797f8abf27deacb862183126e2f072788e","signature":"8b310edcfec83da25bc4f3adb20a7583bc5dae56d7d06c5b1431b76d390c1b72"},{"version":"894d93831d2afcd26f7362347e4960dd6d53f4153dad08813f3670e1327e387c","signature":"b1802850887a3ea11a06df1fc1c65c6579332eefba1e63b3967a73dc937a2574"},{"version":"8f9eac2c3ae305c25d4ffeff800b9811c8d3ec6a11b142fe96d08a2bc40f6440","signature":"08d6a2d1b004bbcac4249cd5baf6e9c662adc6139939c266b42e0422ef0c68b3"},{"version":"ac8980bdd810c30c444b59cca584c9b61d5ab274fa9474d778970537f3090240","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"1c024431c672cf9c6dcdb4d30c5b625435d81a5423b9d45e8de0082e969af8a8","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"eee1b57475023853cd09dd79b8d0d6639b6b82c3baee5863c2f2022b710f4102","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"377ba49d29102653a4b0c72b3870f9c599575df7db3a3fae7a21be5327ff84e2","signature":"c47f5db4df0a5031ed84bc6ee192c412b9e2d4d5e94681af77ccdcc25c851839"},{"version":"377ba49d29102653a4b0c72b3870f9c599575df7db3a3fae7a21be5327ff84e2","signature":"c47f5db4df0a5031ed84bc6ee192c412b9e2d4d5e94681af77ccdcc25c851839"},{"version":"39833acf7547216b2f31b2279dcfec3ed1359dec8adc9d1cb87c695ebf9bff94","signature":"7292d4dc9dac6d815dc30245a4a4a4959845d3a2b84ba0166857e4b23f2d033f"},{"version":"39833acf7547216b2f31b2279dcfec3ed1359dec8adc9d1cb87c695ebf9bff94","signature":"7292d4dc9dac6d815dc30245a4a4a4959845d3a2b84ba0166857e4b23f2d033f"},{"version":"529dd364d169ab3dbbb177ccdc4987c4a6f69187f553f3d36460ab65879ad998","signature":"3919e9d5911da2254732c31942e2cdc0057056ebfc2a16d34041c76a9b58d447"},{"version":"ebea587ca6477b9db29baf75d359924c55ab490fecdc38d7c0f16e589f0d27f9","signature":"0688c25f38e78e052338305d23046c7841074b3da5709a8f9e598ed705b9932b"},{"version":"de411013305dbe5c7a1ac13d2ea16dc36e52e6efd255b4e912fe53862058c649","signature":"2faaf4f254008bf5be0e145be10dba35dccfac7116e9083f9d697a476a8e7076"},"e432b56911b58550616fc4d54c1606f65fe98c74875b81d74601f5f965767c60","cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","a46a2e69d12afe63876ec1e58d70e5dbee6d3e74132f4468f570c3d69f809f1c","93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","3b043cf9a81854a72963fdb57d1884fc4da1cf5be69b5e0a4c5b751e58cb6d88","dd5647a9ccccb2b074dca8a02b00948ac293091ebe73fdf2e6e98f718819f669","0cba3a5d7b81356222594442753cf90dd2892e5ccfe1d262aaca6896ba6c1380","a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a",{"version":"c2ab70bbc7a24c42a790890739dd8a0ba9d2e15038b40dff8163a97a5d148c00","affectsGlobalScope":true},"422dbb183fdced59425ca072c8bd09efaa77ce4e2ab928ec0d8a1ce062d2a45a",{"version":"712ba0d43b44d144dfd01593f61af6e2e21cfae83e834d297643e7973e55ed61","affectsGlobalScope":true},"1dab5ab6bcf11de47ab9db295df8c4f1d92ffa750e8f095e88c71ce4c3299628","f71f46ccd5a90566f0a37b25b23bc4684381ab2180bdf6733f4e6624474e1894",{"version":"54e65985a3ee3cec182e6a555e20974ea936fc8b8d1738c14e8ed8a42bd921d4","affectsGlobalScope":true},"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","98a3ebfa494b46265634a73459050befba5da8fdc6ca0ef9b7269421780f4ff3","34e5de87d983bc6aefef8b17658556e3157003e8d9555d3cb098c6bef0b5fbc8","cc0b61316c4f37393f1f9595e93b673f4184e9d07f4c127165a490ec4a928668","f27371653aded82b2b160f7a7033fb4a5b1534b6f6081ef7be1468f0f15327d3","c762cd6754b13a461c54b59d0ae0ab7aeef3c292c6cf889873f786ee4d8e75c9","f4ea7d5df644785bd9fbf419930cbaec118f0d8b4160037d2339b8e23c059e79",{"version":"bfea28e6162ed21a0aeed181b623dcf250aa79abf49e24a6b7e012655af36d81","affectsGlobalScope":true},"7a5459efa09ea82088234e6533a203d528c594b01787fb90fba148885a36e8b6","ae97e20f2e10dbeec193d6a2f9cd9a367a1e293e7d6b33b68bacea166afd7792","10d4796a130577d57003a77b95d8723530bbec84718e364aa2129fa8ffba0378","ad41bb744149e92adb06eb953da195115620a3f2ad48e7d3ae04d10762dae197","bf73c576885408d4a176f44a9035d798827cc5020d58284cb18d7573430d9022","7ae078ca42a670445ae0c6a97c029cb83d143d62abd1730efb33f68f0b2c0e82",{"version":"e8b18c6385ff784228a6f369694fcf1a6b475355ba89090a88de13587a9391d5","affectsGlobalScope":true},"5d0a9ea09d990b5788f867f1c79d4878f86f7384cb7dab38eecbf22f9efd063d","12eea70b5e11e924bb0543aea5eadc16ced318aa26001b453b0d561c2fd0bd1e","08777cd9318d294646b121838574e1dd7acbb22c21a03df84e1f2c87b1ad47f2","08a90bcdc717df3d50a2ce178d966a8c353fd23e5c392fd3594a6e39d9bb6304",{"version":"4cd4cff679c9b3d9239fd7bf70293ca4594583767526916af8e5d5a47d0219c7","affectsGlobalScope":true},"2a12d2da5ac4c4979401a3f6eaafa874747a37c365e4bc18aa2b171ae134d21b","002b837927b53f3714308ecd96f72ee8a053b8aeb28213d8ec6de23ed1608b66","1dc9c847473bb47279e398b22c740c83ea37a5c88bf66629666e3cf4c5b9f99c","a9e4a5a24bf2c44de4c98274975a1a705a0abbaad04df3557c2d3cd8b1727949","00fa7ce8bc8acc560dc341bbfdf37840a8c59e6a67c9bfa3fa5f36254df35db2","1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff",{"version":"806ef4cac3b3d9fa4a48d849c8e084d7c72fcd7b16d76e06049a9ed742ff79c0","affectsGlobalScope":true},"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","5f0ed51db151c2cdc4fa3bb0f44ce6066912ad001b607a34e65a96c52eb76248",{"version":"3345c276cab0e76dda86c0fb79104ff915a4580ba0f3e440870e183b1baec476","affectsGlobalScope":true},"664d8f2d59164f2e08c543981453893bc7e003e4dfd29651ce09db13e9457980","e383ff72aabf294913f8c346f5da1445ae6ad525836d28efd52cbadc01a361a6","f52fbf64c7e480271a9096763c4882d356b05cab05bf56a64e68a95313cd2ce2","59bdb65f28d7ce52ccfc906e9aaf422f8b8534b2d21c32a27d7819be5ad81df7",{"version":"3a2da34079a2567161c1359316a32e712404b56566c45332ac9dcee015ecce9f","affectsGlobalScope":true},"28a2e7383fd898c386ffdcacedf0ec0845e5d1a86b5a43f25b86bc315f556b79","3aff9c8c36192e46a84afe7b926136d520487155154ab9ba982a8b544ea8fc95","a880cf8d85af2e4189c709b0fea613741649c0e40fffb4360ec70762563d5de0","85bbf436a15bbeda4db888be3062d47f99c66fd05d7c50f0f6473a9151b6a070","9f9c49c95ecd25e0cb2587751925976cf64fd184714cb11e213749c80cf0f927","f0c75c08a71f9212c93a719a25fb0320d53f2e50ca89a812640e08f8ad8c408c",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"9cafe917bf667f1027b2bb62e2de454ecd2119c80873ad76fc41d941089753b8","3ebae8c00411116a66fca65b08228ea0cf0b72724701f9b854442100aab55aba","8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","7980bf9d2972585cdf76b5a72105f7817be0723ccb2256090f6335f45b462abe","301d7466eb591139c7d456958f732153b3400f3243f68d3321956b43a64769e9","22f13de9e2fe5f0f4724797abd3d34a1cdd6e47ef81fc4933fea3b8bf4ad524b","e3ba509d3dce019b3190ceb2f3fc88e2610ab717122dabd91a9efaa37804040d","cda0cb09b995489b7f4c57f168cd31b83dcbaa7aad49612734fb3c9c73f6e4f2",{"version":"2abad7477cf6761b55c18bea4c21b5a5dcf319748c13696df3736b35f8ac149e","affectsGlobalScope":true},"d38e588a10943bbab1d4ce03d94759bf065ff802a9a72fc57aa75a72f1725b71","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","2b8264b2fefd7367e0f20e2c04eed5d3038831fe00f5efbc110ff0131aab899b","6209c901f30cc321f4b86800d11fad3d67e73a3308f19946b1bc642af0280298","60aaac5fb1858fbd4c4eb40e01706eb227eed9eca5c665564bd146971280dbd3","74b0245c42990ed8a849df955db3f4362c81b13f799ebc981b7bec2d5b414a57","b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","4266ccd2cf1d6a281efd9c7ddf9efd7daecf76575364148bd233e18919cac3ed","70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","105b9a2234dcb06ae922f2cd8297201136d416503ff7d16c72bfc8791e9895c1"],"options":{"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"experimentalDecorators":true,"importHelpers":true,"jsx":2,"noEmitOnError":false,"noImplicitAny":true,"noUnusedLocals":true,"outDir":"./","rootDir":"../src","skipLibCheck":true,"sourceMap":true,"strictNullChecks":true,"target":1,"tsBuildInfoFile":"./tsconfig.tsbuildinfo"},"fileIdsList":[[211,260],[260],[260,273],[53,190,260],[192,194,260],[190,192,193,260],[53,260],[53,140,260],[69,260],[211,212,213,214,215,260],[211,213,260],[233,260,267],[260,269],[260,270],[260,275,277],[217,260],[220,260],[221,226,260],[222,232,233,240,249,259,260],[222,223,232,240,260],[224,260],[225,226,233,241,260],[226,249,256,260],[227,229,232,240,260],[228,260],[229,230,260],[231,232,260],[232,260],[232,233,234,249,259,260],[232,233,234,249,260],[235,240,249,259,260],[232,233,235,236,240,249,256,259,260],[235,237,249,256,259,260],[217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266],[232,238,260],[239,259,260],[229,232,240,249,260],[241,260],[242,260],[220,243,260],[244,258,260,264],[245,260],[246,260],[232,247,260],[247,248,260,262],[232,249,250,251,260],[249,251,260],[249,250,260],[252,260],[253,260],[232,254,255,260],[254,255,260],[226,240,249,256,260],[257,260],[240,258,260],[221,235,246,259,260],[226,260],[249,260,261],[260,262],[260,263],[221,226,232,234,243,249,259,260,262,264],[249,260,265],[76,77,260],[53,58,64,65,68,71,72,73,76,260],[74,260],[84,260],[53,57,82,260],[53,54,57,58,62,75,76,260],[53,76,105,106,260],[53,54,57,58,62,76,260],[82,91,260],[53,54,62,75,76,93,260],[53,55,58,61,62,65,75,76,260],[53,54,57,62,76,260],[53,54,57,62,260],[53,54,55,58,60,62,63,75,76,260],[53,76,260],[53,75,76,260],[53,54,57,58,61,62,75,76,82,93,260],[53,55,58,260],[53,54,57,60,75,76,93,103,260],[53,54,60,76,103,105,260],[53,54,57,60,62,93,103,260],[53,54,55,58,60,61,75,76,93,260],[58,260],[53,55,58,59,60,61,75,76,260],[82,260],[83,260],[53,54,55,57,58,61,66,67,75,76,260],[58,59,260],[53,64,65,70,75,76,260],[53,56,64,70,75,76,260],[53,58,62,260],[53,118,260],[53,57,260],[57,260],[76,260],[75,260],[66,74,76,260],[53,54,57,58,61,75,76,260],[128,260],[53,56,57,260],[91,260],[44,45,46,47,48,55,56,57,58,59,60,61,62,63,64,65,66,67,68,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,260],[140,260],[46,260],[49,50,51,52,260],[232,235,237,240,259,260,267],[260,287],[260,275],[260,272,276],[260,274],[151,260],[53,141,142,143,144,146,147,148,149,150,157,260],[53,140,147,150,151,260],[143,144,260],[142,143,144,147,260],[143,260],[155,260],[157,260],[144,260],[53,144,260],[141,142,143,144,145,146,147,149,150,151,152,153,154,156,260],[149,260],[158,260],[43,140,166,177,260],[43,53,140,157,159,162,163,164,166,168,169,170,171,172,174,176,260],[43,53,140,162,165,260],[43,157,166,167,168,260],[43,53,140,165,166,168,170,171,177,260],[43,53,260],[43,167,260],[43,168,260],[43,53,140,157,162,163,166,172,191,195,260],[43,140,157,177,195,260],[43,53,140,157,177,179,191,198,260],[43,200,260],[43,157,170,171,173,260],[43,53,140,166,177,191,194,260],[43,53,140,166,179,191,194,260],[43,53,177,183,194,195,260],[43,260],[43,181,260],[43,53,177,180,181,182,183,260],[43,53,157,162,177,260],[43,53,140,180,182,184,260],[43,162,163,165,166,177,178,179,180,182,183,184,185,186,260],[43,53,140,160,161,260],[43,140,160,260],[43,140,260],[43,53,140,260],[43,157,260],[43,157,175,260],[43,53,140,157,175,260],[43,140,157,166,260],[43,140,157,170,171,260],[43,140,165,173,177,260],[53,140,166],[53,157,166,169],[53,140,162,165],[157,166],[53,140,166,177],[53],[191],[53,166,177,191,194],[53,166,179,191,194],[53,177,182,183,187],[53,162,177],[140,184],[162,163,165,166,177,178,179,180,182,183,184,185,186],[53,140],[140,160],[140],[157],[53,157],[140,157,166],[140,157],[177]],"referencedMap":[[213,1],[211,2],[274,3],[192,4],[193,5],[194,6],[191,4],[190,7],[69,8],[70,9],[273,2],[216,10],[212,1],[214,11],[215,1],[268,12],[269,2],[270,13],[271,14],[278,15],[279,2],[280,2],[217,16],[218,16],[220,17],[221,18],[222,19],[223,20],[224,21],[225,22],[226,23],[227,24],[228,25],[229,26],[230,26],[231,27],[232,28],[233,29],[234,30],[219,2],[266,2],[235,31],[236,32],[237,33],[267,34],[238,35],[239,36],[240,37],[241,38],[242,39],[243,40],[244,41],[245,42],[246,43],[247,44],[248,45],[249,46],[251,47],[250,48],[252,49],[253,50],[254,51],[255,52],[256,53],[257,54],[258,55],[259,56],[260,57],[261,58],[262,59],[263,60],[264,61],[265,62],[281,2],[282,2],[51,2],[78,63],[79,2],[74,64],[80,2],[81,65],[85,66],[86,2],[87,67],[88,68],[107,69],[89,2],[90,70],[92,71],[94,72],[95,73],[96,74],[63,74],[97,75],[64,76],[98,77],[99,68],[100,78],[101,79],[102,2],[60,80],[104,81],[106,82],[105,83],[103,84],[65,75],[61,85],[62,86],[108,2],[91,87],[83,87],[84,88],[68,89],[66,2],[67,2],[109,87],[110,90],[111,2],[112,71],[71,91],[72,92],[113,2],[114,93],[115,2],[116,2],[117,2],[119,94],[120,2],[56,7],[121,7],[122,95],[123,96],[124,2],[125,97],[127,97],[126,97],[76,98],[75,99],[77,97],[73,100],[128,2],[129,101],[58,102],[130,66],[131,66],[132,103],[133,87],[118,2],[134,2],[135,2],[136,2],[137,7],[138,2],[82,2],[140,104],[44,2],[45,105],[46,106],[48,2],[47,2],[93,2],[54,2],[139,105],[55,2],[59,85],[57,7],[283,7],[49,2],[53,107],[284,2],[52,2],[285,2],[286,108],[287,2],[288,109],[272,2],[50,2],[276,110],[277,111],[275,112],[149,2],[154,113],[151,114],[158,115],[147,116],[148,117],[141,2],[142,2],[145,116],[144,118],[156,119],[155,120],[153,116],[143,121],[146,122],[157,123],[175,124],[152,2],[150,7],[159,125],[43,2],[8,2],[9,2],[11,2],[10,2],[2,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[3,2],[4,2],[23,2],[20,2],[21,2],[22,2],[24,2],[25,2],[26,2],[5,2],[27,2],[28,2],[29,2],[30,2],[6,2],[31,2],[32,2],[33,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[178,126],[177,127],[166,128],[169,129],[179,130],[164,131],[188,132],[189,133],[196,134],[197,135],[199,136],[201,137],[202,138],[195,139],[198,140],[203,141],[180,142],[182,143],[181,142],[184,144],[183,145],[185,142],[186,146],[170,142],[171,142],[172,142],[187,147],[162,148],[204,149],[205,149],[161,149],[160,131],[206,150],[207,150],[163,151],[208,131],[209,152],[210,152],[176,153],[200,154],[167,142],[168,155],[165,142],[173,156],[174,157]],"exportedModulesMap":[[213,1],[211,2],[274,3],[192,4],[193,5],[194,6],[191,4],[190,7],[69,8],[70,9],[273,2],[216,10],[212,1],[214,11],[215,1],[268,12],[269,2],[270,13],[271,14],[278,15],[279,2],[280,2],[217,16],[218,16],[220,17],[221,18],[222,19],[223,20],[224,21],[225,22],[226,23],[227,24],[228,25],[229,26],[230,26],[231,27],[232,28],[233,29],[234,30],[219,2],[266,2],[235,31],[236,32],[237,33],[267,34],[238,35],[239,36],[240,37],[241,38],[242,39],[243,40],[244,41],[245,42],[246,43],[247,44],[248,45],[249,46],[251,47],[250,48],[252,49],[253,50],[254,51],[255,52],[256,53],[257,54],[258,55],[259,56],[260,57],[261,58],[262,59],[263,60],[264,61],[265,62],[281,2],[282,2],[51,2],[78,63],[79,2],[74,64],[80,2],[81,65],[85,66],[86,2],[87,67],[88,68],[107,69],[89,2],[90,70],[92,71],[94,72],[95,73],[96,74],[63,74],[97,75],[64,76],[98,77],[99,68],[100,78],[101,79],[102,2],[60,80],[104,81],[106,82],[105,83],[103,84],[65,75],[61,85],[62,86],[108,2],[91,87],[83,87],[84,88],[68,89],[66,2],[67,2],[109,87],[110,90],[111,2],[112,71],[71,91],[72,92],[113,2],[114,93],[115,2],[116,2],[117,2],[119,94],[120,2],[56,7],[121,7],[122,95],[123,96],[124,2],[125,97],[127,97],[126,97],[76,98],[75,99],[77,97],[73,100],[128,2],[129,101],[58,102],[130,66],[131,66],[132,103],[133,87],[118,2],[134,2],[135,2],[136,2],[137,7],[138,2],[82,2],[140,104],[44,2],[45,105],[46,106],[48,2],[47,2],[93,2],[54,2],[139,105],[55,2],[59,85],[57,7],[283,7],[49,2],[53,107],[284,2],[52,2],[285,2],[286,108],[287,2],[288,109],[272,2],[50,2],[276,110],[277,111],[275,112],[149,2],[154,113],[151,114],[158,115],[147,116],[148,117],[141,2],[142,2],[145,116],[144,118],[156,119],[155,120],[153,116],[143,121],[146,122],[157,123],[175,124],[152,2],[150,7],[159,125],[43,2],[8,2],[9,2],[11,2],[10,2],[2,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[3,2],[4,2],[23,2],[20,2],[21,2],[22,2],[24,2],[25,2],[26,2],[5,2],[27,2],[28,2],[29,2],[30,2],[6,2],[31,2],[32,2],[33,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[178,158],[177,159],[166,160],[169,161],[179,162],[164,163],[196,164],[199,164],[195,165],[198,166],[184,167],[183,168],[186,169],[187,170],[162,171],[204,172],[205,172],[161,172],[160,163],[206,173],[207,173],[163,171],[208,163],[209,174],[210,174],[176,174],[200,175],[168,176],[173,177],[174,178]],"semanticDiagnosticsPerFile":[213,211,274,192,193,194,191,190,69,70,273,216,212,214,215,268,269,270,271,278,279,280,217,218,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,219,266,235,236,237,267,238,239,240,241,242,243,244,245,246,247,248,249,251,250,252,253,254,255,256,257,258,259,260,261,262,263,264,265,281,282,51,78,79,74,80,81,85,86,87,88,107,89,90,92,94,95,96,63,97,64,98,99,100,101,102,60,104,106,105,103,65,61,62,108,91,83,84,68,66,67,109,110,111,112,71,72,113,114,115,116,117,119,120,56,121,122,123,124,125,127,126,76,75,77,73,128,129,58,130,131,132,133,118,134,135,136,137,138,82,140,44,45,46,48,47,93,54,139,55,59,57,283,49,53,284,52,285,286,287,288,272,50,276,277,275,149,154,151,158,147,148,141,142,145,144,156,155,153,143,146,157,175,152,150,159,43,8,9,11,10,2,12,13,14,15,16,17,18,19,3,4,23,20,21,22,24,25,26,5,27,28,29,30,6,31,32,33,34,7,35,40,41,36,37,38,39,1,42,178,177,166,169,179,164,188,189,196,197,199,201,202,195,198,203,180,182,181,184,183,185,186,170,171,172,187,162,204,205,161,160,206,207,163,208,209,210,176,200,167,168,165,173,174]},"version":"4.7.4"}
-\ No newline at end of file
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
-index f18e92c..af1903c 100644
---- a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
-+++ b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
-@@ -4,31 +4,35 @@ import UIKit
- 
- /// Container for all RecyclerListView children. This will automatically remove all gaps and overlaps for GridLayouts with flexible spans.
- /// Note: This cannot work for masonry layouts i.e, pinterest like layout
--@objc class AutoLayoutView: UIView {
-+@objc public class AutoLayoutView: UIView {
-+    #if RCT_NEW_ARCH_ENABLED
-+    @objc public var onBlankAreaEventHandler: ((CGFloat, CGFloat) -> Void)?
-+    #endif
-+    
-     @objc(onBlankAreaEvent)
-     var onBlankAreaEvent: RCTDirectEventBlock?
- 
--    @objc func setHorizontal(_ horizontal: Bool) {
-+    @objc public func setHorizontal(_ horizontal: Bool) {
-         self.horizontal = horizontal
-     }
- 
--    @objc func setScrollOffset(_ scrollOffset: Int) {
-+    @objc public func setScrollOffset(_ scrollOffset: Int) {
-         self.scrollOffset = CGFloat(scrollOffset)
-     }
- 
--    @objc func setWindowSize(_ windowSize: Int) {
-+    @objc public func setWindowSize(_ windowSize: Int) {
-         self.windowSize = CGFloat(windowSize)
-     }
- 
--    @objc func setRenderAheadOffset(_ renderAheadOffset: Int) {
-+    @objc public func setRenderAheadOffset(_ renderAheadOffset: Int) {
-         self.renderAheadOffset = CGFloat(renderAheadOffset)
-     }
- 
--    @objc func setEnableInstrumentation(_ enableInstrumentation: Bool) {
-+    @objc public func setEnableInstrumentation(_ enableInstrumentation: Bool) {
-         self.enableInstrumentation = enableInstrumentation
-     }
- 
--    @objc func setDisableAutoLayout(_ disableAutoLayout: Bool) {
-+    @objc public func setDisableAutoLayout(_ disableAutoLayout: Bool) {
-         self.disableAutoLayout = disableAutoLayout
-     }
- 
-@@ -46,7 +50,15 @@ import UIKit
-     /// Tracks where first pixel is drawn in the visible window
-     private var lastMinBound: CGFloat = 0
-     
--    override func layoutSubviews() {
-+    private var viewsToLayout: [UIView] {
-+        #if RCT_NEW_ARCH_ENABLED
-+        return superview?.subviews ?? []
-+        #else
-+        return subviews
-+        #endif
-+    }
-+
-+    override public func layoutSubviews() {
-         fixLayout()
-         super.layoutSubviews()
- 
-@@ -69,12 +81,16 @@ import UIKit
-             distanceFromWindowEnd: distanceFromWindowEnd
-         )
- 
-+        #if RCT_NEW_ARCH_ENABLED
-+        onBlankAreaEventHandler?(blankOffsetStart, blankOffsetEnd)
-+        #else
-         onBlankAreaEvent?(
-             [
-                 "offsetStart": blankOffsetStart,
-                 "offsetEnd": blankOffsetEnd,
-             ]
-         )
-+        #endif
-     }
- 
-     func getScrollView() -> UIScrollView? {
-@@ -85,15 +101,21 @@ import UIKit
-     /// Performance: Sort is needed. Given relatively low number of views in RecyclerListView render tree this should be a non issue.
-     private func fixLayout() {
-         guard
--            subviews.count > 1,
-+            viewsToLayout.count > 1,
-             // Fixing layout during animation can interfere with it.
-             layer.animationKeys()?.isEmpty ?? true,
-             !disableAutoLayout
-         else { return }
--        let cellContainers = subviews
--            .compactMap { subview -> CellContainer? in
--                if let cellContainer = subview as? CellContainer {
-+        let cellContainers = viewsToLayout
-+            .compactMap { subview -> CellContainerComponentView? in
-+                if let cellContainer = subview as? CellContainerComponentView {
-                     return cellContainer
-+                } else if subview is AutoLayoutView {
-+                    // On Fabric, due to view flattening children of AutoLayoutView are moved one level up, so they appear
-+                    // as children of AutoLayoutViewComponentView in view hierarchy. viewsToLayout property takes it under
-+                    // consideration, returning children of AutoLayoutViewComponentView when on Fabric. Because of that
-+                    // AutoLayoutView may be on the list, in which case we want to ignore it.
-+                    return nil
-                 } else {
-                     assertionFailure("CellRendererComponent outer view should always be CellContainer. Learn more here: https://shopify.github.io/flash-list/docs/usage#cellrenderercomponent.")
-                     return nil
-@@ -106,7 +128,7 @@ import UIKit
- 
-     /// Checks for overlaps or gaps between adjacent items and then applies a correction.
-     /// Performance: RecyclerListView renders very small number of views and this is not going to trigger multiple layouts on the iOS side.
--    private func clearGaps(for cellContainers: [CellContainer]) {
-+    private func clearGaps(for cellContainers: [CellContainerComponentView]) {
-         var maxBound: CGFloat = 0
-         var minBound: CGFloat = CGFloat(Int.max)
-         var maxBoundNextCell: CGFloat = 0
-@@ -192,7 +214,7 @@ import UIKit
-         lastMinBound = minBound
-     }
- 
--    private func updateLastMaxBoundOverall(currentCell: CellContainer, nextCell: CellContainer) {
-+    private func updateLastMaxBoundOverall(currentCell: CellContainerComponentView, nextCell: CellContainerComponentView) {
-         lastMaxBoundOverall = max(lastMaxBoundOverall, horizontal ? currentCell.frame.maxX : currentCell.frame.maxY, horizontal ? nextCell.frame.maxX : nextCell.frame.maxY)
-     }
- 
-@@ -217,7 +239,7 @@ import UIKit
- 
-     /// It's important to avoid correcting views outside the render window. An item that isn't being recycled might still remain in the view tree. If views outside get considered then gaps between unused items will cause algorithm to fail.
-     func isWithinBounds(
--        _ cellContainer: CellContainer,
-+        _ cellContainer: CellContainerComponentView,
-         scrollOffset: CGFloat,
-         renderAheadOffset: CGFloat,
-         windowSize: CGFloat,
-@@ -260,10 +282,10 @@ import UIKit
-     }
- 
-     private func footerDiff() -> CGFloat {
--        if subviews.count == 0 {
-+        if viewsToLayout.count == 0 {
-             lastMaxBoundOverall = 0
--        } else if subviews.count == 1 {
--            let firstChild = subviews[0]
-+        } else if viewsToLayout.count == 1 {
-+            let firstChild = viewsToLayout[0]
-             lastMaxBoundOverall = horizontal ? firstChild.frame.maxX : firstChild.frame.maxY
-         }
-         let autoLayoutEnd = horizontal ? frame.width : frame.height
-@@ -271,6 +293,13 @@ import UIKit
-     }
- 
-     private func footer() -> UIView? {
--        return superview?.subviews.first(where:{($0 as? CellContainer)?.index == -1})
-+        // On Fabric, AutoLayoutView is wrapped with AutoLayoutViewComponentView, so we need to go up one more level
-+        #if RCT_NEW_ARCH_ENABLED
-+        let parentSubviews = superview?.superview?.subviews
-+        #else
-+        let parentSubviews = superview?.subviews
-+        #endif
-+        
-+        return parentSubviews?.first(where:{($0 as? CellContainerComponentView)?.index == -1})
-     }
- }
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.h b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.h
-new file mode 100644
-index 0000000..1ae0b66
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.h
-@@ -0,0 +1,16 @@
-+#ifndef AutoLayoutViewComponentView_h
-+#define AutoLayoutViewComponentView_h
-+
-+#ifdef RCT_NEW_ARCH_ENABLED
-+
-+#import <UIKit/UIKit.h>
-+#import <React/RCTViewComponentView.h>
-+
-+@interface AutoLayoutViewComponentView : RCTViewComponentView
-+
-+@end
-+
-+
-+#endif /* RCT_NEW_ARCH_ENABLED */
-+
-+#endif /* AutoLayoutViewComponentView_h */
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.mm b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.mm
-new file mode 100644
-index 0000000..2d4295c
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.mm
-@@ -0,0 +1,80 @@
-+#ifdef RCT_NEW_ARCH_ENABLED
-+#import "AutoLayoutViewComponentView.h"
-+#import <React/RCTConversions.h>
-+#import <React/RCTViewManager.h>
-+
-+#import <react/renderer/components/rnflashlist/ComponentDescriptors.h>
-+#import <react/renderer/components/rnflashlist/EventEmitters.h>
-+#import <react/renderer/components/rnflashlist/Props.h>
-+#import <react/renderer/components/rnflashlist/RCTComponentViewHelpers.h>
-+
-+#import "RCTFabricComponentsPlugins.h"
-+#import <RNFlashList-Swift.h>
-+
-+using namespace facebook::react;
-+
-+@interface AutoLayoutViewComponentView () <RCTAutoLayoutViewViewProtocol>
-+@end
-+
-+@implementation AutoLayoutViewComponentView
-+{
-+    AutoLayoutView *_autoLayoutView;
-+}
-+
-+- (instancetype)initWithFrame:(CGRect)frame
-+{
-+  if (self = [super initWithFrame:frame]) {
-+    static const auto defaultProps = std::make_shared<const AutoLayoutViewProps>();
-+    _props = defaultProps;
-+    _autoLayoutView = [[AutoLayoutView alloc] initWithFrame:self.bounds];
-+
-+    // Due to view flattening, AutoLayoutView's children get moved to its parent (AutoLayoutViewComponentView) and
-+    // AutoLayoutView is positioned above them consuming all events. Turning off userInteraction prevents that.
-+    _autoLayoutView.userInteractionEnabled = false;
-+
-+    self.contentView = _autoLayoutView;
-+
-+    __weak AutoLayoutViewComponentView* weakSelf = self;
-+    _autoLayoutView.onBlankAreaEventHandler = ^(CGFloat start, CGFloat end) {
-+      AutoLayoutViewComponentView *strongSelf = weakSelf;
-+      if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-+        std::dynamic_pointer_cast<const facebook::react::AutoLayoutViewEventEmitter>(strongSelf->_eventEmitter)
-+          ->onBlankAreaEvent(facebook::react::AutoLayoutViewEventEmitter::OnBlankAreaEvent{
-+            .offsetStart = (int) floor(start),
-+            .offsetEnd = (int) floor(end),
-+        });
-+      }
-+    };
-+  }
-+
-+  return self;
-+}
-+
-+#pragma mark - RCTComponentViewProtocol
-+
-++ (ComponentDescriptorProvider)componentDescriptorProvider
-+{
-+  return concreteComponentDescriptorProvider<AutoLayoutViewComponentDescriptor>();
-+}
-+
-+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
-+{
-+    const auto &newProps = *std::static_pointer_cast<const AutoLayoutViewProps>(props);
-+
-+    [_autoLayoutView setHorizontal:newProps.horizontal];
-+    [_autoLayoutView setScrollOffset:newProps.scrollOffset];
-+    [_autoLayoutView setWindowSize:newProps.windowSize];
-+    [_autoLayoutView setRenderAheadOffset:newProps.renderAheadOffset];
-+    [_autoLayoutView setEnableInstrumentation:newProps.enableInstrumentation];
-+    [_autoLayoutView setDisableAutoLayout:newProps.disableAutoLayout];
-+
-+    [super updateProps:props oldProps:oldProps];
-+}
-+@end
-+
-+Class<RCTComponentViewProtocol> AutoLayoutViewCls(void)
-+{
-+  return AutoLayoutViewComponentView.class;
-+}
-+
-+#endif /* RCT_NEW_ARCH_ENABLED */
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.m b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.mm
-similarity index 100%
-rename from node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.m
-rename to node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.mm
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainer.swift b/node_modules/@shopify/flash-list/ios/Sources/CellContainer.swift
-deleted file mode 100644
-index 7f09ce7..0000000
---- a/node_modules/@shopify/flash-list/ios/Sources/CellContainer.swift
-+++ /dev/null
-@@ -1,9 +0,0 @@
--import Foundation
--
--@objc class CellContainer: UIView {
--    var index: Int = -1
--    
--    @objc func setIndex(_ index: Int) {
--        self.index = index
--    }
--}
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.h b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.h
-new file mode 100644
-index 0000000..ca1cbfe
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.h
-@@ -0,0 +1,18 @@
-+#ifndef CellContainer_h
-+#define CellContainer_h
-+
-+#import <UIKit/UIKit.h>
-+
-+#ifdef RCT_NEW_ARCH_ENABLED
-+#import <React/RCTViewComponentView.h>
-+
-+@interface CellContainerComponentView : RCTViewComponentView
-+#else
-+@interface CellContainerComponentView : UIView
-+#endif
-+
-+@property int64_t index;
-+
-+@end
-+
-+#endif /* CellContainer_h */
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.mm b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.mm
-new file mode 100644
-index 0000000..3a1c57e
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.mm
-@@ -0,0 +1,57 @@
-+#import "CellContainerComponentView.h"
-+
-+#ifdef RCT_NEW_ARCH_ENABLED
-+#import <React/RCTConversions.h>
-+
-+#import <react/renderer/components/rnflashlist/ComponentDescriptors.h>
-+#import <react/renderer/components/rnflashlist/EventEmitters.h>
-+#import <react/renderer/components/rnflashlist/Props.h>
-+#import <react/renderer/components/rnflashlist/RCTComponentViewHelpers.h>
-+
-+#import "RCTFabricComponentsPlugins.h"
-+#import <RNFlashList-Swift.h>
-+
-+using namespace facebook::react;
-+
-+@interface CellContainerComponentView () <RCTCellContainerViewProtocol>
-+@end
-+
-+@implementation CellContainerComponentView
-+
-+- (instancetype)initWithFrame:(CGRect)frame
-+{
-+    if (self = [super initWithFrame:frame]) {
-+        static const auto defaultProps = std::make_shared<const CellContainerProps>();
-+        _props = defaultProps;
-+
-+        self.userInteractionEnabled = true;
-+    }
-+
-+    return self;
-+}
-+
-+#pragma mark - RCTComponentViewProtocol
-+
-++ (ComponentDescriptorProvider)componentDescriptorProvider
-+{
-+    return concreteComponentDescriptorProvider<CellContainerComponentDescriptor>();
-+}
-+
-+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
-+{
-+    const auto &newProps = *std::static_pointer_cast<const CellContainerProps>(props);
-+
-+    self.index = newProps.index;
-+
-+    [super updateProps:props oldProps:oldProps];
-+}
-+@end
-+
-+Class<RCTComponentViewProtocol> CellContainerCls(void)
-+{
-+    return CellContainerComponentView.class;
-+}
-+#else
-+@implementation CellContainerComponentView
-+@end
-+#endif /* RCT_NEW_ARCH_ENABLED */
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.m b/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.mm
-similarity index 100%
-rename from node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.m
-rename to node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.mm
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift b/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift
-index a36fccd..dbe6c14 100644
---- a/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift
-+++ b/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift
-@@ -3,7 +3,7 @@ import Foundation
- @objc(CellContainerManager)
- class CellContainerManager: RCTViewManager {  
-     override func view() -> UIView! {
--        return CellContainer()
-+        return CellContainerComponentView()
-     }
-     
-     override static func requiresMainQueueSetup() -> Bool {
-diff --git a/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h b/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h
-index e3e23d5..7ed83ce 100644
---- a/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h
-+++ b/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h
-@@ -4,5 +4,8 @@
- #import <React/RCTBridgeModule.h>
- #import <React/RCTEventEmitter.h>
- #import <React/RCTViewManager.h>
-+#import <React/RCTComponent.h>
-+
-+#import "CellContainerComponentView.h"
- 
- #endif /* FlatListPro_Bridging_Header_h */
-diff --git a/node_modules/@shopify/flash-list/package.json b/node_modules/@shopify/flash-list/package.json
-index b90c287..ccca16d 100644
---- a/node_modules/@shopify/flash-list/package.json
-+++ b/node_modules/@shopify/flash-list/package.json
-@@ -25,6 +25,7 @@
-   "author": "shopify",
-   "license": "MIT",
-   "homepage": "https://shopify.github.io/flash-list/",
-+  "react-native": "src/index.ts",
-   "main": "dist/index.js",
-   "types": "dist/index.d.ts",
-   "scripts": {
-@@ -64,7 +65,7 @@
-     "@react-native-community/eslint-config": "^3.0.3",
-     "@shopify/eslint-plugin": "^41.3.1",
-     "@types/jest": "^28.1.3",
--    "@types/react-native": "0.72.2",
-+    "@types/react-native": "^0.72.2",
-     "babel-jest": "^28.1.1",
-     "enhanced-resolve": "^5.9.3",
-     "eslint": "8.18.0",
-@@ -74,7 +75,7 @@
-     "prettier": "^2.7.1",
-     "react": "17.0.2",
-     "react-native": "0.68.5",
--    "typescript": "^4.7.4"
-+    "typescript": "4.8.4"
-   },
-   "files": [
-     "android",
-@@ -87,5 +88,10 @@
-   "dependencies": {
-     "recyclerlistview": "4.2.0",
-     "tslib": "2.4.0"
-+  },
-+  "codegenConfig": {
-+    "name": "rnflashlist",
-+    "type": "components",
-+    "jsSrcsDir": "./src/fabric"
-   }
- }
-diff --git a/node_modules/@shopify/flash-list/src/FlashList.tsx b/node_modules/@shopify/flash-list/src/FlashList.tsx
-index 64748fe..87dea16 100644
---- a/node_modules/@shopify/flash-list/src/FlashList.tsx
-+++ b/node_modules/@shopify/flash-list/src/FlashList.tsx
-@@ -827,6 +827,12 @@ class FlashList<T> extends React.PureComponent<
-     return this.rlvRef?.getScrollableNode?.() || null;
-   }
- 
-+  public getNativeScrollRef(): number | null {
-+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-+    // @ts-ignore
-+    return this.rlvRef?.getNativeScrollRef?.() || null;
-+  }
-+
-   /**
-    * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
-    * Warning: We may swap recyclerlistview for something else in the future. Use with caution.
-diff --git a/node_modules/@shopify/flash-list/src/fabric/AutoLayoutNativeComponent.ts b/node_modules/@shopify/flash-list/src/fabric/AutoLayoutNativeComponent.ts
-new file mode 100644
-index 0000000..93750de
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/src/fabric/AutoLayoutNativeComponent.ts
-@@ -0,0 +1,24 @@
-+import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
-+import type { ViewProps } from "react-native";
-+import type {
-+  Int32,
-+  Double,
-+  DirectEventHandler,
-+} from "react-native/Libraries/Types/CodegenTypes";
-+
-+type BlankAreaEvent = Readonly<{
-+  offsetStart: Int32;
-+  offsetEnd: Int32;
-+}>;
-+
-+interface NativeProps extends ViewProps {
-+  horizontal?: boolean;
-+  scrollOffset?: Double;
-+  windowSize?: Double;
-+  renderAheadOffset?: Double;
-+  enableInstrumentation?: boolean;
-+  disableAutoLayout?: boolean;
-+  onBlankAreaEvent?: DirectEventHandler<BlankAreaEvent>;
-+}
-+
-+export default codegenNativeComponent<NativeProps>("AutoLayoutView");
-diff --git a/node_modules/@shopify/flash-list/src/fabric/CellContainerNativeComponent.ts b/node_modules/@shopify/flash-list/src/fabric/CellContainerNativeComponent.ts
-new file mode 100644
-index 0000000..dd284ac
---- /dev/null
-+++ b/node_modules/@shopify/flash-list/src/fabric/CellContainerNativeComponent.ts
-@@ -0,0 +1,9 @@
-+import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
-+import type { Int32 } from "react-native/Libraries/Types/CodegenTypes";
-+import type { ViewProps } from "react-native";
-+
-+interface NativeProps extends ViewProps {
-+  index?: Int32;
-+}
-+
-+export default codegenNativeComponent<NativeProps>("CellContainer");
diff --git a/react-native.config.js b/react-native.config.js
index 6d6dd3f5805f..7dc0482f74bb 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -1,7 +1,10 @@
 module.exports = {
     project: {
-        ios: {sourceDir: 'ios'},
-        android: {},
+        ios: {sourceDir: 'ios',
+        unstable_reactLegacyComponentNames: [ "AutoLayoutView", "CellContainer" ]},
+        android: {
+            unstable_reactLegacyComponentNames: [ "AutoLayoutView", "CellContainer" ]
+        },
     },
     assets: ['./assets/fonts/native'],
 };

From 1bb5258d96d0507cc33d003fc7ad94ab099e4dfb Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Fri, 12 Apr 2024 22:41:28 +0200
Subject: [PATCH 202/383] fix: prettier

---
 react-native.config.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/react-native.config.js b/react-native.config.js
index 7dc0482f74bb..b941493529e7 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -1,9 +1,8 @@
 module.exports = {
     project: {
-        ios: {sourceDir: 'ios',
-        unstable_reactLegacyComponentNames: [ "AutoLayoutView", "CellContainer" ]},
+        ios: {sourceDir: 'ios', unstable_reactLegacyComponentNames: ['AutoLayoutView', 'CellContainer']},
         android: {
-            unstable_reactLegacyComponentNames: [ "AutoLayoutView", "CellContainer" ]
+            unstable_reactLegacyComponentNames: ['AutoLayoutView', 'CellContainer'],
         },
     },
     assets: ['./assets/fonts/native'],

From 326900e845c2fca191fbba44593d31528ec2954e Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 02:47:23 +0530
Subject: [PATCH 203/383] handles distance requests

---
 ...raryForRefactorRequestConfirmationList.tsx | 45 +++--------
 .../CategorizeTrackedExpenseParams.ts         | 13 ++-
 .../ConvertTrackedExpenseToRequestParams.ts   |  5 ++
 .../parameters/ShareTrackedExpenseParams.ts   | 13 ++-
 src/libs/ReportUtils.ts                       |  4 +-
 src/libs/actions/IOU.ts                       | 81 ++++++++++++++++---
 .../step/IOURequestStepConfirmation.tsx       |  3 +-
 7 files changed, 117 insertions(+), 47 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
index db5a2867f600..a568fbce7679 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
@@ -252,9 +252,9 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
 
     // A flag for showing the billable field
     const shouldShowBillable = policy?.disabledFields?.defaultBillable === false;
-
+    const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
     const hasRoute = TransactionUtils.hasRoute(transaction);
-    const isDistanceRequestWithPendingRoute = isDistanceRequest && (!hasRoute || !rate);
+    const isDistanceRequestWithPendingRoute = isDistanceRequest && (!hasRoute || !rate) && !isMovingTransactionFromTrackExpense;
     const formattedAmount = isDistanceRequestWithPendingRoute
         ? ''
         : CurrencyUtils.convertToDisplayString(
@@ -456,7 +456,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
     }, [selectedParticipants, hasMultipleParticipants, personalDetailsOfPayee]);
 
     useEffect(() => {
-        if (!isDistanceRequest) {
+        if (!isDistanceRequest || isMovingTransactionFromTrackExpense) {
             return;
         }
 
@@ -469,7 +469,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
 
         const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(hasRoute, distance, unit, rate ?? 0, currency ?? 'USD', translate, toLocaleDigit);
         IOU.setMoneyRequestMerchant(transaction?.transactionID ?? '', distanceMerchant, true);
-    }, [isDistanceRequestWithPendingRoute, hasRoute, distance, unit, rate, currency, translate, toLocaleDigit, isDistanceRequest, transaction]);
+    }, [isDistanceRequestWithPendingRoute, hasRoute, distance, unit, rate, currency, translate, toLocaleDigit, isDistanceRequest, transaction, action, isMovingTransactionFromTrackExpense]);
 
     // Auto select the category if there is only one enabled category and it is required
     useEffect(() => {
@@ -699,7 +699,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
             item: (
                 <MenuItemWithTopDescription
                     key={translate('common.distance')}
-                    shouldShowRightIcon={!isReadOnly}
+                    shouldShowRightIcon={!isReadOnly && !isMovingTransactionFromTrackExpense}
                     title={isMerchantEmpty ? '' : iouMerchant}
                     description={translate('common.distance')}
                     style={[styles.moneyRequestMenuItem]}
@@ -711,7 +711,8 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     }
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     disabled={didConfirm}
-                    interactive={!isReadOnly}
+                    // todo: handle edit for transaction while moving from track expense
+                    interactive={!isReadOnly && !isMovingTransactionFromTrackExpense}
                 />
             ),
             shouldShow: isDistanceRequest,
@@ -798,14 +799,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                         numberOfLinesTitle={2}
                         onPress={() =>
                             Navigation.navigate(
-                                ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(
-                                    CONST.IOU.ACTION.CREATE,
-                                    iouType,
-                                    index,
-                                    transaction?.transactionID ?? '',
-                                    reportID,
-                                    Navigation.getActiveRouteWithoutParams(),
-                                ),
+                                ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(action, iouType, index, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                             )
                         }
                         style={[styles.moneyRequestMenuItem]}
@@ -829,13 +823,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() =>
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(
-                                CONST.IOU.ACTION.CREATE,
-                                iouType,
-                                transaction?.transactionID ?? '',
-                                reportID,
-                                Navigation.getActiveRouteWithoutParams(),
-                            ),
+                            ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         )
                     }
                     disabled={didConfirm}
@@ -856,13 +844,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     titleStyle={styles.flex1}
                     onPress={() =>
                         Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(
-                                CONST.IOU.ACTION.CREATE,
-                                iouType,
-                                transaction?.transactionID ?? '',
-                                reportID,
-                                Navigation.getActiveRouteWithoutParams(),
-                            ),
+                            ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
                         )
                     }
                     disabled={didConfirm}
@@ -957,9 +939,9 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     <ConfirmedRoute transaction={transaction ?? ({} as OnyxTypes.Transaction)} />
                 </View>
             )}
-            {
+            {(!isMovingTransactionFromTrackExpense || !hasRoute) &&
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                receiptImage || receiptThumbnail
+                (receiptImage || receiptThumbnail
                     ? receiptThumbnailContent
                     : // The empty receipt component should only show for IOU Requests of a paid policy ("Team" or "Corporate")
                       PolicyUtils.isPaidGroupPolicy(policy) &&
@@ -978,8 +960,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                                   )
                               }
                           />
-                      )
-            }
+                      ))}
             {primaryFields}
             {!shouldShowAllFields && (
                 <View style={[styles.flexRow, styles.justifyContentBetween, styles.mh3, styles.alignItemsCenter, styles.mb2, styles.mt1]}>
diff --git a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
index ce5b6894fe97..38ee5272f1e7 100644
--- a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
@@ -1,12 +1,21 @@
 type CategorizeTrackedExpenseParams = {
+    amount: number;
+    currency: string;
+    comment: string;
+    created: string;
+    merchant: string;
     policyID: string;
     transactionID: string;
     moneyRequestPreviewReportActionID: string;
     moneyRequestReportID: string;
     moneyRequestCreatedReportActionID: string;
     actionableWhisperReportActionID: string;
-    // making it optional for now
-    modifiedExpenseReportActionID?: string;
+    modifiedExpenseReportActionID: string;
+    category?: string;
+    tag?: string;
+    taxCode: string;
+    taxAmount: number;
+    billable?: boolean;
 };
 
 export default CategorizeTrackedExpenseParams;
diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
index 68a0b07cb25a..ddfae4f1f701 100644
--- a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -1,4 +1,9 @@
 type ConvertTrackedExpenseToRequestParams = {
+    amount: number,
+    currency: string,
+    created: string,
+    comment?: string,
+    merchant?: string,
     payerAccountID: number;
     chatReportID: string;
     transactionID: string;
diff --git a/src/libs/API/parameters/ShareTrackedExpenseParams.ts b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
index b007206a4e73..33288e676cda 100644
--- a/src/libs/API/parameters/ShareTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
@@ -1,12 +1,21 @@
 type ShareTrackedExpenseParams = {
+    amount: number;
+    currency: string;
+    comment: string;
+    created: string;
+    merchant: string;
     policyID: string;
     transactionID: string;
     moneyRequestPreviewReportActionID: string;
     moneyRequestReportID: string;
     moneyRequestCreatedReportActionID: string;
     actionableWhisperReportActionID: string;
-    // making it optional for now
-    modifiedExpenseReportActionID?: string;
+    modifiedExpenseReportActionID: string;
+    category?: string;
+    tag?: string;
+    taxCode: string;
+    taxAmount: number;
+    billable?: boolean;
 };
 
 export default ShareTrackedExpenseParams;
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 8e2766c52b4f..87572e293bfa 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4339,6 +4339,8 @@ function buildOptimisticMoneyRequestEntities(
     const iouActionCreationTime = DateUtils.getDBTime();
     const createdActionForIOUReport = buildOptimisticCreatedReportAction(payeeEmail, DateUtils.subtractMillisecondsFromDateTime(iouActionCreationTime, 1));
 
+    console.log(type)
+
     const iouAction = buildOptimisticIOUReportAction(
         type,
         amount,
@@ -5845,7 +5847,7 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
 
     const transactionAmount = Math.abs(transaction.amount);
     const transactionCreated = format(new Date(transaction.created), CONST.DATE.FNS_FORMAT_STRING);
-
+    console.log('transaction', transaction);
     IOU.createDraftTransaction({
         ...transaction,
         actionableWhisperReportActionID: reportActionID,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 9407be0676bb..384583293a3c 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2547,10 +2547,6 @@ const getConvertTrackedExpenseInformation = (
 
 function convertTrackedExpenseToRequest(
     payerAccountID: number,
-    amount: number,
-    currency: string,
-    comment: string,
-    created: string,
     chatReportID: string,
     transactionID: string,
     actionableWhisperReportActionID: string,
@@ -2562,6 +2558,11 @@ function convertTrackedExpenseToRequest(
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
     onyxData: OnyxData,
+    amount: number,
+    currency: string,
+    created: string,
+    comment: string,
+    merchant: string,
 ) {
     const {optimisticData, successData, failureData} = onyxData;
 
@@ -2588,6 +2589,7 @@ function convertTrackedExpenseToRequest(
         currency,
         comment,
         created,
+        merchant,
         payerAccountID,
         chatReportID,
         transactionID,
@@ -2613,6 +2615,16 @@ function categorizeTrackedExpense(
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
     onyxData: OnyxData,
+    amount: number,
+    currency: string,
+    comment: string,
+    merchant: string,
+    created: string,
+    category?: string,
+    tag?: string,
+    taxCode = '',
+    taxAmount = 0,
+    billable?: boolean,
 ) {
     const {optimisticData, successData, failureData} = onyxData;
 
@@ -2642,6 +2654,16 @@ function categorizeTrackedExpense(
         moneyRequestCreatedReportActionID,
         actionableWhisperReportActionID,
         modifiedExpenseReportActionID,
+        amount,
+        currency,
+        comment,
+        merchant,
+        category,
+        tag,
+        taxCode,
+        taxAmount,
+        billable,
+        created,
     };
 
     API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, {optimisticData, successData, failureData});
@@ -2658,6 +2680,16 @@ function shareTrackedExpense(
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
     onyxData: OnyxData,
+    amount: number,
+    currency: string,
+    comment: string,
+    merchant: string,
+    created: string,
+    category?: string,
+    tag?: string,
+    taxCode = '',
+    taxAmount = 0,
+    billable?: boolean,
 ) {
     const {optimisticData, successData, failureData} = onyxData;
 
@@ -2687,6 +2719,16 @@ function shareTrackedExpense(
         moneyRequestCreatedReportActionID,
         actionableWhisperReportActionID,
         modifiedExpenseReportActionID,
+        amount,
+        currency,
+        comment,
+        merchant,
+        created,
+        category,
+        tag,
+        taxCode,
+        taxAmount,
+        billable,
     };
 
     API.write(WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION, parameters, {optimisticData, successData, failureData});
@@ -2744,7 +2786,7 @@ function requestMoney(
         isMovingTransactionFromTrackExpense ? {} : currentChatReport,
         participant,
         comment,
-        isMovingTransactionFromTrackExpense ? Math.abs(amount) : amount,
+        amount,
         currency,
         currentCreated,
         merchant,
@@ -2771,10 +2813,6 @@ function requestMoney(
 
             convertTrackedExpenseToRequest(
                 payerAccountID,
-                amount,
-                currency,
-                comment,
-                currentCreated,
                 chatReport.reportID,
                 transaction.transactionID,
                 actionableWhisperReportActionID,
@@ -2786,6 +2824,11 @@ function requestMoney(
                 linkedTrackedExpenseReportID,
                 transactionThreadReportID,
                 onyxData,
+                amount,
+                currency,
+                comment,
+                merchant,
+                currentCreated,
             );
             break;
         }
@@ -2804,6 +2847,16 @@ function requestMoney(
                 linkedTrackedExpenseReportID,
                 transactionThreadReportID,
                 onyxData,
+                amount,
+                currency,
+                comment,
+                merchant,
+                currentCreated,
+                category,
+                tag,
+                taxCode,
+                taxAmount,
+                billable,
             );
             break;
         }
@@ -2822,6 +2875,16 @@ function requestMoney(
                 linkedTrackedExpenseReportID,
                 transactionThreadReportID,
                 onyxData,
+                amount,
+                currency,
+                comment,
+                merchant,
+                currentCreated,
+                category,
+                tag,
+                taxCode,
+                taxAmount,
+                billable,
             );
             break;
         }
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 9473d42f81ed..5b656df1707e 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -414,7 +414,7 @@ function IOURequestStepConfirmation({
                 return;
             }
 
-            if (requestType === CONST.IOU.REQUEST_TYPE.DISTANCE) {
+            if (requestType === CONST.IOU.REQUEST_TYPE.DISTANCE && !IOUUtils.isMovingTransactionFromTrackExpense(action)) {
                 createDistanceRequest(selectedParticipants, trimmedComment);
                 return;
             }
@@ -432,6 +432,7 @@ function IOURequestStepConfirmation({
             report?.reportID,
             trackExpense,
             createDistanceRequest,
+            action,
         ],
     );
 

From 3c8867053d98460d5b3ecc76cabb45d69eb74bde Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 03:01:16 +0530
Subject: [PATCH 204/383] fixes add receipt flow

---
 .../parameters/ConvertTrackedExpenseToRequestParams.ts | 10 +++++-----
 .../iou/request/step/IOURequestStepConfirmation.tsx    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
index ddfae4f1f701..78f4be199a76 100644
--- a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -1,9 +1,9 @@
 type ConvertTrackedExpenseToRequestParams = {
-    amount: number,
-    currency: string,
-    created: string,
-    comment?: string,
-    merchant?: string,
+    amount: number;
+    currency: string;
+    created: string;
+    comment?: string;
+    merchant?: string;
     payerAccountID: number;
     chatReportID: string;
     transactionID: string;
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 5b656df1707e..465bda5eb3e9 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -533,7 +533,7 @@ function IOURequestStepConfirmation({
                             iouMerchant={transaction?.merchant}
                             iouCreated={transaction?.created}
                             isDistanceRequest={requestType === CONST.IOU.REQUEST_TYPE.DISTANCE}
-                            shouldShowSmartScanFields={requestType !== CONST.IOU.REQUEST_TYPE.SCAN}
+                            shouldShowSmartScanFields={IOUUtils.isMovingTransactionFromTrackExpense(action) ? transaction?.amount !== 0 : requestType !== CONST.IOU.REQUEST_TYPE.SCAN}
                             action={action}
                         />
                     </View>

From 74fb2596e6aacc64856f66d23374c101972f5850 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 03:01:49 +0530
Subject: [PATCH 205/383] run prettier

---
 src/libs/ReportUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 87572e293bfa..d34c365daacd 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4339,7 +4339,7 @@ function buildOptimisticMoneyRequestEntities(
     const iouActionCreationTime = DateUtils.getDBTime();
     const createdActionForIOUReport = buildOptimisticCreatedReportAction(payeeEmail, DateUtils.subtractMillisecondsFromDateTime(iouActionCreationTime, 1));
 
-    console.log(type)
+    console.log(type);
 
     const iouAction = buildOptimisticIOUReportAction(
         type,

From 611c3e2fc2a0db61b415de9b7b0fbd489cf9cb69 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Fri, 12 Apr 2024 23:36:35 +0200
Subject: [PATCH 206/383] fixing small bug for taglistName

---
 config/webpack/webpack.dev.ts                      | 4 ++--
 src/pages/workspace/tags/WorkspaceEditTagsPage.tsx | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/webpack/webpack.dev.ts b/config/webpack/webpack.dev.ts
index 8f32a2d95c99..e4b5aabf4ca6 100644
--- a/config/webpack/webpack.dev.ts
+++ b/config/webpack/webpack.dev.ts
@@ -49,9 +49,9 @@ const getConfiguration = (environment: Environment): Promise<Configuration> =>
                 ...proxySettings,
                 historyApiFallback: true,
                 port,
-                host: 'dev.new.expensify.com',
+                host: 'localhost',
                 server: {
-                    type: 'https',
+                    type: 'http',
                     options: {
                         key: path.join(__dirname, 'key.pem'),
                         cert: path.join(__dirname, 'certificate.pem'),
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index bb7f2e3eba91..b87f225d40f4 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -48,7 +48,9 @@ function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps)
 
     const updateTaglistName = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM>) => {
-            Policy.renamePolicyTaglist(route.params.policyID, {oldName: taglistName, newName: values[INPUT_IDS.POLICY_TAGS_NAME]}, policyTags);
+            if (values[INPUT_IDS.POLICY_TAGS_NAME]  !== taglistName) {
+                Policy.renamePolicyTaglist(route.params.policyID, {oldName: taglistName, newName: values[INPUT_IDS.POLICY_TAGS_NAME]}, policyTags);
+            }
             Navigation.goBack();
         },
         [policyTags, route.params.policyID, taglistName],

From f9b310d6fcefab2457941c75a0bf38e3f3a6d794 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 03:33:55 +0530
Subject: [PATCH 207/383] fixes distance receipt not showing on request

---
 .../iou/request/step/IOURequestStepConfirmation.tsx      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 465bda5eb3e9..98170daed6f7 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -170,7 +170,11 @@ function IOURequestStepConfirmation({
     // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
     // skip this in case user is moving the transaction as the receipt path will be valid in that case
     useEffect(() => {
-        if (IOUUtils.isMovingTransactionFromTrackExpense(action)) {
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        const isLocalFile = typeof receiptPath === 'number' || receiptPath?.startsWith('blob:') || receiptPath?.startsWith('file:') || receiptPath?.startsWith('/');
+
+        if (!isLocalFile) {
+            setReceiptFile(transaction?.receipt);
             return;
         }
 
@@ -181,7 +185,7 @@ function IOURequestStepConfirmation({
         };
 
         IOU.navigateToStartStepIfScanFileCannotBeRead(receiptFilename, receiptPath, onSuccess, requestType, iouType, transactionID, reportID, receiptType);
-    }, [receiptType, receiptPath, receiptFilename, requestType, iouType, transactionID, reportID, action]);
+    }, [receiptType, receiptPath, receiptFilename, requestType, iouType, transactionID, reportID, action, transaction?.receipt]);
 
     const requestMoney = useCallback(
         (selectedParticipants: Participant[], trimmedComment: string, receiptObj?: Receipt, gpsPoints?: IOU.GpsPoint) => {
@@ -274,6 +278,7 @@ function IOURequestStepConfirmation({
         [policy, policyCategories, policyTags, report, transaction],
     );
 
+
     const createTransaction = useCallback(
         (selectedParticipants: Participant[]) => {
             const trimmedComment = (transaction?.comment.comment ?? '').trim();

From 969d6e63601fd76913ac6547a070e3e2a5edcc9f Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 03:35:32 +0530
Subject: [PATCH 208/383] prettier

---
 src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 98170daed6f7..ca53218c9dcc 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -278,7 +278,6 @@ function IOURequestStepConfirmation({
         [policy, policyCategories, policyTags, report, transaction],
     );
 
-
     const createTransaction = useCallback(
         (selectedParticipants: Participant[]) => {
             const trimmedComment = (transaction?.comment.comment ?? '').trim();

From 8582e00e66d7a9b0ff6970288c2a6bbe64033203 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Sat, 13 Apr 2024 00:06:08 +0200
Subject: [PATCH 209/383] lint ...

---
 src/pages/workspace/tags/WorkspaceEditTagsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index b87f225d40f4..ffee71bd5011 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -48,7 +48,7 @@ function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps)
 
     const updateTaglistName = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM>) => {
-            if (values[INPUT_IDS.POLICY_TAGS_NAME]  !== taglistName) {
+            if (values[INPUT_IDS.POLICY_TAGS_NAME] !== taglistName) {
                 Policy.renamePolicyTaglist(route.params.policyID, {oldName: taglistName, newName: values[INPUT_IDS.POLICY_TAGS_NAME]}, policyTags);
             }
             Navigation.goBack();

From a4541dded14d996b99f6475bc283d7002d2b8de9 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 03:43:29 +0530
Subject: [PATCH 210/383] fixes translation

---
 src/languages/en.ts                                       | 1 +
 src/languages/es.ts                                       | 1 +
 src/libs/ReportUtils.ts                                   | 4 +---
 src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 3 +++
 src/pages/iou/request/step/IOURequestStepParticipants.tsx | 3 +++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index cf6bd8359382..21acf5c470ae 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -621,6 +621,7 @@ export default {
         splitBill: 'Split bill',
         request: 'Request',
         categorize: 'Categorize',
+        share: 'Share',
         participants: 'Participants',
         requestMoney: 'Request money',
         sendMoney: 'Send money',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index fd52d894dfef..f1570aac0704 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -617,6 +617,7 @@ export default {
         splitBill: 'Dividir factura',
         request: 'Solicitar',
         categorize: 'Categorizar',
+        share: 'Compartir',
         participants: 'Participantes',
         requestMoney: 'Pedir dinero',
         sendMoney: 'Enviar dinero',
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index d34c365daacd..8e2766c52b4f 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4339,8 +4339,6 @@ function buildOptimisticMoneyRequestEntities(
     const iouActionCreationTime = DateUtils.getDBTime();
     const createdActionForIOUReport = buildOptimisticCreatedReportAction(payeeEmail, DateUtils.subtractMillisecondsFromDateTime(iouActionCreationTime, 1));
 
-    console.log(type);
-
     const iouAction = buildOptimisticIOUReportAction(
         type,
         amount,
@@ -5847,7 +5845,7 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
 
     const transactionAmount = Math.abs(transaction.amount);
     const transactionCreated = format(new Date(transaction.created), CONST.DATE.FNS_FORMAT_STRING);
-    console.log('transaction', transaction);
+
     IOU.createDraftTransaction({
         ...transaction,
         actionableWhisperReportActionID: reportActionID,
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index ca53218c9dcc..8f137012c64c 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -86,6 +86,9 @@ function IOURequestStepConfirmation({
         if (action === CONST.IOU.ACTION.MOVE) {
             return translate('iou.request');
         }
+        if (action === CONST.IOU.ACTION.SHARE) {
+            return translate('iou.share');
+        }
         if (iouType === CONST.IOU.TYPE.SPLIT) {
             return translate('iou.split');
         }
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
index bb0ab48f1b4e..c8ded28a7cf4 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -53,6 +53,9 @@ function IOURequestStepParticipants({
         if (action === CONST.IOU.ACTION.MOVE) {
             return translate('iou.request');
         }
+        if (action === CONST.IOU.ACTION.SHARE) {
+            return translate('iou.share');
+        }
         if (isSplitRequest) {
             return translate('iou.split');
         }

From 5fcac893f23fc02f5e1e717a4a3bb75cccde7467 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Sat, 13 Apr 2024 00:54:39 +0200
Subject: [PATCH 211/383] config/webpack/webpack.dev.ts

---
 config/webpack/webpack.dev.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/webpack/webpack.dev.ts b/config/webpack/webpack.dev.ts
index e4b5aabf4ca6..8f32a2d95c99 100644
--- a/config/webpack/webpack.dev.ts
+++ b/config/webpack/webpack.dev.ts
@@ -49,9 +49,9 @@ const getConfiguration = (environment: Environment): Promise<Configuration> =>
                 ...proxySettings,
                 historyApiFallback: true,
                 port,
-                host: 'localhost',
+                host: 'dev.new.expensify.com',
                 server: {
-                    type: 'http',
+                    type: 'https',
                     options: {
                         key: path.join(__dirname, 'key.pem'),
                         cert: path.join(__dirname, 'certificate.pem'),

From 43cf827f1fb4e8ac4d24cf9c3b414b1daeb22a12 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 04:27:38 +0530
Subject: [PATCH 212/383] fixes param order in convertTrackedExpenseToRequest

---
 src/libs/actions/IOU.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 384583293a3c..32c4716f7c64 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2560,9 +2560,9 @@ function convertTrackedExpenseToRequest(
     onyxData: OnyxData,
     amount: number,
     currency: string,
-    created: string,
     comment: string,
     merchant: string,
+    created: string,
 ) {
     const {optimisticData, successData, failureData} = onyxData;
 

From 8d082afac7702115368ed33604ce0a0619261f45 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Sat, 13 Apr 2024 01:02:55 +0200
Subject: [PATCH 213/383] Revert EditTagPage

---
 src/pages/workspace/tags/EditTagPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index ed55155a3dcf..fbde96eb2b91 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -96,7 +96,7 @@ function EditTagPage({route, policyTags}: EditTagPageProps) {
                             <InputWrapper
                                 InputComponent={TextInput}
                                 maxLength={CONST.TAG_NAME_LIMIT}
-                                defaultValue={PolicyUtils.getCleanedTagName(currentTagName)}
+                                defaultValue={currentTagName}
                                 label={translate('common.name')}
                                 accessibilityLabel={translate('common.name')}
                                 inputID={INPUT_IDS.TAG_NAME}

From a78536e37e9d23e31ac5e4d1483f25cc81bf0ff1 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 13 Apr 2024 06:09:07 +0530
Subject: [PATCH 214/383] fixes invite flow

---
 src/CONST.ts                                  |  5 +++++
 src/ROUTES.ts                                 |  4 ++--
 src/libs/Navigation/types.ts                  |  1 +
 src/libs/actions/IOU.ts                       |  2 +-
 src/pages/RoomInvitePage.tsx                  | 21 ++++++++++++++++---
 ...yForRefactorRequestParticipantsSelector.js |  1 -
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index b1cf45d6515f..45379d404438 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1454,6 +1454,11 @@ const CONST = {
         CANCEL_REASON: {
             PAYMENT_EXPIRED: 'CANCEL_REASON_PAYMENT_EXPIRED',
         },
+        SHARE: {
+            ROLE: {
+                ACCOUNTANT: 'accountant',
+            },
+        },
     },
 
     GROWL: {
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index fc2cec6d5256..2bd06acf70b7 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -284,8 +284,8 @@ const ROUTES = {
         getRoute: (reportID: string) => `r/${reportID}/members` as const,
     },
     ROOM_INVITE: {
-        route: 'r/:reportID/invite',
-        getRoute: (reportID: string) => `r/${reportID}/invite` as const,
+        route: 'r/:reportID/invite/:role',
+        getRoute: (reportID: string, role?: string) => `r/${reportID}/invite/${role}` as const,
     },
     MONEY_REQUEST_PARTICIPANTS: {
         route: ':iouType/new/participants/:reportID?',
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index e95bdd0d7d2f..df6d2054fc85 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -346,6 +346,7 @@ type RoomMembersNavigatorParamList = {
 type RoomInviteNavigatorParamList = {
     [SCREENS.ROOM_INVITE_ROOT]: {
         reportID: string;
+        role?: 'accountant';
     };
 };
 
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 32c4716f7c64..3e90ce8a78f5 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2924,7 +2924,7 @@ function requestMoney(
     }
 
     if (action === CONST.IOU.ACTION.SHARE) {
-        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? ''));
+        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? '', CONST.IOU.SHARE.ROLE.ACCOUNTANT));
     } else {
         Navigation.dismissModal(activeReportID);
     }
diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
index ab5bd10317be..f78866288768 100644
--- a/src/pages/RoomInvitePage.tsx
+++ b/src/pages/RoomInvitePage.tsx
@@ -1,3 +1,4 @@
+import type {StackScreenProps} from '@react-navigation/stack';
 import Str from 'expensify-common/lib/str';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import type {SectionListData} from 'react-native';
@@ -22,20 +23,29 @@ import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PhoneNumber from '@libs/PhoneNumber';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import type {RoomInviteNavigatorParamList} from '@navigation/types';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 import type {Policy} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {WithReportOrNotFoundProps} from './home/report/withReportOrNotFound';
 import withReportOrNotFound from './home/report/withReportOrNotFound';
 import SearchInputManager from './workspace/SearchInputManager';
 
-type RoomInvitePageProps = WithReportOrNotFoundProps & WithNavigationTransitionEndProps;
+type RoomInvitePageProps = WithReportOrNotFoundProps & WithNavigationTransitionEndProps & StackScreenProps<RoomInviteNavigatorParamList, typeof SCREENS.ROOM_INVITE_ROOT>;
 
 type Sections = Array<SectionListData<OptionsListUtils.MemberForList, Section<OptionsListUtils.MemberForList>>>;
 
-function RoomInvitePage({betas, report, policies}: RoomInvitePageProps) {
+function RoomInvitePage({
+    betas,
+    report,
+    policies,
+    route: {
+        params: {role},
+    },
+}: RoomInvitePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [searchTerm, setSearchTerm] = useState('');
@@ -147,7 +157,12 @@ function RoomInvitePage({betas, report, policies}: RoomInvitePageProps) {
     // Non policy members should not be able to view the participants of a room
     const reportID = report?.reportID;
     const isPolicyMember = useMemo(() => (report?.policyID ? PolicyUtils.isPolicyMember(report.policyID, policies as Record<string, Policy>) : false), [report?.policyID, policies]);
-    const backRoute = useMemo(() => reportID && (isPolicyMember ? ROUTES.ROOM_MEMBERS.getRoute(reportID) : ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID)), [isPolicyMember, reportID]);
+    const backRoute = useMemo(() => {
+        if (role === CONST.IOU.SHARE.ROLE.ACCOUNTANT) {
+            return ROUTES.REPORT_WITH_ID.getRoute(reportID);
+        }
+        return reportID && (isPolicyMember ? ROUTES.ROOM_MEMBERS.getRoute(reportID) : ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
+    }, [isPolicyMember, reportID, role]);
     const reportName = useMemo(() => ReportUtils.getReportName(report), [report]);
     const inviteUsers = useCallback(() => {
         if (!validate()) {
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 5e92a32a8700..ff7cd0205c89 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -379,7 +379,6 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({betas, participan
     );
 
     const isAllSectionsEmpty = _.every(sections, (section) => section.data.length === 0);
-
     if ([CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action) && isAllSectionsEmpty && didScreenTransitionEnd && searchTerm.trim() === '') {
         return renderEmptyWorkspaceView();
     }

From 54798edece1adce1e92d88c5fee92a978e30c269 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Sat, 13 Apr 2024 08:48:00 +0530
Subject: [PATCH 215/383] Fixed name in paySomeone

---
 src/libs/ReportUtils.ts                         | 17 +++++++++++++++++
 .../AttachmentPickerWithMenuItems.tsx           |  2 +-
 src/pages/iou/request/IOURequestStartPage.tsx   |  2 +-
 .../request/step/IOURequestStepConfirmation.tsx |  4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a65054552cf4..735522e49325 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2953,6 +2953,22 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
     return participantsWithoutCurrentUser.map((accountID) => getDisplayNameForParticipant(accountID, isMultipleParticipantReport)).join(', ');
 }
 
+/**
+ * Get the payee name given a report.
+ */
+function getPayeeName(report: OnyxEntry<Report>): string | undefined {
+    if (isEmptyObject(report)) {
+        return undefined;
+    }
+
+    const participantAccountIDs = report?.participantAccountIDs ?? [];
+    const participantsWithoutCurrentUser = participantAccountIDs.filter((accountID) => accountID !== currentUserAccountID);
+    if (participantsWithoutCurrentUser.length === 0) {
+        return undefined;
+    }
+    return getDisplayNameForParticipant(participantsWithoutCurrentUser[0], true);
+}
+
 /**
  * Get either the policyName or domainName the chat is tied to
  */
@@ -6030,6 +6046,7 @@ export {
     getGroupChatName,
     getOutstandingChildRequest,
     getAllHeldTransactions,
+    getPayeeName,
 };
 
 export type {
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index 39cbfd060471..ab24c6667ad4 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -135,7 +135,7 @@ function AttachmentPickerWithMenuItems({
             },
             [CONST.IOU.TYPE.SEND]: {
                 icon: Expensicons.Send,
-                text: translate('iou.paySomeone', {name: ReportUtils.getReportName(report)}),
+                text: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
                 onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.SEND, report?.reportID ?? ''),
             },
             [CONST.IOU.TYPE.TRACK_EXPENSE]: {
diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx
index 713127244926..8d64598ed838 100644
--- a/src/pages/iou/request/IOURequestStartPage.tsx
+++ b/src/pages/iou/request/IOURequestStartPage.tsx
@@ -64,7 +64,7 @@ function IOURequestStartPage({
     const [isDraggingOver, setIsDraggingOver] = useState(false);
     const tabTitles = {
         [CONST.IOU.TYPE.REQUEST]: translate('iou.submitExpense'),
-        [CONST.IOU.TYPE.SEND]: translate('iou.paySomeone', {name: undefined}),
+        [CONST.IOU.TYPE.SEND]: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
         [CONST.IOU.TYPE.SPLIT]: translate('iou.splitExpense'),
         [CONST.IOU.TYPE.TRACK_EXPENSE]: translate('iou.trackExpense'),
     };
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 04e739adecb9..8382e20b2686 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -87,10 +87,10 @@ function IOURequestStepConfirmation({
             return translate('iou.trackExpense');
         }
         if (iouType === CONST.IOU.TYPE.SEND) {
-            return translate('iou.paySomeone', {name: undefined});
+            return translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)});
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
-    }, [iouType, transaction, translate]);
+    }, [iouType, report, transaction, translate]);
 
     const participants = useMemo(
         () =>

From 93be4c5fe688aaf5bf14b5c50bddb9ffafbffd7f Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Sat, 13 Apr 2024 14:33:37 +0800
Subject: [PATCH 216/383] parse task action html

---
 src/components/ReportActionItem/TaskAction.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
index e85a2e708feb..94b152f61912 100644
--- a/src/components/ReportActionItem/TaskAction.tsx
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -6,6 +6,7 @@ import Text from '@components/Text';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as TaskUtils from '@libs/TaskUtils';
 import type {ReportAction} from '@src/types/onyx';
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 
 type TaskActionProps = {
     /** Name of the reportAction action */
@@ -15,10 +16,11 @@ type TaskActionProps = {
 function TaskAction({action}: TaskActionProps) {
     const styles = useThemeStyles();
     const message = TaskUtils.getTaskReportActionMessage(action);
+    const parser = new ExpensiMark();
 
     return (
         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.breakWord, styles.preWrap]}>
-            {message.html ? <RenderHTML html={`<muted-text>${message.html}</muted-text>`} /> : <Text style={[styles.chatItemMessage, styles.colorMuted]}>{message.text}</Text>}
+            {message.html ? <RenderHTML html={`<muted-text>${parser.replace(message.html)}</muted-text>`} /> : <Text style={[styles.chatItemMessage, styles.colorMuted]}>{message.text}</Text>}
         </View>
     );
 }

From 909ec73d4bc34a15a3459faf8fa87ccacdb0ff8c Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Sat, 13 Apr 2024 14:37:28 +0800
Subject: [PATCH 217/383] prettier

---
 src/components/ReportActionItem/TaskAction.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
index 94b152f61912..e1b36713592f 100644
--- a/src/components/ReportActionItem/TaskAction.tsx
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -1,3 +1,4 @@
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -6,7 +7,6 @@ import Text from '@components/Text';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as TaskUtils from '@libs/TaskUtils';
 import type {ReportAction} from '@src/types/onyx';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 
 type TaskActionProps = {
     /** Name of the reportAction action */
@@ -20,7 +20,11 @@ function TaskAction({action}: TaskActionProps) {
 
     return (
         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.breakWord, styles.preWrap]}>
-            {message.html ? <RenderHTML html={`<muted-text>${parser.replace(message.html)}</muted-text>`} /> : <Text style={[styles.chatItemMessage, styles.colorMuted]}>{message.text}</Text>}
+            {message.html ? (
+                <RenderHTML html={`<muted-text>${parser.replace(message.html)}</muted-text>`} />
+            ) : (
+                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{message.text}</Text>
+            )}
         </View>
     );
 }

From 021d945f5c4a19938a9fafac112c8383a983d0ab Mon Sep 17 00:00:00 2001
From: Cong Pham <ptcong411@gmail.com>
Date: Sat, 13 Apr 2024 00:18:04 +0700
Subject: [PATCH 218/383]     40076 update adjust scrollY on visual viewport

---
 src/hooks/useViewportOffsetTop/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useViewportOffsetTop/index.ts b/src/hooks/useViewportOffsetTop/index.ts
index da2325a7e13f..6f617aa38121 100644
--- a/src/hooks/useViewportOffsetTop/index.ts
+++ b/src/hooks/useViewportOffsetTop/index.ts
@@ -18,7 +18,7 @@ export default function useViewportOffsetTop(shouldAdjustScrollView = false): nu
 
             if (Browser.isMobileSafari() && shouldAdjustScrollView && window.visualViewport) {
                 const clientHeight = document.body.clientHeight;
-                const adjustScrollY = Math.round(clientHeight - window.visualViewport.height);
+                const adjustScrollY = clientHeight - window.visualViewport.height;
                 if (cachedDefaultOffsetTop.current === 0) {
                     cachedDefaultOffsetTop.current = targetOffsetTop;
                 }
@@ -43,7 +43,7 @@ export default function useViewportOffsetTop(shouldAdjustScrollView = false): nu
         if (!shouldAdjustScrollView) {
             return;
         }
-        window.scrollTo({top: viewportOffsetTop, behavior: 'instant'});
+        window.scrollTo({top: viewportOffsetTop, behavior: 'smooth'});
     }, [shouldAdjustScrollView, viewportOffsetTop]);
 
     return viewportOffsetTop;

From 5065abdc4ef372498ca9076adf212bbe8e2c9794 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Sat, 13 Apr 2024 15:34:24 +0530
Subject: [PATCH 219/383] clear selected members data when navigating from
 ReportParticipantsPage.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/ReportParticipantsPage.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReportParticipantsPage.tsx b/src/pages/ReportParticipantsPage.tsx
index f635499a286f..f6415ae9fa7d 100755
--- a/src/pages/ReportParticipantsPage.tsx
+++ b/src/pages/ReportParticipantsPage.tsx
@@ -1,4 +1,5 @@
-import React, {useCallback, useMemo, useRef, useState} from 'react';
+import {useIsFocused} from '@react-navigation/native';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {InteractionManager, View} from 'react-native';
 import type {TextInput} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -58,6 +59,14 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
     const currentUserAccountID = Number(session?.accountID);
     const isCurrentUserAdmin = ReportUtils.isGroupChatAdmin(report, currentUserAccountID);
     const isGroupChat = useMemo(() => ReportUtils.isGroupChat(report), [report]);
+    const isFocused = useIsFocused();
+
+    useEffect(() => {
+        if (isFocused) {
+            return;
+        }
+        setSelectedMembers([]);
+    }, [isFocused]);
 
     const getUsers = useCallback((): MemberOption[] => {
         let result: MemberOption[] = [];

From cf7c89e4ce7e9df9809429742faf14235559847a Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Sat, 13 Apr 2024 13:03:04 +0200
Subject: [PATCH 220/383] cleaning startChat translation

---
 src/languages/en.ts | 1 -
 src/languages/es.ts | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index dbdda0d35635..ce0bfa6d08f3 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1386,7 +1386,6 @@ export default {
         localTime: 'Local time',
     },
     newChatPage: {
-        createChat: 'Create chat',
         startGroup: 'Start group',
         addToGroup: 'Add to group',
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e81efa07a58c..cd59c9298e38 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1390,7 +1390,6 @@ export default {
         localTime: 'Hora local',
     },
     newChatPage: {
-        createChat: 'Crear chat',
         startGroup: 'Grupo de inicio',
         addToGroup: 'Añadir al grupo',
     },

From 2fc2ddd180344f22e60d0bcfbb916d2be8efb9f1 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sun, 14 Apr 2024 17:09:02 +0200
Subject: [PATCH 221/383] Fix eslint issue

---
 src/pages/workspace/WorkspaceInvitePage.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 940abd4279fb..0310104590e5 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -52,13 +52,7 @@ type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
     WorkspaceInvitePageOnyxProps &
     StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVITE>;
 
-function WorkspaceInvitePage({
-    route,
-    betas,
-    invitedEmailsToAccountIDsDraft,
-    policy,
-    isLoadingReportData = true,
-}: WorkspaceInvitePageProps) {
+function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, policy, isLoadingReportData = true}: WorkspaceInvitePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [searchTerm, setSearchTerm] = useState('');

From 91f90025e1803dff889adc3b079231899cdf03dd Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Sun, 14 Apr 2024 17:39:17 +0200
Subject: [PATCH 222/383] Add test for employeeList

---
 tests/actions/PolicyTest.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
index 8495f822cdb4..44b69bcb86fe 100644
--- a/tests/actions/PolicyTest.ts
+++ b/tests/actions/PolicyTest.ts
@@ -59,6 +59,7 @@ describe('actions/Policy', () => {
             expect(policy?.owner).toBe(ESH_EMAIL);
             expect(policy?.isPolicyExpenseChatEnabled).toBe(true);
             expect(policy?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+            expect(policy?.employeeList).toEqual({[ESH_EMAIL]: {errors: {}, role: CONST.POLICY.ROLE.ADMIN}});
 
             let allReports: OnyxCollection<Report> = await new Promise((resolve) => {
                 const connectionID = Onyx.connect({

From 7402158e91287670a6d5fb2e94c6d996223eb70d Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 14 Apr 2024 23:32:41 +0530
Subject: [PATCH 223/383] resolved conflicts

---
 src/libs/API/types.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index e9537517a272..3d38af1d4f0a 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -205,7 +205,7 @@ const WRITE_COMMANDS = {
     UPDATE_POLICY_DISTANCE_RATE_VALUE: 'UpdatePolicyDistanceRateValue',
     SET_POLICY_DISTANCE_RATES_ENABLED: 'SetPolicyDistanceRatesEnabled',
     DELETE_POLICY_DISTANCE_RATES: 'DeletePolicyDistanceRates',
-    DISMISS_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
+    DISMISS_TRACK_EXPENSE_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
     CONVERT_TRACKED_EXPENSE_TO_REQUEST: 'ConvertTrackedExpenseToRequest',
     CATEGORIZE_TRACKED_TRANSACTION: 'CategorizeTrackedExpense',
     SHARE_TRACKED_TRANSACTION: 'ShareTrackedExpense',
@@ -413,7 +413,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED]: Parameters.SetPolicyDistanceRatesEnabledParams;
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
-    [WRITE_COMMANDS.DISMISS_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
+    [WRITE_COMMANDS.DISMISS_TRACK_EXPENSE_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
     [WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST]: Parameters.ConvertTrackedExpenseToRequestParams;
     [WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION]: Parameters.CategorizeTrackedExpenseParams;
     [WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION]: Parameters.ShareTrackedExpenseParams;

From cfd471b9f8ed0b50b4c818db24d27b27527023ae Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sun, 14 Apr 2024 23:39:26 +0530
Subject: [PATCH 224/383] rename write commands

---
 src/libs/API/types.ts   | 8 ++++----
 src/libs/actions/IOU.ts | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 3d38af1d4f0a..a39062671219 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -207,8 +207,8 @@ const WRITE_COMMANDS = {
     DELETE_POLICY_DISTANCE_RATES: 'DeletePolicyDistanceRates',
     DISMISS_TRACK_EXPENSE_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
     CONVERT_TRACKED_EXPENSE_TO_REQUEST: 'ConvertTrackedExpenseToRequest',
-    CATEGORIZE_TRACKED_TRANSACTION: 'CategorizeTrackedExpense',
-    SHARE_TRACKED_TRANSACTION: 'ShareTrackedExpense',
+    CATEGORIZE_TRACKED_EXPENSE: 'CategorizeTrackedExpense',
+    SHARE_TRACKED_EXPENSE: 'ShareTrackedExpense',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -415,8 +415,8 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
     [WRITE_COMMANDS.DISMISS_TRACK_EXPENSE_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
     [WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST]: Parameters.ConvertTrackedExpenseToRequestParams;
-    [WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION]: Parameters.CategorizeTrackedExpenseParams;
-    [WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION]: Parameters.ShareTrackedExpenseParams;
+    [WRITE_COMMANDS.CATEGORIZE_TRACKED_EXPENSE]: Parameters.CategorizeTrackedExpenseParams;
+    [WRITE_COMMANDS.SHARE_TRACKED_EXPENSE]: Parameters.ShareTrackedExpenseParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 3e90ce8a78f5..d7e08831656f 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2666,7 +2666,7 @@ function categorizeTrackedExpense(
         created,
     };
 
-    API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_TRANSACTION, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
 }
 
 function shareTrackedExpense(
@@ -2731,7 +2731,7 @@ function shareTrackedExpense(
         billable,
     };
 
-    API.write(WRITE_COMMANDS.SHARE_TRACKED_TRANSACTION, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.SHARE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
 }
 
 /**

From 9e7fab0817b91eddb945fe317d0a306618a779d0 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Mon, 15 Apr 2024 00:38:44 +0530
Subject: [PATCH 225/383] fix: No hover effect for an already selected option.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/SelectionList/BaseListItem.tsx  | 3 ++-
 src/components/SelectionList/TableListItem.tsx | 1 +
 src/components/SelectionList/types.ts          | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index 5f4438f18f60..fe9ccc55711b 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -29,6 +29,7 @@ function BaseListItem<TItem extends ListItem>({
     children,
     isFocused,
     onFocus = () => {},
+    hoverStyle,
 }: BaseListItemProps<TItem>) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -68,7 +69,7 @@ function BaseListItem<TItem extends ListItem>({
                 accessibilityLabel={item.text ?? ''}
                 role={CONST.ROLE.BUTTON}
                 hoverDimmingValue={1}
-                hoverStyle={!item.isDisabled && !item.isSelected && styles.hoveredComponentBG}
+                hoverStyle={[!item.isDisabled && styles.hoveredComponentBG, hoverStyle]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                 onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
                 nativeID={keyForList ?? ''}
diff --git a/src/components/SelectionList/TableListItem.tsx b/src/components/SelectionList/TableListItem.tsx
index cc87d84baf03..b330706f34ae 100644
--- a/src/components/SelectionList/TableListItem.tsx
+++ b/src/components/SelectionList/TableListItem.tsx
@@ -58,6 +58,7 @@ function TableListItem({
             pendingAction={item.pendingAction}
             keyForList={item.keyForList}
             onFocus={onFocus}
+            hoverStyle={item.isSelected && styles.activeComponentBG}
         >
             {(hovered) => (
                 <>
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index e15dea542be6..3e6e3c1a0bca 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -147,6 +147,7 @@ type BaseListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
     pendingAction?: PendingAction | null;
     FooterComponent?: ReactElement;
     children?: ReactElement<ListItemProps> | ((hovered: boolean) => ReactElement<ListItemProps>);
+    hoverStyle?: StyleProp<ViewStyle>;
 };
 
 type UserListItemProps = ListItemProps & {

From 87d58066dc329f45e7dd4277f1a9f411c77bd742 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Mon, 15 Apr 2024 01:37:58 +0530
Subject: [PATCH 226/383] fix: Web - Inconsistent behavior of tag disappearing
 and reappearing when requesting money.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 .../MoneyTemporaryForRefactorRequestConfirmationList.tsx    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
index 21815f00253b..62fd1321e35b 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
@@ -474,7 +474,8 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
             return;
         }
         IOU.setMoneyRequestCategory(transaction?.transactionID ?? '', enabledCategories[0].name);
-    }, [iouCategory, shouldShowCategories, policyCategories, transaction, isCategoryRequired]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [shouldShowCategories, policyCategories, isCategoryRequired]);
 
     // Auto select the tag if there is only one enabled tag and it is required
     useEffect(() => {
@@ -490,7 +491,8 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
         if (updatedTagsString !== TransactionUtils.getTag(transaction) && updatedTagsString) {
             IOU.setMoneyRequestTag(transaction?.transactionID ?? '', updatedTagsString);
         }
-    }, [policyTagLists, transaction, policyTags, canUseViolations]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [policyTagLists, policyTags, canUseViolations]);
 
     /**
      */

From 593f41e9ae3461b528144e36305ea59ab95018e2 Mon Sep 17 00:00:00 2001
From: Shridhar Goel <35566748+ShridharGoel@users.noreply.github.com>
Date: Mon, 15 Apr 2024 12:19:39 +0530
Subject: [PATCH 227/383] Enable live markdown in IOU request descriptions

---
 src/pages/iou/request/step/IOURequestStepDescription.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx
index d075ed81c956..70a7bbc7c885 100644
--- a/src/pages/iou/request/step/IOURequestStepDescription.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx
@@ -176,6 +176,7 @@ function IOURequestStepDescription({
                         autoGrowHeight
                         containerStyles={[styles.autoGrowHeightMultilineInput]}
                         shouldSubmitForm
+                        isMarkdownEnabled
                     />
                 </View>
             </FormProvider>

From 307bb9c13dbbb67bc1595bb82917f09d07097f4c Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Mon, 15 Apr 2024 15:16:32 +0800
Subject: [PATCH 228/383] add calculateMentionSuggestion to deps

---
 .../home/report/ReportActionCompose/SuggestionMention.tsx   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index ddc7e69b02eb..6326711b3056 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -338,12 +338,8 @@ function SuggestionMention(
     );
 
     useEffect(() => {
-        if (!isComposerFocused) {
-            return;
-        }
         calculateMentionSuggestion(selection.end);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [selection, isComposerFocused]);
+    }, [selection, calculateMentionSuggestion]);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         setSuggestionValues((prevState) => {

From 25a5d85c17f57631a2de797625934d498c39209a Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Mon, 15 Apr 2024 15:17:35 +0800
Subject: [PATCH 229/383] fix can't mention 2 words user name

---
 src/pages/home/report/ReportActionCompose/SuggestionMention.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 6326711b3056..92fb61505ba1 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -303,6 +303,7 @@ function SuggestionMention(
                 suggestionWord = `${secondToLastWord} ${lastWord}`;
 
                 prefix = suggestionWord.substring(1);
+                prefixType = suggestionWord.substring(0, 1);
             } else {
                 prefix = lastWord.substring(1);
             }

From 8c0acbca1e8f6a737bc13ba51c0dd3a54048e17f Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 15 Apr 2024 15:16:24 +0700
Subject: [PATCH 230/383] update version react native live markdown

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 289880189422..74b2c58d5ebb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@babel/plugin-proposal-private-methods": "^7.18.6",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@dotlottie/react-player": "^1.6.3",
-        "@expensify/react-native-live-markdown": "0.1.47",
+        "@expensify/react-native-live-markdown": "^0.1.49",
         "@expo/metro-runtime": "~3.1.1",
         "@formatjs/intl-datetimeformat": "^6.10.0",
         "@formatjs/intl-listformat": "^7.2.2",
@@ -3570,9 +3570,9 @@
       }
     },
     "node_modules/@expensify/react-native-live-markdown": {
-      "version": "0.1.47",
-      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.47.tgz",
-      "integrity": "sha512-zUfwgg6qq47MnGuynamDpdHSlBYwVKFV4Zc/2wlVzFcBndQOjOyFu04Ns8YDB4Gl80LyGvfAuBT/sU+kvmMU6g==",
+      "version": "0.1.49",
+      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.49.tgz",
+      "integrity": "sha512-5l+/NtUTuSxWkdsT2JOlhKD5NW1hZ+nQcmgrCSz5e/TNIcfkYjJNiW/nEf8qmBV54afiTmTTwKYrh2DwM/BQ0g==",
       "engines": {
         "node": ">= 18.0.0"
       },
diff --git a/package.json b/package.json
index 9e2846f469d9..93d1e1be130f 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.47",
+    "@expensify/react-native-live-markdown": "^0.1.49",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",

From e28aaacfe6949aeb7e6d46d51e860428eb96f2c5 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 15 Apr 2024 15:49:32 +0700
Subject: [PATCH 231/383] fix using the main solution

---
 src/libs/ReportUtils.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index f91f6b3c96d9..093f019aa413 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2949,12 +2949,7 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         const parentReportActionMessage = (
             ReportActionsUtils.isApprovedOrSubmittedReportAction(parentReportAction)
                 ? ReportActionsUtils.getReportActionMessageText(parentReportAction)
-                : parser.htmlToText(
-                      (parentReportAction?.message?.[0]?.html ?? '').replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag, content, closeTag) => {
-                          const innerContent = Str.removeSMSDomain(content);
-                          return openTag + innerContent + closeTag;
-                      }),
-                  )
+                : Str.removeSMSDomain(parentReportAction?.message?.[0]?.text ?? '')
         ).replace(/(\r\n|\n|\r)/gm, ' ');
         if (isAttachment && parentReportActionMessage) {
             return `[${Localize.translateLocal('common.attachment')}]`;

From 8b70ff289293c086b68c5c54d36e6a6b5679953e Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 15 Apr 2024 15:50:05 +0700
Subject: [PATCH 232/383] fix lint

---
 src/libs/ReportUtils.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 093f019aa413..0042ad3f7599 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2945,7 +2945,6 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         }
 
         const isAttachment = ReportActionsUtils.isReportActionAttachment(!isEmptyObject(parentReportAction) ? parentReportAction : null);
-        const parser = new ExpensiMark();
         const parentReportActionMessage = (
             ReportActionsUtils.isApprovedOrSubmittedReportAction(parentReportAction)
                 ? ReportActionsUtils.getReportActionMessageText(parentReportAction)

From dafc42b3aff626669c4abb6112953c0e03014ffb Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Mon, 15 Apr 2024 17:55:29 +0700
Subject: [PATCH 233/383] fix error message appears briefly

---
 src/libs/TransactionUtils.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 95e2ec8a11b5..8158130339d8 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -215,12 +215,10 @@ function getUpdatedTransaction(transaction: Transaction, transactionChanges: Tra
 
     if (Object.hasOwn(transactionChanges, 'taxAmount') && typeof transactionChanges.taxAmount === 'number') {
         updatedTransaction.taxAmount = isFromExpenseReport ? -transactionChanges.taxAmount : transactionChanges.taxAmount;
-        shouldStopSmartscan = true;
     }
 
     if (Object.hasOwn(transactionChanges, 'taxCode') && typeof transactionChanges.taxCode === 'string') {
         updatedTransaction.taxCode = transactionChanges.taxCode;
-        shouldStopSmartscan = true;
     }
 
     if (Object.hasOwn(transactionChanges, 'billable') && typeof transactionChanges.billable === 'boolean') {

From 9669cc9f0842087680a72b7e7bf5593b39feacc7 Mon Sep 17 00:00:00 2001
From: Ted Harris <ted@expensify.com>
Date: Mon, 15 Apr 2024 12:44:45 +0100
Subject: [PATCH 234/383] Update Zenefits.md to say Zenefits

---
 .../expensify-classic/integrations/HR-integrations/Zenefits.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md b/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md
index e94d915e4dfa..07421553aeb2 100644
--- a/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md
@@ -17,7 +17,7 @@ Expensify's direct integration with Zenefits will automatically:
 - Every employee record in Zenefits must have a work email address since we use this as the unique identifier in Expensify. 
 - Zenefits will add all your employees to one Expensify workspace. If your company uses multiple Expensify workspaces, you'll be given the option to choose which workspace to connect to when you're setting up the integration.
 
-## To connect your Expensify workspace to Gusto:
+## To connect your Expensify workspace to Zenefits:
 
 1. Navigate to **Settings > Workspaces > Group > _[Workspace Name]_ > Connections**
 2. Scroll down to HR Integrations, click the **Connect to Zenefits** radio button, then click **Sync with Zenefits**

From 90f219b7f28f50f0b0b4a7d29629fc18febe93e9 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Mon, 15 Apr 2024 14:07:49 +0200
Subject: [PATCH 235/383] Add shouldPreventFocusSync prop to ListItem
 components

---
 src/components/SelectionList/BaseListItem.tsx         | 3 ++-
 src/components/SelectionList/BaseSelectionList.tsx    | 6 +++++-
 src/components/SelectionList/InviteMemberListItem.tsx | 4 ++++
 src/components/SelectionList/RadioListItem.tsx        | 2 ++
 src/components/SelectionList/TableListItem.tsx        | 2 ++
 src/components/SelectionList/UserListItem.tsx         | 4 ++++
 src/components/SelectionList/types.ts                 | 7 +++++++
 7 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index 5f4438f18f60..600234ede12b 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -28,6 +28,7 @@ function BaseListItem<TItem extends ListItem>({
     FooterComponent,
     children,
     isFocused,
+    shouldPreventFocusSync = false,
     onFocus = () => {},
 }: BaseListItemProps<TItem>) {
     const theme = useTheme();
@@ -37,7 +38,7 @@ function BaseListItem<TItem extends ListItem>({
     const pressableRef = useRef<View | HTMLDivElement>(null);
 
     // Sync focus on an item
-    useSyncFocus(pressableRef, Boolean(isFocused));
+    useSyncFocus(pressableRef, Boolean(isFocused && !shouldPreventFocusSync));
 
     const rightHandSideComponentRender = () => {
         if (canSelectMultiple || !rightHandSideComponent) {
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 62f098e76228..10f6bbcb8d0e 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -92,6 +92,7 @@ function BaseSelectionList<TItem extends ListItem>(
     const [itemsToHighlight, setItemsToHighlight] = useState<Set<string> | null>(null);
     const itemFocusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
     const [currentPage, setCurrentPage] = useState(1);
+    const isTextInputFocusedRef = useRef<boolean>(false);
 
     const incrementPage = () => setCurrentPage((prev) => prev + 1);
 
@@ -349,7 +350,8 @@ function BaseSelectionList<TItem extends ListItem>(
                 rightHandSideComponent={rightHandSideComponent}
                 keyForList={item.keyForList ?? ''}
                 isMultilineSupported={isRowMultilineSupported}
-                onFocus={() => setFocusedIndex(index)}
+                onFocus={() => setFocusedIndex(normalizedIndex)}
+                shouldPreventFocusSync={isTextInputFocusedRef.current}
             />
         );
     };
@@ -522,6 +524,8 @@ function BaseSelectionList<TItem extends ListItem>(
                                         textInputRef.current = element as RNTextInput;
                                     }
                                 }}
+                                onFocus={() => (isTextInputFocusedRef.current = true)}
+                                onBlur={() => (isTextInputFocusedRef.current = false)}
                                 label={textInputLabel}
                                 accessibilityLabel={textInputLabel}
                                 hint={textInputHint}
diff --git a/src/components/SelectionList/InviteMemberListItem.tsx b/src/components/SelectionList/InviteMemberListItem.tsx
index 5b3442d0e4ef..a761bec77766 100644
--- a/src/components/SelectionList/InviteMemberListItem.tsx
+++ b/src/components/SelectionList/InviteMemberListItem.tsx
@@ -26,6 +26,8 @@ function InviteMemberListItem({
     onDismissError,
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
+    onFocus,
+    shouldPreventFocusSync,
 }: InviteMemberListItemProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -66,6 +68,8 @@ function InviteMemberListItem({
                 ) : undefined
             }
             keyForList={item.keyForList}
+            onFocus={onFocus}
+            shouldPreventFocusSync={shouldPreventFocusSync}
         >
             {(hovered?: boolean) => (
                 <>
diff --git a/src/components/SelectionList/RadioListItem.tsx b/src/components/SelectionList/RadioListItem.tsx
index 808fa740bfb3..7d98328af37b 100644
--- a/src/components/SelectionList/RadioListItem.tsx
+++ b/src/components/SelectionList/RadioListItem.tsx
@@ -17,6 +17,7 @@ function RadioListItem({
     rightHandSideComponent,
     isMultilineSupported = false,
     onFocus,
+    shouldPreventFocusSync,
 }: RadioListItemProps) {
     const styles = useThemeStyles();
     const fullTitle = isMultilineSupported ? item.text?.trimStart() : item.text;
@@ -36,6 +37,7 @@ function RadioListItem({
             rightHandSideComponent={rightHandSideComponent}
             keyForList={item.keyForList}
             onFocus={onFocus}
+            shouldPreventFocusSync={shouldPreventFocusSync}
         >
             <>
                 <View style={[styles.flex1, styles.alignItemsStart]}>
diff --git a/src/components/SelectionList/TableListItem.tsx b/src/components/SelectionList/TableListItem.tsx
index cc87d84baf03..fd2aae2203bf 100644
--- a/src/components/SelectionList/TableListItem.tsx
+++ b/src/components/SelectionList/TableListItem.tsx
@@ -24,6 +24,7 @@ function TableListItem({
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     onFocus,
+    shouldPreventFocusSync,
 }: TableListItemProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -58,6 +59,7 @@ function TableListItem({
             pendingAction={item.pendingAction}
             keyForList={item.keyForList}
             onFocus={onFocus}
+            shouldPreventFocusSync={shouldPreventFocusSync}
         >
             {(hovered) => (
                 <>
diff --git a/src/components/SelectionList/UserListItem.tsx b/src/components/SelectionList/UserListItem.tsx
index 7ab777e7e0f1..fb1c82f80fec 100644
--- a/src/components/SelectionList/UserListItem.tsx
+++ b/src/components/SelectionList/UserListItem.tsx
@@ -27,6 +27,8 @@ function UserListItem({
     onDismissError,
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
+    onFocus,
+    shouldPreventFocusSync,
 }: UserListItemProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -67,6 +69,8 @@ function UserListItem({
                 ) : undefined
             }
             keyForList={item.keyForList}
+            onFocus={onFocus}
+            shouldPreventFocusSync={shouldPreventFocusSync}
         >
             {(hovered?: boolean) => (
                 <>
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index e15dea542be6..411e4049c85d 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -137,6 +137,12 @@ type ListItemProps = CommonListItemProps<ListItem> & {
 
     /** Key used internally by React */
     keyForList?: string;
+
+    /**
+     * Whether the focus sync on element should be prevented. For example it should be set to true when the text input above list items is currently focused.
+     * When we type something into the text input, the first element found is focused, in this situation we should not synchronize the focus on the element because we will lose the focus from the text input.
+     */
+    shouldPreventFocusSync?: boolean;
 };
 
 type BaseListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
@@ -147,6 +153,7 @@ type BaseListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
     pendingAction?: PendingAction | null;
     FooterComponent?: ReactElement;
     children?: ReactElement<ListItemProps> | ((hovered: boolean) => ReactElement<ListItemProps>);
+    shouldPreventFocusSync?: boolean;
 };
 
 type UserListItemProps = ListItemProps & {

From 3ce60848acb415034d848ecad3f449f61c87f4cc Mon Sep 17 00:00:00 2001
From: Ezra Ellette <ezrasellette@gmail.com>
Date: Mon, 15 Apr 2024 07:11:02 -0500
Subject: [PATCH 236/383] use waitForCollectionCallback

---
 src/libs/ReportUtils.ts             | 11 ++++----
 src/libs/SidebarUtils.ts            | 44 ++++++++++++++++++-----------
 src/libs/WorkspacesSettingsUtils.ts | 13 ++++-----
 src/libs/actions/IOU.ts             | 11 ++++----
 src/libs/actions/ReportActions.ts   | 11 ++++----
 5 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 1b60cd611d57..abe6f57671c5 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -534,16 +534,15 @@ Onyx.connect({
     },
 });
 
-const reportActionsByReport: OnyxCollection<ReportActions> = {};
+let reportActionsByReport: OnyxCollection<ReportActions> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
-
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        reportActionsByReport[reportID] = actions;
+        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
     },
 });
 
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 3f1b354d70fc..18ff4063650c 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -23,31 +23,41 @@ import * as ReportUtils from './ReportUtils';
 import * as TaskUtils from './TaskUtils';
 import * as UserUtils from './UserUtils';
 
-const reportActionsByReport: OnyxCollection<ReportActions> = {};
-const visibleReportActionItems: ReportActions = {};
+let reportActionsByReport: OnyxCollection<ReportActions> = {};
+let visibleReportActionItems: ReportActions = {};
 
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
 
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        reportActionsByReport[reportID] = actions;
-
-        const actionsArray: ReportAction[] = ReportActionsUtils.getSortedReportActions(Object.values(actions));
+        reportActionsByReport = Object.fromEntries(
+            Object.entries(actions).map(([key, reportActions]) => {
+                const reportID = CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`);
+                return [reportID, reportActions];
+            }),
+        );
 
-        // The report is only visible if it is the last action not deleted that
-        // does not match a closed or created state.
-        const reportActionsForDisplay = actionsArray.filter(
-            (reportAction, actionKey) =>
-                ReportActionsUtils.shouldReportActionBeVisible(reportAction, actionKey) &&
-                !ReportActionsUtils.isWhisperAction(reportAction) &&
-                reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED &&
-                reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        visibleReportActionItems = Object.fromEntries(
+            Object.entries(reportActionsByReport).map(([reportID, reportActions]) => {
+                const actionsArray: ReportAction[] = ReportActionsUtils.getSortedReportActions(Object.values(reportActions ?? {}));
+
+                // The report is only visible if it is the last action not deleted that
+                // does not match a closed or created state.
+                const reportActionsForDisplay = actionsArray.filter(
+                    (reportAction, actionKey) =>
+                        ReportActionsUtils.shouldReportActionBeVisible(reportAction, actionKey) &&
+                        !ReportActionsUtils.isWhisperAction(reportAction) &&
+                        reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED &&
+                        reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                );
+
+                return [reportID, reportActionsForDisplay[reportActionsForDisplay.length - 1]];
+            }),
         );
-        visibleReportActionItems[reportID] = reportActionsForDisplay[reportActionsForDisplay.length - 1];
     },
 });
 
diff --git a/src/libs/WorkspacesSettingsUtils.ts b/src/libs/WorkspacesSettingsUtils.ts
index 995bcba06a5c..54ebe0ef9ab7 100644
--- a/src/libs/WorkspacesSettingsUtils.ts
+++ b/src/libs/WorkspacesSettingsUtils.ts
@@ -52,16 +52,15 @@ Onyx.connect({
     },
 });
 
-const reportActionsByReport: OnyxCollection<ReportActions> = {};
+let reportActionsByReport: OnyxCollection<ReportActions> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
-
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        reportActionsByReport[reportID] = actions;
+        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
     },
 });
 
@@ -80,7 +79,7 @@ const getBrickRoadForPolicy = (report: Report): BrickRoad => {
     // To determine if the report requires attention from the current user, we need to load the parent report action
     let itemParentReportAction = {};
     if (report.parentReportID) {
-        const itemParentReportActions = reportActionsByReport[report.parentReportID] ?? {};
+        const itemParentReportActions = reportActionsByReport?.[report.parentReportID] ?? {};
         itemParentReportAction = report.parentReportActionID ? itemParentReportActions[report.parentReportActionID] : {};
     }
     const reportOption = {...report, isUnread: ReportUtils.isUnread(report), isUnreadWithMention: ReportUtils.isUnreadWithMention(report)};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index cd0264ddb6ea..d33829ef41a6 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -259,16 +259,15 @@ Onyx.connect({
     callback: (value) => (allPolicies = value),
 });
 
-const reportActionsByReport: OnyxCollection<OnyxTypes.ReportActions> = {};
+let reportActionsByReport: OnyxCollection<OnyxTypes.ReportActions> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
-
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        reportActionsByReport[reportID] = actions;
+        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
     },
 });
 
diff --git a/src/libs/actions/ReportActions.ts b/src/libs/actions/ReportActions.ts
index 610c5c67a0fa..84aba3eca4fd 100644
--- a/src/libs/actions/ReportActions.ts
+++ b/src/libs/actions/ReportActions.ts
@@ -59,16 +59,15 @@ function clearReportActionErrors(reportID: string, reportAction: ReportAction, k
     });
 }
 
-const reportActionsByReport: OnyxCollection<ReportActions> = {};
+let reportActionsByReport: OnyxCollection<ReportActions> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
-
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        reportActionsByReport[reportID] = actions;
+        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
     },
 });
 

From 705c4c0c4a410667483ed68d22ac3a47b566e8b9 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 15 Apr 2024 18:17:33 +0530
Subject: [PATCH 237/383] removes split for categorize and share action

---
 .../MoneyTemporaryForRefactorRequestParticipantsSelector.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index ff7cd0205c89..2d766195773c 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -268,7 +268,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({betas, participan
     // canUseP2PDistanceRequests is true if the iouType is track expense, but we don't want to allow splitting distance with track expense yet
     const isAllowedToSplit =
         (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
-        (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE || ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action));
+        (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE) && ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action)
 
     const handleConfirmSelection = useCallback(
         (keyEvent, option) => {

From 48545bb0bd4d87e80568a3e1c2c33c20de198e80 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 15 Apr 2024 14:52:35 +0200
Subject: [PATCH 238/383] Update leaveWorkspace

---
 src/libs/actions/Policy.ts | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 90f3ac0aeef4..fffc992746d9 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -968,52 +968,47 @@ function removeMembers(accountIDs: number[], policyID: string) {
 }
 
 function leaveWorkspace(policyID: string) {
-    const membersListKey = `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}` as const;
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const workspaceChats = ReportUtils.getAllWorkspaceReports(policyID);
 
     const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
-            value: {
-                [sessionAccountID]: {
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                },
-            },
-        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                employeeList: {
+                    [sessionEmail]: {
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    },
+                },
             },
         },
     ];
+
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                [sessionAccountID]: null,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                employeeList: {
+                    [sessionEmail]: null,
+                },
             },
         },
     ];
     const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: membersListKey,
-            value: {
-                [sessionAccountID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericRemove'),
-                },
-            },
-        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingAction: policy?.pendingAction,
+                employeeList: {
+                    [sessionEmail]: {
+                        errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericRemove'),
+                    },
+                },
             },
         },
     ];

From 93cda52580e504cb406641ab1bcaf7663590d072 Mon Sep 17 00:00:00 2001
From: Samil Abud <samilabud@gmail.com>
Date: Mon, 15 Apr 2024 09:48:31 -0400
Subject: [PATCH 239/383] Fixed styles to work withoud fixed height

---
 src/pages/signin/SignInPageLayout/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/signin/SignInPageLayout/index.tsx b/src/pages/signin/SignInPageLayout/index.tsx
index 3532c17181db..9071eb55ac26 100644
--- a/src/pages/signin/SignInPageLayout/index.tsx
+++ b/src/pages/signin/SignInPageLayout/index.tsx
@@ -144,8 +144,8 @@ function SignInPageLayout(
                     keyboardShouldPersistTaps="handled"
                     ref={scrollViewRef}
                 >
-                    <View style={[styles.flex1, styles.flexColumn, styles.overflowHidden, StyleUtils.getMinimumHeight(backgroundImageHeight), StyleUtils.getSignInBgStyles(theme)]}>
-                        <View style={[styles.pAbsolute, styles.w100, StyleUtils.getHeight(backgroundImageHeight), StyleUtils.getBackgroundColorStyle(theme.highlightBG)]}>
+                    <View style={[styles.dBlock, styles.flexColumn, styles.overflowHidden, StyleUtils.getSignInBgStyles(theme)]}>
+                        <View style={[styles.dBlock, styles.pAbsolute, styles.w100, StyleUtils.getHeight(backgroundImageHeight), StyleUtils.getBackgroundColorStyle(theme.highlightBG)]}>
                             <BackgroundImage
                                 isSmallScreen
                                 pointerEvents="none"

From 714ea5e0f5247e1d7d41625248b12ec7f50b98e5 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 15 Apr 2024 21:34:00 +0700
Subject: [PATCH 240/383] edit type of hold comment report action

---
 src/libs/ReportUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 1b60cd611d57..f5eccb046765 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4042,7 +4042,7 @@ function buildOptimisticHoldReportAction(created = DateUtils.getDBTime()): Optim
 function buildOptimisticHoldReportActionComment(comment: string, created = DateUtils.getDBTime()): OptimisticHoldReportAction {
     return {
         reportActionID: NumberUtils.rand64(),
-        actionName: CONST.REPORT.ACTIONS.TYPE.HOLDCOMMENT,
+        actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         actorAccountID: currentUserAccountID,
         message: [

From 5bef68f7c3f8563815d01727f65f3476df13efdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Mon, 15 Apr 2024 17:23:00 +0200
Subject: [PATCH 241/383] no results found fix

---
 src/pages/WorkspaceSwitcherPage/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/WorkspaceSwitcherPage/index.tsx b/src/pages/WorkspaceSwitcherPage/index.tsx
index 050c2d1a962a..489c9566d6c7 100644
--- a/src/pages/WorkspaceSwitcherPage/index.tsx
+++ b/src/pages/WorkspaceSwitcherPage/index.tsx
@@ -167,7 +167,7 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
         return options;
     }, [activeWorkspaceID, filteredAndSortedUserWorkspaces, getIndicatorTypeForPolicy, translate]);
 
-    const headerMessage = filteredAndSortedUserWorkspaces.length === 0 ? translate('common.noResultsFound') : '';
+    const headerMessage = filteredAndSortedUserWorkspaces.length === 0 && usersWorkspaces.length ? translate('common.noResultsFound') : '';
     const shouldShowCreateWorkspace = usersWorkspaces.length === 0;
 
     return (

From fa118b6ae1b0fff3a4e7769a16ab3a5523d687ee Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Mon, 15 Apr 2024 17:42:23 +0200
Subject: [PATCH 242/383] Rename shouldPreventFocusSync to shouldSyncFocus

---
 src/components/SelectionList/BaseListItem.tsx         | 4 ++--
 src/components/SelectionList/BaseSelectionList.tsx    | 2 +-
 src/components/SelectionList/InviteMemberListItem.tsx | 4 ++--
 src/components/SelectionList/RadioListItem.tsx        | 4 ++--
 src/components/SelectionList/TableListItem.tsx        | 4 ++--
 src/components/SelectionList/UserListItem.tsx         | 4 ++--
 src/components/SelectionList/types.ts                 | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index 600234ede12b..4aac07863c36 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -28,7 +28,7 @@ function BaseListItem<TItem extends ListItem>({
     FooterComponent,
     children,
     isFocused,
-    shouldPreventFocusSync = false,
+    shouldSyncFocus = true,
     onFocus = () => {},
 }: BaseListItemProps<TItem>) {
     const theme = useTheme();
@@ -38,7 +38,7 @@ function BaseListItem<TItem extends ListItem>({
     const pressableRef = useRef<View | HTMLDivElement>(null);
 
     // Sync focus on an item
-    useSyncFocus(pressableRef, Boolean(isFocused && !shouldPreventFocusSync));
+    useSyncFocus(pressableRef, Boolean(isFocused && shouldSyncFocus));
 
     const rightHandSideComponentRender = () => {
         if (canSelectMultiple || !rightHandSideComponent) {
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 10f6bbcb8d0e..fa04458fc08f 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -351,7 +351,7 @@ function BaseSelectionList<TItem extends ListItem>(
                 keyForList={item.keyForList ?? ''}
                 isMultilineSupported={isRowMultilineSupported}
                 onFocus={() => setFocusedIndex(normalizedIndex)}
-                shouldPreventFocusSync={isTextInputFocusedRef.current}
+                shouldSyncFocus={!isTextInputFocusedRef.current}
             />
         );
     };
diff --git a/src/components/SelectionList/InviteMemberListItem.tsx b/src/components/SelectionList/InviteMemberListItem.tsx
index a761bec77766..7b6c70373b9e 100644
--- a/src/components/SelectionList/InviteMemberListItem.tsx
+++ b/src/components/SelectionList/InviteMemberListItem.tsx
@@ -27,7 +27,7 @@ function InviteMemberListItem({
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     onFocus,
-    shouldPreventFocusSync,
+    shouldSyncFocus,
 }: InviteMemberListItemProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -69,7 +69,7 @@ function InviteMemberListItem({
             }
             keyForList={item.keyForList}
             onFocus={onFocus}
-            shouldPreventFocusSync={shouldPreventFocusSync}
+            shouldSyncFocus={shouldSyncFocus}
         >
             {(hovered?: boolean) => (
                 <>
diff --git a/src/components/SelectionList/RadioListItem.tsx b/src/components/SelectionList/RadioListItem.tsx
index 7d98328af37b..088d688fdb2d 100644
--- a/src/components/SelectionList/RadioListItem.tsx
+++ b/src/components/SelectionList/RadioListItem.tsx
@@ -17,7 +17,7 @@ function RadioListItem({
     rightHandSideComponent,
     isMultilineSupported = false,
     onFocus,
-    shouldPreventFocusSync,
+    shouldSyncFocus,
 }: RadioListItemProps) {
     const styles = useThemeStyles();
     const fullTitle = isMultilineSupported ? item.text?.trimStart() : item.text;
@@ -37,7 +37,7 @@ function RadioListItem({
             rightHandSideComponent={rightHandSideComponent}
             keyForList={item.keyForList}
             onFocus={onFocus}
-            shouldPreventFocusSync={shouldPreventFocusSync}
+            shouldSyncFocus={shouldSyncFocus}
         >
             <>
                 <View style={[styles.flex1, styles.alignItemsStart]}>
diff --git a/src/components/SelectionList/TableListItem.tsx b/src/components/SelectionList/TableListItem.tsx
index fd2aae2203bf..9720d963b2d9 100644
--- a/src/components/SelectionList/TableListItem.tsx
+++ b/src/components/SelectionList/TableListItem.tsx
@@ -24,7 +24,7 @@ function TableListItem({
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     onFocus,
-    shouldPreventFocusSync,
+    shouldSyncFocus,
 }: TableListItemProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -59,7 +59,7 @@ function TableListItem({
             pendingAction={item.pendingAction}
             keyForList={item.keyForList}
             onFocus={onFocus}
-            shouldPreventFocusSync={shouldPreventFocusSync}
+            shouldSyncFocus={shouldSyncFocus}
         >
             {(hovered) => (
                 <>
diff --git a/src/components/SelectionList/UserListItem.tsx b/src/components/SelectionList/UserListItem.tsx
index fb1c82f80fec..a97ac2f26c9a 100644
--- a/src/components/SelectionList/UserListItem.tsx
+++ b/src/components/SelectionList/UserListItem.tsx
@@ -28,7 +28,7 @@ function UserListItem({
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     onFocus,
-    shouldPreventFocusSync,
+    shouldSyncFocus,
 }: UserListItemProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -70,7 +70,7 @@ function UserListItem({
             }
             keyForList={item.keyForList}
             onFocus={onFocus}
-            shouldPreventFocusSync={shouldPreventFocusSync}
+            shouldSyncFocus={shouldSyncFocus}
         >
             {(hovered?: boolean) => (
                 <>
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 411e4049c85d..12f3110f6052 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -139,10 +139,10 @@ type ListItemProps = CommonListItemProps<ListItem> & {
     keyForList?: string;
 
     /**
-     * Whether the focus sync on element should be prevented. For example it should be set to true when the text input above list items is currently focused.
+     * Whether the focus on the element should be synchronized. For example it should be set to false when the text input above list items is currently focused.
      * When we type something into the text input, the first element found is focused, in this situation we should not synchronize the focus on the element because we will lose the focus from the text input.
      */
-    shouldPreventFocusSync?: boolean;
+    shouldSyncFocus?: boolean;
 };
 
 type BaseListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
@@ -153,7 +153,7 @@ type BaseListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
     pendingAction?: PendingAction | null;
     FooterComponent?: ReactElement;
     children?: ReactElement<ListItemProps> | ((hovered: boolean) => ReactElement<ListItemProps>);
-    shouldPreventFocusSync?: boolean;
+    shouldSyncFocus?: boolean;
 };
 
 type UserListItemProps = ListItemProps & {

From c0c3e90a31d66927715fa4a952f8cefbb58fa732 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 15 Apr 2024 22:34:20 +0530
Subject: [PATCH 243/383] fixes infinite loading

---
 src/libs/ReportUtils.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 731dcbfd7324..319abcd7d21d 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4367,6 +4367,19 @@ function buildTransactionThread(
     existingTransactionThreadReportID?: string,
 ): OptimisticChatReport {
     const participantAccountIDs = [...new Set([currentUserAccountID, Number(reportAction?.actorAccountID)])].filter(Boolean) as number[];
+    const existingTransactionThreadReport = getReport(existingTransactionThreadReportID)
+
+
+    if (existingTransactionThreadReportID && existingTransactionThreadReport) {
+        return {
+            ...existingTransactionThreadReport,
+            isOptimisticReport: true,
+            parentReportActionID: reportAction?.reportActionID,
+            parentReportID: moneyRequestReport?.reportID,
+            reportName: getTransactionReportName(reportAction),
+        };
+    }
+
 
     return buildOptimisticChatReport(
         participantAccountIDs,
@@ -4384,7 +4397,7 @@ function buildTransactionThread(
         '',
         '',
         existingTransactionThreadReportID,
-    );
+    );;
 }
 
 /**

From c1d8bf76cee12e0bb511e84825ced3a0a58cd6cb Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 11:50:43 -0700
Subject: [PATCH 244/383] Update consts

---
 src/CONST.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index cf99b4475733..9f5a28c22bf7 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1595,14 +1595,16 @@ const CONST = {
             },
             SYNC_STAGE_NAME: {
                 STARTING_IMPORT: 'startingImport',
-                QBO_CUSTOMERS: 'quickbooksOnlineImportCustomers',
-                QBO_EMPLOYEES: 'quickbooksOnlineImportEmployees',
-                QBO_ACCOUNTS: 'quickbooksOnlineImportAccounts',
-                QBO_CLASSES: 'quickbooksOnlineImportClasses',
-                QBO_LOCATIONS: 'quickbooksOnlineImportLocations',
-                QBO_PROCESSING: 'quickbooksOnlineImportProcessing',
-                QBO_PAYMENTS: 'quickbooksOnlineSyncBillPayments',
-                QBO_TAX_CODES: 'quickbooksOnlineSyncTaxCodes',
+                QBO_IMPORT_MAIN: 'quickbooksOnlineImportMain',
+                QBO_IMPORT_CUSTOMERS: 'quickbooksOnlineImportCustomers',
+                QBO_IMPORT_EMPLOYEES: 'quickbooksOnlineImportEmployees',
+                QBO_IMPORT_ACCOUNTS: 'quickbooksOnlineImportAccounts',
+                QBO_IMPORT_CLASSES: 'quickbooksOnlineImportClasses',
+                QBO_IMPORT_LOCATIONS: 'quickbooksOnlineImportLocations',
+                QBO_IMPORT_PROCESSING: 'quickbooksOnlineImportProcessing',
+                QBO_SYNC_PAYMENTS: 'quickbooksOnlineSyncBillPayments',
+                QBO_IMPORT_TAX_CODES: 'quickbooksOnlineSyncTaxCodes',
+                QBO_CHECK_CONNECTION: 'quickbooksOnlineCheckConnection',
                 JOB_DONE: 'jobDone',
             },
         },

From 3db0b692c7ca9d8b96ed77f624881758ea93e547 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Tue, 16 Apr 2024 03:05:55 +0700
Subject: [PATCH 245/383] Reapply changes

---
 src/libs/ReportUtils.ts         | 2 +-
 src/pages/ReportDetailsPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index fc28a37b9237..c587d1ad3ca0 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2993,7 +2993,7 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
     }
 
     if (isGroupChat(report)) {
-        return getGroupChatName(report?.participantAccountIDs ?? [], true) ?? '';
+        return getGroupChatName(report?.participantAccountIDs ?? [], true, report?.reportID) ?? '';
     }
 
     if (isChatRoom(report) || isTaskReport(report)) {
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 7f1dadab8c0e..cf11adcd428e 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -249,7 +249,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         />
     );
 
-    const reportName = useMemo(() => (isGroupChat ? ReportUtils.getGroupChatName(undefined, true, report.reportID ?? '') : ReportUtils.getReportName(report)), [report, isGroupChat]);
+    const reportName = useMemo(() => ReportUtils.getReportName(report), [report]);
     return (
         <ScreenWrapper testID={ReportDetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={isEmptyObject(report)}>

From 6f5d49b7d8afcedb17c2a143dc321173ecc95af9 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Mon, 15 Apr 2024 13:10:09 -0700
Subject: [PATCH 246/383] feat: add field for loading status inside policy

---
 src/libs/actions/PolicyConnections.ts | 39 ++++++++++++++++++++++++++-
 src/types/onyx/Policy.ts              |  3 +++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
index 89eae3d20ace..5aad8bc66898 100644
--- a/src/libs/actions/PolicyConnections.ts
+++ b/src/libs/actions/PolicyConnections.ts
@@ -1,13 +1,50 @@
+import Onyx from 'react-native-onyx';
+import type {OnyxUpdate} from 'react-native-onyx';
 import * as API from '@libs/API';
 import type {OpenPolicyAccountingPageParams} from '@libs/API/parameters';
 import {READ_COMMANDS} from '@libs/API/types';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 function openPolicyAccountingPage(policyID: string) {
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {
+                isLoadingConnections: true,
+            },
+        },
+    ];
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {
+                isLoadingConnections: false,
+            },
+        },
+    ];
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {
+                isLoadingConnections: false,
+            },
+        },
+    ];
+
     const parameters: OpenPolicyAccountingPageParams = {
         policyID,
     };
 
-    API.read(READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE, parameters);
+    API.read(READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 }
 
 // More action functions will be added later
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index a21e98f4bfec..40140338ff94 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -402,6 +402,9 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** All the integration connections attached to the policy */
         connections?: Connections;
 
+        /** Whether the connections data is being fetched */
+        isLoadingConnections?: boolean;
+
         /** Report fields attached to the policy */
         fieldList?: Record<string, PolicyReportField>;
 

From 67ee4530548d7cdbdb75ff6b1508fd902496bd1b Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 13:11:28 -0700
Subject: [PATCH 247/383] Use UpdatePolicyConnectionConfigParams

---
 src/libs/actions/connections/index.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index a93d9635ff24..68d349e8bfcf 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -1,13 +1,12 @@
 import Onyx from 'react-native-onyx';
 import type {OnyxUpdate} from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
-import type {RemovePolicyConnectionParams} from '@libs/API/parameters';
+import type {RemovePolicyConnectionParams, UpdatePolicyConnectionConfigParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyConnectionName} from '@src/types/onyx/Policy';
+import type {ConnectionName, Connections, PolicyConnectionName} from '@src/types/onyx/Policy';
 
 function removePolicyConnection(policyID: string, connectionName: PolicyConnectionName) {
     const optimisticData: OnyxUpdate[] = [
@@ -43,9 +42,14 @@ function removePolicyConnection(policyID: string, connectionName: PolicyConnecti
     };
     API.write(WRITE_COMMANDS.REMOVE_POLICY_CONNECTION, parameters, {optimisticData, failureData});
 }
-
-function updatePolicyConnectionConfig(policyID: string, settingName: ValueOf<typeof CONST.QUICK_BOOKS_IMPORTS>, settingValue: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>) {
-    const parameters = {policyID, connectionName: CONST.QUICK_BOOKS_ONLINE, settingName, settingValue, idempotencyKey: settingName};
+function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TSettingName extends keyof Connections[TConnectionName]['config']>(policyID: string, connectionName: TConnectionName, settingName: TSettingName, settingValue: Connections[TConnectionName]['config'][TSettingName]) {
+    const parameters: UpdatePolicyConnectionConfigParams<TConnectionName, TSettingName> = {
+        policyID,
+        connectionName,
+        settingName,
+        settingValue,
+        idempotencyKey: String(settingName)
+    };
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,

From 8d4f91d9c80b2fffc1a75eecf24daeb535762ea5 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 01:44:18 +0530
Subject: [PATCH 248/383] formatting and fixes onyx data for moved expense

---
 src/libs/ReportUtils.ts                       |   7 +-
 src/libs/actions/IOU.ts                       | 252 ++++++++++--------
 ...yForRefactorRequestParticipantsSelector.js |   3 +-
 .../step/IOURequestStepConfirmation.tsx       |   8 +-
 4 files changed, 149 insertions(+), 121 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 319abcd7d21d..2d3842473eea 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4367,8 +4367,7 @@ function buildTransactionThread(
     existingTransactionThreadReportID?: string,
 ): OptimisticChatReport {
     const participantAccountIDs = [...new Set([currentUserAccountID, Number(reportAction?.actorAccountID)])].filter(Boolean) as number[];
-    const existingTransactionThreadReport = getReport(existingTransactionThreadReportID)
-
+    const existingTransactionThreadReport = getReport(existingTransactionThreadReportID);
 
     if (existingTransactionThreadReportID && existingTransactionThreadReport) {
         return {
@@ -4380,7 +4379,6 @@ function buildTransactionThread(
         };
     }
 
-
     return buildOptimisticChatReport(
         participantAccountIDs,
         getTransactionReportName(reportAction),
@@ -4396,8 +4394,7 @@ function buildTransactionThread(
         moneyRequestReport?.reportID,
         '',
         '',
-        existingTransactionThreadReportID,
-    );;
+    );
 }
 
 /**
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index d7e08831656f..a285ceeb1091 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -849,16 +849,18 @@ function buildOnyxDataForTrackExpense(
     iouCreatedAction: OptimisticCreatedReportAction,
     iouAction: OptimisticIOUReportAction,
     reportPreviewAction: OnyxEntry<ReportAction>,
-    transactionThreadReport: OptimisticChatReport,
-    transactionThreadCreatedReportAction: OptimisticCreatedReportAction,
+    transactionThreadReport: OptimisticChatReport | EmptyObject,
+    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | EmptyObject,
     shouldCreateNewMoneyRequestReport: boolean,
     policy?: OnyxEntry<OnyxTypes.Policy>,
     policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
+    existingTransactionThreadReportID?: string,
 ): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
     const isScanRequest = TransactionUtils.isScanRequest(transaction);
     const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null]));
     const optimisticData: OnyxUpdate[] = [];
+    const existingTransactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
 
     if (chatReport) {
         optimisticData.push({
@@ -933,14 +935,6 @@ function buildOnyxDataForTrackExpense(
             key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
             value: transactionThreadReport,
         },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
-            value: {
-                [transactionThreadCreatedReportAction.reportActionID]: transactionThreadCreatedReportAction,
-            },
-        },
-
         // Remove the temporary transaction used during the creation flow
         {
             onyxMethod: Onyx.METHOD.SET,
@@ -949,6 +943,16 @@ function buildOnyxDataForTrackExpense(
         },
     );
 
+    if (!isEmptyObject(transactionThreadCreatedReportAction)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            value: {
+                [transactionThreadCreatedReportAction.reportActionID]: transactionThreadCreatedReportAction,
+            },
+        });
+    }
+
     const successData: OnyxUpdate[] = [];
 
     if (iouReport) {
@@ -1018,7 +1022,10 @@ function buildOnyxDataForTrackExpense(
                 pendingFields: clearedPendingFields,
             },
         },
-        {
+    );
+
+    if (!isEmptyObject(transactionThreadCreatedReportAction)) {
+        successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
             value: {
@@ -1027,8 +1034,8 @@ function buildOnyxDataForTrackExpense(
                     errors: null,
                 },
             },
-        },
-    );
+        });
+    }
 
     const failureData: OnyxUpdate[] = [];
 
@@ -1097,9 +1104,11 @@ function buildOnyxDataForTrackExpense(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
             value: {
-                errorFields: {
-                    createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
-                },
+                errorFields: existingTransactionThreadReport
+                    ? null
+                    : {
+                          createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                      },
             },
         },
         {
@@ -1386,7 +1395,7 @@ function getMoneyRequestInformation(
         receiptObject.state = receipt.state ?? CONST.IOU.RECEIPT_STATE.SCANREADY;
         filename = receipt.name;
     }
-    const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
+    const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${existingTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
     const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
     let optimisticTransaction = TransactionUtils.buildOptimisticTransaction(
         ReportUtils.isExpenseReport(iouReport) ? -amount : amount,
@@ -1446,6 +1455,8 @@ function getMoneyRequestInformation(
         );
 
     let reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
+
+    console.log('getMoneyRequestInformation', reportPreviewAction);
     if (reportPreviewAction) {
         reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
     } else {
@@ -1538,6 +1549,8 @@ function getTrackExpenseInformation(
     payeeEmail = currentUserEmail,
     payeeAccountID = userAccountID,
     moneyRequestReportID = '',
+    linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
+    existingTransactionID?: string,
 ): TrackExpenseInformation | EmptyObject {
     const isPolicyExpenseChat = participant.isPolicyExpenseChat;
 
@@ -1593,7 +1606,7 @@ function getTrackExpenseInformation(
         receiptObject.state = receipt.state ?? CONST.IOU.RECEIPT_STATE.SCANREADY;
         filename = receipt.name;
     }
-    const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
+    const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${existingTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
     const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
     let optimisticTransaction = TransactionUtils.buildOptimisticTransaction(
         ReportUtils.isExpenseReport(iouReport) ? -amount : amount,
@@ -1606,7 +1619,7 @@ function getTrackExpenseInformation(
         merchant,
         receiptObject,
         filename,
-        null,
+        existingTransactionID ?? null,
         category,
         tag,
         billable,
@@ -1643,6 +1656,8 @@ function getTrackExpenseInformation(
         receiptObject,
         false,
         !shouldUseMoneyReport,
+        linkedTrackedExpenseReportAction?.childReportID,
+        linkedTrackedExpenseReportAction,
     );
 
     let reportPreviewAction: OnyxEntry<OnyxTypes.ReportAction> = null;
@@ -1652,7 +1667,7 @@ function getTrackExpenseInformation(
             reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
         } else {
             reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, iouReport, comment, optimisticTransaction);
-
+            console.log('getTrackExpenseInformation', reportPreviewAction);
             // Generated ReportPreview action is a parent report action of the iou report.
             // We are setting the iou report's parentReportActionID to display subtitle correctly in IOU page when offline.
             iouReport.parentReportActionID = reportPreviewAction.reportActionID;
@@ -1667,8 +1682,8 @@ function getTrackExpenseInformation(
         optimisticCreatedActionForIOUReport,
         iouAction,
         reportPreviewAction,
-        optimisticTransactionThread,
-        optimisticCreatedActionForTransactionThread as OptimisticCreatedReportAction, // Add type assertion here
+        optimisticTransactionThread ?? {},
+        (optimisticCreatedActionForTransactionThread as OptimisticCreatedReportAction) ?? {}, // Add type assertion here
         shouldCreateNewMoneyRequestReport,
         policy,
         policyTagList,
@@ -2832,62 +2847,6 @@ function requestMoney(
             );
             break;
         }
-        case CONST.IOU.ACTION.CATEGORIZE: {
-            if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
-                return;
-            }
-            categorizeTrackedExpense(
-                chatReport.policyID ?? '',
-                transaction.transactionID,
-                iouAction.reportActionID,
-                iouReport.reportID,
-                createdIOUReportActionID,
-                actionableWhisperReportActionID,
-                linkedTrackedExpenseReportAction,
-                linkedTrackedExpenseReportID,
-                transactionThreadReportID,
-                onyxData,
-                amount,
-                currency,
-                comment,
-                merchant,
-                currentCreated,
-                category,
-                tag,
-                taxCode,
-                taxAmount,
-                billable,
-            );
-            break;
-        }
-        case CONST.IOU.ACTION.SHARE: {
-            if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
-                return;
-            }
-            shareTrackedExpense(
-                chatReport.policyID ?? '',
-                transaction.transactionID,
-                iouAction.reportActionID,
-                iouReport.reportID,
-                createdIOUReportActionID,
-                actionableWhisperReportActionID,
-                linkedTrackedExpenseReportAction,
-                linkedTrackedExpenseReportID,
-                transactionThreadReportID,
-                onyxData,
-                amount,
-                currency,
-                comment,
-                merchant,
-                currentCreated,
-                category,
-                tag,
-                taxCode,
-                taxAmount,
-                billable,
-            );
-            break;
-        }
         default: {
             const parameters: RequestMoneyParams = {
                 debtorEmail: payerEmail,
@@ -2923,12 +2882,7 @@ function requestMoney(
         }
     }
 
-    if (action === CONST.IOU.ACTION.SHARE) {
-        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? '', CONST.IOU.SHARE.ROLE.ACCOUNTANT));
-    } else {
-        Navigation.dismissModal(activeReportID);
-    }
-
+    Navigation.dismissModal(activeReportID);
     if (activeReportID) {
         Report.notifyNewAction(activeReportID, payeeAccountID);
     }
@@ -2958,10 +2912,15 @@ function trackExpense(
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     gpsPoints?: GPSPoint,
     validWaypoints?: WaypointCollection,
+    action?: ValueOf<typeof CONST.IOU.ACTION>,
+    actionableWhisperReportActionID?: string,
+    linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
+    linkedTrackedExpenseReportID?: string,
 ) {
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
     const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
     const moneyRequestReportID = isMoneyRequestReport ? report.reportID : '';
+    const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
 
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
     const {
@@ -2993,39 +2952,106 @@ function trackExpense(
         payeeEmail,
         payeeAccountID,
         moneyRequestReportID,
+        linkedTrackedExpenseReportAction,
+        isMovingTransactionFromTrackExpense ? (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID : undefined,
     );
     const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
 
-    const parameters: TrackExpenseParams = {
-        amount,
-        currency,
-        comment,
-        created: currentCreated,
-        merchant,
-        iouReportID: iouReport?.reportID,
-        chatReportID: chatReport.reportID,
-        transactionID: transaction.transactionID,
-        reportActionID: iouAction.reportActionID,
-        createdChatReportActionID,
-        createdIOUReportActionID,
-        reportPreviewReportActionID: reportPreviewAction?.reportActionID,
-        receipt,
-        receiptState: receipt?.state,
-        category,
-        tag,
-        taxCode,
-        taxAmount,
-        billable,
-        // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
-        gpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
-        transactionThreadReportID,
-        createdReportActionIDForThread,
-        waypoints: validWaypoints ? JSON.stringify(validWaypoints) : undefined,
-    };
+    switch (action) {
+        case CONST.IOU.ACTION.CATEGORIZE: {
+            if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
+                return;
+            }
+            categorizeTrackedExpense(
+                chatReport.policyID ?? '',
+                transaction.transactionID,
+                iouAction.reportActionID,
+                iouReport?.reportID ?? '',
+                createdIOUReportActionID ?? '',
+                actionableWhisperReportActionID,
+                linkedTrackedExpenseReportAction,
+                linkedTrackedExpenseReportID,
+                transactionThreadReportID,
+                onyxData,
+                amount,
+                currency,
+                comment,
+                merchant,
+                currentCreated,
+                category,
+                tag,
+                taxCode,
+                taxAmount,
+                billable,
+            );
+            break;
+        }
+        case CONST.IOU.ACTION.SHARE: {
+            if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
+                return;
+            }
+            shareTrackedExpense(
+                chatReport.policyID ?? '',
+                transaction.transactionID,
+                iouAction.reportActionID,
+                iouReport?.reportID ?? '',
+                createdIOUReportActionID ?? '',
+                actionableWhisperReportActionID,
+                linkedTrackedExpenseReportAction,
+                linkedTrackedExpenseReportID,
+                transactionThreadReportID,
+                onyxData,
+                amount,
+                currency,
+                comment,
+                merchant,
+                currentCreated,
+                category,
+                tag,
+                taxCode,
+                taxAmount,
+                billable,
+            );
+            break;
+        }
+        default: {
+            const parameters: TrackExpenseParams = {
+                amount,
+                currency,
+                comment,
+                created: currentCreated,
+                merchant,
+                iouReportID: iouReport?.reportID,
+                chatReportID: chatReport.reportID,
+                transactionID: transaction.transactionID,
+                reportActionID: iouAction.reportActionID,
+                createdChatReportActionID,
+                createdIOUReportActionID,
+                reportPreviewReportActionID: reportPreviewAction?.reportActionID,
+                receipt,
+                receiptState: receipt?.state,
+                category,
+                tag,
+                taxCode,
+                taxAmount,
+                billable,
+                // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
+                gpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
+                transactionThreadReportID,
+                createdReportActionIDForThread,
+                waypoints: validWaypoints ? JSON.stringify(validWaypoints) : undefined,
+            };
+
+            API.write(WRITE_COMMANDS.TRACK_EXPENSE, parameters, onyxData);
+            resetMoneyRequestInfo();
+        }
+    }
+    if (action === CONST.IOU.ACTION.SHARE) {
+        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? '', CONST.IOU.SHARE.ROLE.ACCOUNTANT));
+    } else {
+        Navigation.dismissModal(activeReportID);
+    }
 
-    API.write(WRITE_COMMANDS.TRACK_EXPENSE, parameters, onyxData);
-    resetMoneyRequestInfo();
-    Navigation.dismissModal(activeReportID);
     Report.notifyNewAction(activeReportID, payeeAccountID);
 }
 
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index 2d766195773c..b090e123818b 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -268,7 +268,8 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({betas, participan
     // canUseP2PDistanceRequests is true if the iouType is track expense, but we don't want to allow splitting distance with track expense yet
     const isAllowedToSplit =
         (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
-        (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE) && ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action)
+        (iouType !== CONST.IOU.TYPE.SEND || iouType !== CONST.IOU.TYPE.TRACK_EXPENSE) &&
+        ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action);
 
     const handleConfirmSelection = useCallback(
         (keyEvent, option) => {
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 8f137012c64c..7e5a18579deb 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -251,9 +251,13 @@ function IOURequestStepConfirmation({
                 policyCategories,
                 gpsPoints,
                 Object.keys(transaction?.comment?.waypoints ?? {}).length ? TransactionUtils.getValidWaypoints(transaction.comment.waypoints, true) : undefined,
+                action,
+                transaction.actionableWhisperReportActionID,
+                transaction.linkedTrackedExpenseReportAction,
+                transaction.linkedTrackedExpenseReportID,
             );
         },
-        [report, transaction, currentUserPersonalDetails.login, currentUserPersonalDetails.accountID, transactionTaxCode, transactionTaxAmount, policy, policyTags, policyCategories],
+        [report, transaction, currentUserPersonalDetails.login, currentUserPersonalDetails.accountID, transactionTaxCode, transactionTaxAmount, policy, policyTags, policyCategories, action],
     );
 
     const createDistanceRequest = useCallback(
@@ -355,7 +359,7 @@ function IOURequestStepConfirmation({
                 return;
             }
 
-            if (iouType === CONST.IOU.TYPE.TRACK_EXPENSE) {
+            if (iouType === CONST.IOU.TYPE.TRACK_EXPENSE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE) {
                 if (receiptFile && transaction) {
                     // If the transaction amount is zero, then the money is being requested through the "Scan" flow and the GPS coordinates need to be included.
                     if (transaction.amount === 0) {

From 14c8e929da2781dc558e919fb28f968b5c2adce9 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Mon, 15 Apr 2024 13:25:51 -0700
Subject: [PATCH 249/383] feat: add new field to Policy object

---
 src/types/onyx/Policy.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 40140338ff94..170f0c547831 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -405,6 +405,9 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Whether the connections data is being fetched */
         isLoadingConnections?: boolean;
 
+        /** Whether or not the connections data has been fetched or not */
+        hasConnectionsDataBeenFetched?: boolean;
+
         /** Report fields attached to the policy */
         fieldList?: Record<string, PolicyReportField>;
 

From 34c1c4d56cbd20eee3b9e9fc468fff9a527aa317 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 01:57:43 +0530
Subject: [PATCH 250/383] prettier

---
 src/libs/actions/IOU.ts                                     | 1 -
 .../MoneyTemporaryForRefactorRequestParticipantsSelector.js | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index ae301702302f..94c18d1ec809 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -1654,7 +1654,6 @@ function getTrackExpenseInformation(
             reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
         } else {
             reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, iouReport, comment, optimisticTransaction);
-            console.log('getTrackExpenseInformation', reportPreviewAction);
             // Generated ReportPreview action is a parent report action of the iou report.
             // We are setting the iou report's parentReportActionID to display subtitle correctly in IOU page when offline.
             iouReport.parentReportActionID = reportPreviewAction.reportActionID;
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index d270ff4f43e7..87883972f84f 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -263,7 +263,11 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({participants, onF
     const shouldShowSplitBillErrorMessage = participants.length > 1 && hasPolicyExpenseChatParticipant;
 
     // canUseP2PDistanceRequests is true if the iouType is track expense, but we don't want to allow splitting distance with track expense yet
-    const isAllowedToSplit = (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && iouType !== CONST.IOU.TYPE.SEND && iouType !== CONST.IOU.TYPE.TRACK_EXPENSE && ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action);
+    const isAllowedToSplit =
+        (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
+        iouType !== CONST.IOU.TYPE.SEND &&
+        iouType !== CONST.IOU.TYPE.TRACK_EXPENSE &&
+        ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.MOVE, CONST.IOU.ACTION.CATEGORIZE].includes(action);
 
     const handleConfirmSelection = useCallback(
         (keyEvent, option) => {

From 357ce2507801e49d49bb68aed7f34f1d8d645e82 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Mon, 15 Apr 2024 13:29:52 -0700
Subject: [PATCH 251/383] chore: update the fetching status field when taking
 the API request

---
 src/libs/actions/PolicyConnections.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
index 5aad8bc66898..d581c032e134 100644
--- a/src/libs/actions/PolicyConnections.ts
+++ b/src/libs/actions/PolicyConnections.ts
@@ -14,6 +14,7 @@ function openPolicyAccountingPage(policyID: string) {
             key: policyKey,
             value: {
                 isLoadingConnections: true,
+                hasConnectionsDataBeenFetched: false,
             },
         },
     ];
@@ -23,6 +24,7 @@ function openPolicyAccountingPage(policyID: string) {
             key: policyKey,
             value: {
                 isLoadingConnections: false,
+                hasConnectionsDataBeenFetched: true,
             },
         },
     ];
@@ -32,6 +34,7 @@ function openPolicyAccountingPage(policyID: string) {
             key: policyKey,
             value: {
                 isLoadingConnections: false,
+                hasConnectionsDataBeenFetched: true,
             },
         },
     ];

From cdcd2c1837da75986e56b1d5b48786cd52bd0ed4 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 02:00:14 +0530
Subject: [PATCH 252/383] remove console log

---
 src/libs/actions/IOU.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 94c18d1ec809..eaec162b3c42 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -1443,7 +1443,6 @@ function getMoneyRequestInformation(
 
     let reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
 
-    console.log('getMoneyRequestInformation', reportPreviewAction);
     if (reportPreviewAction) {
         reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
     } else {

From d9340cf121075a8c9d9aec5a96dea292fcbf11e0 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Mon, 15 Apr 2024 13:30:49 -0700
Subject: [PATCH 253/383] chore: check the fetched and loading statuses before
 making the api request

---
 src/pages/workspace/withPolicyConnections.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 06431c2653ca..4e4dd799adeb 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -30,7 +30,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
-            if (wasConnectionsDataFetched || !policy?.areConnectionsEnabled || !!policy?.connections || !policy?.id) {
+            if (!policy || !policy.areConnectionsEnabled || !!policy.connections || !!policy.hasConnectionsDataBeenFetched || !!policy.isLoadingConnections || !policy.id) {
                 return;
             }
 

From 68db14d92abec38f317649af55dfc02a270ca715 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Mon, 15 Apr 2024 13:31:39 -0700
Subject: [PATCH 254/383] refactor: remove unused statuses

---
 src/pages/workspace/withPolicyConnections.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 4e4dd799adeb..01feef800042 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,4 +1,4 @@
-import {useEffect, useState} from 'react';
+import {useEffect} from 'react';
 import type {ComponentType} from 'react';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import useNetwork from '@hooks/useNetwork';
@@ -22,11 +22,6 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
     function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
 
-        // When the accounting feature is enabled, but the user hasn't connected to any accounting software,
-        // the connections data doesn't exist. We don't want to continually attempt to fetch non-existent data.
-        // This state helps us track whether a data fetch attempt has been made.
-        const [wasConnectionsDataFetched, setWasConnectionsDataFetched] = useState(false);
-
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
@@ -35,8 +30,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
             }
 
             openPolicyAccountingPage(policy.id);
-            setWasConnectionsDataFetched(true);
-        }, [policy, wasConnectionsDataFetched]);
+        }, [policy]);
 
         if (!policy?.connections) {
             if (isOffline) {

From 2d11f33efc1c80584b3b794004e0dfb3071a2853 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 02:33:57 +0530
Subject: [PATCH 255/383] fixes lint

---
 .../CategorizeTrackedExpenseParams.ts         |  3 ++
 .../ConvertTrackedExpenseToRequestParams.ts   |  3 ++
 .../parameters/ShareTrackedExpenseParams.ts   |  3 ++
 src/libs/actions/IOU.ts                       | 32 +++++++++++++++----
 .../step/IOURequestStepConfirmation.tsx       |  2 ++
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
index 38ee5272f1e7..23b5152e0f18 100644
--- a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
@@ -1,3 +1,5 @@
+import type {Receipt} from '@src/types/onyx/Transaction';
+
 type CategorizeTrackedExpenseParams = {
     amount: number;
     currency: string;
@@ -13,6 +15,7 @@ type CategorizeTrackedExpenseParams = {
     modifiedExpenseReportActionID: string;
     category?: string;
     tag?: string;
+    receipt?: Receipt;
     taxCode: string;
     taxAmount: number;
     billable?: boolean;
diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
index 78f4be199a76..0e668312279c 100644
--- a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -1,3 +1,5 @@
+import type {Receipt} from '@src/types/onyx/Transaction';
+
 type ConvertTrackedExpenseToRequestParams = {
     amount: number;
     currency: string;
@@ -9,6 +11,7 @@ type ConvertTrackedExpenseToRequestParams = {
     transactionID: string;
     actionableWhisperReportActionID: string;
     createdChatReportActionID: string;
+    receipt?: Receipt;
     moneyRequestReportID: string;
     moneyRequestCreatedReportActionID: string;
     moneyRequestPreviewReportActionID: string;
diff --git a/src/libs/API/parameters/ShareTrackedExpenseParams.ts b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
index 33288e676cda..f6aadf3e221c 100644
--- a/src/libs/API/parameters/ShareTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
@@ -1,3 +1,5 @@
+import type {Receipt} from '@src/types/onyx/Transaction';
+
 type ShareTrackedExpenseParams = {
     amount: number;
     currency: string;
@@ -13,6 +15,7 @@ type ShareTrackedExpenseParams = {
     modifiedExpenseReportActionID: string;
     category?: string;
     tag?: string;
+    receipt?: Receipt;
     taxCode: string;
     taxAmount: number;
     billable?: boolean;
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index eaec162b3c42..6cc469fbf851 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -282,6 +282,17 @@ function getPolicy(policyID: string | undefined): OnyxTypes.Policy | EmptyObject
     return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? {};
 }
 
+/**
+ * Find the report preview action from given chat report and iou report
+ */
+function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxEntry<ReportAction> {
+    return (
+        Object.values(reportActionsByReport?.[chatReportID] ?? {}).find(
+            (reportAction) => reportAction && reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && reportAction.originalMessage.linkedReportID === iouReportID,
+        ) ?? null
+    );
+}
+
 /**
  * Initialize money request info
  * @param reportID to attach the transaction to
@@ -1441,7 +1452,7 @@ function getMoneyRequestInformation(
             linkedTrackedExpenseReportAction,
         );
 
-    let reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
+    let reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : getReportPreviewAction(chatReport.reportID, iouReport.reportID);
 
     if (reportPreviewAction) {
         reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
@@ -1648,7 +1659,7 @@ function getTrackExpenseInformation(
 
     let reportPreviewAction: OnyxEntry<OnyxTypes.ReportAction> = null;
     if (shouldUseMoneyReport && iouReport) {
-        reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
+        reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : getReportPreviewAction(chatReport.reportID, iouReport.reportID);
         if (reportPreviewAction) {
             reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
         } else {
@@ -2563,6 +2574,7 @@ function convertTrackedExpenseToRequest(
     comment: string,
     merchant: string,
     created: string,
+    receipt?: Receipt,
 ) {
     const {optimisticData, successData, failureData} = onyxData;
 
@@ -2590,6 +2602,7 @@ function convertTrackedExpenseToRequest(
         comment,
         created,
         merchant,
+        receipt,
         payerAccountID,
         chatReportID,
         transactionID,
@@ -2625,6 +2638,7 @@ function categorizeTrackedExpense(
     taxCode = '',
     taxAmount = 0,
     billable?: boolean,
+    receipt?: Receipt,
 ) {
     const {optimisticData, successData, failureData} = onyxData;
 
@@ -2664,6 +2678,7 @@ function categorizeTrackedExpense(
         taxAmount,
         billable,
         created,
+        receipt,
     };
 
     API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
@@ -2690,6 +2705,7 @@ function shareTrackedExpense(
     taxCode = '',
     taxAmount = 0,
     billable?: boolean,
+    receipt?: Receipt,
 ) {
     const {optimisticData, successData, failureData} = onyxData;
 
@@ -2729,6 +2745,7 @@ function shareTrackedExpense(
         taxCode,
         taxAmount,
         billable,
+        receipt,
     };
 
     API.write(WRITE_COMMANDS.SHARE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
@@ -2829,6 +2846,7 @@ function requestMoney(
                 comment,
                 merchant,
                 currentCreated,
+                receipt,
             );
             break;
         }
@@ -2968,6 +2986,7 @@ function trackExpense(
                 taxCode,
                 taxAmount,
                 billable,
+                receipt,
             );
             break;
         }
@@ -2996,6 +3015,7 @@ function trackExpense(
                 taxCode,
                 taxAmount,
                 billable,
+                receipt,
             );
             break;
         }
@@ -3383,7 +3403,7 @@ function createSplitsAndOnyxData(
               }
             : {};
 
-        let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
+        let oneOnOneReportPreviewAction = getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
         if (oneOnOneReportPreviewAction) {
             oneOnOneReportPreviewAction = ReportUtils.updateReportPreview(oneOnOneIOUReport, oneOnOneReportPreviewAction);
         } else {
@@ -4052,7 +4072,7 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
                 undefined,
             );
 
-        let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport?.reportID ?? '', oneOnOneIOUReport?.reportID ?? '');
+        let oneOnOneReportPreviewAction = getReportPreviewAction(oneOnOneChatReport?.reportID ?? '', oneOnOneIOUReport?.reportID ?? '');
         if (oneOnOneReportPreviewAction) {
             oneOnOneReportPreviewAction = ReportUtils.updateReportPreview(oneOnOneIOUReport, oneOnOneReportPreviewAction);
         } else {
@@ -4454,7 +4474,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
     const iouReportID = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? reportAction.originalMessage.IOUReportID : '';
     const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`] ?? null;
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`];
-    const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(iouReport?.chatReportID ?? '', iouReport?.reportID ?? '');
+    const reportPreviewAction = getReportPreviewAction(iouReport?.chatReportID ?? '', iouReport?.reportID ?? '');
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
     const transactionThreadID = reportAction.childReportID;
@@ -5089,7 +5109,7 @@ function getPayMoneyRequestParams(
     // In some instances, the report preview action might not be available to the payer (only whispered to the requestor)
     // hence we need to make the updates to the action safely.
     let optimisticReportPreviewAction = null;
-    const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
+    const reportPreviewAction = getReportPreviewAction(chatReport.reportID, iouReport.reportID);
     if (reportPreviewAction) {
         optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, true);
     }
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 7c8857b356a8..8a3b5cf02986 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -186,6 +186,8 @@ function IOURequestStepConfirmation({
                 return;
             }
 
+            console.log(receiptObj, 'receiptObj');
+
             IOU.requestMoney(
                 report,
                 transaction.amount,

From 8515852dce523ff76c01e49042c27d4ac426f9bd Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 02:46:14 +0530
Subject: [PATCH 256/383] remove console

---
 src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 8a3b5cf02986..7c8857b356a8 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -186,8 +186,6 @@ function IOURequestStepConfirmation({
                 return;
             }
 
-            console.log(receiptObj, 'receiptObj');
-
             IOU.requestMoney(
                 report,
                 transaction.amount,

From 768571d31c5c82869541d8dd0ee32c3dc48cc848 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 14:19:31 -0700
Subject: [PATCH 257/383] Simplify loading state / add back button

---
 .../index.native.tsx                          | 63 ++++++++-----------
 .../ConnectToQuickbooksOnlineButton/index.tsx |  1 -
 2 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index f8c1dac8c2ea..5dd7451ace82 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -1,12 +1,13 @@
-import React, {useCallback, useState} from 'react';
+import React, {useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
-import type {WebViewNavigation} from 'react-native-webview';
 import {WebView} from 'react-native-webview';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import Button from '@components/Button';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
 import CONST from '@src/CONST';
@@ -22,51 +23,39 @@ type ConnectToQuickbooksOnlineButtonOnyxProps = {
 const renderLoading = () => <FullScreenLoadingIndicator />;
 
 function ConnectToQuickbooksOnlineButton({policyID, session}: ConnectToQuickbooksOnlineButtonProps & ConnectToQuickbooksOnlineButtonOnyxProps) {
-    const [isWebViewOpen, setWebViewOpen] = useState(false);
-    const [isQuickbooksOnlineReady, setIsQuickbooksOnlineReady] = useState(false);
+    const [isModalOpen, setIsModalOpen] = useState(false);
     const {translate} = useLocalize();
 
-    const handleNavigationStateChange = useCallback(({url, loading}: WebViewNavigation) => {
-        if (loading || !url.startsWith('https://accounts.intuit.com/app/sign-in')) {
-            return;
-        }
-        setIsQuickbooksOnlineReady(true);
-    }, []);
-
     return (
         <>
             <Button
-                onPress={() => setWebViewOpen(true)}
+                onPress={() => setIsModalOpen(true)}
                 text={translate('workspace.accounting.setup')}
-                small
             />
-            {isWebViewOpen && (
+            <Modal
+                fullscreen
+                onClose={() => setIsModalOpen(false)}
+                isVisible={isModalOpen}
+                type={CONST.MODAL.MODAL_TYPE.CENTERED}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.accounting.title')}
+                    onBackButtonPress={() => setIsModalOpen(false)}
+                />
                 <FullPageOfflineBlockingView>
-                    <Modal
-                        onClose={() => {
-                            setWebViewOpen(false);
-                            setIsQuickbooksOnlineReady(false);
+                    <WebView
+                        source={{
+                            uri: getQuickBooksOnlineSetupLink(policyID),
+                            headers: {
+                                Cookie: `authToken=${session?.authToken}`,
+                            },
                         }}
-                        fullscreen
-                        isVisible
-                        type={CONST.MODAL.MODAL_TYPE.CENTERED}
-                    >
-                        {!isQuickbooksOnlineReady && <FullScreenLoadingIndicator />}
-                        <WebView
-                            source={{
-                                uri: getQuickBooksOnlineSetupLink(policyID),
-                                headers: {
-                                    Cookie: `authToken=${session?.authToken}`,
-                                },
-                            }}
-                            incognito // 'incognito' prop required for Android, issue here https://github.com/react-native-webview/react-native-webview/issues/1352
-                            startInLoadingState={false}
-                            renderLoading={renderLoading}
-                            onNavigationStateChange={handleNavigationStateChange}
-                        />
-                    </Modal>
+                        incognito // 'incognito' prop required for Android, issue here https://github.com/react-native-webview/react-native-webview/issues/1352
+                        startInLoadingState
+                        renderLoading={renderLoading}
+                    />
                 </FullPageOfflineBlockingView>
-            )}
+            </Modal>
         </>
     );
 }
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index 5fe1a71c9037..8de22a8746a5 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -16,7 +16,6 @@ function ConnectToQuickbooksOnlineButton({policyID}: ConnectToQuickbooksOnlineBu
             onPress={() => Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL, false)}
             text={translate('workspace.accounting.setup')}
             style={styles.justifyContentCenter}
-            small
         />
     );
 }

From d4d55efb9892acdbb0b9dc600f2668c939ea19a3 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 14:19:37 -0700
Subject: [PATCH 258/383] Style

---
 src/libs/actions/connections/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index 68d349e8bfcf..efec23d7c989 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -42,13 +42,18 @@ function removePolicyConnection(policyID: string, connectionName: PolicyConnecti
     };
     API.write(WRITE_COMMANDS.REMOVE_POLICY_CONNECTION, parameters, {optimisticData, failureData});
 }
-function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TSettingName extends keyof Connections[TConnectionName]['config']>(policyID: string, connectionName: TConnectionName, settingName: TSettingName, settingValue: Connections[TConnectionName]['config'][TSettingName]) {
+function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TSettingName extends keyof Connections[TConnectionName]['config']>(
+    policyID: string,
+    connectionName: TConnectionName,
+    settingName: TSettingName,
+    settingValue: Connections[TConnectionName]['config'][TSettingName],
+) {
     const parameters: UpdatePolicyConnectionConfigParams<TConnectionName, TSettingName> = {
         policyID,
         connectionName,
         settingName,
         settingValue,
-        idempotencyKey: String(settingName)
+        idempotencyKey: String(settingName),
     };
     const optimisticData: OnyxUpdate[] = [
         {

From 50402d29b5825e8c439b5fadabaf41d63783afa8 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 03:47:31 +0530
Subject: [PATCH 259/383] pass reportPreviewReportActionID to api for request,
 share and categorize actions

---
 .../parameters/CategorizeTrackedExpenseParams.ts  |  1 +
 .../ConvertTrackedExpenseToRequestParams.ts       |  1 +
 .../API/parameters/ShareTrackedExpenseParams.ts   |  1 +
 src/libs/actions/IOU.ts                           | 15 ++++++++++++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
index 23b5152e0f18..9b61d1e3faf0 100644
--- a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
@@ -13,6 +13,7 @@ type CategorizeTrackedExpenseParams = {
     moneyRequestCreatedReportActionID: string;
     actionableWhisperReportActionID: string;
     modifiedExpenseReportActionID: string;
+    reportPreviewReportActionID: string,
     category?: string;
     tag?: string;
     receipt?: Receipt;
diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
index 0e668312279c..8eb85cebf99f 100644
--- a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -15,6 +15,7 @@ type ConvertTrackedExpenseToRequestParams = {
     moneyRequestReportID: string;
     moneyRequestCreatedReportActionID: string;
     moneyRequestPreviewReportActionID: string;
+    reportPreviewReportActionID: string,
 };
 
 export default ConvertTrackedExpenseToRequestParams;
diff --git a/src/libs/API/parameters/ShareTrackedExpenseParams.ts b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
index f6aadf3e221c..22faf6af65ef 100644
--- a/src/libs/API/parameters/ShareTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
@@ -13,6 +13,7 @@ type ShareTrackedExpenseParams = {
     moneyRequestCreatedReportActionID: string;
     actionableWhisperReportActionID: string;
     modifiedExpenseReportActionID: string;
+    reportPreviewReportActionID: string,
     category?: string;
     tag?: string;
     receipt?: Receipt;
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 6cc469fbf851..2c3fc0bb3b31 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -286,8 +286,11 @@ function getPolicy(policyID: string | undefined): OnyxTypes.Policy | EmptyObject
  * Find the report preview action from given chat report and iou report
  */
 function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxEntry<ReportAction> {
+    const reportActions = reportActionsByReport?.[chatReportID] ?? {};
+
+    // Find the report preview action from the chat report
     return (
-        Object.values(reportActionsByReport?.[chatReportID] ?? {}).find(
+        Object.values(reportActions).find(
             (reportAction) => reportAction && reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && reportAction.originalMessage.linkedReportID === iouReportID,
         ) ?? null
     );
@@ -1660,6 +1663,7 @@ function getTrackExpenseInformation(
     let reportPreviewAction: OnyxEntry<OnyxTypes.ReportAction> = null;
     if (shouldUseMoneyReport && iouReport) {
         reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : getReportPreviewAction(chatReport.reportID, iouReport.reportID);
+
         if (reportPreviewAction) {
             reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
         } else {
@@ -2568,6 +2572,7 @@ function convertTrackedExpenseToRequest(
     linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
+    reportPreviewReportActionID: string,
     onyxData: OnyxData,
     amount: number,
     currency: string,
@@ -2613,6 +2618,7 @@ function convertTrackedExpenseToRequest(
         moneyRequestPreviewReportActionID,
         transactionThreadReportID,
         modifiedExpenseReportActionID,
+        reportPreviewReportActionID,
     };
     API.write(WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST, parameters, {optimisticData, successData, failureData});
 }
@@ -2627,6 +2633,7 @@ function categorizeTrackedExpense(
     linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
+    reportPreviewReportActionID: string,
     onyxData: OnyxData,
     amount: number,
     currency: string,
@@ -2668,6 +2675,7 @@ function categorizeTrackedExpense(
         moneyRequestCreatedReportActionID,
         actionableWhisperReportActionID,
         modifiedExpenseReportActionID,
+        reportPreviewReportActionID,
         amount,
         currency,
         comment,
@@ -2694,6 +2702,7 @@ function shareTrackedExpense(
     linkedTrackedExpenseReportAction: OnyxTypes.ReportAction,
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
+    reportPreviewReportActionID: string,
     onyxData: OnyxData,
     amount: number,
     currency: string,
@@ -2735,6 +2744,7 @@ function shareTrackedExpense(
         moneyRequestCreatedReportActionID,
         actionableWhisperReportActionID,
         modifiedExpenseReportActionID,
+        reportPreviewReportActionID,
         amount,
         currency,
         comment,
@@ -2840,6 +2850,7 @@ function requestMoney(
                 linkedTrackedExpenseReportAction,
                 linkedTrackedExpenseReportID,
                 transactionThreadReportID,
+                reportPreviewAction.reportActionID,
                 onyxData,
                 amount,
                 currency,
@@ -2975,6 +2986,7 @@ function trackExpense(
                 linkedTrackedExpenseReportAction,
                 linkedTrackedExpenseReportID,
                 transactionThreadReportID,
+                reportPreviewAction?.reportActionID ?? '',
                 onyxData,
                 amount,
                 currency,
@@ -3004,6 +3016,7 @@ function trackExpense(
                 linkedTrackedExpenseReportAction,
                 linkedTrackedExpenseReportID,
                 transactionThreadReportID,
+                reportPreviewAction?.reportActionID ?? '',
                 onyxData,
                 amount,
                 currency,

From 50d57f8ae0bd5f769af105f900c7f8db64b1dd2c Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 15:55:16 -0700
Subject: [PATCH 260/383] Include connectionName

---
 .../workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx   | 1 +
 src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx     | 1 +
 src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx   | 1 +
 src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx   | 1 +
 src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
index d4ba46e4b46e..e75d2e7a345d 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
@@ -49,6 +49,7 @@ function QuickbooksChartOfAccountsPage({policy}: WithPolicyProps) {
                                         onToggle={() =>
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
+                                                CONST.POLICY.CONNECTIONS.NAME.QBO,
                                                 CONST.QUICK_BOOKS_IMPORTS.ENABLE_NEW_CATEGORIES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
index ffa2e54c421e..498bacfd8e56 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
@@ -51,6 +51,7 @@ function QuickbooksClassesPage({policy}: WithPolicyProps) {
                                         onToggle={() =>
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
+                                                CONST.POLICY.CONNECTIONS.NAME.QBO,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_CLASSES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
index f321bf9b49a7..4fbcbe9b7a5a 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
@@ -50,6 +50,7 @@ function QuickbooksCustomersPage({policy}: WithPolicyProps) {
                                         onToggle={() =>
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
+                                                CONST.POLICY.CONNECTIONS.NAME.QBO,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_CUSTOMERS,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
index 728db13a7f36..e6e4d771969d 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
@@ -51,6 +51,7 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
                                         onToggle={() =>
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
+                                                CONST.POLICY.CONNECTIONS.NAME.QBO,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_LOCATIONS,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
index a2d41969fb27..f35500a23087 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
@@ -48,6 +48,7 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
                                         onToggle={() =>
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
+                                                CONST.POLICY.CONNECTIONS.NAME.QBO,
                                                 CONST.QUICK_BOOKS_IMPORTS.SYNC_TAXES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )

From 3b501792ba7005a074e1f36897b61bd246b46823 Mon Sep 17 00:00:00 2001
From: Ezra Ellette <ezrasellette@gmail.com>
Date: Mon, 15 Apr 2024 18:52:13 -0500
Subject: [PATCH 261/383] Update SidebarUtils reportActionsProcessing

---
 src/libs/SidebarUtils.ts | 44 +++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 18ff4063650c..60a177c8fea9 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -23,8 +23,8 @@ import * as ReportUtils from './ReportUtils';
 import * as TaskUtils from './TaskUtils';
 import * as UserUtils from './UserUtils';
 
-let reportActionsByReport: OnyxCollection<ReportActions> = {};
-let visibleReportActionItems: ReportActions = {};
+const reportActionsByReport: OnyxCollection<ReportActions> = {};
+const visibleReportActionItems: ReportActions = {};
 
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
@@ -34,30 +34,24 @@ Onyx.connect({
             return;
         }
 
-        reportActionsByReport = Object.fromEntries(
-            Object.entries(actions).map(([key, reportActions]) => {
-                const reportID = CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`);
-                return [reportID, reportActions];
-            }),
-        );
+        Object.entries(actions).forEach(([reportKey, reportActions]) => {
+            const reportID = CollectionUtils.extractCollectionItemID(reportKey as `reportActions_${string}`);
 
-        visibleReportActionItems = Object.fromEntries(
-            Object.entries(reportActionsByReport).map(([reportID, reportActions]) => {
-                const actionsArray: ReportAction[] = ReportActionsUtils.getSortedReportActions(Object.values(reportActions ?? {}));
-
-                // The report is only visible if it is the last action not deleted that
-                // does not match a closed or created state.
-                const reportActionsForDisplay = actionsArray.filter(
-                    (reportAction, actionKey) =>
-                        ReportActionsUtils.shouldReportActionBeVisible(reportAction, actionKey) &&
-                        !ReportActionsUtils.isWhisperAction(reportAction) &&
-                        reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED &&
-                        reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                );
-
-                return [reportID, reportActionsForDisplay[reportActionsForDisplay.length - 1]];
-            }),
-        );
+            reportActionsByReport[reportID] = reportActions;
+
+            const actionsArray: ReportAction[] = ReportActionsUtils.getSortedReportActions(Object.values(reportActions ?? {}));
+            // The report is only visible if it is the last action not deleted that
+            // does not match a closed or created state.
+            const reportActionsForDisplay = actionsArray.filter(
+                (reportAction, actionKey) =>
+                    ReportActionsUtils.shouldReportActionBeVisible(reportAction, actionKey) &&
+                    !ReportActionsUtils.isWhisperAction(reportAction) &&
+                    reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED &&
+                    reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+            );
+
+            visibleReportActionItems[reportID] = reportActionsForDisplay[reportActionsForDisplay.length - 1];
+        });
     },
 });
 

From 48ee7fe91df2c6791f28dfc84d997d273e2aee97 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 17:43:39 -0700
Subject: [PATCH 262/383] Move parameters

---
 src/libs/actions/connections/index.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index efec23d7c989..49e3ec2bb6ee 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -48,13 +48,6 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
     settingName: TSettingName,
     settingValue: Connections[TConnectionName]['config'][TSettingName],
 ) {
-    const parameters: UpdatePolicyConnectionConfigParams<TConnectionName, TSettingName> = {
-        policyID,
-        connectionName,
-        settingName,
-        settingValue,
-        idempotencyKey: String(settingName),
-    };
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -121,6 +114,13 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
         },
     ];
 
+    const parameters: UpdatePolicyConnectionConfigParams<TConnectionName, TSettingName> = {
+        policyID,
+        connectionName,
+        settingName,
+        settingValue,
+        idempotencyKey: String(settingName),
+    };
     API.write(WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG, parameters, {optimisticData, failureData, successData});
 }
 

From 7bc2047612512ee5a867762e05bb858dd4c9fc94 Mon Sep 17 00:00:00 2001
From: Antony Kithinzi <kithinzi97@gmail.com>
Date: Tue, 16 Apr 2024 02:46:36 +0200
Subject: [PATCH 263/383] EditTagPage.tsx

---
 src/pages/workspace/tags/EditTagPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index fbde96eb2b91..d329d74dbca0 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -37,7 +37,7 @@ function EditTagPage({route, policyTags}: EditTagPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {inputCallbackRef} = useAutoFocusInput();
-    const currentTagName = route.params.tagName;
+    const currentTagName = PolicyUtils.getCleanedTagName(route.params.tagName);
 
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {

From f35fb19f84b93d85b6ae1d18d6f79aabb231133b Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 17:50:40 -0700
Subject: [PATCH 264/383] Use connectionName instead of hardcoded qbo

---
 src/libs/actions/connections/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index 49e3ec2bb6ee..154036ba70e1 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -54,7 +54,7 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 connections: {
-                    quickbooksOnline: {
+                    [connectionName]: {
                         config: {
                             [settingName]: settingValue,
                             pendingFields: {
@@ -76,7 +76,7 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 connections: {
-                    quickbooksOnline: {
+                    [connectionName]: {
                         config: {
                             [settingName]: settingValue,
                             pendingFields: {
@@ -98,7 +98,7 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 connections: {
-                    quickbooksOnline: {
+                    [connectionName]: {
                         config: {
                             [settingName]: settingValue,
                             pendingFields: {

From 172e5b64fda8b358adf26106a8b091a2ed8e4283 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 15 Apr 2024 17:52:31 -0700
Subject: [PATCH 265/383] Remove unused import

---
 src/components/ConnectToQuickbooksOnlineButton/index.native.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index 5dd7451ace82..4d482cb92ead 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -7,7 +7,6 @@ import Button from '@components/Button';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Modal from '@components/Modal';
-import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
 import CONST from '@src/CONST';

From f4b975e13ccc9b5cbde986450f296311ea104680 Mon Sep 17 00:00:00 2001
From: nkdengineer <161821005+nkdengineer@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:05:23 +0700
Subject: [PATCH 266/383] Update package.json

Co-authored-by: Pavlo Tsimura <paultsimura@gmail.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93d1e1be130f..4030e0f53e63 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "^0.1.49",
+    "@expensify/react-native-live-markdown": "0.1.49",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",

From 17b9ac02e7fd6394aa944933d9aa1d9f64a17c75 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Tue, 16 Apr 2024 09:58:53 +0530
Subject: [PATCH 267/383] Fixed wrong translation

---
 ...eyTemporaryForRefactorRequestConfirmationList.tsx |  2 +-
 src/libs/ReportUtils.ts                              | 12 ++++++------
 src/pages/home/report/ReportActionItem.tsx           |  2 +-
 tests/unit/ReportUtilsTest.ts                        |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
index e982f3d5f03b..98e3581b58f5 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
@@ -72,7 +72,7 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
     /** Callback to inform parent modal of success */
     onConfirm?: (selectedParticipants: Participant[]) => void;
 
-    /** Callback to parent modal to send money */
+    /** Callback to parent modal to pay someone */
     onSendMoney?: (paymentMethod: PaymentMethodType | undefined) => void;
 
     /** Callback to inform a participant is selected */
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 04f814c50ad9..69702b01ad03 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2713,7 +2713,7 @@ function getReportPreviewMessage(
 
             const transactionDetails = getTransactionDetails(linkedTransaction);
             const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency ?? '');
-            return Localize.translateLocal('iou.submittedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
+            return Localize.translateLocal('iou.trackedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
         }
     }
 
@@ -3317,7 +3317,7 @@ function buildOptimisticTaskCommentReportAction(taskReportID: string, taskTitle:
  * @param total - IOU amount in the smallest unit of the currency.
  * @param chatReportID - Report ID of the chat where the IOU is.
  * @param currency - IOU currency.
- * @param isSendingMoney - If we send money the IOU should be created as settled
+ * @param isSendingMoney - If we pay someone the IOU should be created as settled
  */
 
 function buildOptimisticIOUReport(payeeAccountID: number, payerAccountID: number, total: number, chatReportID: string, currency: string, isSendingMoney = false): OptimisticIOUReport {
@@ -3510,7 +3510,7 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
  * @param [paymentType] - Only required if the IOUReportAction type is 'pay'. Can be oneOf(elsewhere, Expensify).
  * @param [iouReportID] - Only required if the IOUReportActions type is oneOf(decline, cancel, pay). Generates a randomID as default.
  * @param [isSettlingUp] - Whether we are settling up an IOU.
- * @param [isSendMoneyFlow] - Whether this is send money flow
+ * @param [isSendMoneyFlow] - Whether this is pay someone flow
  * @param [receipt]
  * @param [isOwnPolicyExpenseChat] - Whether this is an expense report create from the current user's policy expense chat
  */
@@ -3541,7 +3541,7 @@ function buildOptimisticIOUReportAction(
     };
 
     if (type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
-        // In send money flow, we store amount, comment, currency in IOUDetails when type = pay
+        // In pay someone flow, we store amount, comment, currency in IOUDetails when type = pay
         if (isSendMoneyFlow) {
             const keys = ['amount', 'comment', 'currency'] as const;
             keys.forEach((key) => {
@@ -5016,7 +5016,7 @@ function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Pol
         }
     }
 
-    // Send money option should be visible only in 1:1 DMs
+    // Pay someone option should be visible only in 1:1 DMs
     if (isDM(report) && hasSingleOtherParticipantInReport) {
         options = [...options, CONST.IOU.TYPE.SEND];
     }
@@ -5383,7 +5383,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
     if (originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
         // The `REPORT_ACTION_TYPE.PAY` action type is used for both fulfilling existing requests and sending money. To
         // differentiate between these two scenarios, we check if the `originalMessage` contains the `IOUDetails`
-        // property. If it does, it indicates that this is a 'Send money' action.
+        // property. If it does, it indicates that this is a 'Pay someone' action.
         const {amount, currency} = originalMessage.IOUDetails ?? originalMessage;
         const formattedAmount = CurrencyUtils.convertToDisplayString(Math.abs(amount), currency) ?? '';
 
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 800aa81e0dc7..3f6138d173c9 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -800,7 +800,7 @@ function ReportActionItem({
         );
     }
 
-    // For the `pay` IOU action on non-send money flow, we don't want to render anything if `isWaitingOnBankAccount` is true
+    // For the `pay` IOU action on non-pay expense flow, we don't want to render anything if `isWaitingOnBankAccount` is true
     // Otherwise, we will see two system messages informing the payee needs to add a bank account or wallet
     if (isIOUReport(action) && !!report?.isWaitingOnBankAccount && action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && !isSendingMoney) {
         return null;
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index d1be9a347831..63f83a03e022 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -490,7 +490,7 @@ describe('ReportUtils', () => {
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)).toBe(true);
             });
 
-            it('user has send money permission', () => {
+            it('user has pay expense permission', () => {
                 const report = {
                     ...LHNTestUtils.getFakeReport(),
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
@@ -525,7 +525,7 @@ describe('ReportUtils', () => {
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.REQUEST)).toBe(true);
             });
 
-            it('it is an IOU report in submitted state even with send money permissions', () => {
+            it('it is an IOU report in submitted state even with pay expense permissions', () => {
                 const report = {
                     ...LHNTestUtils.getFakeReport(),
                     type: CONST.REPORT.TYPE.IOU,
@@ -598,7 +598,7 @@ describe('ReportUtils', () => {
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.REQUEST)).toBe(true);
             });
 
-            it('it is an IOU report in submitted state even with send money permissions', () => {
+            it('it is an IOU report in submitted state even with pay expense permissions', () => {
                 const report = {
                     ...LHNTestUtils.getFakeReport(),
                     type: CONST.REPORT.TYPE.IOU,

From 51c256135cbabdcec49e0539170c34cf2d01a428 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:06:38 +0530
Subject: [PATCH 268/383] Apply suggestions from code review

Co-authored-by: G T <75031127+getusha@users.noreply.github.com>
Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
---
 .well-known/apple-app-site-association |  2 +-
 src/languages/es.ts                    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
index a156d919c020..26c23de2aed9 100644
--- a/.well-known/apple-app-site-association
+++ b/.well-known/apple-app-site-association
@@ -82,7 +82,7 @@
                     },
                     {
                         "/": "/send/*",
-                        "comment": "Pay Someone"
+                        "comment": "Pay someone"
                     },
                     {
                         "/": "/money2020/*",
diff --git a/src/languages/es.ts b/src/languages/es.ts
index abae4d379e00..51c7997c8d62 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -617,7 +617,7 @@ export default {
         expense: 'Solicitar',
         participants: 'Participantes',
         submitExpense: 'Pedir dinero',
-        paySomeone: ({name}: PaySomeoneParams) => `Pay ${name ?? 'someone'}`,
+        paySomeone: ({name}: PaySomeoneParams) => `Pagar a ${name ?? 'alguien'}`,
         trackExpense: 'Seguimiento de gastos',
         pay: 'Pagar',
         cancelPayment: 'Cancelar el pago',
@@ -637,10 +637,10 @@ export default {
         receiptScanningFailed: 'El escaneo de recibo ha fallado. Introduce los detalles manualmente.',
         transactionPendingText: 'La transacción tarda unos días en contabilizarse desde la fecha en que se utilizó la tarjeta.',
         expenseCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
-            `${count} ${Str.pluralize('solicitude', 'solicitudes', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}${
+            `${count} ${Str.pluralize('gasto', 'gastos', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}${
                 pendingReceipts > 0 ? `, ${pendingReceipts} pendiente` : ''
             }`,
-        deleteExpense: 'Eliminar solicitud',
+        deleteExpense: 'Eliminar gasto',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar esta solicitud?',
         settledExpensify: 'Pagado',
         settledElsewhere: 'Pagado de otra forma',
@@ -649,8 +649,8 @@ export default {
         nextStep: 'Pasos Siguientes',
         finished: 'Finalizado',
         submitAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
-        submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicité ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
-        trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `seguimiento ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
+        submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicitó ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
+        trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `realizó un seguimiento de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `dividió ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         amountEach: ({amount}: AmountEachParams) => `${amount} cada uno`,
@@ -674,7 +674,7 @@ export default {
         paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount} con Expensify`,
         noReimbursableExpenses: 'El importe de este informe no es válido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
-        changedTheExpense: 'cambió la solicitud',
+        changedTheExpense: 'cambió el gasto',
         setTheRequest: ({valueName, newValueToDisplay}: SetTheRequestParams) => `${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay}`,
         setTheDistance: ({newDistanceToDisplay, newAmountToDisplay}: SetTheDistanceParams) =>
             `estableció la distancia a ${newDistanceToDisplay}, lo que estableció el importe a ${newAmountToDisplay}`,
@@ -683,7 +683,7 @@ export default {
             `${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay} (previamente ${oldValueToDisplay})`,
         updatedTheDistance: ({newDistanceToDisplay, oldDistanceToDisplay, newAmountToDisplay, oldAmountToDisplay}: UpdatedTheDistanceParams) =>
             `cambió la distancia a ${newDistanceToDisplay} (previamente ${oldDistanceToDisplay}), lo que cambió el importe a ${newAmountToDisplay} (previamente ${oldAmountToDisplay})`,
-        threadExpenseReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${comment ? `${formattedAmount} para ${comment}` : `Solicitud de ${formattedAmount}`}`,
+        threadExpenseReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${comment ? `${formattedAmount} para ${comment}` : `Gasto de ${formattedAmount}`}`,
         threadTrackReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Seguimiento ${formattedAmount} ${comment ? `para ${comment}` : ''}`,
         threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
         tagSelection: 'Selecciona una etiqueta para organizar mejor tu dinero.',
@@ -703,19 +703,19 @@ export default {
             genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
             duplicateWaypointsErrorMessage: 'Por favor, elimina los puntos de ruta duplicados',
             atLeastTwoDifferentWaypoints: 'Por favor, introduce al menos dos direcciones diferentes',
-            splitExpenseMultipleParticipantsErrorMessage: 'Solo puedes dividir una cuenta entre un único espacio de trabajo o con usuarios individuales. Por favor, actualiza tu selección.',
+            splitExpenseMultipleParticipantsErrorMessage: 'Solo puedes dividir un gasto entre un único espacio de trabajo o con usuarios individuales. Por favor, actualiza tu selección.',
             invalidMerchant: 'Por favor, introduce un comerciante correcto.',
         },
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
         enableWallet: 'Habilitar Billetera',
-        holdExpense: 'Bloquear solicitud',
-        unholdExpense: 'Desbloquear solicitud',
-        heldExpense: 'bloqueó esta solicitud',
-        unheldExpense: 'desbloqueó esta solicitud',
+        holdExpense: 'Bloquear gasto',
+        unholdExpense: 'Desbloquear gasto',
+        heldExpense: 'bloqueó este gasto',
+        unheldExpense: 'desbloqueó este gasto',
         explainHold: 'Explica la razón para bloquear esta solicitud.',
         reason: 'Razón',
         holdReasonRequired: 'Se requiere una razón para bloquear.',
-        expenseOnHold: 'Este solicitud está bloqueada. Revisa los comentarios para saber como proceder.',
+        expenseOnHold: 'Este gasto está bloqueado. Revisa los comentarios para saber como proceder.',
         confirmApprove: 'Confirma que quieres aprobar',
         confirmApprovalAmount: 'Aprobar el total o solo la parte no bloqueada.',
         confirmPay: 'Confirma que quieres pagar',

From fb8283b8ca043f552c2458b94da2924947fa2472 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 16 Apr 2024 12:38:56 +0800
Subject: [PATCH 269/383] remove extra spacing

---
 src/components/AvatarWithDisplayName.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index f6afb4dae2d6..c7a4ece0de97 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -65,7 +65,6 @@ function AvatarWithDisplayName({
     const ownerPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs(report?.ownerAccountID ? [report.ownerAccountID] : [], personalDetails);
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(Object.values(ownerPersonalDetails) as PersonalDetails[], false);
     const shouldShowSubscriptAvatar = ReportUtils.shouldReportShowSubscript(report);
-    const isExpenseRequest = ReportUtils.isExpenseRequest(report);
     const avatarBorderColor = isAnonymous ? theme.highlightBG : theme.componentBG;
 
     const actorAccountID = useRef<number | null>(null);
@@ -128,7 +127,7 @@ function AvatarWithDisplayName({
                             />
                         )}
                     </PressableWithoutFeedback>
-                    <View style={[styles.flex1, styles.flexColumn, shouldShowSubscriptAvatar && !isExpenseRequest ? styles.ml4 : {}]}>
+                    <View style={[styles.flex1, styles.flexColumn]}>
                         <DisplayNames
                             fullTitle={title}
                             displayNamesWithTooltips={displayNamesWithTooltips}

From 751f903e20f890f1dd37d6cef3675719966c5ae6 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Tue, 16 Apr 2024 10:45:24 +0530
Subject: [PATCH 270/383] Making the space to get correct spanish translations

---
 src/languages/es.ts                           | 60 +++++++++----------
 .../FloatingActionButtonAndPopover.tsx        |  2 +-
 .../step/IOURequestStepParticipants.tsx       |  2 +-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 51c7997c8d62..0975e6facec6 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -410,7 +410,7 @@ export default {
     },
     login: {
         hero: {
-            header: 'Divida las facturas, solicite pagos y chatee con sus amigos.',
+            header: 'Manage spend, split expenses, and chat with your team.',
             body: 'Bienvenido al futuro de Expensify, tu nuevo lugar de referencia para la colaboración financiera con amigos y compañeros de equipo por igual.',
         },
     },
@@ -464,15 +464,15 @@ export default {
         markAsRead: 'Marcar como leído',
         editAction: ({action}: EditActionParams) =>
             `Editar ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? `${action?.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ? 'gastos' : 'solicitud'}` : 'comentario'
+                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'
             }`,
         deleteAction: ({action}: DeleteActionParams) =>
             `Eliminar ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? `${action?.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ? 'gastos' : 'solicitud'}` : 'comentario'
+                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'
             }`,
         deleteConfirmation: ({action}: DeleteConfirmationParams) =>
             `¿Estás seguro de que quieres eliminar esta ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? `${action?.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ? 'gastos' : 'solicitud'}` : 'comentario'
+                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'
             }`,
         onlyVisible: 'Visible sólo para',
         replyInThread: 'Responder en el hilo',
@@ -502,7 +502,7 @@ export default {
         beginningOfChatHistory: 'Aquí comienzan tus conversaciones con ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: '¡La colaboración entre ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' y ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' empieza aquí! 🎉 Este es el lugar donde chatear, pedir dinero y pagar.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, submit expenses and settle up.',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
         sayHello: '¡Saluda!',
@@ -510,9 +510,9 @@ export default {
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`,
         usePlusButton: ({additionalText}: UsePlusButtonParams) => `\n¡También puedes usar el botón + de abajo para ${additionalText}, o asignar una tarea!`,
         iouTypes: {
-            send: 'enviar dinero',
-            split: 'dividir una factura',
-            request: 'pedir dinero',
+            send: 'pay expenses',
+            split: 'split an expense',
+            request: 'submit an expense',
             // eslint-disable-next-line @typescript-eslint/naming-convention
             'track-expense': 'rastrear un gasto',
         },
@@ -592,11 +592,11 @@ export default {
     quickAction: {
         scanReceipt: 'Escanear recibo',
         recordDistance: 'Grabar distancia',
-        requestMoney: 'Solicitar dinero',
-        splitBill: 'Dividir cuenta',
+        requestMoney: 'Submit expense',
+        splitBill: 'Split expense',
         splitScan: 'Dividir recibo',
         splitDistance: 'Dividir distancia',
-        sendMoney: 'Enviar dinero',
+        sendMoney: 'Pagar a alguien',
         assignTask: 'Assignar tarea',
         header: 'Acción rápida',
         trackManual: 'Crear gasto',
@@ -613,10 +613,10 @@ export default {
         card: 'Tarjeta',
         original: 'Original',
         split: 'Dividir',
-        splitExpense: 'Dividir factura',
-        expense: 'Solicitar',
+        splitExpense: 'Split expense',
+        expense: 'Expense',
         participants: 'Participantes',
-        submitExpense: 'Pedir dinero',
+        submitExpense: 'Submit expense',
         paySomeone: ({name}: PaySomeoneParams) => `Pagar a ${name ?? 'alguien'}`,
         trackExpense: 'Seguimiento de gastos',
         pay: 'Pagar',
@@ -648,7 +648,7 @@ export default {
         payElsewhere: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pagar ${formattedAmount} de otra forma` : `Pagar de otra forma`),
         nextStep: 'Pasos Siguientes',
         finished: 'Finalizado',
-        submitAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
+        submitAmount: ({amount}: RequestAmountParams) => `submit ${amount}`,
         submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicitó ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `realizó un seguimiento de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
@@ -694,12 +694,12 @@ export default {
             invalidTaxAmount: ({amount}: RequestAmountParams) => `El importe máximo del impuesto es ${amount}`,
             invalidSplit: 'La suma de las partes no equivale al importe total',
             other: 'Error inesperado, por favor inténtalo más tarde',
-            genericCreateFailureMessage: 'Error inesperado solicitando dinero. Por favor, inténtalo más tarde',
+            genericCreateFailureMessage: 'Unexpected error submitting this expense. Please try again later.',
             receiptFailureMessage: 'El recibo no se subió. ',
             saveFileMessage: 'Guarda el archivo ',
             loseFileMessage: 'o descarta este error y piérdelo',
-            genericDeleteFailureMessage: 'Error inesperado eliminando la solicitud de dinero. Por favor, inténtalo más tarde',
-            genericEditFailureMessage: 'Error inesperado al guardar la solicitud de dinero. Por favor, inténtalo más tarde',
+            genericDeleteFailureMessage: 'Unexpected error deleting this expense, please try again later',
+            genericEditFailureMessage: 'Unexpected error editing this expense, please try again later',
             genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
             duplicateWaypointsErrorMessage: 'Por favor, elimina los puntos de ruta duplicados',
             atLeastTwoDifferentWaypoints: 'Por favor, introduce al menos dos direcciones diferentes',
@@ -723,7 +723,7 @@ export default {
         payOnly: 'Solo pagar',
         approveOnly: 'Solo aprobar',
         hold: 'Bloqueada',
-        holdEducationalTitle: 'Esta solicitud está',
+        holdEducationalTitle: 'This expense is on',
         whatIsHoldTitle: '¿Qué es Bloquear?',
         whatIsHoldExplain: 'Bloquear es nuestra forma de agilizar la colaboración financiera. ¡"Rechazar" es tan duro!',
         holdIsTemporaryTitle: 'Bloquear suele ser temporal',
@@ -935,7 +935,7 @@ export default {
         enterMessageHere: 'Escribe aquí tu mensaje',
         closeAccountWarning: 'Una vez cerrada tu cuenta no se puede revertir.',
         closeAccountPermanentlyDeleteData:
-            'Esta acción eliminará permanentemente toda la información de tus gastos no enviados y cancelará o rechazará cualquier solicitud de dinero pendiente. ¿Estás seguro de que quieres eliminar tu cuenta?',
+            'Are you sure you want to delete your account? This will permanently delete any outstanding expenses.',
         enterDefaultContactToConfirm: 'Por favor, escribe tu método de contacto predeterminado para confirmar que deseas eliminar tu cuenta. Tu método de contacto predeterminado es:',
         enterDefaultContact: 'Tu método de contacto predeterminado',
         defaultContact: 'Método de contacto predeterminado:',
@@ -1332,7 +1332,7 @@ export default {
             [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Cobrar de mi empresa',
             [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
             [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: 'Controlar y presupuestar los gastos personales',
-            [CONST.ONBOARDING_CHOICES.CHAT_SPLIT]: 'Chatea y divide cuentas con tus amigos',
+            [CONST.ONBOARDING_CHOICES.CHAT_SPLIT]: 'Chat and split expenses with friends',
             [CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Sólo estoy mirando',
         },
         error: {
@@ -3128,27 +3128,27 @@ export default {
             body: `¡Gana dinero por hablar con tus amigos! Inicia un chat con una cuenta nueva de Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]: {
-            buttonText1: 'Pide dinero, ',
+            buttonText1: 'Submit expense, ',
             buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            header: `Pide dinero y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `¡Vale la pena cobrar! Pide dinero a una cuenta nueva de Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
+            header: `Submit an expense, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            body: `It pays to get paid! Submit an expense to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]: {
-            buttonText1: 'Envía dinero, ',
+            buttonText1: 'Pagar a alguien, ',
             buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            header: `Envía dinero y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `¡Hay que enviar dinero para ganar dinero! Envía dinero a una cuenta nueva de Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
+            header: `Pagar a alguien y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            body: `You gotta spend money to make money! Pay someone with Expensify and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]: {
             buttonText1: 'Invita a un amigo y ',
             buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             header: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `Sé el primero en chatear, enviar o pedir dinero, dividir una factura o compartir tu enlace de invitación con un amigo, y recibirás $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se convierta en cliente. También puedes publicar tu enlace de invitación en las redes sociales.`,
+            body: `Chat, pay, submit, or split an expense with a friend and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. Otherwise, just share your invite link!`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]: {
             buttonText1: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             header: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `Sé el primero en chatear, enviar o pedir dinero, dividir una factura o compartir tu enlace de invitación con un amigo, y recibirás $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se convierta en cliente. También puedes publicar tu enlace de invitación en las redes sociales.`,
+            body: `Chat, pay, submit, or split an expense with a friend and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. Otherwise, just share your invite link!`,
         },
         copyReferralLink: 'Copiar enlace de invitación',
     },
@@ -3156,7 +3156,7 @@ export default {
         [CONST.INTRO_CHOICES.TRACK]: 'Seguimiento de los gastos de empresa para fines fiscales',
         [CONST.INTRO_CHOICES.SUBMIT]: 'Reclamar gastos a mi empleador',
         [CONST.INTRO_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
-        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chatea y divide gastos con tus amigos',
+        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chat and split expenses with friends',
         welcomeMessage: 'Bienvenido a Expensify',
         welcomeSubtitle: '¿Qué te gustaría hacer?',
     },
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index cccf8926d62d..2e4aed0ceba5 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -298,7 +298,7 @@ function FloatingActionButtonAndPopover(
                     },
                     {
                         icon: Expensicons.Send,
-                        text: translate('iou.paySomeone', {name: undefined}),
+                        text: translate('iou.paySomeone', {}),
                         onSelected: () =>
                             interceptAnonymousUser(() =>
                                 IOU.startMoneyRequest(
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
index bd5a0ea22a93..07e3e062eef7 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -51,7 +51,7 @@ function IOURequestStepParticipants({
             return translate('iou.splitExpense');
         }
         if (iouType === CONST.IOU.TYPE.SEND) {
-            return translate('iou.paySomeone', {name: undefined});
+            return translate('iou.paySomeone', {});
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
     }, [iouType, transaction, translate, isSplitRequest]);

From 975e427beff26b00b9a0be029c935a0aae99f52d Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Tue, 16 Apr 2024 10:46:17 +0530
Subject: [PATCH 271/383] lint fix

---
 src/languages/es.ts | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 0975e6facec6..27abc38bc568 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -462,18 +462,10 @@ export default {
         copyEmailToClipboard: 'Copiar email al portapapeles',
         markAsUnread: 'Marcar como no leído',
         markAsRead: 'Marcar como leído',
-        editAction: ({action}: EditActionParams) =>
-            `Editar ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'
-            }`,
-        deleteAction: ({action}: DeleteActionParams) =>
-            `Eliminar ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'
-            }`,
+        editAction: ({action}: EditActionParams) => `Editar ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'}`,
+        deleteAction: ({action}: DeleteActionParams) => `Eliminar ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'}`,
         deleteConfirmation: ({action}: DeleteConfirmationParams) =>
-            `¿Estás seguro de que quieres eliminar esta ${
-                action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'
-            }`,
+            `¿Estás seguro de que quieres eliminar esta ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'}`,
         onlyVisible: 'Visible sólo para',
         replyInThread: 'Responder en el hilo',
         joinThread: 'Unirse al hilo',
@@ -934,8 +926,7 @@ export default {
         reasonForLeavingPrompt: '¡Lamentamos verte partir! ¿Serías tan amable de decirnos por qué, para que podamos mejorar?',
         enterMessageHere: 'Escribe aquí tu mensaje',
         closeAccountWarning: 'Una vez cerrada tu cuenta no se puede revertir.',
-        closeAccountPermanentlyDeleteData:
-            'Are you sure you want to delete your account? This will permanently delete any outstanding expenses.',
+        closeAccountPermanentlyDeleteData: 'Are you sure you want to delete your account? This will permanently delete any outstanding expenses.',
         enterDefaultContactToConfirm: 'Por favor, escribe tu método de contacto predeterminado para confirmar que deseas eliminar tu cuenta. Tu método de contacto predeterminado es:',
         enterDefaultContact: 'Tu método de contacto predeterminado',
         defaultContact: 'Método de contacto predeterminado:',

From 1e3de7a7f618685905bc85423ea77f2a8a4053f7 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Tue, 16 Apr 2024 07:25:10 +0200
Subject: [PATCH 272/383] fix ctrl enter shortcut action

---
 src/pages/NewChatPage.tsx | 45 ++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 8137bb0e8515..0996c16ebcfb 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -244,25 +244,24 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
         [selectedOptions, setSelectedOptions, styles, translate],
     );
 
-    const footerContent = useMemo(() => {
-        /**
-         * Creates a new group chat with all the selected options and the current user,
-         * or navigates to the existing chat if one with those participants already exists.
-         */
-        const createGroup = () => {
-            if (selectedOptions.length === 1) {
-                createChat();
-            }
-            if (!personalData || !personalData.login || !personalData.accountID) {
-                return;
-            }
-            const selectedParticipants: SelectedParticipant[] = selectedOptions.map((option: OptionData) => ({login: option.login ?? '', accountID: option.accountID ?? -1}));
-            const logins = [...selectedParticipants, {login: personalData.login, accountID: personalData.accountID}];
-            Report.setGroupDraft({participants: logins});
-            Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM);
-        };
-
-        return (
+    const createGroup = useCallback(() => {
+        if (selectedOptions.length === 1) {
+            createChat();
+        }
+        if (!personalData || !personalData.login || !personalData.accountID) {
+            return;
+        }
+        const selectedParticipants = selectedOptions.map((option) => ({
+            login: option.login ?? '',
+            accountID: option.accountID ?? -1,
+        }));
+        const logins = [...selectedParticipants, {login: personalData.login, accountID: personalData.accountID}];
+        Report.setGroupDraft({participants: logins});
+        Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM);
+    }, [selectedOptions, createChat, personalData]);
+
+    const footerContent = useMemo(
+        () => (
             <>
                 <ReferralProgramCTA
                     referralContentType={CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT}
@@ -272,14 +271,15 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                 {!!selectedOptions.length && (
                     <Button
                         success
-                        text={selectedOptions.length > 1 ? translate('common.next') : translate('newChatPage.createChat')}
+                        text={translate('common.next')}
                         onPress={createGroup}
                         pressOnEnter
                     />
                 )}
             </>
-        );
-    }, [createChat, personalData, selectedOptions, styles.mb5, translate]);
+        ),
+        [createGroup, selectedOptions.length, styles.mb5, translate],
+    );
 
     return (
         <View
@@ -302,6 +302,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                     textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
                     headerMessage={headerMessage}
                     onSelectRow={createChat}
+                    onConfirm={(e, option) => (selectedOptions.length > 0 ? createGroup() : createChat(option))}
                     rightHandSideComponent={itemRightSideComponent}
                     footerContent={footerContent}
                     showLoadingPlaceholder={!areOptionsInitialized}

From b6f6864ba7f40eaa264668916be3aa44edf9b2a6 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Tue, 16 Apr 2024 07:33:45 +0200
Subject: [PATCH 273/383] cleanup

---
 src/pages/NewChatPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 0996c16ebcfb..a6e97653a667 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -31,7 +31,6 @@ import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {SelectedParticipant} from '@src/types/onyx/NewGroupChatDraft';
 
 type NewChatPageProps = {
     isGroupChat?: boolean;

From 8f00f6319ec45af57621a8642732627078848735 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Tue, 16 Apr 2024 07:40:02 +0200
Subject: [PATCH 274/383] minor edit

---
 src/pages/NewChatPage.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index a6e97653a667..08c8be17bb31 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -31,6 +31,7 @@ import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type {SelectedParticipant} from '@src/types/onyx/NewGroupChatDraft';
 
 type NewChatPageProps = {
     isGroupChat?: boolean;
@@ -250,10 +251,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
         if (!personalData || !personalData.login || !personalData.accountID) {
             return;
         }
-        const selectedParticipants = selectedOptions.map((option) => ({
-            login: option.login ?? '',
-            accountID: option.accountID ?? -1,
-        }));
+        const selectedParticipants: SelectedParticipant[] = selectedOptions.map((option: OptionData) => ({login: option.login ?? '', accountID: option.accountID ?? -1}));
         const logins = [...selectedParticipants, {login: personalData.login, accountID: personalData.accountID}];
         Report.setGroupDraft({participants: logins});
         Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM);

From 937466c433b8d39b2ccafadf9e6c788765784bf4 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Tue, 16 Apr 2024 11:13:39 +0530
Subject: [PATCH 275/383] revert purpose text for track

---
 .../PurposeForUsingExpensifyPage.tsx               | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
index d1bcedadb508..65fbd4185cef 100644
--- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
+++ b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
@@ -26,11 +26,17 @@ const messageCopy = {
     [CONST.INTRO_CHOICES.TRACK]:
         "Here's how to start tracking business spend for taxes:\n" +
         '\n' +
-        '1. Click the green *+* > *Track expense*.\n' +
-        '2. Scan a receipt, enter an amount, or log your trip.\n' +
-        '3. Click *Track*.\n' +
+        '1. Click the green *+* > *New workspace*.\n' +
+        '2. Your new workspace is now active.\n' +
+        '3. To update your workspace name, click *Profile* > *Name*.\n' +
         '\n' +
-        "And that's it. Every expense will drop into your personal space, neatly organized for tax season. Let me know how it goes!",
+        'Next, start adding expenses to your workspace:\n' +
+        '\n' +
+        '1. Click the green *+* > *Submit expense*.\n' +
+        '2. Add an expense or scan a receipt.\n' +
+        '3. Choose your workspace as the destination.\n' +
+        '\n' +
+        'Be sure to track all of your expenses in your new workspace to keep everything organized. Let me know how it goes!',
     [CONST.INTRO_CHOICES.SUBMIT]:
         "Here's how to submit expenses for reimbursement:\n" +
         '\n' +

From 86a01f7ddc7ddcbc2ba436a8bc3c04345925e4e7 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Tue, 16 Apr 2024 10:38:52 +0200
Subject: [PATCH 276/383] Remove comments

---
 src/CONST.ts                                     | 3 +--
 src/libs/E2E/reactNativeLaunchingTest.ts         | 1 -
 src/libs/E2E/tests/openChatFinderPageTest.e2e.ts | 6 +++---
 src/pages/ChatFinderPage/index.tsx               | 2 --
 tests/e2e/config.ts                              | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index d87243282955..43662829b8d4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -875,8 +875,7 @@ const CONST = {
     },
     TIMING: {
         CALCULATE_MOST_RECENT_LAST_MODIFIED_ACTION: 'calc_most_recent_last_modified_action',
-        // ASK: Should we also update this name?
-        CHAT_FINDER_RENDER: 'chat_finder',
+        CHAT_FINDER_RENDER: 'search_render',
         CHAT_RENDER: 'chat_render',
         OPEN_REPORT: 'open_report',
         HOMEPAGE_INITIAL_RENDER: 'homepage_initial_render',
diff --git a/src/libs/E2E/reactNativeLaunchingTest.ts b/src/libs/E2E/reactNativeLaunchingTest.ts
index 0a685a2788d1..9d5b0be0d2e7 100644
--- a/src/libs/E2E/reactNativeLaunchingTest.ts
+++ b/src/libs/E2E/reactNativeLaunchingTest.ts
@@ -35,7 +35,6 @@ if (!appInstanceId) {
 // import your test here, define its name and config first in e2e/config.js
 const tests: Tests = {
     [E2EConfig.TEST_NAMES.AppStartTime]: require('./tests/appStartTimeTest.e2e').default,
-    // ASK: Should we also update this name?
     [E2EConfig.TEST_NAMES.OpenChatFinderPage]: require('./tests/openChatFinderPageTest.e2e').default,
     [E2EConfig.TEST_NAMES.ChatOpening]: require('./tests/chatOpeningTest.e2e').default,
     [E2EConfig.TEST_NAMES.ReportTyping]: require('./tests/reportTypingTest.e2e').default,
diff --git a/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
index 549cb7b8c2c9..9d2b117a7044 100644
--- a/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
+++ b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
@@ -9,7 +9,7 @@ import ROUTES from '@src/ROUTES';
 
 const test = () => {
     // check for login (if already logged in the action will simply resolve)
-    console.debug('[E2E] Logging in for chat finding');
+    console.debug('[E2E] Logging in for chat finder');
 
     E2ELogin().then((neededLogin: boolean): Promise<Response> | undefined => {
         if (neededLogin) {
@@ -19,7 +19,7 @@ const test = () => {
             );
         }
 
-        console.debug('[E2E] Logged in, getting chat finding metrics and submitting them…');
+        console.debug('[E2E] Logged in, getting chat finder metrics and submitting them…');
 
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
@@ -29,7 +29,7 @@ const test = () => {
             }
 
             console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`);
-            if (entry.name !== CONST.TIMING.SEARCH_RENDER) {
+            if (entry.name !== CONST.TIMING.CHAT_FINDER_RENDER) {
                 return;
             }
 
diff --git a/src/pages/ChatFinderPage/index.tsx b/src/pages/ChatFinderPage/index.tsx
index 50228f1c23aa..f992fa37d8c5 100644
--- a/src/pages/ChatFinderPage/index.tsx
+++ b/src/pages/ChatFinderPage/index.tsx
@@ -45,7 +45,6 @@ type ChatFinderPageSectionItem = {
 type ChatFinderPageSectionList = ChatFinderPageSectionItem[];
 
 const setPerformanceTimersEnd = () => {
-    // ASK: Should we also update this name?
     Timing.end(CONST.TIMING.CHAT_FINDER_RENDER);
     Performance.markEnd(CONST.TIMING.CHAT_FINDER_RENDER);
 };
@@ -66,7 +65,6 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
 
     useEffect(() => {
-        // ASK: Should we also update this name?
         Timing.start(CONST.TIMING.CHAT_FINDER_RENDER);
         Performance.markStart(CONST.TIMING.CHAT_FINDER_RENDER);
     }, []);
diff --git a/tests/e2e/config.ts b/tests/e2e/config.ts
index 63469454a1ac..6fe88d45c2e9 100644
--- a/tests/e2e/config.ts
+++ b/tests/e2e/config.ts
@@ -4,7 +4,6 @@ const OUTPUT_DIR = process.env.WORKING_DIRECTORY || './tests/e2e/results';
 // add your test name here …
 const TEST_NAMES = {
     AppStartTime: 'App start time',
-    // ASK: Should we also update this name?
     OpenChatFinderPage: 'Open chat finder page TTI',
     ReportTyping: 'Report typing',
     ChatOpening: 'Chat opening',

From c256de7d0bbd5042804c5e9940fe1a71e3b9ef0d Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 16 Apr 2024 15:38:57 +0700
Subject: [PATCH 277/383] Fix skeleton displays when opening a unaccess or not
 found report

---
 src/pages/home/ReportScreen.tsx | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 332e9b080558..a2a68cbc34c6 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -363,7 +363,7 @@ function ReportScreen({
         return reportIDFromRoute !== '' && !!report.reportID && !isTransitioning;
     }, [report, reportIDFromRoute]);
 
-    const isLoading = !ReportUtils.isValidReportIDFromPath(reportIDFromRoute) || !isSidebarLoaded || PersonalDetailsUtils.isPersonalDetailsEmpty();
+    const isLoading = !reportIDFromRoute || !isSidebarLoaded || PersonalDetailsUtils.isPersonalDetailsEmpty();
     const shouldShowSkeleton =
         !isLinkedMessageAvailable &&
         (isLinkingToMessage ||
@@ -372,19 +372,14 @@ function ReportScreen({
             isLoading ||
             (!!reportActionIDFromRoute && reportMetadata?.isLoadingInitialReportActions));
     const shouldShowReportActionList = isCurrentReportLoadedFromOnyx && !isLoading;
+    const currentReportIDFormRoute = route.params?.reportID;
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage = useMemo(
         (): boolean =>
-            !shouldShowSkeleton &&
-            ((!wasReportAccessibleRef.current &&
-                !firstRenderRef.current &&
-                !report.reportID &&
-                !isOptimisticDelete &&
-                !reportMetadata?.isLoadingInitialReportActions &&
-                !userLeavingStatus) ||
-                shouldHideReport ||
-                (!!reportIDFromRoute && !ReportUtils.isValidReportIDFromPath(reportIDFromRoute))),
-        [shouldShowSkeleton, report.reportID, isOptimisticDelete, reportMetadata?.isLoadingInitialReportActions, userLeavingStatus, shouldHideReport, reportIDFromRoute],
+            (!wasReportAccessibleRef.current && !firstRenderRef.current && !report.reportID && !isOptimisticDelete && !reportMetadata?.isLoadingInitialReportActions && !userLeavingStatus) ||
+            shouldHideReport ||
+            (!!currentReportIDFormRoute && !ReportUtils.isValidReportIDFromPath(currentReportIDFormRoute)),
+        [report.reportID, isOptimisticDelete, reportMetadata?.isLoadingInitialReportActions, userLeavingStatus, shouldHideReport, currentReportIDFormRoute],
     );
 
     const fetchReport = useCallback(() => {

From c543a4632af56db57fb6d6541beab17c61c42485 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 16 Apr 2024 16:52:51 +0800
Subject: [PATCH 278/383] fix video play control broken after coming back from
 thread

---
 .../HTMLRenderers/VideoRenderer.tsx           |  1 +
 .../VideoPlayerContexts/PlaybackContext.tsx   | 20 ++++++++++++++++---
 src/components/VideoPlayerContexts/types.ts   |  1 +
 src/components/VideoPlayerPreview/index.tsx   | 11 ++++++----
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
index 43d1be85d21a..6802a4518ba1 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
@@ -29,6 +29,7 @@ function VideoRenderer({tnode, key}: VideoRendererProps) {
                 <VideoPlayerPreview
                     key={key}
                     videoUrl={sourceURL}
+                    reportID={report?.reportID ?? ''}
                     fileName={fileName}
                     thumbnailUrl={thumbnailUrl}
                     videoDimensions={{width, height}}
diff --git a/src/components/VideoPlayerContexts/PlaybackContext.tsx b/src/components/VideoPlayerContexts/PlaybackContext.tsx
index 0fe0fe378ba6..499dd2b07f67 100644
--- a/src/components/VideoPlayerContexts/PlaybackContext.tsx
+++ b/src/components/VideoPlayerContexts/PlaybackContext.tsx
@@ -10,6 +10,7 @@ const Context = React.createContext<PlaybackContext | null>(null);
 
 function PlaybackContextProvider({children}: ChildrenProps) {
     const [currentlyPlayingURL, setCurrentlyPlayingURL] = useState<string | null>(null);
+    const [currentlyPlayingURLReportID, setCurrentlyPlayingURLReportID] = useState<string | undefined>();
     const [sharedElement, setSharedElement] = useState<View | HTMLDivElement | null>(null);
     const [originalParent, setOriginalParent] = useState<View | HTMLDivElement | null>(null);
     const currentVideoPlayerRef = useRef<VideoWithOnFullScreenUpdate | null>(null);
@@ -21,7 +22,7 @@ function PlaybackContextProvider({children}: ChildrenProps) {
     }, [currentVideoPlayerRef]);
 
     const stopVideo = useCallback(() => {
-        currentVideoPlayerRef.current?.stopAsync?.();
+        currentVideoPlayerRef.current?.setStatusAsync?.({shouldPlay: false, positionMillis: 0});
     }, [currentVideoPlayerRef]);
 
     const playVideo = useCallback(() => {
@@ -43,9 +44,10 @@ function PlaybackContextProvider({children}: ChildrenProps) {
             if (currentlyPlayingURL && url !== currentlyPlayingURL) {
                 pauseVideo();
             }
+            setCurrentlyPlayingURLReportID(currentReportID);
             setCurrentlyPlayingURL(url);
         },
-        [currentlyPlayingURL, pauseVideo],
+        [currentlyPlayingURL, currentReportID, pauseVideo],
     );
 
     const shareVideoPlayerElements = useCallback(
@@ -91,6 +93,7 @@ function PlaybackContextProvider({children}: ChildrenProps) {
         () => ({
             updateCurrentlyPlayingURL,
             currentlyPlayingURL,
+            currentlyPlayingURLReportID,
             originalParent,
             sharedElement,
             currentVideoPlayerRef,
@@ -101,7 +104,18 @@ function PlaybackContextProvider({children}: ChildrenProps) {
             checkVideoPlaying,
             videoResumeTryNumber,
         }),
-        [updateCurrentlyPlayingURL, currentlyPlayingURL, originalParent, sharedElement, shareVideoPlayerElements, playVideo, pauseVideo, checkVideoPlaying, setCurrentlyPlayingURL],
+        [
+            updateCurrentlyPlayingURL,
+            currentlyPlayingURL,
+            currentlyPlayingURLReportID,
+            originalParent,
+            sharedElement,
+            shareVideoPlayerElements,
+            playVideo,
+            pauseVideo,
+            checkVideoPlaying,
+            setCurrentlyPlayingURL,
+        ],
     );
     return <Context.Provider value={contextValue}>{children}</Context.Provider>;
 }
diff --git a/src/components/VideoPlayerContexts/types.ts b/src/components/VideoPlayerContexts/types.ts
index e6a20ec090fe..ff8d9378caf7 100644
--- a/src/components/VideoPlayerContexts/types.ts
+++ b/src/components/VideoPlayerContexts/types.ts
@@ -9,6 +9,7 @@ import type CONST from '@src/CONST';
 type PlaybackContext = {
     updateCurrentlyPlayingURL: (url: string | null) => void;
     currentlyPlayingURL: string | null;
+    currentlyPlayingURLReportID: string | undefined;
     originalParent: View | HTMLDivElement | null;
     sharedElement: View | HTMLDivElement | null;
     videoResumeTryNumber: MutableRefObject<number>;
diff --git a/src/components/VideoPlayerPreview/index.tsx b/src/components/VideoPlayerPreview/index.tsx
index 923ab919a55a..414e95b0ff32 100644
--- a/src/components/VideoPlayerPreview/index.tsx
+++ b/src/components/VideoPlayerPreview/index.tsx
@@ -21,6 +21,9 @@ type VideoPlayerPreviewProps = {
     /** Url to a video. */
     videoUrl: string;
 
+    /** reportID of the video */
+    reportID: string;
+
     /** Dimension of a video. */
     videoDimensions: VideoDimensions;
 
@@ -37,10 +40,10 @@ type VideoPlayerPreviewProps = {
     onShowModalPress: (event?: GestureResponderEvent | KeyboardEvent) => void | Promise<void>;
 };
 
-function VideoPlayerPreview({videoUrl, thumbnailUrl, fileName, videoDimensions, videoDuration, onShowModalPress}: VideoPlayerPreviewProps) {
+function VideoPlayerPreview({videoUrl, thumbnailUrl, reportID, fileName, videoDimensions, videoDuration, onShowModalPress}: VideoPlayerPreviewProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {currentlyPlayingURL, updateCurrentlyPlayingURL} = usePlaybackContext();
+    const {currentlyPlayingURL, currentlyPlayingURLReportID, updateCurrentlyPlayingURL} = usePlaybackContext();
     const {isSmallScreenWidth} = useWindowDimensions();
     const [isThumbnail, setIsThumbnail] = useState(true);
     const [measuredDimensions, setMeasuredDimensions] = useState(videoDimensions);
@@ -60,11 +63,11 @@ function VideoPlayerPreview({videoUrl, thumbnailUrl, fileName, videoDimensions,
     };
 
     useEffect(() => {
-        if (videoUrl !== currentlyPlayingURL) {
+        if (videoUrl !== currentlyPlayingURL || reportID !== currentlyPlayingURLReportID) {
             return;
         }
         setIsThumbnail(false);
-    }, [currentlyPlayingURL, updateCurrentlyPlayingURL, videoUrl]);
+    }, [currentlyPlayingURL, currentlyPlayingURLReportID, updateCurrentlyPlayingURL, videoUrl, reportID]);
 
     return (
         <View style={[styles.webViewStyles.tagStyles.video, thumbnailDimensionsStyles]}>

From 6ad3d75dcd428c609ac665affbbe095bac9e94ec Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <jakub.piasecki@swmansion.com>
Date: Tue, 16 Apr 2024 11:09:52 +0200
Subject: [PATCH 279/383] Keep relevant parts of the patch

---
 patches/@shopify+flash-list+1.6.3.patch | 46 +++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 patches/@shopify+flash-list+1.6.3.patch

diff --git a/patches/@shopify+flash-list+1.6.3.patch b/patches/@shopify+flash-list+1.6.3.patch
new file mode 100644
index 000000000000..92308913026b
--- /dev/null
+++ b/patches/@shopify+flash-list+1.6.3.patch
@@ -0,0 +1,46 @@
+diff --git a/node_modules/@shopify/flash-list/dist/FlashList.d.ts b/node_modules/@shopify/flash-list/dist/FlashList.d.ts
+index ed81d7d..1e24103 100644
+--- a/node_modules/@shopify/flash-list/dist/FlashList.d.ts
++++ b/node_modules/@shopify/flash-list/dist/FlashList.d.ts
+@@ -103,6 +103,7 @@ declare class FlashList<T> extends React.PureComponent<FlashListProps<T>, FlashL
+         offset: number;
+     }): void;
+     getScrollableNode(): number | null;
++    getNativeScrollRef(): number | null;
+     /**
+      * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
+      * Warning: We may swap recyclerlistview for something else in the future. Use with caution.
+diff --git a/node_modules/@shopify/flash-list/dist/FlashList.js b/node_modules/@shopify/flash-list/dist/FlashList.js
+index 1a5d026..37852b8 100644
+--- a/node_modules/@shopify/flash-list/dist/FlashList.js
++++ b/node_modules/@shopify/flash-list/dist/FlashList.js
+@@ -478,6 +478,12 @@ var FlashList = /** @class */ (function (_super) {
+         var _a, _b;
+         return ((_b = (_a = this.rlvRef) === null || _a === void 0 ? void 0 : _a.getScrollableNode) === null || _b === void 0 ? void 0 : _b.call(_a)) || null;
+     };
++    FlashList.prototype.getNativeScrollRef = function () {
++        var _a, _b;
++        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
++        // @ts-ignore
++        return ((_b = (_a = this.rlvRef) === null || _a === void 0 ? void 0 : _a.getNativeScrollRef) === null || _b === void 0 ? void 0 : _b.call(_a)) || null;
++    };
+     Object.defineProperty(FlashList.prototype, "recyclerlistview_unsafe", {
+         /**
+          * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
+diff --git a/node_modules/@shopify/flash-list/src/FlashList.tsx b/node_modules/@shopify/flash-list/src/FlashList.tsx
+index 64748fe..87dea16 100644
+--- a/node_modules/@shopify/flash-list/src/FlashList.tsx
++++ b/node_modules/@shopify/flash-list/src/FlashList.tsx
+@@ -827,6 +827,12 @@ class FlashList<T> extends React.PureComponent<
+     return this.rlvRef?.getScrollableNode?.() || null;
+   }
+ 
++  public getNativeScrollRef(): number | null {
++    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
++    // @ts-ignore
++    return this.rlvRef?.getNativeScrollRef?.() || null;
++  }
++
+   /**
+    * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
+    * Warning: We may swap recyclerlistview for something else in the future. Use with caution.

From 5ba0446e9a02f9f80de2bf09f3d9678f81979ae8 Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Tue, 16 Apr 2024 11:36:12 +0200
Subject: [PATCH 280/383] add distance

---
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index ee44a312882f..212bf93166a1 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -187,6 +187,9 @@ function FloatingActionButtonAndPopover(
             case CONST.QUICK_ACTIONS.TRACK_SCAN:
                 IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK_EXPENSE, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.SCAN);
                 break;
+            case CONST.QUICK_ACTIONS.TRACK_DISTANCE:
+                IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK_EXPENSE, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.DISTANCE);
+                break;
             default:
         }
     };

From 5bfd5290413f6434daa614d44472e9e6d41d2559 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 15:22:36 +0530
Subject: [PATCH 281/383] fixes lint

---
 src/libs/API/parameters/CategorizeTrackedExpenseParams.ts       | 2 +-
 src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts | 2 +-
 src/libs/API/parameters/ShareTrackedExpenseParams.ts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
index 9b61d1e3faf0..78eb0adecc5e 100644
--- a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
@@ -13,7 +13,7 @@ type CategorizeTrackedExpenseParams = {
     moneyRequestCreatedReportActionID: string;
     actionableWhisperReportActionID: string;
     modifiedExpenseReportActionID: string;
-    reportPreviewReportActionID: string,
+    reportPreviewReportActionID: string;
     category?: string;
     tag?: string;
     receipt?: Receipt;
diff --git a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
index 8eb85cebf99f..c51161b043a8 100644
--- a/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
+++ b/src/libs/API/parameters/ConvertTrackedExpenseToRequestParams.ts
@@ -15,7 +15,7 @@ type ConvertTrackedExpenseToRequestParams = {
     moneyRequestReportID: string;
     moneyRequestCreatedReportActionID: string;
     moneyRequestPreviewReportActionID: string;
-    reportPreviewReportActionID: string,
+    reportPreviewReportActionID: string;
 };
 
 export default ConvertTrackedExpenseToRequestParams;
diff --git a/src/libs/API/parameters/ShareTrackedExpenseParams.ts b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
index 22faf6af65ef..cee4bc40d9ac 100644
--- a/src/libs/API/parameters/ShareTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
@@ -13,7 +13,7 @@ type ShareTrackedExpenseParams = {
     moneyRequestCreatedReportActionID: string;
     actionableWhisperReportActionID: string;
     modifiedExpenseReportActionID: string;
-    reportPreviewReportActionID: string,
+    reportPreviewReportActionID: string;
     category?: string;
     tag?: string;
     receipt?: Receipt;

From af93987f6c313ef144eb9d9b9a7f72dbef8a06df Mon Sep 17 00:00:00 2001
From: Robert Kozik <robert.kozik@swmansion.com>
Date: Tue, 16 Apr 2024 11:57:04 +0200
Subject: [PATCH 282/383] bump react-native-live-markdown version to 0.1.62

---
 ios/Podfile.lock  | 10 +++++-----
 package-lock.json |  8 ++++----
 package.json      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1ebfc6bb1b62..f564bfd931e4 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1835,7 +1835,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.47):
+  - RNLiveMarkdown (0.1.62):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -1853,9 +1853,9 @@ PODS:
     - React-utils
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/common (= 0.1.47)
+    - RNLiveMarkdown/common (= 0.1.62)
     - Yoga
-  - RNLiveMarkdown/common (0.1.47):
+  - RNLiveMarkdown/common (0.1.62):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -2564,7 +2564,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 1190c218cdaaf029ee1437076a3fbbc3297d89fb
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: f172c7199283dc9d21bccf7e21ea10741fd19e1d
+  RNLiveMarkdown: 47dfb50244f9ba1caefbc0efc6404ba41bf6620a
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: 3e273e0e867a079ec33df9ee33bb0482434b897d
   RNPermissions: 8990fc2c10da3640938e6db1647cb6416095b729
@@ -2581,7 +2581,7 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
   VisionCamera: 3033e0dd5272d46e97bcb406adea4ae0e6907abf
-  Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70
+  Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
 
 PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d
 
diff --git a/package-lock.json b/package-lock.json
index 203e062de680..d1959aaa516d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@babel/plugin-proposal-private-methods": "^7.18.6",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@dotlottie/react-player": "^1.6.3",
-        "@expensify/react-native-live-markdown": "0.1.47",
+        "@expensify/react-native-live-markdown": "0.1.62",
         "@expo/metro-runtime": "~3.1.1",
         "@formatjs/intl-datetimeformat": "^6.10.0",
         "@formatjs/intl-listformat": "^7.2.2",
@@ -3570,9 +3570,9 @@
       }
     },
     "node_modules/@expensify/react-native-live-markdown": {
-      "version": "0.1.47",
-      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.47.tgz",
-      "integrity": "sha512-zUfwgg6qq47MnGuynamDpdHSlBYwVKFV4Zc/2wlVzFcBndQOjOyFu04Ns8YDB4Gl80LyGvfAuBT/sU+kvmMU6g==",
+      "version": "0.1.62",
+      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.62.tgz",
+      "integrity": "sha512-o70/tFIGZJ1U8U8aqTQu1HAZed6nt5LYWk74mrceRxQHOqsKhZgn2q5EuEy8EMIcnCGKjwxuDyZJbuRexgHx/A==",
       "engines": {
         "node": ">= 18.0.0"
       },
diff --git a/package.json b/package.json
index 43a3ed8cae6a..02f68a566334 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.47",
+    "@expensify/react-native-live-markdown": "0.1.62",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",

From 8ec2dd69a8d2954e14185cd48bb22c67a7ef4b40 Mon Sep 17 00:00:00 2001
From: Robert Kozik <robert.kozik@swmansion.com>
Date: Tue, 16 Apr 2024 12:01:50 +0200
Subject: [PATCH 283/383] create roomMention style key inside MarkdownStyle

---
 src/hooks/useMarkdownStyle.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hooks/useMarkdownStyle.ts b/src/hooks/useMarkdownStyle.ts
index 21c8d02e9194..b1f430e232e4 100644
--- a/src/hooks/useMarkdownStyle.ts
+++ b/src/hooks/useMarkdownStyle.ts
@@ -49,6 +49,10 @@ function useMarkdownStyle(message: string | null = null): MarkdownStyle {
                 color: theme.mentionText,
                 backgroundColor: theme.mentionBG,
             },
+            mentionReport: {
+                color: theme.mentionText,
+                backgroundColor: theme.mentionBG,
+            },
         }),
         [theme, emojiFontSize],
     );

From fc9f595107bfd1e6bbb2a71d868a2f7023a42a10 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 16 Apr 2024 12:21:26 +0200
Subject: [PATCH 284/383] fix migration logic

---
 src/libs/migrations/RenameCardIsVirtual.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/migrations/RenameCardIsVirtual.ts b/src/libs/migrations/RenameCardIsVirtual.ts
index 490f5944dabf..4d03a9687a70 100644
--- a/src/libs/migrations/RenameCardIsVirtual.ts
+++ b/src/libs/migrations/RenameCardIsVirtual.ts
@@ -36,7 +36,7 @@ export default function () {
                             nameValuePairs: {
                                 isVirtual: card.isVirtual,
                             },
-                            isVirtual: null,
+                            isVirtual: undefined,
                         },
                     };
                 }, {});

From d7fcc276318523a2a157a6002e41b683effc448c Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 16 Apr 2024 17:50:57 +0700
Subject: [PATCH 285/383] Fix case approver approves yourself

---
 src/libs/NextStepUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index d522a64740eb..3b8fce748f45 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -230,7 +230,7 @@ function buildNextStep(
             };
 
             // Self review & another reviewer
-            if (!isSelfApproval) {
+            if (!isSelfApproval || (isSelfApproval && isOwner)) {
                 optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',

From a384d28095f06189b86dd2f9cb0cc66c8463fa5a Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 16:42:33 +0530
Subject: [PATCH 286/383] fixes invite button padding

---
 src/ROUTES.ts                                        |  2 +-
 src/pages/RoomInvitePage.tsx                         |  2 +-
 .../iou/request/step/IOURequestStepConfirmation.tsx  | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index e273dad61505..ec2bf11957e1 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -301,7 +301,7 @@ const ROUTES = {
         getRoute: (reportID: string) => `r/${reportID}/members` as const,
     },
     ROOM_INVITE: {
-        route: 'r/:reportID/invite/:role',
+        route: 'r/:reportID/invite/:role?',
         getRoute: (reportID: string, role?: string) => `r/${reportID}/invite/${role}` as const,
     },
     MONEY_REQUEST_PARTICIPANTS: {
diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
index f78866288768..b540dfb5f4e9 100644
--- a/src/pages/RoomInvitePage.tsx
+++ b/src/pages/RoomInvitePage.tsx
@@ -243,7 +243,7 @@ function RoomInvitePage({
                         isDisabled={!selectedOptions.length}
                         buttonText={translate('common.invite')}
                         onSubmit={inviteUsers}
-                        containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto, styles.mb5]}
+                        containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto, styles.mb5, styles.ph5]}
                         enabledWhenOffline
                         disablePressOnEnter
                         isAlertVisible={false}
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 7c8857b356a8..d708acbef456 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -75,17 +75,19 @@ function IOURequestStepConfirmation({
     const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
     const transactionTaxCode = transaction?.taxRate ? transaction.taxRate.data?.code : foreignTaxDefault;
     const transactionTaxAmount = transaction?.taxAmount;
+    const isSharingTrackExpense = action === CONST.IOU.ACTION.SHARE;
+    const isCategorizingTrackExpense = action === CONST.IOU.ACTION.CATEGORIZE;
 
     const requestType = TransactionUtils.getRequestType(transaction);
 
     const headerTitle = useMemo(() => {
-        if (action === CONST.IOU.ACTION.CATEGORIZE) {
+        if (isSharingTrackExpense) {
             return translate('iou.categorize');
         }
         if (action === CONST.IOU.ACTION.MOVE) {
             return translate('iou.request');
         }
-        if (action === CONST.IOU.ACTION.SHARE) {
+        if (isCategorizingTrackExpense) {
             return translate('iou.share');
         }
         if (iouType === CONST.IOU.TYPE.SPLIT) {
@@ -349,10 +351,10 @@ function IOURequestStepConfirmation({
                 return;
             }
 
-            if (iouType === CONST.IOU.TYPE.TRACK_EXPENSE || action === CONST.IOU.ACTION.SHARE || action === CONST.IOU.ACTION.CATEGORIZE) {
+            if (iouType === CONST.IOU.TYPE.TRACK_EXPENSE || isCategorizingTrackExpense || isSharingTrackExpense) {
                 if (receiptFile && transaction) {
                     // If the transaction amount is zero, then the money is being requested through the "Scan" flow and the GPS coordinates need to be included.
-                    if (transaction.amount === 0) {
+                    if (transaction.amount === 0 && !isSharingTrackExpense && !isCategorizingTrackExpense) {
                         getCurrentPosition(
                             (successData) => {
                                 trackExpense(selectedParticipants, trimmedComment, receiptFile, {
@@ -386,7 +388,7 @@ function IOURequestStepConfirmation({
 
             if (receiptFile && !!transaction) {
                 // If the transaction amount is zero, then the money is being requested through the "Scan" flow and the GPS coordinates need to be included.
-                if (transaction.amount === 0) {
+                if (transaction.amount === 0 && !isSharingTrackExpense && !isCategorizingTrackExpense) {
                     getCurrentPosition(
                         (successData) => {
                             requestMoney(selectedParticipants, trimmedComment, receiptFile, {

From f2d893e1c1c8dcf85d5ada9e32c2b4b375d58554 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:45:55 +0530
Subject: [PATCH 287/383] Apply suggestions from code review

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
---
 src/languages/es.ts | 50 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 27abc38bc568..74fb49e076fb 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -410,7 +410,7 @@ export default {
     },
     login: {
         hero: {
-            header: 'Manage spend, split expenses, and chat with your team.',
+            header: 'Gestiona o divide gastos y chatea con su equipo.',
             body: 'Bienvenido al futuro de Expensify, tu nuevo lugar de referencia para la colaboración financiera con amigos y compañeros de equipo por igual.',
         },
     },
@@ -465,7 +465,7 @@ export default {
         editAction: ({action}: EditActionParams) => `Editar ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'}`,
         deleteAction: ({action}: DeleteActionParams) => `Eliminar ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'}`,
         deleteConfirmation: ({action}: DeleteConfirmationParams) =>
-            `¿Estás seguro de que quieres eliminar esta ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gastos' : 'comentario'}`,
+            `¿Estás seguro de que quieres eliminar este ${action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? 'gasto' : 'comentario'}`,
         onlyVisible: 'Visible sólo para',
         replyInThread: 'Responder en el hilo',
         joinThread: 'Unirse al hilo',
@@ -494,7 +494,7 @@ export default {
         beginningOfChatHistory: 'Aquí comienzan tus conversaciones con ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: '¡La colaboración entre ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' y ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, submit expenses and settle up.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: '  empieza aquí! 🎉 Este es el lugar donde chatear y presentar o pagar gastos.',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
         sayHello: '¡Saluda!',
@@ -502,9 +502,9 @@ export default {
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`,
         usePlusButton: ({additionalText}: UsePlusButtonParams) => `\n¡También puedes usar el botón + de abajo para ${additionalText}, o asignar una tarea!`,
         iouTypes: {
-            send: 'pay expenses',
-            split: 'split an expense',
-            request: 'submit an expense',
+            send: 'pagar gastos',
+            split: 'dividir un gasto',
+            request: 'presentar un gasto',
             // eslint-disable-next-line @typescript-eslint/naming-convention
             'track-expense': 'rastrear un gasto',
         },
@@ -584,8 +584,8 @@ export default {
     quickAction: {
         scanReceipt: 'Escanear recibo',
         recordDistance: 'Grabar distancia',
-        requestMoney: 'Submit expense',
-        splitBill: 'Split expense',
+        requestMoney: 'Presentar gasto',
+        splitBill: 'Dividir gasto',
         splitScan: 'Dividir recibo',
         splitDistance: 'Dividir distancia',
         sendMoney: 'Pagar a alguien',
@@ -605,10 +605,10 @@ export default {
         card: 'Tarjeta',
         original: 'Original',
         split: 'Dividir',
-        splitExpense: 'Split expense',
-        expense: 'Expense',
+        splitExpense: 'Dividir gasto',
+        expense: 'Gasto',
         participants: 'Participantes',
-        submitExpense: 'Submit expense',
+        submitExpense: 'Presentar gasto',
         paySomeone: ({name}: PaySomeoneParams) => `Pagar a ${name ?? 'alguien'}`,
         trackExpense: 'Seguimiento de gastos',
         pay: 'Pagar',
@@ -686,12 +686,12 @@ export default {
             invalidTaxAmount: ({amount}: RequestAmountParams) => `El importe máximo del impuesto es ${amount}`,
             invalidSplit: 'La suma de las partes no equivale al importe total',
             other: 'Error inesperado, por favor inténtalo más tarde',
-            genericCreateFailureMessage: 'Unexpected error submitting this expense. Please try again later.',
+            genericCreateFailureMessage: 'Error inesperado al enviar este gasto. Por favor, inténtalo más tarde.',
             receiptFailureMessage: 'El recibo no se subió. ',
             saveFileMessage: 'Guarda el archivo ',
             loseFileMessage: 'o descarta este error y piérdelo',
-            genericDeleteFailureMessage: 'Unexpected error deleting this expense, please try again later',
-            genericEditFailureMessage: 'Unexpected error editing this expense, please try again later',
+            genericDeleteFailureMessage: 'Error inesperado al eliminar este gasto. Por favor, inténtalo más tarde',
+            genericEditFailureMessage: 'Error inesperado al editar este gasto. Por favor, inténtalo más tarde,
             genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
             duplicateWaypointsErrorMessage: 'Por favor, elimina los puntos de ruta duplicados',
             atLeastTwoDifferentWaypoints: 'Por favor, introduce al menos dos direcciones diferentes',
@@ -715,7 +715,7 @@ export default {
         payOnly: 'Solo pagar',
         approveOnly: 'Solo aprobar',
         hold: 'Bloqueada',
-        holdEducationalTitle: 'This expense is on',
+        holdEducationalTitle: 'Este gasto está',
         whatIsHoldTitle: '¿Qué es Bloquear?',
         whatIsHoldExplain: 'Bloquear es nuestra forma de agilizar la colaboración financiera. ¡"Rechazar" es tan duro!',
         holdIsTemporaryTitle: 'Bloquear suele ser temporal',
@@ -926,7 +926,7 @@ export default {
         reasonForLeavingPrompt: '¡Lamentamos verte partir! ¿Serías tan amable de decirnos por qué, para que podamos mejorar?',
         enterMessageHere: 'Escribe aquí tu mensaje',
         closeAccountWarning: 'Una vez cerrada tu cuenta no se puede revertir.',
-        closeAccountPermanentlyDeleteData: 'Are you sure you want to delete your account? This will permanently delete any outstanding expenses.',
+        closeAccountPermanentlyDeleteData: '¿Estás seguro de que quieres eliminar tu cuenta? Esta acción eliminará permanentemente toda la información de cualquier gasto pendiente.',
         enterDefaultContactToConfirm: 'Por favor, escribe tu método de contacto predeterminado para confirmar que deseas eliminar tu cuenta. Tu método de contacto predeterminado es:',
         enterDefaultContact: 'Tu método de contacto predeterminado',
         defaultContact: 'Método de contacto predeterminado:',
@@ -1323,7 +1323,7 @@ export default {
             [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Cobrar de mi empresa',
             [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
             [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: 'Controlar y presupuestar los gastos personales',
-            [CONST.ONBOARDING_CHOICES.CHAT_SPLIT]: 'Chat and split expenses with friends',
+            [CONST.ONBOARDING_CHOICES.CHAT_SPLIT]: 'Chatea y divide gastos con tus amigos',
             [CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Sólo estoy mirando',
         },
         error: {
@@ -3119,27 +3119,27 @@ export default {
             body: `¡Gana dinero por hablar con tus amigos! Inicia un chat con una cuenta nueva de Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]: {
-            buttonText1: 'Submit expense, ',
+            buttonText1: 'Presentar gasto, ',
             buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            header: `Submit an expense, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `It pays to get paid! Submit an expense to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
+            header: `Presenta un gasto y consigue $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            body: `¡Vale la pena cobrar! Envia un gasto a una cuenta nueva de Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]: {
             buttonText1: 'Pagar a alguien, ',
             buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            header: `Pagar a alguien y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `You gotta spend money to make money! Pay someone with Expensify and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
+            header: `Paga a alguien y recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            body: `¡Hay que gastar dinero para ganar dinero! Paga a alguien con Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]: {
             buttonText1: 'Invita a un amigo y ',
             buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             header: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `Chat, pay, submit, or split an expense with a friend and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. Otherwise, just share your invite link!`,
+            body: `Chatea, paga, presenta y divide gastos con un amigo y recibirás $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se convierta en cliente. También puedes publicar tu enlace de invitación en las redes sociales.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]: {
             buttonText1: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             header: `Recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
-            body: `Chat, pay, submit, or split an expense with a friend and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer. Otherwise, just share your invite link!`,
+            body: `Chatea, paga, presenta y divide gastos con un amigo y recibirás $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se convierta en cliente. También puedes publicar tu enlace de invitación en las redes sociales.`,
         },
         copyReferralLink: 'Copiar enlace de invitación',
     },
@@ -3147,7 +3147,7 @@ export default {
         [CONST.INTRO_CHOICES.TRACK]: 'Seguimiento de los gastos de empresa para fines fiscales',
         [CONST.INTRO_CHOICES.SUBMIT]: 'Reclamar gastos a mi empleador',
         [CONST.INTRO_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
-        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chat and split expenses with friends',
+        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chatea y divide gastos con tus amigos',
         welcomeMessage: 'Bienvenido a Expensify',
         welcomeSubtitle: '¿Qué te gustaría hacer?',
     },

From 8107aa20a910fe3c0365ba27215d1cf442268b81 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Tue, 16 Apr 2024 16:50:19 +0530
Subject: [PATCH 288/383] Fixed bad merge

---
 src/languages/es.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 74fb49e076fb..1095abcdea90 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -691,7 +691,7 @@ export default {
             saveFileMessage: 'Guarda el archivo ',
             loseFileMessage: 'o descarta este error y piérdelo',
             genericDeleteFailureMessage: 'Error inesperado al eliminar este gasto. Por favor, inténtalo más tarde',
-            genericEditFailureMessage: 'Error inesperado al editar este gasto. Por favor, inténtalo más tarde,
+            genericEditFailureMessage: 'Error inesperado al editar este gasto. Por favor, inténtalo más tarde',
             genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
             duplicateWaypointsErrorMessage: 'Por favor, elimina los puntos de ruta duplicados',
             atLeastTwoDifferentWaypoints: 'Por favor, introduce al menos dos direcciones diferentes',

From 6ca3199174132fd578547b1e07bc1b6b6039ee5e Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 17:07:18 +0530
Subject: [PATCH 289/383] fixes lint warning

---
 src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index d708acbef456..46e663956e4a 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -77,6 +77,7 @@ function IOURequestStepConfirmation({
     const transactionTaxAmount = transaction?.taxAmount;
     const isSharingTrackExpense = action === CONST.IOU.ACTION.SHARE;
     const isCategorizingTrackExpense = action === CONST.IOU.ACTION.CATEGORIZE;
+    const isRequestingFromTrackExpense = action === CONST.IOU.ACTION.MOVE;
 
     const requestType = TransactionUtils.getRequestType(transaction);
 
@@ -84,7 +85,7 @@ function IOURequestStepConfirmation({
         if (isSharingTrackExpense) {
             return translate('iou.categorize');
         }
-        if (action === CONST.IOU.ACTION.MOVE) {
+        if (isRequestingFromTrackExpense) {
             return translate('iou.request');
         }
         if (isCategorizingTrackExpense) {
@@ -100,7 +101,7 @@ function IOURequestStepConfirmation({
             return translate('common.send');
         }
         return translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
-    }, [iouType, transaction, translate, action]);
+    }, [iouType, transaction, translate, isSharingTrackExpense, isCategorizingTrackExpense, isRequestingFromTrackExpense]);
 
     const participants = useMemo(
         () =>
@@ -435,6 +436,8 @@ function IOURequestStepConfirmation({
             report?.reportID,
             trackExpense,
             createDistanceRequest,
+            isSharingTrackExpense,
+            isCategorizingTrackExpense,
             action,
         ],
     );

From 0a875c918553cd7e168b535d5d542cdc719784f4 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Tue, 16 Apr 2024 18:18:15 +0530
Subject: [PATCH 290/383] Apply suggestions from code review

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
---
 src/languages/es.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1095abcdea90..de73ba058c69 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -494,7 +494,7 @@ export default {
         beginningOfChatHistory: 'Aquí comienzan tus conversaciones con ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: '¡La colaboración entre ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' y ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: '  empieza aquí! 🎉 Este es el lugar donde chatear y presentar o pagar gastos.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: ' empieza aquí! 🎉 Este es el lugar donde chatear y presentar o pagar gastos.',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
         sayHello: '¡Saluda!',
@@ -640,7 +640,7 @@ export default {
         payElsewhere: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pagar ${formattedAmount} de otra forma` : `Pagar de otra forma`),
         nextStep: 'Pasos Siguientes',
         finished: 'Finalizado',
-        submitAmount: ({amount}: RequestAmountParams) => `submit ${amount}`,
+        submitAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
         submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicitó ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `realizó un seguimiento de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,

From 0d1ed476ddaee512ee0512904e71753c6bedbf08 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 16 Apr 2024 14:41:52 +0100
Subject: [PATCH 291/383] Do not allow new js files in other folders either

---
 .github/workflows/typecheck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 156b9764bcca..c4b0deb2c9a8 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -30,7 +30,7 @@ jobs:
           #    - git diff is used to see the files that were added on this branch
           #    - gh pr view is used to list files touched by this PR. Git diff may give false positives if the branch isn't up-to-date with main
           #  - wc counts the words in the result of the intersection
-          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
+          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.github/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'web/*.js' 'workflow_tests/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
           if [ "$count_new_js" -gt "0" ]; then
             echo "ERROR: Found new JavaScript files in the project; use TypeScript instead."
             exit 1

From ef3ecdca5407454f2d8f97f2a969d1f9d8e6f3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Tue, 16 Apr 2024 16:00:15 +0200
Subject: [PATCH 292/383] type fixes

---
 .../CalendarPicker/YearPickerModal.tsx        |  2 +-
 .../OptionsList/BaseOptionsList.tsx           |  2 +-
 src/components/OptionsList/types.ts           |  2 +-
 src/components/SelectionList/types.ts         |  2 +-
 src/libs/OptionsListUtils.ts                  | 27 ++++++++++++++-----
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
index c7816b710692..6170b81073a2 100644
--- a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
+++ b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
@@ -34,7 +34,7 @@ function YearPickerModal({isVisible, years, currentYear = new Date().getFullYear
         const yearsList = searchText === '' ? years : years.filter((year) => year.text?.includes(searchText));
         return {
             headerMessage: !yearsList.length ? translate('common.noResultsFound') : '',
-            sections: [{data: yearsList.sort((a, b) => b.value - a.value)}],
+            sections: [{data: yearsList.sort((a, b) => b.value - a.value), indexOffset: 0}],
         };
     }, [years, searchText, translate]);
 
diff --git a/src/components/OptionsList/BaseOptionsList.tsx b/src/components/OptionsList/BaseOptionsList.tsx
index 436f4c147931..7bbd3e344c3f 100644
--- a/src/components/OptionsList/BaseOptionsList.tsx
+++ b/src/components/OptionsList/BaseOptionsList.tsx
@@ -184,7 +184,7 @@ function BaseOptionsList(
                 option={item}
                 showTitleTooltip={showTitleTooltip}
                 hoverStyle={optionHoveredStyle}
-                optionIsFocused={!disableFocusOptions && !isItemDisabled && focusedIndex === index + section.indexOffset}
+                optionIsFocused={!disableFocusOptions && !isItemDisabled && focusedIndex === index + (section.indexOffset ?? 0)}
                 onSelectRow={onSelectRow}
                 isSelected={isSelected}
                 showSelectedState={canSelectMultipleOptions}
diff --git a/src/components/OptionsList/types.ts b/src/components/OptionsList/types.ts
index b7180e6281b4..7f23da965f39 100644
--- a/src/components/OptionsList/types.ts
+++ b/src/components/OptionsList/types.ts
@@ -22,7 +22,7 @@ type Section = {
 
 type SectionWithIndexOffset = Section & {
     /** The initial index of this section given the total number of options in each section's data array */
-    indexOffset: number;
+    indexOffset?: number;
 };
 
 type OptionsListProps = {
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 16431f3ff0c2..22afeb7e832b 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -186,7 +186,7 @@ type Section<TItem extends ListItem> = {
 
 type SectionWithIndexOffset<TItem extends ListItem> = Section<TItem> & {
     /** The initial index of this section given the total number of options in each section's data array */
-    indexOffset: number;
+    indexOffset?: number;
 };
 
 type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index aa16d7b2dc5a..1e76b19aa99c 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -117,6 +117,7 @@ type TaxSection = {
 
 type CategoryTreeSection = CategorySectionBase & {
     data: OptionTree[];
+    indexOffset?: number;
 };
 
 type Category = {
@@ -1023,11 +1024,13 @@ function getCategoryListSections(
     const numberOfEnabledCategories = enabledCategories.length;
 
     if (numberOfEnabledCategories === 0 && selectedOptions.length > 0) {
+        const data = getCategoryOptionTree(selectedOptions, true);
         categorySections.push({
             // "Selected" section
             title: '',
             shouldShow: false,
-            data: getCategoryOptionTree(selectedOptions, true),
+            data,
+            indexOffset: data.length,
         });
 
         return categorySections;
@@ -1046,22 +1049,26 @@ function getCategoryListSections(
             });
         });
 
+        const data = getCategoryOptionTree(searchCategories, true);
         categorySections.push({
             // "Search" section
             title: '',
             shouldShow: true,
-            data: getCategoryOptionTree(searchCategories, true),
+            data,
+            indexOffset: data.length,
         });
 
         return categorySections;
     }
 
     if (selectedOptions.length > 0) {
+        const data = getCategoryOptionTree(selectedOptions, true);
         categorySections.push({
             // "Selected" section
             title: '',
             shouldShow: false,
-            data: getCategoryOptionTree(selectedOptions, true),
+            data,
+            indexOffset: data.length,
         });
     }
 
@@ -1069,11 +1076,13 @@ function getCategoryListSections(
     const filteredCategories = enabledCategories.filter((category) => !selectedOptionNames.includes(category.name));
 
     if (numberOfEnabledCategories < CONST.CATEGORY_LIST_THRESHOLD) {
+        const data = getCategoryOptionTree(filteredCategories, false, selectedOptionNames);
         categorySections.push({
             // "All" section when items amount less than the threshold
             title: '',
             shouldShow: false,
-            data: getCategoryOptionTree(filteredCategories, false, selectedOptionNames),
+            data,
+            indexOffset: data.length,
         });
 
         return categorySections;
@@ -1089,19 +1098,23 @@ function getCategoryListSections(
     if (filteredRecentlyUsedCategories.length > 0) {
         const cutRecentlyUsedCategories = filteredRecentlyUsedCategories.slice(0, maxRecentReportsToShow);
 
+        const data = getCategoryOptionTree(cutRecentlyUsedCategories, true);
         categorySections.push({
             // "Recent" section
             title: Localize.translateLocal('common.recent'),
             shouldShow: true,
-            data: getCategoryOptionTree(cutRecentlyUsedCategories, true),
+            data,
+            indexOffset: data.length,
         });
     }
 
+    const data = getCategoryOptionTree(filteredCategories, false, selectedOptionNames);
     categorySections.push({
         // "All" section when items amount more than the threshold
         title: Localize.translateLocal('common.all'),
         shouldShow: true,
-        data: getCategoryOptionTree(filteredCategories, false, selectedOptionNames),
+        data,
+        indexOffset: data.length,
     });
 
     return categorySections;
@@ -2356,4 +2369,4 @@ export {
     getFirstKeyForList,
 };
 
-export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, TaxRatesOption, Option};
+export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, TaxRatesOption, Option, OptionTree};

From ab217f2cd9414768308fe3d5287fc36a0cb18561 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Tue, 16 Apr 2024 17:01:13 +0300
Subject: [PATCH 293/383] use isThreadFirstChat

---
 src/libs/ReportUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 6eb5dbbed55a..9b85506766a8 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1439,7 +1439,7 @@ function canDeleteReportAction(reportAction: OnyxEntry<ReportAction>, reportID:
             return false;
         }
 
-        const linkedReport = isChatThread(report) ? getReport(report?.parentReportID) : report;
+        const linkedReport = isThreadFirstChat(reportAction, reportID) ? getReport(report?.parentReportID) : report;
         if (isActionOwner) {
             if (!isEmptyObject(linkedReport) && isMoneyRequestReport(linkedReport)) {
                 return canAddOrDeleteTransactions(linkedReport);

From 68fc67f7cd4f279f76d3950627266b48923fbe70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20M=C3=B3rawski?= <lukasz.morawski@callstack.com>
Date: Tue, 16 Apr 2024 16:24:59 +0200
Subject: [PATCH 294/383] test fixes

---
 tests/unit/OptionsListUtilsTest.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index af5782b1ca32..75ed7fa9d5b1 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -812,12 +812,14 @@ describe('OptionsListUtils', () => {
                         isSelected: false,
                     },
                 ],
+                indexOffset: 3,
             },
         ];
         const smallSearchResultList: OptionsListUtils.CategoryTreeSection[] = [
             {
                 title: '',
                 shouldShow: true,
+                indexOffset: 2,
                 data: [
                     {
                         text: 'Food',
@@ -842,6 +844,7 @@ describe('OptionsListUtils', () => {
             {
                 title: '',
                 shouldShow: true,
+                indexOffset: 0,
                 data: [],
             },
         ];
@@ -977,6 +980,7 @@ describe('OptionsListUtils', () => {
             {
                 title: '',
                 shouldShow: false,
+                indexOffset: 1,
                 data: [
                     {
                         text: 'Medical',
@@ -991,6 +995,7 @@ describe('OptionsListUtils', () => {
             {
                 title: 'Recent',
                 shouldShow: true,
+                indexOffset: 1,
                 data: [
                     {
                         text: 'Restaurant',
@@ -1005,6 +1010,7 @@ describe('OptionsListUtils', () => {
             {
                 title: 'All',
                 shouldShow: true,
+                indexOffset: 11,
                 data: [
                     {
                         text: 'Cars',
@@ -1101,6 +1107,7 @@ describe('OptionsListUtils', () => {
             {
                 title: '',
                 shouldShow: true,
+                indexOffset: 3,
                 data: [
                     {
                         text: 'Food',
@@ -1133,6 +1140,7 @@ describe('OptionsListUtils', () => {
             {
                 title: '',
                 shouldShow: true,
+                indexOffset: 0,
                 data: [],
             },
         ];
@@ -1141,6 +1149,7 @@ describe('OptionsListUtils', () => {
             {
                 title: '',
                 shouldShow: false,
+                indexOffset: 1,
                 data: [
                     {
                         text: 'Medical',

From fee8f3f98d6a6c2fcd93df16c4349f9c57a96ee7 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 16 Apr 2024 15:26:01 +0100
Subject: [PATCH 295/383] Test the workflow

---
 .github/workflows/typecheck.yml | 2 +-
 __mocks__/test.js               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 __mocks__/test.js

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index c4b0deb2c9a8..754067f1f1d0 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -30,7 +30,7 @@ jobs:
           #    - git diff is used to see the files that were added on this branch
           #    - gh pr view is used to list files touched by this PR. Git diff may give false positives if the branch isn't up-to-date with main
           #  - wc counts the words in the result of the intersection
-          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.github/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'web/*.js' 'workflow_tests/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
+          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'web/*.js' 'workflow_tests/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
           if [ "$count_new_js" -gt "0" ]; then
             echo "ERROR: Found new JavaScript files in the project; use TypeScript instead."
             exit 1
diff --git a/__mocks__/test.js b/__mocks__/test.js
new file mode 100644
index 000000000000..30d74d258442
--- /dev/null
+++ b/__mocks__/test.js
@@ -0,0 +1 @@
+test
\ No newline at end of file

From 3064d3a430fa262142825c194039aee7207d0bb1 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 20:40:51 +0530
Subject: [PATCH 296/383] fixes category not showing

---
 src/libs/ReportUtils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 72682fe97aa3..666d728a862f 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4388,6 +4388,7 @@ function buildTransactionThread(
             parentReportActionID: reportAction?.reportActionID,
             parentReportID: moneyRequestReport?.reportID,
             reportName: getTransactionReportName(reportAction),
+            policyID: moneyRequestReport?.policyID,
         };
     }
 

From c5e794bd18cc3d2a08d3cefad12cbcbc8c0a7926 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 16 Apr 2024 21:39:04 +0530
Subject: [PATCH 297/383] disable threads for whisper message and use correct
 translations

---
 src/languages/es.ts     | 8 ++++----
 src/libs/ReportUtils.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 4f8ac744e899..14827cb5c6b2 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3048,10 +3048,10 @@ export default {
         decline: 'Rechazar',
     },
     actionableMentionTrackExpense: {
-        request: 'Request someone to pay it',
-        categorize: 'Categorize it',
-        share: 'Share it with my accountant',
-        nothing: 'Nothing for now',
+        request: 'Pedirle a alguien que lo pague',
+        categorize: 'Categorizarlo',
+        share: 'Compartirlo con mi contador',
+        nothing: 'Por ahora, nada',
     },
     moderation: {
         flagDescription: 'Todos los mensajes marcados se enviarán a un moderador para su revisión.',
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 666d728a862f..121579def8a0 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -5712,7 +5712,7 @@ function shouldDisableThread(reportAction: OnyxEntry<ReportAction>, reportID: st
     const isDeletedAction = ReportActionsUtils.isDeletedAction(reportAction);
     const isReportPreviewAction = ReportActionsUtils.isReportPreviewAction(reportAction);
     const isIOUAction = ReportActionsUtils.isMoneyRequestAction(reportAction);
-    const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction);
+    const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction) || ReportActionsUtils.isActionableTrackExpense(reportAction);
     const isArchivedReport = isArchivedRoom(getReport(reportID));
 
     return (

From d15aabc26b54da194cc9df613449a1bf4b9cadd9 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Tue, 16 Apr 2024 18:26:03 +0200
Subject: [PATCH 298/383] fix: remove sensor animation for now

---
 .../report/AnimatedEmptyStateBackground.tsx   | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/pages/home/report/AnimatedEmptyStateBackground.tsx b/src/pages/home/report/AnimatedEmptyStateBackground.tsx
index 4199ebe5937f..7ddbdaef687b 100644
--- a/src/pages/home/report/AnimatedEmptyStateBackground.tsx
+++ b/src/pages/home/report/AnimatedEmptyStateBackground.tsx
@@ -1,15 +1,11 @@
 import React from 'react';
-import Animated, {clamp, SensorType, useAnimatedSensor, useAnimatedStyle, useReducedMotion, useSharedValue, withSpring} from 'react-native-reanimated';
+import {Image} from 'react-native';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeIllustrations from '@hooks/useThemeIllustrations';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 
-// Maximum horizontal and vertical shift in pixels on sensor value change
-const IMAGE_OFFSET_X = 30;
-const IMAGE_OFFSET_Y = 20;
-
 function AnimatedEmptyStateBackground() {
     const StyleUtils = useStyleUtils();
     const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
@@ -18,36 +14,10 @@ function AnimatedEmptyStateBackground() {
     // If window width is greater than the max background width, repeat the background image
     const maxBackgroundWidth = variables.sideBarWidth + CONST.EMPTY_STATE_BACKGROUND.ASPECT_RATIO * CONST.EMPTY_STATE_BACKGROUND.WIDE_SCREEN.IMAGE_HEIGHT;
 
-    // Get data from phone rotation sensor and prep other variables for animation
-    const animatedSensor = useAnimatedSensor(SensorType.GYROSCOPE);
-    const xOffset = useSharedValue(0);
-    const yOffset = useSharedValue(0);
-    const isReducedMotionEnabled = useReducedMotion();
-
-    // Apply data to create style object
-    const animatedStyles = useAnimatedStyle(() => {
-        if (!isSmallScreenWidth || isReducedMotionEnabled) {
-            return {};
-        }
-        /*
-         * We use x and y gyroscope velocity and add it to position offset to move background based on device movements.
-         * Position the phone was in while entering the screen is the initial position for background image.
-         */
-        const {x, y} = animatedSensor.sensor.value;
-        // The x vs y here seems wrong but is the way to make it feel right to the user
-        xOffset.value = clamp(xOffset.value + y * CONST.ANIMATION_GYROSCOPE_VALUE, -IMAGE_OFFSET_X, IMAGE_OFFSET_X);
-        yOffset.value = clamp(yOffset.value - x * CONST.ANIMATION_GYROSCOPE_VALUE, -IMAGE_OFFSET_Y, IMAGE_OFFSET_Y);
-        return {
-            // On Android, scroll view sub views gets clipped beyond container bounds. Set the top position so that image wouldn't get clipped
-            top: IMAGE_OFFSET_Y,
-            transform: [{translateX: withSpring(xOffset.value)}, {translateY: withSpring(yOffset.value, {overshootClamping: true})}, {scale: 1.15}],
-        };
-    }, [isReducedMotionEnabled]);
-
     return (
-        <Animated.Image
+        <Image
             source={illustrations.EmptyStateBackgroundImage}
-            style={[StyleUtils.getReportWelcomeBackgroundImageStyle(isSmallScreenWidth), animatedStyles]}
+            style={StyleUtils.getReportWelcomeBackgroundImageStyle(isSmallScreenWidth)}
             resizeMode={windowWidth > maxBackgroundWidth ? 'repeat' : 'cover'}
         />
     );

From 4ab09499b41b7a394a83211ce34566aea50d4dfc Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 16 Apr 2024 16:56:38 +0000
Subject: [PATCH 299/383] Update version to 1.4.62-11

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index da340184e7c8..878849c0180f 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 1001046210
-        versionName "1.4.62-10"
+        versionCode 1001046211
+        versionName "1.4.62-11"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 4dea8203b477..fdfa26ee8404 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.10</string>
+	<string>1.4.62.11</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0d1e81ade440..328d923ff172 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.62.10</string>
+	<string>1.4.62.11</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index a2dfb017df48..1707a3f8c1fc 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.10</string>
+	<string>1.4.62.11</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 203e062de680..f6860a1b56dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-10",
+  "version": "1.4.62-11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-10",
+      "version": "1.4.62-11",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 43a3ed8cae6a..52b05276ff75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-10",
+  "version": "1.4.62-11",
   "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.",

From 4319c85099c66de2e793f3d131cc6a02657d748e Mon Sep 17 00:00:00 2001
From: Robert Kozik <robert.kozik@swmansion.com>
Date: Tue, 16 Apr 2024 20:16:07 +0200
Subject: [PATCH 300/383] update expensify-common to latest commit

---
 package-lock.json | 36 +++++++++++++++++++++---------------
 package.json      |  2 +-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1959aaa516d..8b1313052561 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,7 +57,7 @@
         "date-fns-tz": "^2.0.0",
         "dom-serializer": "^0.2.2",
         "domhandler": "^4.3.0",
-        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#13de5b0606662df33fa1392ad82cc11daadff52e",
+        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#c0f7f3b6558fbeda0527c80d68460d418afef219",
         "expo": "^50.0.3",
         "expo-av": "~13.10.4",
         "expo-image": "1.11.0",
@@ -16462,10 +16462,8 @@
     },
     "node_modules/classnames": {
       "version": "2.5.0",
-      "license": "MIT",
-      "workspaces": [
-        "benchmarks"
-      ]
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.0.tgz",
+      "integrity": "sha512-FQuRlyKinxrb5gwJlfVASbSrDlikDJ07426TrfPsdGLvtochowmkbnSFdQGJ2aoXrSetq5KqGV9emvWpy+91xA=="
     },
     "node_modules/clean-css": {
       "version": "5.3.2",
@@ -16551,7 +16549,8 @@
     },
     "node_modules/clipboard": {
       "version": "2.0.11",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
       "dependencies": {
         "good-listener": "^1.2.2",
         "select": "^1.1.2",
@@ -18058,7 +18057,8 @@
     },
     "node_modules/delegate": {
       "version": "3.2.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
     },
     "node_modules/delegates": {
       "version": "1.0.0",
@@ -20212,8 +20212,8 @@
     },
     "node_modules/expensify-common": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#13de5b0606662df33fa1392ad82cc11daadff52e",
-      "integrity": "sha512-/NAZoAXqeqFWHvC61dueqq9VjRugF69urUtDdDhsfvu1sQE2PCnBoM7a+ACoAEWRYrnP82cyHHhdSA8e7fPuAg==",
+      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#c0f7f3b6558fbeda0527c80d68460d418afef219",
+      "integrity": "sha512-zz0/y0apISP1orxXEQOgn+Uod45O4wVypwwtaqcDPV4dH1tC3i4L98NoLSZvLn7Y17EcceSkfN6QCEsscgFTDQ==",
       "license": "MIT",
       "dependencies": {
         "classnames": "2.5.0",
@@ -20266,6 +20266,8 @@
     },
     "node_modules/expensify-common/node_modules/ua-parser-js": {
       "version": "1.0.37",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
+      "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -20280,7 +20282,6 @@
           "url": "https://github.com/sponsors/faisalman"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -21728,7 +21729,8 @@
     },
     "node_modules/good-listener": {
       "version": "1.2.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
       "dependencies": {
         "delegate": "^3.1.2"
       }
@@ -22779,7 +22781,8 @@
     },
     "node_modules/immediate": {
       "version": "3.0.6",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
@@ -26838,7 +26841,8 @@
     },
     "node_modules/lie": {
       "version": "3.1.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
       "dependencies": {
         "immediate": "~3.0.5"
       }
@@ -26981,7 +26985,8 @@
     },
     "node_modules/localforage": {
       "version": "1.10.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
       "dependencies": {
         "lie": "3.1.1"
       }
@@ -33311,7 +33316,8 @@
     },
     "node_modules/select": {
       "version": "1.1.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index 02f68a566334..f1f55824937e 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#13de5b0606662df33fa1392ad82cc11daadff52e",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#c0f7f3b6558fbeda0527c80d68460d418afef219",
     "expo": "^50.0.3",
     "expo-av": "~13.10.4",
     "expo-image": "1.11.0",

From f5440ec39b1369ff9cf68d1709b166c030aa9edf Mon Sep 17 00:00:00 2001
From: Robert Kozik <robert.kozik@swmansion.com>
Date: Tue, 16 Apr 2024 20:16:34 +0200
Subject: [PATCH 301/383] enable self closing tags in html messages

---
 src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
index 9551e9d8f7c8..51f9981f1524 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
@@ -92,6 +92,9 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
             tagsStyles={styles.webViewStyles.tagStyles}
             enableCSSInlineProcessing={false}
             systemFonts={Object.values(FontUtils.fontFamily.single)}
+            htmlParserOptions={{
+                recognizeSelfClosing: true,
+            }}
             domVisitors={{
                 // eslint-disable-next-line no-param-reassign
                 onText: (text) => (text.data = convertToLTR(text.data)),

From 1767afa94468772eee5e4fccc8fbb6613e34e50c Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 16 Apr 2024 12:02:37 -0700
Subject: [PATCH 302/383] Avoid crash

---
 src/pages/workspace/WorkspaceMoreFeaturesPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index f37921f07c36..66e6b87d79d3 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -48,7 +48,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
     const {translate} = useLocalize();
     const {canUseAccountingIntegrations} = usePermissions();
     const hasAccountingConnection = !!policy?.areConnectionsEnabled && !!policy?.connections;
-    const isSyncTaxEnabled = !!policy?.connections?.quickbooksOnline.config.syncTax;
+    const isSyncTaxEnabled = !!policy?.connections?.quickbooksOnline?.config?.syncTax;
 
     const spendItems: Item[] = [
         {

From 6bac2eea5426be04b0ffed5caac6451996749097 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 16 Apr 2024 12:14:46 -0700
Subject: [PATCH 303/383] Skip PUSHER_DEV_SUFFIX if env is not DEV

---
 src/CONFIG.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CONFIG.ts b/src/CONFIG.ts
index 76ea18d37d5f..fa72abb93a9e 100644
--- a/src/CONFIG.ts
+++ b/src/CONFIG.ts
@@ -48,6 +48,7 @@ export default {
     EXPENSIFY: {
         // Note: This will be EXACTLY what is set for EXPENSIFY_URL whether the proxy is enabled or not.
         EXPENSIFY_URL: expensifyURL,
+        SECURE_EXPENSIFY_URL: stagingExpensifyURL,
         NEW_EXPENSIFY_URL: newExpensifyURL,
 
         // The DEFAULT API is the API used by most environments, except staging, where we use STAGING (defined below)
@@ -72,7 +73,7 @@ export default {
     IS_USING_LOCAL_WEB: useNgrok || expensifyURLRoot.includes('dev'),
     PUSHER: {
         APP_KEY: get(Config, 'PUSHER_APP_KEY', '268df511a204fbb60884'),
-        SUFFIX: get(Config, 'PUSHER_DEV_SUFFIX', ''),
+        SUFFIX: ENVIRONMENT === CONST.ENVIRONMENT.DEV ? get(Config, 'PUSHER_DEV_SUFFIX', '') : '',
         CLUSTER: 'mt1',
     },
     SITE_TITLE: 'New Expensify',

From 291c85f00beda1522d7c58307e8f65b93fa8843a Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 16 Apr 2024 12:14:59 -0700
Subject: [PATCH 304/383] Add skipWebProxy

---
 src/libs/ApiUtils.ts                             | 6 ++++--
 src/libs/actions/connections/QuickBooksOnline.ts | 2 +-
 src/types/onyx/Request.ts                        | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/ApiUtils.ts b/src/libs/ApiUtils.ts
index 0c8fa3f53915..00d887e7c1f0 100644
--- a/src/libs/ApiUtils.ts
+++ b/src/libs/ApiUtils.ts
@@ -38,12 +38,14 @@ function getApiRoot(request?: Request): string {
     const shouldUseSecure = request?.shouldUseSecure ?? false;
 
     if (shouldUseStagingServer) {
-        if (CONFIG.IS_USING_WEB_PROXY) {
+        if (CONFIG.IS_USING_WEB_PROXY && !request?.skipWebProxy) {
             return shouldUseSecure ? proxyConfig.STAGING_SECURE : proxyConfig.STAGING;
         }
         return shouldUseSecure ? CONFIG.EXPENSIFY.STAGING_SECURE_API_ROOT : CONFIG.EXPENSIFY.STAGING_API_ROOT;
     }
-
+    if (request?.skipWebProxy) {
+        return shouldUseSecure ? CONFIG.EXPENSIFY.SECURE_EXPENSIFY_URL : CONFIG.EXPENSIFY.EXPENSIFY_URL;
+    }
     return shouldUseSecure ? CONFIG.EXPENSIFY.DEFAULT_SECURE_API_ROOT : CONFIG.EXPENSIFY.DEFAULT_API_ROOT;
 }
 
diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index d1e27f9e04f1..61ac8920e912 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -2,7 +2,7 @@ import {getCommandURL} from '@libs/ApiUtils';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
     const params = new URLSearchParams({policyID});
-    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline'});
+    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline', skipWebProxy: true});
     return commandURL + params.toString();
 }
 
diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts
index f6e82d75db70..47208ce6c1ec 100644
--- a/src/types/onyx/Request.ts
+++ b/src/types/onyx/Request.ts
@@ -21,6 +21,7 @@ type RequestData = {
     finallyData?: OnyxUpdate[];
     resolve?: (value: Response) => void;
     reject?: (value?: unknown) => void;
+    skipWebProxy?: boolean,
 };
 
 type Request = RequestData & OnyxData;

From 08efe3b9a005f4715a99f4dd19af517b56049c29 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 16 Apr 2024 19:18:05 +0000
Subject: [PATCH 305/383] Update version to 1.4.62-12

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 878849c0180f..b9a7fa4d6b4b 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 1001046211
-        versionName "1.4.62-11"
+        versionCode 1001046212
+        versionName "1.4.62-12"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index fdfa26ee8404..9db0bbd40945 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.11</string>
+	<string>1.4.62.12</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 328d923ff172..c2fe74d90fcd 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.62.11</string>
+	<string>1.4.62.12</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 1707a3f8c1fc..7503dd04702b 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.11</string>
+	<string>1.4.62.12</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 0e4ffa3878b5..0817e4bbbd2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-11",
+  "version": "1.4.62-12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-11",
+      "version": "1.4.62-12",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 54b9958b627f..60e6a320cfb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-11",
+  "version": "1.4.62-12",
   "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.",

From 033d25881c3af62a39d9125717f14af86a8f21ef Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 16 Apr 2024 20:19:40 +0100
Subject: [PATCH 306/383] Remove the test file

---
 __mocks__/test.js | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 __mocks__/test.js

diff --git a/__mocks__/test.js b/__mocks__/test.js
deleted file mode 100644
index 30d74d258442..000000000000
--- a/__mocks__/test.js
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file

From 487212fe3168ba1f7021e4ec5d5e9075020c4fa6 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 16 Apr 2024 20:30:56 +0100
Subject: [PATCH 307/383] Exclude github libs and scripts folders too

---
 .github/workflows/typecheck.yml | 2 +-
 __mocks__/test.js               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 __mocks__/test.js

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 754067f1f1d0..f20939f9df0a 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -30,7 +30,7 @@ jobs:
           #    - git diff is used to see the files that were added on this branch
           #    - gh pr view is used to list files touched by this PR. Git diff may give false positives if the branch isn't up-to-date with main
           #  - wc counts the words in the result of the intersection
-          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'web/*.js' 'workflow_tests/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
+          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'web/*.js' 'workflow_tests/*.js' '.github/libs/*.js' '.github/scripts/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
           if [ "$count_new_js" -gt "0" ]; then
             echo "ERROR: Found new JavaScript files in the project; use TypeScript instead."
             exit 1
diff --git a/__mocks__/test.js b/__mocks__/test.js
new file mode 100644
index 000000000000..30d74d258442
--- /dev/null
+++ b/__mocks__/test.js
@@ -0,0 +1 @@
+test
\ No newline at end of file

From 457eeb3330763f721284da2a211223c3408ddc06 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 16 Apr 2024 20:32:02 +0100
Subject: [PATCH 308/383] Clear up the test file

---
 __mocks__/test.js | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 __mocks__/test.js

diff --git a/__mocks__/test.js b/__mocks__/test.js
deleted file mode 100644
index 30d74d258442..000000000000
--- a/__mocks__/test.js
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file

From 9fa396f4b489b566f8530fef8daeabdc9fd3d380 Mon Sep 17 00:00:00 2001
From: Ezra Ellette <ezrasellette@gmail.com>
Date: Tue, 16 Apr 2024 15:27:19 -0500
Subject: [PATCH 309/383] useWaitForCollectionCallback no iter

---
 src/libs/ReportActionsUtils.ts      | 25 +++++++++---------
 src/libs/ReportUtils.ts             | 22 ++++++++--------
 src/libs/SidebarUtils.ts            | 41 ++++++++++++-----------------
 src/libs/WorkspacesSettingsUtils.ts |  9 +++----
 src/libs/actions/IOU.ts             |  9 +++----
 src/libs/actions/ReportActions.ts   |  7 +++--
 src/libs/actions/Task.ts            | 13 +++++----
 7 files changed, 57 insertions(+), 69 deletions(-)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 32972a81bcb5..b2feed518683 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -20,7 +20,6 @@ import type {Message, ReportActionBase, ReportActions} from '@src/types/onyx/Rep
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import * as CollectionUtils from './CollectionUtils';
 import * as Environment from './Environment/Environment';
 import isReportMessageAttachment from './isReportMessageAttachment';
 import * as Localize from './Localize';
@@ -59,16 +58,16 @@ Onyx.connect({
     },
 });
 
-const allReportActions: OnyxCollection<ReportActions> = {};
+let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
 
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        allReportActions[reportID] = actions;
+        allReportActions = actions;
     },
 });
 
@@ -195,7 +194,7 @@ function getParentReportAction(report: OnyxEntry<Report> | EmptyObject): ReportA
     if (!report?.parentReportID || !report.parentReportActionID) {
         return {};
     }
-    return allReportActions?.[report.parentReportID]?.[report.parentReportActionID] ?? {};
+    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`]?.[report.parentReportActionID] ?? {};
 }
 
 /**
@@ -593,7 +592,7 @@ function replaceBaseURLInPolicyChangeLogAction(reportAction: ReportAction): Repo
 }
 
 function getLastVisibleAction(reportID: string, actionsToMerge: OnyxCollection<ReportAction> = {}): OnyxEntry<ReportAction> {
-    const reportActions = Object.values(fastMerge(allReportActions?.[reportID] ?? {}, actionsToMerge ?? {}, true));
+    const reportActions = Object.values(fastMerge(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {}, actionsToMerge ?? {}, true));
     const visibleReportActions = Object.values(reportActions ?? {}).filter((action): action is ReportAction => shouldReportActionBeVisibleAsLastAction(action));
     const sortedReportActions = getSortedReportActions(visibleReportActions, true);
     if (sortedReportActions.length === 0) {
@@ -714,7 +713,7 @@ function getLatestReportActionFromOnyxData(onyxData: OnyxUpdate[] | null): OnyxE
  * Find the transaction associated with this reportAction, if one exists.
  */
 function getLinkedTransactionID(reportActionOrID: string | OnyxEntry<ReportAction>, reportID?: string): string | null {
-    const reportAction = typeof reportActionOrID === 'string' ? allReportActions?.[reportID ?? '']?.[reportActionOrID] : reportActionOrID;
+    const reportAction = typeof reportActionOrID === 'string' ? allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]?.[reportActionOrID] : reportActionOrID;
     if (!reportAction || reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
         return null;
     }
@@ -722,7 +721,7 @@ function getLinkedTransactionID(reportActionOrID: string | OnyxEntry<ReportActio
 }
 
 function getReportAction(reportID: string, reportActionID: string): OnyxEntry<ReportAction> {
-    return allReportActions?.[reportID]?.[reportActionID] ?? null;
+    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]?.[reportActionID] ?? null;
 }
 
 function getMostRecentReportActionLastModified(): string {
@@ -769,7 +768,7 @@ function getMostRecentReportActionLastModified(): string {
  */
 function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxEntry<ReportAction> {
     return (
-        Object.values(allReportActions?.[chatReportID] ?? {}).find(
+        Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`] ?? {}).find(
             (reportAction) => reportAction && reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && reportAction.originalMessage.linkedReportID === iouReportID,
         ) ?? null
     );
@@ -823,7 +822,7 @@ function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
  * If there are no visible actions left (including system messages), we can hide the report from view entirely
  */
 function doesReportHaveVisibleActions(reportID: string, actionsToMerge: ReportActions = {}): boolean {
-    const reportActions = Object.values(fastMerge(allReportActions?.[reportID] ?? {}, actionsToMerge, true));
+    const reportActions = Object.values(fastMerge(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {}, actionsToMerge, true));
     const visibleReportActions = Object.values(reportActions ?? {}).filter((action) => shouldReportActionBeVisibleAsLastAction(action));
 
     // Exclude the task system message and the created message
@@ -832,7 +831,7 @@ function doesReportHaveVisibleActions(reportID: string, actionsToMerge: ReportAc
 }
 
 function getAllReportActions(reportID: string): ReportActions {
-    return allReportActions?.[reportID] ?? {};
+    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {};
 }
 
 /**
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 49cf4f11f078..3587d67ee530 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -55,7 +55,6 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
 import * as IOU from './actions/IOU';
 import * as store from './actions/ReimbursementAccount/store';
-import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {hasValidDraftComment} from './DraftCommentUtils';
@@ -537,7 +536,7 @@ Onyx.connect({
     },
 });
 
-let reportActionsByReport: OnyxCollection<ReportActions> = {};
+let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
@@ -545,7 +544,7 @@ Onyx.connect({
         if (!actions) {
             return;
         }
-        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
+        allReportActions = actions;
     },
 });
 
@@ -1319,7 +1318,7 @@ function isMoneyRequestReport(reportOrID: OnyxEntry<Report> | EmptyObject | stri
  * Checks if a report has only one transaction associated with it
  */
 function isOneTransactionReport(reportID: string): boolean {
-    const reportActions = reportActionsByReport?.[reportID] ?? ([] as ReportAction[]);
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? ([] as ReportAction[]);
     return ReportActionsUtils.getOneTransactionThreadReportID(reportID, reportActions) !== null;
 }
 
@@ -1327,7 +1326,7 @@ function isOneTransactionReport(reportID: string): boolean {
  * Checks if a report is a transaction thread associated with a report that has only one transaction
  */
 function isOneTransactionThread(reportID: string, parentReportID: string): boolean {
-    const parentReportActions = reportActionsByReport?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? ([] as ReportAction[]);
+    const parentReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? ([] as ReportAction[]);
     const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(parentReportID, parentReportActions);
     return reportID === transactionThreadReportID;
 }
@@ -4553,7 +4552,7 @@ function canAccessReport(report: OnyxEntry<Report>, policies: OnyxCollection<Pol
 function shouldHideReport(report: OnyxEntry<Report>, currentReportId: string): boolean {
     const currentReport = getReport(currentReportId);
     const parentReport = getParentReport(!isEmptyObject(currentReport) ? currentReport : null);
-    const reportActions = reportActionsByReport?.[report?.reportID ?? ''] ?? {};
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.reportID}`] ?? {};
     const isChildReportHasComment = Object.values(reportActions ?? {})?.some((reportAction) => (reportAction?.childVisibleActionCount ?? 0) > 0);
     return parentReport?.reportID !== report?.reportID && !isChildReportHasComment;
 }
@@ -5211,7 +5210,7 @@ function canUserPerformWriteAction(report: OnyxEntry<Report>) {
  * Returns ID of the original report from which the given reportAction is first created.
  */
 function getOriginalReportID(reportID: string, reportAction: OnyxEntry<ReportAction>): string | undefined {
-    const reportActions = reportActionsByReport?.[reportID];
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`];
     const currentReportAction = reportActions?.[reportAction?.reportActionID ?? ''] ?? null;
     const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(reportID, reportActions ?? ([] as ReportAction[]));
     if (transactionThreadReportID !== null) {
@@ -5713,9 +5712,10 @@ function shouldDisableThread(reportAction: OnyxEntry<ReportAction>, reportID: st
     const isIOUAction = ReportActionsUtils.isMoneyRequestAction(reportAction);
     const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction) || ReportActionsUtils.isActionableTrackExpense(reportAction);
     const isArchivedReport = isArchivedRoom(getReport(reportID));
+    const isActionDisabled = CONST.REPORT.ACTIONS.THREAD_DISABLED.some((action: string) => action === reportAction?.actionName);
 
     return (
-        CONST.REPORT.ACTIONS.THREAD_DISABLED.some((action: string) => action === reportAction?.actionName) ||
+        isActionDisabled ||
         isSplitBillAction ||
         (isDeletedAction && !reportAction?.childVisibleActionCount) ||
         (isArchivedReport && !reportAction?.childVisibleActionCount) ||
@@ -5888,7 +5888,7 @@ function getIndicatedMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, rep
  * Checks if report chat contains missing payment method
  */
 function hasMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, iouReportID: string): boolean {
-    const reportActions = reportActionsByReport?.[iouReportID] ?? {};
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`] ?? {};
     return Object.values(reportActions).some((action) => getIndicatedMissingPaymentMethod(userWallet, iouReportID, action) !== undefined);
 }
 
@@ -5907,7 +5907,7 @@ function shouldCreateNewMoneyRequestReport(existingIOUReport: OnyxEntry<Report>
  * Checks if report contains actions with errors
  */
 function hasActionsWithErrors(reportID: string): boolean {
-    const reportActions = reportActionsByReport?.[reportID ?? ''] ?? {};
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {};
     return Object.values(reportActions).some((action) => !isEmptyObject(action.errors));
 }
 
@@ -5930,7 +5930,7 @@ function getReportActionActorAccountID(reportAction: OnyxEntry<ReportAction>, io
 
 function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: ValueOf<typeof CONST.IOU.ACTION>, reportActionID: string): void {
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction);
-    const reportActions = reportActionsByReport?.[reportID] ?? ([] as ReportAction[]);
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? ([] as ReportAction[]);
 
     if (!transaction || !reportActions) {
         return;
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 60a177c8fea9..d83a8db3cd39 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -23,35 +23,28 @@ import * as ReportUtils from './ReportUtils';
 import * as TaskUtils from './TaskUtils';
 import * as UserUtils from './UserUtils';
 
-const reportActionsByReport: OnyxCollection<ReportActions> = {};
 const visibleReportActionItems: ReportActions = {};
-
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    waitForCollectionCallback: true,
-    callback: (actions) => {
-        if (!actions) {
+    callback: (actions, key) => {
+        if (!actions || !key) {
             return;
         }
+        const reportID = CollectionUtils.extractCollectionItemID(key);
+
+        const actionsArray: ReportAction[] = ReportActionsUtils.getSortedReportActions(Object.values(actions));
+
+        // The report is only visible if it is the last action not deleted that
+        // does not match a closed or created state.
+        const reportActionsForDisplay = actionsArray.filter(
+            (reportAction, actionKey) =>
+                ReportActionsUtils.shouldReportActionBeVisible(reportAction, actionKey) &&
+                !ReportActionsUtils.isWhisperAction(reportAction) &&
+                reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED &&
+                reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        );
 
-        Object.entries(actions).forEach(([reportKey, reportActions]) => {
-            const reportID = CollectionUtils.extractCollectionItemID(reportKey as `reportActions_${string}`);
-
-            reportActionsByReport[reportID] = reportActions;
-
-            const actionsArray: ReportAction[] = ReportActionsUtils.getSortedReportActions(Object.values(reportActions ?? {}));
-            // The report is only visible if it is the last action not deleted that
-            // does not match a closed or created state.
-            const reportActionsForDisplay = actionsArray.filter(
-                (reportAction, actionKey) =>
-                    ReportActionsUtils.shouldReportActionBeVisible(reportAction, actionKey) &&
-                    !ReportActionsUtils.isWhisperAction(reportAction) &&
-                    reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED &&
-                    reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-            );
-
-            visibleReportActionItems[reportID] = reportActionsForDisplay[reportActionsForDisplay.length - 1];
-        });
+        visibleReportActionItems[reportID] = reportActionsForDisplay[reportActionsForDisplay.length - 1];
     },
 });
 
@@ -91,7 +84,7 @@ function getOrderedReportIDs(
 
         const parentReportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`;
         const parentReportActions = allReportActions?.[parentReportActionsKey];
-        const reportActions = reportActionsByReport?.[report.reportID] ?? {};
+        const reportActions = allReportActions?.[report.reportID] ?? {};
         const parentReportAction = parentReportActions?.find((action) => action && action?.reportActionID === report.parentReportActionID);
         const doesReportHaveViolations = !!(
             betas?.includes(CONST.BETAS.VIOLATIONS) &&
diff --git a/src/libs/WorkspacesSettingsUtils.ts b/src/libs/WorkspacesSettingsUtils.ts
index 54ebe0ef9ab7..5d4238c533be 100644
--- a/src/libs/WorkspacesSettingsUtils.ts
+++ b/src/libs/WorkspacesSettingsUtils.ts
@@ -6,7 +6,6 @@ import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, PolicyMembers, ReimbursementAccount, Report, ReportActions} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
-import * as CollectionUtils from './CollectionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
 import type {Phrase, PhraseParameters} from './Localize';
 import * as OptionsListUtils from './OptionsListUtils';
@@ -52,7 +51,7 @@ Onyx.connect({
     },
 });
 
-let reportActionsByReport: OnyxCollection<ReportActions> = {};
+let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
@@ -60,7 +59,7 @@ Onyx.connect({
         if (!actions) {
             return;
         }
-        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
+        allReportActions = actions;
     },
 });
 
@@ -69,7 +68,7 @@ Onyx.connect({
  * @returns BrickRoad for the policy passed as a param
  */
 const getBrickRoadForPolicy = (report: Report): BrickRoad => {
-    const reportActions = reportActionsByReport?.[report.reportID] ?? {};
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {};
     const reportErrors = OptionsListUtils.getAllReportErrors(report, reportActions);
     const doesReportContainErrors = Object.keys(reportErrors ?? {}).length !== 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;
     if (doesReportContainErrors) {
@@ -79,7 +78,7 @@ const getBrickRoadForPolicy = (report: Report): BrickRoad => {
     // To determine if the report requires attention from the current user, we need to load the parent report action
     let itemParentReportAction = {};
     if (report.parentReportID) {
-        const itemParentReportActions = reportActionsByReport?.[report.parentReportID] ?? {};
+        const itemParentReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`] ?? {};
         itemParentReportAction = report.parentReportActionID ? itemParentReportActions[report.parentReportActionID] : {};
     }
     const reportOption = {...report, isUnread: ReportUtils.isUnread(report), isUnreadWithMention: ReportUtils.isUnreadWithMention(report)};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index e2de6f995492..3ce1edb36630 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -25,7 +25,6 @@ import type {
     UpdateMoneyRequestParams,
 } from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
-import * as CollectionUtils from '@libs/CollectionUtils';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import DateUtils from '@libs/DateUtils';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
@@ -259,7 +258,7 @@ Onyx.connect({
     callback: (value) => (allPolicies = value),
 });
 
-let reportActionsByReport: OnyxCollection<OnyxTypes.ReportActions> = {};
+let allReportActions: OnyxCollection<OnyxTypes.ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
@@ -267,7 +266,7 @@ Onyx.connect({
         if (!actions) {
             return;
         }
-        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
+        allReportActions = actions;
     },
 });
 
@@ -285,7 +284,7 @@ function getPolicy(policyID: string | undefined): OnyxTypes.Policy | EmptyObject
  * Find the report preview action from given chat report and iou report
  */
 function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxEntry<ReportAction> {
-    const reportActions = reportActionsByReport?.[chatReportID] ?? {};
+    const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`] ?? {};
 
     // Find the report preview action from the chat report
     return (
@@ -5345,7 +5344,7 @@ function canIOUBePaid(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chat
 }
 
 function hasIOUToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, excludedIOUReportID: string): boolean {
-    const chatReportActions = reportActionsByReport?.[chatReport?.reportID ?? ''] ?? {};
+    const chatReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`] ?? {};
 
     return Object.values(chatReportActions).some((action) => {
         const iouReport = ReportUtils.getReport(action.childReportID ?? '');
diff --git a/src/libs/actions/ReportActions.ts b/src/libs/actions/ReportActions.ts
index 84aba3eca4fd..217dd0b12100 100644
--- a/src/libs/actions/ReportActions.ts
+++ b/src/libs/actions/ReportActions.ts
@@ -1,6 +1,5 @@
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import * as CollectionUtils from '@libs/CollectionUtils';
 import * as ReportActionUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
@@ -59,7 +58,7 @@ function clearReportActionErrors(reportID: string, reportAction: ReportAction, k
     });
 }
 
-let reportActionsByReport: OnyxCollection<ReportActions> = {};
+let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
@@ -67,7 +66,7 @@ Onyx.connect({
         if (!actions) {
             return;
         }
-        reportActionsByReport = Object.fromEntries(Object.entries(actions).map(([key, value]) => [CollectionUtils.extractCollectionItemID(key as `reportActions_${string}`), value]));
+        allReportActions = actions;
     },
 });
 
@@ -93,7 +92,7 @@ function clearAllRelatedReportActionErrors(reportID: string, reportAction: Repor
     }
 
     if (reportAction.childReportID && ignore !== 'child') {
-        const childActions = reportActionsByReport?.[reportAction.childReportID] ?? {};
+        const childActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportAction.childReportID}`] ?? {};
         Object.values(childActions).forEach((action) => {
             const childErrorKeys = Object.keys(action.errors ?? {}).filter((err) => errorKeys.includes(err));
             clearAllRelatedReportActionErrors(reportAction.childReportID ?? '', action, 'parent', childErrorKeys);
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 9cf7b0b78008..f74b451c29f6 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -5,7 +5,6 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import * as API from '@libs/API';
 import type {CancelTaskParams, CompleteTaskParams, CreateTaskParams, EditTaskAssigneeParams, EditTaskParams, ReopenTaskParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
-import * as CollectionUtils from '@libs/CollectionUtils';
 import DateUtils from '@libs/DateUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
@@ -67,16 +66,16 @@ Onyx.connect({
     },
 });
 
-const allReportActions: OnyxCollection<ReportActions> = {};
+let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
 
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        allReportActions[reportID] = actions;
+        allReportActions = actions;
     },
 });
 
@@ -795,7 +794,7 @@ function getParentReportAction(report: OnyxEntry<OnyxTypes.Report>): ReportActio
     if (!report?.parentReportID || !report.parentReportActionID) {
         return {};
     }
-    return allReportActions?.[report.parentReportID]?.[report.parentReportActionID] ?? {};
+    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`]?.[report.parentReportActionID] ?? {};
 }
 
 /**

From 12259a207cb2034e5b37fba6aaac93a302738d61 Mon Sep 17 00:00:00 2001
From: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Tue, 16 Apr 2024 22:14:51 +0100
Subject: [PATCH 310/383] Fix: iOS - Thread - Unable to send a message after
 returning from thread - ParentNavigationSubtitle - Update navigation method
 to go back instead of navigate

---
 src/components/ParentNavigationSubtitle.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index 0ad32f18659b..174bc1005fe6 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -35,7 +35,7 @@ function ParentNavigationSubtitle({parentNavigationSubtitleData, parentReportAct
             onPress={() => {
                 const parentAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '');
                 const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(parentAction, parentAction?.reportActionID ?? '');
-                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(parentReportID, isVisibleAction && !isOffline ? parentReportActionID : undefined));
+                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReportID, isVisibleAction && !isOffline ? parentReportActionID : undefined));
             }}
             accessibilityLabel={translate('threads.parentNavigationSummary', {reportName, workspaceName})}
             role={CONST.ROLE.LINK}

From eb1f0116788e031ccaf4aaa0a07b30c89d524d46 Mon Sep 17 00:00:00 2001
From: Ezra Ellette <ezrasellette@gmail.com>
Date: Tue, 16 Apr 2024 17:08:07 -0500
Subject: [PATCH 311/383] use waitForCollectionCallback no iter

---
 src/libs/SidebarUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index d83a8db3cd39..f63593f432ca 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -84,7 +84,7 @@ function getOrderedReportIDs(
 
         const parentReportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`;
         const parentReportActions = allReportActions?.[parentReportActionsKey];
-        const reportActions = allReportActions?.[report.reportID] ?? {};
+        const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {};
         const parentReportAction = parentReportActions?.find((action) => action && action?.reportActionID === report.parentReportActionID);
         const doesReportHaveViolations = !!(
             betas?.includes(CONST.BETAS.VIOLATIONS) &&

From 1a20e163dad22c89b1242a4c167216ff034923e6 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 16 Apr 2024 22:31:39 +0000
Subject: [PATCH 312/383] Update version to 1.4.62-13

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b9a7fa4d6b4b..32dfb496daa8 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 1001046212
-        versionName "1.4.62-12"
+        versionCode 1001046213
+        versionName "1.4.62-13"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 9db0bbd40945..0b59d7e8316d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.12</string>
+	<string>1.4.62.13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index c2fe74d90fcd..2a6db0634f2f 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.62.12</string>
+	<string>1.4.62.13</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 7503dd04702b..50171f3eb050 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.12</string>
+	<string>1.4.62.13</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 0817e4bbbd2a..478ae3c12b3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-12",
+  "version": "1.4.62-13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-12",
+      "version": "1.4.62-13",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 60e6a320cfb0..e5092e132eae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-12",
+  "version": "1.4.62-13",
   "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.",

From c00a1773ef9129d2c0923ab3e95250a71dd63a65 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Wed, 17 Apr 2024 05:46:04 +0700
Subject: [PATCH 313/383] omit participantAccountIDs

---
 src/libs/ReportUtils.ts         | 2 +-
 src/pages/ReportDetailsPage.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index e801a3e6ea79..f1f1b1b2d524 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2996,7 +2996,7 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
     }
 
     if (isGroupChat(report)) {
-        return getGroupChatName(report?.participantAccountIDs ?? [], true, report?.reportID) ?? '';
+        return getGroupChatName(undefined, true, report?.reportID) ?? '';
     }
 
     if (isChatRoom(report) || isTaskReport(report)) {
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index cf11adcd428e..e6720af53dfc 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -249,7 +249,10 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         />
     );
 
-    const reportName = useMemo(() => ReportUtils.getReportName(report), [report]);
+    const reportName =
+        ReportUtils.isDeprecatedGroupDM(report) || ReportUtils.isGroupChat(report)
+            ? ReportUtils.getGroupChatName(undefined, false, report.reportID ?? '')
+            : ReportUtils.getReportName(report);
     return (
         <ScreenWrapper testID={ReportDetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={isEmptyObject(report)}>

From 0c77c4fefd232c429e25767d5accdf2a832ec317 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 16 Apr 2024 16:06:35 -0700
Subject: [PATCH 314/383] Style

---
 src/types/onyx/Request.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts
index 47208ce6c1ec..2c54f7746e7d 100644
--- a/src/types/onyx/Request.ts
+++ b/src/types/onyx/Request.ts
@@ -21,7 +21,7 @@ type RequestData = {
     finallyData?: OnyxUpdate[];
     resolve?: (value: Response) => void;
     reject?: (value?: unknown) => void;
-    skipWebProxy?: boolean,
+    skipWebProxy?: boolean;
 };
 
 type Request = RequestData & OnyxData;

From 22c1e5772c0473e3288f7e1a23788447f584b925 Mon Sep 17 00:00:00 2001
From: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 17 Apr 2024 01:03:27 +0100
Subject: [PATCH 315/383] Fix threads navigation

---
 src/components/ParentNavigationSubtitle.tsx            | 7 ++++++-
 src/pages/home/report/ReportActionItemParentAction.tsx | 9 ++++++---
 src/pages/home/report/ThreadDivider.tsx                | 7 ++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index 174bc1005fe6..cbc9e1352f21 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -35,7 +35,12 @@ function ParentNavigationSubtitle({parentNavigationSubtitleData, parentReportAct
             onPress={() => {
                 const parentAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '');
                 const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(parentAction, parentAction?.reportActionID ?? '');
-                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReportID, isVisibleAction && !isOffline ? parentReportActionID : undefined));
+                // Pop the thread report screen before navigating to the chat report.
+                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReportID));
+                if (isVisibleAction && !isOffline) {
+                    // Pop the chat report screen before navigating to the linked report action.
+                    Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReportID, parentReportActionID));
+                }
             }}
             accessibilityLabel={translate('threads.parentNavigationSummary', {reportName, workspaceName})}
             role={CONST.ROLE.LINK}
diff --git a/src/pages/home/report/ReportActionItemParentAction.tsx b/src/pages/home/report/ReportActionItemParentAction.tsx
index 6c225421e356..a4592075aa0c 100644
--- a/src/pages/home/report/ReportActionItemParentAction.tsx
+++ b/src/pages/home/report/ReportActionItemParentAction.tsx
@@ -108,9 +108,12 @@ function ReportActionItemParentAction({
                     <ReportActionItem
                         onPress={() => {
                             const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '');
-                            Navigation.goBack(
-                                ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '', isVisibleAction && !isOffline ? ancestor.reportAction.reportActionID : undefined),
-                            );
+                            // Pop the thread report screen before navigating to the chat report.
+                            Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? ''));
+                            if (isVisibleAction && !isOffline) {
+                                // Pop the chat report screen before navigating to the linked report action.
+                                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '', ancestor.reportAction.reportActionID));
+                            }
                         }}
                         parentReportAction={parentReportAction}
                         report={ancestor.report}
diff --git a/src/pages/home/report/ThreadDivider.tsx b/src/pages/home/report/ThreadDivider.tsx
index f8acf63832b7..edbe2c665752 100644
--- a/src/pages/home/report/ThreadDivider.tsx
+++ b/src/pages/home/report/ThreadDivider.tsx
@@ -31,7 +31,12 @@ function ThreadDivider({ancestor}: ThreadDividerProps) {
             <PressableWithoutFeedback
                 onPress={() => {
                     const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '');
-                    Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '', isVisibleAction && !isOffline ? ancestor.reportAction.reportActionID : undefined));
+                    // Pop the thread report screen before navigating to the chat report.
+                    Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? ''));
+                    if (isVisibleAction && !isOffline) {
+                        // Pop the chat report screen before navigating to the linked report action.
+                        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '', ancestor.reportAction.reportActionID));
+                    }
                 }}
                 accessibilityLabel={translate('threads.thread')}
                 role={CONST.ROLE.BUTTON}

From fcfa4d428faa7127dc672ea55679164bf7817ac4 Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Wed, 17 Apr 2024 02:38:16 +0200
Subject: [PATCH 316/383] Copy changes for Track QAB

---
 src/languages/en.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 07a540e5180d..7c379dec347d 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -602,8 +602,8 @@ export default {
         sendMoney: 'Send money',
         assignTask: 'Assign task',
         header: 'Quick action',
-        trackManual: 'Track manual',
-        trackScan: 'Track scan',
+        trackManual: 'Track expense',
+        trackScan: 'Track receipt',
         trackDistance: 'Track distance',
     },
     iou: {

From ef13ceb47d27ed1997a2e96085ae67112f82dbcc Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Wed, 17 Apr 2024 07:12:21 +0530
Subject: [PATCH 317/383] Apply suggestions from code review

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>
---
 src/libs/ReportUtils.ts  | 2 +-
 src/libs/actions/User.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 69702b01ad03..319d8dea6e20 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -781,7 +781,7 @@ function hasParticipantInArray(report: OnyxEntry<Report>, memberAccountIDs: numb
 }
 
 /**
- * Whether the Expense report is settled
+ * Whether the Money Request report is settled
  */
 function isSettled(reportID: string | undefined): boolean {
     if (!allReports || !reportID) {
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 4b6855458050..26bbceb76332 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -525,7 +525,7 @@ function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
             const types = flatten.map((data) => data?.originalMessage).filter(Boolean) as OriginalMessage[];
 
             for (const message of types) {
-                // someone paid money
+                // pay someone flow
                 if ('IOUDetails' in message) {
                     return playSound(SOUNDS.SUCCESS);
                 }
@@ -545,7 +545,7 @@ function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
                     return playSound(SOUNDS.ATTENTION);
                 }
 
-                // submit expense
+                // submit expense flow
                 if ('IOUTransactionID' in message) {
                     return playSound(SOUNDS.ATTENTION);
                 }

From 3adf8906cbe26066ef4cf918a2924a5bf423018f Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 16 Apr 2024 18:51:02 -0700
Subject: [PATCH 318/383] Rename shouldSkipWebProxy / Fix config secure URL

---
 src/CONFIG.ts                                    | 2 +-
 src/libs/ApiUtils.ts                             | 4 ++--
 src/libs/actions/connections/QuickBooksOnline.ts | 2 +-
 src/types/onyx/Request.ts                        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CONFIG.ts b/src/CONFIG.ts
index fa72abb93a9e..9ed4242d7604 100644
--- a/src/CONFIG.ts
+++ b/src/CONFIG.ts
@@ -48,7 +48,7 @@ export default {
     EXPENSIFY: {
         // Note: This will be EXACTLY what is set for EXPENSIFY_URL whether the proxy is enabled or not.
         EXPENSIFY_URL: expensifyURL,
-        SECURE_EXPENSIFY_URL: stagingExpensifyURL,
+        SECURE_EXPENSIFY_URL: secureExpensifyUrl,
         NEW_EXPENSIFY_URL: newExpensifyURL,
 
         // The DEFAULT API is the API used by most environments, except staging, where we use STAGING (defined below)
diff --git a/src/libs/ApiUtils.ts b/src/libs/ApiUtils.ts
index 00d887e7c1f0..1da9795f333b 100644
--- a/src/libs/ApiUtils.ts
+++ b/src/libs/ApiUtils.ts
@@ -38,12 +38,12 @@ function getApiRoot(request?: Request): string {
     const shouldUseSecure = request?.shouldUseSecure ?? false;
 
     if (shouldUseStagingServer) {
-        if (CONFIG.IS_USING_WEB_PROXY && !request?.skipWebProxy) {
+        if (CONFIG.IS_USING_WEB_PROXY && !request?.shouldSkipWebProxy) {
             return shouldUseSecure ? proxyConfig.STAGING_SECURE : proxyConfig.STAGING;
         }
         return shouldUseSecure ? CONFIG.EXPENSIFY.STAGING_SECURE_API_ROOT : CONFIG.EXPENSIFY.STAGING_API_ROOT;
     }
-    if (request?.skipWebProxy) {
+    if (request?.shouldSkipWebProxy) {
         return shouldUseSecure ? CONFIG.EXPENSIFY.SECURE_EXPENSIFY_URL : CONFIG.EXPENSIFY.EXPENSIFY_URL;
     }
     return shouldUseSecure ? CONFIG.EXPENSIFY.DEFAULT_SECURE_API_ROOT : CONFIG.EXPENSIFY.DEFAULT_API_ROOT;
diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index 61ac8920e912..eebd59cad125 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -2,7 +2,7 @@ import {getCommandURL} from '@libs/ApiUtils';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
     const params = new URLSearchParams({policyID});
-    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline', skipWebProxy: true});
+    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline', shouldSkipWebProxy: true});
     return commandURL + params.toString();
 }
 
diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts
index 2c54f7746e7d..233519f010fc 100644
--- a/src/types/onyx/Request.ts
+++ b/src/types/onyx/Request.ts
@@ -21,7 +21,7 @@ type RequestData = {
     finallyData?: OnyxUpdate[];
     resolve?: (value: Response) => void;
     reject?: (value?: unknown) => void;
-    skipWebProxy?: boolean;
+    shouldSkipWebProxy?: boolean;
 };
 
 type Request = RequestData & OnyxData;

From 094c00427f6d18e32f4f8c6c9a8452d6bbb25639 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 17 Apr 2024 09:04:50 +0700
Subject: [PATCH 319/383] update custom onboarding messages

---
 src/CONST.ts                                  | 22 +++++-------------
 src/libs/actions/Report.ts                    | 23 ++++++++++++++++++-
 .../ManageTeamsExpensesPage.tsx               |  2 +-
 .../PurposeForUsingExpensifyPage.tsx          |  2 +-
 .../BaseOnboardingPurpose.tsx                 |  2 +-
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index d47800f69308..a306a8380582 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -3551,8 +3551,7 @@ const CONST = {
 
     ONBOARDING_CONCIERGE: {
         [onboardingChoices.TRACK]:
-            "# Welcome to Expensify, let's start tracking your expenses!\n" +
-            "Hi there, I'm Concierge. Chat with me here for anything you need.\n" +
+            "# Let's start tracking your expenses!\n" +
             '\n' +
             "To track your expenses, create a workspace to keep everything in one place. Here's how:\n" +
             '1. From the home screen, click the green + button > New Workspace\n' +
@@ -3565,8 +3564,7 @@ const CONST = {
             '\n' +
             "We'll store all expenses in your new workspace for easy access. Let me know if you have any questions!",
         [onboardingChoices.EMPLOYER]:
-            '# Welcome to Expensify, the fastest way to get paid back!\n' +
-            "Hi there, I'm Concierge. Chat with me here for anything you need.\n" +
+            '# Expensify is the fastest way to get paid back!\n' +
             '\n' +
             'To submit expenses for reimbursement:\n' +
             '1. From the home screen, click the green + button > Request money.\n' +
@@ -3574,17 +3572,15 @@ const CONST = {
             '\n' +
             "That'll send a request to get you paid back. Let me know if you have any questions!",
         [onboardingChoices.MANAGE_TEAM]:
-            "# Welcome to Expensify, let's start managing your team's expenses!\n" +
-            "Hi there, I'm Concierge. Chat with me here for anything you need.\n" +
+            "# Let's start managing your team's expenses!\n" +
             '\n' +
             "To manage your team's expenses, create a workspace to keep everything in one place. Here's how:\n" +
             '1. From the home screen, click the green + button > New Workspace\n' +
             '2. Give your workspace a name (e.g. “Sales team expenses”).\n' +
             '\n' +
-            'Then, invite your team to your workspace via the Members pane and connect a business bank account to reimburse them. Let me know if you have any questions!',
+            'Then, invite your team to your workspace via the Members pane and [connect a business bank account](https://help.expensify.com/articles/new-expensify/bank-accounts/Connect-a-Bank-Account) to reimburse them. Let me know if you have any questions!',
         [onboardingChoices.PERSONAL_SPEND]:
-            "# Welcome to Expensify, let's start tracking your expenses!\n" +
-            "Hi there, I'm Concierge. Chat with me here for anything you need.\n" +
+            "# Let's start tracking your expenses! \n" +
             '\n' +
             "To track your expenses, create a workspace to keep everything in one place. Here's how:\n" +
             '1. From the home screen, click the green + button > New Workspace\n' +
@@ -3597,19 +3593,13 @@ const CONST = {
             '\n' +
             "We'll store all expenses in your new workspace for easy access. Let me know if you have any questions!",
         [onboardingChoices.CHAT_SPLIT]:
-            '# Welcome to Expensify, where splitting the bill is an easy conversation!\n' +
-            "Hi there, I'm Concierge. Chat with me here for anything you need.\n" +
+            '# Splitting the bill is as easy as a conversation!\n' +
             '\n' +
             'To split an expense:\n' +
             '1. From the home screen, click the green + button > Request money.\n' +
             '2. Enter an amount or scan a receipt, then choose who you want to split it with.\n' +
             '\n' +
             "We'll send a request to each person so they can pay you back. Let me know if you have any questions!",
-        [onboardingChoices.LOOKING_AROUND]:
-            '# Welcome to Expensify!\n' +
-            "Hi there, I'm Concierge. Chat with me here for anything you need.\n" +
-            '\n' +
-            "Expensify is best known for expense and corporate card management, but we do a lot more than that. Let me know what you're interested in and I'll help get you started.",
     },
 
     REPORT_FIELD_TITLE_FIELD_ID: 'text_title',
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index f599208ff915..854eb882ef8f 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2941,8 +2941,28 @@ function getReportPrivateNote(reportID: string | undefined) {
  * - Sets the introSelected NVP to the choice the user made
  * - Creates an optimistic report comment from concierge
  */
-function completeEngagementModal(text: string, choice: ValueOf<typeof CONST.ONBOARDING_CHOICES>) {
+function completeEngagementModal(choice: ValueOf<typeof CONST.ONBOARDING_CHOICES>, text?: string) {
     const conciergeAccountID = PersonalDetailsUtils.getAccountIDsByLogins([CONST.EMAIL.CONCIERGE])[0];
+
+    if (!text) {
+        const parameters: CompleteEngagementModalParams = {
+            reportID: conciergeChatReportID ?? '',
+            engagementChoice: choice,
+        };
+
+        const optimisticData: OnyxUpdate[] = [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.NVP_INTRO_SELECTED,
+                value: {choice},
+            },
+        ];
+        API.write(WRITE_COMMANDS.COMPLETE_ENGAGEMENT_MODAL, parameters, {
+            optimisticData,
+        });
+        return;
+    }
+
     const reportComment = ReportUtils.buildOptimisticAddCommentReportAction(text, undefined, conciergeAccountID);
     const reportCommentAction: OptimisticAddCommentReportAction = reportComment.reportAction;
     const lastComment = reportCommentAction?.message?.[0];
@@ -3007,6 +3027,7 @@ function completeEngagementModal(text: string, choice: ValueOf<typeof CONST.ONBO
         },
     ];
 
+    // eslint-disable-next-line rulesdir/no-multiple-api-calls
     API.write(WRITE_COMMANDS.COMPLETE_ENGAGEMENT_MODAL, parameters, {
         optimisticData,
         successData,
diff --git a/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx b/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx
index fb642c897dbc..c6ec7dc49b9f 100644
--- a/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx
+++ b/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx
@@ -56,7 +56,7 @@ function ManageTeamsExpensesModal() {
     );
 
     const completeEngagement = () => {
-        Report.completeEngagementModal(messageCopy, CONST.INTRO_CHOICES.MANAGE_TEAM);
+        Report.completeEngagementModal(CONST.INTRO_CHOICES.MANAGE_TEAM, messageCopy);
         Report.navigateToConciergeChat();
     };
 
diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
index 3c7520b850b4..3056d4ec51dd 100644
--- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
+++ b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
@@ -86,7 +86,7 @@ function PurposeForUsingExpensifyModal() {
             return Navigation.navigate(ROUTES.ONBOARD_MANAGE_EXPENSES);
         }
 
-        Report.completeEngagementModal(message, choice);
+        Report.completeEngagementModal(choice, message);
         Report.navigateToConciergeChat(true);
     }, []);
 
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index 3b82a79e6c48..82f171e12f14 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -83,7 +83,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
             return;
         }
 
-        Report.completeEngagementModal(CONST.ONBOARDING_CONCIERGE[selectedPurpose], selectedPurpose);
+        Report.completeEngagementModal(selectedPurpose, CONST.ONBOARDING_CONCIERGE[selectedPurpose]);
 
         Navigation.dismissModal();
         // Only navigate to concierge chat when central pane is visible

From 7268729f99ecccda5936adeb04aba943f72cdccd Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 17 Apr 2024 08:42:58 +0530
Subject: [PATCH 320/383] Fixed translations

---
 src/languages/en.ts                        | 2 +-
 src/languages/es.ts                        | 2 +-
 src/pages/home/report/ReportActionItem.tsx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index c9dba9885b4a..38fbae561881 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2558,7 +2558,7 @@ export default {
         decline: 'Decline',
     },
     actionableMentionTrackExpense: {
-        request: 'Request someone to pay it',
+        submit: 'Submit it to someone',
         categorize: 'Categorize it',
         share: 'Share it with my accountant',
         nothing: 'Nothing for now',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 36fa8aebb778..69f80048a165 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3025,7 +3025,7 @@ export default {
         decline: 'Rechazar',
     },
     actionableMentionTrackExpense: {
-        request: 'Pedirle a alguien que lo pague',
+        submit: 'Pedirle a alguien que lo pague',
         categorize: 'Categorizarlo',
         share: 'Compartirlo con mi contador',
         nothing: 'Por ahora, nada',
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index e07f4e653924..4b87ca6e7eea 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -390,8 +390,8 @@ function ReportActionItem({
             const transactionID = (action?.originalMessage as OriginalMessageActionableTrackedExpenseWhisper['originalMessage'])?.transactionID;
             return [
                 {
-                    text: 'actionableMentionTrackExpense.request',
-                    key: `${action.reportActionID}-actionableMentionTrackExpense-request`,
+                    text: 'actionableMentionTrackExpense.submit',
+                    key: `${action.reportActionID}-actionableMentionTrackExpense-submit`,
                     onPress: () => {
                         ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.MOVE, action.reportActionID);
                     },

From 63da26aada4dbc9a4f37100ed3894dd9f26beb16 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 17 Apr 2024 09:16:25 +0530
Subject: [PATCH 321/383] Addressed comments

---
 .well-known/apple-app-site-association | 4 ----
 src/languages/en.ts                    | 2 +-
 src/languages/es.ts                    | 2 +-
 src/libs/ReportUtils.ts                | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
index 26c23de2aed9..a2c7365f7de8 100644
--- a/.well-known/apple-app-site-association
+++ b/.well-known/apple-app-site-association
@@ -32,10 +32,6 @@
                         "/": "/iou/*",
                         "comment": "I Owe You reports"
                     },
-                    {
-                        "/": "/request/*",
-                        "comment": "Submit Expense"
-                    },
                     {
                         "/": "/enable-payments/*",
                         "comment": "Payments setup"
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 38fbae561881..9ea03441eeb8 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -684,7 +684,7 @@ export default {
             `changed the distance to ${newDistanceToDisplay} (previously ${oldDistanceToDisplay}), which updated the amount to ${newAmountToDisplay} (previously ${oldAmountToDisplay})`,
         threadExpenseReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${formattedAmount} ${comment ? `for ${comment}` : 'expense'}`,
         threadTrackReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Tracking ${formattedAmount} ${comment ? `for ${comment}` : ''}`,
-        threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
+        threadPaySomeoneReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
         tagSelection: 'Select a tag to better organize your spend.',
         categorySelection: 'Select a category to better organize your spend.',
         error: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 69f80048a165..f6231c9093b4 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -679,7 +679,7 @@ export default {
             `cambió la distancia a ${newDistanceToDisplay} (previamente ${oldDistanceToDisplay}), lo que cambió el importe a ${newAmountToDisplay} (previamente ${oldAmountToDisplay})`,
         threadExpenseReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${comment ? `${formattedAmount} para ${comment}` : `Gasto de ${formattedAmount}`}`,
         threadTrackReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Seguimiento ${formattedAmount} ${comment ? `para ${comment}` : ''}`,
-        threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
+        threadPaySomeoneReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
         tagSelection: 'Selecciona una etiqueta para organizar mejor tu dinero.',
         categorySelection: 'Seleccione una categoría para organizar mejor tu dinero.',
         error: {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 34e2538b9425..e752476ae6e2 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2645,7 +2645,7 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction | Optimis
 
     const transactionDetails = getTransactionDetails(transaction);
 
-    return Localize.translateLocal(ReportActionsUtils.isSentMoneyReportAction(reportAction) ? 'iou.threadSentMoneyReportName' : 'iou.threadExpenseReportName', {
+    return Localize.translateLocal(ReportActionsUtils.isSentMoneyReportAction(reportAction) ? 'iou.threadPaySomeoneReportName' : 'iou.threadExpenseReportName', {
         formattedAmount: CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency) ?? '',
         comment: (!TransactionUtils.isMerchantMissing(transaction) ? transactionDetails?.merchant : transactionDetails?.comment) ?? '',
     });
@@ -5029,7 +5029,7 @@ function isGroupChatAdmin(report: OnyxEntry<Report>, accountID: number) {
  * - Split options should show for:
  *     - DMs
  *     - chat/policy rooms with more than 1 participant
- *     - groups chats with 3 and more participants
+ *     - groups chats with 2 and more participants
  *     - corporate workspace chats
  * - Track expense option should show for:
  *    - Self DMs

From 1e0adf934290f8227d0f0ee1eea6c37576cadae8 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 17 Apr 2024 12:19:34 +0800
Subject: [PATCH 322/383] get the last bottom tab navigator

---
 src/libs/Navigation/getTopmostBottomTabRoute.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Navigation/getTopmostBottomTabRoute.ts b/src/libs/Navigation/getTopmostBottomTabRoute.ts
index a589f2cbc837..ff27d0e30ba6 100644
--- a/src/libs/Navigation/getTopmostBottomTabRoute.ts
+++ b/src/libs/Navigation/getTopmostBottomTabRoute.ts
@@ -1,7 +1,7 @@
 import type {BottomTabName, NavigationPartialRoute, RootStackParamList, State} from './types';
 
 function getTopmostBottomTabRoute(state: State<RootStackParamList> | undefined): NavigationPartialRoute<BottomTabName> | undefined {
-    const bottomTabNavigatorRoute = state?.routes[0];
+    const bottomTabNavigatorRoute = state?.routes.findLast(route => route.name === 'BottomTabNavigator');;
 
     // The bottomTabNavigatorRoute state may be empty if we just logged in.
     if (!bottomTabNavigatorRoute || bottomTabNavigatorRoute.name !== 'BottomTabNavigator' || bottomTabNavigatorRoute.state === undefined) {

From 2254f3ec36dfe56bffea18d8ed19a34c1aac7d38 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:04:45 -0700
Subject: [PATCH 323/383] feat: add a new Onyx key

---
 src/ONYXKEYS.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 3959f76a626f..8482bce38db0 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -220,6 +220,9 @@ const ONYXKEYS = {
     /** Set when we are loading payment methods */
     IS_LOADING_PAYMENT_METHODS: 'isLoadingPaymentMethods',
 
+    /** Whether the connections data was attempted to be fetched in the current user session */
+    HAS_CONNECTIONS_DATA_BEEN_FETCHED: 'hasConnectionsDataBeenFetched',
+
     /** Is report data loading? */
     IS_LOADING_REPORT_DATA: 'isLoadingReportData',
 
@@ -624,6 +627,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.FREQUENTLY_USED_EMOJIS]: OnyxTypes.FrequentlyUsedEmoji[];
     [ONYXKEYS.REIMBURSEMENT_ACCOUNT_WORKSPACE_ID]: string;
     [ONYXKEYS.IS_LOADING_PAYMENT_METHODS]: boolean;
+    [ONYXKEYS.HAS_CONNECTIONS_DATA_BEEN_FETCHED]: boolean;
     [ONYXKEYS.IS_LOADING_REPORT_DATA]: boolean;
     [ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN]: boolean;
     [ONYXKEYS.APP_PROFILING_IN_PROGRESS]: boolean;

From b1272d445486d88a67ff703508632acbb3e693c8 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:06:14 -0700
Subject: [PATCH 324/383] chore: remove fetch state from the policy object

---
 src/libs/actions/PolicyConnections.ts         | 3 ---
 src/pages/workspace/withPolicyConnections.tsx | 2 +-
 src/types/onyx/Policy.ts                      | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
index d581c032e134..5aad8bc66898 100644
--- a/src/libs/actions/PolicyConnections.ts
+++ b/src/libs/actions/PolicyConnections.ts
@@ -14,7 +14,6 @@ function openPolicyAccountingPage(policyID: string) {
             key: policyKey,
             value: {
                 isLoadingConnections: true,
-                hasConnectionsDataBeenFetched: false,
             },
         },
     ];
@@ -24,7 +23,6 @@ function openPolicyAccountingPage(policyID: string) {
             key: policyKey,
             value: {
                 isLoadingConnections: false,
-                hasConnectionsDataBeenFetched: true,
             },
         },
     ];
@@ -34,7 +32,6 @@ function openPolicyAccountingPage(policyID: string) {
             key: policyKey,
             value: {
                 isLoadingConnections: false,
-                hasConnectionsDataBeenFetched: true,
             },
         },
     ];
diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 01feef800042..afd87d3e9b96 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -25,7 +25,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
-            if (!policy || !policy.areConnectionsEnabled || !!policy.connections || !!policy.hasConnectionsDataBeenFetched || !!policy.isLoadingConnections || !policy.id) {
+            if (!policy || !policy.areConnectionsEnabled || !!policy.connections || !!policy.isLoadingConnections || !policy.id) {
                 return;
             }
 
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index c84d8d8b6a95..339fd5e59cda 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -407,9 +407,6 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Whether the connections data is being fetched */
         isLoadingConnections?: boolean;
 
-        /** Whether or not the connections data has been fetched or not */
-        hasConnectionsDataBeenFetched?: boolean;
-
         /** Report fields attached to the policy */
         fieldList?: Record<string, PolicyReportField>;
 

From d29646d5272ac36de4837e1843d49d874f33cea8 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:07:51 -0700
Subject: [PATCH 325/383] chore: remove unused field from the policy object

---
 src/libs/actions/PolicyConnections.ts | 12 +++---------
 src/types/onyx/Policy.ts              |  3 ---
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
index 5aad8bc66898..d18c7b43a452 100644
--- a/src/libs/actions/PolicyConnections.ts
+++ b/src/libs/actions/PolicyConnections.ts
@@ -12,27 +12,21 @@ function openPolicyAccountingPage(policyID: string) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: policyKey,
-            value: {
-                isLoadingConnections: true,
-            },
+            value: {},
         },
     ];
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: policyKey,
-            value: {
-                isLoadingConnections: false,
-            },
+            value: {},
         },
     ];
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: policyKey,
-            value: {
-                isLoadingConnections: false,
-            },
+            value: {},
         },
     ];
 
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 339fd5e59cda..3d85a6a2a526 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -404,9 +404,6 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** All the integration connections attached to the policy */
         connections?: Connections;
 
-        /** Whether the connections data is being fetched */
-        isLoadingConnections?: boolean;
-
         /** Report fields attached to the policy */
         fieldList?: Record<string, PolicyReportField>;
 

From 124f534a18223ab28ea1205a15d83f995b0ec1b1 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:08:20 -0700
Subject: [PATCH 326/383] fix: delete non-existing variable

---
 src/pages/workspace/withPolicyConnections.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index afd87d3e9b96..80bf23eb7f8e 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -25,7 +25,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
-            if (!policy || !policy.areConnectionsEnabled || !!policy.connections || !!policy.isLoadingConnections || !policy.id) {
+            if (!policy || !policy.areConnectionsEnabled || !!policy.connections || !policy.id) {
                 return;
             }
 

From c1e0cac961bfa37c383fd1ed14031808cb603731 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:14:41 -0700
Subject: [PATCH 327/383] fix: change the new key to the collections

---
 src/ONYXKEYS.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 8482bce38db0..ebf78b57efd3 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -220,9 +220,6 @@ const ONYXKEYS = {
     /** Set when we are loading payment methods */
     IS_LOADING_PAYMENT_METHODS: 'isLoadingPaymentMethods',
 
-    /** Whether the connections data was attempted to be fetched in the current user session */
-    HAS_CONNECTIONS_DATA_BEEN_FETCHED: 'hasConnectionsDataBeenFetched',
-
     /** Is report data loading? */
     IS_LOADING_REPORT_DATA: 'isLoadingReportData',
 
@@ -323,6 +320,8 @@ const ONYXKEYS = {
         POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
         POLICY_TAGS: 'policyTags_',
         POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
+        /** Whether the connections data for the policy was attempted to be fetched in the current user session */
+        POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED: 'policyHasConnectionsDataBeenFetched',
         OLD_POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         WORKSPACE_INVITE_MESSAGE_DRAFT: 'workspaceInviteMessageDraft_',
@@ -532,6 +531,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS_DRAFTS]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
+    [ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED]: boolean;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT]: string;
@@ -627,7 +627,6 @@ type OnyxValuesMapping = {
     [ONYXKEYS.FREQUENTLY_USED_EMOJIS]: OnyxTypes.FrequentlyUsedEmoji[];
     [ONYXKEYS.REIMBURSEMENT_ACCOUNT_WORKSPACE_ID]: string;
     [ONYXKEYS.IS_LOADING_PAYMENT_METHODS]: boolean;
-    [ONYXKEYS.HAS_CONNECTIONS_DATA_BEEN_FETCHED]: boolean;
     [ONYXKEYS.IS_LOADING_REPORT_DATA]: boolean;
     [ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN]: boolean;
     [ONYXKEYS.APP_PROFILING_IN_PROGRESS]: boolean;

From 515833e49d7367e008d4835d515c953e02505129 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:15:28 -0700
Subject: [PATCH 328/383] feat: use the fetched state

---
 src/pages/workspace/withPolicyConnections.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 80bf23eb7f8e..36e16f1940fb 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,8 +1,10 @@
 import {useEffect} from 'react';
 import type {ComponentType} from 'react';
+import {useOnyx} from 'react-native-onyx';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import useNetwork from '@hooks/useNetwork';
 import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
+import ONYXKEYS from '@src/ONYXKEYS';
 import withPolicy from './withPolicy';
 import type {WithPolicyProps} from './withPolicy';
 
@@ -21,16 +23,17 @@ type WithPolicyConnectionsProps = WithPolicyProps;
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
     function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
+        const hasConnectionsDataBeenFetched = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? ''}` as const, {initWithStoredValues: false});
 
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
-            if (!policy || !policy.areConnectionsEnabled || !!policy.connections || !policy.id) {
+            if (!policy || !policy.areConnectionsEnabled || hasConnectionsDataBeenFetched || !!policy.connections) {
                 return;
             }
 
             openPolicyAccountingPage(policy.id);
-        }, [policy]);
+        }, [hasConnectionsDataBeenFetched, policy]);
 
         if (!policy?.connections) {
             if (isOffline) {

From f21307ae8a2ece1702e3bd95207ec9751f55a705 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:17:45 -0700
Subject: [PATCH 329/383] chore: update the fetched state

---
 src/libs/actions/PolicyConnections.ts | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
index d18c7b43a452..7ccf9f2506bd 100644
--- a/src/libs/actions/PolicyConnections.ts
+++ b/src/libs/actions/PolicyConnections.ts
@@ -6,27 +6,20 @@ import {READ_COMMANDS} from '@libs/API/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 function openPolicyAccountingPage(policyID: string) {
-    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    const hasConnectionsDataBeenFetchedKey = `${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policyID}` as const;
 
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-            value: {},
+            key: hasConnectionsDataBeenFetchedKey,
+            value: false,
         },
     ];
-    const successData: OnyxUpdate[] = [
+    const finallyData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-            value: {},
-        },
-    ];
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-            value: {},
+            key: hasConnectionsDataBeenFetchedKey,
+            value: true,
         },
     ];
 
@@ -36,8 +29,7 @@ function openPolicyAccountingPage(policyID: string) {
 
     API.read(READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE, parameters, {
         optimisticData,
-        successData,
-        failureData,
+        finallyData,
     });
 }
 

From 5acf31c79878ec3c3b18801c74b7882290aa96c4 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 17 Apr 2024 13:18:44 +0800
Subject: [PATCH 330/383] prettier

---
 src/libs/Navigation/getTopmostBottomTabRoute.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Navigation/getTopmostBottomTabRoute.ts b/src/libs/Navigation/getTopmostBottomTabRoute.ts
index ff27d0e30ba6..e156b567af0d 100644
--- a/src/libs/Navigation/getTopmostBottomTabRoute.ts
+++ b/src/libs/Navigation/getTopmostBottomTabRoute.ts
@@ -1,7 +1,7 @@
 import type {BottomTabName, NavigationPartialRoute, RootStackParamList, State} from './types';
 
 function getTopmostBottomTabRoute(state: State<RootStackParamList> | undefined): NavigationPartialRoute<BottomTabName> | undefined {
-    const bottomTabNavigatorRoute = state?.routes.findLast(route => route.name === 'BottomTabNavigator');;
+    const bottomTabNavigatorRoute = state?.routes.findLast((route) => route.name === 'BottomTabNavigator');
 
     // The bottomTabNavigatorRoute state may be empty if we just logged in.
     if (!bottomTabNavigatorRoute || bottomTabNavigatorRoute.name !== 'BottomTabNavigator' || bottomTabNavigatorRoute.state === undefined) {

From a44ab1c619d18aa7efec783589af97b2c14015ed Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:22:16 -0700
Subject: [PATCH 331/383] chore: display loading indicator while data is being
 fetched

---
 src/pages/workspace/withPolicyConnections.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 36e16f1940fb..bbc30b2c72b2 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -2,6 +2,7 @@ import {useEffect} from 'react';
 import type {ComponentType} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import useNetwork from '@hooks/useNetwork';
 import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -35,6 +36,10 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
             openPolicyAccountingPage(policy.id);
         }, [hasConnectionsDataBeenFetched, policy]);
 
+        if (!hasConnectionsDataBeenFetched) {
+            return <FullScreenLoadingIndicator />;
+        }
+
         if (!policy?.connections) {
             if (isOffline) {
                 return (
@@ -50,7 +55,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
                 );
             }
 
-            return null;
+            throw new Error('Policy connections data should be fetched before rendering the component');
         }
 
         return (

From 170cf3a53cfb86e86651f8b6d445e25804d15ff1 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:24:24 -0700
Subject: [PATCH 332/383] chore: ensure to display offline screen

---
 src/pages/workspace/withPolicyConnections.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index bbc30b2c72b2..493e419d8270 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -37,10 +37,6 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
         }, [hasConnectionsDataBeenFetched, policy]);
 
         if (!hasConnectionsDataBeenFetched) {
-            return <FullScreenLoadingIndicator />;
-        }
-
-        if (!policy?.connections) {
             if (isOffline) {
                 return (
                     <FullPageOfflineBlockingView>
@@ -55,6 +51,10 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
                 );
             }
 
+            return <FullScreenLoadingIndicator />;
+        }
+
+        if (!policy?.connections) {
             throw new Error('Policy connections data should be fetched before rendering the component');
         }
 

From b7db226a2fd90129fb810a8e0b470e943273322a Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 17 Apr 2024 13:32:43 +0800
Subject: [PATCH 333/383] remove home fallback route

---
 src/libs/actions/PaymentMethods.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index dc8cefc0c30e..ea047d7b0a24 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -30,7 +30,7 @@ const kycWallRef: MutableRefObject<KYCWallRef | null> = createRef<KYCWallRef>();
 /**
  * When we successfully add a payment method or pass the KYC checks we will continue with our setup action if we have one set.
  */
-function continueSetup(fallbackRoute: Route = ROUTES.HOME) {
+function continueSetup(fallbackRoute?: Route) {
     if (!kycWallRef.current?.continueAction) {
         Navigation.goBack(fallbackRoute);
         return;

From f25a3e55f28a3765eaae86f6f899c5bf3f028d28 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:33:15 -0700
Subject: [PATCH 334/383] fix: getting the actual value and status from useOnyx

---
 src/pages/workspace/withPolicyConnections.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 493e419d8270..d9839da13dd8 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,4 +1,4 @@
-import {useEffect} from 'react';
+import React, {useEffect} from 'react';
 import type {ComponentType} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
@@ -24,19 +24,21 @@ type WithPolicyConnectionsProps = WithPolicyProps;
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
     function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
-        const hasConnectionsDataBeenFetched = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? ''}` as const, {initWithStoredValues: false});
+        const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? ''}` as const, {
+            initWithStoredValues: false,
+        });
 
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
-            if (!policy || !policy.areConnectionsEnabled || hasConnectionsDataBeenFetched || !!policy.connections) {
+            if (!policy || !policy.areConnectionsEnabled || !!hasConnectionsDataBeenFetched || !!policy.connections) {
                 return;
             }
 
             openPolicyAccountingPage(policy.id);
         }, [hasConnectionsDataBeenFetched, policy]);
 
-        if (!hasConnectionsDataBeenFetched) {
+        if (status === 'loading' || !hasConnectionsDataBeenFetched) {
             if (isOffline) {
                 return (
                     <FullPageOfflineBlockingView>
@@ -54,10 +56,6 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
             return <FullScreenLoadingIndicator />;
         }
 
-        if (!policy?.connections) {
-            throw new Error('Policy connections data should be fetched before rendering the component');
-        }
-
         return (
             <WrappedComponent
                 policy={policy}

From 9457554bed8d64fbf550253631e40bb0d65da0ba Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 16 Apr 2024 22:37:43 -0700
Subject: [PATCH 335/383] fix: update the prop list

---
 src/pages/workspace/withPolicyConnections.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index d9839da13dd8..60574563be3a 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -22,7 +22,7 @@ type WithPolicyConnectionsProps = WithPolicyProps;
  * For other policies, the connections data needs to be fetched when it's needed.
  */
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
-    function WithPolicyConnections({policy, policyMembers, policyDraft, policyMembersDraft, route}: WithPolicyConnectionsProps) {
+    function WithPolicyConnections({policy, policyDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
         const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? ''}` as const, {
             initWithStoredValues: false,
@@ -44,9 +44,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
                     <FullPageOfflineBlockingView>
                         <WrappedComponent
                             policy={policy}
-                            policyMembers={policyMembers}
                             policyDraft={policyDraft}
-                            policyMembersDraft={policyMembersDraft}
                             route={route}
                         />
                     </FullPageOfflineBlockingView>
@@ -59,9 +57,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
         return (
             <WrappedComponent
                 policy={policy}
-                policyMembers={policyMembers}
                 policyDraft={policyDraft}
-                policyMembersDraft={policyMembersDraft}
                 route={route}
             />
         );

From be33cd798c193a80453311d0bb538258c47d206c Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 17 Apr 2024 13:42:47 +0800
Subject: [PATCH 336/383] remove unused import

---
 src/libs/actions/PaymentMethods.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index ea047d7b0a24..c5a74bdc6ace 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -10,7 +10,6 @@ import * as CardUtils from '@libs/CardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/AddDebitCardForm';
 import type {BankAccountList, FundList} from '@src/types/onyx';

From 93e1aa855ab099d55acd2aa1895f65edb15522f1 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 17 Apr 2024 13:17:07 +0700
Subject: [PATCH 337/383] Add explain comment

---
 src/libs/ReportUtils.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 0fb25b261cac..26ee32e3901e 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1172,6 +1172,9 @@ function isJoinRequestInAdminRoom(report: OnyxEntry<Report>): boolean {
     if (!report) {
         return false;
     }
+    // If this policy isn't owned by Expensify,
+    // Account manager/guide should not have the workspace join request pinned to their LHN, 
+    // since they are not a part of the company, and should not action it on their behalf.
     if (report.policyID) {
         const policy = getPolicy(report.policyID);
         if (!PolicyUtils.isExpensifyTeam(policy.owner) && PolicyUtils.isExpensifyTeam(currentUserPersonalDetails?.login)) {

From 0a370f7c6b2c578c7dd444890d09add4bbf1a3c2 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 17 Apr 2024 13:25:14 +0700
Subject: [PATCH 338/383] fix lint

---
 src/libs/ReportUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 26ee32e3901e..b3d2865a442b 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1173,7 +1173,7 @@ function isJoinRequestInAdminRoom(report: OnyxEntry<Report>): boolean {
         return false;
     }
     // If this policy isn't owned by Expensify,
-    // Account manager/guide should not have the workspace join request pinned to their LHN, 
+    // Account manager/guide should not have the workspace join request pinned to their LHN,
     // since they are not a part of the company, and should not action it on their behalf.
     if (report.policyID) {
         const policy = getPolicy(report.policyID);

From 92ab9eaa65bd2cb0bc9faeaf961e329bc9028e64 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 17 Apr 2024 15:04:53 +0700
Subject: [PATCH 339/383] fix: Skeleton of money request preview has no
 animation

---
 src/components/MoneyRequestSkeletonView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyRequestSkeletonView.tsx b/src/components/MoneyRequestSkeletonView.tsx
index e11e7bcecc07..400e3c9534d7 100644
--- a/src/components/MoneyRequestSkeletonView.tsx
+++ b/src/components/MoneyRequestSkeletonView.tsx
@@ -13,8 +13,8 @@ function MoneyRequestSkeletonView() {
             animate
             width={styles.w100.width}
             height={variables.moneyRequestSkeletonHeight}
-            backgroundColor={theme.borderLighter}
-            foregroundColor={theme.border}
+            backgroundColor={theme.skeletonLHNIn}
+            foregroundColor={theme.skeletonLHNOut}
         >
             <Rect
                 x="16"

From f9721267773113da7ccb2a52266cdbb322f9a93e Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 17 Apr 2024 16:26:08 +0700
Subject: [PATCH 340/383] add comment

---
 src/libs/actions/Report.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 854eb882ef8f..41079d20a982 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2944,6 +2944,7 @@ function getReportPrivateNote(reportID: string | undefined) {
 function completeEngagementModal(choice: ValueOf<typeof CONST.ONBOARDING_CHOICES>, text?: string) {
     const conciergeAccountID = PersonalDetailsUtils.getAccountIDsByLogins([CONST.EMAIL.CONCIERGE])[0];
 
+    // We do not need to send any message for some choices
     if (!text) {
         const parameters: CompleteEngagementModalParams = {
             reportID: conciergeChatReportID ?? '',

From e8ccd30a17729d6e68c19f0a98fe01f23526b439 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 17 Apr 2024 16:37:28 +0700
Subject: [PATCH 341/383] use simple quotation mark

---
 src/CONST.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index a306a8380582..2b85bcb2c326 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -3555,7 +3555,7 @@ const CONST = {
             '\n' +
             "To track your expenses, create a workspace to keep everything in one place. Here's how:\n" +
             '1. From the home screen, click the green + button > New Workspace\n' +
-            '2. Give your workspace a name (e.g. "My business expenses”).\n' +
+            '2. Give your workspace a name (e.g. "My business expenses").\n' +
             '\n' +
             'Then, add expenses to your workspace:\n' +
             '1. Find your workspace using the search field.\n' +
@@ -3576,7 +3576,7 @@ const CONST = {
             '\n' +
             "To manage your team's expenses, create a workspace to keep everything in one place. Here's how:\n" +
             '1. From the home screen, click the green + button > New Workspace\n' +
-            '2. Give your workspace a name (e.g. “Sales team expenses”).\n' +
+            '2. Give your workspace a name (e.g. "Sales team expenses").\n' +
             '\n' +
             'Then, invite your team to your workspace via the Members pane and [connect a business bank account](https://help.expensify.com/articles/new-expensify/bank-accounts/Connect-a-Bank-Account) to reimburse them. Let me know if you have any questions!',
         [onboardingChoices.PERSONAL_SPEND]:
@@ -3584,7 +3584,7 @@ const CONST = {
             '\n' +
             "To track your expenses, create a workspace to keep everything in one place. Here's how:\n" +
             '1. From the home screen, click the green + button > New Workspace\n' +
-            '2. Give your workspace a name (e.g. "My expenses”).\n' +
+            '2. Give your workspace a name (e.g. "My expenses").\n' +
             '\n' +
             'Then, add expenses to your workspace:\n' +
             '1. Find your workspace using the search field.\n' +

From 2b18ce9784d45b3d79b200bec0db591b897d8ee3 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Wed, 17 Apr 2024 12:02:42 +0200
Subject: [PATCH 342/383] refactoring the createGroup function.

---
 src/pages/NewChatPage.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 08c8be17bb31..5f14f8576cb5 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -245,9 +245,6 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
     );
 
     const createGroup = useCallback(() => {
-        if (selectedOptions.length === 1) {
-            createChat();
-        }
         if (!personalData || !personalData.login || !personalData.accountID) {
             return;
         }
@@ -255,7 +252,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
         const logins = [...selectedParticipants, {login: personalData.login, accountID: personalData.accountID}];
         Report.setGroupDraft({participants: logins});
         Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM);
-    }, [selectedOptions, createChat, personalData]);
+    }, [selectedOptions, personalData]);
 
     const footerContent = useMemo(
         () => (

From e9316361e72de95c61f5301c3a988dd88d61c0b6 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 17 Apr 2024 11:01:51 +0000
Subject: [PATCH 343/383] Update version to 1.4.62-14

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 32dfb496daa8..237c284700ed 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 1001046213
-        versionName "1.4.62-13"
+        versionCode 1001046214
+        versionName "1.4.62-14"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 0b59d7e8316d..fa153e5ec674 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.13</string>
+	<string>1.4.62.14</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 2a6db0634f2f..eed52462a526 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.62.13</string>
+	<string>1.4.62.14</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 50171f3eb050..35dbb3c0b6cd 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.13</string>
+	<string>1.4.62.14</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 478ae3c12b3c..7ccbbed9e03b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-13",
+  "version": "1.4.62-14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-13",
+      "version": "1.4.62-14",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index e5092e132eae..36ab2edaeed8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-13",
+  "version": "1.4.62-14",
   "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.",

From c7cd851429899c2fce8c4ed7edae081bf791b9b9 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Wed, 17 Apr 2024 17:08:28 +0530
Subject: [PATCH 344/383] Apply suggestions from code review

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
---
 .../MoneyTemporaryForRefactorRequestConfirmationList.tsx  | 2 +-
 src/languages/es.ts                                       | 2 +-
 src/libs/OptionsListUtils.ts                              | 2 +-
 src/libs/ReportActionsUtils.ts                            | 2 +-
 src/libs/actions/IOU.ts                                   | 2 +-
 src/libs/actions/User.ts                                  | 6 +++---
 .../OnboardEngagement/PurposeForUsingExpensifyPage.tsx    | 2 +-
 src/pages/home/report/ReportActionItemSingle.tsx          | 2 +-
 ...oneyTemporaryForRefactorRequestParticipantsSelector.js | 2 +-
 src/pages/iou/request/step/IOURequestStepMerchant.tsx     | 2 +-
 tests/unit/IOUUtilsTest.ts                                | 8 ++++----
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
index c6044d09e94e..d6ac31749a27 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx
@@ -907,7 +907,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     source={resolvedThumbnail || resolvedReceiptImage || ''}
                     // AuthToken is required when retrieving the image from the server
-                    // but we don't need it to load the blob:// or file:// image when starting a submit / split expense
+                    // but we don't need it to load the blob:// or file:// image when starting an expense/split
                     // So if we have a thumbnail, it means we're retrieving the image from the server
                     isAuthTokenRequired={!!receiptThumbnail}
                     fileExtension={fileExtension}
diff --git a/src/languages/es.ts b/src/languages/es.ts
index f6231c9093b4..353dce580b3d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -410,7 +410,7 @@ export default {
     },
     login: {
         hero: {
-            header: 'Gestiona o divide gastos y chatea con su equipo.',
+            header: 'Gestiona, divide gastos y chatea con tu equipo.',
             body: 'Bienvenido al futuro de Expensify, tu nuevo lugar de referencia para la colaboración financiera con amigos y compañeros de equipo por igual.',
         },
     },
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 4f48551d0126..2d76f3e1122a 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -1707,7 +1707,7 @@ function getOptions(
             return;
         }
 
-        // In case user needs to add credit bank account, don't allow them to submit expense from the workspace.
+        // In case user needs to add credit bank account, don't allow them to submit an expense from the workspace.
         if (includeOwnedWorkspaceChats && ReportUtils.hasIOUWaitingOnCurrentUserBankAccount(report)) {
             return;
         }
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 4043b9268f17..9040257c4635 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -997,7 +997,7 @@ function getMemberChangeMessagePlainText(reportAction: OnyxEntry<ReportAction>):
 }
 
 /**
- * Helper method to determine if the provided accountID has made an expense on the specified report.
+ * Helper method to determine if the provided accountID has submitted an expense on the specified report.
  *
  * @param reportID
  * @param currentAccountID
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 85a933efbb52..e8f9ac5c2d4f 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -1316,7 +1316,7 @@ function getDeleteTrackExpenseInformation(
 }
 
 /**
- * Gathers all the data needed to make an expense. It attempts to find existing reports, iouReports, and receipts. If it doesn't find them, then
+ * Gathers all the data needed to submit an expense. It attempts to find existing reports, iouReports, and receipts. If it doesn't find them, then
  * it creates optimistic versions of them and uses those instead
  */
 function getMoneyRequestInformation(
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 26bbceb76332..f347655b6a4d 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -525,7 +525,7 @@ function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
             const types = flatten.map((data) => data?.originalMessage).filter(Boolean) as OriginalMessage[];
 
             for (const message of types) {
-                // pay someone flow
+                // Pay someone flow
                 if ('IOUDetails' in message) {
                     return playSound(SOUNDS.SUCCESS);
                 }
@@ -545,12 +545,12 @@ function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
                     return playSound(SOUNDS.ATTENTION);
                 }
 
-                // submit expense flow
+                // Submit expense flow
                 if ('IOUTransactionID' in message) {
                     return playSound(SOUNDS.ATTENTION);
                 }
 
-                // Someone completes an expense
+                // Someone reimburses an expense
                 if ('IOUReportID' in message) {
                     return playSound(SOUNDS.SUCCESS);
                 }
diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
index 65fbd4185cef..dbb2635823a7 100644
--- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
+++ b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
@@ -57,7 +57,7 @@ const messageCopy = {
         "6. Tap *Add to split* when you're done.\n" +
         '7. Review and tap *Split* to split your expense(s).\n' +
         '\n' +
-        "We'll send an expense to each of your friends and make sure you get paid back. Let me know how it goes!",
+        "We'll submit an expense to each of your friends and make sure you get paid back. Let me know how it goes!",
 };
 
 const menuIcons = {
diff --git a/src/pages/home/report/ReportActionItemSingle.tsx b/src/pages/home/report/ReportActionItemSingle.tsx
index 3f6ed16dd06c..4e4ebb2a017d 100644
--- a/src/pages/home/report/ReportActionItemSingle.tsx
+++ b/src/pages/home/report/ReportActionItemSingle.tsx
@@ -106,7 +106,7 @@ function ReportActionItemSingle({
     let secondaryAvatar: Icon;
     const primaryDisplayName = displayName;
     if (displayAllActors) {
-        // The ownerAccountID and actorAccountID can be the same if the a user submits expense back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
+        // The ownerAccountID and actorAccountID can be the same if the a user submits an expense back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
         const secondaryAccountId = iouReport?.ownerAccountID === actorAccountID ? iouReport?.managerID : iouReport?.ownerAccountID;
         const secondaryUserAvatar = personalDetails?.[secondaryAccountId ?? -1]?.avatar ?? '';
         const secondaryDisplayName = ReportUtils.getDisplayNameForParticipant(secondaryAccountId);
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index adcce971b45a..95cb043122d4 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -108,7 +108,7 @@ function MoneyTemporaryForRefactorRequestParticipantsSelector({participants, onF
             CONST.EXPENSIFY_EMAILS,
 
             // If we are using this component in the "Submit expense" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
-            // sees the option to submit expense from their admin on their own Workspace Chat.
+            // sees the option to submit an expense from their admin on their own Workspace Chat.
             iouType === CONST.IOU.TYPE.REQUEST && action !== CONST.IOU.ACTION.MOVE,
 
             (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && ![CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action),
diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
index 02bdf0a086ca..d731f56614a5 100644
--- a/src/pages/iou/request/step/IOURequestStepMerchant.tsx
+++ b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
@@ -99,7 +99,7 @@ function IOURequestStepMerchant({
         }
         IOU.setMoneyRequestMerchant(transactionID, newMerchant ?? '', !isEditing);
         if (isEditing) {
-            // When creating new expense newMerchant can be blank so we fall back on PARTIAL_TRANSACTION_MERCHANT
+            // When creating a new expense, newMerchant can be blank so we fall back on PARTIAL_TRANSACTION_MERCHANT
             IOU.updateMoneyRequestMerchant(transactionID, reportID, newMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, policy, policyTags, policyCategories);
         }
         navigateBack();
diff --git a/tests/unit/IOUUtilsTest.ts b/tests/unit/IOUUtilsTest.ts
index 363f327bbca8..ddc220449e2f 100644
--- a/tests/unit/IOUUtilsTest.ts
+++ b/tests/unit/IOUUtilsTest.ts
@@ -25,7 +25,7 @@ describe('IOUUtils', () => {
             });
         });
 
-        test('Submitting expense offline in a different currency will show the pending conversion message', () => {
+        test('Submitting an expense offline in a different currency will show the pending conversion message', () => {
             const iouReport = ReportUtils.buildOptimisticIOUReport(1, 2, 100, '1', 'USD');
             const usdPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'USD', iouReport.reportID);
             const aedPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'AED', iouReport.reportID);
@@ -34,12 +34,12 @@ describe('IOUUtils', () => {
             MergeQueries[`${ONYXKEYS.COLLECTION.TRANSACTION}${aedPendingTransaction.transactionID}`] = aedPendingTransaction;
 
             return Onyx.mergeCollection(ONYXKEYS.COLLECTION.TRANSACTION, MergeQueries).then(() => {
-                // We submitted expense offline in a different currency, we don't know the total of the iouReport until we're back online
+                // We submitted an expense offline in a different currency, we don't know the total of the iouReport until we're back online
                 expect(IOUUtils.isIOUReportPendingCurrencyConversion(iouReport)).toBe(true);
             });
         });
 
-        test('Submitting expense online in a different currency will not show the pending conversion message', () => {
+        test('Submitting an expense online in a different currency will not show the pending conversion message', () => {
             const iouReport = ReportUtils.buildOptimisticIOUReport(2, 3, 100, '1', 'USD');
             const usdPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'USD', iouReport.reportID);
             const aedPendingTransaction = TransactionUtils.buildOptimisticTransaction(100, 'AED', iouReport.reportID);
@@ -55,7 +55,7 @@ describe('IOUUtils', () => {
             };
 
             return Onyx.mergeCollection(ONYXKEYS.COLLECTION.TRANSACTION, MergeQueries).then(() => {
-                // We submitted expense online in a different currency, we know the iouReport total and there's no need to show the pending conversion message
+                // We submitted an expense online in a different currency, we know the iouReport total and there's no need to show the pending conversion message
                 expect(IOUUtils.isIOUReportPendingCurrencyConversion(iouReport)).toBe(false);
             });
         });

From 9e1cc4114d651ebceb0b2875554fab2c8f354dc5 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Wed, 17 Apr 2024 08:30:14 -0400
Subject: [PATCH 345/383] remove duplicate redirect

---
 docs/redirects.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/redirects.csv b/docs/redirects.csv
index 51c8c7515e10..af595ecc5f83 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -152,7 +152,6 @@ https://help.expensify.com/articles/expensify-classic/manage-employees-and-repor
 https://help.expensify.com/articles/expensify-classic/manage-employees-and-report-approvals/Invite-Members,https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Invite-Members
 https://help.expensify.com/articles/expensify-classic/manage-employees-and-report-approvals/Removing-Members,https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Removing-Members
 https://help.expensify.com/articles/expensify-classic/manage-employees-and-report-approvals/User-Roles,https://help.expensify.com/expensify-classic/hubs/copilots-and-delegates/
-https://help.expensify.com/articles/expensify-classic/reports/Currency,https://help.expensify.com/articles/expensify-classic/workspaces/Currency
 https://help.expensify.com/articles/expensify-classic/send-payments/Reimbursing-Reports,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports
 https://help.expensify.com/articles/expensify-classic/workspace-and-domain-settings/SAML-SSO,https://help.expensify.com/articles/expensify-classic/settings/Enable-two-factor-authentication
 https://help.expensify.com/articles/expensify-classic/workspaces/Budgets,https://help.expensify.com/articles/expensify-classic/workspaces/Set-budgets

From 671039d8219171fc668506be52ae2274c0011076 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 17 Apr 2024 21:04:39 +0800
Subject: [PATCH 346/383] use const

---
 src/libs/Navigation/getTopmostBottomTabRoute.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/getTopmostBottomTabRoute.ts b/src/libs/Navigation/getTopmostBottomTabRoute.ts
index e156b567af0d..48a8d80f4096 100644
--- a/src/libs/Navigation/getTopmostBottomTabRoute.ts
+++ b/src/libs/Navigation/getTopmostBottomTabRoute.ts
@@ -1,10 +1,11 @@
+import NAVIGATORS from '@src/NAVIGATORS';
 import type {BottomTabName, NavigationPartialRoute, RootStackParamList, State} from './types';
 
 function getTopmostBottomTabRoute(state: State<RootStackParamList> | undefined): NavigationPartialRoute<BottomTabName> | undefined {
-    const bottomTabNavigatorRoute = state?.routes.findLast((route) => route.name === 'BottomTabNavigator');
+    const bottomTabNavigatorRoute = state?.routes.findLast((route) => route.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR);
 
     // The bottomTabNavigatorRoute state may be empty if we just logged in.
-    if (!bottomTabNavigatorRoute || bottomTabNavigatorRoute.name !== 'BottomTabNavigator' || bottomTabNavigatorRoute.state === undefined) {
+    if (!bottomTabNavigatorRoute || bottomTabNavigatorRoute.name !== NAVIGATORS.BOTTOM_TAB_NAVIGATOR || bottomTabNavigatorRoute.state === undefined) {
         return undefined;
     }
 

From 5ce1479d31f21ac2fb9598c96443d92d381c8867 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Wed, 17 Apr 2024 19:20:04 +0530
Subject: [PATCH 347/383] Apply suggestions from code review

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
---
 src/libs/ReportUtils.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index e752476ae6e2..492431406bfb 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4962,20 +4962,20 @@ function hasIOUWaitingOnCurrentUserBankAccount(chatReport: OnyxEntry<Report>): b
 }
 
 /**
- * Users can submit expense:
+ * Users can submit an expense:
  * - in policy expense chats only if they are in a role of a member in the chat (in other words, if it's their policy expense chat)
  * - in an open or submitted expense report tied to a policy expense chat the user owns
- *     - employee can submit expense in submitted expense report only if the policy has Instant Submit settings turned on
+ *     - employee can submit expenses in a submitted expense report only if the policy has Instant Submit settings turned on
  * - in an IOU report, which is not settled yet
  * - in a 1:1 DM chat
  */
 function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, otherParticipants: number[]): boolean {
-    // User cannot submit expense in chat thread or in task report or in chat room
+    // User cannot submit expenses in a chat thread, task report or in a chat room
     if (isChatThread(report) || isTaskReport(report) || isChatRoom(report) || isSelfDM(report) || isGroupChat(report)) {
         return false;
     }
 
-    // Users can only submit expense in DMs if they are a 1:1 DM
+    // Users can only submit expenses in DMs if they are a 1:1 DM
     if (isDM(report)) {
         return otherParticipants.length === 1;
     }
@@ -4990,19 +4990,19 @@ function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, o
         isOwnPolicyExpenseChat = Boolean(getParentReport(report)?.isOwnPolicyExpenseChat);
     }
 
-    // In case there are no other participants than the current user and it's not user's own policy expense chat, they can't submit expense from such report
+    // In case there are no other participants than the current user and it's not user's own policy expense chat, they can't submit expenses from such report
     if (otherParticipants.length === 0 && !isOwnPolicyExpenseChat) {
         return false;
     }
 
-    // User can submit expense in any IOU report, unless paid, but user can only submit expense in an expense report
+    // User can submit expenses in any IOU report, unless paid, but the user can only submit expenses in an expense report
     // which is tied to their workspace chat.
     if (isMoneyRequestReport(report)) {
         const canAddTransactions = canAddOrDeleteTransactions(report);
         return isGroupPolicy(report) ? isOwnPolicyExpenseChat && canAddTransactions : canAddTransactions;
     }
 
-    // In case of policy expense chat, users can only submit expense from their own policy expense chat
+    // In the case of policy expense chat, users can only submit expenses from their own policy expense chat
     return !isPolicyExpenseChat(report) || isOwnPolicyExpenseChat;
 }
 
@@ -5199,7 +5199,7 @@ function getAddWorkspaceRoomOrChatReportErrors(report: OnyxEntry<Report>): Error
 }
 
 /**
- * Return true if the Submit expense report is marked for deletion.
+ * Return true if the expense report is marked for deletion.
  */
 function isMoneyRequestReportPendingDeletion(report: OnyxEntry<Report> | EmptyObject): boolean {
     if (!isMoneyRequestReport(report)) {
@@ -5213,7 +5213,7 @@ function isMoneyRequestReportPendingDeletion(report: OnyxEntry<Report> | EmptyOb
 function canUserPerformWriteAction(report: OnyxEntry<Report>) {
     const reportErrors = getAddWorkspaceRoomOrChatReportErrors(report);
 
-    // If the Submit Expense report is marked for deletion, let us prevent any further write action.
+    // If the expense report is marked for deletion, let us prevent any further write action.
     if (isMoneyRequestReportPendingDeletion(report)) {
         return false;
     }
@@ -5241,7 +5241,7 @@ function getOriginalReportID(reportID: string, reportAction: OnyxEntry<ReportAct
  *
  * - creating a workspace room
  * - starting a chat
- * - paying expense
+ * - paying the expense
  *
  * while being offline
  */
@@ -5510,7 +5510,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
  * A report is a group chat if it meets the following conditions:
  * - Not a chat thread.
  * - Not a task report.
- * - Not a expense / IOU report.
+ * - Not an expense / IOU report.
  * - Not an archived room.
  * - Not a public / admin / announce chat room (chat type doesn't match any of the specified types).
  * - More than 2 participants.
@@ -5907,7 +5907,7 @@ function hasMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, iouReportID:
 }
 
 /**
- * Used from submit expense actions to decide if we need to build an optimistic submit expense report.
+ * Used from expense actions to decide if we need to build an optimistic expense report.
    Create a new report if:
    - we don't have an iouReport set in the chatReport
    - we have one, but it's waiting on the payee adding a bank account

From c4593e75d4635e36a2e491c03a536cff1568dc6a Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 08:59:47 -0700
Subject: [PATCH 348/383] add missing underscore at the end of the Onyx
 collection key name

Co-authored-by: Luthfi <luthfi.ufi14@gmail.com>
---
 src/ONYXKEYS.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index edf0296eb9c8..c76dd80974c0 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -319,7 +319,7 @@ const ONYXKEYS = {
         POLICY_TAGS: 'policyTags_',
         POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
         /** Whether the connections data for the policy was attempted to be fetched in the current user session */
-        POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED: 'policyHasConnectionsDataBeenFetched',
+        POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED: 'policyHasConnectionsDataBeenFetched_',
         OLD_POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         WORKSPACE_INVITE_MESSAGE_DRAFT: 'workspaceInviteMessageDraft_',

From abd83cd09eba7ac2ff4fd8028f73a874ec999dfb Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 09:07:30 -0700
Subject: [PATCH 349/383] chore: update the eslint config lib version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 36ab2edaeed8..62fbb8d3fc97 100644
--- a/package.json
+++ b/package.json
@@ -258,7 +258,7 @@
     "electron-builder": "24.13.2",
     "eslint": "^7.6.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-expensify": "^2.0.44",
+    "eslint-config-expensify": "^2.0.47",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^24.1.0",

From 0f7264aca12228f618cb0e6b02a6d2badfa4c574 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 09:08:31 -0700
Subject: [PATCH 350/383] chore: update the package-lock json

---
 package-lock.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7ccbbed9e03b..9d6267f9430b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@babel/plugin-proposal-private-methods": "^7.18.6",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@dotlottie/react-player": "^1.6.3",
-        "@expensify/react-native-live-markdown": "^0.1.49",
+        "@expensify/react-native-live-markdown": "0.1.49",
         "@expo/metro-runtime": "~3.1.1",
         "@formatjs/intl-datetimeformat": "^6.10.0",
         "@formatjs/intl-listformat": "^7.2.2",
@@ -207,7 +207,7 @@
         "electron-builder": "24.13.2",
         "eslint": "^7.6.0",
         "eslint-config-airbnb-typescript": "^17.1.0",
-        "eslint-config-expensify": "^2.0.44",
+        "eslint-config-expensify": "^2.0.47",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-jest": "^24.1.0",
@@ -19250,9 +19250,10 @@
       }
     },
     "node_modules/eslint-config-expensify": {
-      "version": "2.0.44",
+      "version": "2.0.48",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.48.tgz",
+      "integrity": "sha512-PFegJ9Wfsiu5tgevhjA1toCxsZ8Etfk6pIjtXAnwpmVj7q4CtB3QDRusJoUDyJ3HrZr8AsFKViz7CU/CBTfwOw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@lwc/eslint-plugin-lwc": "^1.7.2",
         "babel-eslint": "^10.1.0",

From 097d3a5f33b86acae4b47b799d4337128529d7a4 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 09:45:56 -0700
Subject: [PATCH 351/383] fix: remove non-existent lint rule

---
 .eslintrc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c2198da60c52..56a5236a7899 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -94,7 +94,6 @@ module.exports = {
             rules: {
                 'prefer-regex-literals': 'off',
                 'rulesdir/no-multiple-onyx-in-file': 'off',
-                'rulesdir/onyx-props-must-have-default': 'off',
                 'react-native-a11y/has-accessibility-hint': ['off'],
                 'react/jsx-no-constructed-context-values': 'error',
                 'react-native-a11y/has-valid-accessibility-descriptors': [

From 4804fd19f34f2f9c3a89c82b4d6e296d4a1b05ac Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 09:52:05 -0700
Subject: [PATCH 352/383] fix: default policy id to 0

---
 src/pages/workspace/withPolicyConnections.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 60574563be3a..dc678df62cf7 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -24,7 +24,7 @@ type WithPolicyConnectionsProps = WithPolicyProps;
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
     function WithPolicyConnections({policy, policyDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
-        const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? ''}` as const, {
+        const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? '0'}` as const, {
             initWithStoredValues: false,
         });
 

From e19060b4968066e581ec5e825d59bf4c7d9b707a Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 09:57:19 -0700
Subject: [PATCH 353/383] doc: specify the reason why the loading state can't
 be inside the policy object

---
 src/ONYXKEYS.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index c76dd80974c0..e51d760604e8 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -318,7 +318,10 @@ const ONYXKEYS = {
         POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
         POLICY_TAGS: 'policyTags_',
         POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
-        /** Whether the connections data for the policy was attempted to be fetched in the current user session */
+        // Whether the policy's connection data was attempted to be fetched in
+        // the current user session. As this state only exists client-side, it
+        // should not be included as part of the policy object. The policy
+        // object should mirror the data as it's stored in the database.
         POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED: 'policyHasConnectionsDataBeenFetched_',
         OLD_POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',

From a084e5295dea50b4d14fb560c2ad5e58e83cb1f0 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 09:58:25 -0700
Subject: [PATCH 354/383] fix: remove as const statement

---
 src/pages/workspace/withPolicyConnections.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index dc678df62cf7..d540e7e5a681 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -24,7 +24,7 @@ type WithPolicyConnectionsProps = WithPolicyProps;
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps>) {
     function WithPolicyConnections({policy, policyDraft, route}: WithPolicyConnectionsProps) {
         const {isOffline} = useNetwork();
-        const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? '0'}` as const, {
+        const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? '0'}`, {
             initWithStoredValues: false,
         });
 

From 61691b2ce5cddcc0e8c09103eb7021f219f99a14 Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Wed, 17 Apr 2024 10:13:18 -0700
Subject: [PATCH 355/383] Update
 src/pages/workspace/accounting/PolicyAccountingPage.tsx

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>
---
 src/pages/workspace/accounting/PolicyAccountingPage.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 5b5d6ab663ca..fa9d1489dbb9 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -33,8 +33,6 @@ import ROUTES from '@src/ROUTES';
 import type {Policy, PolicyConnectionSyncProgress} from '@src/types/onyx';
 
 type PolicyAccountingPageOnyxProps = {
-    /** From Onyx */
-    /** Bank account attached to free plan */
     connectionSyncProgress: OnyxEntry<PolicyConnectionSyncProgress>;
 };
 

From 925c0b03ac17c3b5015ec24e6d1eca99d32e04f0 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 17 Apr 2024 10:19:03 -0700
Subject: [PATCH 356/383] Add const for command. Make QUICKBOOK constants names
 consistent

---
 src/CONST.ts                                                  | 4 ++--
 src/libs/API/types.ts                                         | 1 +
 src/libs/actions/connections/QuickBooksOnline.ts              | 3 ++-
 .../accounting/qbo/QuickbooksChartOfAccountsPage.tsx          | 2 +-
 src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx  | 2 +-
 .../workspace/accounting/qbo/QuickbooksCustomersPage.tsx      | 2 +-
 .../workspace/accounting/qbo/QuickbooksLocationsPage.tsx      | 2 +-
 src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx    | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index f1e6e95e0e95..556a161876f4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1215,9 +1215,9 @@ const CONST = {
         NOT_IMPORTED: 'NOT_IMPORTED',
         IMPORTED: 'IMPORTED',
     },
-    QUICK_BOOKS_ONLINE: 'quickbooksOnline',
+    QUICKBOOKS_ONLINE: 'quickbooksOnline',
 
-    QUICK_BOOKS_IMPORTS: {
+    QUICKBOOKS_IMPORTS: {
         SYNC_CLASSES: 'syncClasses',
         ENABLE_NEW_CATEGORIES: 'enableNewCategories',
         SYNC_CUSTOMERS: 'syncCustomers',
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index ec26d97e25c7..88af0080938c 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -425,6 +425,7 @@ type WriteCommandParameters = {
 };
 
 const READ_COMMANDS = {
+    CONNECT_POLICY_TO_QUICKBOOKS_ONLINE: 'ConnectPolicyToQuickbooksOnline',
     OPEN_REIMBURSEMENT_ACCOUNT_PAGE: 'OpenReimbursementAccountPage',
     OPEN_WORKSPACE_VIEW: 'OpenWorkspaceView',
     GET_MAPBOX_ACCESS_TOKEN: 'GetMapboxAccessToken',
diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index eebd59cad125..280b5bef1349 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -1,8 +1,9 @@
+import { READ_COMMANDS } from '@libs/API/types';
 import {getCommandURL} from '@libs/ApiUtils';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
     const params = new URLSearchParams({policyID});
-    const commandURL = getCommandURL({command: 'ConnectPolicyToQuickbooksOnline', shouldSkipWebProxy: true});
+    const commandURL = getCommandURL({command: READ_COMMANDS.CONNECT_POLICY_TO_QUICKBOOKS_ONLINE, shouldSkipWebProxy: true});
     return commandURL + params.toString();
 }
 
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
index e75d2e7a345d..10f7500b3ca1 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksChartOfAccountsPage.tsx
@@ -50,7 +50,7 @@ function QuickbooksChartOfAccountsPage({policy}: WithPolicyProps) {
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.POLICY.CONNECTIONS.NAME.QBO,
-                                                CONST.QUICK_BOOKS_IMPORTS.ENABLE_NEW_CATEGORIES,
+                                                CONST.QUICKBOOKS_IMPORTS.ENABLE_NEW_CATEGORIES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
                                         }
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
index 498bacfd8e56..62a0a65ac91c 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksClassesPage.tsx
@@ -52,7 +52,7 @@ function QuickbooksClassesPage({policy}: WithPolicyProps) {
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.POLICY.CONNECTIONS.NAME.QBO,
-                                                CONST.QUICK_BOOKS_IMPORTS.SYNC_CLASSES,
+                                                CONST.QUICKBOOKS_IMPORTS.SYNC_CLASSES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
                                         }
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
index 4fbcbe9b7a5a..3192ff4d83a9 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksCustomersPage.tsx
@@ -51,7 +51,7 @@ function QuickbooksCustomersPage({policy}: WithPolicyProps) {
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.POLICY.CONNECTIONS.NAME.QBO,
-                                                CONST.QUICK_BOOKS_IMPORTS.SYNC_CUSTOMERS,
+                                                CONST.QUICKBOOKS_IMPORTS.SYNC_CUSTOMERS,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
                                         }
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
index e6e4d771969d..fa573b813585 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksLocationsPage.tsx
@@ -52,7 +52,7 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.POLICY.CONNECTIONS.NAME.QBO,
-                                                CONST.QUICK_BOOKS_IMPORTS.SYNC_LOCATIONS,
+                                                CONST.QUICKBOOKS_IMPORTS.SYNC_LOCATIONS,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
                                         }
diff --git a/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx b/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
index f35500a23087..215d8397b7ec 100644
--- a/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/QuickbooksTaxesPage.tsx
@@ -49,7 +49,7 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
                                             Connections.updatePolicyConnectionConfig(
                                                 policyID,
                                                 CONST.POLICY.CONNECTIONS.NAME.QBO,
-                                                CONST.QUICK_BOOKS_IMPORTS.SYNC_TAXES,
+                                                CONST.QUICKBOOKS_IMPORTS.SYNC_TAXES,
                                                 isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                             )
                                         }

From 11ebabe4f0b6cf3e3db2052a72fd546488679fb5 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 17 Apr 2024 10:43:05 -0700
Subject: [PATCH 357/383] Prettier

---
 src/libs/actions/connections/QuickBooksOnline.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index 280b5bef1349..a9881da32095 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -1,4 +1,4 @@
-import { READ_COMMANDS } from '@libs/API/types';
+import {READ_COMMANDS} from '@libs/API/types';
 import {getCommandURL} from '@libs/ApiUtils';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {

From db78384cbae51e1caa0e2aeb5a74d0fa6b7f7b59 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 17 Apr 2024 10:49:05 -0700
Subject: [PATCH 358/383] Add ConnectPolicyToQuickbooksOnlineParams

---
 .../API/parameters/ConnectPolicyToQuickbooksOnlineParams.ts  | 5 +++++
 src/libs/API/parameters/index.ts                             | 1 +
 src/libs/API/types.ts                                        | 1 +
 src/libs/actions/connections/QuickBooksOnline.ts             | 5 +++--
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 src/libs/API/parameters/ConnectPolicyToQuickbooksOnlineParams.ts

diff --git a/src/libs/API/parameters/ConnectPolicyToQuickbooksOnlineParams.ts b/src/libs/API/parameters/ConnectPolicyToQuickbooksOnlineParams.ts
new file mode 100644
index 000000000000..4d889d69f5ad
--- /dev/null
+++ b/src/libs/API/parameters/ConnectPolicyToQuickbooksOnlineParams.ts
@@ -0,0 +1,5 @@
+type ConnectPolicyToQuickbooksOnlineParams = {
+    policyID: string;
+};
+
+export default ConnectPolicyToQuickbooksOnlineParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index a02a7bc75955..cc3ec2767490 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -11,6 +11,7 @@ export type {default as BeginGoogleSignInParams} from './BeginGoogleSignInParams
 export type {default as BeginSignInParams} from './BeginSignInParams';
 export type {default as CloseAccountParams} from './CloseAccountParams';
 export type {default as ConnectBankAccountParams} from './ConnectBankAccountParams';
+export type {default as ConnectPolicyToQuickbooksOnlineParams} from './ConnectPolicyToQuickbooksOnlineParams';
 export type {default as DeleteContactMethodParams} from './DeleteContactMethodParams';
 export type {default as DeletePaymentBankAccountParams} from './DeletePaymentBankAccountParams';
 export type {default as DeletePaymentCardParams} from './DeletePaymentCardParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 88af0080938c..3d32d27084c3 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -466,6 +466,7 @@ const READ_COMMANDS = {
 type ReadCommand = ValueOf<typeof READ_COMMANDS>;
 
 type ReadCommandParameters = {
+    [READ_COMMANDS.CONNECT_POLICY_TO_QUICKBOOKS_ONLINE]: Parameters.ConnectPolicyToQuickbooksOnlineParams;
     [READ_COMMANDS.OPEN_REIMBURSEMENT_ACCOUNT_PAGE]: Parameters.OpenReimbursementAccountPageParams;
     [READ_COMMANDS.OPEN_WORKSPACE_VIEW]: Parameters.OpenWorkspaceViewParams;
     [READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN]: EmptyObject;
diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
index a9881da32095..a774aced0112 100644
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ b/src/libs/actions/connections/QuickBooksOnline.ts
@@ -1,10 +1,11 @@
+import type {ConnectPolicyToQuickbooksOnlineParams} from '@libs/API/parameters';
 import {READ_COMMANDS} from '@libs/API/types';
 import {getCommandURL} from '@libs/ApiUtils';
 
 function getQuickBooksOnlineSetupLink(policyID: string) {
-    const params = new URLSearchParams({policyID});
+    const params: ConnectPolicyToQuickbooksOnlineParams = {policyID};
     const commandURL = getCommandURL({command: READ_COMMANDS.CONNECT_POLICY_TO_QUICKBOOKS_ONLINE, shouldSkipWebProxy: true});
-    return commandURL + params.toString();
+    return commandURL + new URLSearchParams(params).toString();
 }
 
 // More action functions will be added later

From 6463530d9235a62c5469bc8e993b94e4cffc66a6 Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:30:41 -0700
Subject: [PATCH 359/383] Use const

Co-authored-by: Marc Glasser <marc@expensify.com>
---
 src/pages/workspace/accounting/PolicyAccountingPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index fa9d1489dbb9..52da184ca5f6 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -76,7 +76,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
             return [
                 {
                     icon: Expensicons.QBOSquare,
-                    iconType: 'avatar',
+                    iconType: CONST.ICON_TYPE_AVATAR
                     interactive: false,
                     wrapperStyle: [styles.sectionMenuItemTopDescription],
                     shouldShowRightComponent: true,

From d1f621244317d0d8dcaa8aa943fa89b9bcba7702 Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:31:55 -0700
Subject: [PATCH 360/383] Remove comment

Co-authored-by: Marc Glasser <marc@expensify.com>
---
 src/components/ConnectToQuickbooksOnlineButton/types.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/types.ts b/src/components/ConnectToQuickbooksOnlineButton/types.ts
index dce818f221a2..734d5ee2c78a 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/types.ts
+++ b/src/components/ConnectToQuickbooksOnlineButton/types.ts
@@ -2,6 +2,5 @@ type ConnectToQuickbooksOnlineButtonProps = {
     policyID: string;
 };
 
-// More types will be added later
 // eslint-disable-next-line import/prefer-default-export
 export type {ConnectToQuickbooksOnlineButtonProps};

From b7565932c1ed3d64ec6ba871b81b1d7d8faf7885 Mon Sep 17 00:00:00 2001
From: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 17 Apr 2024 19:34:28 +0100
Subject: [PATCH 361/383] Fix: Workspace - Deleting a message on Announce room
 takes user to another report page

---
 src/libs/actions/Report.ts                                  | 6 ++++++
 .../report/ContextMenu/PopoverReportActionContextMenu.tsx   | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 41079d20a982..5922da9dc181 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1277,6 +1277,12 @@ function deleteReportComment(reportID: string, reportAction: ReportAction) {
     CachedPDFPaths.clearByKey(reportActionID);
 
     API.write(WRITE_COMMANDS.DELETE_COMMENT, parameters, {optimisticData, successData, failureData});
+
+    // if we are linking to the report action we are deleting and it's not a deleted parent action,
+    // we should navigate to its report in order to not show not found page
+    if (Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(reportID, reportActionID)) && !isDeletedParentAction) {
+        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(reportID), true);
+    }
 }
 
 /**
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
index 6c9ed8b0a008..6cb688ff2558 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -9,11 +9,9 @@ import ConfirmModal from '@components/ConfirmModal';
 import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent';
 import useLocalize from '@hooks/useLocalize';
 import calculateAnchorPosition from '@libs/calculateAnchorPosition';
-import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as IOU from '@userActions/IOU';
 import * as Report from '@userActions/Report';
-import ROUTES from '@src/ROUTES';
 import type {AnchorDimensions} from '@src/styles';
 import type {ReportAction} from '@src/types/onyx';
 import BaseReportActionContextMenu from './BaseReportActionContextMenu';
@@ -274,9 +272,6 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
             }
         } else if (reportAction) {
             Report.deleteReportComment(reportIDRef.current, reportAction);
-            if (!((reportAction?.childVisibleActionCount ?? 0) > 0)) {
-                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(reportIDRef.current));
-            }
         }
 
         DeviceEventEmitter.emit(`deletedReportAction_${reportIDRef.current}`, reportAction?.reportActionID);

From 9dab752f687bbca823df557a3e1a0d06d0db7bb2 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 17 Apr 2024 11:54:09 -0700
Subject: [PATCH 362/383] style

---
 src/pages/workspace/accounting/PolicyAccountingPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 52da184ca5f6..216bf70df442 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -76,7 +76,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
             return [
                 {
                     icon: Expensicons.QBOSquare,
-                    iconType: CONST.ICON_TYPE_AVATAR
+                    iconType: CONST.ICON_TYPE_AVATAR,
                     interactive: false,
                     wrapperStyle: [styles.sectionMenuItemTopDescription],
                     shouldShowRightComponent: true,

From f34d1f49cb23f2a8d2c2117232e692e490296bab Mon Sep 17 00:00:00 2001
From: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 17 Apr 2024 19:54:42 +0100
Subject: [PATCH 363/383] Correct comment

---
 src/libs/actions/Report.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 5922da9dc181..7bcb82861769 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1278,7 +1278,7 @@ function deleteReportComment(reportID: string, reportAction: ReportAction) {
 
     API.write(WRITE_COMMANDS.DELETE_COMMENT, parameters, {optimisticData, successData, failureData});
 
-    // if we are linking to the report action we are deleting and it's not a deleted parent action,
+    // if we are linking to the report action, and we are deleting it, and it's not a deleted parent action,
     // we should navigate to its report in order to not show not found page
     if (Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(reportID, reportActionID)) && !isDeletedParentAction) {
         Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(reportID), true);

From 171b0f323e3b7034ab80e097d711a628c6dfd106 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 18 Apr 2024 01:31:12 +0530
Subject: [PATCH 364/383] add workflow to validate redirects.csv

---
 .github/workflows/deployExpensifyHelp.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml
index d4577e112d59..699bd379fb77 100644
--- a/.github/workflows/deployExpensifyHelp.yml
+++ b/.github/workflows/deployExpensifyHelp.yml
@@ -36,6 +36,9 @@ jobs:
 
       - name: Create docs routes file
         run: ./.github/scripts/createDocsRoutes.sh
+      
+      - name: Check duplicates in redirect.csv
+        run: ./.github/scripts/verifyRedirect.sh
 
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@0143c158f4fa0c5dcd99499a5d00859d79f70b0e

From 5363920f85cd7c7bc99caeb27e7cc9578112920a Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 18 Apr 2024 01:31:31 +0530
Subject: [PATCH 365/383] add workflow to validate redirects.csv

---
 .github/scripts/verifyRedirect.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/scripts/verifyRedirect.sh

diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh
new file mode 100644
index 000000000000..6b33a1e549d7
--- /dev/null
+++ b/.github/scripts/verifyRedirect.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# HelpDot - Verifies that redirects.csv does not have any duplicates
+# Duplicate sourceURLs break redirection on cloudflare pages
+
+duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' ../../docs/redirects.csv)
+
+if [[ -z "$duplicates" ]]; then
+    exit 0
+fi
+
+echo $duplicates
+exit 1

From 719b54fc3243af963b9d12c44e0c39343c1c3cbc Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 18 Apr 2024 01:40:17 +0530
Subject: [PATCH 366/383] add workflow to validate redirects.csv

---
 .github/scripts/verifyRedirect.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh
index 6b33a1e549d7..89f3ea8dc8bb 100644
--- a/.github/scripts/verifyRedirect.sh
+++ b/.github/scripts/verifyRedirect.sh
@@ -3,7 +3,7 @@
 # HelpDot - Verifies that redirects.csv does not have any duplicates
 # Duplicate sourceURLs break redirection on cloudflare pages
 
-duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' ../../docs/redirects.csv)
+duplicates=$(awk -F, 'a[$1]++{print "duplicate sourceURLs are not allowed: " $1}' ../../docs/redirects.csv)
 
 if [[ -z "$duplicates" ]]; then
     exit 0

From f785d1774439a80a1ee812815f72f395da0756fd Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 18 Apr 2024 01:51:30 +0530
Subject: [PATCH 367/383] fix path

---
 .github/scripts/verifyRedirect.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh
index 89f3ea8dc8bb..800f8d86f73d 100644
--- a/.github/scripts/verifyRedirect.sh
+++ b/.github/scripts/verifyRedirect.sh
@@ -3,7 +3,7 @@
 # HelpDot - Verifies that redirects.csv does not have any duplicates
 # Duplicate sourceURLs break redirection on cloudflare pages
 
-duplicates=$(awk -F, 'a[$1]++{print "duplicate sourceURLs are not allowed: " $1}' ../../docs/redirects.csv)
+duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' docs/redirects.csv)
 
 if [[ -z "$duplicates" ]]; then
     exit 0

From 99ee30dc265e50cadf184cbdf03d26f40a64537c Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 18 Apr 2024 01:52:28 +0530
Subject: [PATCH 368/383] ready only

---
 .github/scripts/verifyRedirect.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh
index 800f8d86f73d..9d8e19d0128f 100644
--- a/.github/scripts/verifyRedirect.sh
+++ b/.github/scripts/verifyRedirect.sh
@@ -3,7 +3,9 @@
 # HelpDot - Verifies that redirects.csv does not have any duplicates
 # Duplicate sourceURLs break redirection on cloudflare pages
 
-duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' docs/redirects.csv)
+declare -r REDIRECTS_FILE="docs/redirects.csv"
+
+duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' $REDIRECTS_FILE)
 
 if [[ -z "$duplicates" ]]; then
     exit 0

From 02a3b824db255f5fd4a1fdebd9a14b8fb3940f39 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 18 Apr 2024 01:55:05 +0530
Subject: [PATCH 369/383] err msg

---
 .github/scripts/verifyRedirect.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh
index 9d8e19d0128f..737d9bffacf9 100644
--- a/.github/scripts/verifyRedirect.sh
+++ b/.github/scripts/verifyRedirect.sh
@@ -5,11 +5,11 @@
 
 declare -r REDIRECTS_FILE="docs/redirects.csv"
 
-duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' $REDIRECTS_FILE)
+duplicates=$(awk -F, 'a[$1]++{print $1}' $REDIRECTS_FILE)
 
 if [[ -z "$duplicates" ]]; then
     exit 0
 fi
 
-echo $duplicates
+echo "duplicate redirects are not allowed: $duplicates"
 exit 1

From 89e3173f4415358c9542fc060be005cc933f63c4 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:26:52 -0700
Subject: [PATCH 370/383] Revert "[CP Staging] feat: change new arch flash list
 to interop"

---
 ios/Podfile.lock                        |   19 +-
 patches/@shopify+flash-list+1.6.3.patch | 1314 +++++++++++++++++++++++
 react-native.config.js                  |    6 +-
 3 files changed, 1334 insertions(+), 5 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 5a8c67088f16..f564bfd931e4 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1793,7 +1793,24 @@ PODS:
     - React-Core
     - RNFBApp
   - RNFlashList (1.6.3):
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - RNFS (2.20.0):
     - React-Core
   - RNGestureHandler (2.14.1):
@@ -2543,7 +2560,7 @@ SPEC CHECKSUMS:
   RNFBApp: 729c0666395b1953198dc4a1ec6deb8fbe1c302e
   RNFBCrashlytics: 2061ca863e8e2fa1aae9b12477d7dfa8e88ca0f9
   RNFBPerf: 389914cda4000fe0d996a752532a591132cbf3f9
-  RNFlashList: 4b4b6b093afc0df60ae08f9cbf6ccd4c836c667a
+  RNFlashList: 5b0e8311e4cf1ad91e410fd7c8526a89fb5826d1
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 1190c218cdaaf029ee1437076a3fbbc3297d89fb
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
diff --git a/patches/@shopify+flash-list+1.6.3.patch b/patches/@shopify+flash-list+1.6.3.patch
index 92308913026b..4910bb20b4ec 100644
--- a/patches/@shopify+flash-list+1.6.3.patch
+++ b/patches/@shopify+flash-list+1.6.3.patch
@@ -1,3 +1,700 @@
+diff --git a/node_modules/@shopify/flash-list/CHANGELOG.md b/node_modules/@shopify/flash-list/CHANGELOG.md
+deleted file mode 100644
+index 9c6bc58..0000000
+--- a/node_modules/@shopify/flash-list/CHANGELOG.md
++++ /dev/null
+@@ -1,279 +0,0 @@
+-# Changelog
+-
+-All notable changes to this project will be documented in this file.
+-
+-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+-and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+-
+-## [Unreleased]
+-
+-## [1.6.3] - 2023-11-09
+-
+-- Changes for RN 0.73 support
+-  - https://github.com/Shopify/flash-list/pull/930
+-
+-## [1.6.2] - 2023-10-19
+-
+-- Move shouldRefreshWithAnchoring configuration so it is possible to disable it from outside FlashList by invalidating layout
+-  - https://github.com/Shopify/flash-list/pull/935
+-
+-## [1.6.1] - 2023-09-14
+-
+-- Prevent an expired layout provider from being used again
+-  - https://github.com/Shopify/flash-list/pull/915
+-
+-## [1.6.0] - 2023-09-13
+-
+-- Update types to match `react-native@0.72` view types.
+-  - https://github.com/Shopify/flash-list/pull/890
+-- Add option to clear cached layouts on update
+-  - https://github.com/Shopify/flash-list/pull/910
+-
+-## [1.5.0] - 2023-07-12
+-
+-- Update kotlin version to 1.8.10 for RN 0.72 compatibility
+-  - https://github.com/Shopify/flash-list/pull/865
+-
+-## [1.4.3] - 2023-04-24
+-
+-- Fix definition conflicts with previous value
+-  - https://github.com/Shopify/flash-list/pull/795
+-- Fix Android unit test
+-  - https://github.com/Shopify/flash-list/pull/815
+-- Fix performance issues with inverted lists on Android
+-  - https://github.com/Shopify/flash-list/pull/819
+-
+-## [1.4.2] - 2023-03-20
+-
+-- Apply layout correction only to consecutive cells
+-  - https://github.com/Shopify/flash-list/pull/788
+-
+-## [1.4.1] - 2023-01-24
+-
+-- Prevent overflow of sticky headers
+-  - https://github.com/Shopify/flash-list/pull/714
+-- Skip footer correction when layout correction is skipped
+-  - https://github.com/Shopify/flash-list/pull/743
+-
+-## [1.4.0] - 2022-11-07
+-
+-- Add content padding support to FlashList
+-  - https://github.com/Shopify/flash-list/pull/626
+-- Upgrade recyclerlistview to v4.2.0
+-  - https://github.com/Shopify/flash-list/pull/660
+-
+-## [1.3.1] - 2022-10-11
+-
+-- Expose `columnIndex` and `columnSpan` to `MasonryFlashList.renderItem`
+-  - https://github.com/Shopify/flash-list/pull/625
+-
+-## [1.3.0] - 2022-09-26
+-
+-- Added `MasonryFlashList` which adds support for rendering masonry layouts
+-  - https://github.com/Shopify/flash-list/pull/587
+-
+-## [1.2.2] - 2022-09-06
+-
+-- Fixes type checking error in `AutoLayoutView` due to `children` not being an explicit type
+-  - https://github.com/Shopify/flash-list/pull/567
+-
+-## [1.2.1] - 2022-08-03
+-
+-- Fixed crash when `estimatedListSize` is used in an empty list
+-  - https://github.com/Shopify/flash-list/pull/546
+-
+-## [1.2.0] - 2022-07-18
+-
+-- Fixed out of bound read from data
+-  - https://github.com/Shopify/flash-list/pull/523
+-- Added JS only fallbacks for unsupported platforms
+-  - https://github.com/Shopify/flash-list/pull/518
+-- Added footer correction in AutoLayoutView
+-  - https://github.com/Shopify/flash-list/pull/519
+-- Added `viewPosition` and `viewOffset` support scrollTo methods
+-  - https://github.com/Shopify/flash-list/pull/521
+-- Fix inverted mode while being horizontal
+-  - https://github.com/Shopify/flash-list/pull/520
+-- Upgrade recyclerlistview to v4.1.1
+-  - https://github.com/Shopify/flash-list/pull/526
+-
+-## [1.1.0] - 2022-07-06
+-
+-- Added render target info to `renderItem` callback
+-  - https://github.com/Shopify/flash-list/pull/454
+-- Add Apple TV support
+-  - https://github.com/Shopify/flash-list/pull/511
+-- Clarify installation instructions in Expo projects
+-  - https://github.com/Shopify/flash-list/pull/497
+-- Upgrade recyclerlistview to v4.0.1
+-  - https://github.com/Shopify/flash-list/pull/507
+-- Add tslib as a dependency
+-  - https://github.com/Shopify/flash-list/pull/514
+-
+-## [1.0.4] - 2022-07-02
+-
+-- Build fix for Android projects having `kotlinVersion` defined in `build.gradle`.
+-- Allow providing an external scrollview.
+-  - https://github.com/Shopify/flash-list/pull/502
+-
+-## [1.0.3] - 2022-07-01
+-
+-- Add kotlin-gradle-plugin to buildscript in project build.gradle
+-  - https://github.com/Shopify/flash-list/pull/481
+-
+-## [1.0.2] - 2022-06-30
+-
+-- Minor changes
+-
+-## [1.0.1] - 2022-06-30
+-
+-- `data` prop change will force update items only if `renderItem` is also updated
+-  - https://github.com/Shopify/flash-list/pull/453
+-
+-## [1.0.0] - 2022-06-17
+-
+-- Upgrade recyclerlistview to v3.3.0-beta.2
+-  - https://github.com/Shopify/flash-list/pull/445
+-- Added web support
+-  - https://github.com/Shopify/flash-list/pull/444
+-- Added `disableAutoLayout` prop to prevent conflicts with custom `CellRendererComponent`
+-  - https://github.com/Shopify/flash-list/pull/452
+-
+-## [0.6.1] - 2022-05-26
+-
+-- Fix amending layout on iOS
+-  - https://github.com/Shopify/flash-list/pull/412
+-- Define `FlashList` props previously inherited from `VirtualizedList` and `FlatList` explicitly
+-  - https://github.com/Shopify/flash-list/pull/386
+-- Make `estimatedItemSize` optional
+-  - https://github.com/Shopify/flash-list/pull/378
+-- Change `overrideItemType` prop name to `getItemType`
+-  - https://github.com/Shopify/flash-list/pull/369
+-- Added `useBlankAreaTracker` hook for tracking blank area in production
+-  - https://github.com/Shopify/flash-list/pull/411
+-- Added `CellRendererComponent` prop
+-  - https://github.com/Shopify/flash-list/pull/362
+-- Added automatic height measurement for horizontal lists even when parent isn't deterministic
+-  - https://github.com/Shopify/flash-list/pull/409
+-
+-## [0.5.0] - 2022-04-29
+-
+-- Fix finding props with testId
+-  - https://github.com/Shopify/flash-list/pull/357
+-- Reuse cached layouts on orientation change
+-  - https://github.com/Shopify/flash-list/pull/319
+-
+-## [0.4.6] - 2022-04-13
+-
+-- Match FlashList's empty list behavior with FlatList
+-  - https://github.com/Shopify/flash-list/pull/312
+-
+-## [0.4.5] - 2022-04-13
+-
+-- Upgrade recyclerlistview to v3.2.0-beta.4
+-
+-  - https://github.com/Shopify/flash-list/pull/315
+-
+-- Add viewability callbacks
+-
+-  - https://github.com/Shopify/flash-list/pull/301
+-
+-- Calculate average item sizes automatically
+-  - https://github.com/Shopify/flash-list/pull/296
+-
+-## [0.4.4] - 2022-04-06
+-
+-- Fix `FlashList` mock when no data is provided
+-  - https://github.com/Shopify/flash-list/pull/295
+-
+-## [0.4.3] - 2022-04-04
+-
+-- Reduce number of render item calls
+-
+-  - https://github.com/Shopify/flash-list/pull/253
+-
+-- Upgrade recyclerlistview to v3.2.0-beta.2
+-  - https://github.com/Shopify/flash-list/pull/284
+-
+-## [0.4.2] - 2022-04-04
+-
+-- Minor changes
+-
+-## [0.4.1] - 2022-03-29
+-
+-- Crash fix for android activity switching (#256)
+-
+-  - https://github.com/Shopify/flash-list/pull/257
+-
+-- initialScrollIndex, scrollTo methods will now account for size of header
+-
+-  - https://github.com/Shopify/flash-list/pull/194
+-
+-- Added a new mock for easier testing of components with `FlashList`
+-  - https://github.com/Shopify/flash-list/pull/236
+-
+-## [0.4.0] - 2022-03-23
+-
+-- Add support for layout animations
+-
+-  - https://github.com/Shopify/flash-list/pull/183
+-
+-- Suppress recyclerlistview's bounded size exception for some missing cases.
+-
+-  - https://github.com/Shopify/flash-list/pull/192
+-
+-- Expose reference to recyclerlistview and firstItemOffset
+-
+-  - https://github.com/Shopify/flash-list/pull/217
+-
+-- recyclerlistview upgraded to v3.1.0-alpha.9
+-  - https://github.com/Shopify/flash-list/pull/227
+-
+-## [0.3.3] - 2022-03-16
+-
+-- Prevent implicit scroll to top on device orientation change
+-- Change recyclerlistview's bounded size exception to a warning
+-  - https://github.com/Shopify/flash-list/pull/187
+-
+-## [0.3.2] - 2022-03-15
+-
+-- Minor changes
+-
+-## [0.3.1] - 2022-03-15
+-
+-- Revert react-native-safe-area upgrade and minSdkVersion bump
+-  - https://github.com/Shopify/flash-list/pull/184
+-
+-## [0.3.0] - 2022-03-15
+-
+-- Fixed untranspiled library code by enforcing stricter TS rules.
+-  - https://github.com/Shopify/flash-list/pull/181
+-
+-## [0.2.4] - 2022-03-14
+-
+-- Added `onLoad` event that is called once the list has rendered items. This is required because FlashList doesn't render items in the first cycle.
+-  - https://github.com/Shopify/flash-list/pull/180
+-
+-## [0.2.3] - 2022-03-10
+-
+-- Fixing publish steps for transpiled code
+-  - https://github.com/Shopify/flash-list/pull/150
+-
+-## [0.2.2] - 2022-03-10
+-
+-- Fixing publish steps for transpiled code
+-  - https://github.com/Shopify/flash-list/pull/149
+-
+-## [0.2.1] - 2022-03-09
+-
+-- Bug fix for style and last separator
+-  - https://github.com/Shopify/flash-list/pull/141
+-
+-## [0.2.0] - 2022-03-08
+-
+-- Rename the component from `RecyclerFlatList` to `FlashList`
+-  - https://github.com/Shopify/flash-list/pull/140
+-
+-## [0.1.0] - 2022-03-02
+-
+-- Initial release
+diff --git a/node_modules/@shopify/flash-list/RNFlashList.podspec b/node_modules/@shopify/flash-list/RNFlashList.podspec
+index 38ff029..a749f6c 100644
+--- a/node_modules/@shopify/flash-list/RNFlashList.podspec
++++ b/node_modules/@shopify/flash-list/RNFlashList.podspec
+@@ -9,14 +9,20 @@ Pod::Spec.new do |s|
+   s.homepage         = package['homepage']
+   s.license          = package['license']
+   s.author           = package['author']
+-  s.platforms        = { :ios => '11.0', :tvos => '12.0' }
+   s.source           = { git: 'https://github.com/shopify/flash-list.git', tag: "v#{s.version}" }
+   s.source_files     = 'ios/Sources/**/*'
+   s.requires_arc     = true
+   s.swift_version    = '5.0'
++  s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D RCT_NEW_ARCH_ENABLED', }
+ 
+-  # Dependencies
+-  s.dependency 'React-Core'
++  if defined?(install_modules_dependencies()) != nil
++    install_modules_dependencies(s)
++    s.ios.deployment_target = "12.4"
++    s.platforms        = { :ios => '12.4', :tvos => '12.0' }
++  else
++    s.dependency "React-Core"
++    s.platforms        = { :ios => '11.0', :tvos => '12.0' }
++  end
+ 
+   # Tests spec
+   s.test_spec 'Tests' do |test_spec|
+diff --git a/node_modules/@shopify/flash-list/android/build.gradle b/node_modules/@shopify/flash-list/android/build.gradle
+index bed08cd..bad4465 100644
+--- a/node_modules/@shopify/flash-list/android/build.gradle
++++ b/node_modules/@shopify/flash-list/android/build.gradle
+@@ -1,7 +1,14 @@
+-apply plugin: 'com.android.library'
++def isNewArchitectureEnabled() {
++    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
++}
+ 
++apply plugin: 'com.android.library'
+ apply plugin: 'kotlin-android'
+ 
++if (isNewArchitectureEnabled()) {
++    apply plugin: 'com.facebook.react'
++}
++
+ def _ext = rootProject.ext
+ 
+ def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+'
+@@ -40,11 +47,19 @@ android {
+         debug.java.srcDirs += 'src/debug/kotlin'
+         test.java.srcDirs += 'src/test/kotlin'
+         androidTest.java.srcDirs += 'src/androidTest/kotlin'
++
++        if (isNewArchitectureEnabled()) {
++            main.java.srcDirs += ["${project.buildDir}/generated/source/codegen/java"]
++            main.java.srcDirs += ["src/fabric/java"]
++        } else {
++            main.java.srcDirs += ['src/paper/java']
++        }
+     }
+ 
+     defaultConfig {
+         minSdkVersion _minSdkVersion
+         targetSdkVersion _targetSdkVersion
++        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+         versionCode 1
+         versionName "1.0"
+         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+@@ -61,7 +76,7 @@ android {
+ 
+ dependencies {
+     compileOnly "com.facebook.react:react-native:${_reactNativeVersion}"
+-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${_kotlinVersion}"
++    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${_kotlinVersion}"
+     testImplementation "junit:junit:${_junitVersion}"
+     testImplementation "org.mockito.kotlin:mockito-kotlin:${_mockitoVersion}"
+     testImplementation "org.mockito:mockito-inline:${_mockitoVersion}"
+diff --git a/node_modules/@shopify/flash-list/android/src/fabric/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt b/node_modules/@shopify/flash-list/android/src/fabric/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
+new file mode 100644
+index 0000000..6e850fe
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/android/src/fabric/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
+@@ -0,0 +1,12 @@
++package com.shopify.reactnative.flash_list
++
++import com.facebook.react.bridge.ReactContext
++import com.facebook.react.fabric.FabricUIManager
++import com.facebook.react.uimanager.UIManagerHelper
++import com.facebook.react.uimanager.common.UIManagerType
++import com.facebook.react.bridge.WritableMap
++
++fun ReactContext.dispatchEvent(nativeTag: Int, eventName: String, event: WritableMap) {
++    val fabricUIManager = UIManagerHelper.getUIManager(this, UIManagerType.FABRIC) as FabricUIManager
++    fabricUIManager.receiveEvent(nativeTag, eventName, event)
++}
+diff --git a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt
+index 4571798..c6c3cce 100644
+--- a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt
++++ b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutView.kt
+@@ -2,8 +2,6 @@ package com.shopify.reactnative.flash_list
+ 
+ import android.content.Context
+ import android.graphics.Canvas
+-import android.util.DisplayMetrics
+-import android.util.Log
+ import android.view.View
+ import android.view.ViewGroup
+ import android.widget.HorizontalScrollView
+@@ -11,7 +9,6 @@ import android.widget.ScrollView
+ import com.facebook.react.bridge.Arguments
+ import com.facebook.react.bridge.ReactContext
+ import com.facebook.react.bridge.WritableMap
+-import com.facebook.react.uimanager.events.RCTEventEmitter
+ import com.facebook.react.views.view.ReactViewGroup
+ 
+ 
+@@ -142,9 +139,8 @@ class AutoLayoutView(context: Context) : ReactViewGroup(context) {
+         val event: WritableMap = Arguments.createMap()
+         event.putDouble("offsetStart", alShadow.blankOffsetAtStart / pixelDensity)
+         event.putDouble("offsetEnd", alShadow.blankOffsetAtEnd / pixelDensity)
++
+         val reactContext = context as ReactContext
+-        reactContext
+-                .getJSModule(RCTEventEmitter::class.java)
+-                .receiveEvent(id, "onBlankAreaEvent", event)
++        reactContext.dispatchEvent(id, "onBlankAreaEvent", event)
+     }
+ }
+diff --git a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt
+index b646f09..7bda0ea 100644
+--- a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt
++++ b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/AutoLayoutViewManager.kt
+@@ -3,15 +3,22 @@ package com.shopify.reactnative.flash_list
+ import com.facebook.react.module.annotations.ReactModule
+ import com.facebook.react.uimanager.ThemedReactContext
+ import com.facebook.react.uimanager.annotations.ReactProp
+-import com.facebook.react.views.view.ReactViewGroup
+-import com.facebook.react.views.view.ReactViewManager
++import com.facebook.react.uimanager.ViewGroupManager
++import com.facebook.react.uimanager.ViewManagerDelegate
++import com.facebook.react.viewmanagers.AutoLayoutViewManagerDelegate
++import com.facebook.react.viewmanagers.AutoLayoutViewManagerInterface
+ import com.facebook.react.common.MapBuilder
+ import kotlin.math.roundToInt
+ 
+ /** ViewManager for AutoLayoutView - Container for all RecyclerListView children. Automatically removes all gaps and overlaps for GridLayouts with flexible spans.
+  * Note: This cannot work for masonry layouts i.e, pinterest like layout */
+ @ReactModule(name = AutoLayoutViewManager.REACT_CLASS)
+-class AutoLayoutViewManager: ReactViewManager() {
++class AutoLayoutViewManager: ViewGroupManager<AutoLayoutView>(), AutoLayoutViewManagerInterface<AutoLayoutView> {
++    private val mDelegate: ViewManagerDelegate<AutoLayoutView>
++
++    init {
++        mDelegate = AutoLayoutViewManagerDelegate(this)
++    }
+ 
+     companion object {
+         const val REACT_CLASS = "AutoLayoutView"
+@@ -21,45 +28,42 @@ class AutoLayoutViewManager: ReactViewManager() {
+         return REACT_CLASS
+     }
+ 
+-    override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
++    override fun createViewInstance(context: ThemedReactContext): AutoLayoutView {
+         return AutoLayoutView(context).also { it.pixelDensity = context.resources.displayMetrics.density.toDouble() }
+     }
+ 
+-    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
+-        return MapBuilder.builder<String, Any>().put(
+-                "onBlankAreaEvent",
+-                MapBuilder.of(
+-                        "registrationName", "onBlankAreaEvent")
+-        ).build();
+-    }
++    override fun getExportedCustomDirectEventTypeConstants() = mutableMapOf(
++        "onBlankAreaEvent" to mutableMapOf("registrationName" to "onBlankAreaEvent"),
++        "topOnBlankAreaEvent" to mutableMapOf("registrationName" to "onBlankAreaEvent"),
++    )
+ 
+     @ReactProp(name = "horizontal")
+-    fun setHorizontal(view: AutoLayoutView, isHorizontal: Boolean) {
++    override fun setHorizontal(view: AutoLayoutView, isHorizontal: Boolean) {
+         view.alShadow.horizontal = isHorizontal
+     }
+ 
+     @ReactProp(name = "disableAutoLayout")
+-    fun setDisableAutoLayout(view: AutoLayoutView, disableAutoLayout: Boolean) {
++    override fun setDisableAutoLayout(view: AutoLayoutView, disableAutoLayout: Boolean) {
+         view.disableAutoLayout = disableAutoLayout
+     }
+ 
+     @ReactProp(name = "scrollOffset")
+-    fun setScrollOffset(view: AutoLayoutView, scrollOffset: Double) {
++    override fun setScrollOffset(view: AutoLayoutView, scrollOffset: Double) {
+         view.alShadow.scrollOffset = convertToPixelLayout(scrollOffset, view.pixelDensity)
+     }
+ 
+     @ReactProp(name = "windowSize")
+-    fun setWindowSize(view: AutoLayoutView, windowSize: Double) {
++    override fun setWindowSize(view: AutoLayoutView, windowSize: Double) {
+         view.alShadow.windowSize = convertToPixelLayout(windowSize, view.pixelDensity)
+     }
+ 
+     @ReactProp(name = "renderAheadOffset")
+-    fun setRenderAheadOffset(view: AutoLayoutView, renderOffset: Double) {
++    override fun setRenderAheadOffset(view: AutoLayoutView, renderOffset: Double) {
+         view.alShadow.renderOffset = convertToPixelLayout(renderOffset, view.pixelDensity)
+     }
+ 
+     @ReactProp(name = "enableInstrumentation")
+-    fun setEnableInstrumentation(view: AutoLayoutView, enableInstrumentation: Boolean) {
++    override fun setEnableInstrumentation(view: AutoLayoutView, enableInstrumentation: Boolean) {
+         view.enableInstrumentation = enableInstrumentation
+     }
+ 
+diff --git a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt
+index 1434caa..590ba1d 100644
+--- a/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt
++++ b/node_modules/@shopify/flash-list/android/src/main/kotlin/com/shopify/reactnative/flash_list/CellContainerManager.kt
+@@ -2,12 +2,20 @@ package com.shopify.reactnative.flash_list
+ 
+ import com.facebook.react.module.annotations.ReactModule
+ import com.facebook.react.uimanager.ThemedReactContext
++import com.facebook.react.uimanager.ViewGroupManager
++import com.facebook.react.uimanager.ViewManagerDelegate
+ import com.facebook.react.uimanager.annotations.ReactProp
+-import com.facebook.react.views.view.ReactViewGroup
+-import com.facebook.react.views.view.ReactViewManager
++import com.facebook.react.viewmanagers.CellContainerManagerDelegate
++import com.facebook.react.viewmanagers.CellContainerManagerInterface
+ 
+ @ReactModule(name = AutoLayoutViewManager.REACT_CLASS)
+-class CellContainerManager: ReactViewManager() {
++class CellContainerManager: ViewGroupManager<CellContainerImpl>(), CellContainerManagerInterface<CellContainerImpl> {
++    private val mDelegate: ViewManagerDelegate<CellContainerImpl>
++
++    init {
++        mDelegate = CellContainerManagerDelegate(this);
++    }
++
+     companion object {
+         const val REACT_CLASS = "CellContainer"
+     }
+@@ -16,12 +24,12 @@ class CellContainerManager: ReactViewManager() {
+         return REACT_CLASS
+     }
+ 
+-    override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
++    override fun createViewInstance(context: ThemedReactContext): CellContainerImpl {
+         return CellContainerImpl(context)
+     }
+ 
+     @ReactProp(name = "index")
+-    fun setIndex(view: CellContainerImpl, index: Int) {
++    override fun setIndex(view: CellContainerImpl, index: Int) {
+         view.index = index
+     }
+ }
+diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
+new file mode 100644
+index 0000000..4c90807
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
+@@ -0,0 +1,46 @@
++/**
++* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
++*
++* Do not edit this file as changes may cause incorrect behavior and will be lost
++* once the code is regenerated.
++*
++* @generated by codegen project: GeneratePropsJavaDelegate.js
++*/
++
++package com.facebook.react.viewmanagers;
++
++import android.view.View;
++import androidx.annotation.Nullable;
++import com.facebook.react.uimanager.BaseViewManagerDelegate;
++import com.facebook.react.uimanager.BaseViewManagerInterface;
++
++public class AutoLayoutViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AutoLayoutViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
++  public AutoLayoutViewManagerDelegate(U viewManager) {
++    super(viewManager);
++  }
++  @Override
++  public void setProperty(T view, String propName, @Nullable Object value) {
++    switch (propName) {
++      case "horizontal":
++        mViewManager.setHorizontal(view, value == null ? false : (boolean) value);
++        break;
++      case "scrollOffset":
++        mViewManager.setScrollOffset(view, value == null ? 0f : ((Double) value).doubleValue());
++        break;
++      case "windowSize":
++        mViewManager.setWindowSize(view, value == null ? 0f : ((Double) value).doubleValue());
++        break;
++      case "renderAheadOffset":
++        mViewManager.setRenderAheadOffset(view, value == null ? 0f : ((Double) value).doubleValue());
++        break;
++      case "enableInstrumentation":
++        mViewManager.setEnableInstrumentation(view, value == null ? false : (boolean) value);
++        break;
++      case "disableAutoLayout":
++        mViewManager.setDisableAutoLayout(view, value == null ? false : (boolean) value);
++        break;
++      default:
++        super.setProperty(view, propName, value);
++    }
++  }
++}
+diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerInterface.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerInterface.java
+new file mode 100644
+index 0000000..8ad2622
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerInterface.java
+@@ -0,0 +1,21 @@
++/**
++* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
++*
++* Do not edit this file as changes may cause incorrect behavior and will be lost
++* once the code is regenerated.
++*
++* @generated by codegen project: GeneratePropsJavaInterface.js
++*/
++
++package com.facebook.react.viewmanagers;
++
++import android.view.View;
++
++public interface AutoLayoutViewManagerInterface<T extends View> {
++  void setHorizontal(T view, boolean value);
++  void setScrollOffset(T view, double value);
++  void setWindowSize(T view, double value);
++  void setRenderAheadOffset(T view, double value);
++  void setEnableInstrumentation(T view, boolean value);
++  void setDisableAutoLayout(T view, boolean value);
++}
+diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
+new file mode 100644
+index 0000000..2b64af7
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
+@@ -0,0 +1,31 @@
++/**
++* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
++*
++* Do not edit this file as changes may cause incorrect behavior and will be lost
++* once the code is regenerated.
++*
++* @generated by codegen project: GeneratePropsJavaDelegate.js
++*/
++
++package com.facebook.react.viewmanagers;
++
++import android.view.View;
++import androidx.annotation.Nullable;
++import com.facebook.react.uimanager.BaseViewManagerDelegate;
++import com.facebook.react.uimanager.BaseViewManagerInterface;
++
++public class CellContainerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & CellContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
++  public CellContainerManagerDelegate(U viewManager) {
++    super(viewManager);
++  }
++  @Override
++  public void setProperty(T view, String propName, @Nullable Object value) {
++    switch (propName) {
++      case "index":
++        mViewManager.setIndex(view, value == null ? 0 : ((Double) value).intValue());
++        break;
++      default:
++        super.setProperty(view, propName, value);
++    }
++  }
++}
+diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerInterface.java b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerInterface.java
+new file mode 100644
+index 0000000..b37ddbd
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerInterface.java
+@@ -0,0 +1,16 @@
++/**
++* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
++*
++* Do not edit this file as changes may cause incorrect behavior and will be lost
++* once the code is regenerated.
++*
++* @generated by codegen project: GeneratePropsJavaInterface.js
++*/
++
++package com.facebook.react.viewmanagers;
++
++import android.view.View;
++
++public interface CellContainerManagerInterface<T extends View> {
++  void setIndex(T view, int value);
++}
+diff --git a/node_modules/@shopify/flash-list/android/src/paper/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt b/node_modules/@shopify/flash-list/android/src/paper/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
+new file mode 100644
+index 0000000..b867c18
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/android/src/paper/java/com/shopify/reactnative/flash_list/ReactContextExtensions.kt
+@@ -0,0 +1,10 @@
++package com.shopify.reactnative.flash_list
++
++import com.facebook.react.bridge.ReactContext
++import com.facebook.react.uimanager.events.RCTEventEmitter
++import com.facebook.react.bridge.WritableMap
++
++fun ReactContext.dispatchEvent(nativeTag: Int, eventName: String, event: WritableMap) {
++    this.getJSModule(RCTEventEmitter::class.java)
++        .receiveEvent(nativeTag, eventName, event)
++}
 diff --git a/node_modules/@shopify/flash-list/dist/FlashList.d.ts b/node_modules/@shopify/flash-list/dist/FlashList.d.ts
 index ed81d7d..1e24103 100644
 --- a/node_modules/@shopify/flash-list/dist/FlashList.d.ts
@@ -10,6 +707,15 @@ index ed81d7d..1e24103 100644
      /**
       * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
       * Warning: We may swap recyclerlistview for something else in the future. Use with caution.
+diff --git a/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map b/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map
+index 97c8cc6..a915a05 100644
+--- a/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map
++++ b/node_modules/@shopify/flash-list/dist/FlashList.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"FlashList.d.ts","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAEL,YAAY,EAEZ,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAKxE,OAAO,EACL,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAoB1B,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9C;AAED,UAAU,SAAS,CAAC,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,CAAC;CACX;AAED,cAAM,SAAS,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,aAAa,CAC5C,cAAc,CAAC,CAAC,CAAC,EACjB,cAAc,CAAC,CAAC,CAAC,CAClB;IACC,OAAO,CAAC,MAAM,CAAC,CAA+C;IAC9D,OAAO,CAAC,yBAAyB,CAAC,CAAuB;IACzD,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,wBAAwB,CACkB;IAElD,OAAO,CAAC,kBAAkB,CAAK;IAC/B,OAAO,CAAC,YAAY,CAKlB;IAEF,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,sBAAsB,CAQ5B;IAEF,OAAO,CAAC,iBAAiB,CAAC,CAAgC;IAC1D,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,kBAAkB,CAAwB;IAElD,OAAO,CAAC,YAAY,CAAC,CAAmB;IAExC,MAAM,CAAC,YAAY;;;MAGjB;gBAEU,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;IAmBpC,OAAO,CAAC,aAAa;IAgCrB,MAAM,CAAC,wBAAwB,CAAC,CAAC,EAC/B,SAAS,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EACtC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,GAC3B,cAAc,CAAC,CAAC,CAAC;IAqCpB,OAAO,CAAC,MAAM,CAAC,sBAAsB;IA2BrC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IA0ChC,OAAO,CAAC,YAAY,CAElB;IAEF,OAAO,CAAC,iBAAiB,CAUvB;IAEF,iBAAiB;IAMjB,oBAAoB;IAQpB,MAAM;IAmGN,OAAO,CAAC,iBAAiB,CAKvB;IAEF,OAAO,CAAC,QAAQ,CAId;IAEF,OAAO,CAAC,gCAAgC;IAaxC,OAAO,CAAC,8BAA8B;IAOtC,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,gBAAgB,CAetB;IAEF,OAAO,CAAC,SAAS,CAsCf;IAEF,OAAO,CAAC,aAAa,CAwBnB;IAEF,OAAO,CAAC,wBAAwB,CAU9B;IAEF,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,SAAS,CAqBf;IAEF,OAAO,CAAC,MAAM,CAiBZ;IAEF,OAAO,CAAC,MAAM,CAqBZ;IAEF,OAAO,CAAC,gCAAgC,CAYtC;IAEF,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,qBAAqB,CAO3B;IAEF,OAAO,CAAC,iBAAiB,CAEvB;IAEF,OAAO,CAAC,oBAAoB,CAQ1B;IAEF;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,qBAAqB,CAgB3B;IAEF,OAAO,CAAC,WAAW,CAEjB;IAEF,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,yBAAyB,CAc/B;IAEF,OAAO,KAAK,eAAe,GAG1B;IAED,OAAO,CAAC,YAAY,CAIlB;IAEF,OAAO,CAAC,wBAAwB,CAQ9B;IAEF,OAAO,CAAC,cAAc,CAqBpB;IAEF,OAAO,CAAC,oBAAoB,CAK1B;IAEF;;;;;OAKG;IACI,+BAA+B,IAAI,IAAI;IAWvC,WAAW,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE;IAI9D,aAAa,CAAC,MAAM,EAAE;QAC3B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACnC;IAwBM,YAAY,CAAC,MAAM,EAAE;QAC1B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,IAAI,EAAE,GAAG,CAAC;QACV,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IAOM,cAAc,CAAC,MAAM,EAAE;QAC5B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,MAAM,EAAE,MAAM,CAAC;KAChB;IAMM,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIzC;;;OAGG;IAEH,IAAW,uBAAuB,6DAEjC;IAED;;OAEG;IACH,IAAW,eAAe,WAEzB;IAED;;OAEG;IACI,wBAAwB;IAI/B;;;OAGG;IACI,iBAAiB,aAEtB;CACH;AAED,eAAe,SAAS,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"FlashList.d.ts","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAEL,YAAY,EAEZ,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAKxE,OAAO,EACL,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAoB1B,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9C;AAED,UAAU,SAAS,CAAC,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,CAAC;CACX;AAED,cAAM,SAAS,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,aAAa,CAC5C,cAAc,CAAC,CAAC,CAAC,EACjB,cAAc,CAAC,CAAC,CAAC,CAClB;IACC,OAAO,CAAC,MAAM,CAAC,CAA+C;IAC9D,OAAO,CAAC,yBAAyB,CAAC,CAAuB;IACzD,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,wBAAwB,CACkB;IAElD,OAAO,CAAC,kBAAkB,CAAK;IAC/B,OAAO,CAAC,YAAY,CAKlB;IAEF,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,sBAAsB,CAQ5B;IAEF,OAAO,CAAC,iBAAiB,CAAC,CAAgC;IAC1D,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,kBAAkB,CAAwB;IAElD,OAAO,CAAC,YAAY,CAAC,CAAmB;IAExC,MAAM,CAAC,YAAY;;;MAGjB;gBAEU,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;IAmBpC,OAAO,CAAC,aAAa;IAgCrB,MAAM,CAAC,wBAAwB,CAAC,CAAC,EAC/B,SAAS,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EACtC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,GAC3B,cAAc,CAAC,CAAC,CAAC;IAqCpB,OAAO,CAAC,MAAM,CAAC,sBAAsB;IA2BrC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IA0ChC,OAAO,CAAC,YAAY,CAElB;IAEF,OAAO,CAAC,iBAAiB,CAUvB;IAEF,iBAAiB;IAMjB,oBAAoB;IAQpB,MAAM;IAmGN,OAAO,CAAC,iBAAiB,CAKvB;IAEF,OAAO,CAAC,QAAQ,CAId;IAEF,OAAO,CAAC,gCAAgC;IAaxC,OAAO,CAAC,8BAA8B;IAOtC,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,gBAAgB,CAetB;IAEF,OAAO,CAAC,SAAS,CAsCf;IAEF,OAAO,CAAC,aAAa,CAwBnB;IAEF,OAAO,CAAC,wBAAwB,CAU9B;IAEF,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,SAAS,CAqBf;IAEF,OAAO,CAAC,MAAM,CAiBZ;IAEF,OAAO,CAAC,MAAM,CAqBZ;IAEF,OAAO,CAAC,gCAAgC,CAYtC;IAEF,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,qBAAqB,CAO3B;IAEF,OAAO,CAAC,iBAAiB,CAEvB;IAEF,OAAO,CAAC,oBAAoB,CAQ1B;IAEF;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,qBAAqB,CAgB3B;IAEF,OAAO,CAAC,WAAW,CAEjB;IAEF,OAAO,CAAC,gBAAgB,CAEtB;IAEF,OAAO,CAAC,yBAAyB,CAc/B;IAEF,OAAO,KAAK,eAAe,GAG1B;IAED,OAAO,CAAC,YAAY,CAIlB;IAEF,OAAO,CAAC,wBAAwB,CAQ9B;IAEF,OAAO,CAAC,cAAc,CAqBpB;IAEF,OAAO,CAAC,oBAAoB,CAK1B;IAEF;;;;;OAKG;IACI,+BAA+B,IAAI,IAAI;IAWvC,WAAW,CAAC,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE;IAI9D,aAAa,CAAC,MAAM,EAAE;QAC3B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACnC;IAwBM,YAAY,CAAC,MAAM,EAAE;QAC1B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,IAAI,EAAE,GAAG,CAAC;QACV,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IAOM,cAAc,CAAC,MAAM,EAAE;QAC5B,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,MAAM,EAAE,MAAM,CAAC;KAChB;IAMM,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIlC,kBAAkB,IAAI,MAAM,GAAG,IAAI;IAM1C;;;OAGG;IAEH,IAAW,uBAAuB,6DAEjC;IAED;;OAEG;IACH,IAAW,eAAe,WAEzB;IAED;;OAEG;IACI,wBAAwB;IAI/B;;;OAGG;IACI,iBAAiB,aAEtB;CACH;AAED,eAAe,SAAS,CAAC"}
+\ No newline at end of file
 diff --git a/node_modules/@shopify/flash-list/dist/FlashList.js b/node_modules/@shopify/flash-list/dist/FlashList.js
 index 1a5d026..37852b8 100644
 --- a/node_modules/@shopify/flash-list/dist/FlashList.js
@@ -27,6 +733,569 @@ index 1a5d026..37852b8 100644
      Object.defineProperty(FlashList.prototype, "recyclerlistview_unsafe", {
          /**
           * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
+diff --git a/node_modules/@shopify/flash-list/dist/FlashList.js.map b/node_modules/@shopify/flash-list/dist/FlashList.js.map
+index 375f7fc..8fc9c3f 100644
+--- a/node_modules/@shopify/flash-list/dist/FlashList.js.map
++++ b/node_modules/@shopify/flash-list/dist/FlashList.js.map
+@@ -1 +1 @@
+-{"version":3,"file":"FlashList.js","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":";;;AAAA,wDAA0B;AAC1B,6CAOsB;AACtB,qDAO0B;AAC1B,2EAAgF;AAEhF,+FAAiE;AACjE,gGAAkE;AAClE,+DAA8D;AAC9D,sGAAwE;AACxE,6EAA+C;AAC/C,iFAAmD;AACnD,uEAA4C;AAC5C,gGAAkE;AAClE,mDAI0B;AAC1B,iEAKwC;AACxC,uEAKuC;AAKvC,IAAM,qBAAqB,GACzB,gBAAoD,CAAC;AAevD;IAA2B,qCAG1B;IAyCC,mBAAY,KAAwB;QAApC,iBAiBC;;gBAhBC,kBAAM,KAAK,CAAC;QAvCN,4BAAsB,GAAG,CAAC,CAAC;QAC3B,oBAAc,GAAG,+BAAc,CAAC,sBAAsB,CAAC;QACvD,8BAAwB,GAC9B,+BAAc,CAAC,gCAAgC,CAAC;QAE1C,wBAAkB,GAAG,CAAC,CAAC;QACvB,kBAAY,GAAyB;YAC3C,aAAa,EAAE,CAAC;YAChB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;SAChB,CAAC;QAEM,mBAAa,GAAG,CAAC,CAAC;QAClB,kBAAY,GAAG,KAAK,CAAC;QACrB,4BAAsB,GAA2B;YACvD,KAAK,EAAE;gBACL,WAAW,EAAE,CAAC;gBACd,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,CAAC;aACjB;YACD,iBAAiB,EAAE,IAAI;YACvB,oBAAoB,EAAE,IAAI;SAC3B,CAAC;QAKM,iBAAW,GAAG,KAAK,CAAC;QA0KpB,kBAAY,GAAG;;YACrB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,YAAY,kDAAI,CAAC;QAC9B,CAAC,CAAC;QAEM,uBAAiB,GAAG;YAC1B,IAAI,KAAI,CAAC,KAAK,CAAC,SAAS,EAAE;gBACxB,OAAO,CACL,8BAAC,6BAAc,IACb,UAAU,EAAE,OAAO,CAAC,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1C,kBAAkB,EAAE,KAAI,CAAC,KAAK,CAAC,kBAAkB,EACjD,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,GAC/B,CACH,CAAC;aACH;QACH,CAAC,CAAC;QAmHM,uBAAiB,GAAG,UAC1B,KAA8C;;YAE9C,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,iBAAiB,mDAAG,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC;QAEM,cAAQ,GAAG,UAAC,KAA8C;;YAChE,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;YAC9C,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,QAAQ,mDAAG,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;QA6BM,sBAAgB,GAAG,UAAC,KAAwB;;YAClD,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAM,OAAO,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACnC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM;gBACjC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,IAAM,OAAO,GAAG,KAAI,CAAC,sBAAsB,CAAC;YAC5C,KAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC;YAEtC,qEAAqE;YACrE,IAAI,OAAO,GAAG,CAAC,IAAI,OAAO,KAAK,OAAO,EAAE;gBACtC,MAAA,KAAI,CAAC,MAAM,0CAAE,aAAa,EAAE,CAAC;aAC9B;YACD,IAAI,KAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACvB,KAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC;QAEM,eAAS,GAAG,UAAC,KAAa,EAAE,QAA2B;YAC7D,KAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,OAAO,CACL;gBACE,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACF,8BAAC,wBAAc,uBACT,KAAK,IACT,gBAAgB,EAAE,KAAI,CAAC,KAAK,CAAC,WAAW,EACxC,QAAQ,EAAE,KAAI,CAAC,wBAAwB,EACvC,iBAAiB,EAAE,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAE9C,QAAQ,CACM;gBAChB,KAAI,CAAC,WAAW;oBACf,CAAC,CAAC,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;oBACvD,CAAC,CAAC,IAAI;gBACR,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACD,KAAI,CAAC,gCAAgC,EAAE,CACvC,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,mBAAa,GAAG,UAAC,KAAU,EAAE,WAAgB;;YACnD,IAAM,qBAAqB,GACzB,MAAA,KAAI,CAAC,KAAK,CAAC,qBAAqB,mCAAI,uBAAa,CAAC;YACpD,OAAO,CACL,8BAAC,qBAAqB,uBAChB,KAAK,IACT,KAAK,0EACA,KAAK,CAAC,KAAK,KACd,aAAa,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EACvD,UAAU,EAAE,SAAS,KAClB,KAAI,CAAC,YAAY,EAAE,GACnB,IAAA,+CAA8B,EAAC,KAAI,CAAC,KAAK,CAAC,QAAU,EAAE,WAAW,CAAC,GAEvE,KAAK,EAAE,WAAW,CAAC,KAAK;gBAExB,8BAAC,2CAAoB,IACnB,aAAa,EAAE,WAAW,CAAC,aAAa,EACxC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,EAC9C,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,GAAG,EAAE,WAAW,CAAC,KAAK,EACtB,QAAQ,EAAE,KAAI,CAAC,qBAAqB,GACpC,CACoB,CACzB,CAAC;QACJ,CAAC,CAAC;QAEM,8BAAwB,GAAG,UAAC,KAAwB;YAC1D,IAAM,qBAAqB,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACjD,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAE/B,IAAI,KAAI,CAAC,kBAAkB,KAAK,qBAAqB,EAAE;gBACrD,KAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC;gBAChD,KAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;gBACzE,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;aAC/C;QACH,CAAC,CAAC;QASM,eAAS,GAAG,UAAC,KAAa;YAChC,sDAAsD;YACtD,IACE,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI;gBACxB,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;gBAC7B,KAAK,GAAG,CAAC,IAAI,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EACnC;gBACA,OAAO,IAAI,CAAC;aACb;YAED,IAAM,WAAW,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAM,YAAY,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAEhD,IAAM,KAAK,GAAG;gBACZ,WAAW,aAAA;gBACX,YAAY,cAAA;gBACZ,+HAA+H;gBAC/H,6IAA6I;aAC9I,CAAC;YACF,IAAM,SAAS,GAAG,KAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;YACpD,OAAO,SAAS,IAAI,8BAAC,SAAS,uBAAK,KAAK,EAAI,CAAC;QAC/C,CAAC,CAAC;QAEM,YAAM,GAAG;YACf,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,UAAU,EAAE,KAAI,CAAC,YAAY,CAAC,UAAU;wBACxC,WAAW,EAAE,KAAI,CAAC,YAAY,CAAC,WAAW;qBAC3C,GACD;gBAEF,8BAAC,mBAAI,IACH,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAClD,CACN,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,YAAM,GAAG;;YACf;;gCAEoB;YACpB,IAAM,eAAe,GAAG,MAAA,IAAA,mCAAkB,GAAE,mCAAI,uBAAa,CAAC;YAC9D,OAAO,CACL;gBACE,8BAAC,eAAe,IACd,KAAK,EAAE,CAAC,CAAC,EACT,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CACvC;gBAClB,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EAAE,KAAI,CAAC,YAAY,CAAC,aAAa;wBAC9C,YAAY,EAAE,KAAI,CAAC,YAAY,CAAC,YAAY;qBAC7C,GACD,CACD,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,sCAAgC,GAAG;YACzC,OAAO,KAAI,CAAC,KAAK,CAAC,UAAU;gBAC1B,CAAC,KAAI,CAAC,KAAK,CAAC,sCAAsC;gBAClD,CAAC,KAAI,CAAC,YAAY;gBAClB,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CACxC,8BAAC,mBAAI,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,aAAa,EAAC,MAAM,IAC9C,KAAI,CAAC,oBAAoB,CACxB,IAAI,CAAC,GAAG,CAAC,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAClD,oCAAmB,CAAC,WAAW,CAChC,CACI,CACR,CAAC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CAAC;QAaM,2BAAqB,GAAG,UAC9B,CAAM,EACN,EAAO,EACP,gBAAyC;;YAEzC,gBAAgB,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;YACxD,MAAA,KAAI,CAAC,yBAAyB,0CAAE,UAAU,CAAC,KAAI,CAAC,eAAe,CAAC,CAAC;QACnE,CAAC,CAAC;QAEM,uBAAiB,GAAG,UAAC,KAAa;YACxC,OAAO,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,YAAY,CAAC,CAAC;QAC5E,CAAC,CAAC;QAEM,0BAAoB,GAAG,UAAC,KAAa,EAAE,MAAoB;;YACjE,wEAAwE;YACxE,OAAO,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,UAAU,mDAAG;gBAC7B,IAAI,EAAE,KAAI,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC;gBAC7B,KAAK,OAAA;gBACL,MAAM,QAAA;gBACN,SAAS,EAAE,MAAA,KAAI,CAAC,KAAK,CAAC,SAAS,0CAAE,KAAK;aACvC,CAAgB,CAAC;QACpB,CAAC,CAAC;QAEF;;;;WAIG;QACK,sBAAgB,GAAG;YACzB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEM,2BAAqB,GAAG,UAAC,KAAa;YAC5C,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EACX,KAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC;4BAClD,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,KAAK;qBACZ,IAEA,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,IAAI,CAAC,CACtD;gBACN,KAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CACrB,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,iBAAW,GAAG,UAAC,GAAQ;YAC7B,KAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC;QAEM,sBAAgB,GAAG,UAAC,GAAQ;YAClC,KAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;QACvC,CAAC,CAAC;QAEM,+BAAyB,GAAG,UAClC,CAAM,EACN,EAAO,EACP,KAAa,EACb,GAAQ;YAER,OAAO,CACL,8BAAC,2CAAoB,IACnB,GAAG,EAAE,KAAI,CAAC,gBAAgB,EAC1B,OAAO,EAAE,KAAI,CAAC,eAAe,EAC7B,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,KAAI,CAAC,iBAAiB,GAChC,CACH,CAAC;QACJ,CAAC,CAAC;QAOM,kBAAY,GAAG,UAAC,KAAa;YACnC,oIAAoI;YACpI,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAClD,KAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,CAAC,CAAC;QAEM,8BAAwB,GAAG;;YACjC,IAAI,CAAC,KAAI,CAAC,YAAY,EAAE;gBACtB,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,MAAM,mDAAG;oBAClB,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAI,CAAC,aAAa;iBACjD,CAAC,CAAC;gBACH,KAAI,CAAC,cAAc,EAAE,CAAC;aACvB;QACH,CAAC,CAAC;QAEM,oBAAc,GAAG;YACvB,IAAI,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBAC9C,KAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC;oBACrC,IAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAChC,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAC1C,CAAC;oBACF,OAAO,CAAC,IAAI,CACV,kBAAW,CAAC,+BAA+B,CAAC,OAAO,CACjD,OAAO,EACP,eAAe,CAAC,QAAQ,EAAE,CAC3B,CACF,CAAC;gBACJ,CAAC,EAAE,IAAI,CAAC,CAAC;aACV;YACD,KAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;gBAClC,6IAA6I;gBAC7I,sIAAsI;gBACtI,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAI,CAAC,WAAW,EAAE,CAAC;iBACpB;YACH,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,CAAC;QAEM,0BAAoB,GAAG;YAC7B,IAAI,KAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBACxC,YAAY,CAAC,KAAI,CAAC,iBAAiB,CAAC,CAAC;gBACrC,KAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;aACpC;QACH,CAAC,CAAC;QAoGF;;;WAGG;QACI,uBAAiB,GAAG;YACzB,KAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QAC9C,CAAC,CAAC;QA5uBA,KAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,KAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,iBAAiB,EAAE;YAC3B,IAAI,KAAK,CAAC,UAAU,EAAE;gBACpB,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC;aAC9D;iBAAM;gBACL,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC;aAC7D;SACF;QACD,KAAI,CAAC,kBAAkB;YACrB,MAAA,KAAK,CAAC,wBAAwB,mCAAI,CAAC,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5E,sDAAsD;QACtD,KAAI,CAAC,KAAK,GAAG,SAAS,CAAC,sBAAsB,CAAC,KAAI,CAAC,CAAC;QACpD,KAAI,CAAC,kBAAkB,GAAG,IAAI,4BAAkB,CAAC,KAAI,CAAC,CAAC;QACvD,KAAI,CAAC,YAAY,GAAG,IAAA,gCAAe,GAAE,CAAC;;IACxC,CAAC;IAEO,iCAAa,GAArB;;QACE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE;YACtE,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,qBAAqB,CAAC,CAAC;SAC5D;QACD,IACE,MAAM,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,mBAAmB,0CAAE,MAAM,CAAC,GAAG,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,iCAAiC,CAAC,CAAC;SACxE;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YAC9D,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,kCAAkC,CAAC,CAAC;SACzE;QAED,wIAAwI;QACxI,sIAAsI;QACtI,IACE,OAAO;YACP,MAAM,CAAC,IAAI,CAAC,yBAAU,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAClE;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gBAAgB,CAAC,CAAC;SAC5C;QACD,IACE,IAAA,iEAAyC,EACvC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CACjC,EACD;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gCAAgC,CAAC,CAAC;SAC5D;IACH,CAAC;IAED,+DAA+D;IACxD,kCAAwB,GAA/B,UACE,SAAsC,EACtC,SAA4B;;QAE5B,IAAM,QAAQ,wBAAQ,SAAS,CAAE,CAAC;QAClC,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;YACjD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,CAAC,CAAC;YAChD,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;aAAM,IAAI,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE;YACrE,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;QAED,8EAA8E;QAC9E,sDAAsD;QACtD,QAAQ,CAAC,cAAc,CAAC,0BAA0B,GAAG,OAAO,CAC1D,CAAC,CAAA,MAAA,SAAS,CAAC,cAAc,0CAAE,UAAU,CAAA,CACtC,CAAC;QAEF,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE;YACrC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;YAC/B,QAAQ,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,CAC1D,SAAS,CAAC,IAAa,CACxB,CAAC;YACF,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;gBACjD,QAAQ,CAAC,SAAS,wBAAQ,SAAS,CAAC,SAAS,CAAE,CAAC;aACjD;SACF;QACD,IAAI,SAAS,CAAC,SAAS,MAAK,MAAA,SAAS,CAAC,SAAS,0CAAE,KAAK,CAAA,EAAE;YACtD,QAAQ,CAAC,SAAS,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;SACrD;QACD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QAC3C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEc,gCAAsB,GAArC,UACE,SAAuB;QAEvB,IAAI,WAAoD,CAAC;QACzD,IACE,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YACrC,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAC1C;YACA,WAAW,GAAG,UAAC,KAAK;gBAClB,+GAA+G;gBAC/G,mFAAmF;gBACnF,OAAA,SAAS,CAAC,KAAK,CAAC,YAAa,CAC3B,SAAS,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC,EAC5B,KAAK,CACN,CAAC,QAAQ,EAAE;YAHZ,CAGY,CAAC;SAChB;QACD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,cAAc,EAAE,IAAM;YACtB,YAAY,EAAE,IAAI,+BAAY,CAAC,UAAC,EAAE,EAAE,EAAE;gBACpC,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,CAAC,EAAE,WAAW,CAAC;YACf,UAAU,EAAE,CAAC;SACd,CAAC;IACJ,CAAC;IAED,2HAA2H;IAC5G,2BAAiB,GAAhC,UACE,UAAkB,EAClB,cAAiC;QAEjC,OAAO,IAAI,qCAA2B;QACpC,6BAA6B;QAC7B,UAAU,EACV,UAAC,KAAK,EAAE,KAAK;;YACX,mCAAmC;YACnC,IAAM,IAAI,GAAG,MAAA,KAAK,CAAC,WAAW,sDAC5B,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,IAAI,IAAI,CAAC,CAAC;QACnB,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,gFAAgF;YAChF,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,mCAAI,CAAC,CAAC;QAClC,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,4CAA4C;YAC5C,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC;QAC7B,CAAC,EACD,cAAc,CACf,CAAC;IACJ,CAAC;IAkBD,qCAAiB,GAAjB;;QACE,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,MAAM,MAAK,CAAC,EAAE;YACjC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACjC;IACH,CAAC;IAED,wCAAoB,GAApB;QACE,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC3C,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACzC;IACH,CAAC;IAED,0BAAM,GAAN;QACE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAA,0CAAkB,EAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAExE,IAAM,KAYF,IAAI,CAAC,KAAK,EAXZ,YAAY,kBAAA,EACZ,qBAAqB,2BAAA,EACrB,mBAAmB,yBAAA,EACnB,UAAU,gBAAA,EACV,qBAAqB,2BAAA,EACrB,iBAAiB,uBAAA,EACjB,kBAAkB,wBAAA,EAClB,KAAK,WAAA,EACL,qBAAqB,2BAAA,EACrB,qBAAqB,2BAAA,EAClB,SAAS,sBAXR,6MAYL,CAAa,CAAC;QAEf,0GAA0G;QAC1G,gEAAgE;QAChE,IAAM,aAAa,GACjB,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC;YAClE,SAAS,CAAC;QACZ,IAAM,iBAAiB,GACrB,YAAY,KAAK,SAAS;YACxB,CAAC,CAAC,+BAAc,CAAC,mBAAmB;YACpC,CAAC,CAAC,YAAY,CAAC;QAEnB,OAAO,CACL,8BAAC,qBAAqB,IACpB,mBAAmB,EAAE,IAAI,CAAC,yBAAyB,EACnD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EACjD,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EACH,IAAI,CAAC,KAAK,CAAC,UAAU;gBACnB,CAAC,sBAAM,IAAI,CAAC,YAAY,EAAE,EAC1B,CAAC,oBAAG,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,IAAK,IAAI,CAAC,YAAY,EAAE,CAAE;YAG7D,8BAAC,sCAAmB,uBACd,SAAS,IACb,GAAG,EAAE,IAAI,CAAC,WAAW,EACrB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,EACzC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EACrC,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAClC,aAAa,QACb,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,EACjC,eAAe,qBACb,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EACzC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAC/B,cAAc,EACZ,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBAEvD,gEAAgE;oBAChE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EACpC,qBAAqB,qBACnB,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;wBAElD,6FAA6F;wBAC7F,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,IAER,IAAA,kDAA0B,EAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,KAE3D,IAAI,CAAC,KAAK,CAAC,aAAa,GAE7B,8BAA8B,QAC9B,mBAAmB,EAAE,IAAI,CAAC,aAAa,EACvC,sBAAsB,EAAE,IAAI,CAAC,SAAS,EACtC,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,6BAA6B,EAAE,qBAAqB,IAAI,SAAS,EACjE,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EACnC,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,CAAC,GAAG,iBAAiB,EACrC,sBAAsB,EAAE,iBAAiB,EACzC,eAAe,EAAE,iBAAiB,EAClC,kBAAkB,EAChB,CAAC,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,kBAAkB,CAAC;oBAC9D,SAAS,EAEX,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,uBAAuB,EACrB,IAAI,CAAC,kBAAkB,CAAC,4BAA4B;oBAClD,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,uBAAuB;oBACjD,CAAC,CAAC,SAAS,EAEf,sBAAsB,EAAE,IAAI,CAAC,gCAAgC,EAAE,EAC/D,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,4BAA4B,QAC5B,kBAAkB,EAChB,qBAAoE,IAEtE,CACoB,CACzB,CAAC;IACJ,CAAC;IAeO,oDAAgC,GAAxC;QACE,4IAA4I;QAC5I,iFAAiF;QACjF,8HAA8H;QAC9H,IAAI,IAAI,CAAC,8BAA8B,EAAE,EAAE;YACzC,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,KAAK,CAAC;SAC1D;aAAM;YACL,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,IAAI,CAAC;SACzD;QACD,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC;QACzE,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAEO,kDAA8B,GAAtC;;QACE,OAAO,CACL,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,kBAAkB,mCAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;IACJ,CAAC;IAEO,oCAAgB,GAAxB,UAAyB,KAAwB;QACzC,IAAA,KAAoB,KAAK,CAAC,WAAW,CAAC,MAAM,EAA1C,MAAM,YAAA,EAAE,KAAK,WAA6B,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACrD,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,oBAAoB,CAAC,CAAC;SAChD;IACH,CAAC;IAiGO,gCAAY,GAApB;QACE,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;YAC1C,CAAC,CAAC,IAAI,CAAC,wBAAwB;YAC/B,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,SAAS,CAAC;IAC9D,CAAC;IAiFO,qCAAiB,GAAzB,UACE,SAAsE;QAEtE,IAAM,eAAe,GAAG,SAAS,CAAC;QAClC,OAAO,CACL,CAAC,eAAK,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC;YAC1D,CAAC,eAAe,IAAI,8BAAC,eAAe,OAAG,CAAC;YACxC,IAAI,CACL,CAAC;IACJ,CAAC;IA4ED,sBAAY,sCAAe;aAA3B;;YACE,IAAM,aAAa,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,sBAAsB,EAAE,KAAI,CAAC,CAAC;YACjE,OAAO,aAAa,IAAI,IAAI,CAAC,kBAAkB,CAAC;QAClD,CAAC;;;OAAA;IAgDD;;;;;OAKG;IACI,mDAA+B,GAAtC;;QACE,IACE,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YAChC,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EACrC;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,mBAAmB,CAAC,CAAC;SAC/C;aAAM;YACL,MAAA,IAAI,CAAC,MAAM,0CAAE,+BAA+B,EAAE,CAAC;SAChD;IACH,CAAC;IAEM,+BAAW,GAAlB,UAAmB,MAAkD;;QACnE,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,CAAC,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,iCAAa,GAApB,UAAqB,MAKpB;;QACC,IAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,eAAe,EAAE,CAAC;QAEhD,IAAI,MAAM,IAAI,QAAQ,EAAE;YACtB,IAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;gBAC1C,CAAC,CAAC,QAAQ,CAAC,KAAK;gBAChB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACtE,IAAM,YAAY,GAChB,IAAI,CAAC,GAAG,CACN,CAAC,EACD,UAAU,GAAG,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,CAAC,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,CAAC,CACtE,GAAG,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,CAAC,CAAC,CAAC;YAC/B,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CACzB,YAAY,EACZ,YAAY,EACZ,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EACxB,IAAI,CACL,CAAC;SACH;IACH,CAAC;IAEM,gCAAY,GAAnB,UAAoB,MAKnB;;QACC,IAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAI,CAAC,CAAC,CAAC;QAC1D,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,aAAa,uCAAM,MAAM,KAAE,KAAK,OAAA,IAAG,CAAC;SAC1C;IACH,CAAC;IAEM,kCAAc,GAArB,UAAsB,MAGrB;;QACC,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QACpD,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,qCAAiB,GAAxB;;QACE,OAAO,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,iBAAiB,kDAAI,KAAI,IAAI,CAAC;IACpD,CAAC;IAOD,sBAAW,8CAAuB;QALlC;;;WAGG;QACH,yDAAyD;aACzD;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAKD,sBAAW,sCAAe;QAH1B;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACjC,CAAC;;;OAAA;IAED;;OAEG;IACI,4CAAwB,GAA/B;QACE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IA3uBM,sBAAY,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC;KACd,CAAC;IAivBJ,gBAAC;CAAA,AA3xBD,CAA2B,eAAK,CAAC,aAAa,GA2xB7C;AAED,kBAAe,SAAS,CAAC"}
+\ No newline at end of file
++{"version":3,"file":"FlashList.js","sourceRoot":"","sources":["../src/FlashList.tsx"],"names":[],"mappings":";;;AAAA,wDAA0B;AAC1B,6CAOsB;AACtB,qDAO0B;AAC1B,2EAAgF;AAEhF,+FAAiE;AACjE,gGAAkE;AAClE,+DAA8D;AAC9D,sGAAwE;AACxE,6EAA+C;AAC/C,iFAAmD;AACnD,uEAA4C;AAC5C,gGAAkE;AAClE,mDAI0B;AAC1B,iEAKwC;AACxC,uEAKuC;AAKvC,IAAM,qBAAqB,GACzB,gBAAoD,CAAC;AAevD;IAA2B,qCAG1B;IAyCC,mBAAY,KAAwB;QAApC,iBAiBC;;gBAhBC,kBAAM,KAAK,CAAC;QAvCN,4BAAsB,GAAG,CAAC,CAAC;QAC3B,oBAAc,GAAG,+BAAc,CAAC,sBAAsB,CAAC;QACvD,8BAAwB,GAC9B,+BAAc,CAAC,gCAAgC,CAAC;QAE1C,wBAAkB,GAAG,CAAC,CAAC;QACvB,kBAAY,GAAyB;YAC3C,aAAa,EAAE,CAAC;YAChB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;SAChB,CAAC;QAEM,mBAAa,GAAG,CAAC,CAAC;QAClB,kBAAY,GAAG,KAAK,CAAC;QACrB,4BAAsB,GAA2B;YACvD,KAAK,EAAE;gBACL,WAAW,EAAE,CAAC;gBACd,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,CAAC;aACjB;YACD,iBAAiB,EAAE,IAAI;YACvB,oBAAoB,EAAE,IAAI;SAC3B,CAAC;QAKM,iBAAW,GAAG,KAAK,CAAC;QA0KpB,kBAAY,GAAG;;YACrB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,YAAY,kDAAI,CAAC;QAC9B,CAAC,CAAC;QAEM,uBAAiB,GAAG;YAC1B,IAAI,KAAI,CAAC,KAAK,CAAC,SAAS,EAAE;gBACxB,OAAO,CACL,8BAAC,6BAAc,IACb,UAAU,EAAE,OAAO,CAAC,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1C,kBAAkB,EAAE,KAAI,CAAC,KAAK,CAAC,kBAAkB,EACjD,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,GAC/B,CACH,CAAC;aACH;QACH,CAAC,CAAC;QAmHM,uBAAiB,GAAG,UAC1B,KAA8C;;YAE9C,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,iBAAiB,mDAAG,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC;QAEM,cAAQ,GAAG,UAAC,KAA8C;;YAChE,KAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;YAC9C,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,QAAQ,mDAAG,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC;QA6BM,sBAAgB,GAAG,UAAC,KAAwB;;YAClD,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAM,OAAO,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACnC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM;gBACjC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,IAAM,OAAO,GAAG,KAAI,CAAC,sBAAsB,CAAC;YAC5C,KAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC;YAEtC,qEAAqE;YACrE,IAAI,OAAO,GAAG,CAAC,IAAI,OAAO,KAAK,OAAO,EAAE;gBACtC,MAAA,KAAI,CAAC,MAAM,0CAAE,aAAa,EAAE,CAAC;aAC9B;YACD,IAAI,KAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACvB,KAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC;QAEM,eAAS,GAAG,UAAC,KAAa,EAAE,QAA2B;YAC7D,KAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,OAAO,CACL;gBACE,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACF,8BAAC,wBAAc,uBACT,KAAK,IACT,gBAAgB,EAAE,KAAI,CAAC,KAAK,CAAC,WAAW,EACxC,QAAQ,EAAE,KAAI,CAAC,wBAAwB,EACvC,iBAAiB,EAAE,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAE9C,QAAQ,CACM;gBAChB,KAAI,CAAC,WAAW;oBACf,CAAC,CAAC,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;oBACvD,CAAC,CAAC,IAAI;gBACR,8BAAC,2CAAoB,IACnB,OAAO,EAAE,KAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,KAAI,CAAC,WAAW,EACrE,YAAY,EAAE,KAAI,CAAC,KAAK,CAAC,qBAAqB,EAC9C,UAAU,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,EACjC,MAAM,EAAE,KAAI,CAAC,KAAK,CAAC,mBAAmB,EACtC,SAAS,EAAE,KAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAChD,QAAQ,EAAE,KAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,QAAQ,EAAE,KAAI,CAAC,MAAM,GACrB;gBACD,KAAI,CAAC,gCAAgC,EAAE,CACvC,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,mBAAa,GAAG,UAAC,KAAU,EAAE,WAAgB;;YACnD,IAAM,qBAAqB,GACzB,MAAA,KAAI,CAAC,KAAK,CAAC,qBAAqB,mCAAI,uBAAa,CAAC;YACpD,OAAO,CACL,8BAAC,qBAAqB,uBAChB,KAAK,IACT,KAAK,0EACA,KAAK,CAAC,KAAK,KACd,aAAa,EAAE,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EACvD,UAAU,EAAE,SAAS,KAClB,KAAI,CAAC,YAAY,EAAE,GACnB,IAAA,+CAA8B,EAAC,KAAI,CAAC,KAAK,CAAC,QAAU,EAAE,WAAW,CAAC,GAEvE,KAAK,EAAE,WAAW,CAAC,KAAK;gBAExB,8BAAC,2CAAoB,IACnB,aAAa,EAAE,WAAW,CAAC,aAAa,EACxC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,EAC9C,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,GAAG,EAAE,WAAW,CAAC,KAAK,EACtB,QAAQ,EAAE,KAAI,CAAC,qBAAqB,GACpC,CACoB,CACzB,CAAC;QACJ,CAAC,CAAC;QAEM,8BAAwB,GAAG,UAAC,KAAwB;YAC1D,IAAM,qBAAqB,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU;gBACjD,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAE/B,IAAI,KAAI,CAAC,kBAAkB,KAAK,qBAAqB,EAAE;gBACrD,KAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC;gBAChD,KAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;gBACzE,KAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;aAC/C;QACH,CAAC,CAAC;QASM,eAAS,GAAG,UAAC,KAAa;YAChC,sDAAsD;YACtD,IACE,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI;gBACxB,KAAI,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;gBAC7B,KAAK,GAAG,CAAC,IAAI,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EACnC;gBACA,OAAO,IAAI,CAAC;aACb;YAED,IAAM,WAAW,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAM,YAAY,GAAG,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAEhD,IAAM,KAAK,GAAG;gBACZ,WAAW,aAAA;gBACX,YAAY,cAAA;gBACZ,+HAA+H;gBAC/H,6IAA6I;aAC9I,CAAC;YACF,IAAM,SAAS,GAAG,KAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;YACpD,OAAO,SAAS,IAAI,8BAAC,SAAS,uBAAK,KAAK,EAAI,CAAC;QAC/C,CAAC,CAAC;QAEM,YAAM,GAAG;YACf,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,UAAU,EAAE,KAAI,CAAC,YAAY,CAAC,UAAU;wBACxC,WAAW,EAAE,KAAI,CAAC,YAAY,CAAC,WAAW;qBAC3C,GACD;gBAEF,8BAAC,mBAAI,IACH,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAClD,CACN,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,YAAM,GAAG;;YACf;;gCAEoB;YACpB,IAAM,eAAe,GAAG,MAAA,IAAA,mCAAkB,GAAE,mCAAI,uBAAa,CAAC;YAC9D,OAAO,CACL;gBACE,8BAAC,eAAe,IACd,KAAK,EAAE,CAAC,CAAC,EACT,KAAK,EAAE,CAAC,KAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAI,CAAC,YAAY,EAAE,CAAC,IAEhE,KAAI,CAAC,iBAAiB,CAAC,KAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CACvC;gBAClB,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EAAE,KAAI,CAAC,YAAY,CAAC,aAAa;wBAC9C,YAAY,EAAE,KAAI,CAAC,YAAY,CAAC,YAAY;qBAC7C,GACD,CACD,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,sCAAgC,GAAG;YACzC,OAAO,KAAI,CAAC,KAAK,CAAC,UAAU;gBAC1B,CAAC,KAAI,CAAC,KAAK,CAAC,sCAAsC;gBAClD,CAAC,KAAI,CAAC,YAAY;gBAClB,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CACxC,8BAAC,mBAAI,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,aAAa,EAAC,MAAM,IAC9C,KAAI,CAAC,oBAAoB,CACxB,IAAI,CAAC,GAAG,CAAC,KAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAClD,oCAAmB,CAAC,WAAW,CAChC,CACI,CACR,CAAC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CAAC;QAaM,2BAAqB,GAAG,UAC9B,CAAM,EACN,EAAO,EACP,gBAAyC;;YAEzC,gBAAgB,CAAC,WAAW,GAAG,CAAC,KAAI,CAAC,kBAAkB,CAAC;YACxD,MAAA,KAAI,CAAC,yBAAyB,0CAAE,UAAU,CAAC,KAAI,CAAC,eAAe,CAAC,CAAC;QACnE,CAAC,CAAC;QAEM,uBAAiB,GAAG,UAAC,KAAa;YACxC,OAAO,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,YAAY,CAAC,CAAC;QAC5E,CAAC,CAAC;QAEM,0BAAoB,GAAG,UAAC,KAAa,EAAE,MAAoB;;YACjE,wEAAwE;YACxE,OAAO,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,UAAU,mDAAG;gBAC7B,IAAI,EAAE,KAAI,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC;gBAC7B,KAAK,OAAA;gBACL,MAAM,QAAA;gBACN,SAAS,EAAE,MAAA,KAAI,CAAC,KAAK,CAAC,SAAS,0CAAE,KAAK;aACvC,CAAgB,CAAC;QACpB,CAAC,CAAC;QAEF;;;;WAIG;QACK,sBAAgB,GAAG;YACzB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEM,2BAAqB,GAAG,UAAC,KAAa;YAC5C,OAAO,CACL;gBACE,8BAAC,mBAAI,IACH,KAAK,EAAE;wBACL,aAAa,EACX,KAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC;4BAClD,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,KAAK;qBACZ,IAEA,KAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,oCAAmB,CAAC,IAAI,CAAC,CACtD;gBACN,KAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CACrB,CACJ,CAAC;QACJ,CAAC,CAAC;QAEM,iBAAW,GAAG,UAAC,GAAQ;YAC7B,KAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC;QAEM,sBAAgB,GAAG,UAAC,GAAQ;YAClC,KAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;QACvC,CAAC,CAAC;QAEM,+BAAyB,GAAG,UAClC,CAAM,EACN,EAAO,EACP,KAAa,EACb,GAAQ;YAER,OAAO,CACL,8BAAC,2CAAoB,IACnB,GAAG,EAAE,KAAI,CAAC,gBAAgB,EAC1B,OAAO,EAAE,KAAI,CAAC,eAAe,EAC7B,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,KAAI,CAAC,iBAAiB,GAChC,CACH,CAAC;QACJ,CAAC,CAAC;QAOM,kBAAY,GAAG,UAAC,KAAa;YACnC,oIAAoI;YACpI,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAClD,KAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,CAAC,CAAC;QAEM,8BAAwB,GAAG;;YACjC,IAAI,CAAC,KAAI,CAAC,YAAY,EAAE;gBACtB,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,MAAM,mDAAG;oBAClB,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAI,CAAC,aAAa;iBACjD,CAAC,CAAC;gBACH,KAAI,CAAC,cAAc,EAAE,CAAC;aACvB;QACH,CAAC,CAAC;QAEM,oBAAc,GAAG;YACvB,IAAI,KAAI,CAAC,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBAC9C,KAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC;oBACrC,IAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAChC,KAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,CAC1C,CAAC;oBACF,OAAO,CAAC,IAAI,CACV,kBAAW,CAAC,+BAA+B,CAAC,OAAO,CACjD,OAAO,EACP,eAAe,CAAC,QAAQ,EAAE,CAC3B,CACF,CAAC;gBACJ,CAAC,EAAE,IAAI,CAAC,CAAC;aACV;YACD,KAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;gBAClC,6IAA6I;gBAC7I,sIAAsI;gBACtI,IAAI,KAAI,CAAC,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAI,CAAC,WAAW,EAAE,CAAC;iBACpB;YACH,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,CAAC;QAEM,0BAAoB,GAAG;YAC7B,IAAI,KAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBACxC,YAAY,CAAC,KAAI,CAAC,iBAAiB,CAAC,CAAC;gBACrC,KAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;aACpC;QACH,CAAC,CAAC;QA0GF;;;WAGG;QACI,uBAAiB,GAAG;YACzB,KAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QAC9C,CAAC,CAAC;QAlvBA,KAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,KAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,iBAAiB,EAAE;YAC3B,IAAI,KAAK,CAAC,UAAU,EAAE;gBACpB,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC;aAC9D;iBAAM;gBACL,KAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC;aAC7D;SACF;QACD,KAAI,CAAC,kBAAkB;YACrB,MAAA,KAAK,CAAC,wBAAwB,mCAAI,CAAC,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5E,sDAAsD;QACtD,KAAI,CAAC,KAAK,GAAG,SAAS,CAAC,sBAAsB,CAAC,KAAI,CAAC,CAAC;QACpD,KAAI,CAAC,kBAAkB,GAAG,IAAI,4BAAkB,CAAC,KAAI,CAAC,CAAC;QACvD,KAAI,CAAC,YAAY,GAAG,IAAA,gCAAe,GAAE,CAAC;;IACxC,CAAC;IAEO,iCAAa,GAArB;;QACE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE;YACtE,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,qBAAqB,CAAC,CAAC;SAC5D;QACD,IACE,MAAM,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,mBAAmB,0CAAE,MAAM,CAAC,GAAG,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,iCAAiC,CAAC,CAAC;SACxE;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YAC9D,MAAM,IAAI,qBAAW,CAAC,uBAAa,CAAC,kCAAkC,CAAC,CAAC;SACzE;QAED,wIAAwI;QACxI,sIAAsI;QACtI,IACE,OAAO;YACP,MAAM,CAAC,IAAI,CAAC,yBAAU,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAClE;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gBAAgB,CAAC,CAAC;SAC5C;QACD,IACE,IAAA,iEAAyC,EACvC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CACjC,EACD;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,gCAAgC,CAAC,CAAC;SAC5D;IACH,CAAC;IAED,+DAA+D;IACxD,kCAAwB,GAA/B,UACE,SAAsC,EACtC,SAA4B;;QAE5B,IAAM,QAAQ,wBAAQ,SAAS,CAAE,CAAC;QAClC,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;YACjD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,CAAC,CAAC;YAChD,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;aAAM,IAAI,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE;YACrE,QAAQ,CAAC,cAAc,GAAG,SAAS,CAAC,iBAAiB,CACnD,QAAQ,CAAC,UAAU,EACnB,SAAS,CACV,CAAC;SACH;QAED,8EAA8E;QAC9E,sDAAsD;QACtD,QAAQ,CAAC,cAAc,CAAC,0BAA0B,GAAG,OAAO,CAC1D,CAAC,CAAA,MAAA,SAAS,CAAC,cAAc,0CAAE,UAAU,CAAA,CACtC,CAAC;QAEF,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE;YACrC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;YAC/B,QAAQ,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,CAC1D,SAAS,CAAC,IAAa,CACxB,CAAC;YACF,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE;gBACjD,QAAQ,CAAC,SAAS,wBAAQ,SAAS,CAAC,SAAS,CAAE,CAAC;aACjD;SACF;QACD,IAAI,SAAS,CAAC,SAAS,MAAK,MAAA,SAAS,CAAC,SAAS,0CAAE,KAAK,CAAA,EAAE;YACtD,QAAQ,CAAC,SAAS,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;SACrD;QACD,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QAC3C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEc,gCAAsB,GAArC,UACE,SAAuB;QAEvB,IAAI,WAAoD,CAAC;QACzD,IACE,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YACrC,SAAS,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAC1C;YACA,WAAW,GAAG,UAAC,KAAK;gBAClB,+GAA+G;gBAC/G,mFAAmF;gBACnF,OAAA,SAAS,CAAC,KAAK,CAAC,YAAa,CAC3B,SAAS,CAAC,KAAK,CAAC,IAAK,CAAC,KAAK,CAAC,EAC5B,KAAK,CACN,CAAC,QAAQ,EAAE;YAHZ,CAGY,CAAC;SAChB;QACD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,cAAc,EAAE,IAAM;YACtB,YAAY,EAAE,IAAI,+BAAY,CAAC,UAAC,EAAE,EAAE,EAAE;gBACpC,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,CAAC,EAAE,WAAW,CAAC;YACf,UAAU,EAAE,CAAC;SACd,CAAC;IACJ,CAAC;IAED,2HAA2H;IAC5G,2BAAiB,GAAhC,UACE,UAAkB,EAClB,cAAiC;QAEjC,OAAO,IAAI,qCAA2B;QACpC,6BAA6B;QAC7B,UAAU,EACV,UAAC,KAAK,EAAE,KAAK;;YACX,mCAAmC;YACnC,IAAM,IAAI,GAAG,MAAA,KAAK,CAAC,WAAW,sDAC5B,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,IAAI,IAAI,CAAC,CAAC;QACnB,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,gFAAgF;YAChF,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,mCAAI,CAAC,CAAC;QAClC,CAAC,EACD,UAAC,KAAK,EAAE,KAAK,EAAE,aAAa;;YAC1B,4CAA4C;YAC5C,MAAA,KAAK,CAAC,kBAAkB,sDACtB,aAAa,EACb,KAAK,CAAC,IAAM,CAAC,KAAK,CAAC,EACnB,KAAK,EACL,UAAU,EACV,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC;QAC7B,CAAC,EACD,cAAc,CACf,CAAC;IACJ,CAAC;IAkBD,qCAAiB,GAAjB;;QACE,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,MAAM,MAAK,CAAC,EAAE;YACjC,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACjC;IACH,CAAC;IAED,wCAAoB,GAApB;QACE,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC3C,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACzC;IACH,CAAC;IAED,0BAAM,GAAN;QACE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAA,0CAAkB,EAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAExE,IAAM,KAYF,IAAI,CAAC,KAAK,EAXZ,YAAY,kBAAA,EACZ,qBAAqB,2BAAA,EACrB,mBAAmB,yBAAA,EACnB,UAAU,gBAAA,EACV,qBAAqB,2BAAA,EACrB,iBAAiB,uBAAA,EACjB,kBAAkB,wBAAA,EAClB,KAAK,WAAA,EACL,qBAAqB,2BAAA,EACrB,qBAAqB,2BAAA,EAClB,SAAS,sBAXR,6MAYL,CAAa,CAAC;QAEf,0GAA0G;QAC1G,gEAAgE;QAChE,IAAM,aAAa,GACjB,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC;YAClE,SAAS,CAAC;QACZ,IAAM,iBAAiB,GACrB,YAAY,KAAK,SAAS;YACxB,CAAC,CAAC,+BAAc,CAAC,mBAAmB;YACpC,CAAC,CAAC,YAAY,CAAC;QAEnB,OAAO,CACL,8BAAC,qBAAqB,IACpB,mBAAmB,EAAE,IAAI,CAAC,yBAAyB,EACnD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EACjD,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EACH,IAAI,CAAC,KAAK,CAAC,UAAU;gBACnB,CAAC,sBAAM,IAAI,CAAC,YAAY,EAAE,EAC1B,CAAC,oBAAG,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,IAAK,IAAI,CAAC,YAAY,EAAE,CAAE;YAG7D,8BAAC,sCAAmB,uBACd,SAAS,IACb,GAAG,EAAE,IAAI,CAAC,WAAW,EACrB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,EACzC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EACrC,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAClC,aAAa,QACb,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,EACjC,eAAe,qBACb,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EACzC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAC/B,cAAc,EACZ,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBAEvD,gEAAgE;oBAChE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EACpC,qBAAqB,qBACnB,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;wBAElD,6FAA6F;wBAC7F,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,IAER,IAAA,kDAA0B,EAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,KAE3D,IAAI,CAAC,KAAK,CAAC,aAAa,GAE7B,8BAA8B,QAC9B,mBAAmB,EAAE,IAAI,CAAC,aAAa,EACvC,sBAAsB,EAAE,IAAI,CAAC,SAAS,EACtC,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,6BAA6B,EAAE,qBAAqB,IAAI,SAAS,EACjE,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EACnC,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,CAAC,GAAG,iBAAiB,EACrC,sBAAsB,EAAE,iBAAiB,EACzC,eAAe,EAAE,iBAAiB,EAClC,kBAAkB,EAChB,CAAC,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,kBAAkB,CAAC;oBAC9D,SAAS,EAEX,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,uBAAuB,EACrB,IAAI,CAAC,kBAAkB,CAAC,4BAA4B;oBAClD,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,uBAAuB;oBACjD,CAAC,CAAC,SAAS,EAEf,sBAAsB,EAAE,IAAI,CAAC,gCAAgC,EAAE,EAC/D,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,4BAA4B,QAC5B,kBAAkB,EAChB,qBAAoE,IAEtE,CACoB,CACzB,CAAC;IACJ,CAAC;IAeO,oDAAgC,GAAxC;QACE,4IAA4I;QAC5I,iFAAiF;QACjF,8HAA8H;QAC9H,IAAI,IAAI,CAAC,8BAA8B,EAAE,EAAE;YACzC,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,KAAK,CAAC;SAC1D;aAAM;YACL,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,GAAG,IAAI,CAAC;SACzD;QACD,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC;QACzE,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAEO,kDAA8B,GAAtC;;QACE,OAAO,CACL,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,kBAAkB,mCAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;IACJ,CAAC;IAEO,oCAAgB,GAAxB,UAAyB,KAAwB;QACzC,IAAA,KAAoB,KAAK,CAAC,WAAW,CAAC,MAAM,EAA1C,MAAM,YAAA,EAAE,KAAK,WAA6B,CAAC;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACrD,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,oBAAoB,CAAC,CAAC;SAChD;IACH,CAAC;IAiGO,gCAAY,GAApB;QACE,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;YAC1C,CAAC,CAAC,IAAI,CAAC,wBAAwB;YAC/B,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,cAAc,CAAC,IAAI,SAAS,CAAC;IAC9D,CAAC;IAiFO,qCAAiB,GAAzB,UACE,SAAsE;QAEtE,IAAM,eAAe,GAAG,SAAS,CAAC;QAClC,OAAO,CACL,CAAC,eAAK,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC;YAC1D,CAAC,eAAe,IAAI,8BAAC,eAAe,OAAG,CAAC;YACxC,IAAI,CACL,CAAC;IACJ,CAAC;IA4ED,sBAAY,sCAAe;aAA3B;;YACE,IAAM,aAAa,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,sBAAsB,EAAE,KAAI,CAAC,CAAC;YACjE,OAAO,aAAa,IAAI,IAAI,CAAC,kBAAkB,CAAC;QAClD,CAAC;;;OAAA;IAgDD;;;;;OAKG;IACI,mDAA+B,GAAtC;;QACE,IACE,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI;YAChC,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EACrC;YACA,OAAO,CAAC,IAAI,CAAC,kBAAW,CAAC,mBAAmB,CAAC,CAAC;SAC/C;aAAM;YACL,MAAA,IAAI,CAAC,MAAM,0CAAE,+BAA+B,EAAE,CAAC;SAChD;IACH,CAAC;IAEM,+BAAW,GAAlB,UAAmB,MAAkD;;QACnE,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,CAAC,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,iCAAa,GAApB,UAAqB,MAKpB;;QACC,IAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,eAAe,EAAE,CAAC;QAEhD,IAAI,MAAM,IAAI,QAAQ,EAAE;YACtB,IAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,IAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU;gBAC1C,CAAC,CAAC,QAAQ,CAAC,KAAK;gBAChB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACtE,IAAM,YAAY,GAChB,IAAI,CAAC,GAAG,CACN,CAAC,EACD,UAAU,GAAG,CAAC,MAAA,MAAM,CAAC,YAAY,mCAAI,CAAC,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,CAAC,CACtE,GAAG,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,CAAC,CAAC,CAAC;YAC/B,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CACzB,YAAY,EACZ,YAAY,EACZ,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EACxB,IAAI,CACL,CAAC;SACH;IACH,CAAC;IAEM,gCAAY,GAAnB,UAAoB,MAKnB;;QACC,IAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAI,CAAC,CAAC,CAAC;QAC1D,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,aAAa,uCAAM,MAAM,KAAE,KAAK,OAAA,IAAG,CAAC;SAC1C;IACH,CAAC;IAEM,kCAAc,GAArB,UAAsB,MAGrB;;QACC,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,IAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QACpD,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,qCAAiB,GAAxB;;QACE,OAAO,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,iBAAiB,kDAAI,KAAI,IAAI,CAAC;IACpD,CAAC;IAEM,sCAAkB,GAAzB;;QACE,6DAA6D;QAC7D,aAAa;QACb,OAAO,CAAA,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,kBAAkB,kDAAI,KAAI,IAAI,CAAC;IACrD,CAAC;IAOD,sBAAW,8CAAuB;QALlC;;;WAGG;QACH,yDAAyD;aACzD;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAKD,sBAAW,sCAAe;QAH1B;;WAEG;aACH;YACE,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACjC,CAAC;;;OAAA;IAED;;OAEG;IACI,4CAAwB,GAA/B;QACE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAjvBM,sBAAY,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,CAAC;KACd,CAAC;IAuvBJ,gBAAC;CAAA,AAjyBD,CAA2B,eAAK,CAAC,aAAa,GAiyB7C;AAED,kBAAe,SAAS,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts
+new file mode 100644
+index 0000000..661dc81
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts
+@@ -0,0 +1,18 @@
++import type { ViewProps } from "react-native";
++import type { Int32, Double, DirectEventHandler } from "react-native/Libraries/Types/CodegenTypes";
++declare type BlankAreaEvent = Readonly<{
++    offsetStart: Int32;
++    offsetEnd: Int32;
++}>;
++interface NativeProps extends ViewProps {
++    horizontal?: boolean;
++    scrollOffset?: Double;
++    windowSize?: Double;
++    renderAheadOffset?: Double;
++    enableInstrumentation?: boolean;
++    disableAutoLayout?: boolean;
++    onBlankAreaEvent?: DirectEventHandler<BlankAreaEvent>;
++}
++declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
++export default _default;
++//# sourceMappingURL=AutoLayoutNativeComponent.d.ts.map
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts.map b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts.map
+new file mode 100644
+index 0000000..25297b9
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.d.ts.map
+@@ -0,0 +1 @@
++{"version":3,"file":"AutoLayoutNativeComponent.d.ts","sourceRoot":"","sources":["../../src/fabric/AutoLayoutNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EACV,KAAK,EACL,MAAM,EACN,kBAAkB,EACnB,MAAM,2CAA2C,CAAC;AAEnD,aAAK,cAAc,GAAG,QAAQ,CAAC;IAC7B,WAAW,EAAE,KAAK,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC;CAClB,CAAC,CAAC;AAEH,UAAU,WAAY,SAAQ,SAAS;IACrC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;CACvD;;AAED,wBAAqE"}
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js
+new file mode 100644
+index 0000000..c69ba24
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js
+@@ -0,0 +1,6 @@
++"use strict";
++Object.defineProperty(exports, "__esModule", { value: true });
++var tslib_1 = require("tslib");
++var codegenNativeComponent_1 = tslib_1.__importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
++exports.default = (0, codegenNativeComponent_1.default)("AutoLayoutView");
++//# sourceMappingURL=AutoLayoutNativeComponent.js.map
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js.map b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js.map
+new file mode 100644
+index 0000000..890db63
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/AutoLayoutNativeComponent.js.map
+@@ -0,0 +1 @@
++{"version":3,"file":"AutoLayoutNativeComponent.js","sourceRoot":"","sources":["../../src/fabric/AutoLayoutNativeComponent.ts"],"names":[],"mappings":";;;AAAA,2HAA6F;AAuB7F,kBAAe,IAAA,gCAAsB,EAAc,gBAAgB,CAAC,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts
+new file mode 100644
+index 0000000..bb8f63b
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts
+@@ -0,0 +1,8 @@
++import type { Int32 } from "react-native/Libraries/Types/CodegenTypes";
++import type { ViewProps } from "react-native";
++interface NativeProps extends ViewProps {
++    index?: Int32;
++}
++declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
++export default _default;
++//# sourceMappingURL=CellContainerNativeComponent.d.ts.map
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts.map b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts.map
+new file mode 100644
+index 0000000..993a2c3
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.d.ts.map
+@@ -0,0 +1 @@
++{"version":3,"file":"CellContainerNativeComponent.d.ts","sourceRoot":"","sources":["../../src/fabric/CellContainerNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,UAAU,WAAY,SAAQ,SAAS;IACrC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;;AAED,wBAAoE"}
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js
+new file mode 100644
+index 0000000..b21acb7
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js
+@@ -0,0 +1,6 @@
++"use strict";
++Object.defineProperty(exports, "__esModule", { value: true });
++var tslib_1 = require("tslib");
++var codegenNativeComponent_1 = tslib_1.__importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
++exports.default = (0, codegenNativeComponent_1.default)("CellContainer");
++//# sourceMappingURL=CellContainerNativeComponent.js.map
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js.map b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js.map
+new file mode 100644
+index 0000000..d7c2469
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/dist/fabric/CellContainerNativeComponent.js.map
+@@ -0,0 +1 @@
++{"version":3,"file":"CellContainerNativeComponent.js","sourceRoot":"","sources":["../../src/fabric/CellContainerNativeComponent.ts"],"names":[],"mappings":";;;AAAA,2HAA6F;AAQ7F,kBAAe,IAAA,gCAAsB,EAAc,eAAe,CAAC,CAAC"}
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/dist/tsconfig.tsbuildinfo b/node_modules/@shopify/flash-list/dist/tsconfig.tsbuildinfo
+deleted file mode 100644
+index 023b94a..0000000
+--- a/node_modules/@shopify/flash-list/dist/tsconfig.tsbuildinfo
++++ /dev/null
+@@ -1 +0,0 @@
+-{"program":{"fileNames":["../node_modules/typescript/lib/lib.es5.d.ts","../node_modules/typescript/lib/lib.es2015.d.ts","../node_modules/typescript/lib/lib.es2016.d.ts","../node_modules/typescript/lib/lib.es2017.d.ts","../node_modules/typescript/lib/lib.es2018.d.ts","../node_modules/typescript/lib/lib.es2019.d.ts","../node_modules/typescript/lib/lib.es2020.d.ts","../node_modules/typescript/lib/lib.dom.d.ts","../node_modules/typescript/lib/lib.dom.iterable.d.ts","../node_modules/typescript/lib/lib.es2015.core.d.ts","../node_modules/typescript/lib/lib.es2015.collection.d.ts","../node_modules/typescript/lib/lib.es2015.generator.d.ts","../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../node_modules/typescript/lib/lib.es2015.promise.d.ts","../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../node_modules/typescript/lib/lib.es2017.object.d.ts","../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../node_modules/typescript/lib/lib.es2017.string.d.ts","../node_modules/typescript/lib/lib.es2017.intl.d.ts","../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../node_modules/typescript/lib/lib.es2018.intl.d.ts","../node_modules/typescript/lib/lib.es2018.promise.d.ts","../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../node_modules/typescript/lib/lib.es2019.array.d.ts","../node_modules/typescript/lib/lib.es2019.object.d.ts","../node_modules/typescript/lib/lib.es2019.string.d.ts","../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../node_modules/typescript/lib/lib.es2020.date.d.ts","../node_modules/typescript/lib/lib.es2020.promise.d.ts","../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../node_modules/typescript/lib/lib.es2020.string.d.ts","../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../node_modules/typescript/lib/lib.es2020.intl.d.ts","../node_modules/typescript/lib/lib.es2020.number.d.ts","../node_modules/typescript/lib/lib.esnext.intl.d.ts","../node_modules/tslib/tslib.d.ts","../node_modules/@types/react-native/modules/BatchedBridge.d.ts","../node_modules/@types/react-native/modules/Codegen.d.ts","../node_modules/@types/react-native/modules/Devtools.d.ts","../node_modules/@types/react-native/modules/globals.d.ts","../node_modules/@types/react-native/modules/LaunchScreen.d.ts","../node_modules/@types/react/global.d.ts","../node_modules/csstype/index.d.ts","../node_modules/@types/prop-types/index.d.ts","../node_modules/@types/scheduler/tracing.d.ts","../node_modules/@types/react/index.d.ts","../node_modules/@types/react-native/private/Utilities.d.ts","../node_modules/@types/react-native/public/Insets.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/RendererProxy.d.ts","../node_modules/@types/react-native/public/ReactNativeTypes.d.ts","../node_modules/@types/react-native/Libraries/Types/CoreEventTypes.d.ts","../node_modules/@types/react-native/public/ReactNativeRenderer.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/Touchable.d.ts","../node_modules/@types/react-native/Libraries/Components/View/ViewAccessibility.d.ts","../node_modules/@types/react-native/Libraries/Components/View/ViewPropTypes.d.ts","../node_modules/@types/react-native/Libraries/Components/RefreshControl/RefreshControl.d.ts","../node_modules/@types/react-native/Libraries/Components/ScrollView/ScrollView.d.ts","../node_modules/@types/react-native/Libraries/Components/View/View.d.ts","../node_modules/@types/react-native/Libraries/Image/ImageResizeMode.d.ts","../node_modules/@types/react-native/Libraries/Image/ImageSource.d.ts","../node_modules/@types/react-native/Libraries/Image/Image.d.ts","../node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.d.ts","../node_modules/@react-native/virtualized-lists/index.d.ts","../node_modules/@types/react-native/Libraries/Lists/FlatList.d.ts","../node_modules/@types/react-native/Libraries/Lists/SectionList.d.ts","../node_modules/@types/react-native/Libraries/Text/Text.d.ts","../node_modules/@types/react-native/Libraries/Animated/Animated.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/StyleSheet.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/processColor.d.ts","../node_modules/@types/react-native/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts","../node_modules/@types/react-native/Libraries/Alert/Alert.d.ts","../node_modules/@types/react-native/Libraries/Animated/Easing.d.ts","../node_modules/@types/react-native/Libraries/Animated/useAnimatedValue.d.ts","../node_modules/@types/react-native/Libraries/vendor/emitter/EventEmitter.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/AppState/AppState.d.ts","../node_modules/@types/react-native/Libraries/BatchedBridge/NativeModules.d.ts","../node_modules/@types/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts","../node_modules/@types/react-native/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts","../node_modules/@types/react-native/Libraries/Components/Clipboard/Clipboard.d.ts","../node_modules/@types/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/NativeEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/Components/Keyboard/Keyboard.d.ts","../node_modules/@types/react-native/private/TimerMixin.d.ts","../node_modules/@types/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts","../node_modules/@types/react-native/Libraries/Components/Pressable/Pressable.d.ts","../node_modules/@types/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts","../node_modules/@types/react-native/Libraries/Components/SafeAreaView/SafeAreaView.d.ts","../node_modules/@types/react-native/Libraries/Components/StatusBar/StatusBar.d.ts","../node_modules/@types/react-native/Libraries/Components/Switch/Switch.d.ts","../node_modules/@types/react-native/Libraries/Components/TextInput/InputAccessoryView.d.ts","../node_modules/@types/react-native/Libraries/Components/TextInput/TextInput.d.ts","../node_modules/@types/react-native/Libraries/Components/ToastAndroid/ToastAndroid.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableHighlight.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableOpacity.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts","../node_modules/@types/react-native/Libraries/Components/Button.d.ts","../node_modules/@types/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.d.ts","../node_modules/@types/react-native/Libraries/Interaction/InteractionManager.d.ts","../node_modules/@types/react-native/Libraries/Interaction/PanResponder.d.ts","../node_modules/@types/react-native/Libraries/LayoutAnimation/LayoutAnimation.d.ts","../node_modules/@types/react-native/Libraries/Linking/Linking.d.ts","../node_modules/@types/react-native/Libraries/LogBox/LogBox.d.ts","../node_modules/@types/react-native/Libraries/Modal/Modal.d.ts","../node_modules/@types/react-native/Libraries/Performance/Systrace.d.ts","../node_modules/@types/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.d.ts","../node_modules/@types/react-native/Libraries/PushNotificationIOS/PushNotificationIOS.d.ts","../node_modules/@types/react-native/Libraries/Utilities/IPerformanceLogger.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/AppRegistry.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/I18nManager.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/RootTag.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/UIManager.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/requireNativeComponent.d.ts","../node_modules/@types/react-native/Libraries/Settings/Settings.d.ts","../node_modules/@types/react-native/Libraries/Share/Share.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/PlatformColorValueTypesIOS.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/PlatformColorValueTypes.d.ts","../node_modules/@types/react-native/Libraries/TurboModule/RCTExport.d.ts","../node_modules/@types/react-native/Libraries/TurboModule/TurboModuleRegistry.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Appearance.d.ts","../node_modules/@types/react-native/Libraries/Utilities/BackHandler.d.ts","../node_modules/@types/react-native/Libraries/Utilities/DevSettings.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Dimensions.d.ts","../node_modules/@types/react-native/Libraries/Utilities/PixelRatio.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Platform.d.ts","../node_modules/@types/react-native/Libraries/Vibration/Vibration.d.ts","../node_modules/@types/react-native/Libraries/YellowBox/YellowBoxDeprecated.d.ts","../node_modules/@types/react-native/Libraries/vendor/core/ErrorUtils.d.ts","../node_modules/@types/react-native/public/DeprecatedPropertiesAlias.d.ts","../node_modules/@types/react-native/index.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/ContextProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/DataProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/layoutmanager/LayoutManager.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/LayoutProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/GridLayoutProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/scrollcomponent/BaseScrollView.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ViewabilityTracker.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/VirtualRenderer.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ItemAnimator.d.ts","../node_modules/recyclerlistview/dist/reactnative/utils/ComponentCompat.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/RecyclerListView.d.ts","../node_modules/recyclerlistview/dist/reactnative/utils/AutoScroll.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/layoutmanager/GridLayoutManager.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ProgressiveListView.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/devutils/debughandlers/resize/ResizeDebugHandler.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/devutils/debughandlers/DebugHandlers.d.ts","../node_modules/recyclerlistview/dist/reactnative/index.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/StickyContainer.d.ts","../node_modules/recyclerlistview/sticky/index.d.ts","../src/native/auto-layout/AutoLayoutViewNativeComponentProps.ts","../src/native/auto-layout/AutoLayoutViewNativeComponent.ts","../src/native/auto-layout/AutoLayoutView.tsx","../src/native/cell-container/CellContainer.tsx","../src/PureComponentWrapper.tsx","../src/viewability/ViewToken.ts","../src/FlashListProps.ts","../src/utils/AverageWindow.ts","../src/utils/ContentContainerUtils.ts","../src/GridLayoutProviderWithProps.ts","../src/errors/CustomError.ts","../src/errors/ExceptionList.ts","../src/errors/Warnings.ts","../src/viewability/ViewabilityHelper.ts","../src/viewability/ViewabilityManager.ts","../node_modules/recyclerlistview/dist/reactnative/platform/reactnative/itemanimators/defaultjsanimator/DefaultJSItemAnimator.d.ts","../src/native/config/PlatformHelper.ts","../src/FlashList.tsx","../src/AnimatedFlashList.ts","../src/MasonryFlashList.tsx","../src/benchmark/AutoScrollHelper.ts","../src/benchmark/roundToDecimalPlaces.ts","../src/benchmark/JSFPSMonitor.ts","../src/benchmark/useBlankAreaTracker.ts","../src/benchmark/useBenchmark.ts","../src/benchmark/useDataMultiplier.ts","../src/benchmark/useFlatListBenchmark.ts","../src/index.ts","../src/__tests__/AverageWindow.test.ts","../src/__tests__/ContentContainerUtils.test.ts","../node_modules/@quilted/react-testing/build/typescript/types.d.ts","../node_modules/@quilted/react-testing/build/typescript/matchers/index.d.ts","../node_modules/@quilted/react-testing/build/typescript/environment.d.ts","../node_modules/@quilted/react-testing/build/typescript/implementations/test-renderer.d.ts","../node_modules/@quilted/react-testing/build/typescript/index.d.ts","../src/__tests__/helpers/mountFlashList.tsx","../src/__tests__/FlashList.test.tsx","../src/__tests__/GridLayoutProviderWithProps.test.ts","../src/__tests__/helpers/mountMasonryFlashList.tsx","../src/__tests__/MasonryFlashList.test.ts","../src/native/config/PlatformHelper.web.ts","../src/__tests__/PlatformHelper.web.test.ts","../src/__tests__/ViewabilityHelper.test.ts","../src/__tests__/useBlankAreaTracker.test.tsx","../src/native/auto-layout/AutoLayoutViewNativeComponent.android.ts","../src/native/auto-layout/AutoLayoutViewNativeComponent.ios.ts","../src/native/cell-container/CellContainer.android.ts","../src/native/cell-container/CellContainer.ios.ts","../src/native/cell-container/CellContainer.web.tsx","../src/native/config/PlatformHelper.android.ts","../src/native/config/PlatformHelper.ios.ts","../node_modules/@babel/types/lib/index.d.ts","../node_modules/@types/babel__generator/index.d.ts","../node_modules/@babel/parser/typings/babel-parser.d.ts","../node_modules/@types/babel__template/index.d.ts","../node_modules/@types/babel__traverse/index.d.ts","../node_modules/@types/babel__core/index.d.ts","../node_modules/@types/node/assert.d.ts","../node_modules/@types/node/assert/strict.d.ts","../node_modules/@types/node/globals.d.ts","../node_modules/@types/node/async_hooks.d.ts","../node_modules/@types/node/buffer.d.ts","../node_modules/@types/node/child_process.d.ts","../node_modules/@types/node/cluster.d.ts","../node_modules/@types/node/console.d.ts","../node_modules/@types/node/constants.d.ts","../node_modules/@types/node/crypto.d.ts","../node_modules/@types/node/dgram.d.ts","../node_modules/@types/node/diagnostics_channel.d.ts","../node_modules/@types/node/dns.d.ts","../node_modules/@types/node/dns/promises.d.ts","../node_modules/@types/node/domain.d.ts","../node_modules/@types/node/events.d.ts","../node_modules/@types/node/fs.d.ts","../node_modules/@types/node/fs/promises.d.ts","../node_modules/@types/node/http.d.ts","../node_modules/@types/node/http2.d.ts","../node_modules/@types/node/https.d.ts","../node_modules/@types/node/inspector.d.ts","../node_modules/@types/node/module.d.ts","../node_modules/@types/node/net.d.ts","../node_modules/@types/node/os.d.ts","../node_modules/@types/node/path.d.ts","../node_modules/@types/node/perf_hooks.d.ts","../node_modules/@types/node/process.d.ts","../node_modules/@types/node/punycode.d.ts","../node_modules/@types/node/querystring.d.ts","../node_modules/@types/node/readline.d.ts","../node_modules/@types/node/repl.d.ts","../node_modules/@types/node/stream.d.ts","../node_modules/@types/node/stream/promises.d.ts","../node_modules/@types/node/stream/consumers.d.ts","../node_modules/@types/node/stream/web.d.ts","../node_modules/@types/node/string_decoder.d.ts","../node_modules/@types/node/timers.d.ts","../node_modules/@types/node/timers/promises.d.ts","../node_modules/@types/node/tls.d.ts","../node_modules/@types/node/trace_events.d.ts","../node_modules/@types/node/tty.d.ts","../node_modules/@types/node/url.d.ts","../node_modules/@types/node/util.d.ts","../node_modules/@types/node/v8.d.ts","../node_modules/@types/node/vm.d.ts","../node_modules/@types/node/wasi.d.ts","../node_modules/@types/node/worker_threads.d.ts","../node_modules/@types/node/zlib.d.ts","../node_modules/@types/node/globals.global.d.ts","../node_modules/@types/node/index.d.ts","../node_modules/@types/graceful-fs/index.d.ts","../node_modules/@types/istanbul-lib-coverage/index.d.ts","../node_modules/@types/istanbul-lib-report/index.d.ts","../node_modules/@types/istanbul-reports/index.d.ts","../node_modules/chalk/index.d.ts","../node_modules/@sinclair/typebox/typebox.d.ts","../node_modules/@jest/schemas/build/index.d.ts","../node_modules/pretty-format/build/index.d.ts","../node_modules/jest-diff/build/index.d.ts","../node_modules/jest-matcher-utils/build/index.d.ts","../node_modules/@types/jest/index.d.ts","../node_modules/@types/json-schema/index.d.ts","../node_modules/@types/json5/index.d.ts","../node_modules/@types/parse-json/index.d.ts","../node_modules/@types/prettier/index.d.ts","../node_modules/@types/react-test-renderer/index.d.ts","../node_modules/@types/scheduler/index.d.ts","../node_modules/@types/stack-utils/index.d.ts","../node_modules/@types/websocket/index.d.ts","../node_modules/@types/yargs-parser/index.d.ts","../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f5c28122bee592cfaf5c72ed7bcc47f453b79778ffa6e301f45d21a0970719d4","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","e6b724280c694a9f588847f754198fb96c43d805f065c3a5b28bbc9594541c84","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3f149f903dd20dfeb7c80e228b659f0e436532de772469980dbd00702cc05cc1","affectsGlobalScope":true},{"version":"1272277fe7daa738e555eb6cc45ded42cc2d0f76c07294142283145d49e96186","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"43fb1d932e4966a39a41b464a12a81899d9ae5f2c829063f5571b6b87e6d2f9c","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"0d5f52b3174bee6edb81260ebcd792692c32c81fd55499d69531496f3f2b25e7","affectsGlobalScope":true},{"version":"810627a82ac06fb5166da5ada4159c4ec11978dfbb0805fe804c86406dab8357","affectsGlobalScope":true},{"version":"181f1784c6c10b751631b24ce60c7f78b20665db4550b335be179217bacc0d5f","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"75ec0bdd727d887f1b79ed6619412ea72ba3c81d92d0787ccb64bab18d261f14","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"12a310447c5d23c7d0d5ca2af606e3bd08afda69100166730ab92c62999ebb9d","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"cd483c056da900716879771893a3c9772b66c3c88f8943b4205aec738a94b1d0","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"c37f8a49593a0030eecb51bbfa270e709bec9d79a6cc3bb851ef348d4e6b26f8","affectsGlobalScope":true},"14a84fbe4ec531dcbaf5d2594fd95df107258e60ae6c6a076404f13c3f66f28e",{"version":"1c0e04c54479b57b49fec4e93556974b3d071b65d0b750897e07b3b7d2145fc5","affectsGlobalScope":true},"bc1852215dc1488e6747ca43ae0605041de22ab9a6eeef39542d29837919c414","ae6da60c852e7bacc4a49ff14a42dc1a3fdbb44e11bd9b4acb1bf3d58866ee71",{"version":"0dab023e564abb43c817779fff766e125017e606db344f9633fdba330c970532","affectsGlobalScope":true},"4cbd76eafece5844dc0a32807e68047aecbdd8d863edba651f34c050624f18df",{"version":"ecf78e637f710f340ec08d5d92b3f31b134a46a4fcf2e758690d8c46ce62cba6","affectsGlobalScope":true},"ea0aa24a32c073b8639aa1f3130ba0add0f0f2f76b314d9ba988a5cb91d7e3c4","f7b46d22a307739c145e5fddf537818038fdfffd580d79ed717f4d4d37249380","f5a8b384f182b3851cec3596ccc96cb7464f8d3469f48c74bf2befb782a19de5",{"version":"29b8a3a533884705024eab54e56465614ad167f5dd87fdc2567d8e451f747224","affectsGlobalScope":true},"4f2490e3f420ea6345cade9aee5eada76888848e053726956aaf2af8705477ea","b3ac03d0c853c0ac076a10cfef4dc21d810f54dac5899ade2b1c628c35263533","d17a689ac1bd689f37d6f0d3d9a21afac349e60633844044f7a7b7b9d6f7fd83","019650941b03d4978f62d21ae874788a665c02b54e3268ef2029b02d3b4f7561","ae591c8a4d5c7f7fa44b6965016391457d9c1fd763475f68340599a2a2987a24","fbdef0c642b82cc1713b965f07b4da8005bbbb2c026039bfdc15ca2d20769e38","c2c004e7f1a150541d06bc4a408b96e45ac1f08e0b1b35dfd07fc0f678205f95","1f2081eb2cbeb0828f9baa1dd12cf6d207f8104ae0b085ab9975d11adc7f7e6f","cda9069fc4c312ff484c1373455e4297a02d38ae3bd7d0959aad772a2809623c","c028d20108bcaa3b1fdf3514956a8a90ccf680f18672fa3c92ce5acf81d7ab23","1054f6e8774a75aaf17e7cfea4899344f69590b2db1e06da21048ed1e063c693","9533301b8f75664e1b40a8484a4fd9c77efc04aef526409c2447aab7d12ddc63","b78b5b3fdb4e30976c4263c66c0ad38fb81edcc8075a4160a39d99c6dedd35be","032b51d656feaece529823992f5a39fe9e24d44dfa21b3a149982f7787fc7bdf","5bbfdfb694b019cb2a2022fba361a7a857efc1fc2b77a892c92ebc1349b7e984","46bc25e3501d321a70d0878e82a1d47b16ab77bdf017c8fecc76343f50806a0d","42bacb33cddecbcfe3e043ee1117ba848801749e44f947626765b3e0aec74b1c","49dba0d7a37268e6ae2026e84ad4362eac7e776d816756abf649be7fa177dcd5","5f2b5ab209daae571eb9acc1fd2067ccc94e2a13644579a245875bc4f02b562f","f072acf9547f89b814b9fdb3e72f4ebb1649191591cec99db43d35383906f87f","42450dba65ba1307f27c914a8e45e0b602c6f8f78773c052e42b0b87562f081e","f5870d0ca7b0dfb7e2b9ba9abad3a2e2bffe5c711b53dab2e6e76ca2df58302b","aeb20169389e9f508b1a4eb2a30371b64d64bb7c8543120bc39a3c6b78adfcc9","2a3d3acbab8567057a943f9f56113c0144f5fc561623749fbd6bb5c2b33bf738","9cf21fdcd1beb5142a514887133fa59057e06275bb3070713f3b6d51e830ffa0","0ad4f0b67db47064b404df89c50f99552ce12d6c4bb6154255be61eb6beed094","f8a464b9999126fe1095968c266c0d9c6174612cf256379a1ed1993a87bccdc6","49f981ca657ac160b5de5919ee5602d48bc8f8aac0805107c2ce4fd41dc9a2a1","56e4e08d95a3a7886266a2b4f66b67065c340480d9f1beb73ed7578aa83c639a","eb4360d3818dcd879ee965ae2f4b3fdfdc4149db921b6be338cb7dc7c2bd6710","1c1275f325f13af001aa5873418cb497a26b4b8271f9ad20a45e33f61ea3f9d9","b33e8426136c4f9b349b02c940d23310d350179f790899733aa097ed76457061","05aab001669a230a88820be09a54031c45d9af2488b27d53d4a9c8880ce73e8f","d93a066d4b8b33335dfff910fb25abb8979f8814f8ba45ea902a1360907da1f6","41e97e42d182b4d5f0733ebaad69294faaa507d95e595f317168b8f2325da9ca","debc734fc99b6e1684ed565946bad008913c769d4d2e400d8722c0c23d079c06","5a9f7e087aacb01fa0cdbc36b703a60367239f62beed2507a507199e4c417549","c7c23798fbf564983ed69c1ced3371970d986aaed4801a6e0fb41862550dc034","921f5bce372610ae8948ade7d82decbd2cf56d263de578976189585edd0abac0","ac11f8b13beef593e2f097450a7e214b23dca0d428babd570a2f39582f10e9ab","2499beb5d3e2b4c606977bcc2e08b6ef77b2ecda70e78e0622f5af3bed95c9ba","a11057410396907b84051cbdb8b0cd7f7049d72b58d2b6ac1c14ac2608191a52","bb630c26d487cc45ed107f4f2d3c2a95434716f6367f059de734c40d288c31eb","67cbce0ccdfa96b25de478a93cc493266c152e256c3c96b3d16d1f811e3d881f","19905c928bc4c016d05d915625bb08568447266c4661232faf89f7ddc4417ccc","26204eb4c326e8c975f1b789cbf345c6820205bded6d72e57246a83918d3bc84","618f25b2d41a99216e71817a3bc578991eee86c858c3f0f62a9e70707f4d279d","4cd2947878536ec078e4115b7d53cdcd4dcecd3a8288760caa79098db4f8f61f","2129e984399e94c82b77a32b975f3371ca5ee96341ab9f123474f1a5a1a9921f","798120aaa4952d68cd4b43d6625524c62a135c2f5a3eb705caee98de2355230d","6047365397173788c34bd71fea2bf07a9036d981212efd059b33e52d2c405e97","d7e25d7c03ccf8b10972c2a3a57e29a8d9024e6dbc4ac223baf633a6e8c7145c","6c2e2dead2d80007ee44c429b925d0a7b86f8f3d4c237b2197f7db9f39545dc6","38fbc8f9610fbf4bf619854b26e28c4fbbab16dc1944c4317a4af9bf1ac08d8e","1bd0470a72e6869c330e6e978f15ef32ba2c245249aca097b410448152e8a06b","dd05d7970a92b789f7df3b2252574b2e60f1b9a3758e2839e167b498b8f77159","7092be1889127b2f319efd5d9bdcc0b5cf6fe0740e47247ed039446045518898","0a3d5dbf7c2091017e697ebf9af0a727571f5d99cb4c19e6856212a745c6c355","d05f9c767924db6fb89f6075acb64c042cebdb12779bbd1aaca12c850b772d49","d032678e20ff0f4b8ef6f1e4823b6ae37931b776e8381676dc9141999909b3d7","3e4ab0e8e96e968ac84a2484104892c881ded1757acd81b5e969b6229851f54c","d43a36641f5812794a3b4a941e3dfb5fa070f9fff64cfd6daf5291cb962c8b05","32468df81188116040636844517fbe4f67fc37af4fe565c7592353df8e11d2f3","c12b5f9bf412c891cad443ef00a378ad2d3f1301f140943414308665a7d90af8","cf1b65c20036885ed99ce1c18aa0a0ed66f42acd6d415e99b48a8fa4105c23ed","173aec8be1be982c8244df6f94880d77a9b766c8c1ec3eb0af662c8dc6da7f2e","08188020373062e07955835a996fda1aff97a89e57d469edc6b9210bd9c8926f","cad5c2c0085a3e3b74f58aa199944b25ed8d24f93f51c99ebe2463e4f1694785","3e2d93a797c41ab081fbcd80e959b7c30d5d1c358f091c22a6ebe416ef7c5e19","c440df5735a3305e7db118bf821efb597c8318910861f735372846db9f7b506b","d6d8de719a75e5d2ed9dd9d6a99296d1337259e1c96166579db50797edd72ede","32b4c732e183bf5d123f88d526ac21b71a681089c18d2d761be342df31179d94","212d16020e7dce1b5509f3b9813de73612de57c6a3d74536714eb88787b96dc3","1a63d5212341783aa49cf78d667bf2a6cd03208ea09620b2fc3e647ae07f4e0d","84ea58841272970e6e3247cba4dbb326cf22764c2f4bbcb03f1c634315bbbcb5","86f9fbecdd848d02c90f861cc9839d8f3449c518a77e77ea65362f6a4126c63b","ecdaf317a4a1e7e3540e2f1b6aae38acd78dd99d564b52f98eea7358ac74416d","c30430960f1a0552b3cdaf1ef8164fdd4f289c782a8912df5180d57bc9ddfc03","a348081c01502c9f87d39d9e4b5dd58e1111b34c62686d6e569c595a0417bb35","eff69aee13c76502a16b756cde9c451fb4b5c4234052f3b3bee9dbfe92e1b1d5","9943f44400939f4ff008a882ff71162f70ba0c2f735c9743fd4645ef5c925fc4","b7836eba6c5173a1683aee8aa1771ff339e795cb9c21411590edb910274febe4","6fe447aa7e6fabc4f6c536f2997e3b1116b7f73dbe5bf3fc8d958bad434e4a84","15d3908d453d14be4dae760122ed5d74ad789a19f1fec2edd4034e57217436e9","ef00bc701f382da70870ab7721ed8f6552a38e332e60370b93cf340b6470845c","18891a02fa046e57b43a543dddc7212086fcb04ae6c8e8f28f8605dd3ccf57ed",{"version":"5980a888624dce1b0937a0d21c623f97056501bb61a8da29cbe07f1a0be2c9a8","affectsGlobalScope":true},"590a41ccab332c66a6aa62746612b03ceb2e92cc1da58c140e90fb7ff6e8c851","dc1d2996f23fe7f0da0b2c843e05c0ac170a36b51da11e58de089d344de93c3b","78ff01b50e7e9761f239527ec70b96171bccc28a08d909243e193db03b6f6983","ed18472ee2247563a26d754dd4c8bd66383013df13ce7c2927b03cab1a27b7e8","28ac9ac1fa163e5f2321fafa49b9931908c0076216ed3c82646d79abdf79775e","07dd4bed8ddab685f82a2125bf3aa41b42e36f28c16a5aec7357b727649076fb","fc15a2216f29b825747c0c3a54d6989518dd0f4aa0b580520e5526b4a47bec8f","c656d5baf3d4a8f358fc083db04b0fda8cb8503a613a9ba42327ecbd7909773c","397c2c81eaeae1388f7459699d7606feecfc304b212eb9113407c1315746a578","c2d923e9adc26a3efe5186f3a4a72413d24c80f03b306c68c30fa146690fb101","d34782833b7d5f72486a5fb926d3d96198706ed76aeaf1d435c748ebcf9169fc","b093e56054755189dd891ea832dec40d729d110a0a3f432fff5ea5ab1078cdde","98affe620e6230a3888b445c32376e4edbf6b1b376a71f2bf9c07bee11fcdd65","1e05491bef32ff48393d605d557152735899da3d9b111ba3588a1800f2927f4a","1ff7813974b1b9a0524c1e5a99aa52a05e79fc7df7749ada75ded8c53fe1b7e0","cd8c517f54d4ff3475755b290d741c8799df3265ce73d454d8fafe423f8ff749","bf431147b104ae92d61de6b43e9f25d27e8d3eaeaffd612e0c0d3bb8e2423926","f0f21604ae8f880c0ab529f00303806fdeadc943e32a25ca063fc8fea0fa063c","8dc4f45212fba9381e1674e8bd934a588730efbb8a6681b661cad8cd09b081c5",{"version":"52bf774bd30177ebb3e450c808d8d46f67896848a942e6203ae78b65b33d0106","signature":"688c437017a53e69ff66aac2036a0d7f6263082f676a408c9998cbd87ea2ec73"},{"version":"8b6ee36fd764378c62dca37041c5a12fd5a77b9e853c78908b7ed1c90dc149e4","signature":"03846acca031c757d910dbc017d846c87574faf90bde82316fb9b8537896d5ee"},{"version":"0d089d33f31b56697d142aa7395738c0323cf761b4c79fd6bf65a54ab1ddf02f","signature":"027c87e1cb049497d4f185bc9b922ce91cad59832da8faf3411e6b298b9deb78"},{"version":"ec0982b9e7d6c1b6c80e2829c5909eefb9ecee687e60621e0bb937e8ad5d1d43","signature":"8478b617a5be940f1b4b4d19d2fc6149c21ac69c4a7e00c8a7db2c2c21aa2274"},{"version":"84c5fc9d0d22f4566791b88d5fc2c24f56508b50c9ce894ac549ebaa158b1fca","signature":"677ea66c6fa02f1cebf82df19f416a8302c7a7d10e2de265b162760fcd865eef"},{"version":"8455135ea42310a73404fa2513e212d170af1191584061f583ec1e0f6b75dd91","signature":"83e4298f0b6834e955ee6a76569d3e5b3192065d47f1daf4535bb9edb16e88cb"},{"version":"73529962207605bdc5285d5e745919b8d57b776daa0f22a14b75cd8a92d63af9","signature":"422fcd2a7fd87f05efdfaa6eab382ca607d5d54e1f175ba2efccd4aacd5433ef"},{"version":"ebe927d8a9739c9d32ef4df28c1c36cf82daa9abba7cdf3f79e320c5e99e99d8","signature":"2421f9c6b1ecedd50818719090a77e9d2748c2339c33f3d4817beebf7a39d211"},{"version":"165c56632fea46c85e2a62f1b4eae600b846ea0deacd3c137fde9bacb845c30e","signature":"79bf9e3846b43e706d181c00f3c1c50ae8fc60e587c97a16e521adc150317624"},{"version":"866e1d2cf16a41851b056a2cc0cdc5f0f00df0435376cc2c723a8c609f61fbd0","signature":"5f5bbca60f0bfed6ff714163c4e962a5e260e59db754c89ee2063403accd03e3"},{"version":"ecfa1b63e3829b310ac968b2cc1cc7016ba76ffb8532439aebecbcbc57173b99","signature":"2f1dda63ade2bd085704674523b56ede942bc8c2c37fe8ed9b9b0fdfd69b1262"},{"version":"51d2f746d7e599a5549f5a946565934b4556bb9155be1eed2c474e25f1474872","signature":"c15585fe8935ed5cfedec39b7d41ec49990973f40faaba4b3e14278861643d79"},{"version":"b1d1378906c54a2f4d230ad69d212beedd2552afe3f7ad171b7eacb4cecc26d7","signature":"f9e60e8f79a7f606f19e02e2d39a24995719767dbe587f564f970bb24e3ca29d"},{"version":"f5a156e5b3783ea0399ac0326b7ab31a00e8874c5fa9b5e26fac217da8b5adfd","signature":"cfa7179e0306fc04d93f062c96e7ae8bad58d0cc4a7aa0dd4494ff9d262b101c"},{"version":"3c9fefca9303bcfd5712de11a3cbda20b3d6e85f29019bc75cab24690fb0f90d","signature":"306683152ff5a6038cf05b03ddff85a15b1bc8e18ef268aad26b02fd8e0e8b9d"},"a11c3e55d22d6379fe0949793e2638a6b43aa6e9def4f7452c3e352a296ef8da",{"version":"2770956c9437d7d66650084891c559ff6bb94200b7e2820940fd5d5dd0efa489","signature":"2faaf4f254008bf5be0e145be10dba35dccfac7116e9083f9d697a476a8e7076"},{"version":"ceee917fd557b841b93f7e13103dfdad79d38fe9962408f538f27db03dc9368d","signature":"15003ff6ed10d259dca775c7e5f7a64b272a9c370b6085db2d42a2d4a1d81579"},{"version":"a1691ae6d70af82f3e26d9e2e021dc5063021bd9c335bfdb40dc97d3574d1b3f","signature":"cd1c566b611a70ff987a79d0465da67649a8ed7e7668feddfcdf6dceb01c09a8"},{"version":"a105417dd540f1a400f0665c877e5d7e48e2efe08f01c2e5c7272256e644faa5","signature":"b3a6ee392811d6cddb38378ebaa373d4a39aa7dc4ecac73497c6b33627e6430b"},{"version":"581b44cf6122e3ad267d6bda2428c214fef3d38b6d7249df9fa6bc240a880a78","signature":"0ca09d92d6469d906a3d1c7192a6294c7f65b75f4f7eb8072bbd1b68c7f021e1"},{"version":"2e6426c1a1ff8561aa5f01d9398426bf06e55307f688464939de3196f0d4c143","signature":"5357bd09c9816a9765e617f86a9b49f85133d0bc0f9c5e29e834f2f8e6d52acb"},{"version":"508279c48de5627ae6c30a0aee01f4391bf32450335d7f09d5dd82acbc4d13c5","signature":"11d546a505f70f9c5f8092916027d8045c280a817b709fcaf2c4e63fa026c89c"},{"version":"557f2e0a4e5ac8a59b7c3068b2b30162fb963d72d50152482ab8c414e81caf37","signature":"008eaae28119118f1c589a1e29ea7fd17277f2280d2d3bfddeacd71fd1671bb5"},{"version":"f45c172ca54fb28d64b2dd04e495f17038034e20f37bd286a9f3eeb286cf1388","signature":"75a8761564c8fc5581b062dd339ea698921baf60e52eae055c8177dfa89eba90"},{"version":"ea696a0517ad69afea472e47eb1f904aba1667f54d4557eb98b8c766469d56a2","signature":"7e125d9abc19f62d1480f6c04a45d7bb2c89153316245ae8b8e5a0234b078c4e"},{"version":"902937c505f88d8b5b32829b4c14243eb740013fd0e2f58e6485324bbfe197a6","signature":"dc7de7650e5a64fc010387db18e84d48fe8f562dbd9caac01e54f83681ac976b"},{"version":"842accda78bb1b6f494f264aae307b84d933486d607e91f6e1d3a4d2e4851783","signature":"430d9683c8e5aaab71f0e3b271c4240cd5120a91191f953722985499af51d7e6"},{"version":"45b1a895868587c78a2ddff937967669b4e1968ea72c01e1c2b6dd5993f53b36","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"99cab9373415bac71e9d2c84279782c0a361b59551d0ca8dfaee8d4c08ed3247","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},"ba1fed463e8a21ffddb67a53df3f0d818b351991723736e167d065e2de1c7183",{"version":"22e311fec88bcc49b2b1fb3c9a7c082cd84b3388c9bcc7b9ef08253f6fa74e26","affectsGlobalScope":true},"c186097fd9b86681981cdeba08c0b6bbfcd8b562ab490c25656d85fef8f10c79","0b0c483e991e81c3f26e5f2da53ff26a15994c98c8b89cda1e4156dfc2428111","3340eb7b30bdee5f0349107d4068fd6f2f4712e11a2ba68e203b2f2489350317",{"version":"2000d60bd5195730ffff0d4ce9389003917928502c455ed2a9e296d3bf1a4b42","signature":"56335d3c9b867cc8654c05e633c508dd8de0038157f9958eb8794b7c123bb90e"},{"version":"dfceb5b9355a4a9002a7c291b1c3315511977c73cb23d9c123a72567783a18c0","signature":"b1802850887a3ea11a06df1fc1c65c6579332eefba1e63b3967a73dc937a2574"},{"version":"384fc0e3fa5966f524c96f1782b9d7a005346ba1621c43d0d1d819bf39077fbc","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"7fde517b3f03bb21ec3a46ba5f85c6797f8abf27deacb862183126e2f072788e","signature":"8b310edcfec83da25bc4f3adb20a7583bc5dae56d7d06c5b1431b76d390c1b72"},{"version":"894d93831d2afcd26f7362347e4960dd6d53f4153dad08813f3670e1327e387c","signature":"b1802850887a3ea11a06df1fc1c65c6579332eefba1e63b3967a73dc937a2574"},{"version":"8f9eac2c3ae305c25d4ffeff800b9811c8d3ec6a11b142fe96d08a2bc40f6440","signature":"08d6a2d1b004bbcac4249cd5baf6e9c662adc6139939c266b42e0422ef0c68b3"},{"version":"ac8980bdd810c30c444b59cca584c9b61d5ab274fa9474d778970537f3090240","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"1c024431c672cf9c6dcdb4d30c5b625435d81a5423b9d45e8de0082e969af8a8","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"eee1b57475023853cd09dd79b8d0d6639b6b82c3baee5863c2f2022b710f4102","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"377ba49d29102653a4b0c72b3870f9c599575df7db3a3fae7a21be5327ff84e2","signature":"c47f5db4df0a5031ed84bc6ee192c412b9e2d4d5e94681af77ccdcc25c851839"},{"version":"377ba49d29102653a4b0c72b3870f9c599575df7db3a3fae7a21be5327ff84e2","signature":"c47f5db4df0a5031ed84bc6ee192c412b9e2d4d5e94681af77ccdcc25c851839"},{"version":"39833acf7547216b2f31b2279dcfec3ed1359dec8adc9d1cb87c695ebf9bff94","signature":"7292d4dc9dac6d815dc30245a4a4a4959845d3a2b84ba0166857e4b23f2d033f"},{"version":"39833acf7547216b2f31b2279dcfec3ed1359dec8adc9d1cb87c695ebf9bff94","signature":"7292d4dc9dac6d815dc30245a4a4a4959845d3a2b84ba0166857e4b23f2d033f"},{"version":"529dd364d169ab3dbbb177ccdc4987c4a6f69187f553f3d36460ab65879ad998","signature":"3919e9d5911da2254732c31942e2cdc0057056ebfc2a16d34041c76a9b58d447"},{"version":"ebea587ca6477b9db29baf75d359924c55ab490fecdc38d7c0f16e589f0d27f9","signature":"0688c25f38e78e052338305d23046c7841074b3da5709a8f9e598ed705b9932b"},{"version":"de411013305dbe5c7a1ac13d2ea16dc36e52e6efd255b4e912fe53862058c649","signature":"2faaf4f254008bf5be0e145be10dba35dccfac7116e9083f9d697a476a8e7076"},"e432b56911b58550616fc4d54c1606f65fe98c74875b81d74601f5f965767c60","cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","a46a2e69d12afe63876ec1e58d70e5dbee6d3e74132f4468f570c3d69f809f1c","93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","3b043cf9a81854a72963fdb57d1884fc4da1cf5be69b5e0a4c5b751e58cb6d88","dd5647a9ccccb2b074dca8a02b00948ac293091ebe73fdf2e6e98f718819f669","0cba3a5d7b81356222594442753cf90dd2892e5ccfe1d262aaca6896ba6c1380","a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a",{"version":"c2ab70bbc7a24c42a790890739dd8a0ba9d2e15038b40dff8163a97a5d148c00","affectsGlobalScope":true},"422dbb183fdced59425ca072c8bd09efaa77ce4e2ab928ec0d8a1ce062d2a45a",{"version":"712ba0d43b44d144dfd01593f61af6e2e21cfae83e834d297643e7973e55ed61","affectsGlobalScope":true},"1dab5ab6bcf11de47ab9db295df8c4f1d92ffa750e8f095e88c71ce4c3299628","f71f46ccd5a90566f0a37b25b23bc4684381ab2180bdf6733f4e6624474e1894",{"version":"54e65985a3ee3cec182e6a555e20974ea936fc8b8d1738c14e8ed8a42bd921d4","affectsGlobalScope":true},"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","98a3ebfa494b46265634a73459050befba5da8fdc6ca0ef9b7269421780f4ff3","34e5de87d983bc6aefef8b17658556e3157003e8d9555d3cb098c6bef0b5fbc8","cc0b61316c4f37393f1f9595e93b673f4184e9d07f4c127165a490ec4a928668","f27371653aded82b2b160f7a7033fb4a5b1534b6f6081ef7be1468f0f15327d3","c762cd6754b13a461c54b59d0ae0ab7aeef3c292c6cf889873f786ee4d8e75c9","f4ea7d5df644785bd9fbf419930cbaec118f0d8b4160037d2339b8e23c059e79",{"version":"bfea28e6162ed21a0aeed181b623dcf250aa79abf49e24a6b7e012655af36d81","affectsGlobalScope":true},"7a5459efa09ea82088234e6533a203d528c594b01787fb90fba148885a36e8b6","ae97e20f2e10dbeec193d6a2f9cd9a367a1e293e7d6b33b68bacea166afd7792","10d4796a130577d57003a77b95d8723530bbec84718e364aa2129fa8ffba0378","ad41bb744149e92adb06eb953da195115620a3f2ad48e7d3ae04d10762dae197","bf73c576885408d4a176f44a9035d798827cc5020d58284cb18d7573430d9022","7ae078ca42a670445ae0c6a97c029cb83d143d62abd1730efb33f68f0b2c0e82",{"version":"e8b18c6385ff784228a6f369694fcf1a6b475355ba89090a88de13587a9391d5","affectsGlobalScope":true},"5d0a9ea09d990b5788f867f1c79d4878f86f7384cb7dab38eecbf22f9efd063d","12eea70b5e11e924bb0543aea5eadc16ced318aa26001b453b0d561c2fd0bd1e","08777cd9318d294646b121838574e1dd7acbb22c21a03df84e1f2c87b1ad47f2","08a90bcdc717df3d50a2ce178d966a8c353fd23e5c392fd3594a6e39d9bb6304",{"version":"4cd4cff679c9b3d9239fd7bf70293ca4594583767526916af8e5d5a47d0219c7","affectsGlobalScope":true},"2a12d2da5ac4c4979401a3f6eaafa874747a37c365e4bc18aa2b171ae134d21b","002b837927b53f3714308ecd96f72ee8a053b8aeb28213d8ec6de23ed1608b66","1dc9c847473bb47279e398b22c740c83ea37a5c88bf66629666e3cf4c5b9f99c","a9e4a5a24bf2c44de4c98274975a1a705a0abbaad04df3557c2d3cd8b1727949","00fa7ce8bc8acc560dc341bbfdf37840a8c59e6a67c9bfa3fa5f36254df35db2","1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff",{"version":"806ef4cac3b3d9fa4a48d849c8e084d7c72fcd7b16d76e06049a9ed742ff79c0","affectsGlobalScope":true},"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","5f0ed51db151c2cdc4fa3bb0f44ce6066912ad001b607a34e65a96c52eb76248",{"version":"3345c276cab0e76dda86c0fb79104ff915a4580ba0f3e440870e183b1baec476","affectsGlobalScope":true},"664d8f2d59164f2e08c543981453893bc7e003e4dfd29651ce09db13e9457980","e383ff72aabf294913f8c346f5da1445ae6ad525836d28efd52cbadc01a361a6","f52fbf64c7e480271a9096763c4882d356b05cab05bf56a64e68a95313cd2ce2","59bdb65f28d7ce52ccfc906e9aaf422f8b8534b2d21c32a27d7819be5ad81df7",{"version":"3a2da34079a2567161c1359316a32e712404b56566c45332ac9dcee015ecce9f","affectsGlobalScope":true},"28a2e7383fd898c386ffdcacedf0ec0845e5d1a86b5a43f25b86bc315f556b79","3aff9c8c36192e46a84afe7b926136d520487155154ab9ba982a8b544ea8fc95","a880cf8d85af2e4189c709b0fea613741649c0e40fffb4360ec70762563d5de0","85bbf436a15bbeda4db888be3062d47f99c66fd05d7c50f0f6473a9151b6a070","9f9c49c95ecd25e0cb2587751925976cf64fd184714cb11e213749c80cf0f927","f0c75c08a71f9212c93a719a25fb0320d53f2e50ca89a812640e08f8ad8c408c",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"9cafe917bf667f1027b2bb62e2de454ecd2119c80873ad76fc41d941089753b8","3ebae8c00411116a66fca65b08228ea0cf0b72724701f9b854442100aab55aba","8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","7980bf9d2972585cdf76b5a72105f7817be0723ccb2256090f6335f45b462abe","301d7466eb591139c7d456958f732153b3400f3243f68d3321956b43a64769e9","22f13de9e2fe5f0f4724797abd3d34a1cdd6e47ef81fc4933fea3b8bf4ad524b","e3ba509d3dce019b3190ceb2f3fc88e2610ab717122dabd91a9efaa37804040d","cda0cb09b995489b7f4c57f168cd31b83dcbaa7aad49612734fb3c9c73f6e4f2",{"version":"2abad7477cf6761b55c18bea4c21b5a5dcf319748c13696df3736b35f8ac149e","affectsGlobalScope":true},"d38e588a10943bbab1d4ce03d94759bf065ff802a9a72fc57aa75a72f1725b71","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","2b8264b2fefd7367e0f20e2c04eed5d3038831fe00f5efbc110ff0131aab899b","6209c901f30cc321f4b86800d11fad3d67e73a3308f19946b1bc642af0280298","60aaac5fb1858fbd4c4eb40e01706eb227eed9eca5c665564bd146971280dbd3","74b0245c42990ed8a849df955db3f4362c81b13f799ebc981b7bec2d5b414a57","b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","4266ccd2cf1d6a281efd9c7ddf9efd7daecf76575364148bd233e18919cac3ed","70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","105b9a2234dcb06ae922f2cd8297201136d416503ff7d16c72bfc8791e9895c1"],"options":{"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"experimentalDecorators":true,"importHelpers":true,"jsx":2,"noEmitOnError":false,"noImplicitAny":true,"noUnusedLocals":true,"outDir":"./","rootDir":"../src","skipLibCheck":true,"sourceMap":true,"strictNullChecks":true,"target":1,"tsBuildInfoFile":"./tsconfig.tsbuildinfo"},"fileIdsList":[[211,260],[260],[260,273],[53,190,260],[192,194,260],[190,192,193,260],[53,260],[53,140,260],[69,260],[211,212,213,214,215,260],[211,213,260],[233,260,267],[260,269],[260,270],[260,275,277],[217,260],[220,260],[221,226,260],[222,232,233,240,249,259,260],[222,223,232,240,260],[224,260],[225,226,233,241,260],[226,249,256,260],[227,229,232,240,260],[228,260],[229,230,260],[231,232,260],[232,260],[232,233,234,249,259,260],[232,233,234,249,260],[235,240,249,259,260],[232,233,235,236,240,249,256,259,260],[235,237,249,256,259,260],[217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266],[232,238,260],[239,259,260],[229,232,240,249,260],[241,260],[242,260],[220,243,260],[244,258,260,264],[245,260],[246,260],[232,247,260],[247,248,260,262],[232,249,250,251,260],[249,251,260],[249,250,260],[252,260],[253,260],[232,254,255,260],[254,255,260],[226,240,249,256,260],[257,260],[240,258,260],[221,235,246,259,260],[226,260],[249,260,261],[260,262],[260,263],[221,226,232,234,243,249,259,260,262,264],[249,260,265],[76,77,260],[53,58,64,65,68,71,72,73,76,260],[74,260],[84,260],[53,57,82,260],[53,54,57,58,62,75,76,260],[53,76,105,106,260],[53,54,57,58,62,76,260],[82,91,260],[53,54,62,75,76,93,260],[53,55,58,61,62,65,75,76,260],[53,54,57,62,76,260],[53,54,57,62,260],[53,54,55,58,60,62,63,75,76,260],[53,76,260],[53,75,76,260],[53,54,57,58,61,62,75,76,82,93,260],[53,55,58,260],[53,54,57,60,75,76,93,103,260],[53,54,60,76,103,105,260],[53,54,57,60,62,93,103,260],[53,54,55,58,60,61,75,76,93,260],[58,260],[53,55,58,59,60,61,75,76,260],[82,260],[83,260],[53,54,55,57,58,61,66,67,75,76,260],[58,59,260],[53,64,65,70,75,76,260],[53,56,64,70,75,76,260],[53,58,62,260],[53,118,260],[53,57,260],[57,260],[76,260],[75,260],[66,74,76,260],[53,54,57,58,61,75,76,260],[128,260],[53,56,57,260],[91,260],[44,45,46,47,48,55,56,57,58,59,60,61,62,63,64,65,66,67,68,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,260],[140,260],[46,260],[49,50,51,52,260],[232,235,237,240,259,260,267],[260,287],[260,275],[260,272,276],[260,274],[151,260],[53,141,142,143,144,146,147,148,149,150,157,260],[53,140,147,150,151,260],[143,144,260],[142,143,144,147,260],[143,260],[155,260],[157,260],[144,260],[53,144,260],[141,142,143,144,145,146,147,149,150,151,152,153,154,156,260],[149,260],[158,260],[43,140,166,177,260],[43,53,140,157,159,162,163,164,166,168,169,170,171,172,174,176,260],[43,53,140,162,165,260],[43,157,166,167,168,260],[43,53,140,165,166,168,170,171,177,260],[43,53,260],[43,167,260],[43,168,260],[43,53,140,157,162,163,166,172,191,195,260],[43,140,157,177,195,260],[43,53,140,157,177,179,191,198,260],[43,200,260],[43,157,170,171,173,260],[43,53,140,166,177,191,194,260],[43,53,140,166,179,191,194,260],[43,53,177,183,194,195,260],[43,260],[43,181,260],[43,53,177,180,181,182,183,260],[43,53,157,162,177,260],[43,53,140,180,182,184,260],[43,162,163,165,166,177,178,179,180,182,183,184,185,186,260],[43,53,140,160,161,260],[43,140,160,260],[43,140,260],[43,53,140,260],[43,157,260],[43,157,175,260],[43,53,140,157,175,260],[43,140,157,166,260],[43,140,157,170,171,260],[43,140,165,173,177,260],[53,140,166],[53,157,166,169],[53,140,162,165],[157,166],[53,140,166,177],[53],[191],[53,166,177,191,194],[53,166,179,191,194],[53,177,182,183,187],[53,162,177],[140,184],[162,163,165,166,177,178,179,180,182,183,184,185,186],[53,140],[140,160],[140],[157],[53,157],[140,157,166],[140,157],[177]],"referencedMap":[[213,1],[211,2],[274,3],[192,4],[193,5],[194,6],[191,4],[190,7],[69,8],[70,9],[273,2],[216,10],[212,1],[214,11],[215,1],[268,12],[269,2],[270,13],[271,14],[278,15],[279,2],[280,2],[217,16],[218,16],[220,17],[221,18],[222,19],[223,20],[224,21],[225,22],[226,23],[227,24],[228,25],[229,26],[230,26],[231,27],[232,28],[233,29],[234,30],[219,2],[266,2],[235,31],[236,32],[237,33],[267,34],[238,35],[239,36],[240,37],[241,38],[242,39],[243,40],[244,41],[245,42],[246,43],[247,44],[248,45],[249,46],[251,47],[250,48],[252,49],[253,50],[254,51],[255,52],[256,53],[257,54],[258,55],[259,56],[260,57],[261,58],[262,59],[263,60],[264,61],[265,62],[281,2],[282,2],[51,2],[78,63],[79,2],[74,64],[80,2],[81,65],[85,66],[86,2],[87,67],[88,68],[107,69],[89,2],[90,70],[92,71],[94,72],[95,73],[96,74],[63,74],[97,75],[64,76],[98,77],[99,68],[100,78],[101,79],[102,2],[60,80],[104,81],[106,82],[105,83],[103,84],[65,75],[61,85],[62,86],[108,2],[91,87],[83,87],[84,88],[68,89],[66,2],[67,2],[109,87],[110,90],[111,2],[112,71],[71,91],[72,92],[113,2],[114,93],[115,2],[116,2],[117,2],[119,94],[120,2],[56,7],[121,7],[122,95],[123,96],[124,2],[125,97],[127,97],[126,97],[76,98],[75,99],[77,97],[73,100],[128,2],[129,101],[58,102],[130,66],[131,66],[132,103],[133,87],[118,2],[134,2],[135,2],[136,2],[137,7],[138,2],[82,2],[140,104],[44,2],[45,105],[46,106],[48,2],[47,2],[93,2],[54,2],[139,105],[55,2],[59,85],[57,7],[283,7],[49,2],[53,107],[284,2],[52,2],[285,2],[286,108],[287,2],[288,109],[272,2],[50,2],[276,110],[277,111],[275,112],[149,2],[154,113],[151,114],[158,115],[147,116],[148,117],[141,2],[142,2],[145,116],[144,118],[156,119],[155,120],[153,116],[143,121],[146,122],[157,123],[175,124],[152,2],[150,7],[159,125],[43,2],[8,2],[9,2],[11,2],[10,2],[2,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[3,2],[4,2],[23,2],[20,2],[21,2],[22,2],[24,2],[25,2],[26,2],[5,2],[27,2],[28,2],[29,2],[30,2],[6,2],[31,2],[32,2],[33,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[178,126],[177,127],[166,128],[169,129],[179,130],[164,131],[188,132],[189,133],[196,134],[197,135],[199,136],[201,137],[202,138],[195,139],[198,140],[203,141],[180,142],[182,143],[181,142],[184,144],[183,145],[185,142],[186,146],[170,142],[171,142],[172,142],[187,147],[162,148],[204,149],[205,149],[161,149],[160,131],[206,150],[207,150],[163,151],[208,131],[209,152],[210,152],[176,153],[200,154],[167,142],[168,155],[165,142],[173,156],[174,157]],"exportedModulesMap":[[213,1],[211,2],[274,3],[192,4],[193,5],[194,6],[191,4],[190,7],[69,8],[70,9],[273,2],[216,10],[212,1],[214,11],[215,1],[268,12],[269,2],[270,13],[271,14],[278,15],[279,2],[280,2],[217,16],[218,16],[220,17],[221,18],[222,19],[223,20],[224,21],[225,22],[226,23],[227,24],[228,25],[229,26],[230,26],[231,27],[232,28],[233,29],[234,30],[219,2],[266,2],[235,31],[236,32],[237,33],[267,34],[238,35],[239,36],[240,37],[241,38],[242,39],[243,40],[244,41],[245,42],[246,43],[247,44],[248,45],[249,46],[251,47],[250,48],[252,49],[253,50],[254,51],[255,52],[256,53],[257,54],[258,55],[259,56],[260,57],[261,58],[262,59],[263,60],[264,61],[265,62],[281,2],[282,2],[51,2],[78,63],[79,2],[74,64],[80,2],[81,65],[85,66],[86,2],[87,67],[88,68],[107,69],[89,2],[90,70],[92,71],[94,72],[95,73],[96,74],[63,74],[97,75],[64,76],[98,77],[99,68],[100,78],[101,79],[102,2],[60,80],[104,81],[106,82],[105,83],[103,84],[65,75],[61,85],[62,86],[108,2],[91,87],[83,87],[84,88],[68,89],[66,2],[67,2],[109,87],[110,90],[111,2],[112,71],[71,91],[72,92],[113,2],[114,93],[115,2],[116,2],[117,2],[119,94],[120,2],[56,7],[121,7],[122,95],[123,96],[124,2],[125,97],[127,97],[126,97],[76,98],[75,99],[77,97],[73,100],[128,2],[129,101],[58,102],[130,66],[131,66],[132,103],[133,87],[118,2],[134,2],[135,2],[136,2],[137,7],[138,2],[82,2],[140,104],[44,2],[45,105],[46,106],[48,2],[47,2],[93,2],[54,2],[139,105],[55,2],[59,85],[57,7],[283,7],[49,2],[53,107],[284,2],[52,2],[285,2],[286,108],[287,2],[288,109],[272,2],[50,2],[276,110],[277,111],[275,112],[149,2],[154,113],[151,114],[158,115],[147,116],[148,117],[141,2],[142,2],[145,116],[144,118],[156,119],[155,120],[153,116],[143,121],[146,122],[157,123],[175,124],[152,2],[150,7],[159,125],[43,2],[8,2],[9,2],[11,2],[10,2],[2,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[3,2],[4,2],[23,2],[20,2],[21,2],[22,2],[24,2],[25,2],[26,2],[5,2],[27,2],[28,2],[29,2],[30,2],[6,2],[31,2],[32,2],[33,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[178,158],[177,159],[166,160],[169,161],[179,162],[164,163],[196,164],[199,164],[195,165],[198,166],[184,167],[183,168],[186,169],[187,170],[162,171],[204,172],[205,172],[161,172],[160,163],[206,173],[207,173],[163,171],[208,163],[209,174],[210,174],[176,174],[200,175],[168,176],[173,177],[174,178]],"semanticDiagnosticsPerFile":[213,211,274,192,193,194,191,190,69,70,273,216,212,214,215,268,269,270,271,278,279,280,217,218,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,219,266,235,236,237,267,238,239,240,241,242,243,244,245,246,247,248,249,251,250,252,253,254,255,256,257,258,259,260,261,262,263,264,265,281,282,51,78,79,74,80,81,85,86,87,88,107,89,90,92,94,95,96,63,97,64,98,99,100,101,102,60,104,106,105,103,65,61,62,108,91,83,84,68,66,67,109,110,111,112,71,72,113,114,115,116,117,119,120,56,121,122,123,124,125,127,126,76,75,77,73,128,129,58,130,131,132,133,118,134,135,136,137,138,82,140,44,45,46,48,47,93,54,139,55,59,57,283,49,53,284,52,285,286,287,288,272,50,276,277,275,149,154,151,158,147,148,141,142,145,144,156,155,153,143,146,157,175,152,150,159,43,8,9,11,10,2,12,13,14,15,16,17,18,19,3,4,23,20,21,22,24,25,26,5,27,28,29,30,6,31,32,33,34,7,35,40,41,36,37,38,39,1,42,178,177,166,169,179,164,188,189,196,197,199,201,202,195,198,203,180,182,181,184,183,185,186,170,171,172,187,162,204,205,161,160,206,207,163,208,209,210,176,200,167,168,165,173,174]},"version":"4.7.4"}
+\ No newline at end of file
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
+index f18e92c..af1903c 100644
+--- a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
++++ b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
+@@ -4,31 +4,35 @@ import UIKit
+ 
+ /// Container for all RecyclerListView children. This will automatically remove all gaps and overlaps for GridLayouts with flexible spans.
+ /// Note: This cannot work for masonry layouts i.e, pinterest like layout
+-@objc class AutoLayoutView: UIView {
++@objc public class AutoLayoutView: UIView {
++    #if RCT_NEW_ARCH_ENABLED
++    @objc public var onBlankAreaEventHandler: ((CGFloat, CGFloat) -> Void)?
++    #endif
++    
+     @objc(onBlankAreaEvent)
+     var onBlankAreaEvent: RCTDirectEventBlock?
+ 
+-    @objc func setHorizontal(_ horizontal: Bool) {
++    @objc public func setHorizontal(_ horizontal: Bool) {
+         self.horizontal = horizontal
+     }
+ 
+-    @objc func setScrollOffset(_ scrollOffset: Int) {
++    @objc public func setScrollOffset(_ scrollOffset: Int) {
+         self.scrollOffset = CGFloat(scrollOffset)
+     }
+ 
+-    @objc func setWindowSize(_ windowSize: Int) {
++    @objc public func setWindowSize(_ windowSize: Int) {
+         self.windowSize = CGFloat(windowSize)
+     }
+ 
+-    @objc func setRenderAheadOffset(_ renderAheadOffset: Int) {
++    @objc public func setRenderAheadOffset(_ renderAheadOffset: Int) {
+         self.renderAheadOffset = CGFloat(renderAheadOffset)
+     }
+ 
+-    @objc func setEnableInstrumentation(_ enableInstrumentation: Bool) {
++    @objc public func setEnableInstrumentation(_ enableInstrumentation: Bool) {
+         self.enableInstrumentation = enableInstrumentation
+     }
+ 
+-    @objc func setDisableAutoLayout(_ disableAutoLayout: Bool) {
++    @objc public func setDisableAutoLayout(_ disableAutoLayout: Bool) {
+         self.disableAutoLayout = disableAutoLayout
+     }
+ 
+@@ -46,7 +50,15 @@ import UIKit
+     /// Tracks where first pixel is drawn in the visible window
+     private var lastMinBound: CGFloat = 0
+     
+-    override func layoutSubviews() {
++    private var viewsToLayout: [UIView] {
++        #if RCT_NEW_ARCH_ENABLED
++        return superview?.subviews ?? []
++        #else
++        return subviews
++        #endif
++    }
++
++    override public func layoutSubviews() {
+         fixLayout()
+         super.layoutSubviews()
+ 
+@@ -69,12 +81,16 @@ import UIKit
+             distanceFromWindowEnd: distanceFromWindowEnd
+         )
+ 
++        #if RCT_NEW_ARCH_ENABLED
++        onBlankAreaEventHandler?(blankOffsetStart, blankOffsetEnd)
++        #else
+         onBlankAreaEvent?(
+             [
+                 "offsetStart": blankOffsetStart,
+                 "offsetEnd": blankOffsetEnd,
+             ]
+         )
++        #endif
+     }
+ 
+     func getScrollView() -> UIScrollView? {
+@@ -85,15 +101,21 @@ import UIKit
+     /// Performance: Sort is needed. Given relatively low number of views in RecyclerListView render tree this should be a non issue.
+     private func fixLayout() {
+         guard
+-            subviews.count > 1,
++            viewsToLayout.count > 1,
+             // Fixing layout during animation can interfere with it.
+             layer.animationKeys()?.isEmpty ?? true,
+             !disableAutoLayout
+         else { return }
+-        let cellContainers = subviews
+-            .compactMap { subview -> CellContainer? in
+-                if let cellContainer = subview as? CellContainer {
++        let cellContainers = viewsToLayout
++            .compactMap { subview -> CellContainerComponentView? in
++                if let cellContainer = subview as? CellContainerComponentView {
+                     return cellContainer
++                } else if subview is AutoLayoutView {
++                    // On Fabric, due to view flattening children of AutoLayoutView are moved one level up, so they appear
++                    // as children of AutoLayoutViewComponentView in view hierarchy. viewsToLayout property takes it under
++                    // consideration, returning children of AutoLayoutViewComponentView when on Fabric. Because of that
++                    // AutoLayoutView may be on the list, in which case we want to ignore it.
++                    return nil
+                 } else {
+                     assertionFailure("CellRendererComponent outer view should always be CellContainer. Learn more here: https://shopify.github.io/flash-list/docs/usage#cellrenderercomponent.")
+                     return nil
+@@ -106,7 +128,7 @@ import UIKit
+ 
+     /// Checks for overlaps or gaps between adjacent items and then applies a correction.
+     /// Performance: RecyclerListView renders very small number of views and this is not going to trigger multiple layouts on the iOS side.
+-    private func clearGaps(for cellContainers: [CellContainer]) {
++    private func clearGaps(for cellContainers: [CellContainerComponentView]) {
+         var maxBound: CGFloat = 0
+         var minBound: CGFloat = CGFloat(Int.max)
+         var maxBoundNextCell: CGFloat = 0
+@@ -192,7 +214,7 @@ import UIKit
+         lastMinBound = minBound
+     }
+ 
+-    private func updateLastMaxBoundOverall(currentCell: CellContainer, nextCell: CellContainer) {
++    private func updateLastMaxBoundOverall(currentCell: CellContainerComponentView, nextCell: CellContainerComponentView) {
+         lastMaxBoundOverall = max(lastMaxBoundOverall, horizontal ? currentCell.frame.maxX : currentCell.frame.maxY, horizontal ? nextCell.frame.maxX : nextCell.frame.maxY)
+     }
+ 
+@@ -217,7 +239,7 @@ import UIKit
+ 
+     /// It's important to avoid correcting views outside the render window. An item that isn't being recycled might still remain in the view tree. If views outside get considered then gaps between unused items will cause algorithm to fail.
+     func isWithinBounds(
+-        _ cellContainer: CellContainer,
++        _ cellContainer: CellContainerComponentView,
+         scrollOffset: CGFloat,
+         renderAheadOffset: CGFloat,
+         windowSize: CGFloat,
+@@ -260,10 +282,10 @@ import UIKit
+     }
+ 
+     private func footerDiff() -> CGFloat {
+-        if subviews.count == 0 {
++        if viewsToLayout.count == 0 {
+             lastMaxBoundOverall = 0
+-        } else if subviews.count == 1 {
+-            let firstChild = subviews[0]
++        } else if viewsToLayout.count == 1 {
++            let firstChild = viewsToLayout[0]
+             lastMaxBoundOverall = horizontal ? firstChild.frame.maxX : firstChild.frame.maxY
+         }
+         let autoLayoutEnd = horizontal ? frame.width : frame.height
+@@ -271,6 +293,13 @@ import UIKit
+     }
+ 
+     private func footer() -> UIView? {
+-        return superview?.subviews.first(where:{($0 as? CellContainer)?.index == -1})
++        // On Fabric, AutoLayoutView is wrapped with AutoLayoutViewComponentView, so we need to go up one more level
++        #if RCT_NEW_ARCH_ENABLED
++        let parentSubviews = superview?.superview?.subviews
++        #else
++        let parentSubviews = superview?.subviews
++        #endif
++        
++        return parentSubviews?.first(where:{($0 as? CellContainerComponentView)?.index == -1})
+     }
+ }
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.h b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.h
+new file mode 100644
+index 0000000..1ae0b66
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.h
+@@ -0,0 +1,16 @@
++#ifndef AutoLayoutViewComponentView_h
++#define AutoLayoutViewComponentView_h
++
++#ifdef RCT_NEW_ARCH_ENABLED
++
++#import <UIKit/UIKit.h>
++#import <React/RCTViewComponentView.h>
++
++@interface AutoLayoutViewComponentView : RCTViewComponentView
++
++@end
++
++
++#endif /* RCT_NEW_ARCH_ENABLED */
++
++#endif /* AutoLayoutViewComponentView_h */
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.mm b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.mm
+new file mode 100644
+index 0000000..2d4295c
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewComponentView.mm
+@@ -0,0 +1,80 @@
++#ifdef RCT_NEW_ARCH_ENABLED
++#import "AutoLayoutViewComponentView.h"
++#import <React/RCTConversions.h>
++#import <React/RCTViewManager.h>
++
++#import <react/renderer/components/rnflashlist/ComponentDescriptors.h>
++#import <react/renderer/components/rnflashlist/EventEmitters.h>
++#import <react/renderer/components/rnflashlist/Props.h>
++#import <react/renderer/components/rnflashlist/RCTComponentViewHelpers.h>
++
++#import "RCTFabricComponentsPlugins.h"
++#import <RNFlashList-Swift.h>
++
++using namespace facebook::react;
++
++@interface AutoLayoutViewComponentView () <RCTAutoLayoutViewViewProtocol>
++@end
++
++@implementation AutoLayoutViewComponentView
++{
++    AutoLayoutView *_autoLayoutView;
++}
++
++- (instancetype)initWithFrame:(CGRect)frame
++{
++  if (self = [super initWithFrame:frame]) {
++    static const auto defaultProps = std::make_shared<const AutoLayoutViewProps>();
++    _props = defaultProps;
++    _autoLayoutView = [[AutoLayoutView alloc] initWithFrame:self.bounds];
++
++    // Due to view flattening, AutoLayoutView's children get moved to its parent (AutoLayoutViewComponentView) and
++    // AutoLayoutView is positioned above them consuming all events. Turning off userInteraction prevents that.
++    _autoLayoutView.userInteractionEnabled = false;
++
++    self.contentView = _autoLayoutView;
++
++    __weak AutoLayoutViewComponentView* weakSelf = self;
++    _autoLayoutView.onBlankAreaEventHandler = ^(CGFloat start, CGFloat end) {
++      AutoLayoutViewComponentView *strongSelf = weakSelf;
++      if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
++        std::dynamic_pointer_cast<const facebook::react::AutoLayoutViewEventEmitter>(strongSelf->_eventEmitter)
++          ->onBlankAreaEvent(facebook::react::AutoLayoutViewEventEmitter::OnBlankAreaEvent{
++            .offsetStart = (int) floor(start),
++            .offsetEnd = (int) floor(end),
++        });
++      }
++    };
++  }
++
++  return self;
++}
++
++#pragma mark - RCTComponentViewProtocol
++
+++ (ComponentDescriptorProvider)componentDescriptorProvider
++{
++  return concreteComponentDescriptorProvider<AutoLayoutViewComponentDescriptor>();
++}
++
++- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
++{
++    const auto &newProps = *std::static_pointer_cast<const AutoLayoutViewProps>(props);
++
++    [_autoLayoutView setHorizontal:newProps.horizontal];
++    [_autoLayoutView setScrollOffset:newProps.scrollOffset];
++    [_autoLayoutView setWindowSize:newProps.windowSize];
++    [_autoLayoutView setRenderAheadOffset:newProps.renderAheadOffset];
++    [_autoLayoutView setEnableInstrumentation:newProps.enableInstrumentation];
++    [_autoLayoutView setDisableAutoLayout:newProps.disableAutoLayout];
++
++    [super updateProps:props oldProps:oldProps];
++}
++@end
++
++Class<RCTComponentViewProtocol> AutoLayoutViewCls(void)
++{
++  return AutoLayoutViewComponentView.class;
++}
++
++#endif /* RCT_NEW_ARCH_ENABLED */
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.m b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.mm
+similarity index 100%
+rename from node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.m
+rename to node_modules/@shopify/flash-list/ios/Sources/AutoLayoutViewManager.mm
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainer.swift b/node_modules/@shopify/flash-list/ios/Sources/CellContainer.swift
+deleted file mode 100644
+index 7f09ce7..0000000
+--- a/node_modules/@shopify/flash-list/ios/Sources/CellContainer.swift
++++ /dev/null
+@@ -1,9 +0,0 @@
+-import Foundation
+-
+-@objc class CellContainer: UIView {
+-    var index: Int = -1
+-    
+-    @objc func setIndex(_ index: Int) {
+-        self.index = index
+-    }
+-}
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.h b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.h
+new file mode 100644
+index 0000000..ca1cbfe
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.h
+@@ -0,0 +1,18 @@
++#ifndef CellContainer_h
++#define CellContainer_h
++
++#import <UIKit/UIKit.h>
++
++#ifdef RCT_NEW_ARCH_ENABLED
++#import <React/RCTViewComponentView.h>
++
++@interface CellContainerComponentView : RCTViewComponentView
++#else
++@interface CellContainerComponentView : UIView
++#endif
++
++@property int64_t index;
++
++@end
++
++#endif /* CellContainer_h */
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.mm b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.mm
+new file mode 100644
+index 0000000..3a1c57e
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/ios/Sources/CellContainerComponentView.mm
+@@ -0,0 +1,57 @@
++#import "CellContainerComponentView.h"
++
++#ifdef RCT_NEW_ARCH_ENABLED
++#import <React/RCTConversions.h>
++
++#import <react/renderer/components/rnflashlist/ComponentDescriptors.h>
++#import <react/renderer/components/rnflashlist/EventEmitters.h>
++#import <react/renderer/components/rnflashlist/Props.h>
++#import <react/renderer/components/rnflashlist/RCTComponentViewHelpers.h>
++
++#import "RCTFabricComponentsPlugins.h"
++#import <RNFlashList-Swift.h>
++
++using namespace facebook::react;
++
++@interface CellContainerComponentView () <RCTCellContainerViewProtocol>
++@end
++
++@implementation CellContainerComponentView
++
++- (instancetype)initWithFrame:(CGRect)frame
++{
++    if (self = [super initWithFrame:frame]) {
++        static const auto defaultProps = std::make_shared<const CellContainerProps>();
++        _props = defaultProps;
++
++        self.userInteractionEnabled = true;
++    }
++
++    return self;
++}
++
++#pragma mark - RCTComponentViewProtocol
++
+++ (ComponentDescriptorProvider)componentDescriptorProvider
++{
++    return concreteComponentDescriptorProvider<CellContainerComponentDescriptor>();
++}
++
++- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
++{
++    const auto &newProps = *std::static_pointer_cast<const CellContainerProps>(props);
++
++    self.index = newProps.index;
++
++    [super updateProps:props oldProps:oldProps];
++}
++@end
++
++Class<RCTComponentViewProtocol> CellContainerCls(void)
++{
++    return CellContainerComponentView.class;
++}
++#else
++@implementation CellContainerComponentView
++@end
++#endif /* RCT_NEW_ARCH_ENABLED */
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.m b/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.mm
+similarity index 100%
+rename from node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.m
+rename to node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.mm
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift b/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift
+index a36fccd..dbe6c14 100644
+--- a/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift
++++ b/node_modules/@shopify/flash-list/ios/Sources/CellContainerManager.swift
+@@ -3,7 +3,7 @@ import Foundation
+ @objc(CellContainerManager)
+ class CellContainerManager: RCTViewManager {  
+     override func view() -> UIView! {
+-        return CellContainer()
++        return CellContainerComponentView()
+     }
+     
+     override static func requiresMainQueueSetup() -> Bool {
+diff --git a/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h b/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h
+index e3e23d5..7ed83ce 100644
+--- a/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h
++++ b/node_modules/@shopify/flash-list/ios/Sources/FlatListPro-Bridging-Header.h
+@@ -4,5 +4,8 @@
+ #import <React/RCTBridgeModule.h>
+ #import <React/RCTEventEmitter.h>
+ #import <React/RCTViewManager.h>
++#import <React/RCTComponent.h>
++
++#import "CellContainerComponentView.h"
+ 
+ #endif /* FlatListPro_Bridging_Header_h */
+diff --git a/node_modules/@shopify/flash-list/package.json b/node_modules/@shopify/flash-list/package.json
+index b90c287..ccca16d 100644
+--- a/node_modules/@shopify/flash-list/package.json
++++ b/node_modules/@shopify/flash-list/package.json
+@@ -25,6 +25,7 @@
+   "author": "shopify",
+   "license": "MIT",
+   "homepage": "https://shopify.github.io/flash-list/",
++  "react-native": "src/index.ts",
+   "main": "dist/index.js",
+   "types": "dist/index.d.ts",
+   "scripts": {
+@@ -64,7 +65,7 @@
+     "@react-native-community/eslint-config": "^3.0.3",
+     "@shopify/eslint-plugin": "^41.3.1",
+     "@types/jest": "^28.1.3",
+-    "@types/react-native": "0.72.2",
++    "@types/react-native": "^0.72.2",
+     "babel-jest": "^28.1.1",
+     "enhanced-resolve": "^5.9.3",
+     "eslint": "8.18.0",
+@@ -74,7 +75,7 @@
+     "prettier": "^2.7.1",
+     "react": "17.0.2",
+     "react-native": "0.68.5",
+-    "typescript": "^4.7.4"
++    "typescript": "4.8.4"
+   },
+   "files": [
+     "android",
+@@ -87,5 +88,10 @@
+   "dependencies": {
+     "recyclerlistview": "4.2.0",
+     "tslib": "2.4.0"
++  },
++  "codegenConfig": {
++    "name": "rnflashlist",
++    "type": "components",
++    "jsSrcsDir": "./src/fabric"
+   }
+ }
 diff --git a/node_modules/@shopify/flash-list/src/FlashList.tsx b/node_modules/@shopify/flash-list/src/FlashList.tsx
 index 64748fe..87dea16 100644
 --- a/node_modules/@shopify/flash-list/src/FlashList.tsx
@@ -44,3 +1313,48 @@ index 64748fe..87dea16 100644
    /**
     * Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
     * Warning: We may swap recyclerlistview for something else in the future. Use with caution.
+diff --git a/node_modules/@shopify/flash-list/src/fabric/AutoLayoutNativeComponent.ts b/node_modules/@shopify/flash-list/src/fabric/AutoLayoutNativeComponent.ts
+new file mode 100644
+index 0000000..93750de
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/src/fabric/AutoLayoutNativeComponent.ts
+@@ -0,0 +1,24 @@
++import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
++import type { ViewProps } from "react-native";
++import type {
++  Int32,
++  Double,
++  DirectEventHandler,
++} from "react-native/Libraries/Types/CodegenTypes";
++
++type BlankAreaEvent = Readonly<{
++  offsetStart: Int32;
++  offsetEnd: Int32;
++}>;
++
++interface NativeProps extends ViewProps {
++  horizontal?: boolean;
++  scrollOffset?: Double;
++  windowSize?: Double;
++  renderAheadOffset?: Double;
++  enableInstrumentation?: boolean;
++  disableAutoLayout?: boolean;
++  onBlankAreaEvent?: DirectEventHandler<BlankAreaEvent>;
++}
++
++export default codegenNativeComponent<NativeProps>("AutoLayoutView");
+diff --git a/node_modules/@shopify/flash-list/src/fabric/CellContainerNativeComponent.ts b/node_modules/@shopify/flash-list/src/fabric/CellContainerNativeComponent.ts
+new file mode 100644
+index 0000000..dd284ac
+--- /dev/null
++++ b/node_modules/@shopify/flash-list/src/fabric/CellContainerNativeComponent.ts
+@@ -0,0 +1,9 @@
++import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
++import type { Int32 } from "react-native/Libraries/Types/CodegenTypes";
++import type { ViewProps } from "react-native";
++
++interface NativeProps extends ViewProps {
++  index?: Int32;
++}
++
++export default codegenNativeComponent<NativeProps>("CellContainer");
diff --git a/react-native.config.js b/react-native.config.js
index b941493529e7..6d6dd3f5805f 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -1,9 +1,7 @@
 module.exports = {
     project: {
-        ios: {sourceDir: 'ios', unstable_reactLegacyComponentNames: ['AutoLayoutView', 'CellContainer']},
-        android: {
-            unstable_reactLegacyComponentNames: ['AutoLayoutView', 'CellContainer'],
-        },
+        ios: {sourceDir: 'ios'},
+        android: {},
     },
     assets: ['./assets/fonts/native'],
 };

From b3f17c7501bb3ed7388270ce07cda8a69737ac2a Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 17 Apr 2024 15:20:18 -0700
Subject: [PATCH 371/383] Copy over changes from
 https://github.com/Expensify/App/pull/40380

---
 .../LHNOptionsList/LHNOptionsList.tsx         | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 8c43ae542932..7521cb5f5729 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -1,9 +1,8 @@
 import {useRoute} from '@react-navigation/native';
-import type {FlashListProps} from '@shopify/flash-list';
-import {FlashList} from '@shopify/flash-list';
 import type {ReactElement} from 'react';
 import React, {memo, useCallback, useContext, useEffect, useMemo, useRef} from 'react';
-import {StyleSheet, View} from 'react-native';
+import type {FlatListProps} from 'react-native';
+import {FlatList, StyleSheet, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import Icon from '@components/Icon';
@@ -45,7 +44,7 @@ function LHNOptionsList({
     onFirstItemRendered = () => {},
 }: LHNOptionsListProps) {
     const {saveScrollOffset, getScrollOffset} = useContext(ScrollOffsetContext);
-    const flashListRef = useRef<FlashList<string>>(null);
+    const flatListRef = useRef<FlatList>(null);
     const route = useRoute();
 
     const theme = useTheme();
@@ -172,19 +171,19 @@ function LHNOptionsList({
     const previousOptionMode = usePrevious(optionMode);
 
     useEffect(() => {
-        if (previousOptionMode === null || previousOptionMode === optionMode || !flashListRef.current) {
+        if (previousOptionMode === null || previousOptionMode === optionMode || !flatListRef.current) {
             return;
         }
 
-        if (!flashListRef.current) {
+        if (!flatListRef.current) {
             return;
         }
 
         // If the option mode changes want to scroll to the top of the list because rendered items will have different height.
-        flashListRef.current.scrollToOffset({offset: 0});
+        flatListRef.current.scrollToOffset({offset: 0});
     }, [previousOptionMode, optionMode]);
 
-    const onScroll = useCallback<NonNullable<FlashListProps<string>['onScroll']>>(
+    const onScroll = useCallback<NonNullable<FlatListProps<string>['onScroll']>>(
         (e) => {
             // If the layout measurement is 0, it means the flashlist is not displayed but the onScroll may be triggered with offset value 0.
             // We should ignore this case.
@@ -199,18 +198,18 @@ function LHNOptionsList({
     const onLayout = useCallback(() => {
         const offset = getScrollOffset(route);
 
-        if (!(offset && flashListRef.current)) {
+        if (!(offset && flatListRef.current)) {
             return;
         }
 
         // We need to use requestAnimationFrame to make sure it will scroll properly on iOS.
         requestAnimationFrame(() => {
-            if (!(offset && flashListRef.current)) {
+            if (!(offset && flatListRef.current)) {
                 return;
             }
-            flashListRef.current.scrollToOffset({offset});
+            flatListRef.current.scrollToOffset({offset});
         });
-    }, [route, flashListRef, getScrollOffset]);
+    }, [route, flatListRef, getScrollOffset]);
 
     return (
         <View style={[style ?? styles.flex1, shouldShowEmptyLHN ? styles.emptyLHNWrapper : undefined]}>
@@ -224,8 +223,8 @@ function LHNOptionsList({
                     CustomSubtitle={emptyLHNSubtitle}
                 />
             ) : (
-                <FlashList
-                    ref={flashListRef}
+                <FlatList
+                    ref={flatListRef}
                     indicatorStyle="white"
                     keyboardShouldPersistTaps="always"
                     contentContainerStyle={StyleSheet.flatten(contentContainerStyles)}
@@ -233,7 +232,6 @@ function LHNOptionsList({
                     testID="lhn-options-list"
                     keyExtractor={keyExtractor}
                     renderItem={renderItem}
-                    estimatedItemSize={optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight}
                     extraData={extraData}
                     showsVerticalScrollIndicator={false}
                     onLayout={onLayout}

From f34732eda2ded7387e744a7df810820e679ecbe2 Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Wed, 17 Apr 2024 15:38:10 -0700
Subject: [PATCH 372/383] fix: remove deleted rule

---
 src/pages/home/report/ReactionList/BaseReactionList.tsx | 1 -
 src/pages/home/sidebar/BottomTabAvatar.tsx              | 1 -
 src/pages/home/sidebar/SidebarLinks.tsx                 | 1 -
 src/pages/home/sidebar/SignInButton.tsx                 | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/pages/home/report/ReactionList/BaseReactionList.tsx b/src/pages/home/report/ReactionList/BaseReactionList.tsx
index aaa8ca132ee0..6f56f8f09632 100755
--- a/src/pages/home/report/ReactionList/BaseReactionList.tsx
+++ b/src/pages/home/report/ReactionList/BaseReactionList.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable rulesdir/onyx-props-must-have-default */
 import Str from 'expensify-common/lib/str';
 import React from 'react';
 import {FlatList} from 'react-native';
diff --git a/src/pages/home/sidebar/BottomTabAvatar.tsx b/src/pages/home/sidebar/BottomTabAvatar.tsx
index f585090b3739..c928fdbc7dd8 100644
--- a/src/pages/home/sidebar/BottomTabAvatar.tsx
+++ b/src/pages/home/sidebar/BottomTabAvatar.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable rulesdir/onyx-props-must-have-default */
 import React, {useCallback} from 'react';
 import {PressableWithFeedback} from '@components/Pressable';
 import Tooltip from '@components/Tooltip';
diff --git a/src/pages/home/sidebar/SidebarLinks.tsx b/src/pages/home/sidebar/SidebarLinks.tsx
index 4114b2f15135..ac07c9f182b3 100644
--- a/src/pages/home/sidebar/SidebarLinks.tsx
+++ b/src/pages/home/sidebar/SidebarLinks.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable rulesdir/onyx-props-must-have-default */
 import React, {memo, useCallback, useEffect, useMemo, useRef} from 'react';
 import {InteractionManager, StyleSheet, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
diff --git a/src/pages/home/sidebar/SignInButton.tsx b/src/pages/home/sidebar/SignInButton.tsx
index f89deb6f65b2..1dc65bfd5050 100644
--- a/src/pages/home/sidebar/SignInButton.tsx
+++ b/src/pages/home/sidebar/SignInButton.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable rulesdir/onyx-props-must-have-default */
 import React from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';

From a936da04f00c578d1fec20d51195b5575d241221 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 17 Apr 2024 16:41:40 -0700
Subject: [PATCH 373/383] Revert "Copy over changes from
 https://github.com/Expensify/App/pull/40380"

This reverts commit b3f17c7501bb3ed7388270ce07cda8a69737ac2a.
---
 .../LHNOptionsList/LHNOptionsList.tsx         | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 7521cb5f5729..8c43ae542932 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -1,8 +1,9 @@
 import {useRoute} from '@react-navigation/native';
+import type {FlashListProps} from '@shopify/flash-list';
+import {FlashList} from '@shopify/flash-list';
 import type {ReactElement} from 'react';
 import React, {memo, useCallback, useContext, useEffect, useMemo, useRef} from 'react';
-import type {FlatListProps} from 'react-native';
-import {FlatList, StyleSheet, View} from 'react-native';
+import {StyleSheet, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import Icon from '@components/Icon';
@@ -44,7 +45,7 @@ function LHNOptionsList({
     onFirstItemRendered = () => {},
 }: LHNOptionsListProps) {
     const {saveScrollOffset, getScrollOffset} = useContext(ScrollOffsetContext);
-    const flatListRef = useRef<FlatList>(null);
+    const flashListRef = useRef<FlashList<string>>(null);
     const route = useRoute();
 
     const theme = useTheme();
@@ -171,19 +172,19 @@ function LHNOptionsList({
     const previousOptionMode = usePrevious(optionMode);
 
     useEffect(() => {
-        if (previousOptionMode === null || previousOptionMode === optionMode || !flatListRef.current) {
+        if (previousOptionMode === null || previousOptionMode === optionMode || !flashListRef.current) {
             return;
         }
 
-        if (!flatListRef.current) {
+        if (!flashListRef.current) {
             return;
         }
 
         // If the option mode changes want to scroll to the top of the list because rendered items will have different height.
-        flatListRef.current.scrollToOffset({offset: 0});
+        flashListRef.current.scrollToOffset({offset: 0});
     }, [previousOptionMode, optionMode]);
 
-    const onScroll = useCallback<NonNullable<FlatListProps<string>['onScroll']>>(
+    const onScroll = useCallback<NonNullable<FlashListProps<string>['onScroll']>>(
         (e) => {
             // If the layout measurement is 0, it means the flashlist is not displayed but the onScroll may be triggered with offset value 0.
             // We should ignore this case.
@@ -198,18 +199,18 @@ function LHNOptionsList({
     const onLayout = useCallback(() => {
         const offset = getScrollOffset(route);
 
-        if (!(offset && flatListRef.current)) {
+        if (!(offset && flashListRef.current)) {
             return;
         }
 
         // We need to use requestAnimationFrame to make sure it will scroll properly on iOS.
         requestAnimationFrame(() => {
-            if (!(offset && flatListRef.current)) {
+            if (!(offset && flashListRef.current)) {
                 return;
             }
-            flatListRef.current.scrollToOffset({offset});
+            flashListRef.current.scrollToOffset({offset});
         });
-    }, [route, flatListRef, getScrollOffset]);
+    }, [route, flashListRef, getScrollOffset]);
 
     return (
         <View style={[style ?? styles.flex1, shouldShowEmptyLHN ? styles.emptyLHNWrapper : undefined]}>
@@ -223,8 +224,8 @@ function LHNOptionsList({
                     CustomSubtitle={emptyLHNSubtitle}
                 />
             ) : (
-                <FlatList
-                    ref={flatListRef}
+                <FlashList
+                    ref={flashListRef}
                     indicatorStyle="white"
                     keyboardShouldPersistTaps="always"
                     contentContainerStyle={StyleSheet.flatten(contentContainerStyles)}
@@ -232,6 +233,7 @@ function LHNOptionsList({
                     testID="lhn-options-list"
                     keyExtractor={keyExtractor}
                     renderItem={renderItem}
+                    estimatedItemSize={optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight}
                     extraData={extraData}
                     showsVerticalScrollIndicator={false}
                     onLayout={onLayout}

From 11647a33a96b3fa5a2976f814da51257126eee7f Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 17 Apr 2024 16:42:52 -0700
Subject: [PATCH 374/383] Use FlatList in PaymentMethodList

---
 src/pages/settings/Wallet/PaymentMethodList.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index c897f07ce853..e896fcc1aabb 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -1,9 +1,8 @@
-import {FlashList} from '@shopify/flash-list';
 import lodashSortBy from 'lodash/sortBy';
 import type {ReactElement, Ref} from 'react';
 import React, {useCallback, useMemo} from 'react';
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
-import {View} from 'react-native';
+import {FlatList, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg/lib/typescript/ReactNativeSVG';
@@ -336,7 +335,7 @@ function PaymentMethodList({
     return (
         <>
             <View style={[style, {minHeight: (filteredPaymentMethods.length + (shouldShowAddBankAccount ? 1 : 0)) * variables.optionRowHeight}]}>
-                <FlashList
+                <FlatList
                     estimatedItemSize={variables.optionRowHeight}
                     data={filteredPaymentMethods}
                     renderItem={renderItem}

From a21ae1283f6faa1b10d3c2c65f0ea6325721807c Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 17 Apr 2024 16:52:03 -0700
Subject: [PATCH 375/383] Actually, add a ref to FlashList

---
 src/pages/settings/Wallet/PaymentMethodList.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index e896fcc1aabb..d4826e78d02e 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -1,8 +1,9 @@
+import {FlashList} from '@shopify/flash-list';
 import lodashSortBy from 'lodash/sortBy';
 import type {ReactElement, Ref} from 'react';
-import React, {useCallback, useMemo} from 'react';
+import React, {useCallback, useMemo, useRef} from 'react';
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
-import {FlatList, View} from 'react-native';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg/lib/typescript/ReactNativeSVG';
@@ -191,6 +192,7 @@ function PaymentMethodList({
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const flashListRef = useRef<FlashList<string>>(null);
 
     const filteredPaymentMethods = useMemo(() => {
         if (shouldShowAssignedCards) {
@@ -335,7 +337,8 @@ function PaymentMethodList({
     return (
         <>
             <View style={[style, {minHeight: (filteredPaymentMethods.length + (shouldShowAddBankAccount ? 1 : 0)) * variables.optionRowHeight}]}>
-                <FlatList
+                <FlashList
+                    ref={flashListRef}
                     estimatedItemSize={variables.optionRowHeight}
                     data={filteredPaymentMethods}
                     renderItem={renderItem}

From 97256fbe577f1e64c62938102ed67ddd2a86207d Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 17 Apr 2024 16:54:42 -0700
Subject: [PATCH 376/383] Update PaymentMethodList.tsx

---
 src/pages/settings/Wallet/PaymentMethodList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index d4826e78d02e..5aed0e01a301 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -192,7 +192,7 @@ function PaymentMethodList({
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const flashListRef = useRef<FlashList<string>>(null);
+    const flashListRef = useRef<FlashList<PaymentMethodItem>>(null);
 
     const filteredPaymentMethods = useMemo(() => {
         if (shouldShowAssignedCards) {

From 65da8af59e6781cc6deba081a6df8d025d9757ed Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 17 Apr 2024 17:30:48 -0700
Subject: [PATCH 377/383] Remove the FlashList & Ref, just use FlatList. also I
 need to fix my emulator

---
 src/pages/settings/Wallet/PaymentMethodList.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index 5aed0e01a301..2c7557133ff0 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -1,9 +1,8 @@
-import {FlashList} from '@shopify/flash-list';
 import lodashSortBy from 'lodash/sortBy';
 import type {ReactElement, Ref} from 'react';
-import React, {useCallback, useMemo, useRef} from 'react';
+import React, {useCallback, useMemo} from 'react';
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
-import {View} from 'react-native';
+import {FlatList, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg/lib/typescript/ReactNativeSVG';
@@ -192,7 +191,6 @@ function PaymentMethodList({
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const flashListRef = useRef<FlashList<PaymentMethodItem>>(null);
 
     const filteredPaymentMethods = useMemo(() => {
         if (shouldShowAssignedCards) {
@@ -337,9 +335,7 @@ function PaymentMethodList({
     return (
         <>
             <View style={[style, {minHeight: (filteredPaymentMethods.length + (shouldShowAddBankAccount ? 1 : 0)) * variables.optionRowHeight}]}>
-                <FlashList
-                    ref={flashListRef}
-                    estimatedItemSize={variables.optionRowHeight}
+                <FlatList
                     data={filteredPaymentMethods}
                     renderItem={renderItem}
                     keyExtractor={keyExtractor}

From 0eb9ef233ba5222032cb4865f9237160ddfbc92f Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 18 Apr 2024 01:34:29 +0000
Subject: [PATCH 378/383] Update version to 1.4.62-15

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 237c284700ed..795b45b3701d 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 1001046214
-        versionName "1.4.62-14"
+        versionCode 1001046215
+        versionName "1.4.62-15"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index fa153e5ec674..2246a26f814b 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.14</string>
+	<string>1.4.62.15</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index eed52462a526..0aa8a566b2b6 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.62.14</string>
+	<string>1.4.62.15</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 35dbb3c0b6cd..70e57e8fff02 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.14</string>
+	<string>1.4.62.15</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 4d78c6cfd9a2..84005e60d925 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-14",
+  "version": "1.4.62-15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-14",
+      "version": "1.4.62-15",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 7ba21eeb9161..e0f1ee825889 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-14",
+  "version": "1.4.62-15",
   "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.",

From 2491a29b39b88cae0ce7ba520e76bb1bfb1540ad Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 18 Apr 2024 02:55:03 +0000
Subject: [PATCH 379/383] Update version to 1.4.62-16

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 795b45b3701d..da439f860d96 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 1001046215
-        versionName "1.4.62-15"
+        versionCode 1001046216
+        versionName "1.4.62-16"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2246a26f814b..2452b71fdb99 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.15</string>
+	<string>1.4.62.16</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0aa8a566b2b6..0c55923f8583 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.62.15</string>
+	<string>1.4.62.16</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 70e57e8fff02..3e8adc88d852 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.15</string>
+	<string>1.4.62.16</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 84005e60d925..0884041f2268 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-15",
+  "version": "1.4.62-16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-15",
+      "version": "1.4.62-16",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index e0f1ee825889..71276370dfe7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-15",
+  "version": "1.4.62-16",
   "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.",

From 39d040029b1d4e83bfeb30782375a4812850f031 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Wed, 17 Apr 2024 20:39:12 -0700
Subject: [PATCH 380/383] Temporarily disable Android production deploys

---
 .github/workflows/platformDeploy.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index d97ea2b86269..bb850e6eda10 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -87,11 +87,12 @@ jobs:
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
-      - name: Run Fastlane production
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane android production
-        env:
-          VERSION: ${{ env.VERSION_CODE }}
+      # Note: Android production deploys are temporarily disabled until https://github.com/Expensify/App/issues/40108 is resolved
+      #      - name: Run Fastlane production
+      #        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+      #        run: bundle exec fastlane android production
+      #        env:
+      #          VERSION: ${{ env.VERSION_CODE }}
 
       - name: Archive Android sourcemaps
         uses: actions/upload-artifact@v3
@@ -158,7 +159,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           GCP_GEOLOCATION_API_KEY: $${{ secrets.GCP_GEOLOCATION_API_KEY_PRODUCTION }}
-          
+
 
       - name: Build staging desktop app
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}

From d5157821d418931fc2e57fccd26f09c80dfcc3e1 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Wed, 17 Apr 2024 20:57:34 -0700
Subject: [PATCH 381/383] Fix tests

---
 workflow_tests/mocks/platformDeployMocks.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/workflow_tests/mocks/platformDeployMocks.ts b/workflow_tests/mocks/platformDeployMocks.ts
index 504510ac8962..9d5727bbf5f5 100644
--- a/workflow_tests/mocks/platformDeployMocks.ts
+++ b/workflow_tests/mocks/platformDeployMocks.ts
@@ -38,7 +38,6 @@ const PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK = createMockStep('Run F
     'MYAPP_UPLOAD_STORE_PASSWORD',
     'MYAPP_UPLOAD_KEY_PASSWORD',
 ]);
-const PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK = createMockStep('Run Fastlane production', 'Running Fastlane production', 'ANDROID', null, ['VERSION']);
 const PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK = createMockStep('Archive Android sourcemaps', 'Archiving Android sourcemaps', 'ANDROID', ['name', 'path']);
 const PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = createMockStep(
     'Upload Android version to GitHub artifacts',
@@ -70,7 +69,6 @@ const PLATFORM_DEPLOY__ANDROID__STEP_MOCKS = [
     PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK,
     PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK,
     PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK,
-    PLATFORM_DEPLOY__ANDROID__FASTLANE_PRODUCTION__STEP_MOCK,
     PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK,
     PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK,
     PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK,

From e286be5d48a55780a313a6913351bb37368d60e5 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 18 Apr 2024 04:06:24 +0000
Subject: [PATCH 382/383] Update version to 1.4.62-17

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index da439f860d96..8cc6bb971a70 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 1001046216
-        versionName "1.4.62-16"
+        versionCode 1001046217
+        versionName "1.4.62-17"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2452b71fdb99..363a007a303b 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.16</string>
+	<string>1.4.62.17</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0c55923f8583..1cf95ee76cbc 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.62.16</string>
+	<string>1.4.62.17</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 3e8adc88d852..778041d17d2c 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.16</string>
+	<string>1.4.62.17</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 0884041f2268..64af59435abf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-16",
+  "version": "1.4.62-17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-16",
+      "version": "1.4.62-17",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 71276370dfe7..994195845f70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-16",
+  "version": "1.4.62-17",
   "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.",

From 3ec8f2f9473ee1ccee7b8fc74b60cf608ee590f5 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 18 Apr 2024 04:22:27 +0000
Subject: [PATCH 383/383] Update version to 1.4.63-0

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 4 ++--
 ios/NewExpensifyTests/Info.plist            | 4 ++--
 ios/NotificationServiceExtension/Info.plist | 4 ++--
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8cc6bb971a70..0db4b032ec9d 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 1001046217
-        versionName "1.4.62-17"
+        versionCode 1001046300
+        versionName "1.4.63-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 363a007a303b..ddcc64604581 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.62</string>
+	<string>1.4.63</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.17</string>
+	<string>1.4.63.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1cf95ee76cbc..a57ffb9500c5 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.62</string>
+	<string>1.4.63</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.17</string>
+	<string>1.4.63.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 778041d17d2c..3c8e8c1fb63f 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.62</string>
+	<string>1.4.63</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.17</string>
+	<string>1.4.63.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 64af59435abf..920fefc8242b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-17",
+  "version": "1.4.63-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.62-17",
+      "version": "1.4.63-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 994195845f70..20d066eabebe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-17",
+  "version": "1.4.63-0",
   "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.",