From 496110e0406d1b46ef39c17f8397d2e5c997bf91 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 26 Jul 2024 16:18:14 +0700
Subject: [PATCH 01/71] fix update settings button title in web

---
 src/components/LocationPermissionModal/index.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/LocationPermissionModal/index.tsx b/src/components/LocationPermissionModal/index.tsx
index 2bc4a7393822..49dfb8121167 100644
--- a/src/components/LocationPermissionModal/index.tsx
+++ b/src/components/LocationPermissionModal/index.tsx
@@ -5,7 +5,9 @@ import ConfirmModal from '@components/ConfirmModal';
 import * as Illustrations from '@components/Icon/Illustrations';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import getPlatform from '@libs/getPlatform';
 import {getLocationPermission, requestLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
+import CONST from '@src/CONST';
 import type {LocationPermissionModalProps} from './types';
 
 function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDeny, onGrant}: LocationPermissionModalProps) {
@@ -15,6 +17,8 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
+    const isWeb = getPlatform() === CONST.PLATFORM.WEB;
+
     useEffect(() => {
         if (!startPermissionFlow) {
             return;
@@ -32,8 +36,10 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
     }, [startPermissionFlow]);
 
     const handledBlockedPermission = (cb: () => void) => () => {
-        if (hasError && Linking.openSettings) {
-            Linking.openSettings();
+        if (hasError) {
+            if (Linking.openSettings) {
+                Linking.openSettings();
+            }
             setShowModal(false);
             setHasError(false);
             resetPermissionFlow();
@@ -68,7 +74,7 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
             isVisible={showModal}
             onConfirm={grantLocationPermission}
             onCancel={skipLocationPermission}
-            confirmText={hasError ? translate('common.settings') : translate('common.continue')}
+            confirmText={hasError ? (isWeb ? translate('common.buttonConfirm') : translate('common.settings')) : translate('common.continue')}
             cancelText={translate('common.notNow')}
             prompt={translate(hasError ? 'receipt.locationErrorMessage' : 'receipt.locationAccessMessage')}
             promptStyles={[styles.textLabelSupportingEmptyValue, styles.mb4]}

From b251c17a1af9824032d06ae3dbcfeac655d9f9af Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 26 Jul 2024 16:42:09 +0700
Subject: [PATCH 02/71] fix lint

---
 src/components/LocationPermissionModal/index.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/LocationPermissionModal/index.tsx b/src/components/LocationPermissionModal/index.tsx
index 49dfb8121167..53fa6928b90d 100644
--- a/src/components/LocationPermissionModal/index.tsx
+++ b/src/components/LocationPermissionModal/index.tsx
@@ -69,12 +69,20 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
         setHasError(false);
     };
 
+    const getConfirmText = (): string => {
+        if (!hasError) {
+            return translate('common.continue');
+        }
+
+        return isWeb ? translate('common.buttonConfirm') : translate('common.settings');
+    };
+
     return (
         <ConfirmModal
             isVisible={showModal}
             onConfirm={grantLocationPermission}
             onCancel={skipLocationPermission}
-            confirmText={hasError ? (isWeb ? translate('common.buttonConfirm') : translate('common.settings')) : translate('common.continue')}
+            confirmText={getConfirmText()}
             cancelText={translate('common.notNow')}
             prompt={translate(hasError ? 'receipt.locationErrorMessage' : 'receipt.locationAccessMessage')}
             promptStyles={[styles.textLabelSupportingEmptyValue, styles.mb4]}

From 162f9dffc2328afd0a2f2a554ca356304d70f31a Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Fri, 26 Jul 2024 19:57:45 +0200
Subject: [PATCH 03/71] add translations

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

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1cb58198425f..554d51771ddc 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -4153,6 +4153,7 @@ export default {
             changeCurrency: 'Change payment currency',
             cardNotFound: 'No payment card added',
             retryPaymentButton: 'Retry payment',
+            authenticatePayment: 'Authenticate payment',
             requestRefund: 'Request refund',
             requestRefundModal: {
                 phrase1: 'Getting a refund is easy, just downgrade your account before your next billing date and you’ll receive a refund.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 92936b6371ee..7657aef1b6da 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -4676,6 +4676,7 @@ export default {
             changeCurrency: 'Cambiar moneda de pago',
             cardNotFound: 'No se ha añadido ninguna tarjeta de pago',
             retryPaymentButton: 'Reintentar el pago',
+            authenticatePayment: 'Autenticar el pago',
             requestRefund: 'Solicitar reembolso',
             requestRefundModal: {
                 phrase1: 'Obtener un reembolso es fácil, simplemente baja tu cuenta de categoría antes de la próxima fecha de facturación y recibirás un reembolso.',

From fdb3a16dc808feb69d2a73504e17318972da76e0 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Fri, 26 Jul 2024 19:58:50 +0200
Subject: [PATCH 04/71] add authenticate button

---
 .../Subscription/CardSection/CardSection.tsx       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 049728a85614..df3c6809e1de 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -70,6 +70,10 @@ function CardSection() {
         Subscription.clearOutstandingBalance();
     };
 
+    const handleAuthenticatePayment = () => {
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+    };
+
     const handleBillingBannerClose = () => {
         setBillingStatus(undefined);
     };
@@ -140,6 +144,16 @@ function CardSection() {
                         large
                     />
                 )}
+                {billingStatus?.isAuthenticationRequired !== undefined && (
+                    <Button
+                        text={translate('subscription.cardSection.authenticatePayment')}
+                        isDisabled={isOffline || !billingStatus?.isAuthenticationRequired}
+                        isLoading={subscriptionRetryBillingStatusPending}
+                        onPress={handleAuthenticatePayment}
+                        style={[styles.w100, styles.mt5]}
+                        large
+                    />
+                )}
 
                 {!!account?.hasPurchases && (
                     <MenuItem

From d37081085e825b4b3f29d5f1b9f0bb0f6d8c1165 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Mon, 29 Jul 2024 14:21:28 +0200
Subject: [PATCH 05/71] updated banner

---
 src/libs/SubscriptionUtils.ts                               | 3 ++-
 src/pages/settings/Subscription/CardSection/CardSection.tsx | 5 +++--
 src/pages/settings/Subscription/CardSection/utils.ts        | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 0cc4e05f7b29..4d640f0505cc 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -175,7 +175,7 @@ function hasAmountOwed(): boolean {
  * @returns Whether there is a card authentication error.
  */
 function hasCardAuthenticatedError() {
-    return stripeCustomerId?.status === 'authentication_required' && amountOwed === 0;
+    return stripeCustomerId?.status === 'authentication_required' && getAmountOwed() === 0;
 }
 
 /**
@@ -458,6 +458,7 @@ export {
     getAmountOwed,
     getOverdueGracePeriodDate,
     getCardForSubscriptionBilling,
+    hasCardAuthenticatedError,
     hasSubscriptionGreenDotInfo,
     hasRetryBillingError,
     PAYMENT_STATUS,
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index df3c6809e1de..8973a0886be7 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -85,7 +85,8 @@ function CardSection() {
         BillingBanner = <TrialStartedBillingBanner />;
     } else if (SubscriptionUtils.hasUserFreeTrialEnded()) {
         BillingBanner = <TrialEndedBillingBanner />;
-    } else if (billingStatus) {
+    }
+    if (billingStatus) {
         BillingBanner = (
             <SubscriptionBillingBanner
                 title={billingStatus.title}
@@ -144,7 +145,7 @@ function CardSection() {
                         large
                     />
                 )}
-                {billingStatus?.isAuthenticationRequired !== undefined && (
+                {SubscriptionUtils.hasCardAuthenticatedError() && (
                     <Button
                         text={translate('subscription.cardSection.authenticatePayment')}
                         isDisabled={isOffline || !billingStatus?.isAuthenticationRequired}
diff --git a/src/pages/settings/Subscription/CardSection/utils.ts b/src/pages/settings/Subscription/CardSection/utils.ts
index 48999f1bb7cb..e97773eb82a1 100644
--- a/src/pages/settings/Subscription/CardSection/utils.ts
+++ b/src/pages/settings/Subscription/CardSection/utils.ts
@@ -28,7 +28,7 @@ function getBillingStatus(
 
     const amountOwed = SubscriptionUtils.getAmountOwed();
 
-    const subscriptionStatus = SubscriptionUtils.getSubscriptionStatus();
+    const subscriptionStatus = SubscriptionUtils.PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED;
 
     const endDate = SubscriptionUtils.getOverdueGracePeriodDate();
 
@@ -36,7 +36,7 @@ function getBillingStatus(
 
     const isCurrentCardExpired = DateUtils.isCardExpired(accountData?.cardMonth ?? 0, accountData?.cardYear ?? 0);
 
-    switch (subscriptionStatus?.status) {
+    switch (subscriptionStatus) {
         case SubscriptionUtils.PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED:
             return {
                 title: translate('subscription.billingBanner.policyOwnerAmountOwed.title'),

From 35af9345b24e372bf6c9bc1a5ecca053b3419f0a Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Mon, 29 Jul 2024 14:26:53 +0200
Subject: [PATCH 06/71] fix ts

---
 src/pages/settings/Subscription/CardSection/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Subscription/CardSection/utils.ts b/src/pages/settings/Subscription/CardSection/utils.ts
index e97773eb82a1..48999f1bb7cb 100644
--- a/src/pages/settings/Subscription/CardSection/utils.ts
+++ b/src/pages/settings/Subscription/CardSection/utils.ts
@@ -28,7 +28,7 @@ function getBillingStatus(
 
     const amountOwed = SubscriptionUtils.getAmountOwed();
 
-    const subscriptionStatus = SubscriptionUtils.PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED;
+    const subscriptionStatus = SubscriptionUtils.getSubscriptionStatus();
 
     const endDate = SubscriptionUtils.getOverdueGracePeriodDate();
 
@@ -36,7 +36,7 @@ function getBillingStatus(
 
     const isCurrentCardExpired = DateUtils.isCardExpired(accountData?.cardMonth ?? 0, accountData?.cardYear ?? 0);
 
-    switch (subscriptionStatus) {
+    switch (subscriptionStatus?.status) {
         case SubscriptionUtils.PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED:
             return {
                 title: translate('subscription.billingBanner.policyOwnerAmountOwed.title'),

From 235604fd79ee8602976768734d9688c0a975d1d0 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Thu, 1 Aug 2024 18:50:03 +0200
Subject: [PATCH 07/71] dont remove link on moda close, only on payment success

---
 .../Subscription/CardAuthenticationModal/index.tsx   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
index 80cde4cb862c..f4be7c299302 100644
--- a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
+++ b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
@@ -22,9 +22,10 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
     const [isLoading, setIsLoading] = useState(true);
+    const [isVisible, setIsVisible] = useState(false);
 
     const onModalClose = () => {
-        PaymentMethods.clearPaymentCard3dsVerification();
+        setIsVisible(false);
     };
 
     useEffect(() => {
@@ -35,6 +36,13 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
         Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION);
     }, [privateStripeCustomerID]);
 
+    useEffect(() => {
+        if (!authenticationLink) {
+            return;
+        }
+        setIsVisible(!!authenticationLink);
+    }, [authenticationLink]);
+
     const handleGBPAuthentication = useCallback(
         (event: MessageEvent<string>) => {
             const message = event.data;
@@ -56,7 +64,7 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
     return (
         <Modal
             type={CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE}
-            isVisible={!!authenticationLink}
+            isVisible={isVisible}
             onClose={onModalClose}
             onModalHide={onModalClose}
         >

From c190cd316c84323764439dd4715a9e2d5cf5ae1f Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 6 Aug 2024 01:44:37 +0200
Subject: [PATCH 08/71] fixed 3ds flow, rerender fix

---
 src/CONST.ts                                        |  1 +
 .../Subscription/CardAuthenticationModal/index.tsx  | 13 +++----------
 .../Subscription/CardSection/CardSection.tsx        |  6 +++++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 73c9bf605b47..b16ee7f37fe6 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -3888,6 +3888,7 @@ const CONST = {
     },
     STRIPE_GBP_AUTH_STATUSES: {
         SUCCEEDED: 'succeeded',
+        CARD_AUTHENTICATION_REQUIRED: 'authentication_required',
     },
     TAB: {
         NEW_CHAT_TAB_ID: 'NewChatTab',
diff --git a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
index f4be7c299302..b6dee7ee82a5 100644
--- a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
+++ b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
@@ -20,21 +20,14 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
     const styles = useThemeStyles();
     const [authenticationLink] = useOnyx(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION);
     const [session] = useOnyx(ONYXKEYS.SESSION);
-    const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
     const [isLoading, setIsLoading] = useState(true);
     const [isVisible, setIsVisible] = useState(false);
 
-    const onModalClose = () => {
+    const onModalClose = useCallback(() => {
         setIsVisible(false);
-    };
-
-    useEffect(() => {
-        if (privateStripeCustomerID?.status !== CONST.STRIPE_GBP_AUTH_STATUSES.SUCCEEDED) {
-            return;
-        }
         PaymentMethods.clearPaymentCard3dsVerification();
         Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION);
-    }, [privateStripeCustomerID]);
+    }, []);
 
     useEffect(() => {
         if (!authenticationLink) {
@@ -51,7 +44,7 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
                 onModalClose();
             }
         },
-        [session?.accountID],
+        [onModalClose, session?.accountID],
     );
 
     useEffect(() => {
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index e6f0397a7cdf..cfa4aa53c9f5 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -18,6 +18,7 @@ import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPaymentMethodDescription} from '@libs/PaymentUtils';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import * as PaymentMethods from '@userActions/PaymentMethods';
 import * as Subscription from '@userActions/Subscription';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -40,6 +41,8 @@ function CardSection() {
     const theme = useTheme();
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
     const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
     const subscriptionPlan = useSubscriptionPlan();
     const [subscriptionRetryBillingStatusPending] = useOnyx(ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING);
@@ -64,13 +67,14 @@ function CardSection() {
 
     useEffect(() => {
         setBillingStatus(CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData ?? {}));
-    }, [subscriptionRetryBillingStatusPending, subscriptionRetryBillingStatusSuccessful, subscriptionRetryBillingStatusFailed, translate, defaultCard?.accountData]);
+    }, [subscriptionRetryBillingStatusPending, subscriptionRetryBillingStatusSuccessful, subscriptionRetryBillingStatusFailed, translate, defaultCard?.accountData, privateStripeCustomerID]);
 
     const handleRetryPayment = () => {
         Subscription.clearOutstandingBalance();
     };
 
     const handleAuthenticatePayment = () => {
+        PaymentMethods.verifySetupIntent(session?.accountID ?? -1, false);
         Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
     };
 

From 992125194d378c13e1cb04842d18ff4df7531b51 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 6 Aug 2024 01:57:10 +0200
Subject: [PATCH 09/71] add wait for verifyIntent

---
 .../settings/Subscription/CardSection/CardSection.tsx  | 10 ++++++++--
 .../settings/Subscription/SubscriptionSettingsPage.tsx |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index cfa4aa53c9f5..48caeed2bb96 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -42,6 +42,7 @@ function CardSection() {
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
     const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
+    const [authenticationLink] = useOnyx(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION);
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
     const subscriptionPlan = useSubscriptionPlan();
@@ -50,7 +51,6 @@ function CardSection() {
     const [subscriptionRetryBillingStatusFailed] = useOnyx(ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED);
     const {isOffline} = useNetwork();
     const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);
-
     const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard?.accountData?.cardMonth, preferredLocale]);
 
     const requestRefund = useCallback(() => {
@@ -73,9 +73,15 @@ function CardSection() {
         Subscription.clearOutstandingBalance();
     };
 
+    useEffect(() => {
+        if (!authenticationLink || privateStripeCustomerID?.status !== CONST.STRIPE_GBP_AUTH_STATUSES.CARD_AUTHENTICATION_REQUIRED) {
+            return;
+        }
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+    }, [authenticationLink, privateStripeCustomerID?.status]);
+
     const handleAuthenticatePayment = () => {
         PaymentMethods.verifySetupIntent(session?.accountID ?? -1, false);
-        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
     };
 
     const handleBillingBannerClose = () => {
diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
index c6112ec19c8d..1694c6e3923d 100644
--- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
@@ -27,9 +27,9 @@ function SubscriptionSettingsPage() {
         Subscription.openSubscriptionPage();
     }, []);
 
-    if (!subscriptionPlan) {
-        return <NotFoundPage />;
-    }
+    // if (!subscriptionPlan) {
+    //     return <NotFoundPage />;
+    // }
 
     return (
         <ScreenWrapper

From ac4685b76093e47d018d952e92319d32a1c6898e Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 6 Aug 2024 16:36:14 +0800
Subject: [PATCH 10/71] delay the navigation so we navigate back only after the
 RHP is dismissed

---
 src/pages/ReportDetailsPage.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 88611c600d8f..ad27bf925495 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -219,12 +219,14 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
 
     const leaveChat = useCallback(() => {
         Navigation.dismissModal();
-        if (isRootGroupChat) {
-            Report.leaveGroupChat(report.reportID);
-            return;
-        }
-        const isWorkspaceMemberLeavingWorkspaceRoom = (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
-        Report.leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom);
+        Navigation.isNavigationReady().then(() => {
+            if (isRootGroupChat) {
+                Report.leaveGroupChat(report.reportID);
+                return;
+            }
+            const isWorkspaceMemberLeavingWorkspaceRoom = (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
+            Report.leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom);
+        });
     }, [isPolicyEmployee, isPolicyExpenseChat, isRootGroupChat, report.reportID, report.visibility]);
 
     const [moneyRequestReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`);

From c1cf2fe760a34d7cff7f6c1288ef424f5d79fc2e Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Tue, 6 Aug 2024 22:59:29 +0700
Subject: [PATCH 11/71] fix: change ssn input to full 9 when there's error

---
 .../PersonalInfo/substeps/ConfirmationStep.tsx           | 3 ++-
 .../PersonalInfo/substeps/SocialSecurityNumberStep.tsx   | 7 ++++---
 .../PersonalInfo/substeps/Confirmation.tsx               | 6 ++++--
 .../PersonalInfo/substeps/SocialSecurityNumber.tsx       | 9 ++++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
index ea1b70cd6074..71450b7ebf24 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
@@ -32,6 +32,7 @@ function ConfirmationStep({onNext, onMove}: SubStepProps) {
     const isLoading = walletAdditionalDetails?.isLoading ?? false;
     const error = ErrorUtils.getLatestErrorMessage(walletAdditionalDetails ?? {});
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, walletAdditionalDetailsDraft, walletAdditionalDetails), [walletAdditionalDetails, walletAdditionalDetailsDraft]);
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
 
     return (
         <SafeAreaConsumer>
@@ -76,7 +77,7 @@ function ConfirmationStep({onNext, onMove}: SubStepProps) {
                         }}
                     />
                     <MenuItemWithTopDescription
-                        description={translate('personalInfoStep.last4SSN')}
+                        description={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
                         title={values[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4]}
                         shouldShowRightIcon
                         onPress={() => {
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
index bdaa3fe98f67..297b3ac3710b 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
@@ -39,6 +39,7 @@ function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
     const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
 
     const defaultSsnLast4 = walletAdditionalDetails?.[PERSONAL_INFO_STEP_KEY.SSN_LAST_4] ?? '';
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
 
     const handleSubmit = useWalletAdditionalDetailsStepFormSubmit({
         fieldIds: STEP_FIELDS,
@@ -61,13 +62,13 @@ function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
                     <InputWrapper
                         InputComponent={TextInput}
                         inputID={PERSONAL_INFO_STEP_KEY.SSN_LAST_4}
-                        label={translate('personalInfoStep.last4SSN')}
-                        aria-label={translate('personalInfoStep.last4SSN')}
+                        label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
+                        aria-label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
                         role={CONST.ROLE.PRESENTATION}
                         containerStyles={[styles.mt6]}
                         inputMode={CONST.INPUT_MODE.NUMERIC}
                         defaultValue={defaultSsnLast4}
-                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
+                        maxLength={shouldAskForFullSSN ? 9 : CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
                         shouldSaveDraft={!isEditing}
                     />
                 </View>
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
index af1f081cc3da..9d8b3e7a79dc 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
@@ -1,7 +1,7 @@
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
@@ -42,6 +42,8 @@ function Confirmation({reimbursementAccount, reimbursementAccountDraft, onNext,
     const isLoading = reimbursementAccount?.isLoading ?? false;
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, reimbursementAccountDraft, reimbursementAccount), [reimbursementAccount, reimbursementAccountDraft]);
     const error = ErrorUtils.getLatestErrorMessage(reimbursementAccount ?? {});
+    const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
 
     return (
         <SafeAreaConsumer>
@@ -68,7 +70,7 @@ function Confirmation({reimbursementAccount, reimbursementAccountDraft, onNext,
                         }}
                     />
                     <MenuItemWithTopDescription
-                        description={translate('personalInfoStep.last4SSN')}
+                        description={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
                         title={values[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4]}
                         shouldShowRightIcon
                         onPress={() => {
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
index 390880fa65f2..2bb97114cce2 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
@@ -53,6 +53,9 @@ function SocialSecurityNumber({reimbursementAccount, onNext, isEditing}: SocialS
         shouldSaveDraft: isEditing,
     });
 
+    const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
+
     return (
         <FormProvider
             formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM}
@@ -69,13 +72,13 @@ function SocialSecurityNumber({reimbursementAccount, onNext, isEditing}: SocialS
                     <InputWrapper
                         InputComponent={TextInput}
                         inputID={PERSONAL_INFO_STEP_KEY.SSN_LAST_4}
-                        label={translate('personalInfoStep.last4SSN')}
-                        aria-label={translate('personalInfoStep.last4SSN')}
+                        label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
+                        aria-label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
                         role={CONST.ROLE.PRESENTATION}
                         containerStyles={[styles.mt6]}
                         inputMode={CONST.INPUT_MODE.NUMERIC}
                         defaultValue={defaultSsnLast4}
-                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
+                        maxLength={shouldAskForFullSSN ? 9 : CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
                         shouldSaveDraft={!isEditing}
                     />
                 </View>

From 4c22f661833861292892379f95ba3bd61df4c29e Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Tue, 6 Aug 2024 23:34:27 +0700
Subject: [PATCH 12/71] fix: typecheck

---
 .../PersonalInfo/substeps/SocialSecurityNumber.tsx              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
index 2bb97114cce2..48bd6215fac1 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
@@ -1,7 +1,7 @@
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';

From 6b68eaf1e446345f94eeba99d5eec1ffc03e7008 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 6 Aug 2024 21:57:21 +0200
Subject: [PATCH 13/71] remove lint error

---
 .../settings/Subscription/SubscriptionSettingsPage.tsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
index 1694c6e3923d..c6112ec19c8d 100644
--- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
@@ -27,9 +27,9 @@ function SubscriptionSettingsPage() {
         Subscription.openSubscriptionPage();
     }, []);
 
-    // if (!subscriptionPlan) {
-    //     return <NotFoundPage />;
-    // }
+    if (!subscriptionPlan) {
+        return <NotFoundPage />;
+    }
 
     return (
         <ScreenWrapper

From 6ed97358c07fe93ee04393fc2c58509535a208e6 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 8 Aug 2024 15:29:01 +0800
Subject: [PATCH 14/71] fix focus ready promise is resolved on modal show in
 strict mode

---
 src/components/Modal/BaseModal.tsx    |  5 ++++-
 src/components/Modal/ModalContent.tsx | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index a797f83b6c3b..65678d00911a 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -256,7 +256,10 @@ function BaseModal(
                     avoidKeyboard={avoidKeyboard}
                     customBackdrop={shouldUseCustomBackdrop ? <Overlay onPress={handleBackdropPress} /> : undefined}
                 >
-                    <ModalContent onDismiss={handleDismissModal}>
+                    <ModalContent
+                        onModalWillShow={saveFocusState}
+                        onDismiss={handleDismissModal}
+                    >
                         <PortalHost name="modal" />
                         <FocusTrapForModal
                             active={isVisible}
diff --git a/src/components/Modal/ModalContent.tsx b/src/components/Modal/ModalContent.tsx
index f71affe760ac..fb84d551cfb6 100644
--- a/src/components/Modal/ModalContent.tsx
+++ b/src/components/Modal/ModalContent.tsx
@@ -11,11 +11,17 @@ type ModalContentProps = {
      * such as closing the attachment modal through the browser's back button.
      * */
     onDismiss: () => void;
+
+    /** Callback method fired after modal content is mounted. */
+    onModalWillShow: () => void;
 };
 
-function ModalContent({children, onDismiss = () => {}}: ModalContentProps) {
+function ModalContent({children, onDismiss = () => {}, onModalWillShow = () => {}}: ModalContentProps) {
     // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    React.useEffect(() => () => onDismiss?.(), []);
+    React.useEffect(() => {
+        onModalWillShow();
+        return onDismiss;
+    }, []);
     return children;
 }
 ModalContent.displayName = 'ModalContent';

From 3e054242eebb93c616f8c96b9f680f1417b4b1ed Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 8 Aug 2024 15:29:25 +0800
Subject: [PATCH 15/71] fix initial selection

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

diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
index 4281d1ddebd3..cf5ee2e3f3cd 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
@@ -298,7 +298,7 @@ function ComposerWithSuggestions(
     const valueRef = useRef(value);
     valueRef.current = value;
 
-    const [selection, setSelection] = useState<TextSelection>(() => ({start: 0, end: 0, positionX: 0, positionY: 0}));
+    const [selection, setSelection] = useState<TextSelection>(() => ({start: value.length, end: value.length, positionX: 0, positionY: 0}));
 
     const [composerHeight, setComposerHeight] = useState(0);
 

From c60831e25ccef061a78a792654176a4d78159f19 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 8 Aug 2024 15:29:52 +0800
Subject: [PATCH 16/71] wait until the app ready to focus on input

---
 src/components/Composer/index.tsx                              | 3 ++-
 .../ComposerWithSuggestions/ComposerWithSuggestions.tsx        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Composer/index.tsx b/src/components/Composer/index.tsx
index 3889c8597843..389e41f33ee8 100755
--- a/src/components/Composer/index.tsx
+++ b/src/components/Composer/index.tsx
@@ -19,6 +19,7 @@ import * as Browser from '@libs/Browser';
 import updateIsFullComposerAvailable from '@libs/ComposerUtils/updateIsFullComposerAvailable';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
+import focusComposerWithDelay from '@libs/focusComposerWithDelay';
 import isEnterWhileComposition from '@libs/KeyboardShortcut/isEnterWhileComposition';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import CONST from '@src/CONST';
@@ -379,7 +380,7 @@ function Composer(
                             return;
                         }
 
-                        textInput.current.focus();
+                        focusComposerWithDelay(textInput.current)(true);
                     });
 
                     props.onFocus?.(e);
diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
index cf5ee2e3f3cd..5c88010cd9c9 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
@@ -591,7 +591,7 @@ function ComposerWithSuggestions(
                 return;
             }
 
-            focus(false);
+            focus(true);
         }, true);
     }, [focus, isFocused]);
 

From 720900bcf1f3929c7ebdf286532f4eed638a5e0b Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Tue, 13 Aug 2024 18:55:40 +0700
Subject: [PATCH 17/71] fix: allow full ssn input where there's error

---
 .../substeps/SocialSecurityNumberStep.tsx          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
index 297b3ac3710b..f4739ec6e57a 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
@@ -23,23 +23,27 @@ function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
+    const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
+
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
             const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
 
-            if (values.ssn && !ValidationUtils.isValidSSNLastFour(values.ssn)) {
+            if (walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN) {
+                if (values.ssn && !ValidationUtils.isValidSSNFullNine(values.ssn)) {
+                    errors.ssn = translate('additionalDetailsStep.ssnFull9Error');
+                }
+            } else if (values.ssn && !ValidationUtils.isValidSSNLastFour(values.ssn)) {
                 errors.ssn = translate('bankAccount.error.ssnLast4');
             }
 
             return errors;
         },
-        [translate],
+        [translate, walletAdditionalDetails?.errorCode],
     );
 
-    const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
-
     const defaultSsnLast4 = walletAdditionalDetails?.[PERSONAL_INFO_STEP_KEY.SSN_LAST_4] ?? '';
-    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
 
     const handleSubmit = useWalletAdditionalDetailsStepFormSubmit({
         fieldIds: STEP_FIELDS,

From 0984dbf6c1938bee0376a285a7213ccc9d2e320b Mon Sep 17 00:00:00 2001
From: zfurtak <zuzkafurtak@gmail.com>
Date: Tue, 13 Aug 2024 17:15:28 +0200
Subject: [PATCH 18/71] Introduce new fix

---
 src/components/AttachmentModal.tsx            |  1 +
 src/components/AvatarWithImagePicker.tsx      | 38 +++++++++----------
 .../ButtonWithDropdownMenu/index.tsx          |  4 +-
 src/components/PopoverMenu.tsx                | 10 +++++
 .../Navigation/AppNavigator/AuthScreens.tsx   |  6 ++-
 src/libs/actions/Modal.ts                     |  6 ++-
 .../AttachmentPickerWithMenuItems.tsx         | 15 ++++----
 .../request/step/IOURequestStepWaypoint.tsx   |  8 ++--
 src/pages/workspace/WorkspacesListPage.tsx    | 13 +++----
 .../accounting/PolicyAccountingPage.tsx       |  4 +-
 10 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/src/components/AttachmentModal.tsx b/src/components/AttachmentModal.tsx
index 164da5922b98..d9aaa17d0b6e 100644
--- a/src/components/AttachmentModal.tsx
+++ b/src/components/AttachmentModal.tsx
@@ -429,6 +429,7 @@ function AttachmentModal({
                 onSelected: () => {
                     setIsDeleteReceiptConfirmModalVisible(true);
                 },
+                shouldCallAfterModalHide: true,
             });
         }
         return menuItems;
diff --git a/src/components/AvatarWithImagePicker.tsx b/src/components/AvatarWithImagePicker.tsx
index a1b8524dd293..8a018101b63e 100644
--- a/src/components/AvatarWithImagePicker.tsx
+++ b/src/components/AvatarWithImagePicker.tsx
@@ -11,7 +11,6 @@ import * as FileUtils from '@libs/fileDownload/FileUtils';
 import getImageResolution from '@libs/fileDownload/getImageResolution';
 import type {AvatarSource} from '@libs/UserUtils';
 import variables from '@styles/variables';
-import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
@@ -44,6 +43,7 @@ type MenuItem = {
     icon: IconAsset;
     text: string;
     onSelected: () => void;
+    shouldCallAfterModalHide?: boolean;
 };
 
 type AvatarWithImagePickerProps = {
@@ -260,19 +260,19 @@ function AvatarWithImagePicker({
      * Create menu items list for avatar menu
      */
     const createMenuItems = (openPicker: OpenPicker): MenuItem[] => {
-        const menuItems = [
+        const menuItems: MenuItem[] = [
             {
                 icon: Expensicons.Upload,
                 text: translate('avatarWithImagePicker.uploadPhoto'),
-                onSelected: () =>
-                    Modal.close(() => {
-                        if (Browser.isSafari()) {
-                            return;
-                        }
-                        openPicker({
-                            onPicked: showAvatarCropModal,
-                        });
-                    }),
+                onSelected: () => {
+                    if (Browser.isSafari()) {
+                        return;
+                    }
+                    openPicker({
+                        onPicked: showAvatarCropModal,
+                    });
+                },
+                shouldCallAfterModalHide: true,
             },
         ];
 
@@ -344,14 +344,14 @@ function AvatarWithImagePicker({
                                     menuItems.push({
                                         icon: Expensicons.Eye,
                                         text: translate('avatarWithImagePicker.viewPhoto'),
-                                        onSelected: () =>
-                                            Modal.close(() => {
-                                                if (typeof onViewPhotoPress !== 'function') {
-                                                    show();
-                                                    return;
-                                                }
-                                                onViewPhotoPress();
-                                            }),
+                                        onSelected: () => {
+                                            if (typeof onViewPhotoPress !== 'function') {
+                                                show();
+                                                return;
+                                            }
+                                            onViewPhotoPress();
+                                        },
+                                        shouldCallAfterModalHide: true,
                                     });
                                 }
 
diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx
index 943d6dbb5c16..74b38f515a06 100644
--- a/src/components/ButtonWithDropdownMenu/index.tsx
+++ b/src/components/ButtonWithDropdownMenu/index.tsx
@@ -11,7 +11,6 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import mergeRefs from '@libs/mergeRefs';
-import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import type {AnchorPosition} from '@src/styles';
 import type {ButtonWithDropdownMenuProps} from './types';
@@ -178,11 +177,12 @@ function ButtonWithDropdownMenu<IValueType>({
                     menuItems={options.map((item, index) => ({
                         ...item,
                         onSelected: item.onSelected
-                            ? () => Modal.close(() => item.onSelected?.())
+                            ? () => item.onSelected?.()
                             : () => {
                                   onOptionSelected?.(item);
                                   setSelectedItemIndex(index);
                               },
+                        shouldCallAfterModalHide: true,
                     }))}
                 />
             )}
diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index e9df68d43d06..a38fedabe8ca 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -8,6 +8,8 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Browser from '@libs/Browser';
+import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import type {AnchorPosition} from '@src/styles';
 import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
@@ -35,6 +37,9 @@ type PopoverMenuItem = MenuItemProps & {
 
     /** Determines whether the menu item is disabled or not */
     disabled?: boolean;
+
+    /** Determines whether the menu item's onSelected() function is called after modal hide or not */
+    shouldCallAfterModalHide?: boolean;
 };
 
 type PopoverModalProps = Pick<ModalProps, 'animationIn' | 'animationOut' | 'animationInTiming'>;
@@ -128,6 +133,11 @@ function PopoverMenu({
             setEnteredSubMenuIndexes([...enteredSubMenuIndexes, index]);
             const selectedSubMenuItemIndex = selectedItem?.subMenuItems.findIndex((option) => option.isSelected);
             setFocusedIndex(selectedSubMenuItemIndex);
+        } else if (selectedItem.shouldCallAfterModalHide && !Browser.isSafari()) {
+            Modal.close(() => {
+                onItemSelected(selectedItem, index);
+                selectedItem.onSelected?.();
+            });
         } else {
             onItemSelected(selectedItem, index);
             selectedItem.onSelected?.();
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 071b6d8270d7..067f47494c24 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -305,7 +305,11 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
         const unsubscribeSearchShortcut = KeyboardShortcut.subscribe(
             searchShortcutConfig.shortcutKey,
             () => {
-                Modal.close(Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.CHAT_FINDER)));
+                Modal.close(
+                    Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.CHAT_FINDER)),
+                    true,
+                    true,
+                );
             },
             shortcutsOverviewShortcutConfig.descriptionKey,
             shortcutsOverviewShortcutConfig.modifiers,
diff --git a/src/libs/actions/Modal.ts b/src/libs/actions/Modal.ts
index 9cba7a359537..01ac832336ab 100644
--- a/src/libs/actions/Modal.ts
+++ b/src/libs/actions/Modal.ts
@@ -5,6 +5,7 @@ const closeModals: Array<(isNavigating?: boolean) => void> = [];
 
 let onModalClose: null | (() => void);
 let isNavigate: undefined | boolean;
+let shouldCloseAll: boolean | undefined;
 
 /**
  * Allows other parts of the app to call modal close function
@@ -39,12 +40,13 @@ function closeTop() {
 /**
  * Close modal in other parts of the app
  */
-function close(onModalCloseCallback: () => void, isNavigating = true) {
+function close(onModalCloseCallback: () => void, isNavigating = true, shouldCloseAllModals = false) {
     if (closeModals.length === 0) {
         onModalCloseCallback();
         return;
     }
     onModalClose = onModalCloseCallback;
+    shouldCloseAll = shouldCloseAllModals;
     isNavigate = isNavigating;
     closeTop();
 }
@@ -53,7 +55,7 @@ function onModalDidClose() {
     if (!onModalClose) {
         return;
     }
-    if (closeModals.length) {
+    if (closeModals.length && shouldCloseAll) {
         closeTop();
         return;
     }
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index 5d7b5b1390c2..6e3c3a48de74 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -23,7 +23,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as IOU from '@userActions/IOU';
-import * as Modal from '@userActions/Modal';
 import * as Report from '@userActions/Report';
 import * as Task from '@userActions/Task';
 import type {IOUType} from '@src/CONST';
@@ -225,13 +224,13 @@ function AttachmentPickerWithMenuItems({
                     {
                         icon: Expensicons.Paperclip,
                         text: translate('reportActionCompose.addAttachment'),
-                        onSelected: () =>
-                            Modal.close(() => {
-                                if (Browser.isSafari()) {
-                                    return;
-                                }
-                                triggerAttachmentPicker();
-                            }),
+                        onSelected: () => {
+                            if (Browser.isSafari()) {
+                                return;
+                            }
+                            triggerAttachmentPicker();
+                        },
+                        shouldCallAfterModalHide: true,
                     },
                 ];
                 return (
diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
index 71c42acefdaa..802967345fb6 100644
--- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
+++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
@@ -23,7 +23,6 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import * as Modal from '@userActions/Modal';
 import * as Transaction from '@userActions/Transaction';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -179,11 +178,10 @@ function IOURequestStepWaypoint({
                             icon: Expensicons.Trashcan,
                             text: translate('distance.deleteWaypoint'),
                             onSelected: () => {
-                                Modal.close(() => {
-                                    setRestoreFocusType(undefined);
-                                    setIsDeleteStopModalOpen(true);
-                                });
+                                setRestoreFocusType(undefined);
+                                setIsDeleteStopModalOpen(true);
                             },
+                            shouldCallAfterModalHide: true,
                         },
                     ]}
                 />
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 94fb454c4a2d..d4ff46e268f8 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -32,7 +32,6 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import type {AvatarSource} from '@libs/UserUtils';
 import * as App from '@userActions/App';
-import * as Modal from '@userActions/Modal';
 import * as Policy from '@userActions/Policy/Policy';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
@@ -162,12 +161,12 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                 threeDotsMenuItems.push({
                     icon: Expensicons.Trashcan,
                     text: translate('workspace.common.delete'),
-                    onSelected: () =>
-                        Modal.close(() => {
-                            setPolicyIDToDelete(item.policyID ?? '-1');
-                            setPolicyNameToDelete(item.title);
-                            setIsDeleteModalOpen(true);
-                        }),
+                    onSelected: () => {
+                        setPolicyIDToDelete(item.policyID ?? '-1');
+                        setPolicyNameToDelete(item.title);
+                        setIsDeleteModalOpen(true);
+                    },
+                    shouldCallAfterModalHide: true,
                 });
             }
 
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index ffde9cb25de0..7cd61a09e40e 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -47,7 +47,6 @@ import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnec
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import type {AnchorPosition} from '@styles/index';
 import {getTrackingCategories} from '@userActions/connections/ConnectToXero';
-import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -249,7 +248,8 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
             {
                 icon: Expensicons.Trashcan,
                 text: translate('workspace.accounting.disconnect'),
-                onSelected: () => Modal.close(() => setIsDisconnectModalOpen(true)),
+                onSelected: () => setIsDisconnectModalOpen(true),
+                shouldCallAfterModalHide: true,
             },
         ],
         [translate, policyID, isOffline, connectedIntegration],

From 449f22ab1025ac1d29dafa451126c89e10765599 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 13 Aug 2024 17:53:03 +0200
Subject: [PATCH 19/71] add AmountWithoutCurrencyForm component

---
 src/CONST.ts                                 |  1 +
 src/components/AmountWithoutCurrencyForm.tsx | 55 ++++++++++++++++++++
 src/libs/SearchUtils.ts                      |  5 ++
 3 files changed, 61 insertions(+)
 create mode 100644 src/components/AmountWithoutCurrencyForm.tsx

diff --git a/src/CONST.ts b/src/CONST.ts
index 84b393a1f5ae..dfae746ab178 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1187,6 +1187,7 @@ const CONST = {
         VISIBLE_PASSWORD: 'visible-password',
         ASCII_CAPABLE: 'ascii-capable',
         NUMBER_PAD: 'number-pad',
+        DECIMAL_PAD: 'decimal-pad',
     },
 
     INPUT_MODE: {
diff --git a/src/components/AmountWithoutCurrencyForm.tsx b/src/components/AmountWithoutCurrencyForm.tsx
new file mode 100644
index 000000000000..0c24bf47e5da
--- /dev/null
+++ b/src/components/AmountWithoutCurrencyForm.tsx
@@ -0,0 +1,55 @@
+import React, {useCallback, useMemo} from 'react';
+import useLocalize from '@hooks/useLocalize';
+import {replaceAllDigits, stripSpacesFromAmount, validateAmount} from '@libs/MoneyRequestUtils';
+import {replaceCommaWithDot} from '@libs/SearchUtils';
+import CONST from '@src/CONST';
+import TextInput from './TextInput';
+import type {BaseTextInputProps} from './TextInput/BaseTextInput/types';
+
+type AmountFormProps = {
+    /** Amount supplied by the FormProvider */
+    value?: string;
+
+    /** Callback to update the amount in the FormProvider */
+    onInputChange?: (value: string) => void;
+} & Partial<BaseTextInputProps>;
+
+function AmountWithoutCurrencyForm({value: amount, onInputChange, ...rest}: AmountFormProps) {
+    const {toLocaleDigit} = useLocalize();
+
+    const currentAmount = useMemo(() => (typeof amount === 'string' ? amount : ''), [amount]);
+
+    /**
+     * Sets the selection and the amount accordingly to the value passed to the input
+     * @param newAmount - Changed amount from user input
+     */
+    const setNewAmount = useCallback(
+        (newAmount: string) => {
+            // Remove spaces from the newAmount value because Safari on iOS adds spaces when pasting a copied value
+            // More info: https://github.com/Expensify/App/issues/16974
+            const newAmountWithoutSpaces = stripSpacesFromAmount(newAmount);
+            const replacedCommasAmount = replaceCommaWithDot(newAmountWithoutSpaces);
+            if (!validateAmount(replacedCommasAmount, 3)) {
+                return;
+            }
+            onInputChange?.(replacedCommasAmount);
+        },
+        [onInputChange],
+    );
+
+    const formattedAmount = replaceAllDigits(currentAmount, toLocaleDigit);
+
+    return (
+        <TextInput
+            value={formattedAmount}
+            onChangeText={setNewAmount}
+            keyboardType={CONST.KEYBOARD_TYPE.DECIMAL_PAD}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...rest}
+        />
+    );
+}
+
+AmountWithoutCurrencyForm.displayName = 'AmountWithoutCurrencyForm';
+
+export default AmountWithoutCurrencyForm;
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 9ed9a97821bb..f7512bf826ee 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -74,6 +74,10 @@ function getTransactionItemCommonFormattedProperties(
     };
 }
 
+function replaceCommaWithDot(amount: string): string {
+    return amount.replace(/,/g, '.');
+}
+
 function isSearchDataType(type: string): type is SearchDataTypes {
     const searchDataTypes: string[] = Object.values(CONST.SEARCH.DATA_TYPES);
     return searchDataTypes.includes(type);
@@ -574,4 +578,5 @@ export {
     normalizeQuery,
     shouldShowYear,
     getExpenseTypeTranslationKey,
+    replaceCommaWithDot,
 };

From afa7e1c2ccb15d354653775f20d4f88fc84551e1 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 13 Aug 2024 17:53:48 +0200
Subject: [PATCH 20/71] add amount filter page

---
 src/ROUTES.ts                                 |  1 +
 src/SCREENS.ts                                |  1 +
 src/languages/en.ts                           |  5 ++
 src/languages/es.ts                           |  5 ++
 .../ModalStackNavigators/index.tsx            |  1 +
 .../CENTRAL_PANE_TO_RHP_MAPPING.ts            |  1 +
 src/libs/Navigation/linkingConfig/config.ts   |  1 +
 src/pages/Search/AdvancedSearchFilters.tsx    | 18 ++++
 src/pages/Search/SearchFiltersAmountPage.tsx  | 84 +++++++++++++++++++
 src/types/form/SearchAdvancedFiltersForm.ts   |  4 +
 10 files changed, 121 insertions(+)
 create mode 100644 src/pages/Search/SearchFiltersAmountPage.tsx

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index f6bdaecdf339..5632347d0abc 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -44,6 +44,7 @@ const ROUTES = {
     SEARCH_ADVANCED_FILTERS_MERCHANT: 'search/filters/merchant',
     SEARCH_ADVANCED_FILTERS_DESCRIPTION: 'search/filters/description',
     SEARCH_ADVANCED_FILTERS_REPORT_ID: 'search/filters/reportID',
+    SEARCH_ADVANCED_FILTERS_AMOUNT: 'search/filters/amount',
     SEARCH_ADVANCED_FILTERS_CATEGORY: 'search/filters/category',
     SEARCH_ADVANCED_FILTERS_KEYWORD: 'search/filters/keyword',
     SEARCH_ADVANCED_FILTERS_CARD: 'search/filters/card',
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 0da8b088f5ec..1de7ad0f5a5b 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -37,6 +37,7 @@ const SCREENS = {
         ADVANCED_FILTERS_DESCRIPTION_RHP: 'Search_Advanced_Filters_Description_RHP',
         ADVANCED_FILTERS_MERCHANT_RHP: 'Search_Advanced_Filters_Merchant_RHP',
         ADVANCED_FILTERS_REPORT_ID_RHP: 'Search_Advanced_Filters_ReportID_RHP',
+        ADVANCED_FILTERS_AMOUNT_RHP: 'Search_Advanced_Filters_Amount_RHP',
         ADVANCED_FILTERS_CATEGORY_RHP: 'Search_Advanced_Filters_Category_RHP',
         ADVANCED_FILTERS_KEYWORD_RHP: 'Search_Advanced_Filters_Keyword_RHP',
         ADVANCED_FILTERS_CARD_RHP: 'Search_Advanced_Filters_Card_RHP',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2332e7d76cb6..75e6d24cfd6a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3676,6 +3676,11 @@ export default {
             keyword: 'Keyword',
             hasKeywords: 'Has keywords',
             currency: 'Currency',
+            amount: {
+                lessThan: (amount?: string) => `Less than ${amount ?? ''}`,
+                greaterThan: (amount?: string) => `Greater than ${amount ?? ''}`,
+                between: (greaterThan: string, lessThan: string) => `Between ${greaterThan} and ${lessThan}`,
+            },
         },
         expenseType: 'Expense type',
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 271ff43a95a9..2d27a1fa2771 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3730,6 +3730,11 @@ export default {
             keyword: 'Palabra clave',
             hasKeywords: 'Tiene palabras clave',
             currency: 'Divisa',
+            amount: {
+                lessThan: (amount?: string) => `Menos de ${amount ?? ''}`,
+                greaterThan: (amount?: string) => `Más que ${amount ?? ''}`,
+                between: (greaterThan: string, lessThan: string) => `Entre ${greaterThan} y ${lessThan}`,
+            },
         },
         expenseType: 'Tipo de gasto',
     },
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 2cdc6bff4e08..6c19eb015308 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -517,6 +517,7 @@ const SearchAdvancedFiltersModalStackNavigator = createModalStackNavigator<Searc
     [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersDescriptionPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersMerchantPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersReportIDPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersAmountPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersCategoryPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersKeywordPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersCardPage').default,
diff --git a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
index b47df57764a5..9224d05679d0 100755
--- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
@@ -47,6 +47,7 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial<Record<CentralPaneName, string[]>> =
         SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_TAX_RATE_RHP,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 204a4b559b03..b29cb825e566 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1020,6 +1020,7 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_MERCHANT,
                         [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_DESCRIPTION,
                         [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_REPORT_ID,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_AMOUNT,
                         [SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_CATEGORY,
                         [SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_KEYWORD,
                         [SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_CARD,
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 163c5b628bd5..2a04bfdf396a 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -39,6 +39,19 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
         return dateValue;
     }
 
+    if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
+        const {lessThan, greaterThan} = filters;
+        if (lessThan && greaterThan) {
+            return translate('search.filters.amount.between', lessThan, greaterThan);
+        }
+        if (lessThan) {
+            return translate('search.filters.amount.lessThan', lessThan);
+        }
+        if (greaterThan) {
+            return translate('search.filters.amount.greaterThan', greaterThan);
+        }
+    }
+
     if (
         (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY || fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY || fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG) &&
         filters[fieldName]
@@ -132,6 +145,11 @@ function AdvancedSearchFilters() {
                 description: 'common.reportID' as const,
                 route: ROUTES.SEARCH_ADVANCED_FILTERS_REPORT_ID,
             },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, translate),
+                description: 'iou.amount' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_AMOUNT,
+            },
             {
                 title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY, translate),
                 description: 'common.category' as const,
diff --git a/src/pages/Search/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchFiltersAmountPage.tsx
new file mode 100644
index 000000000000..13a8c63987e1
--- /dev/null
+++ b/src/pages/Search/SearchFiltersAmountPage.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import AmountWithoutCurrencyForm from '@components/AmountWithoutCurrencyForm';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/SearchAdvancedFiltersForm';
+
+function SearchFiltersAmountPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const greaterThan = searchAdvancedFiltersForm?.[INPUT_IDS.GREATER_THAN];
+    const lessThan = searchAdvancedFiltersForm?.[INPUT_IDS.LESS_THAN];
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const updateAmountFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
+        updateAdvancedFilters(values);
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersAmountPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+        >
+            <HeaderWithBackButton
+                title={translate('common.total')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <FormProvider
+                style={[styles.flex1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                onSubmit={updateAmountFilter}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+            >
+                <View style={styles.mb5}>
+                    <InputWrapper
+                        InputComponent={AmountWithoutCurrencyForm}
+                        inputID={INPUT_IDS.LESS_THAN}
+                        name={INPUT_IDS.LESS_THAN}
+                        defaultValue={greaterThan}
+                        label={translate('search.filters.amount.greaterThan')}
+                        accessibilityLabel={translate('search.filters.amount.greaterThan')}
+                        role={CONST.ROLE.PRESENTATION}
+                    />
+                </View>
+                <View style={styles.mb5}>
+                    <InputWrapper
+                        InputComponent={AmountWithoutCurrencyForm}
+                        inputID={INPUT_IDS.GREATER_THAN}
+                        name={INPUT_IDS.GREATER_THAN}
+                        defaultValue={lessThan}
+                        label={translate('search.filters.amount.lessThan')}
+                        accessibilityLabel={translate('search.filters.amount.lessThan')}
+                        role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
+                    />
+                </View>
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersAmountPage.displayName = 'SearchFiltersAmountPage';
+
+export default SearchFiltersAmountPage;
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 2d9f05828d54..bacd6c547996 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -11,6 +11,8 @@ const INPUT_IDS = {
     MERCHANT: 'merchant',
     DESCRIPTION: 'description',
     REPORT_ID: 'reportID',
+    LESS_THAN: 'lessThan',
+    GREATER_THAN: 'greaterThan',
     TAX_RATE: 'taxRate',
     EXPENSE_TYPE: 'expenseType',
     TAG: 'tag',
@@ -31,6 +33,8 @@ type SearchAdvancedFiltersForm = Form<
         [INPUT_IDS.MERCHANT]: string;
         [INPUT_IDS.DESCRIPTION]: string;
         [INPUT_IDS.REPORT_ID]: string;
+        [INPUT_IDS.LESS_THAN]: string;
+        [INPUT_IDS.GREATER_THAN]: string;
         [INPUT_IDS.KEYWORD]: string;
         [INPUT_IDS.TAX_RATE]: string[];
         [INPUT_IDS.EXPENSE_TYPE]: string[];

From 4885ee5e66878b83d6fccb88cd58cbb2148557ab Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 14 Aug 2024 10:11:30 +0200
Subject: [PATCH 21/71] fix greaterThan and lessThan values

---
 src/components/AmountWithoutCurrencyForm.tsx | 8 +++++++-
 src/pages/Search/AdvancedSearchFilters.tsx   | 2 +-
 src/pages/Search/SearchFiltersAmountPage.tsx | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/AmountWithoutCurrencyForm.tsx b/src/components/AmountWithoutCurrencyForm.tsx
index 0c24bf47e5da..f3483e640b7f 100644
--- a/src/components/AmountWithoutCurrencyForm.tsx
+++ b/src/components/AmountWithoutCurrencyForm.tsx
@@ -14,7 +14,7 @@ type AmountFormProps = {
     onInputChange?: (value: string) => void;
 } & Partial<BaseTextInputProps>;
 
-function AmountWithoutCurrencyForm({value: amount, onInputChange, ...rest}: AmountFormProps) {
+function AmountWithoutCurrencyForm({value: amount, onInputChange, inputID, name, defaultValue, accessibilityLabel, role, label, ...rest}: AmountFormProps) {
     const {toLocaleDigit} = useLocalize();
 
     const currentAmount = useMemo(() => (typeof amount === 'string' ? amount : ''), [amount]);
@@ -43,6 +43,12 @@ function AmountWithoutCurrencyForm({value: amount, onInputChange, ...rest}: Amou
         <TextInput
             value={formattedAmount}
             onChangeText={setNewAmount}
+            inputID={inputID}
+            name={name}
+            label={label}
+            defaultValue={defaultValue}
+            accessibilityLabel={accessibilityLabel}
+            role={role}
             keyboardType={CONST.KEYBOARD_TYPE.DECIMAL_PAD}
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 2a04bfdf396a..dc15f1d382cc 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -42,7 +42,7 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
     if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
         const {lessThan, greaterThan} = filters;
         if (lessThan && greaterThan) {
-            return translate('search.filters.amount.between', lessThan, greaterThan);
+            return translate('search.filters.amount.between', greaterThan, lessThan);
         }
         if (lessThan) {
             return translate('search.filters.amount.lessThan', lessThan);
diff --git a/src/pages/Search/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchFiltersAmountPage.tsx
index 13a8c63987e1..8f56cf586d2f 100644
--- a/src/pages/Search/SearchFiltersAmountPage.tsx
+++ b/src/pages/Search/SearchFiltersAmountPage.tsx
@@ -54,8 +54,8 @@ function SearchFiltersAmountPage() {
                 <View style={styles.mb5}>
                     <InputWrapper
                         InputComponent={AmountWithoutCurrencyForm}
-                        inputID={INPUT_IDS.LESS_THAN}
-                        name={INPUT_IDS.LESS_THAN}
+                        inputID={INPUT_IDS.GREATER_THAN}
+                        name={INPUT_IDS.GREATER_THAN}
                         defaultValue={greaterThan}
                         label={translate('search.filters.amount.greaterThan')}
                         accessibilityLabel={translate('search.filters.amount.greaterThan')}
@@ -65,8 +65,8 @@ function SearchFiltersAmountPage() {
                 <View style={styles.mb5}>
                     <InputWrapper
                         InputComponent={AmountWithoutCurrencyForm}
-                        inputID={INPUT_IDS.GREATER_THAN}
-                        name={INPUT_IDS.GREATER_THAN}
+                        inputID={INPUT_IDS.LESS_THAN}
+                        name={INPUT_IDS.LESS_THAN}
                         defaultValue={lessThan}
                         label={translate('search.filters.amount.lessThan')}
                         accessibilityLabel={translate('search.filters.amount.lessThan')}

From 1ca142388d9191c5dc5b8b163b1d4466fa87649b Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 14 Aug 2024 10:45:21 +0200
Subject: [PATCH 22/71] add build query from string logic

---
 src/libs/SearchUtils.ts | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index f7512bf826ee..4e52cd7d313a 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -431,6 +431,28 @@ function buildDateFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>)
     return dateFilter;
 }
 
+/**
+ * @private
+ * returns Date filter query string part, which needs special logic
+ */
+function buildAmountFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>) {
+    const lessThan = filterValues[FILTER_KEYS.LESS_THAN];
+    const greaterThan = filterValues[FILTER_KEYS.GREATER_THAN];
+
+    let amountFilter = '';
+    if (lessThan) {
+        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}<${lessThan}`;
+    }
+    if (lessThan && greaterThan) {
+        amountFilter += ' ';
+    }
+    if (greaterThan) {
+        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}>${greaterThan}`;
+    }
+
+    return amountFilter;
+}
+
 function sanitizeString(str: string) {
     if (str.includes(' ') || str.includes(',')) {
         return `"${str}"`;
@@ -480,14 +502,19 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
                 }
             }
 
+            if (filterKey === FILTER_KEYS.GREATER_THAN || filterKey === FILTER_KEYS.LESS_THAN) {
+                return buildAmountFilterQuery(filterValues);
+            }
+
+            if (filterKey === FILTER_KEYS.DATE_AFTER || filterKey === FILTER_KEYS.DATE_BEFORE) {
+                return buildDateFilterQuery(filterValues);
+            }
+
             return undefined;
         })
         .filter(Boolean)
         .join(' ');
-
-    const dateFilter = buildDateFilterQuery(filterValues);
-
-    return dateFilter ? `${filtersString} ${dateFilter}` : filtersString;
+    return filtersString;
 }
 
 function getFilters(queryJSON: SearchQueryJSON) {

From 3ceeb4a5f935d24abbea9425ce7f224ffe5eaa3e Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 14 Aug 2024 13:07:29 +0200
Subject: [PATCH 23/71] fix bug in buildQueryString

---
 src/libs/SearchUtils.ts                    | 62 ++++++++++------------
 src/pages/Search/AdvancedSearchFilters.tsx |  2 +-
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 4e52cd7d313a..9de44b7c2329 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -476,45 +476,41 @@ function getExpenseTypeTranslationKey(expenseType: ValueOf<typeof CONST.SEARCH.T
  * Given object with chosen search filters builds correct query string from them
  */
 function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFiltersForm>) {
-    const filtersString = Object.entries(filterValues)
-        .map(([filterKey, filterValue]) => {
-            if ((filterKey === FILTER_KEYS.MERCHANT || filterKey === FILTER_KEYS.DESCRIPTION || filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.KEYWORD) && filterValue) {
-                const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
-                if (keyInCorrectForm) {
-                    return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValue as string}`;
-                }
+    const filtersString = Object.entries(filterValues).map(([filterKey, filterValue]) => {
+        if ((filterKey === FILTER_KEYS.MERCHANT || filterKey === FILTER_KEYS.DESCRIPTION || filterKey === FILTER_KEYS.REPORT_ID || filterKey === FILTER_KEYS.KEYWORD) && filterValue) {
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
+            if (keyInCorrectForm) {
+                return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValue as string}`;
             }
+        }
 
-            if (
-                (filterKey === FILTER_KEYS.CATEGORY ||
-                    filterKey === FILTER_KEYS.CARD_ID ||
-                    filterKey === FILTER_KEYS.TAX_RATE ||
-                    filterKey === FILTER_KEYS.EXPENSE_TYPE ||
-                    filterKey === FILTER_KEYS.TAG ||
-                    filterKey === FILTER_KEYS.CURRENCY) &&
-                Array.isArray(filterValue) &&
-                filterValue.length > 0
-            ) {
-                const filterValueArray = filterValues[filterKey] ?? [];
-                const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
-                if (keyInCorrectForm) {
-                    return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValueArray.map(sanitizeString).join(',')}`;
-                }
+        if (
+            (filterKey === FILTER_KEYS.CATEGORY ||
+                filterKey === FILTER_KEYS.CARD_ID ||
+                filterKey === FILTER_KEYS.TAX_RATE ||
+                filterKey === FILTER_KEYS.EXPENSE_TYPE ||
+                filterKey === FILTER_KEYS.TAG ||
+                filterKey === FILTER_KEYS.CURRENCY) &&
+            Array.isArray(filterValue) &&
+            filterValue.length > 0
+        ) {
+            const filterValueArray = filterValues[filterKey] ?? [];
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
+            if (keyInCorrectForm) {
+                return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValueArray.map(sanitizeString).join(',')}`;
             }
+        }
 
-            if (filterKey === FILTER_KEYS.GREATER_THAN || filterKey === FILTER_KEYS.LESS_THAN) {
-                return buildAmountFilterQuery(filterValues);
-            }
+        return undefined;
+    });
 
-            if (filterKey === FILTER_KEYS.DATE_AFTER || filterKey === FILTER_KEYS.DATE_BEFORE) {
-                return buildDateFilterQuery(filterValues);
-            }
+    const dateFilter = buildDateFilterQuery(filterValues);
+    filtersString.push(dateFilter);
+
+    const amountFilter = buildAmountFilterQuery(filterValues);
+    filtersString.push(amountFilter);
 
-            return undefined;
-        })
-        .filter(Boolean)
-        .join(' ');
-    return filtersString;
+    return filtersString.filter(Boolean).join('');
 }
 
 function getFilters(queryJSON: SearchQueryJSON) {
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index dc15f1d382cc..1c6ff4c78312 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -147,7 +147,7 @@ function AdvancedSearchFilters() {
             },
             {
                 title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, translate),
-                description: 'iou.amount' as const,
+                description: 'common.total' as const,
                 route: ROUTES.SEARCH_ADVANCED_FILTERS_AMOUNT,
             },
             {

From e231cc89cb126e41041bb4389bc1718013a4bc66 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 14 Aug 2024 13:12:42 +0200
Subject: [PATCH 24/71] fix bug

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

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 9de44b7c2329..d8f544e60a1c 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -510,7 +510,7 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
     const amountFilter = buildAmountFilterQuery(filterValues);
     filtersString.push(amountFilter);
 
-    return filtersString.filter(Boolean).join('');
+    return filtersString.filter(Boolean).join(' ');
 }
 
 function getFilters(queryJSON: SearchQueryJSON) {

From dc9f2630f36b24d5730b7e0a44ebba340a8bc6d0 Mon Sep 17 00:00:00 2001
From: QichenZhu <57348009+QichenZhu@users.noreply.github.com>
Date: Thu, 15 Aug 2024 00:50:17 +1200
Subject: [PATCH 25/71] Bump react-native-pager-view to 6.3.4

---
 ios/Podfile.lock  | 24 ++++++++++++++++++++++--
 package-lock.json |  8 ++++----
 package.json      |  2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index f5c825e63868..272d7937f78b 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1343,7 +1343,27 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-pager-view (6.2.3):
+  - react-native-pager-view (6.3.4):
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-graphics
+    - React-ImageManager
+    - react-native-pager-view/common (= 6.3.4)
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - react-native-pager-view/common (6.3.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -2568,7 +2588,7 @@ SPEC CHECKSUMS:
   react-native-keyboard-controller: 47c01b0741ae5fc84e53cf282e61cfa5c2edb19b
   react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
   react-native-netinfo: 02d31de0e08ab043d48f2a1a8baade109d7b6ca5
-  react-native-pager-view: ccd4bbf9fc7effaf8f91f8dae43389844d9ef9fa
+  react-native-pager-view: 770eee116657fca3d30329b2e8aa5a282a9dc722
   react-native-pdf: 762369633665ec02ac227aefe2f4558b92475c23
   react-native-performance: fb21ff0c9bd7a10789c69d948f25b0067d29f7a9
   react-native-plaid-link-sdk: ba40d1b13cca4b946974fafd9ae278e0fb697d87
diff --git a/package-lock.json b/package-lock.json
index bac831c266f7..ebd9a03bcf74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -103,7 +103,7 @@
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
         "react-native-onyx": "2.0.64",
-        "react-native-pager-view": "6.2.3",
+        "react-native-pager-view": "^6.3.4",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.0",
         "react-native-permissions": "^3.10.0",
@@ -37381,9 +37381,9 @@
       }
     },
     "node_modules/react-native-pager-view": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.2.3.tgz",
-      "integrity": "sha512-dqVpXWFtPNfD3D2QQQr8BP+ullS5MhjRJuF8Z/qml4QTILcrWaW8F5iAxKkQR3Jl0ikcEryG/+SQlNcwlo0Ggg==",
+      "version": "6.3.4",
+      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.3.4.tgz",
+      "integrity": "sha512-4PEQd52EOwWcfiFJZ4VGSlY+GZfumvUzNbAozsMEgJaLvOHOMMl+Arfsc0txgtGdS49uEiHFLLZthZQzxx/Mog==",
       "peerDependencies": {
         "react": "*",
         "react-native": "*"
diff --git a/package.json b/package.json
index e28722865a7a..5338bf49a2f1 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
     "react-native-onyx": "2.0.64",
-    "react-native-pager-view": "6.2.3",
+    "react-native-pager-view": "^6.3.4",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.0",
     "react-native-permissions": "^3.10.0",

From 25d93c7ac4c653ddcb81ed5468df87421c0c15ef Mon Sep 17 00:00:00 2001
From: zfurtak <zuzkafurtak@gmail.com>
Date: Wed, 14 Aug 2024 16:21:21 +0200
Subject: [PATCH 26/71] Adjusted to review

---
 src/components/PopoverMenu.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index a38fedabe8ca..788f1f84246a 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -8,7 +8,6 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Browser from '@libs/Browser';
 import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import type {AnchorPosition} from '@src/styles';
@@ -38,7 +37,9 @@ type PopoverMenuItem = MenuItemProps & {
     /** Determines whether the menu item is disabled or not */
     disabled?: boolean;
 
-    /** Determines whether the menu item's onSelected() function is called after modal hide or not */
+    /** Determines whether the menu item's onSelected() function is called after the modal is hidden
+     *  It is meant to be used in situations where, after clicking on the modal, another one is opened.
+     */
     shouldCallAfterModalHide?: boolean;
 };
 
@@ -133,7 +134,7 @@ function PopoverMenu({
             setEnteredSubMenuIndexes([...enteredSubMenuIndexes, index]);
             const selectedSubMenuItemIndex = selectedItem?.subMenuItems.findIndex((option) => option.isSelected);
             setFocusedIndex(selectedSubMenuItemIndex);
-        } else if (selectedItem.shouldCallAfterModalHide && !Browser.isSafari()) {
+        } else if (selectedItem.shouldCallAfterModalHide) {
             Modal.close(() => {
                 onItemSelected(selectedItem, index);
                 selectedItem.onSelected?.();

From a45b5a22a384173c7f3903df96fd4e3db7ff4740 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Thu, 15 Aug 2024 21:30:49 +0530
Subject: [PATCH 27/71] Removed the participant migration since migration
 happened long time ago

---
 src/libs/migrateOnyx.ts             |  2 -
 src/libs/migrations/Participants.ts | 77 -----------------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 src/libs/migrations/Participants.ts

diff --git a/src/libs/migrateOnyx.ts b/src/libs/migrateOnyx.ts
index 332e4a020cab..423b5e7c0017 100644
--- a/src/libs/migrateOnyx.ts
+++ b/src/libs/migrateOnyx.ts
@@ -1,7 +1,6 @@
 import Log from './Log';
 import KeyReportActionsDraftByReportActionID from './migrations/KeyReportActionsDraftByReportActionID';
 import NVPMigration from './migrations/NVPMigration';
-import Participants from './migrations/Participants';
 import PronounsMigration from './migrations/PronounsMigration';
 import RemoveEmptyReportActionsDrafts from './migrations/RemoveEmptyReportActionsDrafts';
 import RenameCardIsVirtual from './migrations/RenameCardIsVirtual';
@@ -22,7 +21,6 @@ export default function () {
             RemoveEmptyReportActionsDrafts,
             NVPMigration,
             PronounsMigration,
-            Participants,
         ];
 
         // Reduce all promises down to a single promise. All promises run in a linear fashion, waiting for the
diff --git a/src/libs/migrations/Participants.ts b/src/libs/migrations/Participants.ts
deleted file mode 100644
index 74a909379771..000000000000
--- a/src/libs/migrations/Participants.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import Onyx from 'react-native-onyx';
-import type {NullishDeep, OnyxCollection} from 'react-native-onyx';
-import Log from '@libs/Log';
-import * as ReportConnection from '@libs/ReportConnection';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
-import type {Participants} from '@src/types/onyx/Report';
-
-type ReportKey = `${typeof ONYXKEYS.COLLECTION.REPORT}${string}`;
-type OldReport = Report & {participantAccountIDs?: number[]; visibleChatMemberAccountIDs?: number[]};
-type OldReportCollection = Record<ReportKey, NullishDeep<OldReport>>;
-
-function getReports(): Promise<OnyxCollection<OldReport>> {
-    return new Promise((resolve) => {
-        resolve(ReportConnection.getAllReports());
-    });
-}
-
-function getCurrentUserAccountID(): Promise<number | undefined> {
-    return new Promise((resolve) => {
-        const connectionID = Onyx.connect({
-            key: ONYXKEYS.SESSION,
-            callback: (session) => {
-                Onyx.disconnect(connectionID);
-                return resolve(session?.accountID);
-            },
-        });
-    });
-}
-
-export default function (): Promise<void> {
-    return Promise.all([getCurrentUserAccountID(), getReports()]).then(([currentUserAccountID, reports]) => {
-        if (!reports) {
-            Log.info('[Migrate Onyx] Skipped Participants migration because there are no reports');
-            return;
-        }
-
-        const collection = Object.entries(reports).reduce<OldReportCollection>((reportsCollection, [onyxKey, report]) => {
-            // If we have non-empty participantAccountIDs then this report is eligible for migration
-            if (report?.participantAccountIDs?.length) {
-                const participants: NullishDeep<Participants> = {};
-
-                const deprecatedParticipants = new Set(report.participantAccountIDs);
-                const deprecatedVisibleParticipants = new Set(report.visibleChatMemberAccountIDs);
-
-                // Check all possible participants because some of these may be invalid https://github.com/Expensify/App/pull/40254#issuecomment-2096867084
-                const possibleParticipants = new Set([
-                    ...report.participantAccountIDs,
-                    ...Object.keys(report.participants ?? {}).map(Number),
-                    ...(currentUserAccountID !== undefined ? [currentUserAccountID] : []),
-                ]);
-
-                possibleParticipants.forEach((accountID) => {
-                    if (deprecatedParticipants.has(accountID) || accountID === currentUserAccountID) {
-                        participants[accountID] = {
-                            hidden: report.participants?.[accountID]?.hidden ?? (!deprecatedVisibleParticipants.has(accountID) && accountID !== currentUserAccountID),
-                        };
-                    } else {
-                        participants[accountID] = null;
-                    }
-                });
-
-                // eslint-disable-next-line no-param-reassign
-                reportsCollection[onyxKey as ReportKey] = {
-                    participants,
-                    participantAccountIDs: null,
-                    visibleChatMemberAccountIDs: null,
-                };
-            }
-
-            return reportsCollection;
-        }, {});
-
-        // eslint-disable-next-line rulesdir/prefer-actions-set-data
-        return Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, collection).then(() => Log.info('[Migrate Onyx] Ran migration Participants successfully'));
-    });
-}

From 017ab7f6c8545ede1ec3f883d3b74af624cca85f Mon Sep 17 00:00:00 2001
From: Someshwar Tripathi <someshwartripathi8@gmail.com>
Date: Fri, 16 Aug 2024 07:22:43 +0530
Subject: [PATCH 28/71] Remove Split Expense, Assign Task & Pay Someone from
 Global Create

---
 .../FloatingActionButtonAndPopover.tsx        | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 8cad6d2fc45d..122599153cbe 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -405,32 +405,6 @@ function FloatingActionButtonAndPopover(
                                 ),
                             ),
                     },
-                    {
-                        icon: Expensicons.Transfer,
-                        text: translate('iou.splitExpense'),
-                        onSelected: () =>
-                            interceptAnonymousUser(() =>
-                                IOU.startMoneyRequest(
-                                    CONST.IOU.TYPE.SPLIT,
-                                    // When starting to create a money request from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
-                                    // for all of the routes in the creation flow.
-                                    ReportUtils.generateReportID(),
-                                ),
-                            ),
-                    },
-                    {
-                        icon: getIconForAction(CONST.IOU.TYPE.SEND),
-                        text: translate('iou.paySomeone', {}),
-                        onSelected: () =>
-                            interceptAnonymousUser(() =>
-                                IOU.startMoneyRequest(
-                                    CONST.IOU.TYPE.PAY,
-                                    // When starting to pay someone from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
-                                    // for all of the routes in the creation flow.
-                                    ReportUtils.generateReportID(),
-                                ),
-                            ),
-                    },
                     ...(canSendInvoice
                         ? [
                               {
@@ -448,11 +422,6 @@ function FloatingActionButtonAndPopover(
                               },
                           ]
                         : []),
-                    {
-                        icon: Expensicons.Task,
-                        text: translate('newTaskPage.assignTask'),
-                        onSelected: () => interceptAnonymousUser(() => Task.clearOutTaskInfoAndNavigate()),
-                    },
                     ...(canUseSpotnanaTravel
                         ? [
                               {

From 348b322ede5842c94c375c818dd4c550daccadab Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Fri, 16 Aug 2024 14:30:37 +0700
Subject: [PATCH 29/71] fix: revert reimbursement accounts

---
 .../substeps/SocialSecurityNumberStep.tsx             |  4 ++--
 .../PersonalInfo/substeps/Confirmation.tsx            |  6 ++----
 .../PersonalInfo/substeps/SocialSecurityNumber.tsx    | 11 ++++-------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
index f4739ec6e57a..51041ee8bbab 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
@@ -30,7 +30,7 @@ function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
             const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
 
-            if (walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN) {
+            if (shouldAskForFullSSN) {
                 if (values.ssn && !ValidationUtils.isValidSSNFullNine(values.ssn)) {
                     errors.ssn = translate('additionalDetailsStep.ssnFull9Error');
                 }
@@ -40,7 +40,7 @@ function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
 
             return errors;
         },
-        [translate, walletAdditionalDetails?.errorCode],
+        [translate, shouldAskForFullSSN],
     );
 
     const defaultSsnLast4 = walletAdditionalDetails?.[PERSONAL_INFO_STEP_KEY.SSN_LAST_4] ?? '';
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
index 9d8b3e7a79dc..af1f081cc3da 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
@@ -1,7 +1,7 @@
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
@@ -42,8 +42,6 @@ function Confirmation({reimbursementAccount, reimbursementAccountDraft, onNext,
     const isLoading = reimbursementAccount?.isLoading ?? false;
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, reimbursementAccountDraft, reimbursementAccount), [reimbursementAccount, reimbursementAccountDraft]);
     const error = ErrorUtils.getLatestErrorMessage(reimbursementAccount ?? {});
-    const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
-    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
 
     return (
         <SafeAreaConsumer>
@@ -70,7 +68,7 @@ function Confirmation({reimbursementAccount, reimbursementAccountDraft, onNext,
                         }}
                     />
                     <MenuItemWithTopDescription
-                        description={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
+                        description={translate('personalInfoStep.last4SSN')}
                         title={values[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4]}
                         shouldShowRightIcon
                         onPress={() => {
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
index 48bd6215fac1..390880fa65f2 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
@@ -1,7 +1,7 @@
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
@@ -53,9 +53,6 @@ function SocialSecurityNumber({reimbursementAccount, onNext, isEditing}: SocialS
         shouldSaveDraft: isEditing,
     });
 
-    const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
-    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
-
     return (
         <FormProvider
             formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM}
@@ -72,13 +69,13 @@ function SocialSecurityNumber({reimbursementAccount, onNext, isEditing}: SocialS
                     <InputWrapper
                         InputComponent={TextInput}
                         inputID={PERSONAL_INFO_STEP_KEY.SSN_LAST_4}
-                        label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
-                        aria-label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
+                        label={translate('personalInfoStep.last4SSN')}
+                        aria-label={translate('personalInfoStep.last4SSN')}
                         role={CONST.ROLE.PRESENTATION}
                         containerStyles={[styles.mt6]}
                         inputMode={CONST.INPUT_MODE.NUMERIC}
                         defaultValue={defaultSsnLast4}
-                        maxLength={shouldAskForFullSSN ? 9 : CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
+                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
                         shouldSaveDraft={!isEditing}
                     />
                 </View>

From 9979903adfece7b2cd82eef8d09665c727a0868e Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Fri, 16 Aug 2024 17:53:56 +0700
Subject: [PATCH 30/71] fix: Different amount in thread header vs system
 message

---
 src/libs/OptionsListUtils.ts                  |  6 ++--
 src/libs/ReportActionsUtils.ts                | 10 ++++++
 src/libs/ReportUtils.ts                       | 34 +++++++++++++------
 .../report/ContextMenu/ContextMenuActions.tsx |  6 ++--
 src/pages/home/report/ReportActionItem.tsx    |  6 ++--
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 287bbcdfb2dd..bc00733093ed 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -705,11 +705,11 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
     } else if (ReportActionUtils.isCreatedTaskReportAction(lastReportAction)) {
         lastMessageTextFromReport = TaskUtils.getTaskCreatedMessage(lastReportAction);
     } else if (lastReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
-        lastMessageTextFromReport = ReportUtils.getIOUSubmittedMessage(reportID);
+        lastMessageTextFromReport = ReportUtils.getIOUSubmittedMessage(lastReportAction);
     } else if (lastReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
-        lastMessageTextFromReport = ReportUtils.getIOUApprovedMessage(reportID);
+        lastMessageTextFromReport = ReportUtils.getIOUApprovedMessage(lastReportAction);
     } else if (lastReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
-        lastMessageTextFromReport = ReportUtils.getIOUForwardedMessage(reportID);
+        lastMessageTextFromReport = ReportUtils.getIOUForwardedMessage(lastReportAction);
     } else if (ReportActionUtils.isActionableAddPaymentCard(lastReportAction)) {
         lastMessageTextFromReport = ReportActionUtils.getReportActionMessageText(lastReportAction);
     } else if (lastReportAction?.actionName === 'EXPORTINTEGRATION') {
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index a731fab4ae05..ce36cda07bf6 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -152,6 +152,13 @@ function isReportPreviewAction(reportAction: OnyxInputOrEntry<ReportAction>): re
 function isSubmittedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.SUBMITTED> {
     return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.SUBMITTED);
 }
+function isApprovedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.APPROVED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.APPROVED);
+}
+
+function isForwardedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.FORWARDED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.FORWARDED);
+}
 
 function isModifiedExpenseAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE> {
     return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE);
@@ -1676,6 +1683,9 @@ export {
     isTransactionThread,
     isTripPreview,
     isWhisperAction,
+    isSubmittedAction,
+    isApprovedAction,
+    isForwardedAction,
     isWhisperActionTargetedToOthers,
     shouldHideNewMarker,
     shouldReportActionBeVisible,
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 710f5e5faff8..a3a19daa94f6 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3596,6 +3596,16 @@ function getReportName(
     const parentReportAction = parentReportActionParam ?? ReportActionsUtils.getParentReportAction(report);
     const parentReportActionMessage = ReportActionsUtils.getReportActionMessage(parentReportAction);
 
+    if (parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
+        return getIOUSubmittedMessage(parentReportAction);
+    }
+    if (parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
+        return getIOUForwardedMessage(parentReportAction);
+    }
+    if (parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
+        return getIOUApprovedMessage(parentReportAction);
+    }
+
     if (isChatThread(report)) {
         if (!isEmptyObject(parentReportAction) && ReportActionsUtils.isTransactionThread(parentReportAction)) {
             formattedName = getTransactionReportName(parentReportAction);
@@ -4287,23 +4297,25 @@ function buildOptimisticExpenseReport(
     return expenseReport;
 }
 
-function getFormattedAmount(reportID: string) {
-    const report = getReportOrDraftReport(reportID);
-    const linkedReport = isChatThread(report) ? getParentReport(report) : report;
-    const formattedAmount = CurrencyUtils.convertToDisplayString(Math.abs(linkedReport?.total ?? 0), linkedReport?.currency);
+function getFormattedAmount(reportAction: ReportAction) {
+    if (!ReportActionsUtils.isSubmittedAction(reportAction) && !ReportActionsUtils.isForwardedAction(reportAction) && !ReportActionsUtils.isApprovedAction(reportAction)) {
+        return '';
+    }
+    const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
+    const formattedAmount = CurrencyUtils.convertToDisplayString(Math.abs(originalMessage?.amount ?? 0), originalMessage?.currency);
     return formattedAmount;
 }
 
-function getIOUSubmittedMessage(reportID: string) {
-    return Localize.translateLocal('iou.submittedAmount', {formattedAmount: getFormattedAmount(reportID)});
+function getIOUSubmittedMessage(reportAction: ReportAction) {
+    return Localize.translateLocal('iou.submittedAmount', {formattedAmount: getFormattedAmount(reportAction)});
 }
 
-function getIOUApprovedMessage(reportID: string) {
-    return Localize.translateLocal('iou.approvedAmount', {amount: getFormattedAmount(reportID)});
+function getIOUApprovedMessage(reportAction: ReportAction) {
+    return Localize.translateLocal('iou.approvedAmount', {amount: getFormattedAmount(reportAction)});
 }
 
-function getIOUForwardedMessage(reportID: string) {
-    return Localize.translateLocal('iou.forwardedAmount', {amount: getFormattedAmount(reportID)});
+function getIOUForwardedMessage(reportAction: ReportAction) {
+    return Localize.translateLocal('iou.forwardedAmount', {amount: getFormattedAmount(reportAction)});
 }
 
 /**
@@ -4339,7 +4351,7 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
             iouMessage = `approved ${amount}`;
             break;
         case CONST.REPORT.ACTIONS.TYPE.FORWARDED:
-            iouMessage = getIOUForwardedMessage(iouReportID);
+            iouMessage = Localize.translateLocal('iou.forwardedAmount', {amount});
             break;
         case CONST.REPORT.ACTIONS.TYPE.UNAPPROVED:
             iouMessage = `unapproved ${amount}`;
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index aec92fd360e9..63a28def6fc1 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -434,13 +434,13 @@ const ContextMenuActions: ContextMenuAction[] = [
                 } else if (ReportActionsUtils.isActionableTrackExpense(reportAction)) {
                     setClipboardMessage(CONST.ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE);
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
-                    const displayMessage = ReportUtils.getIOUSubmittedMessage(reportID);
+                    const displayMessage = ReportUtils.getIOUSubmittedMessage(reportAction);
                     Clipboard.setString(displayMessage);
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
-                    const displayMessage = ReportUtils.getIOUApprovedMessage(reportID);
+                    const displayMessage = ReportUtils.getIOUApprovedMessage(reportAction);
                     Clipboard.setString(displayMessage);
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
-                    const displayMessage = ReportUtils.getIOUForwardedMessage(reportID);
+                    const displayMessage = ReportUtils.getIOUForwardedMessage(reportAction);
                     Clipboard.setString(displayMessage);
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
                     Clipboard.setString(Localize.translateLocal('iou.heldExpense'));
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 68ced63d12d0..998cb6c62ec2 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -636,11 +636,11 @@ function ReportActionItem({
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {
             children = <ReportActionItemBasicMessage message={ModifiedExpenseMessage.getForReportAction(report.reportID, action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
-            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUSubmittedMessage(report.reportID)} />;
+            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUSubmittedMessage(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
-            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUApprovedMessage(report.reportID)} />;
+            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUApprovedMessage(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
-            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUForwardedMessage(report.reportID)} />;
+            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUForwardedMessage(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
             children = <ReportActionItemBasicMessage message={translate('iou.heldExpense')} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD_COMMENT) {

From 4dafde25c8bfc8eb5667902a040404e3b34a5e05 Mon Sep 17 00:00:00 2001
From: QichenZhu <57348009+QichenZhu@users.noreply.github.com>
Date: Fri, 16 Aug 2024 23:11:37 +1200
Subject: [PATCH 31/71] Update package.json

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

diff --git a/package.json b/package.json
index 5338bf49a2f1..2035f355f6da 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
     "react-native-onyx": "2.0.64",
-    "react-native-pager-view": "^6.3.4",
+    "react-native-pager-view": "6.3.4",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.0",
     "react-native-permissions": "^3.10.0",

From 82bd647a5d53853089b79cad1784796592876bfa Mon Sep 17 00:00:00 2001
From: QichenZhu <57348009+QichenZhu@users.noreply.github.com>
Date: Fri, 16 Aug 2024 23:15:40 +1200
Subject: [PATCH 32/71] Update package-lock.json

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index ebd9a03bcf74..1fd4cf8850f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -103,7 +103,7 @@
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
         "react-native-onyx": "2.0.64",
-        "react-native-pager-view": "^6.3.4",
+        "react-native-pager-view": "6.3.4",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.0",
         "react-native-permissions": "^3.10.0",

From 00233f0ad503139115ab341094ada23d26b648e8 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Sat, 17 Aug 2024 22:02:15 +0800
Subject: [PATCH 33/71] suppress lint

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

diff --git a/src/components/Modal/ModalContent.tsx b/src/components/Modal/ModalContent.tsx
index fb84d551cfb6..a5a6f49dd33f 100644
--- a/src/components/Modal/ModalContent.tsx
+++ b/src/components/Modal/ModalContent.tsx
@@ -17,10 +17,10 @@ type ModalContentProps = {
 };
 
 function ModalContent({children, onDismiss = () => {}, onModalWillShow = () => {}}: ModalContentProps) {
-    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     React.useEffect(() => {
         onModalWillShow();
         return onDismiss;
+    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
     return children;
 }

From bc51410a96f93c90abb1efca825890e960bd3678 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Sat, 17 Aug 2024 22:17:52 +0800
Subject: [PATCH 34/71] prettier

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

diff --git a/src/components/Modal/ModalContent.tsx b/src/components/Modal/ModalContent.tsx
index a5a6f49dd33f..d143aef46ca6 100644
--- a/src/components/Modal/ModalContent.tsx
+++ b/src/components/Modal/ModalContent.tsx
@@ -20,7 +20,7 @@ function ModalContent({children, onDismiss = () => {}, onModalWillShow = () => {
     React.useEffect(() => {
         onModalWillShow();
         return onDismiss;
-    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
     return children;
 }

From a94c759d538390817406020bc731b1c1681db0fe Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.io>
Date: Mon, 19 Aug 2024 09:38:39 +0200
Subject: [PATCH 35/71] fix: typo

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

diff --git a/src/libs/actions/OnyxUpdateManager/index.ts b/src/libs/actions/OnyxUpdateManager/index.ts
index deb530547021..db00a55aa25b 100644
--- a/src/libs/actions/OnyxUpdateManager/index.ts
+++ b/src/libs/actions/OnyxUpdateManager/index.ts
@@ -75,7 +75,7 @@ function handleOnyxUpdateGap(onyxUpdatesFromServer: OnyxEntry<OnyxUpdatesFromSer
         // When ONYX_UPDATES_FROM_SERVER is set, we pause the queue. Let's unpause
         // it so the app is not stuck forever without processing requests.
         SequentialQueue.unpause();
-        console.debug(`[OnyxUpdateManager] Ignoring Onyx updates while OpenApp hans't finished yet.`);
+        console.debug(`[OnyxUpdateManager] Ignoring Onyx updates while OpenApp hasn't finished yet.`);
         return;
     }
     // This key is shared across clients, thus every client/tab will have a copy and try to execute this method.

From 13b1608b54cbe5dff3a91aaa1dc0d7897ae2ab95 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.io>
Date: Mon, 19 Aug 2024 09:41:13 +0200
Subject: [PATCH 36/71] fix: chrome crashes

---
 .../actions/OnyxUpdateManager/utils/index.ts  | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/libs/actions/OnyxUpdateManager/utils/index.ts b/src/libs/actions/OnyxUpdateManager/utils/index.ts
index ffc8cbd989df..22847cb5f206 100644
--- a/src/libs/actions/OnyxUpdateManager/utils/index.ts
+++ b/src/libs/actions/OnyxUpdateManager/utils/index.ts
@@ -33,37 +33,54 @@ function detectGapsAndSplit(updates: DeferredUpdatesDictionary, clientLastUpdate
     for (const [index, update] of updateValues.entries()) {
         const isFirst = index === 0;
 
+        const lastUpdateID = Number(update.lastUpdateID);
+        const previousUpdateID = Number(update.previousUpdateID);
+
+        // If an update is older than the last update that was applied to the client, we can skip it
+        // This should already be handled before, but we'll keep this as a safeguard.
+        if (lastUpdateID <= lastUpdateIDFromClient) {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+
         // If any update's previousUpdateID doesn't match the lastUpdateID from the previous update, the deferred updates aren't chained and there's a gap.
         // For the first update, we need to check that the previousUpdateID of the fetched update is the same as the lastUpdateIDAppliedToClient.
         // For any other updates, we need to check if the previousUpdateID of the current update is found in the deferred updates.
         // If an update is chained, we can add it to the applicable updates.
-        const isChained = isFirst ? update.previousUpdateID === lastUpdateIDFromClient : !!updates[Number(update.previousUpdateID)];
+        const isChained = isFirst ? previousUpdateID === lastUpdateIDFromClient : !!updates[Number(update.previousUpdateID)];
         if (isChained) {
             // If a gap exists already, we will not add any more updates to the applicable updates.
             // Instead, once there are two chained updates again, we can set "firstUpdateAfterGaps" to the first update after the current gap.
             if (gapExists) {
                 // If "firstUpdateAfterGaps" hasn't been set yet and there was a gap, we need to set it to the first update after all gaps.
                 if (!firstUpdateAfterGaps) {
-                    firstUpdateAfterGaps = Number(update.previousUpdateID);
+                    firstUpdateAfterGaps = previousUpdateID;
                 }
             } else {
                 // If no gap exists yet, we can add the update to the applicable updates
-                applicableUpdates[Number(update.lastUpdateID)] = update;
+                applicableUpdates[lastUpdateID] = update;
             }
         } else {
+            // If the previousUpdateID of the update after the gap is older than the lastUpdateIDFromClient,
+            // we don't want to detect a missing update, since this would cause a recursion loop in "validateAndApplyDeferredUpdates".
+            if (previousUpdateID <= lastUpdateIDFromClient) {
+                // eslint-disable-next-line no-continue
+                continue;
+            }
+
             // When we find a (new) gap, we need to set "gapExists" to true and reset the "firstUpdateAfterGaps" variable,
             // so that we can continue searching for the next update after all gaps
             gapExists = true;
             firstUpdateAfterGaps = undefined;
 
             // If there is a gap, it means the previous update is the latest missing update.
-            latestMissingUpdateID = Number(update.previousUpdateID);
+            latestMissingUpdateID = previousUpdateID;
         }
     }
 
     // When "firstUpdateAfterGaps" is not set yet, we need to set it to the last update in the list,
     // because we will fetch all missing updates up to the previous one and can then always apply the last update in the deferred updates.
-    const firstUpdateAfterGapWithFallback = firstUpdateAfterGaps ?? Number(updateValues[updateValues.length - 1].lastUpdateID);
+    const firstUpdateAfterGapWithFallback = Math.max(firstUpdateAfterGaps ?? Number(updateValues[updateValues.length - 1].lastUpdateID), lastUpdateIDFromClient);
 
     let updatesAfterGaps: DeferredUpdatesDictionary = {};
     if (gapExists) {
@@ -99,8 +116,8 @@ function validateAndApplyDeferredUpdates(clientLastUpdateID?: number, previousPa
 
     const {applicableUpdates, updatesAfterGaps, latestMissingUpdateID} = detectGapsAndSplit(pendingDeferredUpdates, lastUpdateIDFromClient);
 
-    // If we detected a gap in the deferred updates, only apply the deferred updates before the gap,
-    // re-fetch the missing updates and then apply the remaining deferred updates after the gap
+    // If newer updates got applied in the meantime, we don't need to refetch for missing updates
+    // and can just re-trigger the "validateAndApplyDeferredUpdates" process
     if (latestMissingUpdateID) {
         Log.info('[DeferredUpdates] Gap detected in deferred updates', false, {lastUpdateIDFromClient, latestMissingUpdateID});
 

From c3f85a361dbfc33e9f178446a8a7b23567c1d77a Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.io>
Date: Mon, 19 Aug 2024 09:44:54 +0200
Subject: [PATCH 37/71] test: add new test for OnyxUpdateManager edge case

---
 tests/unit/OnyxUpdateManagerTest.ts | 27 ++++++++++++++++++++++++++-
 tests/utils/createOnyxMockUpdate.ts |  6 +++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/tests/unit/OnyxUpdateManagerTest.ts b/tests/unit/OnyxUpdateManagerTest.ts
index 20b29ca18a56..e0b28747e22c 100644
--- a/tests/unit/OnyxUpdateManagerTest.ts
+++ b/tests/unit/OnyxUpdateManagerTest.ts
@@ -18,6 +18,7 @@ const ApplyUpdates = ApplyUpdatesImport as ApplyUpdatesMock;
 const OnyxUpdateManagerUtils = OnyxUpdateManagerUtilsImport as OnyxUpdateManagerUtilsMock;
 
 const mockUpdate3 = createOnyxMockUpdate(3);
+const offsetedMockUpdate3 = createOnyxMockUpdate(3, undefined, 2);
 const mockUpdate4 = createOnyxMockUpdate(4);
 const mockUpdate5 = createOnyxMockUpdate(5);
 const mockUpdate6 = createOnyxMockUpdate(6);
@@ -193,7 +194,7 @@ describe('OnyxUpdateManager', () => {
             // Even though there are multiple gaps in the deferred updates, we only want to fetch missing updates once per batch.
             expect(App.getMissingOnyxUpdates).toHaveBeenCalledTimes(1);
 
-            // validateAndApplyDeferredUpdates should be called twice, once for the initial deferred updates and once for the remaining deferred updates with gaps.
+            // validateAndApplyDeferredUpdates should be called once for the initial deferred updates
             // Unfortunately, we cannot easily count the calls of this function with Jest, since it recursively calls itself.
             // The intended assertion would look like this:
             // expect(OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates).toHaveBeenCalledTimes(1);
@@ -254,4 +255,28 @@ describe('OnyxUpdateManager', () => {
             expect(ApplyUpdates.applyUpdates).toHaveBeenNthCalledWith(2, {7: mockUpdate7});
         });
     });
+
+    it('should only fetch missing updates that are not stale', () => {
+        OnyxUpdateManager.handleOnyxUpdateGap(offsetedMockUpdate3);
+        OnyxUpdateManager.handleOnyxUpdateGap(mockUpdate4);
+
+        return OnyxUpdateManager.queryPromise.then(() => {
+            // After all missing and deferred updates have been applied, the lastUpdateIDAppliedToClient should be 4.
+            expect(lastUpdateIDAppliedToClient).toBe(4);
+
+            // validateAndApplyDeferredUpdates should be called once for the initial deferred updates
+            // Unfortunately, we cannot easily count the calls of this function with Jest, since it recursively calls itself.
+            // The intended assertion would look like this:
+            // expect(OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates).toHaveBeenCalledTimes(1);
+
+            // There should be only one call to applyUpdates. The call should contain all the deferred update,
+            // since the locally applied updates have changed in the meantime.
+            expect(ApplyUpdates.applyUpdates).toHaveBeenCalledTimes(1);
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            expect(ApplyUpdates.applyUpdates).toHaveBeenCalledWith({3: offsetedMockUpdate3, 4: mockUpdate4});
+
+            // There are no gaps in the deferred updates, therefore only one call to getMissingOnyxUpdates should be triggered
+            expect(App.getMissingOnyxUpdates).toHaveBeenCalledTimes(1);
+        });
+    });
 });
diff --git a/tests/utils/createOnyxMockUpdate.ts b/tests/utils/createOnyxMockUpdate.ts
index f8e28e364cf7..e50918b01faf 100644
--- a/tests/utils/createOnyxMockUpdate.ts
+++ b/tests/utils/createOnyxMockUpdate.ts
@@ -1,10 +1,10 @@
 import type {OnyxUpdate} from 'react-native-onyx';
 import type {OnyxUpdatesFromServer} from '@src/types/onyx';
 
-const createOnyxMockUpdate = (lastUpdateID: number, successData: OnyxUpdate[] = []): OnyxUpdatesFromServer => ({
+const createOnyxMockUpdate = (lastUpdateID: number, successData: OnyxUpdate[] = [], previousUpdateIDOffset = 1): OnyxUpdatesFromServer => ({
     type: 'https',
     lastUpdateID,
-    previousUpdateID: lastUpdateID - 1,
+    previousUpdateID: lastUpdateID - previousUpdateIDOffset,
     request: {
         command: 'TestCommand',
         successData,
@@ -15,7 +15,7 @@ const createOnyxMockUpdate = (lastUpdateID: number, successData: OnyxUpdate[] =
     response: {
         jsonCode: 200,
         lastUpdateID,
-        previousUpdateID: lastUpdateID - 1,
+        previousUpdateID: lastUpdateID - previousUpdateIDOffset,
         onyxData: successData,
     },
 });

From 8cdfe96643963bfcf3fcc130619bd9a14c43b0cf Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Mon, 19 Aug 2024 10:34:20 +0200
Subject: [PATCH 38/71] review suggestions

---
 src/components/AmountWithoutCurrencyForm.tsx |  7 +++----
 src/libs/SearchUtils.ts                      | 13 ++++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/components/AmountWithoutCurrencyForm.tsx b/src/components/AmountWithoutCurrencyForm.tsx
index f3483e640b7f..edb823044b38 100644
--- a/src/components/AmountWithoutCurrencyForm.tsx
+++ b/src/components/AmountWithoutCurrencyForm.tsx
@@ -1,7 +1,6 @@
 import React, {useCallback, useMemo} from 'react';
 import useLocalize from '@hooks/useLocalize';
-import {replaceAllDigits, stripSpacesFromAmount, validateAmount} from '@libs/MoneyRequestUtils';
-import {replaceCommaWithDot} from '@libs/SearchUtils';
+import {replaceAllDigits, replaceCommasWithPeriod, stripSpacesFromAmount, validateAmount} from '@libs/MoneyRequestUtils';
 import CONST from '@src/CONST';
 import TextInput from './TextInput';
 import type {BaseTextInputProps} from './TextInput/BaseTextInput/types';
@@ -28,8 +27,8 @@ function AmountWithoutCurrencyForm({value: amount, onInputChange, inputID, name,
             // Remove spaces from the newAmount value because Safari on iOS adds spaces when pasting a copied value
             // More info: https://github.com/Expensify/App/issues/16974
             const newAmountWithoutSpaces = stripSpacesFromAmount(newAmount);
-            const replacedCommasAmount = replaceCommaWithDot(newAmountWithoutSpaces);
-            if (!validateAmount(replacedCommasAmount, 3)) {
+            const replacedCommasAmount = replaceCommasWithPeriod(newAmountWithoutSpaces);
+            if (!validateAmount(replacedCommasAmount, 2)) {
                 return;
             }
             onInputChange?.(replacedCommasAmount);
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index d8f544e60a1c..f5f261aa8f28 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -74,10 +74,6 @@ function getTransactionItemCommonFormattedProperties(
     };
 }
 
-function replaceCommaWithDot(amount: string): string {
-    return amount.replace(/,/g, '.');
-}
-
 function isSearchDataType(type: string): type is SearchDataTypes {
     const searchDataTypes: string[] = Object.values(CONST.SEARCH.DATA_TYPES);
     return searchDataTypes.includes(type);
@@ -440,14 +436,14 @@ function buildAmountFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>
     const greaterThan = filterValues[FILTER_KEYS.GREATER_THAN];
 
     let amountFilter = '';
-    if (lessThan) {
-        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}<${lessThan}`;
+    if (greaterThan) {
+        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}>${greaterThan}`;
     }
     if (lessThan && greaterThan) {
         amountFilter += ' ';
     }
-    if (greaterThan) {
-        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}>${greaterThan}`;
+    if (lessThan) {
+        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}<${lessThan}`;
     }
 
     return amountFilter;
@@ -601,5 +597,4 @@ export {
     normalizeQuery,
     shouldShowYear,
     getExpenseTypeTranslationKey,
-    replaceCommaWithDot,
 };

From d568ed673d7c0df183f83dab64345e573f296e47 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Mon, 19 Aug 2024 12:15:01 +0200
Subject: [PATCH 39/71] fix focus bug

---
 src/components/AmountWithoutCurrencyForm.tsx | 11 ++++++++---
 src/pages/Search/SearchFiltersAmountPage.tsx |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/AmountWithoutCurrencyForm.tsx b/src/components/AmountWithoutCurrencyForm.tsx
index edb823044b38..4975e8e34d85 100644
--- a/src/components/AmountWithoutCurrencyForm.tsx
+++ b/src/components/AmountWithoutCurrencyForm.tsx
@@ -1,9 +1,10 @@
 import React, {useCallback, useMemo} from 'react';
+import type {ForwardedRef} from 'react';
 import useLocalize from '@hooks/useLocalize';
 import {replaceAllDigits, replaceCommasWithPeriod, stripSpacesFromAmount, validateAmount} from '@libs/MoneyRequestUtils';
 import CONST from '@src/CONST';
 import TextInput from './TextInput';
-import type {BaseTextInputProps} from './TextInput/BaseTextInput/types';
+import type {BaseTextInputProps, BaseTextInputRef} from './TextInput/BaseTextInput/types';
 
 type AmountFormProps = {
     /** Amount supplied by the FormProvider */
@@ -13,7 +14,10 @@ type AmountFormProps = {
     onInputChange?: (value: string) => void;
 } & Partial<BaseTextInputProps>;
 
-function AmountWithoutCurrencyForm({value: amount, onInputChange, inputID, name, defaultValue, accessibilityLabel, role, label, ...rest}: AmountFormProps) {
+function AmountWithoutCurrencyForm(
+    {value: amount, onInputChange, inputID, name, defaultValue, accessibilityLabel, role, label, ...rest}: AmountFormProps,
+    ref: ForwardedRef<BaseTextInputRef>,
+) {
     const {toLocaleDigit} = useLocalize();
 
     const currentAmount = useMemo(() => (typeof amount === 'string' ? amount : ''), [amount]);
@@ -48,6 +52,7 @@ function AmountWithoutCurrencyForm({value: amount, onInputChange, inputID, name,
             defaultValue={defaultValue}
             accessibilityLabel={accessibilityLabel}
             role={role}
+            ref={ref}
             keyboardType={CONST.KEYBOARD_TYPE.DECIMAL_PAD}
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
@@ -57,4 +62,4 @@ function AmountWithoutCurrencyForm({value: amount, onInputChange, inputID, name,
 
 AmountWithoutCurrencyForm.displayName = 'AmountWithoutCurrencyForm';
 
-export default AmountWithoutCurrencyForm;
+export default React.forwardRef(AmountWithoutCurrencyForm);
diff --git a/src/pages/Search/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchFiltersAmountPage.tsx
index 8f56cf586d2f..02d0e1177b08 100644
--- a/src/pages/Search/SearchFiltersAmountPage.tsx
+++ b/src/pages/Search/SearchFiltersAmountPage.tsx
@@ -60,6 +60,7 @@ function SearchFiltersAmountPage() {
                         label={translate('search.filters.amount.greaterThan')}
                         accessibilityLabel={translate('search.filters.amount.greaterThan')}
                         role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
                     />
                 </View>
                 <View style={styles.mb5}>
@@ -71,7 +72,6 @@ function SearchFiltersAmountPage() {
                         label={translate('search.filters.amount.lessThan')}
                         accessibilityLabel={translate('search.filters.amount.lessThan')}
                         role={CONST.ROLE.PRESENTATION}
-                        ref={inputCallbackRef}
                     />
                 </View>
             </FormProvider>

From eed752aa07ecaa7cbf56e7c678aae9a402575e3c Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Mon, 19 Aug 2024 13:21:08 +0200
Subject: [PATCH 40/71] fix merge

---
 src/types/form/SearchAdvancedFiltersForm.ts | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index bcd0e18015e5..6541072cae81 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -26,21 +26,21 @@ type InputID = ValueOf<typeof FILTER_KEYS>;
 type SearchAdvancedFiltersForm = Form<
     InputID,
     {
-        [INPUT_IDS.DATE_AFTER]: string;
-        [INPUT_IDS.DATE_BEFORE]: string;
-        [INPUT_IDS.CURRENCY]: string[];
-        [INPUT_IDS.CATEGORY]: string[];
-        [INPUT_IDS.POLICY_ID]: string;
-        [INPUT_IDS.CARD_ID]: string[];
-        [INPUT_IDS.MERCHANT]: string;
-        [INPUT_IDS.DESCRIPTION]: string;
-        [INPUT_IDS.REPORT_ID]: string;
-        [INPUT_IDS.LESS_THAN]: string;
-        [INPUT_IDS.GREATER_THAN]: string;
-        [INPUT_IDS.KEYWORD]: string;
-        [INPUT_IDS.TAX_RATE]: string[];
-        [INPUT_IDS.EXPENSE_TYPE]: string[];
-        [INPUT_IDS.TAG]: string[];
+        [FILTER_KEYS.DATE_AFTER]: string;
+        [FILTER_KEYS.DATE_BEFORE]: string;
+        [FILTER_KEYS.CURRENCY]: string[];
+        [FILTER_KEYS.CATEGORY]: string[];
+        [FILTER_KEYS.POLICY_ID]: string;
+        [FILTER_KEYS.CARD_ID]: string[];
+        [FILTER_KEYS.MERCHANT]: string;
+        [FILTER_KEYS.DESCRIPTION]: string;
+        [FILTER_KEYS.REPORT_ID]: string;
+        [FILTER_KEYS.LESS_THAN]: string;
+        [FILTER_KEYS.GREATER_THAN]: string;
+        [FILTER_KEYS.KEYWORD]: string;
+        [FILTER_KEYS.TAX_RATE]: string[];
+        [FILTER_KEYS.EXPENSE_TYPE]: string[];
+        [FILTER_KEYS.TAG]: string[];
         [FILTER_KEYS.FROM]: string[];
         [FILTER_KEYS.TO]: string[];
     }

From abfcf6e4c5f8ce68eae54b84ef86fa0dc929a918 Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Mon, 19 Aug 2024 10:32:48 -0400
Subject: [PATCH 41/71] Hide crossSubsidiaryCustomers selector when both
 customers and projects are not imported

---
 .../NetSuiteImportCustomersOrProjectsPage.tsx | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
index cb9436fa082c..4e23da326d92 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
@@ -95,18 +95,20 @@ function NetSuiteImportCustomersOrProjectsPage({policy}: WithPolicyConnectionsPr
                 errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS)}
                 onCloseError={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS)}
             />
-            <ToggleSettingOptionRow
-                wrapperStyle={[styles.mv3, styles.ph5]}
-                title={translate('workspace.netsuite.import.crossSubsidiaryCustomers')}
-                isActive={config?.syncOptions?.crossSubsidiaryCustomers ?? false}
-                switchAccessibilityLabel={translate('workspace.netsuite.import.crossSubsidiaryCustomers')}
-                onToggle={(isEnabled: boolean) => {
-                    updateNetSuiteCrossSubsidiaryCustomersConfiguration(policyID, isEnabled);
-                }}
-                pendingAction={config?.syncOptions?.pendingFields?.crossSubsidiaryCustomers}
-                errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CROSS_SUBSIDIARY_CUSTOMERS)}
-                onCloseError={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CROSS_SUBSIDIARY_CUSTOMERS)}
-            />
+            {importedValue !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT && (
+                <ToggleSettingOptionRow
+                    wrapperStyle={[styles.mv3, styles.ph5]}
+                    title={translate('workspace.netsuite.import.crossSubsidiaryCustomers')}
+                    isActive={config?.syncOptions?.crossSubsidiaryCustomers ?? false}
+                    switchAccessibilityLabel={translate('workspace.netsuite.import.crossSubsidiaryCustomers')}
+                    onToggle={(isEnabled: boolean) => {
+                        updateNetSuiteCrossSubsidiaryCustomersConfiguration(policyID, isEnabled);
+                    }}
+                    pendingAction={config?.syncOptions?.pendingFields?.crossSubsidiaryCustomers}
+                    errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CROSS_SUBSIDIARY_CUSTOMERS)}
+                    onCloseError={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CROSS_SUBSIDIARY_CUSTOMERS)}
+                />
+            )}
 
             {importedValue !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT && (
                 <OfflineWithFeedback

From 1cf2e1e9d332caedbe6d0869a22563c24e75be22 Mon Sep 17 00:00:00 2001
From: cretadn22 <cretadn22@gmail.com>
Date: Mon, 19 Aug 2024 23:21:56 +0700
Subject: [PATCH 42/71] reset errors

---
 .../workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx | 1 +
 src/types/onyx/ApprovalWorkflow.ts                              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
index 25f288690c5d..41a8d5c6a4ee 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
@@ -87,6 +87,7 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
             availableMembers: [...currentApprovalWorkflow.members, ...(workflows.at(0)?.members ?? [])],
             action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
             isLoading: false,
+            errors: null,
         });
         setInitialApprovalWorkflow(currentApprovalWorkflow);
     }, [initialApprovalWorkflow, personalDetails, policy, route.params.firstApproverEmail, route.params.policyID]);
diff --git a/src/types/onyx/ApprovalWorkflow.ts b/src/types/onyx/ApprovalWorkflow.ts
index 44a8932341fc..8fef76e19d40 100644
--- a/src/types/onyx/ApprovalWorkflow.ts
+++ b/src/types/onyx/ApprovalWorkflow.ts
@@ -112,7 +112,7 @@ type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
     /**
      * Errors for the workflow
      */
-    errors?: Record<string, TranslationPaths>;
+    errors?: Record<string, TranslationPaths> | null;
 };
 
 export default ApprovalWorkflow;

From 6616b24fc77a41f8bacbbf3f0adbf45a686ae140 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Mon, 19 Aug 2024 19:50:54 +0200
Subject: [PATCH 43/71] remove sideeffects

---
 src/libs/API/types.ts              |  2 --
 src/libs/actions/PaymentMethods.ts | 18 +++---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index cc3504ad89ab..364984d526a2 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -798,7 +798,6 @@ const SIDE_EFFECT_REQUEST_COMMANDS = {
     OPEN_OLD_DOT_LINK: 'OpenOldDotLink',
     OPEN_REPORT: 'OpenReport',
     RECONNECT_APP: 'ReconnectApp',
-    ADD_PAYMENT_CARD_GBP: 'AddPaymentCardGBP',
     REVEAL_EXPENSIFY_CARD_DETAILS: 'RevealExpensifyCardDetails',
     SWITCH_TO_OLD_DOT: 'SwitchToOldDot',
     TWO_FACTOR_AUTH_VALIDATE: 'TwoFactorAuth_Validate',
@@ -815,7 +814,6 @@ type SideEffectRequestCommandParameters = {
     [SIDE_EFFECT_REQUEST_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK]: Parameters.JoinPolicyInviteLinkParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.GENERATE_SPOTNANA_TOKEN]: Parameters.GenerateSpotnanaTokenParams;
-    [SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP]: Parameters.AddPaymentCardParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.ACCEPT_SPOTNANA_TERMS]: null;
     [SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
 };
diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index bac3739af810..e7a01ccb2d04 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -13,7 +13,7 @@ import type {
     TransferWalletBalanceParams,
     UpdateBillingCurrencyParams,
 } from '@libs/API/parameters';
-import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as CardUtils from '@libs/CardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
@@ -254,22 +254,10 @@ function addSubscriptionPaymentCard(cardData: {
     ];
 
     if (currency === CONST.PAYMENT_CARD_CURRENCY.GBP) {
-        // eslint-disable-next-line rulesdir/no-api-side-effects-method
-        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData}).then((response) => {
-            if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
-                return;
-            }
-
-            // We are using this onyx key to open Modal and preview iframe. Potentially we can save the whole object which come from side effect
-            Onyx.set(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION, (response as {authenticationLink: string}).authenticationLink);
-        });
+        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData});
     } else {
         // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {
-            optimisticData,
-            successData,
-            failureData,
-        });
+        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {optimisticData, successData, failureData});
     }
 }
 

From 9e4f20f254167d0acfb7f70f18be22311089ba3f Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.io>
Date: Mon, 19 Aug 2024 22:04:16 +0200
Subject: [PATCH 44/71] improve splitting logic and comments

---
 .../actions/OnyxUpdateManager/utils/index.ts  | 103 ++++++++++--------
 1 file changed, 57 insertions(+), 46 deletions(-)

diff --git a/src/libs/actions/OnyxUpdateManager/utils/index.ts b/src/libs/actions/OnyxUpdateManager/utils/index.ts
index 22847cb5f206..a29e6397b4e0 100644
--- a/src/libs/actions/OnyxUpdateManager/utils/index.ts
+++ b/src/libs/actions/OnyxUpdateManager/utils/index.ts
@@ -16,18 +16,30 @@ Onyx.connect({
 /**
  * In order for the deferred updates to be applied correctly in order,
  * we need to check if there are any gaps between deferred updates.
+ * If there are gaps, we need to split the deferred updates into two parts:
+ * 1. The applicable updates that can be applied immediately
+ * 2. The updates after the gaps that need to be fetched and applied first
  * @param updates The deferred updates to be checked for gaps
- * @param clientLastUpdateID An optional lastUpdateID passed to use instead of the lastUpdateIDAppliedToClient
+ * @param lastUpdateIDFromClient An optional lastUpdateID passed to use instead of the lastUpdateIDAppliedToClient
  * @returns
  */
-function detectGapsAndSplit(updates: DeferredUpdatesDictionary, clientLastUpdateID?: number): DetectGapAndSplitResult {
-    const lastUpdateIDFromClient = clientLastUpdateID ?? lastUpdateIDAppliedToClient ?? 0;
+function detectGapsAndSplit(lastUpdateIDFromClient: number): DetectGapAndSplitResult {
+    // We only want to apply deferred updates that are newer than the last update that was applied to the client.
+    // At this point, the missing updates from "GetMissingOnyxUpdates" have been applied already,
+    // so we can safely filter out any outdated deferred updates.
+    const pendingDeferredUpdates = DeferredOnyxUpdates.getUpdates({minUpdateID: lastUpdateIDFromClient});
 
-    const updateValues = Object.values(updates);
+    // If there are no remaining deferred updates after filtering out outdated updates,
+    // we don't need to iterate over the deferred updates and check for gaps.
+    if (Object.values(pendingDeferredUpdates).length === 0) {
+        return {applicableUpdates: {}, updatesAfterGaps: {}, latestMissingUpdateID: undefined};
+    }
+
+    const updateValues = Object.values(pendingDeferredUpdates);
     const applicableUpdates: DeferredUpdatesDictionary = {};
 
     let gapExists = false;
-    let firstUpdateAfterGaps: number | undefined;
+    let firstUpdateIDAfterGaps: number | undefined;
     let latestMissingUpdateID: number | undefined;
 
     for (const [index, update] of updateValues.entries()) {
@@ -36,59 +48,61 @@ function detectGapsAndSplit(updates: DeferredUpdatesDictionary, clientLastUpdate
         const lastUpdateID = Number(update.lastUpdateID);
         const previousUpdateID = Number(update.previousUpdateID);
 
-        // If an update is older than the last update that was applied to the client, we can skip it
-        // This should already be handled before, but we'll keep this as a safeguard.
-        if (lastUpdateID <= lastUpdateIDFromClient) {
-            // eslint-disable-next-line no-continue
-            continue;
-        }
+        // Whether the previous update (of the current update) is outdated, because there was a newer update applied to the client.
+        const isPreviousUpdateAlreadyApplied = previousUpdateID <= lastUpdateIDFromClient;
 
-        // If any update's previousUpdateID doesn't match the lastUpdateID from the previous update, the deferred updates aren't chained and there's a gap.
-        // For the first update, we need to check that the previousUpdateID of the fetched update is the same as the lastUpdateIDAppliedToClient.
+        // If any update's previousUpdateID doesn't match the lastUpdateID of the previous update,
+        // the deferred updates aren't chained and we detected a gap.
+        // For the first update, we need to check that the previousUpdateID of the current update is the same as the lastUpdateIDAppliedToClient.
         // For any other updates, we need to check if the previousUpdateID of the current update is found in the deferred updates.
         // If an update is chained, we can add it to the applicable updates.
-        const isChained = isFirst ? previousUpdateID === lastUpdateIDFromClient : !!updates[Number(update.previousUpdateID)];
-        if (isChained) {
-            // If a gap exists already, we will not add any more updates to the applicable updates.
-            // Instead, once there are two chained updates again, we can set "firstUpdateAfterGaps" to the first update after the current gap.
+        const isChainedToPreviousUpdate = isFirst ? isPreviousUpdateAlreadyApplied : !!pendingDeferredUpdates[previousUpdateID];
+        if (isChainedToPreviousUpdate) {
+            // If we found a gap in the deferred updates, we will not add any more updates to the applicable updates.
+            // Instead, if we find two chained updates, we can set "firstUpdateIDAfterGaps" to the first update after the gap.
             if (gapExists) {
-                // If "firstUpdateAfterGaps" hasn't been set yet and there was a gap, we need to set it to the first update after all gaps.
-                if (!firstUpdateAfterGaps) {
-                    firstUpdateAfterGaps = previousUpdateID;
+                // If there was a gap, "firstUpdateIDAfterGaps" isn't set and we find two chained updates,
+                // we need to set "firstUpdateIDAfterGaps" to the first update after the gap.
+                if (!firstUpdateIDAfterGaps) {
+                    firstUpdateIDAfterGaps = previousUpdateID;
                 }
             } else {
                 // If no gap exists yet, we can add the update to the applicable updates
                 applicableUpdates[lastUpdateID] = update;
             }
         } else {
-            // If the previousUpdateID of the update after the gap is older than the lastUpdateIDFromClient,
-            // we don't want to detect a missing update, since this would cause a recursion loop in "validateAndApplyDeferredUpdates".
-            if (previousUpdateID <= lastUpdateIDFromClient) {
+            // If a previous update has already been applied to the client we should not detect a gap.
+            // This can cause a recursion loop, because "validateAndApplyDeferredUpdates" will refetch
+            // missing updates up to the previous update, which will then be applied again.
+            if (isPreviousUpdateAlreadyApplied) {
                 // eslint-disable-next-line no-continue
                 continue;
             }
 
-            // When we find a (new) gap, we need to set "gapExists" to true and reset the "firstUpdateAfterGaps" variable,
-            // so that we can continue searching for the next update after all gaps
+            // When we find a (new) gap, we initially need to set "gapExists" to true
+            // and reset "firstUpdateIDAfterGaps" and continue searching the first update after all gaps.
             gapExists = true;
-            firstUpdateAfterGaps = undefined;
+            firstUpdateIDAfterGaps = undefined;
 
-            // If there is a gap, it means the previous update is the latest missing update.
+            // We need to set update the latest missing update to the previous update of the current unchained update.
             latestMissingUpdateID = previousUpdateID;
         }
     }
 
-    // When "firstUpdateAfterGaps" is not set yet, we need to set it to the last update in the list,
-    // because we will fetch all missing updates up to the previous one and can then always apply the last update in the deferred updates.
-    const firstUpdateAfterGapWithFallback = Math.max(firstUpdateAfterGaps ?? Number(updateValues[updateValues.length - 1].lastUpdateID), lastUpdateIDFromClient);
-
     let updatesAfterGaps: DeferredUpdatesDictionary = {};
     if (gapExists) {
-        updatesAfterGaps = Object.entries(updates).reduce<DeferredUpdatesDictionary>((acc, [lastUpdateID, update]) => {
-            if (Number(lastUpdateID) >= firstUpdateAfterGapWithFallback) {
-                acc[Number(lastUpdateID)] = update;
+        // If there is a gap and we didn't detect two chained updates, "firstUpdateToBeAppliedAfterGap" will always be the the last deferred update.
+        // We will fetch all missing updates up to the previous update and can always apply the last deferred update.
+        const firstUpdateToBeAppliedAfterGap = firstUpdateIDAfterGaps ?? Number(updateValues[updateValues.length - 1].lastUpdateID);
+
+        // Add all deferred updates after the gap(s) to "updatesAfterGaps".
+        // If "firstUpdateToBeAppliedAfterGap" is set to the last deferred update, the array will be empty.
+        Object.entries(pendingDeferredUpdates).forEach(([lastUpdateID, update]) => {
+            if (Number(lastUpdateID) < firstUpdateToBeAppliedAfterGap) {
+                return;
             }
-            return acc;
+
+            updatesAfterGaps[Number(lastUpdateID)] = update;
         }, {});
     }
 
@@ -104,20 +118,16 @@ function validateAndApplyDeferredUpdates(clientLastUpdateID?: number, previousPa
 
     Log.info('[DeferredUpdates] Processing deferred updates', false, {lastUpdateIDFromClient, previousParams});
 
-    // We only want to apply deferred updates that are newer than the last update that was applied to the client.
-    // At this point, the missing updates from "GetMissingOnyxUpdates" have been applied already, so we can safely filter out.
-    const pendingDeferredUpdates = DeferredOnyxUpdates.getUpdates({minUpdateID: lastUpdateIDFromClient});
+    const {applicableUpdates, updatesAfterGaps, latestMissingUpdateID} = detectGapsAndSplit(lastUpdateIDFromClient);
 
-    // If there are no remaining deferred updates after filtering out outdated ones,
-    // we can just unpause the queue and return
-    if (Object.values(pendingDeferredUpdates).length === 0) {
+    // If there are no applicable deferred updates and no missing deferred updates,
+    // we don't need to apply or re-fetch any updates. We can just unpause the queue by resolving.
+    if (Object.values(applicableUpdates).length === 0 && latestMissingUpdateID === undefined) {
         return Promise.resolve();
     }
 
-    const {applicableUpdates, updatesAfterGaps, latestMissingUpdateID} = detectGapsAndSplit(pendingDeferredUpdates, lastUpdateIDFromClient);
-
-    // If newer updates got applied in the meantime, we don't need to refetch for missing updates
-    // and can just re-trigger the "validateAndApplyDeferredUpdates" process
+    // If newer updates got applied, we don't need to refetch for missing updates
+    // and will re-trigger the "validateAndApplyDeferredUpdates" process
     if (latestMissingUpdateID) {
         Log.info('[DeferredUpdates] Gap detected in deferred updates', false, {lastUpdateIDFromClient, latestMissingUpdateID});
 
@@ -134,7 +144,8 @@ function validateAndApplyDeferredUpdates(clientLastUpdateID?: number, previousPa
 
                 DeferredOnyxUpdates.enqueue(updatesAfterGaps, {shouldPauseSequentialQueue: false});
 
-                // If lastUpdateIDAppliedToClient got updated in the meantime, we will just retrigger the validation and application of the current deferred updates.
+                // If lastUpdateIDAppliedToClient got updated, we will just retrigger the validation
+                // and application of the current deferred updates.
                 if (latestMissingUpdateID <= newLastUpdateIDFromClient) {
                     validateAndApplyDeferredUpdates(undefined, {newLastUpdateIDFromClient, latestMissingUpdateID})
                         .then(() => resolve(undefined))

From 911a1dc68038dc298bf4b40da332fc6cdcf6c362 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.io>
Date: Mon, 19 Aug 2024 22:11:17 +0200
Subject: [PATCH 45/71] rename new test

---
 tests/unit/OnyxUpdateManagerTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/OnyxUpdateManagerTest.ts b/tests/unit/OnyxUpdateManagerTest.ts
index e0b28747e22c..2cfd1eec10c7 100644
--- a/tests/unit/OnyxUpdateManagerTest.ts
+++ b/tests/unit/OnyxUpdateManagerTest.ts
@@ -256,7 +256,7 @@ describe('OnyxUpdateManager', () => {
         });
     });
 
-    it('should only fetch missing updates that are not stale', () => {
+    it('should only fetch missing updates that are not outdated (older than already locally applied update)', () => {
         OnyxUpdateManager.handleOnyxUpdateGap(offsetedMockUpdate3);
         OnyxUpdateManager.handleOnyxUpdateGap(mockUpdate4);
 

From 4ce7ef561ad3230f272c0f559419b254235968e4 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.io>
Date: Tue, 20 Aug 2024 09:59:28 +0200
Subject: [PATCH 46/71] fix: lint error

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

diff --git a/src/libs/actions/OnyxUpdateManager/utils/index.ts b/src/libs/actions/OnyxUpdateManager/utils/index.ts
index a29e6397b4e0..bb5dd599480e 100644
--- a/src/libs/actions/OnyxUpdateManager/utils/index.ts
+++ b/src/libs/actions/OnyxUpdateManager/utils/index.ts
@@ -89,7 +89,7 @@ function detectGapsAndSplit(lastUpdateIDFromClient: number): DetectGapAndSplitRe
         }
     }
 
-    let updatesAfterGaps: DeferredUpdatesDictionary = {};
+    const updatesAfterGaps: DeferredUpdatesDictionary = {};
     if (gapExists) {
         // If there is a gap and we didn't detect two chained updates, "firstUpdateToBeAppliedAfterGap" will always be the the last deferred update.
         // We will fetch all missing updates up to the previous update and can always apply the last deferred update.

From 7b385233f02cbceca9486488c16543f3988734e1 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 20 Aug 2024 16:09:44 +0530
Subject: [PATCH 47/71] fix: List empty content does not render.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/SelectionList/BaseSelectionList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index bbc8615898df..7d8f4c1738c8 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -97,7 +97,7 @@ function BaseSelectionList<TItem extends ListItem>(
         shouldDelayFocus = true,
         shouldUpdateFocusedIndex = false,
         onLongPressRow,
-        shouldShowListEmptyContent = false,
+        shouldShowListEmptyContent = true,
     }: BaseSelectionListProps<TItem>,
     ref: ForwardedRef<SelectionListHandle>,
 ) {

From 3b6fdfdc4d1cacef9ac99aed8a39c0c207cf1e77 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 20 Aug 2024 13:10:17 +0200
Subject: [PATCH 48/71] revert remove sideeffects commit

---
 src/libs/API/types.ts              |  2 ++
 src/libs/actions/PaymentMethods.ts | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 364984d526a2..cc3504ad89ab 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -798,6 +798,7 @@ const SIDE_EFFECT_REQUEST_COMMANDS = {
     OPEN_OLD_DOT_LINK: 'OpenOldDotLink',
     OPEN_REPORT: 'OpenReport',
     RECONNECT_APP: 'ReconnectApp',
+    ADD_PAYMENT_CARD_GBP: 'AddPaymentCardGBP',
     REVEAL_EXPENSIFY_CARD_DETAILS: 'RevealExpensifyCardDetails',
     SWITCH_TO_OLD_DOT: 'SwitchToOldDot',
     TWO_FACTOR_AUTH_VALIDATE: 'TwoFactorAuth_Validate',
@@ -814,6 +815,7 @@ type SideEffectRequestCommandParameters = {
     [SIDE_EFFECT_REQUEST_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK]: Parameters.JoinPolicyInviteLinkParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.GENERATE_SPOTNANA_TOKEN]: Parameters.GenerateSpotnanaTokenParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP]: Parameters.AddPaymentCardParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.ACCEPT_SPOTNANA_TERMS]: null;
     [SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
 };
diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index e7a01ccb2d04..bac3739af810 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -13,7 +13,7 @@ import type {
     TransferWalletBalanceParams,
     UpdateBillingCurrencyParams,
 } from '@libs/API/parameters';
-import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as CardUtils from '@libs/CardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
@@ -254,10 +254,22 @@ function addSubscriptionPaymentCard(cardData: {
     ];
 
     if (currency === CONST.PAYMENT_CARD_CURRENCY.GBP) {
-        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData});
+        // eslint-disable-next-line rulesdir/no-api-side-effects-method
+        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData}).then((response) => {
+            if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
+                return;
+            }
+
+            // We are using this onyx key to open Modal and preview iframe. Potentially we can save the whole object which come from side effect
+            Onyx.set(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION, (response as {authenticationLink: string}).authenticationLink);
+        });
     } else {
         // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {optimisticData, successData, failureData});
+        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {
+            optimisticData,
+            successData,
+            failureData,
+        });
     }
 }
 

From d48a513f2960a6164d9376ec1d290123a5bf3d5b Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 20 Aug 2024 16:51:11 +0530
Subject: [PATCH 49/71] fix: Workspace - ESC key does not dismiss popup in
 Distance rates.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/pages/settings/AboutPage/ConsolePage.tsx                     | 1 +
 .../workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx    | 1 +
 src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/pages/settings/AboutPage/ConsolePage.tsx b/src/pages/settings/AboutPage/ConsolePage.tsx
index eb9b13608039..21ce3a7907cc 100644
--- a/src/pages/settings/AboutPage/ConsolePage.tsx
+++ b/src/pages/settings/AboutPage/ConsolePage.tsx
@@ -215,6 +215,7 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
                 title={translate('initialSettingsPage.debugConsole.shareLog')}
                 isVisible={isLimitModalVisible}
                 onConfirm={() => setIsLimitModalVisible(false)}
+                onCancel={() => setIsLimitModalVisible(false)}
                 prompt={translate('initialSettingsPage.debugConsole.logSizeTooLarge', {
                     size: CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE / 1024 / 1024,
                 })}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
index 00204d1e40c7..8f4e274b3d86 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
@@ -183,6 +183,7 @@ function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetail
                     />
                     <ConfirmModal
                         onConfirm={() => setIsWarningModalVisible(false)}
+                        onCancel={() => setIsWarningModalVisible(false)}
                         isVisible={isWarningModalVisible}
                         title={translate('workspace.distanceRates.oopsNotSoFast')}
                         prompt={translate('workspace.distanceRates.workspaceNeeds')}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index c13538d45d4c..0b2e83f458ff 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -338,6 +338,7 @@ function PolicyDistanceRatesPage({
                 )}
                 <ConfirmModal
                     onConfirm={() => setIsWarningModalVisible(false)}
+                    onCancel={() => setIsWarningModalVisible(false)}
                     isVisible={isWarningModalVisible}
                     title={translate('workspace.distanceRates.oopsNotSoFast')}
                     prompt={translate('workspace.distanceRates.workspaceNeeds')}

From 5cfaf085de2d2bed5d1db6e585d3d73802649782 Mon Sep 17 00:00:00 2001
From: cretadn22 <cretadn22@gmail.com>
Date: Tue, 20 Aug 2024 20:19:54 +0700
Subject: [PATCH 50/71] remove null type

---
 src/libs/actions/Workflow.ts       | 4 ++--
 src/types/onyx/ApprovalWorkflow.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Workflow.ts b/src/libs/actions/Workflow.ts
index 0b6c29c9890a..ec1b9c08025e 100644
--- a/src/libs/actions/Workflow.ts
+++ b/src/libs/actions/Workflow.ts
@@ -1,6 +1,6 @@
 import lodashDropRightWhile from 'lodash/dropRightWhile';
 import lodashMapKeys from 'lodash/mapKeys';
-import type {OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import type {OnyxCollection, OnyxMergeInput, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
 import type {CreateWorkspaceApprovalParams, RemoveWorkspaceApprovalParams, UpdateWorkspaceApprovalParams} from '@libs/API/parameters';
@@ -327,7 +327,7 @@ function clearApprovalWorkflowApprovers() {
     Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, {approvers: []});
 }
 
-function setApprovalWorkflow(approvalWorkflow: ApprovalWorkflowOnyx) {
+function setApprovalWorkflow(approvalWorkflow: OnyxMergeInput<typeof ONYXKEYS.APPROVAL_WORKFLOW>) {
     Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, approvalWorkflow);
 }
 
diff --git a/src/types/onyx/ApprovalWorkflow.ts b/src/types/onyx/ApprovalWorkflow.ts
index 8fef76e19d40..44a8932341fc 100644
--- a/src/types/onyx/ApprovalWorkflow.ts
+++ b/src/types/onyx/ApprovalWorkflow.ts
@@ -112,7 +112,7 @@ type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
     /**
      * Errors for the workflow
      */
-    errors?: Record<string, TranslationPaths> | null;
+    errors?: Record<string, TranslationPaths>;
 };
 
 export default ApprovalWorkflow;

From b73603a549b967338263aa4b95846e4b186f7f89 Mon Sep 17 00:00:00 2001
From: Carlos Martins <luacmartins@gmail.com>
Date: Tue, 20 Aug 2024 10:33:29 -0400
Subject: [PATCH 51/71] Revert "Fix message highlight stuck when open the 2nd
 context menu"

---
 .../PopoverReportActionContextMenu.tsx        |  1 -
 .../ContextMenu/ReportActionContextMenu.ts    | 48 +++++++++----------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
index 50b424fc736b..5cfce625201e 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -242,7 +242,6 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         reportIDRef.current = '-1';
         reportActionIDRef.current = '-1';
         originalReportIDRef.current = '-1';
-        setInstanceID('');
 
         onPopoverHide.current = runAndResetCallback(onPopoverHide.current);
         onPopoverHideActionCallback.current = runAndResetCallback(onPopoverHideActionCallback.current);
diff --git a/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts b/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts
index df500a967cfd..c8d952be0972 100644
--- a/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts
+++ b/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts
@@ -123,37 +123,33 @@ function showContextMenu(
     if (!contextMenuRef.current) {
         return;
     }
-    const show = () => {
-        contextMenuRef.current?.showContextMenu(
-            type,
-            event,
-            selection,
-            contextMenuAnchor,
-            reportID,
-            reportActionID,
-            originalReportID,
-            draftMessage,
-            onShow,
-            onHide,
-            isArchivedRoom,
-            isChronosReport,
-            isPinnedChat,
-            isUnreadChat,
-            disabledActions,
-            shouldCloseOnTarget,
-            setIsEmojiPickerActive,
-            isOverflowMenu,
-        );
-    };
-
     // If there is an already open context menu, close it first before opening
     // a new one.
     if (contextMenuRef.current.instanceID) {
-        hideContextMenu(false, show);
-        return;
+        hideContextMenu();
+        contextMenuRef.current.runAndResetOnPopoverHide();
     }
 
-    show();
+    contextMenuRef.current.showContextMenu(
+        type,
+        event,
+        selection,
+        contextMenuAnchor,
+        reportID,
+        reportActionID,
+        originalReportID,
+        draftMessage,
+        onShow,
+        onHide,
+        isArchivedRoom,
+        isChronosReport,
+        isPinnedChat,
+        isUnreadChat,
+        disabledActions,
+        shouldCloseOnTarget,
+        setIsEmojiPickerActive,
+        isOverflowMenu,
+    );
 }
 
 /**

From dd320739ebcd9491c62d25c56ed14d3890c161c0 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 20 Aug 2024 18:57:19 +0000
Subject: [PATCH 52/71] Update version to 9.0.22-8

---
 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 2f4658efc6b1..2cbc07cfcb3c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -108,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002207
-        versionName "9.0.22-7"
+        versionCode 1009002208
+        versionName "9.0.22-8"
         // 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 90d80233c4a1..58b433da6cf2 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.7</string>
+	<string>9.0.22.8</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 2917b13a2dfc..f5699ff17eb8 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.7</string>
+	<string>9.0.22.8</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 0fd1678399a2..53b6763468d4 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.22</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.7</string>
+	<string>9.0.22.8</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index c8f08b5fbed4..9a7e49b18859 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.22-7",
+  "version": "9.0.22-8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.22-7",
+      "version": "9.0.22-8",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index a158431da4f2..4ebae91f49ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.22-7",
+  "version": "9.0.22-8",
   "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 52ffca94f802bf9df6953d3c7ca5206a68af246f Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 20 Aug 2024 16:31:56 -0400
Subject: [PATCH 53/71] Add copy and translations for 'importing ___' progress
 step messages for NetSuite

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

diff --git a/src/CONST.ts b/src/CONST.ts
index f1e4a3bb46d5..81764e55ef40 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -2180,7 +2180,10 @@ const CONST = {
                 NETSUITE_SYNC_ACCOUNTS: 'netSuiteSyncAccounts',
                 NETSUITE_SYNC_CURRENCIES: 'netSuiteSyncCurrencies',
                 NETSUITE_SYNC_CATEGORIES: 'netSuiteSyncCategories',
+                NETSUITE_SYNC_IMPORT_CUSTOM_LISTS: 'netSuiteSyncImportCustomLists',
                 NETSUITE_SYNC_IMPORT_EMPLOYEES: 'netSuiteSyncImportEmployees',
+                NETSUITE_SYNC_IMPORT_SUBSIDIARIES: 'netSuiteSyncImportSubsidiaries',
+                NETSUITE_SYNC_IMPORT_VENDORS: 'netSuiteSyncImportVendors',
                 NETSUITE_SYNC_REPORT_FIELDS: 'netSuiteSyncReportFields',
                 NETSUITE_SYNC_TAGS: 'netSuiteSyncTags',
                 NETSUITE_SYNC_UPDATE_DATA: 'netSuiteSyncUpdateConnectionData',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1684ed3057da..13cd64168d7b 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3288,6 +3288,12 @@ export default {
                             return 'Marking Expensify reports as reimbursed';
                         case 'netSuiteSyncExpensifyReimbursedReports':
                             return 'Marking NetSuite bills and invoices as paid';
+                        case 'netSuiteSyncImportCustomLists':
+                            return 'Importing custom lists';
+                        case 'netSuiteSyncImportSubsidiaries':
+                            return 'Importing subsidiaries';
+                        case 'netSuiteSyncImportVendors':
+                            return 'Importing vendors';
                         case 'intacctCheckConnection':
                             return 'Checking Sage Intacct connection';
                         case 'intacctImportDimensions':
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b4d071ba4a08..e7ced058bed8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3268,6 +3268,12 @@ export default {
                             return 'Actualizando información de conexión';
                         case 'netSuiteSyncNetSuiteReimbursedReports':
                             return 'Marcando informes de Expensify como reembolsados';
+                        case 'netSuiteSyncImportCustomLists':
+                            return 'Importando listas personalizado';
+                        case 'netSuiteSyncImportSubsidiaries':
+                            return 'Importando subsidiarias';
+                        case 'netSuiteSyncImportVendors':
+                            return 'Importando proveedores';
                         case 'netSuiteSyncExpensifyReimbursedReports':
                             return 'Marcando facturas y recibos de NetSuite como pagados';
                         case 'intacctCheckConnection':

From 141cff88a2c6d05d6df5a5b76f7bc2232b341aab Mon Sep 17 00:00:00 2001
From: Carlos Martins <luacmartins@gmail.com>
Date: Tue, 20 Aug 2024 16:36:42 -0400
Subject: [PATCH 54/71] Revert "Create status bar"

---
 .../simple-illustration__envelopereceipt.svg  |  49 ------
 src/CONST.ts                                  |  15 +-
 src/components/Button/index.tsx               |  20 +--
 src/components/Icon/Illustrations.ts          |   2 -
 src/components/Search/SearchPageHeader.tsx    |  30 ++--
 src/components/Search/SearchStatusBar.tsx     | 166 ------------------
 src/components/Search/index.tsx               |  31 ++--
 src/components/Search/types.ts                |  10 +-
 .../SelectionList/SearchTableHeader.tsx       |  19 +-
 src/languages/en.ts                           |   2 -
 src/languages/es.ts                           |   2 -
 .../BottomTabBar.tsx                          |   6 +-
 src/libs/Navigation/switchPolicyID.ts         |   3 +-
 src/libs/SearchUtils.ts                       |  64 +++++--
 src/pages/Search/EmptySearchView.tsx          |   2 +
 src/pages/Search/SearchPage.tsx               |   8 +-
 src/pages/Search/SearchPageBottomTab.tsx      |  11 +-
 ...earchTypeMenu.tsx => SearchStatusMenu.tsx} |  58 +++---
 ...uNarrow.tsx => SearchStatusMenuNarrow.tsx} |  14 +-
 .../Subscription/CardSection/CardSection.tsx  |   3 +-
 src/styles/index.ts                           |   2 +-
 src/types/onyx/SearchResults.ts               |  14 +-
 22 files changed, 176 insertions(+), 355 deletions(-)
 delete mode 100644 assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg
 delete mode 100644 src/components/Search/SearchStatusBar.tsx
 rename src/pages/Search/{SearchTypeMenu.tsx => SearchStatusMenu.tsx} (57%)
 rename src/pages/Search/{SearchTypeMenuNarrow.tsx => SearchStatusMenuNarrow.tsx} (91%)

diff --git a/assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg b/assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg
deleted file mode 100644
index eb2bad31620d..000000000000
--- a/assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 68 68">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #ffd7b0;
-      }
-
-      .cls-2 {
-        fill: #fffaf0;
-      }
-
-      .cls-3 {
-        fill: #002140;
-      }
-
-      .cls-4 {
-        fill: none;
-        stroke: #002140;
-        stroke-linecap: round;
-        stroke-linejoin: round;
-      }
-
-      .cls-5 {
-        fill: #fbccff;
-      }
-    </style>
-  </defs>
-  <!-- Generator: Adobe Illustrator 28.6.0, SVG Export Plug-In . SVG Version: 1.2.0 Build 709)  -->
-  <g>
-    <g id="Layer_1">
-      <path class="cls-2" d="M55.567,29.859l-.071-3.226s-1.203-2.713-1.793-2.797c-.59-.084-19.216-6.597-19.216-6.597,0,0-1.721.431-2.366.574-.645.143-17.139,5.809-17.139,5.809,0,0-1.579.716-2.007,2.509-.428,1.793-.574,4.159-.574,4.159,0,0-.431.431-.502,1.433-.071,1.005.071,21.223.071,21.223,0,0-.143,1.219,1.361,1.29,1.507.071,42.592,0,42.592,0,0,0,.788-.645.788-1.433s.285-22.014.285-22.014c0,0-.645-1.076-1.433-.934l.003.003Z"/>
-      <path class="cls-1" d="M22.181,39.211s2.331-9.19,1.096-9.171c-1.235.019-10.59.178-10.59.178,0,0-.788.214-.788.859v.645l10.286,7.485-.003.003Z"/>
-      <path class="cls-1" d="M43.391,40.527c.396.853,13.608-9.735,13.608-9.735,0,0-.36-1.147-1.433-.934-1.073.214-6.791-.447-8.461.214-1.669.661-4.11,9.595-3.715,10.451v.003Z"/>
-      <path class="cls-5" d="M17.786,33.117l.444,3.135,6.143,4.506,19.508-.211s5.277-4.402,5.783-4.477c.47-9.32,5.355-18.442,5.355-18.442l-.681-.541-3.452.58-1.997-1.89-3.151,2.101-2.944-2.311-3.679,2.101-2.208-2.418-3.679,2.208-1.472-2.837-3.572,2.626-3.047-2.522s-7.355,3.362-7.355,18.39l.003.003Z"/>
-      <path class="cls-3" d="M17.597,30.535c.276,0,.5-.224.5-.5s-.224-.5-.5-.5v1ZM12.858,30.035l-.003.5h.003v-.5ZM17.597,29.535h-4.739v1h4.739v-1ZM12.861,29.535c-.898-.005-1.624.724-1.624,1.618h1c0-.344.278-.62.619-.618l.005-1ZM11.237,31.153v22.056h1v-22.056h-1ZM11.237,53.209c0,.895.726,1.622,1.622,1.622v-1c-.343,0-.622-.279-.622-.622h-1ZM12.858,54.831h42.893v-1H12.858v1ZM55.751,54.831c.895,0,1.622-.726,1.622-1.622h-1c0,.343-.279.622-.622.622v1ZM57.373,53.209v-22.056h-1v22.056h1ZM57.373,31.153c0-.895-.726-1.622-1.622-1.622v1c.343,0,.622.279.622.622h1ZM55.751,29.531h-5.024v1h5.024v-1Z"/>
-      <path class="cls-3" d="M17.116,54.049c-.125.246-.026.547.22.672.246.125.547.026.672-.22l-.892-.452ZM18.008,54.501l6.739-13.3-.892-.452-6.739,13.3.892.452Z"/>
-      <path class="cls-3" d="M43.969,40.602c-.118-.25-.416-.356-.666-.238-.25.118-.356.417-.238.666l.904-.428ZM43.065,41.03l6.367,13.43.904-.428-6.367-13.43-.904.428Z"/>
-      <path class="cls-3" d="M52.886,23.147c-.261-.091-.546.046-.637.307-.091.261.046.546.307.637l.33-.944ZM53.11,23.755l.167-.471h-.002s-.165.471-.165.471ZM55.495,27.049l-.5.004h0s.5-.004.5-.004ZM52.555,24.091l.389.136.33-.944-.389-.136-.33.944ZM52.943,24.227c1.227.434,2.042,1.565,2.053,2.827l1-.009c-.015-1.694-1.107-3.19-2.719-3.76l-.334.943ZM54.995,27.053l.026,2.739,1-.01-.026-2.739-1,.009Z"/>
-      <path class="cls-3" d="M12.186,29.717c0,.276.224.5.5.5s.5-.224.5-.5h-1ZM15.092,23.538l.163.472h0s-.164-.472-.164-.472ZM13.186,29.717v-2.846h-1v2.846h1ZM13.186,26.871c0-1.279.823-2.429,2.069-2.86l-.327-.945c-1.639.567-2.742,2.089-2.742,3.805h1ZM15.256,24.01l4.516-1.569-.328-.945-4.516,1.569.328.945Z"/>
-      <path class="cls-3" d="M12.187,31.532c-.226-.159-.537-.106-.697.12-.159.225-.106.538.12.697l.577-.816ZM24.372,40.761l-.289.408c.085.06.185.092.289.092v-.5ZM43.592,40.761v.5c.105,0,.208-.033.293-.095l-.293-.405ZM11.61,32.349l12.474,8.82.577-.817-12.474-8.82-.577.816ZM24.372,41.261h19.22v-1h-19.22v1ZM43.885,41.166l13.281-9.608-.586-.81-13.281,9.608.586.81Z"/>
-      <path class="cls-3" d="M17.459,36.334c.067.268.338.431.606.364.268-.067.431-.338.364-.606l-.97.243ZM25.196,14.309l.395-.307c-.089-.115-.224-.185-.369-.193-.145-.007-.287.049-.387.154l.361.345ZM27.64,17.46l-.395.306c.081.105.201.173.332.19.132.017.264-.02.369-.101l-.306-.395ZM31.501,14.465l.433-.251c-.072-.125-.195-.212-.337-.24-.142-.028-.288.007-.402.096l.306.395ZM33.235,17.46l-.433.251c.07.121.188.207.324.237.136.03.279.002.394-.078l-.286-.41ZM36.859,14.938l.366-.34c-.169-.182-.447-.212-.652-.07l.286.41ZM39.358,17.628l-.366.34c.171.184.452.213.657.067l-.29-.407ZM42.85,15.139l.356-.351c-.172-.175-.446-.199-.646-.056l.29.407ZM45.547,17.875l-.356.351c.164.167.423.197.621.073l-.265-.424ZM49.236,15.564l.36-.347c-.164-.17-.425-.202-.625-.076l.265.424ZM51.599,18.008l-.36.348c.14.145.353.191.54.119l-.181-.466ZM55.46,16.825l.436.245c.094-.168.084-.375-.027-.532-.111-.157-.302-.238-.492-.206l.082.493ZM17.944,36.213q.485-.121.485-.121s0,0,0,0c0,0,0,0,0,0,0,0,0-.002,0-.004,0-.004-.003-.011-.005-.02-.004-.019-.011-.049-.02-.089-.017-.08-.041-.201-.069-.36-.056-.318-.125-.788-.178-1.387-.106-1.198-.144-2.909.126-4.945.54-4.067,2.314-9.44,7.275-14.631l-.723-.691c-5.128,5.367-6.979,10.946-7.543,15.191-.282,2.12-.242,3.906-.131,5.165.056.63.129,1.128.189,1.472.03.172.057.305.076.397.01.046.018.081.024.106.003.012.005.022.007.029,0,.003.002.006.002.008,0,0,0,.002,0,.003,0,0,0,0,0,0t.485-.121ZM24.801,14.616l2.444,3.151.79-.613-2.444-3.151-.79.613ZM27.946,17.855l3.861-2.995-.613-.79-3.861,2.995.613.79ZM31.068,14.715l1.734,2.995.865-.501-1.734-2.995-.865.501ZM33.521,17.87l3.624-2.522-.571-.821-3.624,2.522.571.821ZM36.493,15.278l2.499,2.69.733-.681-2.499-2.691-.733.681ZM39.649,18.036l3.491-2.49-.581-.814-3.491,2.49.581.814ZM42.494,15.49l2.697,2.736.712-.702-2.697-2.736-.712.702ZM45.812,18.299l3.689-2.311-.531-.847-3.689,2.311.531.847ZM48.876,15.911l2.363,2.444.719-.695-2.363-2.444-.719.695ZM51.599,18.008q.181.466.181.466s0,0,0,0h0s0,0,.001,0c.001,0,.003,0,.005-.002.004-.002.011-.004.02-.008.018-.007.044-.017.078-.03.068-.026.168-.063.292-.109.248-.091.594-.215.983-.347.787-.266,1.719-.55,2.384-.661l-.165-.986c-.751.126-1.75.433-2.539.7-.399.135-.753.262-1.008.356-.127.047-.23.085-.301.112-.035.014-.063.024-.082.031-.009.004-.017.006-.022.008-.003,0-.004.002-.006.002,0,0-.001,0-.001,0,0,0,0,0,0,0h0s0,0,.181.466ZM55.024,16.58c-2.711,4.824-4.173,9.687-4.959,13.339-.393,1.827-.617,3.355-.743,4.427-.063.536-.102.959-.124,1.249-.011.145-.019.257-.024.333-.002.038-.004.067-.005.087,0,.01,0,.018-.001.023,0,.003,0,.005,0,.006,0,0,0,.001,0,.002h0s0,0,.5.023q.5.022.5.022h0s0-.003,0-.005c0-.004,0-.01,0-.019,0-.017.002-.044.005-.079.004-.071.011-.177.022-.316.022-.278.059-.688.121-1.211.123-1.046.342-2.542.728-4.334.771-3.586,2.205-8.347,4.853-13.059l-.872-.49Z"/>
-      <path class="cls-4" d="M25.669,23.843h18.124"/>
-      <path class="cls-4" d="M24.723,32h18.127"/>
-      <path class="cls-4" d="M24.723,36h18.127"/>
-      <path class="cls-4" d="M24.801,28h18.127"/>
-    </g>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/src/CONST.ts b/src/CONST.ts
index 0becab6d3483..db29c1195e48 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5251,6 +5251,8 @@ const CONST = {
     SEARCH: {
         RESULTS_PAGE_SIZE: 50,
         DATA_TYPES: {
+            TRANSACTION: 'transaction',
+            REPORT: 'report',
             EXPENSE: 'expense',
             INVOICE: 'invoice',
             TRIP: 'trip',
@@ -5279,10 +5281,9 @@ const CONST = {
         STATUS: {
             EXPENSE: {
                 ALL: 'all',
+                SHARED: 'shared',
                 DRAFTS: 'drafts',
-                OUTSTANDING: 'outstanding',
-                APPROVED: 'approved',
-                PAID: 'paid',
+                FINISHED: 'finished',
             },
             INVOICE: {
                 ALL: 'all',
@@ -5297,6 +5298,14 @@ const CONST = {
                 PAID: 'paid',
             },
         },
+        TAB: {
+            EXPENSE: {
+                ALL: 'type:expense status:all',
+                SHARED: 'type:expense status:shared',
+                DRAFTS: 'type:expense status:drafts',
+                FINISHED: 'type:expense status:finished',
+            },
+        },
         TABLE_COLUMNS: {
             RECEIPT: 'receipt',
             DATE: 'date',
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 1441266c76de..126c81961cee 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -29,9 +29,6 @@ type ButtonProps = Partial<ChildrenProps> & {
     /** The fill color to pass into the icon. */
     iconFill?: string;
 
-    /** The fill color to pass into the icon when the button is hovered. */
-    iconHoverFill?: string;
-
     /** Any additional styles to pass to the left icon container. */
     iconStyles?: StyleProp<ViewStyle>;
 
@@ -83,15 +80,9 @@ type ButtonProps = Partial<ChildrenProps> & {
     /** Additional text styles */
     textStyles?: StyleProp<TextStyle>;
 
-    /** Additional text styles when the button is hovered */
-    textHoverStyles?: StyleProp<TextStyle>;
-
     /** Whether we should use the default hover style */
     shouldUseDefaultHover?: boolean;
 
-    /** Additional hover styles */
-    hoverStyles?: StyleProp<ViewStyle>;
-
     /** Whether we should use the success theme color */
     success?: boolean;
 
@@ -179,7 +170,6 @@ function Button(
 
         iconRight = Expensicons.ArrowRight,
         iconFill,
-        iconHoverFill,
         icon = null,
         iconStyles = [],
         iconRightStyles = [],
@@ -204,10 +194,8 @@ function Button(
         style = [],
         innerStyles = [],
         textStyles = [],
-        textHoverStyles = [],
 
         shouldUseDefaultHover = true,
-        hoverStyles = undefined,
         success = false,
         danger = false,
 
@@ -250,7 +238,6 @@ function Button(
                     danger && styles.buttonDangerText,
                     !!icon && styles.textAlignLeft,
                     textStyles,
-                    isHovered && textHoverStyles,
                     link && styles.link,
                     link && isHovered && StyleUtils.getColorStyle(theme.linkHover),
                     link && styles.fontWeightNormal,
@@ -272,7 +259,7 @@ function Button(
                                 <Icon
                                     src={icon}
                                     hasText={!!text}
-                                    fill={isHovered ? iconHoverFill : iconFill ?? (success || danger ? theme.textLight : theme.icon)}
+                                    fill={iconFill ?? (success || danger ? theme.textLight : theme.icon)}
                                     small={small}
                                     medium={medium}
                                     large={large}
@@ -286,14 +273,14 @@ function Button(
                             {!isSplitButton ? (
                                 <Icon
                                     src={iconRight}
-                                    fill={isHovered ? iconHoverFill : iconFill ?? (success || danger ? theme.textLight : theme.icon)}
+                                    fill={iconFill ?? (success || danger ? theme.textLight : theme.icon)}
                                     small={medium}
                                     medium={large}
                                 />
                             ) : (
                                 <Icon
                                     src={iconRight}
-                                    fill={isHovered ? iconHoverFill : iconFill ?? (success || danger ? theme.textLight : theme.icon)}
+                                    fill={iconFill ?? (success || danger ? theme.textLight : theme.icon)}
                                     small={small}
                                     medium={medium}
                                     large={large}
@@ -371,7 +358,6 @@ function Button(
                     shouldUseDefaultHover && !isDisabled ? styles.buttonDefaultHovered : undefined,
                     success && !isDisabled ? styles.buttonSuccessHovered : undefined,
                     danger && !isDisabled ? styles.buttonDangerHovered : undefined,
-                    hoverStyles,
                 ]}
                 id={id}
                 accessibilityLabel={accessibilityLabel}
diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts
index 64058a495231..9537e7a0a7a7 100644
--- a/src/components/Icon/Illustrations.ts
+++ b/src/components/Icon/Illustrations.ts
@@ -58,7 +58,6 @@ import CreditCardsNew from '@assets/images/simple-illustrations/simple-illustrat
 import CreditCardEyes from '@assets/images/simple-illustrations/simple-illustration__creditcardeyes.svg';
 import EmailAddress from '@assets/images/simple-illustrations/simple-illustration__email-address.svg';
 import EmptyState from '@assets/images/simple-illustrations/simple-illustration__empty-state.svg';
-import EnvelopeReceipt from '@assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg';
 import Filters from '@assets/images/simple-illustrations/simple-illustration__filters.svg';
 import FolderOpen from '@assets/images/simple-illustrations/simple-illustration__folder-open.svg';
 import Gears from '@assets/images/simple-illustrations/simple-illustration__gears.svg';
@@ -122,7 +121,6 @@ export {
     EmailAddress,
     EmptyCardState,
     EmptyStateExpenses,
-    EnvelopeReceipt,
     FolderOpen,
     HandCard,
     HotDogStand,
diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 2b59e2046484..7e4b69c39596 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -27,11 +27,11 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {SearchDataTypes, SearchReport} from '@src/types/onyx/SearchResults';
+import type {SearchReport} from '@src/types/onyx/SearchResults';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import type IconAsset from '@src/types/utils/IconAsset';
 import {useSearchContext} from './SearchContext';
-import type {SearchQueryJSON} from './types';
+import type {SearchQueryJSON, SearchStatus} from './types';
 
 type HeaderWrapperProps = Pick<HeaderWithBackButtonProps, 'title' | 'subtitle' | 'icon' | 'children'> & {
     subtitleStyles?: StyleProp<TextStyle>;
@@ -100,23 +100,13 @@ type SearchPageHeaderProps = {
 
 type SearchHeaderOptionValue = DeepValueOf<typeof CONST.SEARCH.BULK_ACTION_TYPES> | undefined;
 
-type HeaderContent = {
-    icon: IconAsset;
-    titleText: TranslationPaths;
+const headerContent: {[key in SearchStatus]: {icon: IconAsset; titleText: TranslationPaths}} = {
+    all: {icon: Illustrations.MoneyReceipts, titleText: 'common.expenses'},
+    shared: {icon: Illustrations.SendMoney, titleText: 'common.shared'},
+    drafts: {icon: Illustrations.Pencil, titleText: 'common.drafts'},
+    finished: {icon: Illustrations.CheckmarkCircle, titleText: 'common.finished'},
 };
 
-function getHeaderContent(type: SearchDataTypes): HeaderContent {
-    switch (type) {
-        case CONST.SEARCH.DATA_TYPES.INVOICE:
-            return {icon: Illustrations.EnvelopeReceipt, titleText: 'workspace.common.invoices'};
-        case CONST.SEARCH.DATA_TYPES.TRIP:
-            return {icon: Illustrations.Luggage, titleText: 'travel.trips'};
-        case CONST.SEARCH.DATA_TYPES.EXPENSE:
-        default:
-            return {icon: Illustrations.MoneyReceipts, titleText: 'common.expenses'};
-    }
-}
-
 function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModalOpen, setDownloadErrorModalOpen, isCustomQuery, data}: SearchPageHeaderProps) {
     const {translate} = useLocalize();
     const theme = useTheme();
@@ -141,10 +131,10 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
                 .map((item) => item.reportID),
         [data, selectedTransactions],
     );
-    const {status, type} = queryJSON;
-    const headerSubtitle = isCustomQuery ? SearchUtils.getSearchHeaderTitle(queryJSON) : translate(getHeaderContent(type).titleText);
+    const {status} = queryJSON;
+    const headerSubtitle = isCustomQuery ? SearchUtils.getSearchHeaderTitle(queryJSON) : translate(headerContent[status]?.titleText);
     const headerTitle = isCustomQuery ? translate('search.filtersHeader') : '';
-    const headerIcon = isCustomQuery ? Illustrations.Filters : getHeaderContent(type).icon;
+    const headerIcon = isCustomQuery ? Illustrations.Filters : headerContent[status]?.icon;
 
     const subtitleStyles = isCustomQuery ? {} : styles.textHeadlineH2;
 
diff --git a/src/components/Search/SearchStatusBar.tsx b/src/components/Search/SearchStatusBar.tsx
deleted file mode 100644
index 7c1ffeff1818..000000000000
--- a/src/components/Search/SearchStatusBar.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import React from 'react';
-import Button from '@components/Button';
-import * as Expensicons from '@components/Icon/Expensicons';
-import ScrollView from '@components/ScrollView';
-import useLocalize from '@hooks/useLocalize';
-import useSingleExecution from '@hooks/useSingleExecution';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import Navigation from '@libs/Navigation/Navigation';
-import * as SearchUtils from '@libs/SearchUtils';
-import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
-import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
-import type IconAsset from '@src/types/utils/IconAsset';
-import type {ExpenseSearchStatus, InvoiceSearchStatus, SearchQueryString, SearchStatus, TripSearchStatus} from './types';
-
-type SearchStatusBarProps = {
-    type: SearchDataTypes;
-    status: SearchStatus;
-};
-
-const expenseOptions: Array<{key: ExpenseSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
-    {
-        key: CONST.SEARCH.STATUS.EXPENSE.ALL,
-        icon: Expensicons.All,
-        text: 'common.all',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL),
-    },
-    {
-        key: CONST.SEARCH.STATUS.EXPENSE.DRAFTS,
-        icon: Expensicons.Pencil,
-        text: 'common.drafts',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.DRAFTS),
-    },
-    {
-        key: CONST.SEARCH.STATUS.EXPENSE.OUTSTANDING,
-        icon: Expensicons.Hourglass,
-        text: 'common.outstanding',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.OUTSTANDING),
-    },
-    {
-        key: CONST.SEARCH.STATUS.EXPENSE.APPROVED,
-        icon: Expensicons.ThumbsUp,
-        text: 'iou.approved',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.APPROVED),
-    },
-    {
-        key: CONST.SEARCH.STATUS.EXPENSE.PAID,
-        icon: Expensicons.MoneyBag,
-        text: 'iou.settledExpensify',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.PAID),
-    },
-];
-
-const invoiceOptions: Array<{key: InvoiceSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
-    {
-        key: CONST.SEARCH.STATUS.INVOICE.ALL,
-        icon: Expensicons.All,
-        text: 'common.all',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.ALL),
-    },
-    {
-        key: CONST.SEARCH.STATUS.INVOICE.OUTSTANDING,
-        icon: Expensicons.Hourglass,
-        text: 'common.outstanding',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.OUTSTANDING),
-    },
-    {
-        key: CONST.SEARCH.STATUS.INVOICE.PAID,
-        icon: Expensicons.MoneyBag,
-        text: 'iou.settledExpensify',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.PAID),
-    },
-];
-
-const tripOptions: Array<{key: TripSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
-    {
-        key: CONST.SEARCH.STATUS.TRIP.ALL,
-        icon: Expensicons.All,
-        text: 'common.all',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.ALL),
-    },
-    {
-        key: CONST.SEARCH.STATUS.TRIP.DRAFTS,
-        icon: Expensicons.Pencil,
-        text: 'common.drafts',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.DRAFTS),
-    },
-    {
-        key: CONST.SEARCH.STATUS.TRIP.OUTSTANDING,
-        icon: Expensicons.Hourglass,
-        text: 'common.outstanding',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.OUTSTANDING),
-    },
-    {
-        key: CONST.SEARCH.STATUS.TRIP.APPROVED,
-        icon: Expensicons.ThumbsUp,
-        text: 'iou.approved',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.APPROVED),
-    },
-    {
-        key: CONST.SEARCH.STATUS.TRIP.PAID,
-        icon: Expensicons.MoneyBag,
-        text: 'iou.settledExpensify',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.PAID),
-    },
-];
-
-function getOptions(type: SearchDataTypes) {
-    switch (type) {
-        case CONST.SEARCH.DATA_TYPES.INVOICE:
-            return invoiceOptions;
-        case CONST.SEARCH.DATA_TYPES.TRIP:
-            return tripOptions;
-        case CONST.SEARCH.DATA_TYPES.EXPENSE:
-        default:
-            return expenseOptions;
-    }
-}
-
-function SearchStatusBar({type, status}: SearchStatusBarProps) {
-    const {singleExecution} = useSingleExecution();
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const theme = useTheme();
-    const {translate} = useLocalize();
-    const options = getOptions(type);
-
-    return (
-        <ScrollView
-            style={[styles.flexRow, styles.mb5, styles.overflowScroll, styles.flexGrow0]}
-            horizontal
-            showsHorizontalScrollIndicator={false}
-        >
-            {options.map((item, index) => {
-                const onPress = singleExecution(() => Navigation.setParams({q: item.query}));
-                const isActive = status === item.key;
-                const isFirstItem = index === 0;
-                const isLastItem = index === options.length - 1;
-
-                return (
-                    <Button
-                        key={item.key}
-                        text={translate(item.text)}
-                        onPress={onPress}
-                        icon={item.icon}
-                        iconFill={isActive ? theme.success : undefined}
-                        iconHoverFill={theme.success}
-                        innerStyles={!isActive && styles.bgTransparent}
-                        hoverStyles={StyleUtils.getBackgroundColorStyle(!isActive ? theme.highlightBG : theme.border)}
-                        textStyles={!isActive && StyleUtils.getTextColorStyle(theme.textSupporting)}
-                        textHoverStyles={StyleUtils.getTextColorStyle(theme.text)}
-                        // We add padding to the first and last items so that they align with the header and table but can overflow outside the screen when scrolled.
-                        style={[isFirstItem && styles.pl5, isLastItem && styles.pr5]}
-                        medium
-                    />
-                );
-            })}
-        </ScrollView>
-    );
-}
-
-SearchStatusBar.displayName = 'SearchStatusBar';
-
-export default SearchStatusBar;
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index db729a9aa77d..df5398bffffa 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -31,7 +31,6 @@ import ROUTES from '@src/ROUTES';
 import type SearchResults from '@src/types/onyx/SearchResults';
 import {useSearchContext} from './SearchContext';
 import SearchPageHeader from './SearchPageHeader';
-import SearchStatusBar from './SearchStatusBar';
 import type {SearchColumnType, SearchQueryJSON, SearchStatus, SelectedTransactionInfo, SelectedTransactions, SortOrder} from './types';
 
 type SearchProps = {
@@ -89,7 +88,7 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
     const [selectedTransactionsToDelete, setSelectedTransactionsToDelete] = useState<string[]>([]);
     const [deleteExpensesConfirmModalVisible, setDeleteExpensesConfirmModalVisible] = useState(false);
     const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
-    const {type, status, sortBy, sortOrder, hash} = queryJSON;
+    const {status, sortBy, sortOrder, hash} = queryJSON;
 
     const [currentSearchResults] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`);
 
@@ -177,12 +176,11 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
 
     const searchResults = currentSearchResults?.data ? currentSearchResults : lastSearchResultsRef.current;
 
-    // There's a race condition in Onyx which makes it return data from the previous Search, so in addition to checking that the data is loaded
-    // we also need to check that the searchResults matches the type and status of the current search
-    const isDataLoaded = searchResults?.data !== undefined && searchResults?.search?.type === type && searchResults?.search?.status === status;
+    const isDataLoaded = searchResults?.data !== undefined;
     const shouldShowLoadingState = !isOffline && !isDataLoaded;
     const shouldShowLoadingMoreItems = !shouldShowLoadingState && searchResults?.search?.isLoading && searchResults?.search?.offset > 0;
-    const isSearchResultsEmpty = !searchResults?.data || SearchUtils.isSearchResultsEmpty(searchResults);
+
+    const isSearchResultsEmpty = !searchResults || SearchUtils.isSearchResultsEmpty(searchResults);
     const prevIsSearchResultEmpty = usePrevious(isSearchResultsEmpty);
 
     useEffect(() => {
@@ -205,14 +203,16 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
         );
     }
 
-    if (searchResults === undefined) {
+    const type = SearchUtils.getSearchType(searchResults?.search);
+
+    if (searchResults === undefined || type === undefined) {
         Log.alert('[Search] Undefined search type');
         return null;
     }
 
-    const ListItem = SearchUtils.getListItem(status);
-    const data = SearchUtils.getSections(status, searchResults.data, searchResults.search);
-    const sortedData = SearchUtils.getSortedSections(status, data, sortBy, sortOrder);
+    const ListItem = SearchUtils.getListItem(type, status);
+    const data = SearchUtils.getSections(type, status, searchResults.data, searchResults.search);
+    const sortedData = SearchUtils.getSortedSections(type, status, data, sortBy, sortOrder);
     const sortedSelectedData = sortedData.map((item) => mapToItemWithSelectionInfo(item, selectedTransactions, canSelectMultiple));
 
     const shouldShowEmptyState = !isDataLoaded || data.length === 0;
@@ -225,10 +225,6 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
                     queryJSON={queryJSON}
                     hash={hash}
                 />
-                <SearchStatusBar
-                    type={type}
-                    status={status}
-                />
                 <EmptySearchView type={type} />
             </>
         );
@@ -285,7 +281,7 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
     };
 
     const toggleAllTransactions = () => {
-        const areItemsOfReportType = status !== CONST.SEARCH.STATUS.EXPENSE.ALL;
+        const areItemsOfReportType = searchResults?.search.type === CONST.SEARCH.DATA_TYPES.REPORT;
         const flattenedItems = areItemsOfReportType ? (data as ReportListItemType[]).flatMap((item) => item.transactions) : data;
         const isAllSelected = flattenedItems.length === Object.keys(selectedTransactions).length;
 
@@ -322,10 +318,7 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
                 setOfflineModalOpen={() => setOfflineModalVisible(true)}
                 setDownloadErrorModalOpen={() => setDownloadErrorModalVisible(true)}
             />
-            <SearchStatusBar
-                type={type}
-                status={status}
-            />
+
             <SelectionListWithModal<ReportListItemType | TransactionListItemType>
                 sections={[{data: sortedSelectedData, isDisabled: false}]}
                 turnOnSelectionModeOnLongPress
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index c933deb8ee03..54b26ea6bac4 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -1,6 +1,5 @@
 import type {ValueOf} from 'react-native-gesture-handler/lib/typescript/typeUtils';
 import type CONST from '@src/CONST';
-import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 
 /** Model of the selected transaction */
 type SelectedTransactionInfo = {
@@ -26,9 +25,7 @@ type SelectedTransactions = Record<string, SelectedTransactionInfo>;
 type SortOrder = ValueOf<typeof CONST.SEARCH.SORT_ORDER>;
 type SearchColumnType = ValueOf<typeof CONST.SEARCH.TABLE_COLUMNS>;
 type ExpenseSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.EXPENSE>;
-type InvoiceSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.INVOICE>;
-type TripSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.TRIP>;
-type SearchStatus = ExpenseSearchStatus | InvoiceSearchStatus | TripSearchStatus;
+type SearchStatus = ExpenseSearchStatus;
 
 type SearchContext = {
     currentSearchHash: number;
@@ -58,7 +55,7 @@ type QueryFilters = {
 type SearchQueryString = string;
 
 type SearchQueryAST = {
-    type: SearchDataTypes;
+    type: string;
     status: SearchStatus;
     sortBy: SearchColumnType;
     sortOrder: SortOrder;
@@ -84,7 +81,4 @@ export type {
     QueryFilter,
     QueryFilters,
     AdvancedFiltersKeys,
-    ExpenseSearchStatus,
-    InvoiceSearchStatus,
-    TripSearchStatus,
 };
diff --git a/src/components/SelectionList/SearchTableHeader.tsx b/src/components/SelectionList/SearchTableHeader.tsx
index a5547eb9e710..f68b3c6d17ff 100644
--- a/src/components/SelectionList/SearchTableHeader.tsx
+++ b/src/components/SelectionList/SearchTableHeader.tsx
@@ -9,6 +9,7 @@ import * as SearchUtils from '@libs/SearchUtils';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type * as OnyxTypes from '@src/types/onyx';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import SortableHeaderText from './SortableHeaderText';
 
 type SearchColumnConfig = {
@@ -85,6 +86,19 @@ const expenseHeaders: SearchColumnConfig[] = [
     },
 ];
 
+function getSearchColumns(type: SearchDataTypes): SearchColumnConfig[] {
+    switch (type) {
+        case CONST.SEARCH.DATA_TYPES.TRANSACTION:
+        case CONST.SEARCH.DATA_TYPES.REPORT:
+        case CONST.SEARCH.DATA_TYPES.EXPENSE:
+        case CONST.SEARCH.DATA_TYPES.INVOICE:
+        case CONST.SEARCH.DATA_TYPES.TRIP:
+            return expenseHeaders;
+        default:
+            return expenseHeaders;
+    }
+}
+
 type SearchTableHeaderProps = {
     data: OnyxTypes.SearchResults['data'];
     metadata: OnyxTypes.SearchResults['search'];
@@ -101,15 +115,16 @@ function SearchTableHeader({data, metadata, sortBy, sortOrder, onSortPress, shou
     const {isSmallScreenWidth, isMediumScreenWidth} = useWindowDimensions();
     const {translate} = useLocalize();
     const displayNarrowVersion = isMediumScreenWidth || isSmallScreenWidth;
+    const type = SearchUtils.getSearchType(metadata);
 
-    if (displayNarrowVersion) {
+    if (displayNarrowVersion || !type) {
         return;
     }
 
     return (
         <View style={[styles.flex1]}>
             <View style={[styles.flex1, styles.flexRow, styles.gap3, styles.pl4]}>
-                {expenseHeaders.map(({columnName, translationKey, shouldShow, isColumnSortable}) => {
+                {getSearchColumns(type).map(({columnName, translationKey, shouldShow, isColumnSortable}) => {
                     if (!shouldShow(data, metadata)) {
                         return null;
                     }
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 796105bf8ed2..ea5c8f14ae86 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -375,7 +375,6 @@ export default {
         filterLogs: 'Filter Logs',
         network: 'Network',
         reportID: 'Report ID',
-        outstanding: 'Outstanding',
     },
     location: {
         useCurrent: 'Use current location',
@@ -2096,7 +2095,6 @@ export default {
         viewTrip: 'View trip',
         viewTripDetails: 'View trip details',
         trip: 'Trip',
-        trips: 'Trips',
         tripSummary: 'Trip summary',
         departs: 'Departs',
         errorMessage: 'Something went wrong. Please try again later.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index cad3b16fe7cc..54679d9f5cfe 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -365,7 +365,6 @@ export default {
         filterLogs: 'Registros de filtrado',
         network: 'La red',
         reportID: 'ID del informe',
-        outstanding: 'Pendiente',
     },
     connectionComplete: {
         title: 'Conexión completa',
@@ -2128,7 +2127,6 @@ export default {
         viewTrip: 'Ver viaje',
         viewTripDetails: 'Ver detalles del viaje',
         trip: 'Viaje',
-        trips: 'Viajes',
         tripSummary: 'Resumen del viaje',
         departs: 'Sale',
         errorMessage: 'Ha ocurrido un error. Por favor, inténtalo mas tarde.',
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
index a9df43ad5b64..f023e94bec9b 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
@@ -18,7 +18,7 @@ import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 import type {RootStackParamList, State} from '@libs/Navigation/types';
 import {isCentralPaneName} from '@libs/NavigationUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import * as SearchUtils from '@libs/SearchUtils';
+import {getCurrentSearchParams} from '@libs/SearchUtils';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 import {getChatTabBrickRoad} from '@libs/WorkspacesSettingsUtils';
 import BottomTabAvatar from '@pages/home/sidebar/BottomTabAvatar';
@@ -88,14 +88,14 @@ function BottomTabBar({selectedTab}: BottomTabBarProps) {
             return;
         }
         interceptAnonymousUser(() => {
-            const currentSearchParams = SearchUtils.getCurrentSearchParams();
+            const currentSearchParams = getCurrentSearchParams();
             if (currentSearchParams) {
                 const {q, ...rest} = currentSearchParams;
                 const policy = PolicyUtils.getPolicy(currentSearchParams?.policyIDs);
                 Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: q, ...rest, policyIDs: policy ? currentSearchParams?.policyIDs : undefined}));
                 return;
             }
-            Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
+            Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL}));
         });
     }, [selectedTab]);
 
diff --git a/src/libs/Navigation/switchPolicyID.ts b/src/libs/Navigation/switchPolicyID.ts
index a37ccb0c2506..28de413b0904 100644
--- a/src/libs/Navigation/switchPolicyID.ts
+++ b/src/libs/Navigation/switchPolicyID.ts
@@ -4,7 +4,6 @@ import {getPathFromState} from '@react-navigation/native';
 import type {Writable} from 'type-fest';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import {isCentralPaneName} from '@libs/NavigationUtils';
-import * as SearchUtils from '@libs/SearchUtils';
 import CONST from '@src/CONST';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
@@ -85,7 +84,7 @@ export default function switchPolicyID(navigation: NavigationContainerRef<RootSt
     // Here's the configuration: src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx
     const isOpeningSearchFromBottomTab = !route && topmostCentralPaneRoute?.name === SCREENS.SEARCH.CENTRAL_PANE;
     if (isOpeningSearchFromBottomTab) {
-        newPath = ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()});
+        newPath = ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL});
     }
     const stateFromPath = getStateFromPath(newPath as Route) as PartialState<NavigationState<RootStackParamList>>;
     const action: StackNavigationAction = getActionFromState(stateFromPath, linkingConfig.config);
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 48af780eab5b..bb49697a8345 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -76,6 +76,23 @@ function getTransactionItemCommonFormattedProperties(
     };
 }
 
+function isSearchDataType(type: string): type is SearchDataTypes {
+    const searchDataTypes: string[] = Object.values(CONST.SEARCH.DATA_TYPES);
+    return searchDataTypes.includes(type);
+}
+
+function getSearchType(search: OnyxTypes.SearchResults['search'] | undefined): SearchDataTypes | undefined {
+    if (!search) {
+        return undefined;
+    }
+
+    if (!isSearchDataType(search.type)) {
+        return undefined;
+    }
+
+    return search.type;
+}
+
 function getShouldShowMerchant(data: OnyxTypes.SearchResults['data']): boolean {
     return Object.values(data).some((item) => {
         const merchant = item.modifiedMerchant ? item.modifiedMerchant : item.merchant ?? '';
@@ -233,16 +250,45 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
     return Object.values(reportIDToTransactions);
 }
 
-function getListItem(status: SearchStatus): ListItemType<typeof status> {
-    return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? TransactionListItem : ReportListItem;
+function getListItem(type: SearchDataTypes, status: SearchStatus): ListItemType<typeof status> {
+    switch (type) {
+        case CONST.SEARCH.DATA_TYPES.TRANSACTION:
+        case CONST.SEARCH.DATA_TYPES.EXPENSE:
+        case CONST.SEARCH.DATA_TYPES.REPORT:
+        case CONST.SEARCH.DATA_TYPES.INVOICE:
+        case CONST.SEARCH.DATA_TYPES.TRIP:
+            return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? TransactionListItem : ReportListItem;
+        default:
+            return TransactionListItem;
+    }
 }
 
-function getSections(status: SearchStatus, data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']) {
-    return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? getTransactionsSections(data, metadata) : getReportSections(data, metadata);
+function getSections(type: SearchDataTypes, status: SearchStatus, data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']) {
+    switch (type) {
+        case CONST.SEARCH.DATA_TYPES.TRANSACTION:
+        case CONST.SEARCH.DATA_TYPES.EXPENSE:
+        case CONST.SEARCH.DATA_TYPES.REPORT:
+        case CONST.SEARCH.DATA_TYPES.INVOICE:
+        case CONST.SEARCH.DATA_TYPES.TRIP:
+            return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? getTransactionsSections(data, metadata) : getReportSections(data, metadata);
+        default:
+            return getTransactionsSections(data, metadata);
+    }
 }
 
-function getSortedSections(status: SearchStatus, data: ListItemDataType<typeof status>, sortBy?: SearchColumnType, sortOrder?: SortOrder) {
-    return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? getSortedTransactionData(data as TransactionListItemType[], sortBy, sortOrder) : getSortedReportData(data as ReportListItemType[]);
+function getSortedSections(type: SearchDataTypes, status: SearchStatus, data: ListItemDataType<typeof status>, sortBy?: SearchColumnType, sortOrder?: SortOrder) {
+    switch (type) {
+        case CONST.SEARCH.DATA_TYPES.TRANSACTION:
+        case CONST.SEARCH.DATA_TYPES.EXPENSE:
+        case CONST.SEARCH.DATA_TYPES.REPORT:
+        case CONST.SEARCH.DATA_TYPES.INVOICE:
+        case CONST.SEARCH.DATA_TYPES.TRIP:
+            return status === CONST.SEARCH.STATUS.EXPENSE.ALL
+                ? getSortedTransactionData(data as TransactionListItemType[], sortBy, sortOrder)
+                : getSortedReportData(data as ReportListItemType[]);
+        default:
+            return getSortedTransactionData(data as TransactionListItemType[], sortBy, sortOrder);
+    }
 }
 
 function getQueryHash(query: string, policyID?: string, sortBy?: string, sortOrder?: string): number {
@@ -525,10 +571,6 @@ function getSearchHeaderTitle(queryJSON: SearchQueryJSON) {
     return title;
 }
 
-function buildCannedSearchQuery(type: SearchDataTypes = CONST.SEARCH.DATA_TYPES.EXPENSE, status: SearchStatus = CONST.SEARCH.STATUS.EXPENSE.ALL): SearchQueryString {
-    return normalizeQuery(`type:${type} status:${status}`);
-}
-
 export {
     buildQueryStringFromFilters,
     buildSearchQueryJSON,
@@ -538,6 +580,7 @@ export {
     getListItem,
     getQueryHash,
     getSearchHeaderTitle,
+    getSearchType,
     getSections,
     getShouldShowMerchant,
     getSortedSections,
@@ -546,6 +589,5 @@ export {
     isTransactionListItemType,
     normalizeQuery,
     shouldShowYear,
-    buildCannedSearchQuery,
     getExpenseTypeTranslationKey,
 };
diff --git a/src/pages/Search/EmptySearchView.tsx b/src/pages/Search/EmptySearchView.tsx
index 88b2a38b3603..eaa6c13bcad6 100644
--- a/src/pages/Search/EmptySearchView.tsx
+++ b/src/pages/Search/EmptySearchView.tsx
@@ -32,6 +32,8 @@ function EmptySearchView({type}: EmptySearchViewProps) {
                     buttonText: translate('search.searchResults.emptyTripResults.buttonText'),
                     buttonAction: () => Navigation.navigate(ROUTES.TRAVEL_MY_TRIPS),
                 };
+            case CONST.SEARCH.DATA_TYPES.TRANSACTION:
+            case CONST.SEARCH.DATA_TYPES.REPORT:
             case CONST.SEARCH.DATA_TYPES.EXPENSE:
             case CONST.SEARCH.DATA_TYPES.INVOICE:
             default:
diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
index d5725c2d40a2..e2495c02d44f 100644
--- a/src/pages/Search/SearchPage.tsx
+++ b/src/pages/Search/SearchPage.tsx
@@ -7,7 +7,8 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
-import * as SearchUtils from '@libs/SearchUtils';
+import {buildSearchQueryJSON} from '@libs/SearchUtils';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
@@ -18,8 +19,9 @@ function SearchPage({route}: SearchPageProps) {
     const styles = useThemeStyles();
     const {policyIDs, q, isCustomQuery} = route.params;
 
-    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(q, policyIDs), [q, policyIDs]);
-    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
+    const queryJSON = useMemo(() => buildSearchQueryJSON(q, policyIDs), [q, policyIDs]);
+
+    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL}));
 
     // On small screens this page is not displayed, the configuration is in the file: src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx
     // To avoid calling hooks in the Search component when this page isn't visible, we return null here.
diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 029407026dc8..1b9e81c8a035 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -12,12 +12,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
-import * as SearchUtils from '@libs/SearchUtils';
+import {buildSearchQueryJSON} from '@libs/SearchUtils';
 import TopBar from '@navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
-import SearchTypeMenu from './SearchTypeMenu';
+import SearchStatusMenu from './SearchStatusMenu';
 
 function SearchPageBottomTab() {
     const {translate} = useLocalize();
@@ -36,13 +37,13 @@ function SearchPageBottomTab() {
         const searchParams = activeCentralPaneRoute.params as AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
 
         return {
-            queryJSON: SearchUtils.buildSearchQueryJSON(searchParams.q, searchParams.policyIDs),
+            queryJSON: buildSearchQueryJSON(searchParams.q, searchParams.policyIDs),
             policyIDs: searchParams.policyIDs,
             isCustomQuery: searchParams.isCustomQuery,
         };
     }, [activeCentralPaneRoute]);
 
-    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
+    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL}));
 
     return (
         <ScreenWrapper
@@ -62,7 +63,7 @@ function SearchPageBottomTab() {
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
                         />
-                        <SearchTypeMenu
+                        <SearchStatusMenu
                             isCustomQuery={isCustomQuery}
                             queryJSON={queryJSON}
                         />
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchStatusMenu.tsx
similarity index 57%
rename from src/pages/Search/SearchTypeMenu.tsx
rename to src/pages/Search/SearchStatusMenu.tsx
index a2d84209114b..9fd812ead9a1 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchStatusMenu.tsx
@@ -1,69 +1,75 @@
 import React from 'react';
 import {View} from 'react-native';
 import MenuItem from '@components/MenuItem';
-import type {SearchQueryJSON} from '@components/Search/types';
+import type {SearchQueryJSON, SearchStatus} from '@components/Search/types';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import {normalizeQuery} from '@libs/SearchUtils';
 import * as SearchUtils from '@libs/SearchUtils';
 import variables from '@styles/variables';
 import * as Expensicons from '@src/components/Icon/Expensicons';
 import CONST from '@src/CONST';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
-import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
-import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
+import SearchStatusMenuNarrow from './SearchStatusMenuNarrow';
 
-type SearchTypeMenuProps = {
+type SearchStatusMenuProps = {
     queryJSON: SearchQueryJSON;
     isCustomQuery: boolean;
 };
 
-type SearchTypeMenuItem = {
+type SearchStatusMenuItem = {
     title: string;
-    type: SearchDataTypes;
+    status: SearchStatus;
     icon: IconAsset;
     route?: Route;
 };
 
-function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
-    const {type} = queryJSON;
+function SearchStatusMenu({queryJSON, isCustomQuery}: SearchStatusMenuProps) {
+    const {status} = queryJSON;
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
 
-    const typeMenuItems: SearchTypeMenuItem[] = [
+    const statusMenuItems: SearchStatusMenuItem[] = [
         {
             title: translate('common.expenses'),
-            type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+            status: CONST.SEARCH.STATUS.EXPENSE.ALL,
             icon: Expensicons.Receipt,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: normalizeQuery(CONST.SEARCH.TAB.EXPENSE.ALL)}),
         },
         {
-            title: translate('workspace.common.invoices'),
-            type: CONST.SEARCH.DATA_TYPES.INVOICE,
-            icon: Expensicons.InvoiceGeneric,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.ALL)}),
+            title: translate('common.shared'),
+            status: CONST.SEARCH.STATUS.EXPENSE.SHARED,
+            icon: Expensicons.Send,
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: normalizeQuery(CONST.SEARCH.TAB.EXPENSE.SHARED)}),
         },
         {
-            title: translate('travel.trips'),
-            type: CONST.SEARCH.DATA_TYPES.TRIP,
-            icon: Expensicons.Suitcase,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.ALL)}),
+            title: translate('common.drafts'),
+            status: CONST.SEARCH.STATUS.EXPENSE.DRAFTS,
+            icon: Expensicons.Pencil,
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: normalizeQuery(CONST.SEARCH.TAB.EXPENSE.DRAFTS)}),
+        },
+        {
+            title: translate('common.finished'),
+            status: CONST.SEARCH.STATUS.EXPENSE.FINISHED,
+            icon: Expensicons.CheckCircle,
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: normalizeQuery(CONST.SEARCH.TAB.EXPENSE.FINISHED)}),
         },
     ];
-    const activeItemIndex = typeMenuItems.findIndex((item) => item.type === type);
+    const activeItemIndex = statusMenuItems.findIndex((item) => item.status === status);
 
     if (shouldUseNarrowLayout) {
         const title = isCustomQuery ? SearchUtils.getSearchHeaderTitle(queryJSON) : undefined;
 
         return (
-            <SearchTypeMenuNarrow
-                typeMenuItems={typeMenuItems}
+            <SearchStatusMenuNarrow
+                statusMenuItems={statusMenuItems}
                 activeItemIndex={activeItemIndex}
                 title={title}
             />
@@ -72,7 +78,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
 
     return (
         <View style={[styles.pb4, styles.mh3, styles.mt3]}>
-            {typeMenuItems.map((item, index) => {
+            {statusMenuItems.map((item, index) => {
                 const onPress = singleExecution(() => Navigation.navigate(item.route));
 
                 return (
@@ -96,7 +102,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
     );
 }
 
-SearchTypeMenu.displayName = 'SearchTypeMenu';
+SearchStatusMenu.displayName = 'SearchStatusMenu';
 
-export default SearchTypeMenu;
-export type {SearchTypeMenuItem};
+export default SearchStatusMenu;
+export type {SearchStatusMenuItem};
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchStatusMenuNarrow.tsx
similarity index 91%
rename from src/pages/Search/SearchTypeMenuNarrow.tsx
rename to src/pages/Search/SearchStatusMenuNarrow.tsx
index 08c7852cb037..8850b0fb2b0f 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchStatusMenuNarrow.tsx
@@ -10,15 +10,15 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import * as Expensicons from '@src/components/Icon/Expensicons';
-import type {SearchTypeMenuItem} from './SearchTypeMenu';
+import type {SearchStatusMenuItem} from './SearchStatusMenu';
 
-type SearchTypeMenuNarrowProps = {
-    typeMenuItems: SearchTypeMenuItem[];
+type SearchStatusMenuNarrowProps = {
+    statusMenuItems: SearchStatusMenuItem[];
     activeItemIndex: number;
     title?: string;
 };
 
-function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTypeMenuNarrowProps) {
+function SearchStatusMenuNarrow({statusMenuItems, activeItemIndex, title}: SearchStatusMenuNarrowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {singleExecution} = useSingleExecution();
@@ -30,7 +30,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTyp
     const openMenu = () => setIsPopoverVisible(true);
     const closeMenu = () => setIsPopoverVisible(false);
 
-    const popoverMenuItems = typeMenuItems.map((item, index) => {
+    const popoverMenuItems = statusMenuItems.map((item, index) => {
         const isSelected = title ? false : index === activeItemIndex;
 
         return {
@@ -105,6 +105,6 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTyp
     );
 }
 
-SearchTypeMenuNarrow.displayName = 'SearchTypeMenuNarrow';
+SearchStatusMenuNarrow.displayName = 'SearchStatusMenuNarrow';
 
-export default SearchTypeMenuNarrow;
+export default SearchStatusMenuNarrow;
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 797b28de4107..48caeed2bb96 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -17,7 +17,6 @@ import * as User from '@libs/actions/User';
 import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPaymentMethodDescription} from '@libs/PaymentUtils';
-import * as SearchUtils from '@libs/SearchUtils';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import * as Subscription from '@userActions/Subscription';
@@ -174,7 +173,7 @@ function CardSection() {
                         wrapperStyle={styles.sectionMenuItemTopDescription}
                         title={translate('subscription.cardSection.viewPaymentHistory')}
                         titleStyle={styles.textStrong}
-                        onPress={() => Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}))}
+                        onPress={() => Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL}))}
                         hoverAndPressStyle={styles.hoveredComponentBG}
                     />
                 )}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 918c7927852b..fe65e48bc4a1 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -4253,7 +4253,7 @@ const styles = (theme: ThemeColors) =>
         tabText: (isSelected: boolean) =>
             ({
                 marginLeft: 8,
-                ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+                ...(isSelected ? FontUtils.fontFamily.platform.EXP_NEUE_BOLD : FontUtils.fontFamily.platform.EXP_NEUE),
                 color: isSelected ? theme.text : theme.textSupporting,
                 lineHeight: variables.lineHeightNormal,
                 fontSize: variables.fontSizeNormal,
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index e67b5b30f1d6..228a49e263f7 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -14,6 +14,13 @@ type ListItemType<T extends SearchStatus> = T extends typeof CONST.SEARCH.STATUS
 /** Model of search list item data type */
 type ListItemDataType<T extends SearchStatus> = T extends typeof CONST.SEARCH.STATUS.EXPENSE.ALL ? TransactionListItemType[] : ReportListItemType[];
 
+/** Model of search result section */
+type SectionsType<T extends SearchDataTypes> = T extends typeof CONST.SEARCH.DATA_TYPES.TRANSACTION
+    ? TransactionListItemType[]
+    : T extends typeof CONST.SEARCH.DATA_TYPES.REPORT
+    ? ReportListItemType[]
+    : never;
+
 /** Model of columns to show for search results */
 type ColumnsToShow = {
     /** Whether the category column should be shown */
@@ -32,10 +39,7 @@ type SearchResultsInfo = {
     offset: number;
 
     /** Type of search */
-    type: SearchDataTypes;
-
-    /** The status filter for the current search */
-    status: SearchStatus;
+    type: string;
 
     /** Whether the user can fetch more search results */
     hasMoreResults: boolean;
@@ -226,4 +230,4 @@ type SearchResults = {
 
 export default SearchResults;
 
-export type {ListItemType, ListItemDataType, SearchTransaction, SearchTransactionType, SearchTransactionAction, SearchPersonalDetails, SearchDataTypes, SearchReport};
+export type {ListItemType, ListItemDataType, SearchTransaction, SearchTransactionType, SearchTransactionAction, SearchPersonalDetails, SearchDataTypes, SearchReport, SectionsType};

From fd2c5f5258b822bb1322597adfc2b26db8c159ef Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 20 Aug 2024 20:57:11 +0000
Subject: [PATCH 55/71] Update version to 9.0.22-9

---
 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 2cbc07cfcb3c..89356063d71a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -108,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002208
-        versionName "9.0.22-8"
+        versionCode 1009002209
+        versionName "9.0.22-9"
         // 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 58b433da6cf2..2d1b5270350d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.8</string>
+	<string>9.0.22.9</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index f5699ff17eb8..52cd5faa412e 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.8</string>
+	<string>9.0.22.9</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 53b6763468d4..c538ab996260 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.22</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.8</string>
+	<string>9.0.22.9</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 9a7e49b18859..0d4abff51a6a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.22-8",
+  "version": "9.0.22-9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.22-8",
+      "version": "9.0.22-9",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 4ebae91f49ea..02068edabb0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.22-8",
+  "version": "9.0.22-9",
   "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 981de5c615fe2f1c0021b740b39fa2e3c940bfaa Mon Sep 17 00:00:00 2001
From: Yuwen Memon <yuwen@expensify.com>
Date: Tue, 20 Aug 2024 17:08:40 -0400
Subject: [PATCH 56/71] Personalizidas

---
 src/languages/es.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index e7ced058bed8..9b5bcb2b3b9a 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2690,12 +2690,12 @@ export default {
                         },
                     },
                     customLists: {
-                        title: 'Listas personalizados',
-                        addText: 'Añadir lista personalizado',
+                        title: 'Listas personalizadas',
+                        addText: 'Añadir lista personalizada',
                         recordTitle: 'Lista personalizado',
                         helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS,
                         helpLinkText: 'Ver instrucciones detalladas',
-                        helpText: ' sobre cómo configurar listas personalizado.',
+                        helpText: ' sobre cómo configurar listas personalizada.',
                         emptyTitle: 'Añadir una lista personalizado',
                         fields: {
                             listName: 'Nombre',
@@ -3269,7 +3269,7 @@ export default {
                         case 'netSuiteSyncNetSuiteReimbursedReports':
                             return 'Marcando informes de Expensify como reembolsados';
                         case 'netSuiteSyncImportCustomLists':
-                            return 'Importando listas personalizado';
+                            return 'Importando listas personalizadas';
                         case 'netSuiteSyncImportSubsidiaries':
                             return 'Importando subsidiarias';
                         case 'netSuiteSyncImportVendors':

From 958882db20e647cf8bdcce47473474dffe2f1ad2 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:14:48 -0400
Subject: [PATCH 57/71] Update Connect-US-Business-Bank-Account.md

adding list of prohibited industries - https://expensify.slack.com/archives/C041MSQM7NH/p1724173481375629
---
 .../Connect-US-Business-Bank-Account.md       | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
index 99b904b23344..eb6a68cea61d 100644
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
@@ -145,7 +145,25 @@ To pay employees from a business deposit account, click **Verify** next to the b
 There are a few reasons why you might not have received a reimbursement:  
 - The estimated deposit date on the report has not arrived yet.
 - The bank account information is incorrect. If you believe you may have entered the wrong account, contact the Concierge and provide the Report ID for the missing reimbursement.
-- Your account wasn’t set up for Direct Deposit/ACH. You can contact your bank to confirm.
+- Your account wasn’t set up for Direct Deposit/ACH. Please contact your bank to confirm.
+
+**Are there certain industries or businesses for which Expensify cannot process payments?**
+
+- There are! If your business is associated with one of the following industries, you won't be able to connect your business bank account to process payments:
+- Security Brokers & Dealers
+- Dating & Escort Services
+- Massage Parlors
+- Casinos & Gambling/Betting Services
+- Non-FI, Money Orders
+- Wires, Money Orders
+- Government Owned Lotteries
+- Government Licensed Online Casinos (Online Gambling)
+- Government Licensed Horse/Dog Racing
+- Crypto-currency businesses
+- Internet gambling
+- Marijuana-related businesses
+- Firearm-related businesses (manufacturing and selling)
+- NFT (non-fungible token) services
 
 {% include faq-end.md %}
 

From d3c02b41319f78bf9fa33cdc966f78b0188fdbf7 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:25:25 -0400
Subject: [PATCH 58/71] Update Connect-US-Business-Bank-Account.md

additional updates
---
 .../Connect-US-Business-Bank-Account.md       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
index eb6a68cea61d..1ad70117ed5c 100644
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
@@ -96,7 +96,7 @@ If you do not see these test transactions after two business days, click the gre
 
 {% include faq-begin.md %}
 
-**I received a “something’s gone wrong” error while trying to add my ID to Onfido.**
+### I received a “something’s gone wrong” error while trying to add my ID to Onfido.
 
 If you receive an error message during this process, check all of the following:
 - Ensure you are using either the Safari (on iPhone) or Chrome (on Android) browser.
@@ -108,17 +108,17 @@ If you receive an error message during this process, check all of the following:
 
 If the issue persists, follow these steps on a different device, if possible. Contact your Account Manager or Concierge for further troubleshooting assistance.
 
-**Should I add a Beneficial Owner if our business is owned by another company?**
+### Should I add a Beneficial Owner if our business is owned by another company?
 
 No, you should only indicate that you have a Beneficial Owner if an individual owns 25% or more of the business.
 
-**Why can’t I input my address or upload my ID?**
+### Why can’t I input my address or upload my ID?
 
 Ensure that the address you’re entering is in the United States. When adding a verified business bank account in Expensify, the individual adding the account and any beneficial owners are required to have a U.S. address, photo ID, and SSN. 
 
 If you do not meet these requirements, you’ll need to have another admin add the bank account and share access with you once the account is verified.
 
-**Why am I being asked for documentation when adding my bank account?**
+### Why am I being asked for documentation when adding my bank account?
 
 When a bank account is added to Expensify, we conduct a series of checks to comply with both our sponsor bank’s requirements and federal government regulations for the Bank Secrecy Act (BSA), Anti-Money Laundering (AML) laws, and anti-fraud. 
 
@@ -126,30 +126,30 @@ If automatic verification fails, we may request manual verification, which could
 
 If you have any questions regarding the documentation request you received, contact Concierge for additional assistance.
 
-**I don’t see all three microtransactions I need to validate my bank account.** 
+### What should I do if I don’t see all three microtransactions needed to validate my bank account?
 
 If you do not see the three microtransactions by the end of the second business day, contact your bank and ask them to whitelist Expensify’s ACH IDs 1270239450 and 4270239450. Expensify’s ACH Originator Name is “Expensify.”
 
 Once you are whitelisted, contact your Account Manager or Concierge, and our team will re-trigger the three transactions.
 
-**What happens if my bank requires an additional security check before adding it to a third party?**
+### What happens if my bank requires an additional security check before adding it to a third party?
 
 If your bank account has two-factor authentication (2FA) or another security step enabled, you should be prompted to complete this authentication step when connecting the account to Expensify. However, if you encounter an error during this process, you can close the pop-up window and select Connect Manually to add the account manually.
 
-**I added a business deposit account. Can I also pay employees from this account?** 
+### I added a business deposit account. Can I also pay employees from this account?
 
 To pay employees from a business deposit account, click **Verify** next to the bank account. This will take you through the additional verification steps required to make this account a verified business bank account that you can use to issue payments.
 
-**I connected my business deposit account. Why haven’t I received my reimbursement?**
+### I connected my business deposit account. Why haven’t I received my reimbursement?
 
 There are a few reasons why you might not have received a reimbursement:  
 - The estimated deposit date on the report has not arrived yet.
 - The bank account information is incorrect. If you believe you may have entered the wrong account, contact the Concierge and provide the Report ID for the missing reimbursement.
 - Your account wasn’t set up for Direct Deposit/ACH. Please contact your bank to confirm.
 
-**Are there certain industries or businesses for which Expensify cannot process payments?**
+### Are there certain industries or businesses for which Expensify cannot process payments?
 
-- There are! If your business is associated with one of the following industries, you won't be able to connect your business bank account to process payments:
+There are! If your business is associated with one of the following industries, you won't be able to connect your business bank account to process payments:
 - Security Brokers & Dealers
 - Dating & Escort Services
 - Massage Parlors

From 01f7011293e4a108b74cdf57464dcda70ac77ed4 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:35:34 -0400
Subject: [PATCH 59/71] Update redirects.csv

https://github.com/Expensify/App/pull/47755

https://expensify.slack.com/archives/C041MSQM7NH/p1724173481375629
---
 docs/redirects.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/redirects.csv b/docs/redirects.csv
index c8b472f01f7c..afefb662a69d 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -529,3 +529,4 @@ https://community.expensify.com/discussion/4939/how-to-connect-upside-to-your-ex
 https://community.expensify.com/discussion/4905/how-to-setup-the-parking-spot-to-automatically-forward-airport-parking-receipts-to-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
 https://community.expensify.com/discussion/5324/how-to-connect-parkwhiz-to-your-expensify-account-using-a-business-profile,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
 https://community.expensify.com/discussion/6983/faq-why-do-i-need-to-provide-personal-documentation-when-setting-up-updating-my-bank-account,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account#faq
+https://community.expensify.com/discussion/6191/list-of-restricted-businesses,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account#are-there-certain-industries-or-businesses-for-which-expensify-cannot-process-payments

From 685bb4c7bbaa2ef332896de5cace193edb9c6a51 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 20 Aug 2024 22:22:56 +0000
Subject: [PATCH 60/71] Update version to 9.0.23-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 89356063d71a..6b3e2f51b55d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -108,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002209
-        versionName "9.0.22-9"
+        versionCode 1009002300
+        versionName "9.0.23-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 2d1b5270350d..d67a06a0cad7 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>9.0.22</string>
+	<string>9.0.23</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.9</string>
+	<string>9.0.23.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 52cd5faa412e..d808278550be 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>9.0.22</string>
+	<string>9.0.23</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.9</string>
+	<string>9.0.23.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index c538ab996260..7fb5a7c657c6 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>9.0.22</string>
+	<string>9.0.23</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.22.9</string>
+	<string>9.0.23.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 0d4abff51a6a..4c0b1948c009 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.22-9",
+  "version": "9.0.23-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.22-9",
+      "version": "9.0.23-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 02068edabb0a..679ca1793b2d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.22-9",
+  "version": "9.0.23-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.",

From afeb37e206cbca5f261e461548f41fbe241d2aae Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Wed, 21 Aug 2024 08:28:17 +0200
Subject: [PATCH 61/71] fix lint

---
 src/pages/workspace/accounting/PolicyAccountingPage.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index eab0a1cc32cb..107f64dd2dee 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -38,7 +38,6 @@ import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import type {AnchorPosition} from '@styles/index';
-import {getTrackingCategories} from '@userActions/connections/ConnectToXero';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -99,8 +98,8 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                           icon: Expensicons.Key,
                           text: translate('workspace.accounting.enterCredentials'),
                           onSelected: () => startIntegrationFlow({name: connectedIntegration}),
-						  shouldCallAfterModalHide: true,
-						  disabled: isOffline,
+                          shouldCallAfterModalHide: true,
+                          disabled: isOffline,
                           iconRight: Expensicons.NewWindow,
                           shouldShowRightIcon: true,
                       },

From 5887482ca08fd50ce36195e982471e4c37c390c2 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 21 Aug 2024 13:48:03 +0700
Subject: [PATCH 62/71] feat: add FULL_SSN constant

---
 src/CONST.ts                                                    | 1 +
 .../PersonalInfo/substeps/SocialSecurityNumberStep.tsx          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 8adb5568e0fb..b2bc04676eb2 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -355,6 +355,7 @@ const CONST = {
             OPEN: 'OPEN',
         },
         MAX_LENGTH: {
+            FULL_SSN: 9,
             SSN: 4,
             ZIP_CODE: 10,
         },
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
index 51041ee8bbab..c12f90db072e 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
@@ -72,7 +72,7 @@ function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
                         containerStyles={[styles.mt6]}
                         inputMode={CONST.INPUT_MODE.NUMERIC}
                         defaultValue={defaultSsnLast4}
-                        maxLength={shouldAskForFullSSN ? 9 : CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
+                        maxLength={shouldAskForFullSSN ? CONST.BANK_ACCOUNT.MAX_LENGTH.FULL_SSN : CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
                         shouldSaveDraft={!isEditing}
                     />
                 </View>

From a7cbfe581c25ec79745ea8c23da57eaf4bbea64e Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Wed, 21 Aug 2024 10:30:25 +0200
Subject: [PATCH 63/71] review suggestions

---
 src/pages/Search/AdvancedSearchFilters.tsx   |  7 ++++---
 src/pages/Search/SearchFiltersAmountPage.tsx | 13 ++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 51ef1b421274..5143a2d70008 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -12,6 +12,7 @@ import useLocalize from '@hooks/useLocalize';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
+import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import {getAllTaxRates} from '@libs/PolicyUtils';
@@ -68,13 +69,13 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
     if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
         const {lessThan, greaterThan} = filters;
         if (lessThan && greaterThan) {
-            return translate('search.filters.amount.between', greaterThan, lessThan);
+            return translate('search.filters.amount.between', convertToDisplayStringWithoutCurrency(Number(greaterThan)), convertToDisplayStringWithoutCurrency(Number(lessThan)));
         }
         if (lessThan) {
-            return translate('search.filters.amount.lessThan', lessThan);
+            return translate('search.filters.amount.lessThan', convertToDisplayStringWithoutCurrency(Number(lessThan)));
         }
         if (greaterThan) {
-            return translate('search.filters.amount.greaterThan', greaterThan);
+            return translate('search.filters.amount.greaterThan', convertToDisplayStringWithoutCurrency(Number(greaterThan)));
         }
     }
 
diff --git a/src/pages/Search/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchFiltersAmountPage.tsx
index 02d0e1177b08..e01d5e311e27 100644
--- a/src/pages/Search/SearchFiltersAmountPage.tsx
+++ b/src/pages/Search/SearchFiltersAmountPage.tsx
@@ -11,6 +11,7 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {updateAdvancedFilters} from '@libs/actions/Search';
+import {convertToBackendAmount, convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -23,11 +24,17 @@ function SearchFiltersAmountPage() {
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
     const greaterThan = searchAdvancedFiltersForm?.[INPUT_IDS.GREATER_THAN];
+    const greaterThanFormattedAmount = greaterThan !== undefined ? convertToDisplayStringWithoutCurrency(Number(greaterThan)) : undefined;
     const lessThan = searchAdvancedFiltersForm?.[INPUT_IDS.LESS_THAN];
+    const lessThanFormattedAmount = lessThan !== undefined ? convertToDisplayStringWithoutCurrency(Number(lessThan)) : undefined;
     const {inputCallbackRef} = useAutoFocusInput();
 
     const updateAmountFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
-        updateAdvancedFilters(values);
+        const greater = values[INPUT_IDS.GREATER_THAN];
+        const greaterThanBackendAmount = greater ? convertToBackendAmount(Number(greater)) : undefined;
+        const less = values[INPUT_IDS.LESS_THAN];
+        const lessThanBackendAmount = less ? convertToBackendAmount(Number(less)) : undefined;
+        updateAdvancedFilters({greaterThan: greaterThanBackendAmount?.toString(), lessThan: lessThanBackendAmount?.toString()});
         Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
     };
 
@@ -56,7 +63,7 @@ function SearchFiltersAmountPage() {
                         InputComponent={AmountWithoutCurrencyForm}
                         inputID={INPUT_IDS.GREATER_THAN}
                         name={INPUT_IDS.GREATER_THAN}
-                        defaultValue={greaterThan}
+                        defaultValue={greaterThanFormattedAmount}
                         label={translate('search.filters.amount.greaterThan')}
                         accessibilityLabel={translate('search.filters.amount.greaterThan')}
                         role={CONST.ROLE.PRESENTATION}
@@ -68,7 +75,7 @@ function SearchFiltersAmountPage() {
                         InputComponent={AmountWithoutCurrencyForm}
                         inputID={INPUT_IDS.LESS_THAN}
                         name={INPUT_IDS.LESS_THAN}
-                        defaultValue={lessThan}
+                        defaultValue={lessThanFormattedAmount}
                         label={translate('search.filters.amount.lessThan')}
                         accessibilityLabel={translate('search.filters.amount.lessThan')}
                         role={CONST.ROLE.PRESENTATION}

From 070731e983c84e7bfaa44dc4d93fd6ec1c82022d Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Wed, 21 Aug 2024 12:51:52 +0200
Subject: [PATCH 64/71] add leading zero to comma

---
 src/components/AmountWithoutCurrencyForm.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/AmountWithoutCurrencyForm.tsx b/src/components/AmountWithoutCurrencyForm.tsx
index 4975e8e34d85..78b7c84ecb54 100644
--- a/src/components/AmountWithoutCurrencyForm.tsx
+++ b/src/components/AmountWithoutCurrencyForm.tsx
@@ -1,7 +1,7 @@
 import React, {useCallback, useMemo} from 'react';
 import type {ForwardedRef} from 'react';
 import useLocalize from '@hooks/useLocalize';
-import {replaceAllDigits, replaceCommasWithPeriod, stripSpacesFromAmount, validateAmount} from '@libs/MoneyRequestUtils';
+import {addLeadingZero, replaceAllDigits, replaceCommasWithPeriod, stripSpacesFromAmount, validateAmount} from '@libs/MoneyRequestUtils';
 import CONST from '@src/CONST';
 import TextInput from './TextInput';
 import type {BaseTextInputProps, BaseTextInputRef} from './TextInput/BaseTextInput/types';
@@ -32,10 +32,11 @@ function AmountWithoutCurrencyForm(
             // More info: https://github.com/Expensify/App/issues/16974
             const newAmountWithoutSpaces = stripSpacesFromAmount(newAmount);
             const replacedCommasAmount = replaceCommasWithPeriod(newAmountWithoutSpaces);
-            if (!validateAmount(replacedCommasAmount, 2)) {
+            const withLeadingZero = addLeadingZero(replacedCommasAmount);
+            if (!validateAmount(withLeadingZero, 2)) {
                 return;
             }
-            onInputChange?.(replacedCommasAmount);
+            onInputChange?.(withLeadingZero);
         },
         [onInputChange],
     );

From 52ab72e388b68374b2131c653487fa96e1e1f6e4 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Wed, 21 Aug 2024 14:15:32 +0200
Subject: [PATCH 65/71] remove commas from input

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

diff --git a/src/pages/Search/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchFiltersAmountPage.tsx
index e01d5e311e27..681bb8b208e6 100644
--- a/src/pages/Search/SearchFiltersAmountPage.tsx
+++ b/src/pages/Search/SearchFiltersAmountPage.tsx
@@ -11,7 +11,7 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {updateAdvancedFilters} from '@libs/actions/Search';
-import {convertToBackendAmount, convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils';
+import {convertToBackendAmount, convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -24,9 +24,9 @@ function SearchFiltersAmountPage() {
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
     const greaterThan = searchAdvancedFiltersForm?.[INPUT_IDS.GREATER_THAN];
-    const greaterThanFormattedAmount = greaterThan !== undefined ? convertToDisplayStringWithoutCurrency(Number(greaterThan)) : undefined;
+    const greaterThanFormattedAmount = greaterThan !== undefined ? convertToFrontendAmountAsString(Number(greaterThan)) : undefined;
     const lessThan = searchAdvancedFiltersForm?.[INPUT_IDS.LESS_THAN];
-    const lessThanFormattedAmount = lessThan !== undefined ? convertToDisplayStringWithoutCurrency(Number(lessThan)) : undefined;
+    const lessThanFormattedAmount = lessThan !== undefined ? convertToFrontendAmountAsString(Number(lessThan)) : undefined;
     const {inputCallbackRef} = useAutoFocusInput();
 
     const updateAmountFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {

From c205d92c714a040dc6c27042da80f15b381a2be5 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Wed, 21 Aug 2024 14:27:50 +0200
Subject: [PATCH 66/71] fix removing value

---
 src/pages/Search/SearchFiltersAmountPage.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Search/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchFiltersAmountPage.tsx
index 681bb8b208e6..d7533f9ac20e 100644
--- a/src/pages/Search/SearchFiltersAmountPage.tsx
+++ b/src/pages/Search/SearchFiltersAmountPage.tsx
@@ -24,16 +24,16 @@ function SearchFiltersAmountPage() {
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
     const greaterThan = searchAdvancedFiltersForm?.[INPUT_IDS.GREATER_THAN];
-    const greaterThanFormattedAmount = greaterThan !== undefined ? convertToFrontendAmountAsString(Number(greaterThan)) : undefined;
+    const greaterThanFormattedAmount = greaterThan ? convertToFrontendAmountAsString(Number(greaterThan)) : undefined;
     const lessThan = searchAdvancedFiltersForm?.[INPUT_IDS.LESS_THAN];
-    const lessThanFormattedAmount = lessThan !== undefined ? convertToFrontendAmountAsString(Number(lessThan)) : undefined;
+    const lessThanFormattedAmount = lessThan ? convertToFrontendAmountAsString(Number(lessThan)) : undefined;
     const {inputCallbackRef} = useAutoFocusInput();
 
     const updateAmountFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
         const greater = values[INPUT_IDS.GREATER_THAN];
-        const greaterThanBackendAmount = greater ? convertToBackendAmount(Number(greater)) : undefined;
+        const greaterThanBackendAmount = greater ? convertToBackendAmount(Number(greater)) : '';
         const less = values[INPUT_IDS.LESS_THAN];
-        const lessThanBackendAmount = less ? convertToBackendAmount(Number(less)) : undefined;
+        const lessThanBackendAmount = less ? convertToBackendAmount(Number(less)) : '';
         updateAdvancedFilters({greaterThan: greaterThanBackendAmount?.toString(), lessThan: lessThanBackendAmount?.toString()});
         Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
     };

From 73d8f70e542c30b5f18a699bd452d33d8af544d3 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Wed, 21 Aug 2024 09:18:55 -0400
Subject: [PATCH 67/71] Remove redirects to domains we don't support

---
 docs/redirects.csv | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/redirects.csv b/docs/redirects.csv
index afefb662a69d..c59c772b5535 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -420,7 +420,6 @@ https://community.expensify.com/discussion/8850/how-to-enable-monthly-settlement
 https://community.expensify.com/discussion/4828/how-to-match-your-company-cards-statement-to-expensify/,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#reconciling-expenses-and-settlements
 https://community.expensify.com/discussion/5751/deep-dive-domain-groups-and-permissions-what-are-they-all-about,https://help.expensify.com/articles/expensify-classic/domains/Create-A-Group
 https://community.expensify.com/discussion/4832/how-to-enable-saml-sso,https://help.expensify.com/articles/expensify-classic/domains/SAML-SSO
-https://community.expensify.com/categories/expensify-org-general-questions-and-discussions,https://www.expensify.org/
 https://community.expensify.com/discussion/4476/how-to-enable-scheduled-submit-for-a-group-policy/,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
 https://community.expensify.com/discussion/4524/how-to-set-up-the-uber-integration/,https://help.expensify.com/articles/expensify-classic/connections/Uber
 https://community.expensify.com/discussion/4828/how-to-match-your-company-cards-statement-to-expensify/p1,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#reconciling-expenses-and-settlements
@@ -498,13 +497,10 @@ https://community.expensify.com/discussion/7335/faq-what-is-the-expensify-card-a
 https://community.expensify.com/discussion/7524/how-to-set-up-disable-2fa-for-your-domain,https://help.expensify.com/articles/expensify-classic/domains/Add-Domain-Members-and-Admins
 https://community.expensify.com/discussion/7736/faq-troubleshooting-two-factor-authentication-issues,https://help.expensify.com/articles/expensify-classic/settings/Enable-two-factor-authentication
 https://community.expensify.com/discussion/7862/introducing-expensify-cash-open-source-financial-group-chat-built-with-react-native,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
-https://community.expensify.com/discussion/7931/how-to-become-an-expensify-org-donor,https://www.expensify.org/donate
 https://community.expensify.com/discussion/8705/how-to-change-an-invoice-to-an-expense-report/,https://help.expensify.com/articles/expensify-classic/reports/Edit-a-report
-https://community.expensify.com/discussion/8707/how-to-connect-bolt-to-your-expensify-account-using-a-work-profile/,https://bolt.eu/en/support/articles/4403357843090/
 https://community.expensify.com/discussion/8803/settle-your-expensify-cards-monthly-or-daily-you-pick,https://help.expensify.com/articles/expensify-classic/expensify-card/Statements#expensify-card-settlement-frequency
 https://community.expensify.com/discussion/4784/how-to-alternate-option-submit-as-part-of-approval-workflow,https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow
 https://community.expensify.com/discussion/4863/how-to-assign-and-unassign-company-cards,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds#how-to-assign-company-cards
-https://community.expensify.com/discussion/4901/how-to-connect-locomote-to-your-expensify-account,https://www.locomote.com/marketplace/expensify-expense-management
 https://community.expensify.com/discussion/4902/how-to-expense-grab-airport-mobile-orders-with-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations#how-to-connect-to-grab
 https://community.expensify.com/discussion/4953/how-to-forward-hoteltonight-expenses-to-your-expensify-account,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations#how-to-connect-to-hoteltonight
 https://community.expensify.com/discussion/5042/faq-expensierror-xro052-expenses-are-not-categorized-with-a-xero-account,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting

From 737e2ef5081c08206cdf58f0646e591ffea65ab2 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Wed, 21 Aug 2024 09:29:53 -0400
Subject: [PATCH 68/71] support expensify.org

---
 .github/scripts/createHelpRedirects.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/createHelpRedirects.sh b/.github/scripts/createHelpRedirects.sh
index 14ed9de953fc..553766c64ccf 100755
--- a/.github/scripts/createHelpRedirects.sh
+++ b/.github/scripts/createHelpRedirects.sh
@@ -46,7 +46,7 @@ while read -r line; do
         exit 1
     fi
 
-    if ! [[ $DEST_URL =~ ^https://(help|use)\.expensify\.com ]]; then
+    if ! [[ $DEST_URL =~ ^https://(help|use)\.expensify\.com|^https://www\.expensify\.org ]]; then
         error "Found destination URL that is not a helpDot or useDot URL: $DEST_URL"
         exit 1
     fi

From 8047fe4b4bb56dcd7fc286471703ab5de30639ba Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Wed, 21 Aug 2024 09:31:44 -0400
Subject: [PATCH 69/71] restore expesify.org redirects

---
 docs/redirects.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/redirects.csv b/docs/redirects.csv
index c59c772b5535..532bd4ca1752 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -419,6 +419,7 @@ https://community.expensify.com/discussion/4825/how-to-create-and-send-invoices-
 https://community.expensify.com/discussion/8850/how-to-enable-monthly-settlement,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#change-the-settlement-frequency
 https://community.expensify.com/discussion/4828/how-to-match-your-company-cards-statement-to-expensify/,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#reconciling-expenses-and-settlements
 https://community.expensify.com/discussion/5751/deep-dive-domain-groups-and-permissions-what-are-they-all-about,https://help.expensify.com/articles/expensify-classic/domains/Create-A-Group
+https://community.expensify.com/categories/expensify-org-general-questions-and-discussions,https://www.expensify.org/
 https://community.expensify.com/discussion/4832/how-to-enable-saml-sso,https://help.expensify.com/articles/expensify-classic/domains/SAML-SSO
 https://community.expensify.com/discussion/4476/how-to-enable-scheduled-submit-for-a-group-policy/,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
 https://community.expensify.com/discussion/4524/how-to-set-up-the-uber-integration/,https://help.expensify.com/articles/expensify-classic/connections/Uber
@@ -497,6 +498,7 @@ https://community.expensify.com/discussion/7335/faq-what-is-the-expensify-card-a
 https://community.expensify.com/discussion/7524/how-to-set-up-disable-2fa-for-your-domain,https://help.expensify.com/articles/expensify-classic/domains/Add-Domain-Members-and-Admins
 https://community.expensify.com/discussion/7736/faq-troubleshooting-two-factor-authentication-issues,https://help.expensify.com/articles/expensify-classic/settings/Enable-two-factor-authentication
 https://community.expensify.com/discussion/7862/introducing-expensify-cash-open-source-financial-group-chat-built-with-react-native,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://community.expensify.com/discussion/7931/how-to-become-an-expensify-org-donor,https://www.expensify.org/donate
 https://community.expensify.com/discussion/8705/how-to-change-an-invoice-to-an-expense-report/,https://help.expensify.com/articles/expensify-classic/reports/Edit-a-report
 https://community.expensify.com/discussion/8803/settle-your-expensify-cards-monthly-or-daily-you-pick,https://help.expensify.com/articles/expensify-classic/expensify-card/Statements#expensify-card-settlement-frequency
 https://community.expensify.com/discussion/4784/how-to-alternate-option-submit-as-part-of-approval-workflow,https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow

From 0a975278906e5d782b423d3d0752afdc34b68273 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Wed, 21 Aug 2024 09:35:04 -0400
Subject: [PATCH 70/71] support integrations.expensify.com

---
 .github/scripts/createHelpRedirects.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/createHelpRedirects.sh b/.github/scripts/createHelpRedirects.sh
index 553766c64ccf..e804fd65854f 100755
--- a/.github/scripts/createHelpRedirects.sh
+++ b/.github/scripts/createHelpRedirects.sh
@@ -46,7 +46,7 @@ while read -r line; do
         exit 1
     fi
 
-    if ! [[ $DEST_URL =~ ^https://(help|use)\.expensify\.com|^https://www\.expensify\.org ]]; then
+    if ! [[ $DEST_URL =~ ^https://(help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
         error "Found destination URL that is not a helpDot or useDot URL: $DEST_URL"
         exit 1
     fi

From a9645867dcdacbb00cd35ae461bb4ff60bc1c6c2 Mon Sep 17 00:00:00 2001
From: Justin Persaud <jpersaud@expensify.com>
Date: Wed, 21 Aug 2024 10:09:02 -0400
Subject: [PATCH 71/71] update error message

---
 .github/scripts/createHelpRedirects.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/createHelpRedirects.sh b/.github/scripts/createHelpRedirects.sh
index e804fd65854f..4ce3d0753f58 100755
--- a/.github/scripts/createHelpRedirects.sh
+++ b/.github/scripts/createHelpRedirects.sh
@@ -47,7 +47,7 @@ while read -r line; do
     fi
 
     if ! [[ $DEST_URL =~ ^https://(help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
-        error "Found destination URL that is not a helpDot or useDot URL: $DEST_URL"
+        error "Found destination URL that is not a supported URL: $DEST_URL"
         exit 1
     fi