From fd3dac22f82fbef3c1079589ed5964dac43354b6 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 10 Sep 2024 10:26:18 +0530
Subject: [PATCH 01/70] fix: Distance rates - Enabled distance rate changes to
 Disabled after deleting it.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/actions/Policy/Category.ts | 3 ++-
 src/libs/actions/Policy/Tag.ts      | 8 ++++++--
 src/libs/actions/TaxRate.ts         | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts
index 16d28481f06f..bbaca4104d55 100644
--- a/src/libs/actions/Policy/Category.ts
+++ b/src/libs/actions/Policy/Category.ts
@@ -790,7 +790,7 @@ function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: stri
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {};
     const optimisticPolicyCategoriesData = categoryNamesToDelete.reduce<Record<string, Partial<PolicyCategory>>>((acc, categoryName) => {
-        acc[categoryName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        acc[categoryName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, enabled: false};
         return acc;
     }, {});
     const shouldDisableRequiresCategory = !OptionsListUtils.hasEnabledOptions(
@@ -822,6 +822,7 @@ function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: stri
                     acc[categoryName] = {
                         pendingAction: null,
                         errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.deleteFailureMessage'),
+                        enabled: policyCategories?.[categoryName].enabled,
                     };
                     return acc;
                 }, {}),
diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
index 49a285c12bbe..8441a32ea8d9 100644
--- a/src/libs/actions/Policy/Tag.ts
+++ b/src/libs/actions/Policy/Tag.ts
@@ -298,7 +298,7 @@ function deletePolicyTags(policyID: string, tagsToDelete: string[]) {
                     [policyTag.name]: {
                         tags: {
                             ...tagsToDelete.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
-                                acc[tagName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+                                acc[tagName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, enabled: false};
                                 return acc;
                             }, {}),
                         },
@@ -330,7 +330,11 @@ function deletePolicyTags(policyID: string, tagsToDelete: string[]) {
                     [policyTag.name]: {
                         tags: {
                             ...tagsToDelete.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
-                                acc[tagName] = {pendingAction: null, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.deleteFailureMessage')};
+                                acc[tagName] = {
+                                    pendingAction: null,
+                                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.deleteFailureMessage'),
+                                    enabled: policyTag?.tags[tagName].enabled,
+                                };
                                 return acc;
                             }, {}),
                         },
diff --git a/src/libs/actions/TaxRate.ts b/src/libs/actions/TaxRate.ts
index 514b73915633..179d71743017 100644
--- a/src/libs/actions/TaxRate.ts
+++ b/src/libs/actions/TaxRate.ts
@@ -275,7 +275,7 @@ function setPolicyTaxesEnabled(policyID: string, taxesIDsToUpdate: string[], isE
 
 type TaxRateDeleteMap = Record<
     string,
-    | (Pick<TaxRate, 'pendingAction'> & {
+    | (Pick<TaxRate, 'pendingAction' | 'isDisabled'> & {
           errors: OnyxCommon.Errors | null;
       })
     | null
@@ -304,7 +304,7 @@ function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
                         pendingFields: {foreignTaxDefault: isForeignTaxRemoved ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : null},
                         foreignTaxDefault: isForeignTaxRemoved ? firstTaxID : foreignTaxDefault,
                         taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
-                            acc[taxID] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, errors: null};
+                            acc[taxID] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, errors: null, isDisabled: true};
                             return acc;
                         }, {}),
                     },
@@ -337,6 +337,7 @@ function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
                             acc[taxID] = {
                                 pendingAction: null,
                                 errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.deleteFailureMessage'),
+                                isDisabled: policyTaxRates?.[taxID].isDisabled,
                             };
                             return acc;
                         }, {}),

From 62e9819f4467a0531e59c267955298df2bd49e17 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Tue, 17 Sep 2024 16:12:14 +0200
Subject: [PATCH 02/70] add consts

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

diff --git a/src/CONST.ts b/src/CONST.ts
index c00b33be1c31..3d8ca3dc30b4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5424,6 +5424,7 @@ const CONST = {
         INITIAL_URL: 'INITIAL_URL',
         ACTIVE_WORKSPACE_ID: 'ACTIVE_WORKSPACE_ID',
         RETRY_LAZY_REFRESHED: 'RETRY_LAZY_REFRESHED',
+        LAST_REFRESH_TIMESTAMP: 'LAST_REFRESH_TIMESTAMP',
     },
 
     RESERVATION_TYPE: {
@@ -5753,6 +5754,9 @@ const CONST = {
 
         CATEGORIES_ARTICLE_LINK: 'https://help.expensify.com/articles/expensify-classic/workspaces/Create-categories#import-custom-categories',
     },
+
+    // The timeout duration (1 minute) (in milliseconds) before the window reloads due to an error.
+    ERROR_WINDOW_RELOAD_TIMEOUT: 60000,
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;

From de80004ecc5ff296683065809bb27ecfa632b640 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Tue, 17 Sep 2024 16:12:47 +0200
Subject: [PATCH 03/70] integrate refresh or reload in GenericErrorPage

---
 src/pages/ErrorPage/GenericErrorPage.tsx | 28 +++++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 9f4186bc354f..4d7c2f649208 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -1,3 +1,4 @@
+import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import React from 'react';
 import {useErrorBoundary} from 'react-error-boundary';
 import {View} from 'react-native';
@@ -23,9 +24,27 @@ function GenericErrorPage() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-
     const {resetBoundary} = useErrorBoundary();
 
+    const refresh = () => {
+        const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
+
+        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+            resetBoundary();
+            sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
+
+            return;
+        }
+
+        window.location.reload();
+        sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
+    };
+
+    const refreshAndSignOut = () => {
+        Session.signOutAndRedirectToSignIn();
+        refresh();
+    };
+
     return (
         <SafeAreaConsumer>
             {({paddingBottom}) => (
@@ -59,16 +78,13 @@ function GenericErrorPage() {
                                 <View style={[styles.flex1, styles.flexRow]}>
                                     <Button
                                         success
-                                        onPress={resetBoundary}
                                         text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
+                                        onPress={refresh}
                                     />
                                     <Button
-                                        onPress={() => {
-                                            Session.signOutAndRedirectToSignIn();
-                                            resetBoundary();
-                                        }}
                                         text={translate('initialSettingsPage.signOut')}
+                                        onPress={refreshAndSignOut}
                                     />
                                 </View>
                             </View>

From 27e953c751cdda98f6b786bca6db6a3a90c248fa Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Tue, 17 Sep 2024 16:20:32 +0200
Subject: [PATCH 04/70] handle RN case

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

diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 4d7c2f649208..069f651442f6 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -29,7 +29,7 @@ function GenericErrorPage() {
     const refresh = () => {
         const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
 
-        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT || !window?.location?.reload) {
             resetBoundary();
             sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
 

From c4a5dea3c7cd0b99c7a7eaf4c32606735c3b5d96 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 18 Sep 2024 17:13:05 +0800
Subject: [PATCH 05/70] Add ONXYKEYS.CREDENTIALS to
 KEYS_TO_PRESERVE_DELEGATE_ACCESS

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

diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index 4797506d1a3c..d2df14348f0e 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -18,7 +18,9 @@ Onyx.connect({
     },
 });
 
-const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [ONYXKEYS.NVP_TRY_FOCUS_MODE, ONYXKEYS.PREFERRED_THEME, ONYXKEYS.NVP_PREFERRED_LOCALE, ONYXKEYS.SESSION];
+// NOTE: We are preserving the CREDENTIALS because new ones are returned from DelegateConnect and DelegateDisconnect
+// and clearing them out would prevent the user from reauthenticating when the restricted authTokens expire.
+const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [ONYXKEYS.NVP_TRY_FOCUS_MODE, ONYXKEYS.PREFERRED_THEME, ONYXKEYS.NVP_PREFERRED_LOCALE, ONYXKEYS.SESSION, ONYXKEYS.CREDENTIALS];
 
 function connect(email: string) {
     if (!delegatedAccess?.delegators) {

From de36524f8df6d00e09979c284976ee8668d29e7b Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 18 Sep 2024 12:14:00 +0200
Subject: [PATCH 06/70] integrate refreshPage

---
 src/libs/refreshPage/index.native.ts     |  3 +++
 src/libs/refreshPage/index.ts            | 16 +++++++++++++
 src/pages/ErrorPage/GenericErrorPage.tsx | 29 ++++++------------------
 3 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 src/libs/refreshPage/index.native.ts
 create mode 100644 src/libs/refreshPage/index.ts

diff --git a/src/libs/refreshPage/index.native.ts b/src/libs/refreshPage/index.native.ts
new file mode 100644
index 000000000000..765b1491f922
--- /dev/null
+++ b/src/libs/refreshPage/index.native.ts
@@ -0,0 +1,3 @@
+export default function refreshPage(resetBoundary: () => void) {
+    resetBoundary();
+}
diff --git a/src/libs/refreshPage/index.ts b/src/libs/refreshPage/index.ts
new file mode 100644
index 000000000000..8744ac1865c8
--- /dev/null
+++ b/src/libs/refreshPage/index.ts
@@ -0,0 +1,16 @@
+import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
+import CONST from '@src/CONST';
+
+export default function refreshPage(resetBoundary: () => void) {
+    const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
+
+    if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+        resetBoundary();
+        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
+
+        return;
+    }
+
+    window.location.reload();
+    sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
+}
diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 069f651442f6..9f62b774e08e 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -1,4 +1,3 @@
-import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import React from 'react';
 import {useErrorBoundary} from 'react-error-boundary';
 import {View} from 'react-native';
@@ -14,6 +13,7 @@ import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import refreshPage from '@libs/refreshPage';
 import variables from '@styles/variables';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
@@ -24,26 +24,8 @@ function GenericErrorPage() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {resetBoundary} = useErrorBoundary();
-
-    const refresh = () => {
-        const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
-
-        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT || !window?.location?.reload) {
-            resetBoundary();
-            sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
 
-            return;
-        }
-
-        window.location.reload();
-        sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
-    };
-
-    const refreshAndSignOut = () => {
-        Session.signOutAndRedirectToSignIn();
-        refresh();
-    };
+    const {resetBoundary} = useErrorBoundary();
 
     return (
         <SafeAreaConsumer>
@@ -80,11 +62,14 @@ function GenericErrorPage() {
                                         success
                                         text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
-                                        onPress={refresh}
+                                        onPress={() => refreshPage(resetBoundary)}
                                     />
                                     <Button
                                         text={translate('initialSettingsPage.signOut')}
-                                        onPress={refreshAndSignOut}
+                                        onPress={() => {
+                                            Session.signOutAndRedirectToSignIn();
+                                            refreshPage(resetBoundary);
+                                        }}
                                     />
                                 </View>
                             </View>

From c5bbcc66ee492a03e8c0bc16e32217d9650bc1da Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 18 Sep 2024 12:21:33 +0200
Subject: [PATCH 07/70] integrate usePageRefresh

---
 src/hooks/usePageRefresh/index.native.ts | 10 ++++++++++
 src/hooks/usePageRefresh/index.ts        | 24 ++++++++++++++++++++++++
 src/hooks/usePageRefresh/type.ts         |  3 +++
 src/libs/refreshPage/index.native.ts     |  3 ---
 src/libs/refreshPage/index.ts            | 16 ----------------
 src/pages/ErrorPage/GenericErrorPage.tsx | 10 ++++------
 6 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 src/hooks/usePageRefresh/index.native.ts
 create mode 100644 src/hooks/usePageRefresh/index.ts
 create mode 100644 src/hooks/usePageRefresh/type.ts
 delete mode 100644 src/libs/refreshPage/index.native.ts
 delete mode 100644 src/libs/refreshPage/index.ts

diff --git a/src/hooks/usePageRefresh/index.native.ts b/src/hooks/usePageRefresh/index.native.ts
new file mode 100644
index 000000000000..c2685708ffff
--- /dev/null
+++ b/src/hooks/usePageRefresh/index.native.ts
@@ -0,0 +1,10 @@
+import {useErrorBoundary} from 'react-error-boundary';
+import type UsePageRefreshType from './type';
+
+const usePageRefresh: UsePageRefreshType = () => {
+    const {resetBoundary} = useErrorBoundary();
+
+    return resetBoundary;
+};
+
+export default usePageRefresh;
diff --git a/src/hooks/usePageRefresh/index.ts b/src/hooks/usePageRefresh/index.ts
new file mode 100644
index 000000000000..d6edd13edd74
--- /dev/null
+++ b/src/hooks/usePageRefresh/index.ts
@@ -0,0 +1,24 @@
+import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
+import {useErrorBoundary} from 'react-error-boundary';
+import CONST from '@src/CONST';
+import type UsePageRefreshType from './type';
+
+const usePageRefresh: UsePageRefreshType = () => {
+    const {resetBoundary} = useErrorBoundary();
+
+    return () => {
+        const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
+
+        if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
+            resetBoundary();
+            sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
+
+            return;
+        }
+
+        window.location.reload();
+        sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
+    };
+};
+
+export default usePageRefresh;
diff --git a/src/hooks/usePageRefresh/type.ts b/src/hooks/usePageRefresh/type.ts
new file mode 100644
index 000000000000..72d4c8bab71d
--- /dev/null
+++ b/src/hooks/usePageRefresh/type.ts
@@ -0,0 +1,3 @@
+type UsePageRefreshType = () => () => void;
+
+export default UsePageRefreshType;
diff --git a/src/libs/refreshPage/index.native.ts b/src/libs/refreshPage/index.native.ts
deleted file mode 100644
index 765b1491f922..000000000000
--- a/src/libs/refreshPage/index.native.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function refreshPage(resetBoundary: () => void) {
-    resetBoundary();
-}
diff --git a/src/libs/refreshPage/index.ts b/src/libs/refreshPage/index.ts
deleted file mode 100644
index 8744ac1865c8..000000000000
--- a/src/libs/refreshPage/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
-import CONST from '@src/CONST';
-
-export default function refreshPage(resetBoundary: () => void) {
-    const lastRefreshTimestamp = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP) ?? 'null') as string;
-
-    if (lastRefreshTimestamp === null || differenceInMilliseconds(Date.now(), Number(lastRefreshTimestamp)) > CONST.ERROR_WINDOW_RELOAD_TIMEOUT) {
-        resetBoundary();
-        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP, Date.now().toString());
-
-        return;
-    }
-
-    window.location.reload();
-    sessionStorage.removeItem(CONST.SESSION_STORAGE_KEYS.LAST_REFRESH_TIMESTAMP);
-}
diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx
index 9f62b774e08e..0357cdc0204b 100644
--- a/src/pages/ErrorPage/GenericErrorPage.tsx
+++ b/src/pages/ErrorPage/GenericErrorPage.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import {useErrorBoundary} from 'react-error-boundary';
 import {View} from 'react-native';
 import LogoWordmark from '@assets/images/expensify-wordmark.svg';
 import Button from '@components/Button';
@@ -10,10 +9,10 @@ import SafeAreaConsumer from '@components/SafeAreaConsumer';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
+import usePageRefresh from '@hooks/usePageRefresh';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import refreshPage from '@libs/refreshPage';
 import variables from '@styles/variables';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
@@ -24,8 +23,7 @@ function GenericErrorPage() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-
-    const {resetBoundary} = useErrorBoundary();
+    const refreshPage = usePageRefresh();
 
     return (
         <SafeAreaConsumer>
@@ -62,13 +60,13 @@ function GenericErrorPage() {
                                         success
                                         text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
-                                        onPress={() => refreshPage(resetBoundary)}
+                                        onPress={refreshPage}
                                     />
                                     <Button
                                         text={translate('initialSettingsPage.signOut')}
                                         onPress={() => {
                                             Session.signOutAndRedirectToSignIn();
-                                            refreshPage(resetBoundary);
+                                            refreshPage();
                                         }}
                                     />
                                 </View>

From 77f36722a1cf0e87adc10f6024b5cf37bbac2446 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 18 Sep 2024 13:04:42 +0200
Subject: [PATCH 08/70] rename type

---
 src/hooks/usePageRefresh/index.native.ts | 4 ++--
 src/hooks/usePageRefresh/index.ts        | 4 ++--
 src/hooks/usePageRefresh/type.ts         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hooks/usePageRefresh/index.native.ts b/src/hooks/usePageRefresh/index.native.ts
index c2685708ffff..eb6a229ad65c 100644
--- a/src/hooks/usePageRefresh/index.native.ts
+++ b/src/hooks/usePageRefresh/index.native.ts
@@ -1,7 +1,7 @@
 import {useErrorBoundary} from 'react-error-boundary';
-import type UsePageRefreshType from './type';
+import type UsePageRefresh from './type';
 
-const usePageRefresh: UsePageRefreshType = () => {
+const usePageRefresh: UsePageRefresh = () => {
     const {resetBoundary} = useErrorBoundary();
 
     return resetBoundary;
diff --git a/src/hooks/usePageRefresh/index.ts b/src/hooks/usePageRefresh/index.ts
index d6edd13edd74..3708fe29e966 100644
--- a/src/hooks/usePageRefresh/index.ts
+++ b/src/hooks/usePageRefresh/index.ts
@@ -1,9 +1,9 @@
 import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import {useErrorBoundary} from 'react-error-boundary';
 import CONST from '@src/CONST';
-import type UsePageRefreshType from './type';
+import type UsePageRefresh from './type';
 
-const usePageRefresh: UsePageRefreshType = () => {
+const usePageRefresh: UsePageRefresh = () => {
     const {resetBoundary} = useErrorBoundary();
 
     return () => {
diff --git a/src/hooks/usePageRefresh/type.ts b/src/hooks/usePageRefresh/type.ts
index 72d4c8bab71d..f800cc0224a9 100644
--- a/src/hooks/usePageRefresh/type.ts
+++ b/src/hooks/usePageRefresh/type.ts
@@ -1,3 +1,3 @@
-type UsePageRefreshType = () => () => void;
+type UsePageRefresh = () => () => void;
 
-export default UsePageRefreshType;
+export default UsePageRefresh;

From d4daac70fff99197dbb2c686ba6435ef8968d871 Mon Sep 17 00:00:00 2001
From: BhuvaneshPatil <bhuvaneshpatil80642@gmail.com>
Date: Sat, 21 Sep 2024 01:06:31 +0530
Subject: [PATCH 09/70] chore: change size of avatar to 100x100 for react
 action item created

---
 src/components/MultipleAvatars.tsx                | 6 +++++-
 src/pages/home/report/ReportActionItemCreated.tsx | 5 +++--
 src/styles/utils/index.ts                         | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/MultipleAvatars.tsx b/src/components/MultipleAvatars.tsx
index 601b8f7edfed..8e405c2d454a 100644
--- a/src/components/MultipleAvatars.tsx
+++ b/src/components/MultipleAvatars.tsx
@@ -54,6 +54,9 @@ type MultipleAvatarsProps = {
 
     /** Prop to limit the amount of avatars displayed horizontally */
     maxAvatarsInRow?: number;
+
+    /** Prop to limit the amount of avatars displayed horizontally */
+    overlapDivider?: number;
 };
 
 type AvatarStyles = {
@@ -79,6 +82,7 @@ function MultipleAvatars({
     shouldShowTooltip = true,
     shouldUseCardBackground = false,
     maxAvatarsInRow = CONST.AVATAR_ROW_SIZE.DEFAULT,
+    overlapDivider = 3,
 }: MultipleAvatarsProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -167,7 +171,7 @@ function MultipleAvatars({
 
     const oneAvatarSize = StyleUtils.getAvatarStyle(size);
     const oneAvatarBorderWidth = StyleUtils.getAvatarBorderWidth(size).borderWidth ?? 0;
-    const overlapSize = oneAvatarSize.width / 3;
+    const overlapSize = oneAvatarSize.width / overlapDivider;
 
     if (shouldStackHorizontally) {
         // Height of one avatar + border space
diff --git a/src/pages/home/report/ReportActionItemCreated.tsx b/src/pages/home/report/ReportActionItemCreated.tsx
index ec9f5ea9915f..5dd826361a8b 100644
--- a/src/pages/home/report/ReportActionItemCreated.tsx
+++ b/src/pages/home/report/ReportActionItemCreated.tsx
@@ -40,7 +40,7 @@ function ReportActionItemCreated({report, personalDetails, policy, reportID}: Re
     const styles = useThemeStyles();
 
     const {translate} = useLocalize();
-    const {shouldUseNarrowLayout, isLargeScreenWidth} = useResponsiveLayout();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : -1}`);
 
     if (!ReportUtils.isChatReport(report)) {
@@ -77,7 +77,8 @@ function ReportActionItemCreated({report, personalDetails, policy, reportID}: Re
                         >
                             <MultipleAvatars
                                 icons={icons}
-                                size={isLargeScreenWidth || (icons && icons.length < 3) ? CONST.AVATAR_SIZE.LARGE : CONST.AVATAR_SIZE.MEDIUM}
+                                size={CONST.AVATAR_SIZE.XLARGE}
+                                overlapDivider={4}
                                 shouldStackHorizontally
                                 shouldDisplayAvatarsInRows={shouldUseNarrowLayout}
                                 maxAvatarsInRow={shouldUseNarrowLayout ? CONST.AVATAR_ROW_SIZE.DEFAULT : CONST.AVATAR_ROW_SIZE.LARGE_SCREEN}
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index d3d31cc2ea1b..ee92eaa14146 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -132,6 +132,7 @@ const avatarBorderWidths: Partial<Record<AvatarSizeName, number>> = {
     [CONST.AVATAR_SIZE.SMALL]: 2,
     [CONST.AVATAR_SIZE.SMALLER]: 2,
     [CONST.AVATAR_SIZE.LARGE]: 4,
+    [CONST.AVATAR_SIZE.XLARGE]: 4,
     [CONST.AVATAR_SIZE.MEDIUM]: 3,
     [CONST.AVATAR_SIZE.LARGE_BORDERED]: 4,
 };

From 220645c5b45229e756669e08f64f5d32a030f570 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Mon, 23 Sep 2024 10:00:38 -0700
Subject: [PATCH 10/70] Clear delegate keys and open app after reauthenticating
 due to expired delegate token

---
 src/libs/Authentication.ts   | 16 ++++++++++++++++
 src/libs/actions/Delegate.ts | 16 +++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/libs/Authentication.ts b/src/libs/Authentication.ts
index dd1003591701..89df2b86bb36 100644
--- a/src/libs/Authentication.ts
+++ b/src/libs/Authentication.ts
@@ -1,6 +1,9 @@
+import Onyx from 'react-native-onyx';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import type Response from '@src/types/onyx/Response';
+import {confirmReadyToOpenApp, openApp} from './actions/App';
+import * as Delegate from './actions/Delegate';
 import updateSessionAuthTokens from './actions/Session/updateSessionAuthTokens';
 import redirectToSignIn from './actions/SignInRedirect';
 import * as ErrorUtils from './ErrorUtils';
@@ -94,6 +97,19 @@ function reauthenticate(command = ''): Promise<void> {
 
         // The authentication process is finished so the network can be unpaused to continue processing requests
         NetworkStore.setIsAuthenticating(false);
+
+        // If we reauthenticated while connected as a delegate, that means we made an API call with an expired delegate token and reauthenticated using the original user's credentials.
+        // If this happens, clear the delegate keys and restore the user's original account.
+        // Delegate tokens expire once every 5 days so this shouldn't happen too often.
+        if (Delegate.isConnectedAsDelegate()) {
+            console.log('>>>> Reauthenticated while connected as a delegate. Clearing delegate keys and restoring original account.');
+            Onyx.clear(Delegate.KEYS_TO_PRESERVE_DELEGATE_ACCESS).then(() => {
+                debugger;
+                console.log('>>>> Opening app after clearing delegate keys');
+                confirmReadyToOpenApp();
+                openApp();
+            });
+        }
     });
 }
 
diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index 92267c0fece9..eb204098d3d2 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -332,4 +332,18 @@ function removePendingDelegate(email: string) {
     });
 }
 
-export {connect, disconnect, clearDelegatorErrors, addDelegate, requestValidationCode, clearAddDelegateErrors, removePendingDelegate};
+function isConnectedAsDelegate() {
+    return !!delegatedAccess?.delegate;
+}
+
+export {
+    connect,
+    disconnect,
+    clearDelegatorErrors,
+    addDelegate,
+    requestValidationCode,
+    clearAddDelegateErrors,
+    removePendingDelegate,
+    isConnectedAsDelegate,
+    KEYS_TO_PRESERVE_DELEGATE_ACCESS,
+};

From 22ebc5596d810278ed762da839718951f53a5734 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Mon, 23 Sep 2024 11:14:12 -0700
Subject: [PATCH 11/70] When reauthenticating during delegate access, restore
 the delegate's original account

---
 src/libs/Authentication.ts                    | 23 +++++---------
 src/libs/actions/Delegate.ts                  | 31 +++++++++++--------
 src/libs/actions/Session/updateSessionUser.ts |  6 ++++
 src/types/onyx/Response.ts                    |  6 ++++
 4 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 src/libs/actions/Session/updateSessionUser.ts

diff --git a/src/libs/Authentication.ts b/src/libs/Authentication.ts
index 89df2b86bb36..1ab7083b2d8e 100644
--- a/src/libs/Authentication.ts
+++ b/src/libs/Authentication.ts
@@ -1,8 +1,6 @@
-import Onyx from 'react-native-onyx';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import type Response from '@src/types/onyx/Response';
-import {confirmReadyToOpenApp, openApp} from './actions/App';
 import * as Delegate from './actions/Delegate';
 import updateSessionAuthTokens from './actions/Session/updateSessionAuthTokens';
 import redirectToSignIn from './actions/SignInRedirect';
@@ -87,6 +85,14 @@ function reauthenticate(command = ''): Promise<void> {
             return;
         }
 
+        // If we reauthenticated due to an expired delegate token, restore the delegate's original account.
+        // This is because the credentials used to reauthenticate were for the delegate's original account, and not for the account they were connected as.
+        if (Delegate.isConnectedAsDelegate()) {
+            Log.info('Reauthenticated while connected as a delegate. Restoring original account.');
+            Delegate.restoreDelegateSession(response);
+            return;
+        }
+
         // Update authToken in Onyx and in our local variables so that API requests will use the new authToken
         updateSessionAuthTokens(response.authToken, response.encryptedAuthToken);
 
@@ -97,19 +103,6 @@ function reauthenticate(command = ''): Promise<void> {
 
         // The authentication process is finished so the network can be unpaused to continue processing requests
         NetworkStore.setIsAuthenticating(false);
-
-        // If we reauthenticated while connected as a delegate, that means we made an API call with an expired delegate token and reauthenticated using the original user's credentials.
-        // If this happens, clear the delegate keys and restore the user's original account.
-        // Delegate tokens expire once every 5 days so this shouldn't happen too often.
-        if (Delegate.isConnectedAsDelegate()) {
-            console.log('>>>> Reauthenticated while connected as a delegate. Clearing delegate keys and restoring original account.');
-            Onyx.clear(Delegate.KEYS_TO_PRESERVE_DELEGATE_ACCESS).then(() => {
-                debugger;
-                console.log('>>>> Opening app after clearing delegate keys');
-                confirmReadyToOpenApp();
-                openApp();
-            });
-        }
     });
 }
 
diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index eb204098d3d2..1515628c1b99 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -10,8 +10,10 @@ import * as SequentialQueue from '@libs/Network/SequentialQueue';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Delegate, DelegatedAccess, DelegateRole} from '@src/types/onyx/Account';
+import type Response from '@src/types/onyx/Response';
 import {confirmReadyToOpenApp, openApp} from './App';
 import updateSessionAuthTokens from './Session/updateSessionAuthTokens';
+import updateSessionUser from './Session/updateSessionUser';
 
 let delegatedAccess: DelegatedAccess;
 Onyx.connect({
@@ -320,6 +322,10 @@ function clearAddDelegateErrors(email: string, fieldName: string) {
     });
 }
 
+function isConnectedAsDelegate() {
+    return !!delegatedAccess?.delegate;
+}
+
 function removePendingDelegate(email: string) {
     if (!delegatedAccess?.delegates) {
         return;
@@ -332,18 +338,17 @@ function removePendingDelegate(email: string) {
     });
 }
 
-function isConnectedAsDelegate() {
-    return !!delegatedAccess?.delegate;
+function restoreDelegateSession(authenticateResponse: Response) {
+    Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS).then(() => {
+        updateSessionAuthTokens(authenticateResponse?.authToken, authenticateResponse?.encryptedAuthToken);
+        updateSessionUser(authenticateResponse?.accountID, authenticateResponse?.email);
+
+        NetworkStore.setAuthToken(authenticateResponse.authToken ?? null);
+        NetworkStore.setIsAuthenticating(false);
+
+        confirmReadyToOpenApp();
+        openApp();
+    });
 }
 
-export {
-    connect,
-    disconnect,
-    clearDelegatorErrors,
-    addDelegate,
-    requestValidationCode,
-    clearAddDelegateErrors,
-    removePendingDelegate,
-    isConnectedAsDelegate,
-    KEYS_TO_PRESERVE_DELEGATE_ACCESS,
-};
+export {connect, disconnect, clearDelegatorErrors, addDelegate, requestValidationCode, clearAddDelegateErrors, removePendingDelegate, restoreDelegateSession, isConnectedAsDelegate};
diff --git a/src/libs/actions/Session/updateSessionUser.ts b/src/libs/actions/Session/updateSessionUser.ts
new file mode 100644
index 000000000000..75e888469bec
--- /dev/null
+++ b/src/libs/actions/Session/updateSessionUser.ts
@@ -0,0 +1,6 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+export default function updateSessionUser(accountID?: number, email?: string) {
+    Onyx.merge(ONYXKEYS.SESSION, {accountID, email});
+}
diff --git a/src/types/onyx/Response.ts b/src/types/onyx/Response.ts
index ef558896c55e..3c12611ee841 100644
--- a/src/types/onyx/Response.ts
+++ b/src/types/onyx/Response.ts
@@ -68,6 +68,12 @@ type Response = {
     /** Base64 key to decrypt messages from Pusher encrypted channels */
     // eslint-disable-next-line @typescript-eslint/naming-convention
     shared_secret?: string;
+
+    /** The accountID of the user */
+    accountID?: number;
+
+    /** The email of the user */
+    email?: string;
 };
 
 export default Response;

From 863bdede364676fae9bd9368343ac93f42ff9f5a Mon Sep 17 00:00:00 2001
From: Dysto coder <dystovskycoder@gmail.com>
Date: Mon, 23 Sep 2024 22:31:24 +0300
Subject: [PATCH 12/70] Display pay animation when paying form hold modal

---
 src/components/ProcessMoneyReportHoldMenu.tsx     | 7 +++++++
 src/components/ReportActionItem/ReportPreview.tsx | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/src/components/ProcessMoneyReportHoldMenu.tsx b/src/components/ProcessMoneyReportHoldMenu.tsx
index 4a63714b6157..7b9408935b96 100644
--- a/src/components/ProcessMoneyReportHoldMenu.tsx
+++ b/src/components/ProcessMoneyReportHoldMenu.tsx
@@ -41,6 +41,9 @@ type ProcessMoneyReportHoldMenuProps = {
 
     /** Number of transaction of a money request */
     transactionCount: number;
+
+    /** Callback for displaying payment animation on IOU preview component */
+    startAnimation?: () => void;
 };
 
 function ProcessMoneyReportHoldMenu({
@@ -53,6 +56,7 @@ function ProcessMoneyReportHoldMenu({
     chatReport,
     moneyRequestReport,
     transactionCount,
+    startAnimation,
 }: ProcessMoneyReportHoldMenuProps) {
     const {translate} = useLocalize();
     const isApprove = requestType === CONST.IOU.REPORT_ACTION_TYPE.APPROVE;
@@ -66,6 +70,9 @@ function ProcessMoneyReportHoldMenu({
                 Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(moneyRequestReport.reportID));
             }
         } else if (chatReport && paymentType) {
+            if (startAnimation) {
+                startAnimation();
+            }
             IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport, full);
         }
         onClose();
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 50ab8e9ee08c..adaa3f446a52 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -192,6 +192,10 @@ function ReportPreview({
     const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
 
     const stopAnimation = useCallback(() => setIsPaidAnimationRunning(false), []);
+    const startAnimation = useCallback(() => {
+        setIsPaidAnimationRunning(true);
+        HapticFeedback.longPress();
+    }, []);
     const confirmPayment = useCallback(
         (type: PaymentMethodType | undefined, payAsBusiness?: boolean) => {
             if (!type) {
@@ -587,6 +591,7 @@ function ReportPreview({
                     chatReport={chatReport}
                     moneyRequestReport={iouReport}
                     transactionCount={numberOfRequests}
+                    startAnimation={startAnimation}
                 />
             )}
         </OfflineWithFeedback>

From 7e4e5383a1fcbc9bbee6a4a845e9a8ee650fe6fc Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Thu, 26 Sep 2024 13:00:27 -0700
Subject: [PATCH 13/70] Prevent isSidebarLoaded key from getting cleared when
 switching to delegate access

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

diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index 1515628c1b99..ff44e62829ea 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -30,6 +30,7 @@ const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [
     ONYXKEYS.SESSION,
     ONYXKEYS.IS_LOADING_APP,
     ONYXKEYS.CREDENTIALS,
+    ONYXKEYS.IS_SIDEBAR_LOADED,
 ];
 
 function connect(email: string) {

From af22fa1bffe48382268d70eb9921c355193adf64 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Thu, 26 Sep 2024 13:02:55 -0700
Subject: [PATCH 14/70] add comment

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

diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index ff44e62829ea..2d6469dfb8a5 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -30,6 +30,9 @@ const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [
     ONYXKEYS.SESSION,
     ONYXKEYS.IS_LOADING_APP,
     ONYXKEYS.CREDENTIALS,
+
+    // We need to preserve the sidebar loaded state since we never unrender the sidebar when connecting as a delegate
+    // This allows the report screen to load correctly when the delegate token expires and the delegate is returned to their original account.
     ONYXKEYS.IS_SIDEBAR_LOADED,
 ];
 

From 4d5626156985bb639fe4f11b12ae39c9c8bb6937 Mon Sep 17 00:00:00 2001
From: BhuvaneshPatil <bhuvaneshpatil80642@gmail.com>
Date: Mon, 30 Sep 2024 09:43:12 +0530
Subject: [PATCH 15/70] withOnyx migrate

---
 .../home/report/ReportActionItemCreated.tsx   | 56 +++----------------
 1 file changed, 8 insertions(+), 48 deletions(-)

diff --git a/src/pages/home/report/ReportActionItemCreated.tsx b/src/pages/home/report/ReportActionItemCreated.tsx
index 2a354a5d7708..2e71b050434d 100644
--- a/src/pages/home/report/ReportActionItemCreated.tsx
+++ b/src/pages/home/report/ReportActionItemCreated.tsx
@@ -1,8 +1,6 @@
-import lodashIsEqual from 'lodash/isEqual';
-import React, {memo} from 'react';
+import React from 'react';
 import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import MultipleAvatars from '@components/MultipleAvatars';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
@@ -15,21 +13,9 @@ import * as ReportUtils from '@libs/ReportUtils';
 import {navigateToConciergeChatAndDeleteReport} from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Policy, Report} from '@src/types/onyx';
 import AnimatedEmptyStateBackground from './AnimatedEmptyStateBackground';
 
-type ReportActionItemCreatedOnyxProps = {
-    /** The report currently being looked at */
-    report: OnyxEntry<Report>;
-
-    /** The policy object for the current route */
-    policy: OnyxEntry<Policy>;
-
-    /** Personal details of all the users */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-};
-
-type ReportActionItemCreatedProps = ReportActionItemCreatedOnyxProps & {
+type ReportActionItemCreatedProps = {
     /** The id of the report */
     reportID: string;
 
@@ -37,11 +23,14 @@ type ReportActionItemCreatedProps = ReportActionItemCreatedOnyxProps & {
     // eslint-disable-next-line react/no-unused-prop-types
     policyID: string | undefined;
 };
-function ReportActionItemCreated({report, personalDetails, policy, reportID}: ReportActionItemCreatedProps) {
+function ReportActionItemCreated({reportID, policyID}: ReportActionItemCreatedProps) {
     const styles = useThemeStyles();
 
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
     const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : -1}`);
 
     if (!ReportUtils.isChatReport(report)) {
@@ -100,33 +89,4 @@ function ReportActionItemCreated({report, personalDetails, policy, reportID}: Re
 
 ReportActionItemCreated.displayName = 'ReportActionItemCreated';
 
-export default withOnyx<ReportActionItemCreatedProps, ReportActionItemCreatedOnyxProps>({
-    report: {
-        key: ({reportID}) => `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-    },
-
-    policy: {
-        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-    },
-
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-})(
-    memo(
-        ReportActionItemCreated,
-        (prevProps, nextProps) =>
-            prevProps.policy?.name === nextProps.policy?.name &&
-            prevProps.policy?.avatarURL === nextProps.policy?.avatarURL &&
-            prevProps.report?.stateNum === nextProps.report?.stateNum &&
-            prevProps.report?.statusNum === nextProps.report?.statusNum &&
-            prevProps.report?.lastReadTime === nextProps.report?.lastReadTime &&
-            prevProps.report?.description === nextProps.report?.description &&
-            prevProps.personalDetails === nextProps.personalDetails &&
-            prevProps.policy?.description === nextProps.policy?.description &&
-            prevProps.report?.reportName === nextProps.report?.reportName &&
-            prevProps.report?.avatarUrl === nextProps.report?.avatarUrl &&
-            lodashIsEqual(prevProps.report?.invoiceReceiver, nextProps.report?.invoiceReceiver) &&
-            prevProps.report?.errorFields === nextProps.report?.errorFields,
-    ),
-);
+export default ReportActionItemCreated;

From a1daa0c73ff2c12e6a464419faaa644cdcd941ac Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 30 Sep 2024 18:11:53 +0700
Subject: [PATCH 16/70] update beginningOfChatHistory translation

---
 src/components/ReportWelcomeText.tsx | 69 +++++++++++++++++++---------
 src/languages/en.ts                  | 43 ++++++++---------
 src/languages/es.ts                  | 44 +++++++++---------
 src/libs/ReportUtils.ts              |  4 +-
 src/libs/SidebarUtils.ts             | 19 ++++++--
 5 files changed, 110 insertions(+), 69 deletions(-)

diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx
index 68f060d22e6c..0901fdc5846a 100644
--- a/src/components/ReportWelcomeText.tsx
+++ b/src/components/ReportWelcomeText.tsx
@@ -1,29 +1,25 @@
 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} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import {getPolicy} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetailsList, Policy, Report} from '@src/types/onyx';
+import type {Policy, Report} from '@src/types/onyx';
 import {PressableWithoutFeedback} from './Pressable';
 import RenderHTML from './RenderHTML';
 import Text from './Text';
 import UserDetailsTooltip from './UserDetailsTooltip';
 
-type ReportWelcomeTextOnyxProps = {
-    /** All of the personal details for everyone */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-};
-
-type ReportWelcomeTextProps = ReportWelcomeTextOnyxProps & {
+type ReportWelcomeTextProps = {
     /** The report currently being looked at */
     report: OnyxEntry<Report>;
 
@@ -31,23 +27,26 @@ type ReportWelcomeTextProps = ReportWelcomeTextOnyxProps & {
     policy: OnyxEntry<Policy>;
 };
 
-function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextProps) {
+function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     const isChatRoom = ReportUtils.isChatRoom(report);
     const isSelfDM = ReportUtils.isSelfDM(report);
     const isInvoiceRoom = ReportUtils.isInvoiceRoom(report);
     const isSystemChat = ReportUtils.isSystemChat(report);
     const isDefault = !(isChatRoom || isPolicyExpenseChat || isSelfDM || isInvoiceRoom || isSystemChat);
-    const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
+    const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report, undefined, undefined, true);
     const isMultipleParticipant = participantAccountIDs.length > 1;
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails), isMultipleParticipant);
     const welcomeMessage = SidebarUtils.getWelcomeMessage(report, policy);
     const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, policy, participantAccountIDs);
-    const additionalText = moneyRequestOptions
-        .filter((item): item is Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND | typeof CONST.IOU.TYPE.INVOICE> => item !== CONST.IOU.TYPE.INVOICE)
-        .map((item) => translate(`reportActionsView.iouTypes.${item}`))
+    const filteredOptions = moneyRequestOptions.filter(
+        (item): item is Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND | typeof CONST.IOU.TYPE.INVOICE> => item !== CONST.IOU.TYPE.INVOICE,
+    );
+    const additionalText = filteredOptions
+        .map((item, index) => `${index === filteredOptions.length - 1 ? `${translate('common.or')} ` : ''}${translate(`reportActionsView.iouTypes.${item}`)}`)
         .join(', ');
     const canEditPolicyDescription = ReportUtils.canEditPolicyDescription(policy);
     const reportName = ReportUtils.getReportName(report);
@@ -109,7 +108,37 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
                             <Text>{welcomeMessage.phrase3}</Text>
                         </Text>
                     ))}
+                {isInvoiceRoom &&
+                    (welcomeMessage?.messageHtml ? (
+                        <PressableWithoutFeedback
+                            onPress={() => {
+                                if (!canEditPolicyDescription) {
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(policy?.id ?? '-1'));
+                            }}
+                            style={[styles.renderHTML, canEditPolicyDescription ? styles.cursorPointer : styles.cursorText]}
+                            accessibilityLabel={translate('reportDescriptionPage.roomDescription')}
+                        >
+                            <RenderHTML html={welcomeMessage.messageHtml} />
+                        </PressableWithoutFeedback>
+                    ) : (
+                        <Text>
+                            <Text>{welcomeMessage.phrase1}</Text>
+                            <Text>
+                                {report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL ? (
+                                    <Text style={[styles.textStrong]}>{ReportUtils.getDisplayNameForParticipant(report?.invoiceReceiver?.accountID)}</Text>
+                                ) : (
+                                    <Text style={[styles.textStrong]}>{getPolicy(report?.invoiceReceiver?.policyID)?.name}</Text>
+                                )}
+                            </Text>
+                            <Text>{` ${translate('common.and')} `}</Text>
+                            <Text style={[styles.textStrong]}>{ReportUtils.getPolicyName(report)}</Text>
+                            <Text>{welcomeMessage.phrase2}</Text>
+                        </Text>
+                    ))}
                 {isChatRoom &&
+                    !isInvoiceRoom &&
                     (welcomeMessage?.messageHtml ? (
                         <PressableWithoutFeedback
                             onPress={() => {
@@ -176,9 +205,11 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
                         ))}
                     </Text>
                 )}
-                {(moneyRequestOptions.includes(CONST.IOU.TYPE.PAY) || moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT) || moneyRequestOptions.includes(CONST.IOU.TYPE.TRACK)) && (
-                    <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>
-                )}
+                {(moneyRequestOptions.includes(CONST.IOU.TYPE.PAY) ||
+                    moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT) ||
+                    moneyRequestOptions.includes(CONST.IOU.TYPE.TRACK) ||
+                    moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)) && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>}
+                {ReportUtils.isConciergeChatReport(report) && <Text>{translate('reportActionsView.askConcierge')}</Text>}
             </View>
         </>
     );
@@ -186,8 +217,4 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
 
 ReportWelcomeText.displayName = 'ReportWelcomeText';
 
-export default withOnyx<ReportWelcomeTextProps, ReportWelcomeTextOnyxProps>({
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-})(ReportWelcomeText);
+export default ReportWelcomeText;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6d579a2af2df..efe47c4d88a8 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -19,7 +19,6 @@ import type {
     BadgeFreeTrialParams,
     BeginningOfChatHistoryAdminRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartOneParams,
-    BeginningOfChatHistoryAnnounceRoomPartTwo,
     BeginningOfChatHistoryDomainRoomPartOneParams,
     BillingBannerCardAuthenticationRequiredParams,
     BillingBannerCardExpiredParams,
@@ -264,6 +263,7 @@ const translations = {
         phoneNumberPlaceholder: '(xxx) xxx-xxxx',
         email: 'Email',
         and: 'and',
+        or: 'or',
         details: 'Details',
         privacy: 'Privacy',
         privacyPolicy: 'Privacy Policy',
@@ -656,33 +656,34 @@ const translations = {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'You missed the party in ',
         beginningOfArchivedRoomPartTwo: ", there's nothing to see here.",
-        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `,
-        beginningOfChatHistoryDomainRoomPartTwo: ' to chat with colleagues, share tips, and ask questions.',
-        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
-        beginningOfChatHistoryAdminRoomPartTwo: ' to chat about topics such as workspace configurations and more.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) =>
-            `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartTwo) => ` to chat about anything ${workspaceName} related.`,
-        beginningOfChatHistoryUserRoomPartOne: 'Collaboration starts here! 🎉\nUse this space to chat about anything ',
-        beginningOfChatHistoryUserRoomPartTwo: ' related.',
-        beginningOfChatHistoryInvoiceRoom: 'Collaboration starts here! 🎉 Use this room to view, discuss, and pay invoices.',
-        beginningOfChatHistory: 'This is the beginning of your chat with ',
-        beginningOfChatHistoryPolicyExpenseChatPartOne: 'Collaboration between ',
-        beginningOfChatHistoryPolicyExpenseChatPartTwo: ' and ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, submit expenses and settle up.',
+        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) => `This chat is with all Expensify members on the ${domainRoom} domain.`,
+        beginningOfChatHistoryDomainRoomPartTwo: ' Use it to chat with colleagues, share tips, and ask questions.',
+        beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) => `This chat is with ${workspaceName} admins.`,
+        beginningOfChatHistoryAdminRoomPartTwo: ' Use it to chat about workspace setup and more.',
+        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) => `This chat is with everyone in ${workspaceName} workspace.`,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ` Use it for the most important announcements.`,
+        beginningOfChatHistoryUserRoomPartOne: 'This chat room is for anything ',
+        beginningOfChatHistoryUserRoomPartTwo: ({displayName}: {displayName: string}) => ` related. It was created by ${displayName}`,
+        beginningOfChatHistoryInvoiceRoomPartOne: `This chat is for invoices between `,
+        beginningOfChatHistoryInvoiceRoomPartTwo: `. Use the + button to send an invoice.`,
+        beginningOfChatHistory: 'This chat is with ',
+        beginningOfChatHistoryPolicyExpenseChatPartOne: 'This is where ',
+        beginningOfChatHistoryPolicyExpenseChatPartTwo: ' will submit expenses to the ',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: ' workspace. Just use the + button.',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.",
         chatWithAccountManager: 'Chat with your account manager here',
         sayHello: 'Say hello!',
         yourSpace: 'Your space',
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`,
-        usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nYou can also use the + button to ${additionalText}, or assign a task!`,
+        usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUse the + button to ${additionalText} an expense`,
+        askConcierge: '\nAsk questions and get 24/7 realtime support.',
         iouTypes: {
-            pay: 'pay expenses',
-            split: 'split an expense',
-            submit: 'submit an expense',
-            track: 'track an expense',
-            invoice: 'invoice an expense',
+            pay: 'pay',
+            split: 'split',
+            submit: 'submit',
+            track: 'track',
+            invoice: 'invoice',
         },
     },
     adminOnlyCanPost: 'Only admins can send messages in this room.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index cb19b091b058..cf077b5357bf 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -17,7 +17,6 @@ import type {
     BadgeFreeTrialParams,
     BeginningOfChatHistoryAdminRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartOneParams,
-    BeginningOfChatHistoryAnnounceRoomPartTwo,
     BeginningOfChatHistoryDomainRoomPartOneParams,
     BillingBannerCardAuthenticationRequiredParams,
     BillingBannerCardExpiredParams,
@@ -255,6 +254,7 @@ const translations = {
         phoneNumberPlaceholder: '(xxx) xxx-xxxx',
         email: 'Email',
         and: 'y',
+        or: 'o',
         details: 'Detalles',
         privacy: 'Privacidad',
         hidden: 'Oculto',
@@ -648,34 +648,36 @@ const translations = {
     reportActionsView: {
         beginningOfArchivedRoomPartOne: 'Te perdiste la fiesta en ',
         beginningOfArchivedRoomPartTwo: ', no hay nada que ver aquí.',
-        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) => `¡Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `,
-        beginningOfChatHistoryDomainRoomPartTwo: ' para chatear con compañeros, compartir consejos o hacer una pregunta.',
+        beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) =>
+            `Este chat es con todos los miembros de Expensify en el dominio ${domainRoom}.`,
+        beginningOfChatHistoryDomainRoomPartTwo: ' Úsalo para chatear con colegas, compartir consejos y hacer preguntas.',
         beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) =>
-            `¡Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
-        beginningOfChatHistoryAdminRoomPartTwo: ' para chatear sobre temas como la configuración del espacio de trabajo y mas.',
-        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) =>
-            `¡Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
-        beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartTwo) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
-        beginningOfChatHistoryUserRoomPartOne: '¡Este es el lugar para colaborar! 🎉\nUsa este espacio para chatear sobre cualquier cosa relacionada con ',
-        beginningOfChatHistoryUserRoomPartTwo: '.',
-        beginningOfChatHistoryInvoiceRoom: '¡Este es el lugar para colaborar! 🎉 Utilice esta sala para ver, discutir y pagar facturas.',
-        beginningOfChatHistory: 'Aquí comienzan tus conversaciones con ',
-        beginningOfChatHistoryPolicyExpenseChatPartOne: '¡La colaboración entre ',
-        beginningOfChatHistoryPolicyExpenseChatPartTwo: ' y ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' empieza aquí! 🎉 Este es el lugar donde chatear y presentar o pagar gastos.',
+            `Este chat es con los administradores del espacio de trabajo ${workspaceName}.`,
+        beginningOfChatHistoryAdminRoomPartTwo: ' Use it to chat about workspace setup and more.',
+        beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) => `Este chat es con todos en el espacio de trabajo ${workspaceName}.`,
+        beginningOfChatHistoryAnnounceRoomPartTwo: ` Úsalo para hablar sobre la configuración del espacio de trabajo y más.`,
+        beginningOfChatHistoryUserRoomPartOne: 'ste chat es para todo lo relacionado con ',
+        beginningOfChatHistoryUserRoomPartTwo: ({displayName}: {displayName: string}) => ` Fue creado por ${displayName}.`,
+        beginningOfChatHistoryInvoiceRoomPartOne: `Este chat es para facturas entre `,
+        beginningOfChatHistoryInvoiceRoomPartTwo: `. Usa el botón + para enviar una factura.`,
+        beginningOfChatHistory: 'Este chat es con',
+        beginningOfChatHistoryPolicyExpenseChatPartOne: 'Aquí es donde ',
+        beginningOfChatHistoryPolicyExpenseChatPartTwo: ' enviará los gastos al espacio de trabajo ',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: '. Solo usa el botón +.',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
         sayHello: '¡Saluda!',
         yourSpace: 'Tu espacio',
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`,
-        usePlusButton: ({additionalText}: UsePlusButtonParams) => `\n¡También puedes usar el botón + de abajo para ${additionalText}, o asignar una tarea!`,
+        usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUsa el botón + para ${additionalText} un gasto`,
+        askConcierge: 'Haz preguntas y obtén soporte en tiempo real las 24/7.',
         iouTypes: {
-            pay: 'pagar gastos',
-            split: 'dividir un gasto',
-            submit: 'presentar un gasto',
-            track: 'rastrear un gasto',
-            invoice: 'facturar un gasto',
+            pay: 'pagar',
+            split: 'dividir',
+            submit: 'presentar',
+            track: 'rastrear',
+            invoice: 'facturar',
         },
     },
     adminOnlyCanPost: 'Solo los administradores pueden enviar mensajes en esta sala.',
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 78ebdd92751e..33f1e4c35d56 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2107,7 +2107,7 @@ function getDisplayNameForParticipant(
     return shouldUseShortForm ? shortName : longName;
 }
 
-function getParticipantsAccountIDsForDisplay(report: OnyxEntry<Report>, shouldExcludeHidden = false, shouldExcludeDeleted = false): number[] {
+function getParticipantsAccountIDsForDisplay(report: OnyxEntry<Report>, shouldExcludeHidden = false, shouldExcludeDeleted = false, shouldForceExcludeCurrentUser = false): number[] {
     const reportParticipants = report?.participants ?? {};
     let participantsEntries = Object.entries(reportParticipants);
 
@@ -2134,7 +2134,7 @@ function getParticipantsAccountIDsForDisplay(report: OnyxEntry<Report>, shouldEx
 
     // For 1:1 chat, we don't want to include the current user as a participant in order to not mark 1:1 chats as having multiple participants
     // For system chat, we want to display Expensify as the only participant
-    const shouldExcludeCurrentUser = isOneOnOneChat(report) || isSystemChat(report);
+    const shouldExcludeCurrentUser = isOneOnOneChat(report) || isSystemChat(report) || shouldForceExcludeCurrentUser;
 
     if (shouldExcludeCurrentUser || shouldExcludeHidden || shouldExcludeDeleted) {
         participantsIds = participantsIds.filter((accountID) => {
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index e120f7026fce..915e633bd424 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -536,7 +536,7 @@ function getWelcomeMessage(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>)
     }
 
     welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistory');
-    const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
+    const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report, undefined, undefined, true);
     const isMultipleParticipant = participantAccountIDs.length > 1;
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
         OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, allPersonalDetails),
@@ -581,21 +581,32 @@ function getRoomWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartOne');
         welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartTwo');
     } else if (ReportUtils.isDomainRoom(report)) {
+        welcomeMessage.showReportName = false;
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartOne', {domainRoom: report?.reportName ?? ''});
         welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartTwo');
     } else if (ReportUtils.isAdminRoom(report)) {
+        welcomeMessage.showReportName = false;
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartOne', {workspaceName});
         welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo');
     } else if (ReportUtils.isAnnounceRoom(report)) {
+        welcomeMessage.showReportName = false;
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo');
     } else if (ReportUtils.isInvoiceRoom(report)) {
         welcomeMessage.showReportName = false;
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryInvoiceRoom');
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryInvoiceRoomPartOne');
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryInvoiceRoomPartTwo');
+        const payer =
+            report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL
+                ? ReportUtils.getDisplayNameForParticipant(report?.invoiceReceiver?.accountID)
+                : PolicyUtils.getPolicy(report?.invoiceReceiver?.policyID)?.name;
+        const receiver = ReportUtils.getPolicyName(report);
+        welcomeMessage.messageText = `${welcomeMessage.phrase1}${payer} ${Localize.translateLocal('common.and')} ${receiver}${welcomeMessage.phrase2}`;
+        return welcomeMessage;
     } else {
         // Message for user created rooms or other room types.
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartOne');
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo');
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo', {displayName: ''});
     }
     welcomeMessage.messageText = `${welcomeMessage.phrase1} ${welcomeMessage.showReportName ? ReportUtils.getReportName(report) : ''} ${welcomeMessage.phrase2 ?? ''}`;
 

From 4ff1aad447f31f9c5cf71cb237e2782f5933dfa0 Mon Sep 17 00:00:00 2001
From: BhuvaneshPatil <bhuvaneshpatil80642@gmail.com>
Date: Mon, 30 Sep 2024 22:31:47 +0530
Subject: [PATCH 17/70] fix lint

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

diff --git a/src/pages/home/report/ReportActionItemCreated.tsx b/src/pages/home/report/ReportActionItemCreated.tsx
index 7aaa19d990db..1adb24fa23a7 100644
--- a/src/pages/home/report/ReportActionItemCreated.tsx
+++ b/src/pages/home/report/ReportActionItemCreated.tsx
@@ -6,7 +6,6 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import ReportWelcomeText from '@components/ReportWelcomeText';
 import useLocalize from '@hooks/useLocalize';
-import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';

From 555542a05a2490b1054aa588bb20fc42f8d5b208 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 1 Oct 2024 16:44:23 +0700
Subject: [PATCH 18/70] update policy name for user created room

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

diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 915e633bd424..ded66b21f897 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -606,7 +606,7 @@ function getRoomWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
     } else {
         // Message for user created rooms or other room types.
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartOne');
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo', {displayName: ''});
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo', {displayName: ReportUtils.getPolicyName(report)});
     }
     welcomeMessage.messageText = `${welcomeMessage.phrase1} ${welcomeMessage.showReportName ? ReportUtils.getReportName(report) : ''} ${welcomeMessage.phrase2 ?? ''}`;
 

From cddafc3147f6a733ddfdf5910d67b7da7db0b08d Mon Sep 17 00:00:00 2001
From: nkdengineer <161821005+nkdengineer@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:47:12 +0700
Subject: [PATCH 19/70] Update src/languages/en.ts

Co-authored-by: Kevin Brian Bader <56457735+ikevin127@users.noreply.github.com>
---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 7a45e7e3c934..6eb60d8d19bc 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -678,7 +678,7 @@ const translations = {
         sayHello: 'Say hello!',
         yourSpace: 'Your space',
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`,
-        usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUse the + button to ${additionalText} an expense`,
+        usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUse the + button to ${additionalText} an expense.`,
         askConcierge: '\nAsk questions and get 24/7 realtime support.',
         iouTypes: {
             pay: 'pay',

From 7dad94e54c4388147b0256bc6091144d77369784 Mon Sep 17 00:00:00 2001
From: nkdengineer <161821005+nkdengineer@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:47:23 +0700
Subject: [PATCH 20/70] Update src/languages/en.ts

Co-authored-by: Kevin Brian Bader <56457735+ikevin127@users.noreply.github.com>
---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6eb60d8d19bc..8957a908fd83 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -665,7 +665,7 @@ const translations = {
         beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) => `This chat is with everyone in ${workspaceName} workspace.`,
         beginningOfChatHistoryAnnounceRoomPartTwo: ` Use it for the most important announcements.`,
         beginningOfChatHistoryUserRoomPartOne: 'This chat room is for anything ',
-        beginningOfChatHistoryUserRoomPartTwo: ({displayName}: {displayName: string}) => ` related. It was created by ${displayName}`,
+        beginningOfChatHistoryUserRoomPartTwo: ({displayName}: {displayName: string}) => ` related. It was created by ${displayName}.`,
         beginningOfChatHistoryInvoiceRoomPartOne: `This chat is for invoices between `,
         beginningOfChatHistoryInvoiceRoomPartTwo: `. Use the + button to send an invoice.`,
         beginningOfChatHistory: 'This chat is with ',

From f993567865bacc319b73d74b496c8b3de72ecef7 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 2 Oct 2024 12:14:34 +0700
Subject: [PATCH 21/70] fix archive invoice case

---
 src/components/ReportWelcomeText.tsx | 18 +++++++++++++-----
 src/languages/en.ts                  |  3 ++-
 src/languages/es.ts                  |  3 ++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx
index 53054db2d782..d73614493ff1 100644
--- a/src/components/ReportWelcomeText.tsx
+++ b/src/components/ReportWelcomeText.tsx
@@ -32,6 +32,9 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
     const styles = useThemeStyles();
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID || -1}`);
+    const isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs);
     const isChatRoom = ReportUtils.isChatRoom(report);
     const isSelfDM = ReportUtils.isSelfDM(report);
     const isInvoiceRoom = ReportUtils.isInvoiceRoom(report);
@@ -51,6 +54,12 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
         .join(', ');
     const canEditPolicyDescription = ReportUtils.canEditPolicyDescription(policy);
     const reportName = ReportUtils.getReportName(report);
+    const shouldShowUsePlusButtonText =
+        (moneyRequestOptions.includes(CONST.IOU.TYPE.PAY) ||
+            moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT) ||
+            moneyRequestOptions.includes(CONST.IOU.TYPE.TRACK) ||
+            moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)) &&
+        !isPolicyExpenseChat;
 
     const navigateToReport = () => {
         if (!report?.reportID) {
@@ -110,6 +119,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
                         </Text>
                     ))}
                 {isInvoiceRoom &&
+                    !isArchivedRoom &&
                     (welcomeMessage?.messageHtml ? (
                         <PressableWithoutFeedback
                             onPress={() => {
@@ -139,7 +149,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
                         </Text>
                     ))}
                 {isChatRoom &&
-                    !isInvoiceRoom &&
+                    (!isInvoiceRoom || isArchivedRoom) &&
                     (welcomeMessage?.messageHtml ? (
                         <PressableWithoutFeedback
                             onPress={() => {
@@ -206,10 +216,8 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
                         ))}
                     </Text>
                 )}
-                {(moneyRequestOptions.includes(CONST.IOU.TYPE.PAY) ||
-                    moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT) ||
-                    moneyRequestOptions.includes(CONST.IOU.TYPE.TRACK) ||
-                    moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)) && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>}
+                {shouldShowUsePlusButtonText && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>}
+                {isPolicyExpenseChat && moneyRequestOptions.length && <Text>{translate('reportActionsView.justUsePlusButton')}</Text>}
                 {ReportUtils.isConciergeChatReport(report) && <Text>{translate('reportActionsView.askConcierge')}</Text>}
             </View>
         </>
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 8957a908fd83..55fbafaf5686 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -671,7 +671,7 @@ const translations = {
         beginningOfChatHistory: 'This chat is with ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: 'This is where ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' will submit expenses to the ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' workspace. Just use the + button.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: ' workspace.',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.",
         chatWithAccountManager: 'Chat with your account manager here',
@@ -679,6 +679,7 @@ const translations = {
         yourSpace: 'Your space',
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`,
         usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUse the + button to ${additionalText} an expense.`,
+        justUsePlusButton: `\nJust use the + button.`,
         askConcierge: '\nAsk questions and get 24/7 realtime support.',
         iouTypes: {
             pay: 'pay',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 9087777f3e8b..349c9cba440f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -665,7 +665,7 @@ const translations = {
         beginningOfChatHistory: 'Este chat es con',
         beginningOfChatHistoryPolicyExpenseChatPartOne: 'Aquí es donde ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' enviará los gastos al espacio de trabajo ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: '. Solo usa el botón +.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: '.',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
@@ -673,6 +673,7 @@ const translations = {
         yourSpace: 'Tu espacio',
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`,
         usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUsa el botón + para ${additionalText} un gasto`,
+        justUsePlusButton: `\nSolo usa el botón +.`,
         askConcierge: 'Haz preguntas y obtén soporte en tiempo real las 24/7.',
         iouTypes: {
             pay: 'pagar',

From dc5d24686fa3296f5a6802e836162312821f49d8 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 2 Oct 2024 12:19:15 +0700
Subject: [PATCH 22/70] update policy expense chat welcome text

---
 src/components/ReportWelcomeText.tsx | 1 -
 src/languages/en.ts                  | 3 +--
 src/languages/es.ts                  | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx
index d73614493ff1..12708a7acbfa 100644
--- a/src/components/ReportWelcomeText.tsx
+++ b/src/components/ReportWelcomeText.tsx
@@ -217,7 +217,6 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
                     </Text>
                 )}
                 {shouldShowUsePlusButtonText && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>}
-                {isPolicyExpenseChat && moneyRequestOptions.length && <Text>{translate('reportActionsView.justUsePlusButton')}</Text>}
                 {ReportUtils.isConciergeChatReport(report) && <Text>{translate('reportActionsView.askConcierge')}</Text>}
             </View>
         </>
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 55fbafaf5686..8957a908fd83 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -671,7 +671,7 @@ const translations = {
         beginningOfChatHistory: 'This chat is with ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: 'This is where ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' will submit expenses to the ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: ' workspace.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: ' workspace. Just use the + button.',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.",
         chatWithAccountManager: 'Chat with your account manager here',
@@ -679,7 +679,6 @@ const translations = {
         yourSpace: 'Your space',
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`,
         usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUse the + button to ${additionalText} an expense.`,
-        justUsePlusButton: `\nJust use the + button.`,
         askConcierge: '\nAsk questions and get 24/7 realtime support.',
         iouTypes: {
             pay: 'pay',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 349c9cba440f..9087777f3e8b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -665,7 +665,7 @@ const translations = {
         beginningOfChatHistory: 'Este chat es con',
         beginningOfChatHistoryPolicyExpenseChatPartOne: 'Aquí es donde ',
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' enviará los gastos al espacio de trabajo ',
-        beginningOfChatHistoryPolicyExpenseChatPartThree: '.',
+        beginningOfChatHistoryPolicyExpenseChatPartThree: '. Solo usa el botón +.',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
         beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
@@ -673,7 +673,6 @@ const translations = {
         yourSpace: 'Tu espacio',
         welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`,
         usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUsa el botón + para ${additionalText} un gasto`,
-        justUsePlusButton: `\nSolo usa el botón +.`,
         askConcierge: 'Haz preguntas y obtén soporte en tiempo real las 24/7.',
         iouTypes: {
             pay: 'pagar',

From 4f36fccebbbb6020efdb21a7762111ced6cee238 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 2 Oct 2024 13:48:14 +0700
Subject: [PATCH 23/70] implement resolveDuplicates API and fix regression

---
 .../MoneyRequestPreviewContent.tsx            |  18 ++-
 .../MoneyRequestPreview/index.tsx             |  36 +----
 .../MoneyRequestPreview/types.ts              |  28 +---
 .../API/parameters/ResolveDuplicatesParams.ts |  24 +++
 src/libs/API/parameters/index.ts              |   1 +
 src/libs/API/types.ts                         |   2 +
 src/libs/actions/IOU.ts                       | 149 ++++++++++++++++--
 .../TransactionDuplicate/Confirmation.tsx     |  18 ++-
 8 files changed, 199 insertions(+), 77 deletions(-)
 create mode 100644 src/libs/API/parameters/ResolveDuplicatesParams.ts

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 420d3eaf46a8..9329558d6531 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -51,25 +51,19 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {MoneyRequestPreviewProps, PendingMessageProps} from './types';
 
 function MoneyRequestPreviewContent({
-    iouReport,
     isBillSplit,
-    session,
     action,
-    personalDetails,
-    chatReport,
-    transaction,
     contextMenuAnchor,
     chatReportID,
     reportID,
     onPreviewPressed,
     containerStyles,
-    walletTerms,
     checkIfContextMenuActive = () => {},
     shouldShowPendingConversionMessage = false,
     isHovered = false,
     isWhisper = false,
-    transactionViolations,
     shouldDisplayContextMenu = true,
+    iouReportID,
 }: MoneyRequestPreviewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -78,6 +72,16 @@ function MoneyRequestPreviewContent({
     const {windowWidth} = useWindowDimensions();
     const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || '-1'}`);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID || '-1'}`);
+
+    const isMoneyRequestAction = ReportActionsUtils.isMoneyRequestAction(action);
+    const transactionID = isMoneyRequestAction ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID : '-1';
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
+    const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS);
+    const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
 
     const sessionAccountID = session?.accountID;
     const managerID = iouReport?.managerID ?? -1;
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/index.tsx b/src/components/ReportActionItem/MoneyRequestPreview/index.tsx
index c01206f83f55..f902948b2cb5 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/index.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/index.tsx
@@ -1,44 +1,18 @@
 import lodashIsEmpty from 'lodash/isEmpty';
 import React from 'react';
-import {withOnyx} from 'react-native-onyx';
-import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import {useOnyx} from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
 import MoneyRequestPreviewContent from './MoneyRequestPreviewContent';
-import type {MoneyRequestPreviewOnyxProps, MoneyRequestPreviewProps} from './types';
+import type {MoneyRequestPreviewProps} from './types';
 
 function MoneyRequestPreview(props: MoneyRequestPreviewProps) {
+    const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${props.iouReportID || '-1'}`);
     // We should not render the component if there is no iouReport and it's not a split or track expense.
     // Moved outside of the component scope to allow for easier use of hooks in the main component.
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return lodashIsEmpty(props.iouReport) && !(props.isBillSplit || props.isTrackExpense) ? null : <MoneyRequestPreviewContent {...props} />;
+    return lodashIsEmpty(iouReport) && !(props.isBillSplit || props.isTrackExpense) ? null : <MoneyRequestPreviewContent {...props} />;
 }
 
 MoneyRequestPreview.displayName = 'MoneyRequestPreview';
 
-export default withOnyx<MoneyRequestPreviewProps, MoneyRequestPreviewOnyxProps>({
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-    chatReport: {
-        key: ({chatReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`,
-    },
-    iouReport: {
-        key: ({iouReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`,
-    },
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-    transaction: {
-        key: ({action}) => {
-            const isMoneyRequestAction = ReportActionsUtils.isMoneyRequestAction(action);
-            const transactionID = isMoneyRequestAction ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID : 0;
-            return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
-        },
-    },
-    walletTerms: {
-        key: ONYXKEYS.WALLET_TERMS,
-    },
-    transactionViolations: {
-        key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
-    },
-})(MoneyRequestPreview);
+export default MoneyRequestPreview;
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/types.ts b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
index 021ae5d188d9..c40b45c6d2bd 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/types.ts
+++ b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
@@ -1,33 +1,9 @@
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import type * as OnyxTypes from '@src/types/onyx';
 import type IconAsset from '@src/types/utils/IconAsset';
 
-type MoneyRequestPreviewOnyxProps = {
-    /** All of the personal details for everyone */
-    personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>;
-
-    /** Chat report associated with iouReport */
-    chatReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** IOU report data object */
-    iouReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<OnyxTypes.Session>;
-
-    /** The transaction attached to the action.message.iouTransactionID */
-    transaction: OnyxEntry<OnyxTypes.Transaction>;
-
-    /** The transaction violations attached to the action.message.iouTransactionID */
-    transactionViolations: OnyxCollection<OnyxTypes.TransactionViolation[]>;
-
-    /** Information about the user accepting the terms for payments */
-    walletTerms: OnyxEntry<OnyxTypes.WalletTerms>;
-};
-
-type MoneyRequestPreviewProps = MoneyRequestPreviewOnyxProps & {
+type MoneyRequestPreviewProps = {
     /** The active IOUReport, used for Onyx subscription */
     // The iouReportID is used inside withOnyx HOC
     // eslint-disable-next-line react/no-unused-prop-types
@@ -90,4 +66,4 @@ type PendingProps = {
 
 type PendingMessageProps = PendingProps | NoPendingProps;
 
-export type {MoneyRequestPreviewProps, MoneyRequestPreviewOnyxProps, PendingMessageProps};
+export type {MoneyRequestPreviewProps, PendingMessageProps};
diff --git a/src/libs/API/parameters/ResolveDuplicatesParams.ts b/src/libs/API/parameters/ResolveDuplicatesParams.ts
new file mode 100644
index 000000000000..d225f227c0d7
--- /dev/null
+++ b/src/libs/API/parameters/ResolveDuplicatesParams.ts
@@ -0,0 +1,24 @@
+type ResolveDuplicatesParams = {
+    /** The ID of the transaction that we want to keep */
+    transactionID: string;
+
+    /** The list of other duplicated transactions */
+    transactionIDList: string[];
+    created: string;
+    merchant: string;
+    amount: number;
+    currency: string;
+    category: string;
+    comment: string;
+    billable: boolean;
+    reimbursable: boolean;
+    tag: string;
+
+    /** The reportActionID of the dismissed violation action in the kept transaction thread report */
+    dismissedViolationReportActionID: string;
+
+    /** The ID list of the hold report actions corresponding to the transactionIDList */
+    reportActionIDList: string[];
+};
+
+export default ResolveDuplicatesParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 1b4e89342f5f..0ad5c9644e9f 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -239,6 +239,7 @@ export type {default as SendInvoiceParams} from './SendInvoiceParams';
 export type {default as PayInvoiceParams} from './PayInvoiceParams';
 export type {default as MarkAsCashParams} from './MarkAsCashParams';
 export type {default as TransactionMergeParams} from './TransactionMergeParams';
+export type {default as ResolveDuplicatesParams} from './ResolveDuplicatesParams';
 export type {default as UpdateSubscriptionTypeParams} from './UpdateSubscriptionTypeParams';
 export type {default as SignUpUserParams} from './SignUpUserParams';
 export type {default as UpdateSubscriptionAutoRenewParams} from './UpdateSubscriptionAutoRenewParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 30c563e1ae2b..7adcebbe2872 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -286,6 +286,7 @@ const WRITE_COMMANDS = {
     PAY_INVOICE: 'PayInvoice',
     MARK_AS_CASH: 'MarkAsCash',
     TRANSACTION_MERGE: 'Transaction_Merge',
+    RESOLVE_DUPLICATES: 'ResolveDuplicates',
     UPDATE_SUBSCRIPTION_TYPE: 'UpdateSubscriptionType',
     SIGN_UP_USER: 'SignUpUser',
     UPDATE_SUBSCRIPTION_AUTO_RENEW: 'UpdateSubscriptionAutoRenew',
@@ -706,6 +707,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.PAY_INVOICE]: Parameters.PayInvoiceParams;
     [WRITE_COMMANDS.MARK_AS_CASH]: Parameters.MarkAsCashParams;
     [WRITE_COMMANDS.TRANSACTION_MERGE]: Parameters.TransactionMergeParams;
+    [WRITE_COMMANDS.RESOLVE_DUPLICATES]: Parameters.ResolveDuplicatesParams;
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_TYPE]: Parameters.UpdateSubscriptionTypeParams;
     [WRITE_COMMANDS.SIGN_UP_USER]: Parameters.SignUpUserParams;
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_AUTO_RENEW]: Parameters.UpdateSubscriptionAutoRenewParams;
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 883b38cff1b5..55c6b17ee6d2 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -17,6 +17,7 @@ import type {
     PayMoneyRequestParams,
     ReplaceReceiptParams,
     RequestMoneyParams,
+    ResolveDuplicatesParams,
     SendInvoiceParams,
     SendMoneyParams,
     SetNameValuePairParams,
@@ -8071,6 +8072,21 @@ function getIOURequestPolicyID(transaction: OnyxEntry<OnyxTypes.Transaction>, re
     return workspaceSender?.policyID ?? report?.policyID ?? '-1';
 }
 
+function getIOUActionForTransactions(transactionIDList: string[], iouReportID: string): Array<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>> {
+    return Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`] ?? {})?.filter(
+        (reportAction): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => {
+            if (!ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+                return false;
+            }
+            const message = ReportActionsUtils.getOriginalMessage(reportAction);
+            if (!message?.IOUTransactionID) {
+                return false;
+            }
+            return transactionIDList.includes(message.IOUTransactionID);
+        },
+    );
+}
+
 /** Merge several transactions into one by updating the fields of the one we want to keep and deleting the rest */
 function mergeDuplicates(params: TransactionMergeParams) {
     const originalSelectedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`];
@@ -8155,18 +8171,7 @@ function mergeDuplicates(params: TransactionMergeParams) {
         },
     };
 
-    const iouActionsToDelete = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${params.reportID}`] ?? {})?.filter(
-        (reportAction): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => {
-            if (!ReportActionsUtils.isMoneyRequestAction(reportAction)) {
-                return false;
-            }
-            const message = ReportActionsUtils.getOriginalMessage(reportAction);
-            if (!message?.IOUTransactionID) {
-                return false;
-            }
-            return params.transactionIDList.includes(message.IOUTransactionID);
-        },
-    );
+    const iouActionsToDelete = getIOUActionForTransactions(params.transactionIDList, params.reportID);
 
     const deletedTime = DateUtils.getDBTime();
     const expenseReportActionsOptimisticData: OnyxUpdate = {
@@ -8227,6 +8232,125 @@ function mergeDuplicates(params: TransactionMergeParams) {
     API.write(WRITE_COMMANDS.TRANSACTION_MERGE, params, {optimisticData, failureData});
 }
 
+/** Instead of merging the duplicates, it updates the transaction we want to keep and puts the others on hold without deleting them */
+function resolveDuplicates(params: TransactionMergeParams) {
+    const originalSelectedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`];
+
+    const optimisticTransactionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`,
+        value: {
+            ...originalSelectedTransaction,
+            billable: params.billable,
+            comment: {
+                comment: params.comment,
+            },
+            category: params.category,
+            created: params.created,
+            currency: params.currency,
+            modifiedMerchant: params.merchant,
+            reimbursable: params.reimbursable,
+            tag: params.tag,
+        },
+    };
+
+    const failureTransactionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`,
+        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+        value: originalSelectedTransaction as OnyxTypes.Transaction,
+    };
+
+    const optimisticTransactionViolations: OnyxUpdate[] = [...params.transactionIDList, params.transactionID].map((id) => {
+        const violations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`] ?? [];
+        const newViolation = {name: CONST.VIOLATIONS.HOLD, type: CONST.VIOLATION_TYPES.VIOLATION};
+        const updatedViolations = id === params.transactionID ? violations : [...violations, newViolation];
+        return {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`,
+            value: updatedViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION),
+        };
+    });
+
+    const failureTransactionViolations: OnyxUpdate[] = [...params.transactionIDList, params.transactionID].map((id) => {
+        const violations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`] ?? [];
+        return {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`,
+            value: violations,
+        };
+    });
+
+    const iouActionList = getIOUActionForTransactions(params.transactionIDList, params.reportID);
+    const transactionThreadReportIDList = iouActionList.map((action) => action?.childReportID);
+    const orderedTransactionIDList = iouActionList.map((action) => {
+        const message = ReportActionsUtils.getOriginalMessage(action);
+        return message?.IOUTransactionID ?? '';
+    });
+
+    const optimisticHoldActions: OnyxUpdate[] = [];
+    const failureHoldActions: OnyxUpdate[] = [];
+    const reportActionIDList: string[] = [];
+    transactionThreadReportIDList.forEach((transactionThreadReportID) => {
+        const createdReportAction = ReportUtils.buildOptimisticHoldReportAction();
+        reportActionIDList.push(createdReportAction.reportActionID);
+        optimisticHoldActions.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+            value: {
+                [createdReportAction.reportActionID]: createdReportAction,
+            },
+        });
+        failureHoldActions.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+            value: {
+                [createdReportAction.reportActionID]: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericHoldExpenseFailureMessage'),
+                },
+            },
+        });
+    });
+
+    const transactionThreadReportID = getIOUActionForTransactions([params.transactionID], params.reportID)?.[0]?.childReportID;
+    const optimisticReportAction = ReportUtils.buildOptimisticDismissedViolationReportAction({
+        reason: 'manual',
+        violationName: CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+    });
+
+    const optimisticReportActionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [optimisticReportAction.reportActionID]: optimisticReportAction,
+        },
+    };
+
+    const failureReportActionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+        value: {
+            [optimisticReportAction.reportActionID]: null,
+        },
+    };
+
+    const optimisticData: OnyxUpdate[] = [];
+    const failureData: OnyxUpdate[] = [];
+
+    optimisticData.push(optimisticTransactionData, ...optimisticTransactionViolations, ...optimisticHoldActions, optimisticReportActionData);
+    failureData.push(failureTransactionData, ...failureTransactionViolations, ...failureHoldActions, failureReportActionData);
+    const {reportID, transactionIDList, receiptID, ...otherParams} = params;
+
+    const parameters: ResolveDuplicatesParams = {
+        ...otherParams,
+        reportActionIDList,
+        transactionIDList: orderedTransactionIDList,
+        dismissedViolationReportActionID: optimisticReportAction.reportActionID,
+    };
+
+    API.write(WRITE_COMMANDS.RESOLVE_DUPLICATES, parameters, {optimisticData, failureData});
+}
+
 export {
     adjustRemainingSplitShares,
     getNextApproverAccountID,
@@ -8298,5 +8422,6 @@ export {
     updateMoneyRequestTaxAmount,
     updateMoneyRequestTaxRate,
     mergeDuplicates,
+    resolveDuplicates,
 };
 export type {GPSPoint as GpsPoint, IOURequestType};
diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
index 15217e215ad4..b26ae615b465 100644
--- a/src/pages/TransactionDuplicate/Confirmation.tsx
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -14,6 +14,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
 import Text from '@components/Text';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -35,23 +36,32 @@ function Confirmation() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
     const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
     const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
     const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
     const {goBack} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'confirmation', route.params.threadReportID, route.params.backTo);
     const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
+    const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`);
     const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transaction?.reportID}`);
     const reportAction = Object.values(reportActions ?? {}).find(
         (action) => ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID === reviewDuplicates?.transactionID,
     );
 
     const transactionsMergeParams = useMemo(() => TransactionUtils.buildTransactionsMergeParams(reviewDuplicates, transaction), [reviewDuplicates, transaction]);
+    const isReportOwner = iouReport?.ownerAccountID === currentUserPersonalDetails?.accountID;
+
     const mergeDuplicates = useCallback(() => {
         IOU.mergeDuplicates(transactionsMergeParams);
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportAction?.childReportID ?? '-1'));
     }, [reportAction?.childReportID, transactionsMergeParams]);
 
+    const resolveDuplicates = useCallback(() => {
+        IOU.resolveDuplicates(transactionsMergeParams);
+        Navigation.dismissModal(reportAction?.childReportID ?? '-1');
+    }, [transactionsMergeParams, reportAction?.childReportID]);
+
     const contextValue = useMemo(
         () => ({
             transactionThreadReport: report,
@@ -116,7 +126,13 @@ function Confirmation() {
                             <Button
                                 text={translate('common.confirm')}
                                 success
-                                onPress={mergeDuplicates}
+                                onPress={() => {
+                                    if (!isReportOwner) {
+                                        resolveDuplicates();
+                                        return;
+                                    }
+                                    mergeDuplicates();
+                                }}
                                 large
                             />
                         </FixedFooter>

From 91ff5a83a38d5f07099f67f4f16182ae49d6708d Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 2 Oct 2024 13:53:44 +0700
Subject: [PATCH 24/70] fix prettier

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

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 55c6b17ee6d2..c75c59e7f262 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8312,7 +8312,7 @@ function resolveDuplicates(params: TransactionMergeParams) {
         });
     });
 
-    const transactionThreadReportID = getIOUActionForTransactions([params.transactionID], params.reportID)?.[0]?.childReportID;
+    const transactionThreadReportID = getIOUActionForTransactions([params.transactionID], params.reportID).at(0)?.childReportID;
     const optimisticReportAction = ReportUtils.buildOptimisticDismissedViolationReportAction({
         reason: 'manual',
         violationName: CONST.VIOLATIONS.DUPLICATED_TRANSACTION,

From f8769d8874da1f034cd65bc62e0a5dc01debdb55 Mon Sep 17 00:00:00 2001
From: cretadn22 <cretadn22@gmail.com>
Date: Thu, 3 Oct 2024 10:12:45 +0700
Subject: [PATCH 25/70] reset selected transaction if getting new updates

---
 src/components/Search/index.tsx | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index e459be1815bc..97f58dc8624a 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -180,12 +180,31 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
     const shouldShowLoadingMoreItems = !shouldShowLoadingState && searchResults?.search?.isLoading && searchResults?.search?.offset > 0;
     const isSearchResultsEmpty = !searchResults?.data || SearchUtils.isSearchResultsEmpty(searchResults);
     const prevIsSearchResultEmpty = usePrevious(isSearchResultsEmpty);
+    const data = searchResults === undefined ? [] : SearchUtils.getSections(type, status, searchResults.data, searchResults.search);
 
     useEffect(() => {
         /** We only want to display the skeleton for the status filters the first time we load them for a specific data type */
         setShouldShowStatusBarLoading(shouldShowLoadingState && searchResults?.search?.type !== type);
     }, [searchResults?.search?.type, setShouldShowStatusBarLoading, shouldShowLoadingState, type]);
 
+    useEffect(() => {
+        const newTransactionList: SelectedTransactions = {};
+        data.forEach((report) => {
+            report?.transactions?.forEach((transaction) => {
+                if (Object.keys(selectedTransactions).includes(transaction.transactionID)) {
+                    newTransactionList[transaction.transactionID] = {
+                        action: transaction.action,
+                        canHold: transaction.canHold,
+                        canUnhold: transaction.canUnhold,
+                        isSelected: selectedTransactions[transaction.transactionID].isSelected,
+                        canDelete: transaction.canDelete,
+                    }
+                }
+            })
+        })
+        setSelectedTransactions(newTransactionList, data);
+    }, [data])
+    
     useEffect(() => {
         if (!isSearchResultsEmpty || prevIsSearchResultEmpty) {
             return;
@@ -208,7 +227,6 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
     }
 
     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) => {
         const baseKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${(item as TransactionListItemType).transactionID}`;

From 2cecae194d9564aeefc2ae77ccf05e491a4fbf8e Mon Sep 17 00:00:00 2001
From: cretadn22 <cretadn22@gmail.com>
Date: Thu, 3 Oct 2024 10:32:26 +0700
Subject: [PATCH 26/70] adjust lint error and TS error

---
 src/components/Search/index.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 97f58dc8624a..2663d6a0f04f 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -190,7 +190,8 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
     useEffect(() => {
         const newTransactionList: SelectedTransactions = {};
         data.forEach((report) => {
-            report?.transactions?.forEach((transaction) => {
+            const transactions: TransactionListItemType[] = Object.hasOwn(report, 'transactions') && 'transactions' in report ? report.transactions : [];
+            transactions.forEach((transaction) => {
                 if (Object.keys(selectedTransactions).includes(transaction.transactionID)) {
                     newTransactionList[transaction.transactionID] = {
                         action: transaction.action,
@@ -198,13 +199,14 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
                         canUnhold: transaction.canUnhold,
                         isSelected: selectedTransactions[transaction.transactionID].isSelected,
                         canDelete: transaction.canDelete,
-                    }
+                    };
                 }
-            })
-        })
+            });
+        });
         setSelectedTransactions(newTransactionList, data);
-    }, [data])
-    
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [data, setSelectedTransactions]);
+
     useEffect(() => {
         if (!isSearchResultsEmpty || prevIsSearchResultEmpty) {
             return;

From 10767d0ba6811e63f918aeb9dd605b02bed21d3b Mon Sep 17 00:00:00 2001
From: cretadn22 <cretadn22@gmail.com>
Date: Thu, 3 Oct 2024 10:44:39 +0700
Subject: [PATCH 27/70] adjust lint

---
 src/components/Search/index.tsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 2663d6a0f04f..3556ff068b55 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -190,17 +190,18 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
     useEffect(() => {
         const newTransactionList: SelectedTransactions = {};
         data.forEach((report) => {
-            const transactions: TransactionListItemType[] = Object.hasOwn(report, 'transactions') && 'transactions' in report ? report.transactions : [];
-            transactions.forEach((transaction) => {
-                if (Object.keys(selectedTransactions).includes(transaction.transactionID)) {
-                    newTransactionList[transaction.transactionID] = {
-                        action: transaction.action,
-                        canHold: transaction.canHold,
-                        canUnhold: transaction.canUnhold,
-                        isSelected: selectedTransactions[transaction.transactionID].isSelected,
-                        canDelete: transaction.canDelete,
-                    };
+            const transactionsData: TransactionListItemType[] = Object.hasOwn(report, 'transactions') && 'transactions' in report ? report.transactions : [];
+            transactionsData.forEach((transaction) => {
+                if (!Object.keys(selectedTransactions).includes(transaction.transactionID)) {
+                    return;
                 }
+                newTransactionList[transaction.transactionID] = {
+                    action: transaction.action,
+                    canHold: transaction.canHold,
+                    canUnhold: transaction.canUnhold,
+                    isSelected: selectedTransactions[transaction.transactionID].isSelected,
+                    canDelete: transaction.canDelete,
+                };
             });
         });
         setSelectedTransactions(newTransactionList, data);

From 2aed3554e88db7e304632ad2aa33a7cf7311d0c2 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 3 Oct 2024 11:45:14 +0700
Subject: [PATCH 28/70] fix: The intro text on private notes list stays fixed

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

diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.tsx b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
index cc7ee9f54daa..a7827d9d10af 100644
--- a/src/pages/PrivateNotes/PrivateNotesListPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
@@ -102,11 +102,11 @@ function PrivateNotesListPage({report, personalDetailsList, session}: PrivateNot
                 onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID, backTo))}
                 onCloseButtonPress={() => Navigation.dismissModal()}
             />
-            <Text style={[styles.mb5, styles.ph5]}>{translate('privateNotes.personalNoteMessage')}</Text>
             <ScrollView
                 contentContainerStyle={styles.flexGrow1}
                 bounces={false}
             >
+                <Text style={[styles.mb5, styles.ph5]}>{translate('privateNotes.personalNoteMessage')}</Text>
                 {privateNotes.map((item) => getMenuItem(item))}
             </ScrollView>
         </ScreenWrapper>

From 736ecb7ef6ca740d162218c11de2adbba8dae27f Mon Sep 17 00:00:00 2001
From: nkdengineer <161821005+nkdengineer@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:45:36 +0700
Subject: [PATCH 29/70] Update src/languages/en.ts

Co-authored-by: Kevin Brian Bader <56457735+ikevin127@users.noreply.github.com>
---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 7025fa6cd71e..170aa9c93855 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -670,7 +670,7 @@ const translations = {
         beginningOfChatHistoryInvoiceRoomPartTwo: `. Use the + button to send an invoice.`,
         beginningOfChatHistory: 'This chat is with ',
         beginningOfChatHistoryPolicyExpenseChatPartOne: 'This is where ',
-        beginningOfChatHistoryPolicyExpenseChatPartTwo: ' will submit expenses to the ',
+        beginningOfChatHistoryPolicyExpenseChatPartTwo: ' will submit expenses to ',
         beginningOfChatHistoryPolicyExpenseChatPartThree: ' workspace. Just use the + button.',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
         beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.",

From adfd63223f911ed6dd8d7d94f197ed5d7284f35d Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 3 Oct 2024 16:14:36 +0800
Subject: [PATCH 30/70] don't promp to open in desktop if user is coming from
 desktop

---
 src/components/DeeplinkWrapper/index.website.tsx | 5 +++++
 src/libs/actions/Link.ts                         | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/DeeplinkWrapper/index.website.tsx b/src/components/DeeplinkWrapper/index.website.tsx
index b395eb12c5fe..6f6562f97c17 100644
--- a/src/components/DeeplinkWrapper/index.website.tsx
+++ b/src/components/DeeplinkWrapper/index.website.tsx
@@ -22,6 +22,11 @@ function promptToOpenInDesktopApp(initialUrl = '') {
     // 2. There may be non-idempotent operations (e.g. create a new workspace), which obviously should not be executed again in the desktop app.
     // So we need to wait until after sign-in and navigation are complete before starting the deeplink redirect.
     if (Str.startsWith(window.location.pathname, Str.normalizeUrl(ROUTES.TRANSITION_BETWEEN_APPS))) {
+        const params = new URLSearchParams(window.location.search);
+        // If the user is redirected from the desktop app, don't prompt the user to open in desktop.
+        if (params.get('referrer') === 'desktop') {
+            return;
+        }
         App.beginDeepLinkRedirectAfterTransition();
     } else {
         // Match any magic link (/v/<account id>/<6 digit code>)
diff --git a/src/libs/actions/Link.ts b/src/libs/actions/Link.ts
index 886f8b06fc6f..13fcea0df85d 100644
--- a/src/libs/actions/Link.ts
+++ b/src/libs/actions/Link.ts
@@ -195,7 +195,8 @@ function buildURLWithAuthToken(url: string, shortLivedAuthToken?: string) {
     const emailParam = `email=${encodeURIComponent(currentUserEmail)}`;
     const exitTo = `exitTo=${url}`;
     const accountID = `accountID=${currentUserAccountID}`;
-    const paramsArray = [accountID, emailParam, authTokenParam, exitTo];
+    const referrer = 'referrer=desktop';
+    const paramsArray = [accountID, emailParam, authTokenParam, exitTo, referrer];
     const params = paramsArray.filter(Boolean).join('&');
 
     return `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}transition?${params}`;

From 141a8e645963d03490bc53fed52f54ee022a9a20 Mon Sep 17 00:00:00 2001
From: Eduardo <eduardo.graciano@callstack.com>
Date: Thu, 3 Oct 2024 11:36:54 +0200
Subject: [PATCH 31/70] disabling Jetifier

---
 android/app/build.gradle  | 6 +++---
 android/gradle.properties | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 64b903fdbe24..ec17f2fab156 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -229,11 +229,11 @@ dependencies {
     implementation 'com.facebook.fresco:fresco:2.5.0'
     implementation 'com.facebook.fresco:animated-gif:2.5.0'
 
-    // Android support library
-    implementation 'com.android.support:support-core-utils:28.0.0'
+    // AndroidX support library
+    implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
 
     // Multi Dex Support: https://developer.android.com/studio/build/multidex#mdex-gradle
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
 
     // Plaid SDK
     implementation project(':react-native-plaid-link-sdk')
diff --git a/android/gradle.properties b/android/gradle.properties
index 46cd98554d29..4fad4632765f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -22,7 +22,7 @@ org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=512m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 
 # Increase storage capacity (the default is 6 MB)
 AsyncStorage_db_size_in_MB=10

From 8ebfd562a3c7b61bde128bec3c111620442e0262 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 3 Oct 2024 16:43:58 +0700
Subject: [PATCH 32/70] fix eslint check

---
 .../PrivateNotes/PrivateNotesListPage.tsx     | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.tsx b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
index a7827d9d10af..424cc3e14683 100644
--- a/src/pages/PrivateNotes/PrivateNotesListPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
@@ -1,8 +1,7 @@
 import type {RouteProp} from '@react-navigation/native';
 import {useRoute} from '@react-navigation/native';
 import React, {useCallback, useMemo} from 'react';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import {AttachmentContext} from '@components/AttachmentContext';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -20,19 +19,13 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {PersonalDetailsList, Report} from '@src/types/onyx';
+import type {Report} from '@src/types/onyx';
 
-type PrivateNotesListPageOnyxProps = {
-    /** All of the personal details for everyone */
-    personalDetailsList: OnyxEntry<PersonalDetailsList>;
+type PrivateNotesListPageProps = WithReportAndPrivateNotesOrNotFoundProps & {
+    /** The report currently being looked at */
+    report: Report;
 };
 
-type PrivateNotesListPageProps = WithReportAndPrivateNotesOrNotFoundProps &
-    PrivateNotesListPageOnyxProps & {
-        /** The report currently being looked at */
-        report: Report;
-    };
-
 type NoteListItem = {
     title: string;
     action: () => void;
@@ -43,9 +36,10 @@ type NoteListItem = {
     accountID: string;
 };
 
-function PrivateNotesListPage({report, personalDetailsList, session}: PrivateNotesListPageProps) {
+function PrivateNotesListPage({report, session}: PrivateNotesListPageProps) {
     const route = useRoute<RouteProp<PrivateNotesNavigatorParamList, typeof SCREENS.PRIVATE_NOTES.LIST>>();
     const backTo = route.params.backTo;
+    const [personalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const getAttachmentValue = useCallback((item: NoteListItem) => ({reportID: item.reportID, accountID: Number(item.accountID), type: CONST.ATTACHMENT_TYPE.NOTE}), []);
@@ -115,10 +109,4 @@ function PrivateNotesListPage({report, personalDetailsList, session}: PrivateNot
 
 PrivateNotesListPage.displayName = 'PrivateNotesListPage';
 
-export default withReportAndPrivateNotesOrNotFound('privateNotes.title')(
-    withOnyx<PrivateNotesListPageProps, PrivateNotesListPageOnyxProps>({
-        personalDetailsList: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-    })(PrivateNotesListPage),
-);
+export default withReportAndPrivateNotesOrNotFound('privateNotes.title')(PrivateNotesListPage);

From 6100a629b6712cc41e0243eaff9c71a71bea3ce9 Mon Sep 17 00:00:00 2001
From: Eduardo <eduardo.graciano@callstack.com>
Date: Thu, 3 Oct 2024 12:05:15 +0200
Subject: [PATCH 33/70] updated comment

---
 android/gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index 4fad4632765f..038fb5c392e8 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=512m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
+# Disabled Jetifier to improve build performance as we're not using libraries that require Jetifier for AndroidX compatibility.
 android.enableJetifier=false
 
 # Increase storage capacity (the default is 6 MB)

From 9a98d28eb9871ae16564f710b4d139940a6d71fc Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Thu, 3 Oct 2024 17:30:38 +0200
Subject: [PATCH 34/70] Create QuickbooksDesktopExportPage and update routes

---
 src/ROUTES.ts                                 |   4 +
 src/SCREENS.ts                                |   1 +
 src/languages/en.ts                           |   3 +
 src/languages/es.ts                           |   3 +
 .../ModalStackNavigators/index.tsx            |   2 +
 .../FULL_SCREEN_TO_RHP_MAPPING.ts             |   1 +
 src/libs/Navigation/linkingConfig/config.ts   |   1 +
 src/libs/Navigation/types.ts                  |   3 +
 .../export/QuickbooksDesktopExportPage.tsx    | 117 ++++++++++++++++++
 9 files changed, 135 insertions(+)
 create mode 100644 src/pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage.tsx

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index dfcb42d3c4fe..5fc6d93a6e22 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -649,6 +649,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/export/date-select',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/export/date-select` as const,
     },
+    POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT: {
+        route: 'settings/workspaces/:policyID/accounting/quickbooks-desktop/export',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-desktop/export` as const,
+    },
     WORKSPACE_PROFILE_NAME: {
         route: 'settings/workspaces/:policyID/profile/name',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile/name` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 395f1c4d5fb1..3fc72523dc6d 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -302,6 +302,7 @@ const SCREENS = {
             QUICKBOOKS_ONLINE_ADVANCED: 'Policy_Accounting_Quickbooks_Online_Advanced',
             QUICKBOOKS_ONLINE_ACCOUNT_SELECTOR: 'Policy_Accounting_Quickbooks_Online_Account_Selector',
             QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR: 'Policy_Accounting_Quickbooks_Online_Invoice_Account_Selector',
+            QUICKBOOKS_DESKTOP_EXPORT: 'Workspace_Accounting_Quickbooks_Desktop_Export',
             XERO_IMPORT: 'Policy_Accounting_Xero_Import',
             XERO_ORGANIZATION: 'Policy_Accounting_Xero_Customers',
             XERO_CHART_OF_ACCOUNTS: 'Policy_Accounting_Xero_Import_Chart_Of_Accounts',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index ae5a9314d72d..21ff76e5c6e7 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2342,6 +2342,9 @@ const translations = {
                 }
             },
         },
+        qbd: {
+            exportDescription: 'Configure how Expensify data exports to QuickBooks Desktop.',
+        },
         qbo: {
             importDescription: 'Choose which coding configurations to import from QuickBooks Online to Expensify.',
             classes: 'Classes',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 71cb5037029d..13840d32d3a4 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2363,6 +2363,9 @@ const translations = {
                 }
             },
         },
+        qbd: {
+            exportDescription: 'Configura cómo se exportan los datos de Expensify a QuickBooks Desktop.',
+        },
         qbo: {
             importDescription: 'Elige que configuraciónes de codificación son importadas desde QuickBooks Online a Expensify.',
             classes: 'Clases',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index e1c645118003..3b88a97820ff 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -299,6 +299,8 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
         require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_PREFERRED_EXPORTER]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage').default,
     [SCREENS.REIMBURSEMENT_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/ReimbursementAccount/ReimbursementAccountPage').default,
     [SCREENS.GET_ASSISTANCE]: () => require<ReactComponentModule>('../../../../pages/GetAssistancePage').default,
     [SCREENS.SETTINGS.TWO_FACTOR_AUTH]: () => require<ReactComponentModule>('../../../../pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage').default,
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index 6d8871e5a38a..5a6e949ea6ec 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -45,6 +45,7 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_ADVANCED,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_ACCOUNT_SELECTOR,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR,
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_CHART_OF_ACCOUNTS,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_ORGANIZATION,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 319ec60d143e..f0269ad66783 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -373,6 +373,7 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR]: {
                             path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR.route,
                         },
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_IMPORT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_CHART_OF_ACCOUNTS]: {path: ROUTES.POLICY_ACCOUNTING_XERO_CHART_OF_ACCOUNTS.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_ORGANIZATION]: {path: ROUTES.POLICY_ACCOUNTING_XERO_ORGANIZATION.route},
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 39053de521db..f4a9c34752c7 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -433,6 +433,9 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_PREFERRED_EXPORTER]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT]: {
         policyID: string;
     };
diff --git a/src/pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage.tsx b/src/pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage.tsx
new file mode 100644
index 000000000000..be2cfe2c8c26
--- /dev/null
+++ b/src/pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage.tsx
@@ -0,0 +1,117 @@
+import React, {useMemo} from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const policyOwner = policy?.owner ?? '';
+    const qboConfig = policy?.connections?.quickbooksOnline?.config; // TODO: should be updated to use the new connections object
+    const errorFields = qboConfig?.errorFields;
+
+    const shouldShowVendorMenuItems = useMemo(
+        () => qboConfig?.nonReimbursableExpensesExportDestination === CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL,
+        [qboConfig?.nonReimbursableExpensesExportDestination],
+    );
+    const menuItems = [
+        {
+            description: translate('workspace.accounting.preferredExporter'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_PREFERRED_EXPORTER.getRoute(policyID)), // TODO: should be updated to use new routes
+            title: qboConfig?.export?.exporter ?? policyOwner,
+            subscribedSettings: [CONST.QUICKBOOKS_CONFIG.EXPORT],
+        },
+        {
+            description: translate('workspace.qbo.date'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_DATE_SELECT.getRoute(policyID)), // TODO: should be updated to use new routes
+            title: qboConfig?.exportDate ? translate(`workspace.qbo.exportDate.values.${qboConfig?.exportDate}.label`) : undefined,
+            subscribedSettings: [CONST.QUICKBOOKS_CONFIG.EXPORT_DATE],
+        },
+        {
+            description: translate('workspace.accounting.exportOutOfPocket'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES.getRoute(policyID)),
+            title: qboConfig?.reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${qboConfig?.reimbursableExpensesExportDestination}`) : undefined, // TODO: should be updated to use new routes
+            subscribedSettings: [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT],
+        },
+        {
+            description: translate('workspace.qbo.exportInvoices'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECT.getRoute(policyID)), // TODO: should be updated to use new routes
+            title: qboConfig?.receivableAccount?.name,
+            subscribedSettings: [CONST.QUICKBOOKS_CONFIG.RECEIVABLE_ACCOUNT],
+        },
+        {
+            description: translate('workspace.accounting.exportCompanyCard'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID)), // TODO: should be updated to use new routes
+            brickRoadIndicator: qboConfig?.errorFields?.exportCompanyCard ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: qboConfig?.nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${qboConfig?.nonReimbursableExpensesExportDestination}`) : undefined,
+            subscribedSettings: [
+                CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION,
+                CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSE_ACCOUNT,
+                ...(shouldShowVendorMenuItems ? [CONST.QUICKBOOKS_CONFIG.AUTO_CREATE_VENDOR] : []),
+                ...(shouldShowVendorMenuItems && qboConfig?.autoCreateVendor ? [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_BILL_DEFAULT_VENDOR] : []),
+            ],
+        },
+        {
+            description: translate('workspace.qbo.exportExpensifyCard'),
+            title: translate('workspace.qbo.accounts.credit_card'),
+            shouldShowRightIcon: false,
+            interactive: false,
+        },
+    ];
+
+    return (
+        <ConnectionLayout
+            displayName={QuickbooksDesktopExportPage.displayName}
+            headerTitle="workspace.accounting.export"
+            title="workspace.qbd.exportDescription"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO} // TODO: should be updated to use the new connection
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
+        >
+            {menuItems.map((menuItem) => (
+                <OfflineWithFeedback
+                    key={menuItem.description}
+                    pendingAction={PolicyUtils.settingsPendingAction(menuItem?.subscribedSettings, qboConfig?.pendingFields)}
+                >
+                    <MenuItemWithTopDescription
+                        title={menuItem.title}
+                        interactive={menuItem?.interactive ?? true}
+                        description={menuItem.description}
+                        shouldShowRightIcon={menuItem?.shouldShowRightIcon ?? true}
+                        onPress={menuItem?.onPress}
+                        brickRoadIndicator={PolicyUtils.areSettingsInErrorFields(menuItem?.subscribedSettings, errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            ))}
+            <Text style={[styles.mutedNormalTextLabel, styles.ph5, styles.pb5, styles.mt2]}>
+                <Text style={[styles.mutedNormalTextLabel]}>{translate('workspace.qbo.deepDiveExpensifyCard')}</Text>
+                <TextLink
+                    onPress={() => Link.openExternalLink(CONST.DEEP_DIVE_EXPENSIFY_CARD)}
+                    style={[styles.mutedNormalTextLabel, styles.link]}
+                >
+                    {translate('workspace.qbo.deepDiveExpensifyCardIntegration')}
+                </TextLink>
+            </Text>
+        </ConnectionLayout>
+    );
+}
+
+QuickbooksDesktopExportPage.displayName = 'QuickbooksDesktopExportPage';
+
+export default withPolicyConnections(QuickbooksDesktopExportPage);

From 9581d1475834f69bd35d3df151ac7ca6a205959e Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Thu, 3 Oct 2024 17:32:16 +0200
Subject: [PATCH 35/70] Update folder name

---
 .../Navigation/AppNavigator/ModalStackNavigators/index.tsx     | 3 +--
 .../export/QuickbooksDesktopExportPage.tsx                     | 0
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename src/pages/workspace/accounting/{qbo-desktop => qbd}/export/QuickbooksDesktopExportPage.tsx (100%)

diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 3b88a97820ff..76906c69e00a 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -299,8 +299,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
         require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_PREFERRED_EXPORTER]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage').default,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT]: () =>
-        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage').default,
     [SCREENS.REIMBURSEMENT_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/ReimbursementAccount/ReimbursementAccountPage').default,
     [SCREENS.GET_ASSISTANCE]: () => require<ReactComponentModule>('../../../../pages/GetAssistancePage').default,
     [SCREENS.SETTINGS.TWO_FACTOR_AUTH]: () => require<ReactComponentModule>('../../../../pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage').default,
diff --git a/src/pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
similarity index 100%
rename from src/pages/workspace/accounting/qbo-desktop/export/QuickbooksDesktopExportPage.tsx
rename to src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx

From 6b01554468eeb8e8ab7eff2d680986f2b671b343 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Thu, 3 Oct 2024 17:35:01 +0200
Subject: [PATCH 36/70] update deepDiveExpensifyCard message

---
 .../accounting/qbd/export/QuickbooksDesktopExportPage.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
index be2cfe2c8c26..ecb067495cb0 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
@@ -105,7 +105,7 @@ function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
                     onPress={() => Link.openExternalLink(CONST.DEEP_DIVE_EXPENSIFY_CARD)}
                     style={[styles.mutedNormalTextLabel, styles.link]}
                 >
-                    {translate('workspace.qbo.deepDiveExpensifyCardIntegration')}
+                    {` ${translate('workspace.qbo.deepDiveExpensifyCardIntegration')}`}
                 </TextLink>
             </Text>
         </ConnectionLayout>

From 85e35b58e8cb8abc7f0d49de15a7ee584abf9959 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 3 Oct 2024 23:40:53 +0800
Subject: [PATCH 37/70] fix green dot is not aligned with the arrow

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

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index 95528286d1e1..8d036fc6167b 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -128,7 +128,7 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                     <Text style={titleStyle}>{taskTitle}</Text>
                 </View>
                 {shouldShowGreenDotIndicator && (
-                    <View style={styles.ml2}>
+                    <View style={[styles.ml2, iconWrapperStyle]}>
                         <Icon
                             src={Expensicons.DotIndicator}
                             fill={theme.success}

From 79dda7a7213e047fc03b0a0522932c1f6ae965c2 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Fri, 4 Oct 2024 03:39:11 +0700
Subject: [PATCH 38/70] update translation for user created room

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

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 4cc75d671dc3..0863b0f8db9e 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -665,7 +665,7 @@ const translations = {
         beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) => `This chat is with everyone in ${workspaceName} workspace.`,
         beginningOfChatHistoryAnnounceRoomPartTwo: ` Use it for the most important announcements.`,
         beginningOfChatHistoryUserRoomPartOne: 'This chat room is for anything ',
-        beginningOfChatHistoryUserRoomPartTwo: ({displayName}: {displayName: string}) => ` related. It was created by ${displayName}.`,
+        beginningOfChatHistoryUserRoomPartTwo: ' related.',
         beginningOfChatHistoryInvoiceRoomPartOne: `This chat is for invoices between `,
         beginningOfChatHistoryInvoiceRoomPartTwo: `. Use the + button to send an invoice.`,
         beginningOfChatHistory: 'This chat is with ',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 981f684f7896..a9a904cdcc27 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -659,7 +659,7 @@ const translations = {
         beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) => `Este chat es con todos en el espacio de trabajo ${workspaceName}.`,
         beginningOfChatHistoryAnnounceRoomPartTwo: ` Úsalo para hablar sobre la configuración del espacio de trabajo y más.`,
         beginningOfChatHistoryUserRoomPartOne: 'ste chat es para todo lo relacionado con ',
-        beginningOfChatHistoryUserRoomPartTwo: ({displayName}: {displayName: string}) => ` Fue creado por ${displayName}.`,
+        beginningOfChatHistoryUserRoomPartTwo: ' Fue creado por.',
         beginningOfChatHistoryInvoiceRoomPartOne: `Este chat es para facturas entre `,
         beginningOfChatHistoryInvoiceRoomPartTwo: `. Usa el botón + para enviar una factura.`,
         beginningOfChatHistory: 'Este chat es con',
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 1ad23b64255a..46af583aad87 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -613,7 +613,7 @@ function getRoomWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
     } else {
         // Message for user created rooms or other room types.
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartOne');
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo', {displayName: ReportUtils.getPolicyName(report)});
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo');
     }
     welcomeMessage.messageText = `${welcomeMessage.phrase1} ${welcomeMessage.showReportName ? ReportUtils.getReportName(report) : ''} ${welcomeMessage.phrase2 ?? ''}`;
 

From 9c02026b4f31953f36d02a8304e60fae9b18fe3f Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Fri, 4 Oct 2024 09:09:52 +0800
Subject: [PATCH 39/70] Add clear button to saved search name field

---
 src/pages/Search/SavedSearchRenamePage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index d2643591ebbf..00180cd5de7f 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -68,6 +68,7 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
                     onChangeText={(renamedName) => setNewName(renamedName)}
                     ref={inputCallbackRef}
                     defaultValue={name}
+                    shouldShowClearButton
                 />
             </FormProvider>
         </ScreenWrapper>

From ec7fd1dfd67377314a255a80e4aad0800aa842fe Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Fri, 4 Oct 2024 09:14:56 +0530
Subject: [PATCH 40/70] minor fix.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/actions/Policy/Category.ts | 2 +-
 src/libs/actions/Policy/Tag.ts      | 2 +-
 src/libs/actions/TaxRate.ts         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts
index 1289185105ef..ae09c5efcc45 100644
--- a/src/libs/actions/Policy/Category.ts
+++ b/src/libs/actions/Policy/Category.ts
@@ -878,7 +878,7 @@ function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: stri
                     acc[categoryName] = {
                         pendingAction: null,
                         errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.deleteFailureMessage'),
-                        enabled: policyCategories?.[categoryName].enabled,
+                        enabled: policyCategories?.[categoryName]?.enabled,
                     };
                     return acc;
                 }, {}),
diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
index 6ebd4c150d00..3344ebcc73ec 100644
--- a/src/libs/actions/Policy/Tag.ts
+++ b/src/libs/actions/Policy/Tag.ts
@@ -391,7 +391,7 @@ function deletePolicyTags(policyID: string, tagsToDelete: string[]) {
                                 acc[tagName] = {
                                     pendingAction: null,
                                     errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.deleteFailureMessage'),
-                                    enabled: policyTag?.tags[tagName].enabled,
+                                    enabled: policyTag?.tags[tagName]?.enabled,
                                 };
                                 return acc;
                             }, {}),
diff --git a/src/libs/actions/TaxRate.ts b/src/libs/actions/TaxRate.ts
index beec01b14bcd..495faf9a4a0d 100644
--- a/src/libs/actions/TaxRate.ts
+++ b/src/libs/actions/TaxRate.ts
@@ -339,7 +339,7 @@ function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
                             acc[taxID] = {
                                 pendingAction: null,
                                 errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.deleteFailureMessage'),
-                                isDisabled: policyTaxRates?.[taxID].isDisabled,
+                                isDisabled: policyTaxRates?.[taxID]?.isDisabled,
                             };
                             return acc;
                         }, {}),

From 771611147a3d2df5f3ed3a41df43dee5d927ef80 Mon Sep 17 00:00:00 2001
From: Sasha Kluger <sasha@expensify.com>
Date: Thu, 3 Oct 2024 22:26:27 -0700
Subject: [PATCH 41/70] Fixed formatting and corrected plan availability info

There were some formatting inconsistencies - I fixed them according to the style guide here: https://stackoverflowteams.com/c/expensify/questions/17353

Also, tax tracking is available on Collect and Control plans, so I updated the doc accordingly.
---
 .../articles/new-expensify/workspaces/Track-taxes.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/articles/new-expensify/workspaces/Track-taxes.md b/docs/articles/new-expensify/workspaces/Track-taxes.md
index fb4077679350..a8ea82873b9e 100644
--- a/docs/articles/new-expensify/workspaces/Track-taxes.md
+++ b/docs/articles/new-expensify/workspaces/Track-taxes.md
@@ -4,15 +4,13 @@ description: Set up tax rates in your Expensify workspace
 ---
 <div id="new-expensify" markdown="1">
 
-# Track taxes
-
 Each Expensify workspace can be configured with one or more tax rates. Once tax rates are enabled on your workspace, all expenses will have a default tax rate applied based on the currency, and employees will be able to select the correct tax rate for each expense.
 
-Tax rates are only available on the Control plan. Collect plan users will need to upgrade to Control for access to tag tax codes.
+Tax rates are available on Collect and Control plans.
 
-## Enable taxes on a workspace
+# Enable taxes on a workspace
 
-Tax codes are only available on the Control plan. Taxes can be enabled on any workspace where the default currency is not USD. Please note that if you have a direct accounting integration, tax rates will be managed through the integration and cannot be manually enabled or disabled using the instructions below.
+Taxes can be enabled on any workspace where the default currency is not USD. Please note that if you have a direct accounting integration, tax rates will be managed through the integration and cannot be manually enabled or disabled using the instructions below.
 
 **To enable taxes on your workspace:**
 
@@ -24,7 +22,7 @@ Tax codes are only available on the Control plan. Taxes can be enabled on any wo
 
 After toggling on taxes, you will see a new **Taxes** option in the left menu.
 
-## Manually add, delete, or edit tax rates
+# Manually add, delete, or edit tax rates
 
 **To manually add a tax rate:**
 
@@ -53,7 +51,7 @@ Please note: The workspace currency default rate cannot be deleted or disabled.
 
 Please note: The workspace currency default rate cannot be deleted or disabled.
 
-## Change the default tax rates
+# Change the default tax rates
 
 After enabling taxes in your workspace, you can set two default rates:
 

From 0de93f4129fc6a5a9def2f028fe81402a53c8f38 Mon Sep 17 00:00:00 2001
From: Sasha Kluger <sasha@expensify.com>
Date: Thu, 3 Oct 2024 22:57:33 -0700
Subject: [PATCH 42/70] Fix formatting in Configure-Sage-Intacct.md

---
 .../sage-intacct/Configure-Sage-Intacct.md    | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/docs/articles/new-expensify/connections/sage-intacct/Configure-Sage-Intacct.md b/docs/articles/new-expensify/connections/sage-intacct/Configure-Sage-Intacct.md
index 28cdc71ed80f..d5bc3ee20000 100644
--- a/docs/articles/new-expensify/connections/sage-intacct/Configure-Sage-Intacct.md
+++ b/docs/articles/new-expensify/connections/sage-intacct/Configure-Sage-Intacct.md
@@ -4,17 +4,16 @@ description: Configure the Import, Export, and Advanced settings for Expensify's
 order: 3
 ---
 
-# Configure Sage Intacct integration
 
-## Step 1: Select entity (multi-entity setups only)
+# Step 1: Select entity (multi-entity setups only)
 If you have a multi-entity setup in Sage Intacct, you will be able to select in Expensify which Sage Intacct entity to connect each workspace to. Each Expensify workspace can either be connected to a single entity or connected at the Top Level.
 
 To select or change the Sage Intacct entity that your Expensify workspace is connected to, navigate to the Accounting settings for your workspace and click **Entity** under the Sage Intacct connection.
 
-## Step 2: Configure import settings
+# Step 2: Configure import settings
 The following section will help you determine how data will be imported from Sage Intacct into Expensify. To change your import settings, navigate to the Accounting settings for your workspace, then click **Import** under the Sage Intacct connection.
 
-### Expense Types / Chart of Accounts
+## Expense Types / Chart of Accounts
 The categories in Expensify depend on how you choose to export out-of-pocket expenses:
 
 - If you choose to export out-of-pocket expenses as Expense Reports, your categories in Expensify will be imported from your Sage Intacct Expense Types
@@ -22,13 +21,13 @@ The categories in Expensify depend on how you choose to export out-of-pocket exp
 
 You can disable unnecessary categories in Expensify by going to **Settings > Workspaces > [Workspace Name] > Categories**. Note that every expense must be coded with a Category, or it will fail to export.
 
-### Billable Expenses
+## Billable Expenses
 Enabling billable expenses allows you to map your expense types or accounts to items in Sage Intacct. To do this, you’ll need to enable the correct permissions on your Sage Intacct user or role. This may vary based on the modules you use in Sage Intacct, so you should enable read-only permissions for relevant modules such as Projects, Purchasing, Inventory Control, and Order Entry.
 
 Once permissions are set, you can map categories to specific items, which will then export to Sage Intacct. When an expense is marked as Billable in Expensify, users must select the correct billable Category (Item), or there will be an error during export.
 
 
-### Standard dimensions: Departments, Classes, and Locations
+## Standard dimensions: Departments, Classes, and Locations
 The Sage Intacct integration allows you to import standard dimensions into Expensify as tags, report fields, or using the Sage Intacct employee default.
 
 - **Sage Intacct Employee default:** This option is only available when exporting as expense reports. When this option is selected, nothing will be imported into Expensify - instead, the employee default will be applied to each expense upon export.
@@ -39,7 +38,7 @@ New departments, classes, and locations must be added in Sage Intacct. Once impo
 
 Please note that when importing departments as tags, expense reports may show the tag name as "Tag" instead of "Department."
 
-### Customers and Projects
+## Customers and Projects
 The Sage Intacct integration allows you to import customers and projects into Expensify as Tags or Report Fields.
 
 - **Tags:** Employees can select the customer or project on each individual expense.
@@ -48,12 +47,12 @@ The Sage Intacct integration allows you to import customers and projects into Ex
 New customers and projects must be added in Sage Intacct. Once imported, you can turn specific tags on or off under **Settings > Workspaces > [Workspace Name] > Tags**. You can turn specific report fields on or off under **Settings > Workspaces > [Workspace Name] > Report Fields**.
 
 
-### Tax
+## Tax
 The Sage Intacct integration supports native VAT and GST tax. To enable this feature, go to **Settings > Workspaces > [Workspace Name] > Accounting**, click **Import** under Sage Intacct, and enable Tax. Enabling this option will import your native tax rates from Sage Intacct into Expensify. From there, you can select default rates for each category under **Settings > Workspaces > [Workspace Name] > Categories**.
 
 For older Sage Intacct connections that don't show the Tax option, simply resync the connection by going to **Settings > Workspaces > [Workspace Name] > Accounting** and clicking the three dots next to Sage Intacct, and the tax toggle will appear.
 
-### User-Defined Dimensions
+## User-Defined Dimensions
 You can add User-Defined Dimensions (UDDs) to your workspace by locating the “Integration Name” in Sage Intacct. Please note that you must be logged in as an administrator in Sage Intacct to find the required fields.
 
 To find the Integration Name in Sage Intacct:
@@ -68,23 +67,23 @@ To find the Integration Name in Sage Intacct:
 Once imported, you can turn specific tags on or off under **Settings > Workspaces > [Workspace Name] > Tags**. You can turn specific report fields on or off under **Settings > Workspaces > [Workspace Name] > Report Fields**.
 
 
-## Step 5: Configure export settings
+# Step 3: Configure export settings
 To access export settings, head to **Settings > Workspaces > [Workspace name] > Accounting** and click **Export** under Sage Intacct.
 
-### Preferred exporter
+## Preferred exporter
 Any workspace admin can export reports to Sage Intacct. For auto-export, Concierge will export on behalf of the preferred exporter. The preferred exporter will also be notified of any expense reports that fail to export to Sage Intacct due to an error.
 
-### Export date
+## Export date
 You can choose which date to use for the records created in Sage Intacct. There are three date options:
 
 1. **Date of last expense:** This will use the date of the previous expense on the report
 1. **Export date:** The date you export the report to Sage Intacct
 1. **Submitted date:** The date the employee submitted the report
 
-### Export out-of-pocket expenses as
+## Export out-of-pocket expenses as
 Out-of-pocket expenses can be exported to Sage Intacct as **expense reports** or as **vendor bills**. If you choose to export as expense reports, you can optionally select a **default vendor**, which will apply to reimbursable expenses that don't have a matching vendor in Sage Intacct.
 
-### Export company card expenses as
+## Export company card expenses as
 Company Card expenses are exported separately from out-of-pocket expenses, and can be exported to Sage Intacct as credit card charges** or as **vendor bills**.
 
 - **Credit card charges:** When exporting as credit card charges, you must select a credit card account. You can optionally select a default vendor, which will apply to company card expenses that don't have a matching vendor in Sage Intacct.
@@ -93,13 +92,13 @@ Company Card expenses are exported separately from out-of-pocket expenses, and c
 
 If you centrally manage your company cards through Domains in Expensify Classic, you can export expenses from each individual card to a specific account in Sage Intacct in the Expensify Company Card settings.
 
-### 6. Configure advanced settings
+# Step 4: Configure advanced settings
 To access the advanced settings of the Sage Intacct integration, head to **Settings > Workspaces > [Workspace name] > Accounting** and click **Advanced** under Sage Intacct.
 
 
 Let’s review the different advanced settings and how they interact with the integration.
 
-### Auto-sync
+## Auto-sync
 We strongly recommend enabling auto-sync to ensure that the information in Sage Intacct and Expensify is always in sync. The following will occur when auto-sync is enabled:
 
 **Daily sync from Sage Intacct to Expensify:** Once a day, Expensify will sync any changes from Sage Intacct into Expensify. This includes any changes or additions to your Sage Intacct dimensions.
@@ -108,7 +107,7 @@ We strongly recommend enabling auto-sync to ensure that the information in Sage
 
 **Reimbursement-sync:** If Sync Reimbursed Reports (more details below) is enabled, then we will sync the reimbursement status of reports between Expensify and Sage Intacct.
 
-### Invite employees
+## Invite employees
 Enabling this feature will invite all employees from the connected Sage Intacct entity to your Expensify workspace. Once imported, each employee who has not already been invited to that Expensify workspace will receive an email letting them know they’ve been added to the workspace.
 
 In addition to inviting employees, this feature enables a custom set of approval workflow options, which you can manage in Expensify Classic:
@@ -118,7 +117,7 @@ In addition to inviting employees, this feature enables a custom set of approval
 - **Configure Manually:** Employees will be imported, but all levels of approval must be manually configured in Expensify. If you enable this setting, you can configure approvals by going to **Settings > Workspaces > [Workspace Name] > People**.
 
 
-### Sync reimbursed reports
+## Sync reimbursed reports
 When Sync reimbursed reports is enabled, the reimbursement status will be synced between Expensify and Sage Intacct.
 
 **If you reimburse employees through Expensify:** Reimbursing an expense report will trigger auto-export to Sage Intacct. When the expense report is exported to Sage Intacct, a corresponding bill payment will also be created in Sage Intacct in the selected Cash and Cash Equivalents account.  If you don't see the account you'd like to select in the dropdown list, please confirm that the account type is Cash and Cash Equivalents.
@@ -127,7 +126,7 @@ When Sync reimbursed reports is enabled, the reimbursement status will be synced
 
 To ensure this feature works properly for expense reports, make sure that the account you choose within the settings matches the default account for Bill Payments in NetSuite. When exporting invoices, once marked as Paid, the payment is marked against the account selected after enabling the Collection Account setting.
 
-## FAQ
+# FAQ
 
-### Will enabling auto-sync affect existing approved and reimbursed reports?
+## Will enabling auto-sync affect existing approved and reimbursed reports?
 Auto-sync will only export newly approved reports to Sage Intacct. Any reports that were approved or reimbursed before enabling auto-sync will need to be manually exported in order to sync them to Sage Intacct.

From 121b2417dd9052c0ab37c1dbc34ba5e67de6022d Mon Sep 17 00:00:00 2001
From: Victoria O'Leary <54568958+VictoriaExpensify@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:03:27 +1000
Subject: [PATCH 43/70] Create Enable-Report-Fields.md

New resource required, as outlined in this GH - https://github.com/Expensify/Expensify/issues/427726
---
 .../workspaces/Enable-Report-Fields.md        | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 docs/articles/new-expensify/workspaces/Enable-Report-Fields.md

diff --git a/docs/articles/new-expensify/workspaces/Enable-Report-Fields.md b/docs/articles/new-expensify/workspaces/Enable-Report-Fields.md
new file mode 100644
index 000000000000..3ae1af36482b
--- /dev/null
+++ b/docs/articles/new-expensify/workspaces/Enable-Report-Fields.md
@@ -0,0 +1,51 @@
+---
+title: Enable-Report-Fields.md
+description: Enable and create Report Fields for your Workspaces
+---
+
+{% include info.html %}
+Report fields are only available on the Control plan. You cannot create these report fields directly in Expensify if you are connected to an accounting integration (QuickBooks Online, QuickBooks Desktop, Intacct, Xero, or NetSuite). Please refer to the relevant article for instructions on creating fields within that system.
+{% include end-info.html %}
+
+If you are not connected to an accounting integration, workspace Admins can add additional required report fields that allow you to specify header-level details like specific project names, business trip information, locations, and more.
+
+## Enable Report Fields 
+To enable report fields on a Workspace:
+
+1. Click Settings in the bottom left menu
+2. Click Workspaces from the left-hand menu
+3. Select the Workspace you want to enable Report Fields for 
+4. Go to More Features and toggle on Report Fields
+
+{% include info.html %}
+If you are not already on a Control plan, you will be prompted to upgrade
+{% include end-info.html %}
+
+## Create New Report Fields
+To create new Report Fields:
+
+1. Click Settings in the bottom left menu
+2. Click Workspaces from the left-hand menu
+3. Select the Workspace you want to create Report Fields on
+4. Click Report Fields on the lefthand menu (if you do not see this option, enable Report Fields by following the Enable Report Fields process above this)
+5. Click “Add Field” in the top right corner
+6. Click “Name” and add a name your your Report Field
+7. Click “Type” to select the Report Field type; you will have the following options:
+   - Text - Add a field for free-text input
+   - Date - Add a calendar for date selection
+   - List - Add a list of options to choose from
+       - To create values for your list, click List Vales > Add Values
+8. Once you have added a Name and the Type, click Save at the bottom of the page
+
+## Edit or Delete Existing Report Fields
+To edit or delete existing report fields  Report Fields:
+
+1. Click Settings in the bottom left menu
+2. Click Workspaces from the left-hand menu
+3. Select the Workspace you want to edit Report Fields on
+4. Click Report Fields on the lefthand menu 
+5. Click the Report Field you wish to edit or delete
+6. Make the required edits in the right-hand panel, or select “Delete”
+
+
+

From f13df4cef3dad8875de1d597f3430bd82e27b63c Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 4 Oct 2024 18:48:00 +0800
Subject: [PATCH 44/70] fix categories page always show loader when open the
 page

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

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 127631bc5437..f681193444c7 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -8,6 +8,7 @@ import usePrevious from '@hooks/usePrevious';
 import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import withPolicy from './withPolicy';
 import type {WithPolicyProps} from './withPolicy';
 
@@ -28,11 +29,10 @@ type WithPolicyConnectionsProps = WithPolicyProps & {
 function withPolicyConnections<TProps extends WithPolicyConnectionsProps>(WrappedComponent: ComponentType<TProps>, shouldBlockView = true) {
     function WithPolicyConnections(props: TProps) {
         const {isOffline} = useNetwork();
-        const [hasConnectionsDataBeenFetched] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${props.policy?.id ?? '-1'}`, {
-            initWithStoredValues: false,
-        });
+        const [hasConnectionsDataBeenFetched, hasConnectionsDataBeenFetchedResult] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${props.policy?.id ?? '-1'}`);
+        const isOnyxDataLoading = isLoadingOnyxValue(hasConnectionsDataBeenFetchedResult);
         const isConnectionDataFetchNeeded =
-            !isOffline && !!props.policy && (!!props.policy.areConnectionsEnabled || !isEmptyObject(props.policy.connections)) && !hasConnectionsDataBeenFetched;
+            !isOnyxDataLoading && !isOffline && !!props.policy && (!!props.policy.areConnectionsEnabled || !isEmptyObject(props.policy.connections)) && !hasConnectionsDataBeenFetched;
 
         const [isFetchingData, setIsFetchingData] = useState(false);
 
@@ -55,7 +55,7 @@ function withPolicyConnections<TProps extends WithPolicyConnectionsProps>(Wrappe
             openPolicyAccountingPage(props.policy.id);
         }, [props.policy?.id, isConnectionDataFetchNeeded]);
 
-        if ((isConnectionDataFetchNeeded || isFetchingData) && shouldBlockView) {
+        if ((isConnectionDataFetchNeeded || isFetchingData || isOnyxDataLoading) && shouldBlockView) {
             return <FullScreenLoadingIndicator />;
         }
 

From ee48f01779abdb2d874da0138646c017ca5f1cdd Mon Sep 17 00:00:00 2001
From: Sonia Liapounova <sonia@expensify.com>
Date: Fri, 4 Oct 2024 13:44:04 +0200
Subject: [PATCH 45/70] Create General-product-troubleshooting.md

---
 .../General-product-troubleshooting.md        | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 docs/articles/expensify-classic/settings/General-product-troubleshooting.md

diff --git a/docs/articles/expensify-classic/settings/General-product-troubleshooting.md b/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
new file mode 100644
index 000000000000..a314357391f1
--- /dev/null
+++ b/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
@@ -0,0 +1,48 @@
+---
+title: General Product Troubleshooting
+description: How to troubleshoot a website issue
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# Issues with a specific feature
+If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, pleasee reach out to Concierge via the app or by emailing us at concierge@expensify.com.
+
+# Troubleshooting local issues
+Is your webpage not loading? Try these steps:
+- Try clicking [here](https://www.expensify.com/signout.php?clean=true), which will force a clean sign-out from the site, which can be very helpful in removing any stale data that can cause issues.
+- Clear cookies & cache on your browser.
+- Try using an Incognito or Private browsing window.
+- Try on a different browser.
+
+# JavaScript Console
+A developer console is a tool that logs information about the backend operations of the sites you visit and the applications you run. This information can help our developers solve any issue that you may experience.
+
+If you've been asked to provide a screenshot of your developer console, scroll down to find the instructions for the browser or application you're using.
+
+## Chrome 
+
+- Keyboard shortcut 
+  - Mac: Cmd + Option + J
+  - Windows: Ctrl + Shift + J
+- From the menu: View > Developer > JavaScript Console
+
+## Firefox
+
+- Keyboard shortcut: 
+  - Mac: Cmd + Option + K
+  - Windows: Ctrl + Shift + J
+- From the menu: Menu Bar > More Tools > Web Developer Tools > Console tab
+
+## Safari
+ 
+Before opening the console you will need to enable it in Safari by clicking the Safari Menu > Settings > Advanced > and selecting the "Show features for web developers" checkbox. Once enabled, you can locate the console in the developer menu or open it using the keyboard shortcut:
+
+- Keyboard shortcut: Cmd + Option + C
+- From the menu: Develop Menu > Show JavaScript Console
+
+## Microsoft Edge 
+
+- Keyboard shortcut:
+  - Mac: Cmd + Option + J
+  - Windows: Ctrl + Shift + J 
+- From the menu: Right-click a webpage > Inspect > Console

From b930f0e12f6848ecadf525144f32c611277788fb Mon Sep 17 00:00:00 2001
From: Sonia Liapounova <sonia@expensify.com>
Date: Fri, 4 Oct 2024 13:45:32 +0200
Subject: [PATCH 46/70] Create General-product-troubleshooting.md

---
 .../General-product-troubleshooting.md        | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 docs/articles/new-expensify/settings/General-product-troubleshooting.md

diff --git a/docs/articles/new-expensify/settings/General-product-troubleshooting.md b/docs/articles/new-expensify/settings/General-product-troubleshooting.md
new file mode 100644
index 000000000000..a314357391f1
--- /dev/null
+++ b/docs/articles/new-expensify/settings/General-product-troubleshooting.md
@@ -0,0 +1,48 @@
+---
+title: General Product Troubleshooting
+description: How to troubleshoot a website issue
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# Issues with a specific feature
+If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, pleasee reach out to Concierge via the app or by emailing us at concierge@expensify.com.
+
+# Troubleshooting local issues
+Is your webpage not loading? Try these steps:
+- Try clicking [here](https://www.expensify.com/signout.php?clean=true), which will force a clean sign-out from the site, which can be very helpful in removing any stale data that can cause issues.
+- Clear cookies & cache on your browser.
+- Try using an Incognito or Private browsing window.
+- Try on a different browser.
+
+# JavaScript Console
+A developer console is a tool that logs information about the backend operations of the sites you visit and the applications you run. This information can help our developers solve any issue that you may experience.
+
+If you've been asked to provide a screenshot of your developer console, scroll down to find the instructions for the browser or application you're using.
+
+## Chrome 
+
+- Keyboard shortcut 
+  - Mac: Cmd + Option + J
+  - Windows: Ctrl + Shift + J
+- From the menu: View > Developer > JavaScript Console
+
+## Firefox
+
+- Keyboard shortcut: 
+  - Mac: Cmd + Option + K
+  - Windows: Ctrl + Shift + J
+- From the menu: Menu Bar > More Tools > Web Developer Tools > Console tab
+
+## Safari
+ 
+Before opening the console you will need to enable it in Safari by clicking the Safari Menu > Settings > Advanced > and selecting the "Show features for web developers" checkbox. Once enabled, you can locate the console in the developer menu or open it using the keyboard shortcut:
+
+- Keyboard shortcut: Cmd + Option + C
+- From the menu: Develop Menu > Show JavaScript Console
+
+## Microsoft Edge 
+
+- Keyboard shortcut:
+  - Mac: Cmd + Option + J
+  - Windows: Ctrl + Shift + J 
+- From the menu: Right-click a webpage > Inspect > Console

From 3f515da8ce3339093d653082447564e2c7a1c67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Miko=C5=82ajczak?= <kacpermikolajczak10@gmail.com>
Date: Fri, 4 Oct 2024 13:50:24 +0200
Subject: [PATCH 47/70] add descriptions to memoize options

---
 src/libs/memoize/types.ts | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/libs/memoize/types.ts b/src/libs/memoize/types.ts
index 80a6b4c55507..9ee48c9dc790 100644
--- a/src/libs/memoize/types.ts
+++ b/src/libs/memoize/types.ts
@@ -16,21 +16,40 @@ type IsomorphicReturnType<Fn extends IsomorphicFn> = Fn extends Callable ? Retur
 type KeyComparator<Key> = (k1: Key, k2: Key) => boolean;
 
 type InternalOptions = {
+    /**
+     * Type of cache to use. Currently only `array` is supported.
+     */
     cache: 'array';
 };
 
 type Options<Fn extends IsomorphicFn, MaxArgs extends number, Key> = {
+    /**
+     * Maximum number of entries in the cache. If the cache exceeds this number, the oldest entries will be removed.
+     */
     maxSize: number;
+    /**
+     * Equality comparator to use for comparing keys in the cache. Can be either:
+     * - `deep` - default comparator that uses [DeepEqual](https://github.com/planttheidea/fast-equals?tab=readme-ov-file#deepequal)
+     * - `shallow` - comparator that uses [ShallowEqual](https://github.com/planttheidea/fast-equals?tab=readme-ov-file#shallowequal)
+     * - a custom comparator - a function that takes two keys and returns a boolean.
+     */
     equality: 'deep' | 'shallow' | KeyComparator<Key>;
+    /**
+     * If set to `true`, memoized function stats will be collected. It can be overridden by global `Memoize` config. See `MemoizeStats` for more information.
+     */
     monitor: boolean;
+    /**
+     * Maximum number of arguments to use for caching. If set, only the first `maxArgs` arguments will be used to generate the cache key.
+     */
     maxArgs?: MaxArgs;
+    /**
+     * Name of the monitoring entry. If not provided, the function name will be used.
+     */
     monitoringName?: string;
     /**
-     * Function to transform the arguments into a key, which is used to reference the result in the cache.
-     * When called with constructable (e.g. class, `new` keyword) functions, it won't get proper types for `truncatedArgs`
-     * Any viable fixes are welcome!
-     * @param truncatedArgs - Tuple of arguments passed to the memoized function (truncated to `maxArgs`). Does not work with constructable (see description).
-     * @returns - Key to use for caching
+     * Transforms arguments into a cache key. If set, `maxArgs` will be applied to arguments first.
+     * @param truncatedArgs Tuple of arguments passed to the memoized function (truncated to `maxArgs`). Does not work with constructable (see description).
+     * @returns Key to use for caching
      */
     transformKey?: (truncatedArgs: TakeFirst<IsomorphicParameters<Fn>, MaxArgs>) => Key;
 } & InternalOptions;

From 120bdc9948f753165b096b03c9c2cdb0d6563c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Miko=C5=82ajczak?= <kacpermikolajczak10@gmail.com>
Date: Fri, 4 Oct 2024 13:50:32 +0200
Subject: [PATCH 48/70] add descriptions to memoize stats

---
 src/libs/memoize/stats.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/libs/memoize/stats.ts b/src/libs/memoize/stats.ts
index 59d563100ec4..6020371154ee 100644
--- a/src/libs/memoize/stats.ts
+++ b/src/libs/memoize/stats.ts
@@ -13,14 +13,29 @@ function isMemoizeStatsEntry(entry: any): entry is MemoizeStatsEntry {
 }
 
 class MemoizeStats {
+    /**
+     * Number of calls to the memoized function. Both cache hits and misses are counted.
+     */
     private calls = 0;
 
+    /**
+     * Number of cache hits. This is the number of times the cache returned a value instead of calling the original function.
+     */
     private hits = 0;
 
+    /**
+     * Average time of cache retrieval. This is the time it takes to retrieve a value from the cache, without calling the original function.
+     */
     private avgCacheTime = 0;
 
+    /**
+     * Average time of original function execution. This is the time it takes to execute the original function when the cache does not have a value.
+     */
     private avgFnTime = 0;
 
+    /**
+     * Current cache size. This is the number of entries in the cache.
+     */
     private cacheSize = 0;
 
     isEnabled = false;

From 8fcb0d6346557c110f9bdae68d31b098d02e5230 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Fri, 4 Oct 2024 13:52:46 +0200
Subject: [PATCH 49/70] Revert "Add the workspace name to the title of the
 workspace chats"

---
 src/libs/ReportUtils.ts       | 12 +++---------
 src/libs/SidebarUtils.ts      |  2 +-
 src/pages/home/HeaderView.tsx | 14 +++-----------
 tests/unit/SidebarTest.ts     |  2 +-
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a50bdd7a10ba..8427f5d90b46 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3755,12 +3755,11 @@ function getReportName(
     parentReportActionParam?: OnyxInputOrEntry<ReportAction>,
     personalDetails?: Partial<PersonalDetailsList>,
     invoiceReceiverPolicy?: OnyxEntry<Policy>,
-    shouldIncludePolicyName = false,
 ): string {
     const reportID = report?.reportID;
     const cacheKey = getCacheKey(report);
 
-    if (reportID && !isUserCreatedPolicyRoom(report) && !isDefaultRoom(report)) {
+    if (reportID) {
         const reportNameFromCache = reportNameCache.get(cacheKey);
 
         if (reportNameFromCache?.reportName && reportNameFromCache.reportName === report?.reportName && reportNameFromCache.reportName !== CONST.REPORT.DEFAULT_REPORT_NAME) {
@@ -3874,11 +3873,6 @@ function getReportName(
         formattedName = getInvoicesChatName(report, invoiceReceiverPolicy);
     }
 
-    if (shouldIncludePolicyName && (isUserCreatedPolicyRoom(report) || isDefaultRoom(report))) {
-        const policyName = getPolicyName(report, true);
-        formattedName = policyName ? `${policyName} • ${report?.reportName}` : report?.reportName;
-    }
-
     if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
         formattedName += ` (${Localize.translateLocal('common.archived')})`;
     }
@@ -3935,8 +3929,8 @@ function getPayeeName(report: OnyxEntry<Report>): string | undefined {
 /**
  * Get either the policyName or domainName the chat is tied to
  */
-function getChatRoomSubtitle(report: OnyxEntry<Report>, isTitleIncludePolicyName = false): string | undefined {
-    if (isChatThread(report) || ((isUserCreatedPolicyRoom(report) || isDefaultRoom(report)) && isTitleIncludePolicyName)) {
+function getChatRoomSubtitle(report: OnyxEntry<Report>): string | undefined {
+    if (isChatThread(report)) {
         return '';
     }
     if (isSelfDM(report)) {
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 0496bc66fe5b..4bf74f3c5fc1 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -488,7 +488,7 @@ function getOptionData({
         result.phoneNumber = personalDetail?.phoneNumber ?? '';
     }
 
-    const reportName = ReportUtils.getReportName(report, policy, undefined, undefined, invoiceReceiverPolicy, true);
+    const reportName = ReportUtils.getReportName(report, policy, undefined, undefined, invoiceReceiverPolicy);
 
     result.text = reportName;
     result.subtitle = subtitle;
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 81ee426aa8dd..42483cc3d223 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -87,8 +87,8 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const isTaskReport = ReportUtils.isTaskReport(report);
     const reportHeaderData = !isTaskReport && !isChatThread && report?.parentReportID ? parentReport : report;
     // Use sorted display names for the title for group chats on native small screen widths
-    const title = ReportUtils.getReportName(reportHeaderData, policy, parentReportAction, personalDetails, invoiceReceiverPolicy, true);
-    const subtitle = ReportUtils.getChatRoomSubtitle(reportHeaderData, true);
+    const title = ReportUtils.getReportName(reportHeaderData, policy, parentReportAction, personalDetails, invoiceReceiverPolicy);
+    const subtitle = ReportUtils.getChatRoomSubtitle(reportHeaderData);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(reportHeaderData);
     const reportDescription = ReportUtils.getReportDescriptionText(report);
     const policyName = ReportUtils.getPolicyName(report, true);
@@ -120,15 +120,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     );
 
     const renderAdditionalText = () => {
-        if (
-            shouldShowSubtitle() ||
-            isPersonalExpenseChat ||
-            !policyName ||
-            !isEmptyObject(parentNavigationSubtitleData) ||
-            isSelfDM ||
-            ReportUtils.isUserCreatedPolicyRoom(report) ||
-            ReportUtils.isDefaultRoom(report)
-        ) {
+        if (shouldShowSubtitle() || isPersonalExpenseChat || !policyName || !isEmptyObject(parentNavigationSubtitleData) || isSelfDM) {
             return null;
         }
         return (
diff --git a/tests/unit/SidebarTest.ts b/tests/unit/SidebarTest.ts
index 443b719194b3..2c8d28c537c6 100644
--- a/tests/unit/SidebarTest.ts
+++ b/tests/unit/SidebarTest.ts
@@ -141,7 +141,7 @@ describe('Sidebar', () => {
                     .then(() => {
                         const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames');
                         const displayNames = screen.queryAllByLabelText(hintText);
-                        expect(displayNames.at(0)).toHaveTextContent('Vikings Policy • Report (archived)');
+                        expect(displayNames.at(0)).toHaveTextContent('Report (archived)');
 
                         const hintMessagePreviewText = Localize.translateLocal('accessibilityHints.lastChatMessagePreview');
                         const messagePreviewTexts = screen.queryAllByLabelText(hintMessagePreviewText);

From ec7a1f7877f234ce7ae6cf6460bbf81b82dcda4d Mon Sep 17 00:00:00 2001
From: Sonia Liapounova <sonia@expensify.com>
Date: Fri, 4 Oct 2024 13:53:56 +0200
Subject: [PATCH 50/70] Update General-product-troubleshooting.md

---
 .../settings/General-product-troubleshooting.md                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/expensify-classic/settings/General-product-troubleshooting.md b/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
index a314357391f1..6c594608498e 100644
--- a/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
+++ b/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
@@ -5,7 +5,7 @@ description: How to troubleshoot a website issue
 <!-- The lines above are required by Jekyll to process the .md file -->
 
 # Issues with a specific feature
-If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, pleasee reach out to Concierge via the app or by emailing us at concierge@expensify.com.
+If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, please reach out to Concierge via the app or by emailing us at concierge@expensify.com.
 
 # Troubleshooting local issues
 Is your webpage not loading? Try these steps:

From 4fb0c8e78fe536f01af9107cd39370a343c47eb0 Mon Sep 17 00:00:00 2001
From: Sonia Liapounova <sonia@expensify.com>
Date: Fri, 4 Oct 2024 13:54:31 +0200
Subject: [PATCH 51/70] Update General-product-troubleshooting.md

---
 .../new-expensify/settings/General-product-troubleshooting.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/settings/General-product-troubleshooting.md b/docs/articles/new-expensify/settings/General-product-troubleshooting.md
index a314357391f1..6c594608498e 100644
--- a/docs/articles/new-expensify/settings/General-product-troubleshooting.md
+++ b/docs/articles/new-expensify/settings/General-product-troubleshooting.md
@@ -5,7 +5,7 @@ description: How to troubleshoot a website issue
 <!-- The lines above are required by Jekyll to process the .md file -->
 
 # Issues with a specific feature
-If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, pleasee reach out to Concierge via the app or by emailing us at concierge@expensify.com.
+If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, please reach out to Concierge via the app or by emailing us at concierge@expensify.com.
 
 # Troubleshooting local issues
 Is your webpage not loading? Try these steps:

From 2d1f3baf8391779f2f585134002690d9709d413c Mon Sep 17 00:00:00 2001
From: Sonia Liapounova <sonia@expensify.com>
Date: Fri, 4 Oct 2024 13:54:52 +0200
Subject: [PATCH 52/70] Update General-product-troubleshooting.md

---
 .../new-expensify/settings/General-product-troubleshooting.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/settings/General-product-troubleshooting.md b/docs/articles/new-expensify/settings/General-product-troubleshooting.md
index 6c594608498e..57126628e04f 100644
--- a/docs/articles/new-expensify/settings/General-product-troubleshooting.md
+++ b/docs/articles/new-expensify/settings/General-product-troubleshooting.md
@@ -5,7 +5,7 @@ description: How to troubleshoot a website issue
 <!-- The lines above are required by Jekyll to process the .md file -->
 
 # Issues with a specific feature
-If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, please reach out to Concierge via the app or by emailing us at concierge@expensify.com.
+If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, please reach out to Concierge via in-product chat or by emailing us at concierge@expensify.com.
 
 # Troubleshooting local issues
 Is your webpage not loading? Try these steps:

From 96fb2ac14fa05fb6e0889b58d3b37f5dc54ede12 Mon Sep 17 00:00:00 2001
From: Sonia Liapounova <sonia@expensify.com>
Date: Fri, 4 Oct 2024 13:55:08 +0200
Subject: [PATCH 53/70] Update General-product-troubleshooting.md

---
 .../settings/General-product-troubleshooting.md                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/expensify-classic/settings/General-product-troubleshooting.md b/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
index 6c594608498e..57126628e04f 100644
--- a/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
+++ b/docs/articles/expensify-classic/settings/General-product-troubleshooting.md
@@ -5,7 +5,7 @@ description: How to troubleshoot a website issue
 <!-- The lines above are required by Jekyll to process the .md file -->
 
 # Issues with a specific feature
-If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, please reach out to Concierge via the app or by emailing us at concierge@expensify.com.
+If you're having issues with a specific feature, please reffer to the corresponding section of the help docs for detailed explinations of common errors and troubleshooting steps. If you cannot find an answer to your question, please reach out to Concierge via in-product chat or by emailing us at concierge@expensify.com.
 
 # Troubleshooting local issues
 Is your webpage not loading? Try these steps:

From 48e49f3a3fb9e5d602ddd9fe44a4023ead7b10f6 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:39:40 +0100
Subject: [PATCH 54/70] Fix: Saved search - Saved search list is not scrollable
 when there is a long list

---
 src/pages/Search/SearchPageBottomTab.tsx | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 38e4c5166884..c72462d1f66e 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -102,12 +102,12 @@ function SearchPageBottomTab() {
                             isCustomSearchQuery={shouldUseNarrowLayout && !SearchUtils.isCannedSearchQuery(queryJSON)}
                         />
                     </View>
-                    <Animated.View style={[styles.searchTopBarStyle, topBarAnimatedStyle]}>
-                        <SearchTypeMenu
-                            queryJSON={queryJSON}
-                            searchName={searchName}
-                        />
-                        {shouldUseNarrowLayout && (
+                    {shouldUseNarrowLayout ? (
+                        <Animated.View style={[styles.searchTopBarStyle, topBarAnimatedStyle]}>
+                            <SearchTypeMenu
+                                queryJSON={queryJSON}
+                                searchName={searchName}
+                            />
                             <SearchStatusBar
                                 type={queryJSON.type}
                                 status={queryJSON.status}
@@ -116,8 +116,13 @@ function SearchPageBottomTab() {
                                     topBarOffset.value = withTiming(variables.searchHeaderHeight, {duration: ANIMATION_DURATION_IN_MS});
                                 }}
                             />
-                        )}
-                    </Animated.View>
+                        </Animated.View>
+                    ) : (
+                        <SearchTypeMenu
+                            queryJSON={queryJSON}
+                            searchName={searchName}
+                        />
+                    )}
                 </>
             ) : (
                 <SearchSelectionModeHeader queryJSON={queryJSON} />

From 256a747852de4882a989ae012647ed9cfe0a0f62 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Fri, 4 Oct 2024 18:35:31 +0200
Subject: [PATCH 55/70] add beta for qbd

---
 src/CONST.ts                                  |  3 ++
 src/libs/AccountingUtils.ts                   |  2 ++
 src/libs/Permissions.ts                       |  5 ++++
 .../export/QuickbooksDesktopExportPage.tsx    | 30 +++++++++++--------
 src/types/onyx/Policy.ts                      |  3 ++
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 4f177d2294de..25ba86ee3e1a 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -480,6 +480,7 @@ const CONST = {
         NEW_DOT_COPILOT: 'newDotCopilot',
         WORKSPACE_RULES: 'workspaceRules',
         COMBINED_TRACK_SUBMIT: 'combinedTrackSubmit',
+        NEW_DOT_QBD: 'quickbooksDesktopOnNewDot',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -2300,12 +2301,14 @@ const CONST = {
                 XERO: 'xero',
                 NETSUITE: 'netsuite',
                 SAGE_INTACCT: 'intacct',
+                QBD: 'quickbooksDesktop',
             },
             ROUTE: {
                 QBO: 'quickbooks-online',
                 XERO: 'xero',
                 NETSUITE: 'netsuite',
                 SAGE_INTACCT: 'sage-intacct',
+                QBD: 'quickbooks-desktop',
             },
             NAME_USER_FRIENDLY: {
                 netsuite: 'NetSuite',
diff --git a/src/libs/AccountingUtils.ts b/src/libs/AccountingUtils.ts
index fe472752978a..7516048241d6 100644
--- a/src/libs/AccountingUtils.ts
+++ b/src/libs/AccountingUtils.ts
@@ -7,6 +7,7 @@ const ROUTE_NAME_MAPPING = {
     [CONST.POLICY.CONNECTIONS.ROUTE.XERO]: CONST.POLICY.CONNECTIONS.NAME.XERO,
     [CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT]: CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT,
     [CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE]: CONST.POLICY.CONNECTIONS.NAME.NETSUITE,
+    [CONST.POLICY.CONNECTIONS.ROUTE.QBD]: CONST.POLICY.CONNECTIONS.NAME.QBD,
 };
 
 const NAME_ROUTE_MAPPING = {
@@ -14,6 +15,7 @@ const NAME_ROUTE_MAPPING = {
     [CONST.POLICY.CONNECTIONS.NAME.XERO]: CONST.POLICY.CONNECTIONS.ROUTE.XERO,
     [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT,
     [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE,
+    [CONST.POLICY.CONNECTIONS.NAME.QBD]: CONST.POLICY.CONNECTIONS.ROUTE.QBD,
 };
 
 function getConnectionNameFromRouteParam(routeParam: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>) {
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 7f7e89ad3585..12f5d59a025d 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -50,6 +50,10 @@ function canUseCombinedTrackSubmit(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.COMBINED_TRACK_SUBMIT);
 }
 
+function canUseNewDotQBD(betas: OnyxEntry<Beta[]>): boolean {
+    return !!betas?.includes(CONST.BETAS.NEW_DOT_QBD) || canUseAllBetas(betas);
+}
+
 /**
  * New Search Router is under construction and for now should be displayed only in dev to allow developers to work on it.
  * We are not using BETA for this feature, as betas are heavier to cleanup,
@@ -81,4 +85,5 @@ export default {
     canUseWorkspaceRules,
     canUseCombinedTrackSubmit,
     canUseNewSearchRouter,
+    canUseNewDotQBD,
 };
diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
index ecb067495cb0..5a86dc9d5bce 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
@@ -5,6 +5,7 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
@@ -19,48 +20,49 @@ function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
     const styles = useThemeStyles();
     const policyID = policy?.id ?? '-1';
     const policyOwner = policy?.owner ?? '';
-    const qboConfig = policy?.connections?.quickbooksOnline?.config; // TODO: should be updated to use the new connections object
-    const errorFields = qboConfig?.errorFields;
+    const qbdConfig = policy?.connections?.quickbooksOnline?.config; // TODO: should be updated to use the new connections object
+    const errorFields = qbdConfig?.errorFields;
+    const {canUseNewDotQBD} = usePermissions();
 
     const shouldShowVendorMenuItems = useMemo(
-        () => qboConfig?.nonReimbursableExpensesExportDestination === CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL,
-        [qboConfig?.nonReimbursableExpensesExportDestination],
+        () => qbdConfig?.nonReimbursableExpensesExportDestination === CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL,
+        [qbdConfig?.nonReimbursableExpensesExportDestination],
     );
     const menuItems = [
         {
             description: translate('workspace.accounting.preferredExporter'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_PREFERRED_EXPORTER.getRoute(policyID)), // TODO: should be updated to use new routes
-            title: qboConfig?.export?.exporter ?? policyOwner,
+            title: qbdConfig?.export?.exporter ?? policyOwner,
             subscribedSettings: [CONST.QUICKBOOKS_CONFIG.EXPORT],
         },
         {
             description: translate('workspace.qbo.date'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_DATE_SELECT.getRoute(policyID)), // TODO: should be updated to use new routes
-            title: qboConfig?.exportDate ? translate(`workspace.qbo.exportDate.values.${qboConfig?.exportDate}.label`) : undefined,
+            title: qbdConfig?.exportDate ? translate(`workspace.qbo.exportDate.values.${qbdConfig?.exportDate}.label`) : undefined,
             subscribedSettings: [CONST.QUICKBOOKS_CONFIG.EXPORT_DATE],
         },
         {
             description: translate('workspace.accounting.exportOutOfPocket'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES.getRoute(policyID)),
-            title: qboConfig?.reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${qboConfig?.reimbursableExpensesExportDestination}`) : undefined, // TODO: should be updated to use new routes
+            title: qbdConfig?.reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${qbdConfig?.reimbursableExpensesExportDestination}`) : undefined, // TODO: should be updated to use new routes
             subscribedSettings: [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT],
         },
         {
             description: translate('workspace.qbo.exportInvoices'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECT.getRoute(policyID)), // TODO: should be updated to use new routes
-            title: qboConfig?.receivableAccount?.name,
+            title: qbdConfig?.receivableAccount?.name,
             subscribedSettings: [CONST.QUICKBOOKS_CONFIG.RECEIVABLE_ACCOUNT],
         },
         {
             description: translate('workspace.accounting.exportCompanyCard'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID)), // TODO: should be updated to use new routes
-            brickRoadIndicator: qboConfig?.errorFields?.exportCompanyCard ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
-            title: qboConfig?.nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${qboConfig?.nonReimbursableExpensesExportDestination}`) : undefined,
+            brickRoadIndicator: qbdConfig?.errorFields?.exportCompanyCard ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: qbdConfig?.nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${qbdConfig?.nonReimbursableExpensesExportDestination}`) : undefined,
             subscribedSettings: [
                 CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION,
                 CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSE_ACCOUNT,
                 ...(shouldShowVendorMenuItems ? [CONST.QUICKBOOKS_CONFIG.AUTO_CREATE_VENDOR] : []),
-                ...(shouldShowVendorMenuItems && qboConfig?.autoCreateVendor ? [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_BILL_DEFAULT_VENDOR] : []),
+                ...(shouldShowVendorMenuItems && qbdConfig?.autoCreateVendor ? [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_BILL_DEFAULT_VENDOR] : []),
             ],
         },
         {
@@ -71,12 +73,14 @@ function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
         },
     ];
 
+    const accessVariants = canUseNewDotQBD ? [] : [CONST.POLICY.ACCESS_VARIANTS.ADMIN];
+
     return (
         <ConnectionLayout
             displayName={QuickbooksDesktopExportPage.displayName}
             headerTitle="workspace.accounting.export"
             title="workspace.qbd.exportDescription"
-            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            accessVariants={accessVariants}
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={styles.pb2}
@@ -87,7 +91,7 @@ function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
             {menuItems.map((menuItem) => (
                 <OfflineWithFeedback
                     key={menuItem.description}
-                    pendingAction={PolicyUtils.settingsPendingAction(menuItem?.subscribedSettings, qboConfig?.pendingFields)}
+                    pendingAction={PolicyUtils.settingsPendingAction(menuItem?.subscribedSettings, qbdConfig?.pendingFields)}
                 >
                     <MenuItemWithTopDescription
                         title={menuItem.title}
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 693f49f35eb0..71a845e5cab7 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -1230,6 +1230,9 @@ type Connections = {
 
     /** Sage Intacct integration connection */
     [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: Connection<SageIntacctConnectionData, SageIntacctConnectionsConfig>;
+
+    /** QuickBooks integration connection */
+    [CONST.POLICY.CONNECTIONS.NAME.QBD]: Connection<QBOConnectionData, QBOConnectionConfig>;
 };
 
 /** All integration connections, including unsupported ones */

From 5e484340deae19d14a4a6a98f4c83f51bc26b32b Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <104348397+ishpaul777@users.noreply.github.com>
Date: Fri, 4 Oct 2024 22:08:07 +0530
Subject: [PATCH 56/70] Revert "Fix task title is overflown and align the
 checkbox and arrow correctly"

---
 .../ReportActionItem/TaskPreview.tsx          | 32 +++++++------------
 src/pages/home/report/ReportActionItem.tsx    |  1 -
 src/styles/index.ts                           |  5 +++
 src/styles/utils/index.ts                     | 11 -------
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index 95528286d1e1..a2ea7487df02 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -1,7 +1,6 @@
 import {Str} from 'expensify-common';
 import React from 'react';
 import {View} from 'react-native';
-import type {StyleProp, ViewStyle} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Avatar from '@components/Avatar';
@@ -12,7 +11,6 @@ import {usePersonalDetails} from '@components/OnyxProvider';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import RenderHTML from '@components/RenderHTML';
 import {showContextMenuForReport} from '@components/ShowContextMenuContext';
-import Text from '@components/Text';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
@@ -55,12 +53,9 @@ type TaskPreviewProps = WithCurrentUserPersonalDetailsProps & {
 
     /** Callback for updating context menu active state, used for showing context menu */
     checkIfContextMenuActive: () => void;
-
-    /** Style for the task preview container */
-    style: StyleProp<ViewStyle>;
 };
 
-function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, checkIfContextMenuActive, currentUserPersonalDetails, isHovered = false, style}: TaskPreviewProps) {
+function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, checkIfContextMenuActive, currentUserPersonalDetails, isHovered = false}: TaskPreviewProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
@@ -75,33 +70,29 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
         : action?.childStateNum === CONST.REPORT.STATE_NUM.APPROVED && action?.childStatusNum === CONST.REPORT.STATUS_NUM.APPROVED;
     const taskTitle = Str.htmlEncode(TaskUtils.getTaskTitle(taskReportID, action?.childReportName ?? ''));
     const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport) ?? action?.childManagerAccountID ?? -1;
-    const hasAssignee = taskAssigneeAccountID > 0;
     const personalDetails = usePersonalDetails();
     const avatar = personalDetails?.[taskAssigneeAccountID]?.avatar ?? Expensicons.FallbackAvatar;
-    const avatarSize = CONST.AVATAR_SIZE.SMALL;
+    const htmlForTaskPreview = `<comment>${taskTitle}</comment>`;
     const isDeletedParentAction = ReportUtils.isCanceledTaskReport(taskReport, action);
-    const iconWrapperStyle = StyleUtils.getTaskPreviewIconWrapper(hasAssignee ? avatarSize : undefined);
-    const titleStyle = StyleUtils.getTaskPreviewTitleStyle(iconWrapperStyle.height, isTaskCompleted);
-
     const shouldShowGreenDotIndicator = ReportUtils.isOpenTaskReport(taskReport, action) && ReportUtils.isReportManager(taskReport);
     if (isDeletedParentAction) {
         return <RenderHTML html={`<comment>${translate('parentReportAction.deletedTask')}</comment>`} />;
     }
 
     return (
-        <View style={[styles.chatItemMessage, !hasAssignee && styles.mv1]}>
+        <View style={[styles.chatItemMessage]}>
             <PressableWithoutFeedback
                 onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(taskReportID))}
                 onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
                 onPressOut={() => ControlSelection.unblock()}
                 onLongPress={(event) => showContextMenuForReport(event, contextMenuAnchor, chatReportID, action, checkIfContextMenuActive)}
                 shouldUseHapticsOnLongPress
-                style={[styles.flexRow, styles.justifyContentBetween, style]}
+                style={[styles.flexRow, styles.justifyContentBetween]}
                 role={CONST.ROLE.BUTTON}
                 accessibilityLabel={translate('task.task')}
             >
-                <View style={[styles.flex1, styles.flexRow, styles.alignItemsStart, styles.mr2]}>
-                    <View style={iconWrapperStyle}>
+                <View style={[styles.flex1, styles.flexRow, styles.alignItemsStart, styles.mt1]}>
+                    <View style={[styles.taskCheckboxWrapper, styles.alignSelfCenter]}>
                         <Checkbox
                             style={[styles.mr2]}
                             isChecked={isTaskCompleted}
@@ -116,16 +107,18 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                             accessibilityLabel={translate('task.task')}
                         />
                     </View>
-                    {hasAssignee && (
+                    {taskAssigneeAccountID > 0 && (
                         <Avatar
-                            containerStyles={[styles.mr2, isTaskCompleted ? styles.opacitySemiTransparent : undefined]}
+                            containerStyles={[styles.mr2, styles.alignSelfCenter, isTaskCompleted ? styles.opacitySemiTransparent : undefined]}
                             source={avatar}
-                            size={avatarSize}
+                            size={CONST.AVATAR_SIZE.SMALL}
                             avatarID={taskAssigneeAccountID}
                             type={CONST.ICON_TYPE_AVATAR}
                         />
                     )}
-                    <Text style={titleStyle}>{taskTitle}</Text>
+                    <View style={[styles.alignSelfCenter]}>
+                        <RenderHTML html={isTaskCompleted ? `<completed-task>${htmlForTaskPreview}</completed-task>` : htmlForTaskPreview} />
+                    </View>
                 </View>
                 {shouldShowGreenDotIndicator && (
                     <View style={styles.ml2}>
@@ -138,7 +131,6 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                 <Icon
                     src={Expensicons.ArrowRight}
                     fill={StyleUtils.getIconFillColor(getButtonState(isHovered))}
-                    additionalStyles={iconWrapperStyle}
                 />
             </PressableWithoutFeedback>
         </View>
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 5b826b94aa77..d9701219418e 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -572,7 +572,6 @@ function ReportActionItem({
             children = (
                 <ShowContextMenuContext.Provider value={contextValue}>
                     <TaskPreview
-                        style={displayAsGroup ? [] : [styles.mt1]}
                         taskReportID={ReportActionsUtils.isAddCommentAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.taskReportID?.toString() ?? '-1' : '-1'}
                         chatReportID={reportID}
                         action={action}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 6db06748933e..8220389867d9 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -4151,6 +4151,11 @@ const styles = (theme: ThemeColors) =>
             width: 1,
         },
 
+        taskCheckboxWrapper: {
+            height: variables.fontSizeNormalHeight,
+            ...flex.justifyContentCenter,
+        },
+
         taskTitleMenuItem: {
             ...writingDirection.ltr,
             ...headlineFont,
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 9eeced6de5a6..c7665fc1e3dd 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1667,17 +1667,6 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
         alignItems: 'center',
         justifyContent: 'center',
     }),
-
-    getTaskPreviewIconWrapper: (avatarSize?: AvatarSizeName) => ({
-        height: avatarSize ? getAvatarSize(avatarSize) : variables.fontSizeNormalHeight,
-        ...styles.justifyContentCenter,
-    }),
-
-    getTaskPreviewTitleStyle: (iconHeight: number, isTaskCompleted: boolean): StyleProp<TextStyle> => [
-        styles.flex1,
-        isTaskCompleted ? [styles.textSupporting, styles.textLineThrough] : [],
-        {marginTop: (iconHeight - variables.fontSizeNormalHeight) / 2},
-    ],
 });
 
 type StyleUtilsType = ReturnType<typeof createStyleUtils>;

From 575e904e7b50272e68fe19dc547d8e46a54bad21 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 4 Oct 2024 16:55:12 +0000
Subject: [PATCH 57/70] Update version to 9.0.44-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 3834cf464243..cbf2f602d249 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004408
-        versionName "9.0.44-8"
+        versionCode 1009004409
+        versionName "9.0.44-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 51caecb7c81a..39fad1ad9696 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.8</string>
+	<string>9.0.44.9</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index c2ee6978f322..8c55df2af295 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.44.8</string>
+	<string>9.0.44.9</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 1f812f0eff46..222efefed74d 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.44</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.8</string>
+	<string>9.0.44.9</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index cf9978bae510..683242a636cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-8",
+  "version": "9.0.44-9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.44-8",
+      "version": "9.0.44-9",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index baf05e92111b..25a31d8107b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-8",
+  "version": "9.0.44-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 896bc78eb90272b7160cba98871a7630c400f68c Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 4 Oct 2024 17:24:36 +0000
Subject: [PATCH 58/70] Update version to 9.0.44-10

---
 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 cbf2f602d249..4466f8558024 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004409
-        versionName "9.0.44-9"
+        versionCode 1009004410
+        versionName "9.0.44-10"
         // 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 39fad1ad9696..0a05e6af082f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.9</string>
+	<string>9.0.44.10</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 8c55df2af295..327dbf1bcc7e 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.44.9</string>
+	<string>9.0.44.10</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 222efefed74d..94a98eb26032 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.44</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.9</string>
+	<string>9.0.44.10</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 683242a636cb..1a02390f6c7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-9",
+  "version": "9.0.44-10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.44-9",
+      "version": "9.0.44-10",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 25a31d8107b3..f28c9e10740e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-9",
+  "version": "9.0.44-10",
   "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 c40e883031be55fddb2e3d3648ed8658e3dd0508 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Fri, 4 Oct 2024 11:47:09 -0700
Subject: [PATCH 59/70] Revert "fix: migrate withFullTransactionOrNotFound to
 useOnyx"

---
 .../step/withFullTransactionOrNotFound.tsx    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
index 0ddddf7ff878..491c37c9a402 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
@@ -2,8 +2,8 @@ import type {RouteProp} from '@react-navigation/native';
 import {useIsFocused} from '@react-navigation/native';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
 import React, {forwardRef} from 'react';
-import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import * as IOUUtils from '@libs/IOUUtils';
@@ -38,25 +38,14 @@ type MoneyRequestRouteName =
     | typeof SCREENS.MONEY_REQUEST.STEP_SEND_FROM
     | typeof SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO;
 
-type Route<TRouteName extends MoneyRequestRouteName> = RouteProp<MoneyRequestNavigatorParamList, TRouteName>;
+type Route<T extends MoneyRequestRouteName> = RouteProp<MoneyRequestNavigatorParamList, T>;
 
-type WithFullTransactionOrNotFoundProps<TRouteName extends MoneyRequestRouteName> = WithFullTransactionOrNotFoundOnyxProps & {
-    route: Route<TRouteName>;
-};
+type WithFullTransactionOrNotFoundProps<T extends MoneyRequestRouteName> = WithFullTransactionOrNotFoundOnyxProps & {route: Route<T>};
 
-export default function <TProps extends WithFullTransactionOrNotFoundProps<MoneyRequestRouteName>, TRef>(
-    WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>,
-): React.ComponentType<Omit<TProps, keyof WithFullTransactionOrNotFoundOnyxProps> & RefAttributes<TRef>> {
+export default function <TProps extends WithFullTransactionOrNotFoundProps<MoneyRequestRouteName>, TRef>(WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>) {
     // eslint-disable-next-line rulesdir/no-negated-variables
-    function WithFullTransactionOrNotFound(props: Omit<TProps, keyof WithFullTransactionOrNotFoundOnyxProps>, ref: ForwardedRef<TRef>) {
-        const {route} = props;
-        const transactionID = route.params.transactionID ?? -1;
-        const userAction = 'action' in route.params && route.params.action ? route.params.action : CONST.IOU.ACTION.CREATE;
-
-        const shouldUseTransactionDraft = IOUUtils.shouldUseTransactionDraft(userAction);
-
-        const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
-        const [transactionDraft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+    function WithFullTransactionOrNotFound(props: TProps, ref: ForwardedRef<TRef>) {
+        const transactionID = props.transaction?.transactionID;
 
         const isFocused = useIsFocused();
 
@@ -70,8 +59,7 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
         return (
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
-                {...(props as TProps)}
-                transaction={shouldUseTransactionDraft ? transactionDraft : transaction}
+                {...props}
                 ref={ref}
             />
         );
@@ -79,7 +67,19 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
 
     WithFullTransactionOrNotFound.displayName = `withFullTransactionOrNotFound(${getComponentDisplayName(WrappedComponent)})`;
 
-    return forwardRef(WithFullTransactionOrNotFound);
+    return withOnyx<TProps & RefAttributes<TRef>, WithFullTransactionOrNotFoundOnyxProps>({
+        transaction: {
+            key: ({route}) => {
+                const transactionID = route.params.transactionID ?? -1;
+                const userAction = 'action' in route.params && route.params.action ? route.params.action : CONST.IOU.ACTION.CREATE;
+
+                if (IOUUtils.shouldUseTransactionDraft(userAction)) {
+                    return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`;
+                }
+                return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+            },
+        },
+    })(forwardRef(WithFullTransactionOrNotFound));
 }
 
 export type {WithFullTransactionOrNotFoundProps};

From abe4f3a5bf88f2b9f68afed13e13dd0cd7f95fe8 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Fri, 4 Oct 2024 12:05:12 -0700
Subject: [PATCH 60/70] disable deprecation warning

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

diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
index 491c37c9a402..66736dc80b52 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
@@ -66,7 +66,7 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
     }
 
     WithFullTransactionOrNotFound.displayName = `withFullTransactionOrNotFound(${getComponentDisplayName(WrappedComponent)})`;
-
+    // eslint-disable-next-line deprecation/deprecation
     return withOnyx<TProps & RefAttributes<TRef>, WithFullTransactionOrNotFoundOnyxProps>({
         transaction: {
             key: ({route}) => {

From 58fc7b2b8a22351a5478ed2698f6469994794892 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Fri, 4 Oct 2024 12:09:38 -0700
Subject: [PATCH 61/70] fix import warning

---
 src/components/ReportActionItem/TaskPreview.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index eb780311f087..187dfbafa5c4 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -7,6 +7,7 @@ import Avatar from '@components/Avatar';
 import Checkbox from '@components/Checkbox';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
+import iconWrapperStyle from '@components/Icon/IconWrapperStyles';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import RenderHTML from '@components/RenderHTML';

From 89a3b6158c07f4636d85498e85b92192b3ea72ba Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Fri, 4 Oct 2024 12:35:11 -0700
Subject: [PATCH 62/70] Revert "[No QA] Callable buildIOS workflow"

---
 .github/workflows/buildAndroid.yml |   1 +
 .github/workflows/buildIOS.yml     | 155 --------------------------
 .github/workflows/deploy.yml       | 170 ++++++++++++++++-------------
 .github/workflows/testBuild.yml    | 114 +++++++++++++------
 fastlane/Fastfile                  |  10 +-
 5 files changed, 179 insertions(+), 271 deletions(-)
 delete mode 100644 .github/workflows/buildIOS.yml

diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
index 69bbfa380234..403a40214b40 100644
--- a/.github/workflows/buildAndroid.yml
+++ b/.github/workflows/buildAndroid.yml
@@ -41,6 +41,7 @@ on:
         description: Git ref to checkout and build
         required: true
         type: string
+
       pull_request_number:
         description: The pull request number associated with this build, if relevant.
         type: number
diff --git a/.github/workflows/buildIOS.yml b/.github/workflows/buildIOS.yml
deleted file mode 100644
index 2386d01da793..000000000000
--- a/.github/workflows/buildIOS.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-name: Build iOS app
-
-on:
-  workflow_call:
-    inputs:
-      type:
-        description: 'What type of build to run. Must be one of ["release", "adhoc"]'
-        type: string
-        required: true
-      ref:
-        description: Git ref to checkout and build
-        type: string
-        required: true
-      pull_request_number:
-        description: The pull request number associated with this build, if relevant.
-        type: string
-        required: false
-    outputs:
-      IPA_FILE_NAME:
-        value: ${{ jobs.build.outputs.IPA_FILE_NAME }}
-      DSYM_FILE_NAME:
-        value: ${{ jobs.build.outputs.DSYM_FILE_NAME }}
-
-  workflow_dispatch:
-    inputs:
-      type:
-        description: What type of build do you want to run?
-        required: true
-        type: choice
-        options:
-          - release
-          - adhoc
-      ref:
-        description: Git ref to checkout and build
-        required: true
-        type: string
-      pull_request_number:
-        description: The pull request number associated with this build, if relevant.
-        type: number
-        required: false
-
-jobs:
-  build:
-    name: Build iOS app
-    runs-on: macos-13-xlarge
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.0.app/Contents/Developer
-    outputs:
-      IPA_FILE_NAME: ${{ steps.build.outputs.IPA_FILE_NAME }}
-      DSYM_FILE_NAME: ${{ steps.build.outputs.DSYM_FILE_NAME }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
-
-      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
-        if: ${{ inputs.type == 'adhoc' }}
-        run: |
-          cp .env.staging .env.adhoc
-          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
-          echo "PULL_REQUEST_NUMBER=${{ inputs.pull_request_number }}" >> .env.adhoc
-
-      - name: Configure MapBox SDK
-        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
-
-      - name: Setup Node
-        id: setup-node
-        uses: ./.github/actions/composite/setupNode
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.190.0
-        with:
-          bundler-cache: true
-
-      - name: Cache Pod dependencies
-        uses: actions/cache@v4
-        id: pods-cache
-        with:
-          path: ios/Pods
-          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }}
-
-      - name: Compare Podfile.lock and Manifest.lock
-        id: compare-podfile-and-manifest
-        run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('ios/Podfile.lock') == hashFiles('ios/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
-
-      - name: Install cocoapods
-        uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
-        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
-        with:
-          timeout_minutes: 10
-          max_attempts: 5
-          command: scripts/pod-install.sh
-
-      - name: Decrypt provisioning profiles
-        run: |
-          cd ios
-          provisioningProfile=''
-          if [ '${{ inputs.type }}' == 'release' ]; then
-            provisioningProfile='NewApp_AppStore'
-          else
-            provisioningProfile='NewApp_AdHoc'
-          fi
-          echo "Using provisioning profile: $provisioningProfile"
-          gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output "$provisioningProfile.mobileprovision" "$provisioningProfile.mobileprovision.gpg"
-          gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output "${provisioningProfile}_Notification_Service.mobileprovision" "${provisioningProfile}_Notification_Service.mobileprovision.gpg"
-        env:
-          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
-
-      - name: Decrypt code signing certificate
-        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output Certificates.p12 Certificates.p12.gpg
-        env:
-          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
-
-      - name: Build iOS ${{ inputs.type }} app
-        id: build
-        run: |
-          lane=''
-          if [ '${{ inputs.type }}' == 'release' ]; then
-            lane='build'
-          else
-            lane='build_adhoc'
-          fi
-
-          bundle exec fastlane ios "$lane"
-
-          # Reload environment variables from GITHUB_ENV
-          # shellcheck disable=SC1090
-          source "$GITHUB_ENV"
-
-          {
-            # ipaPath and dsymPath are environment variables set within the Fastfile
-            echo "IPA_PATH=$ipaPath"
-            echo "IPA_FILE_NAME=$(basename "$ipaPath")"
-            echo "DSYM_PATH=$dsymPath"
-            echo "DSYM_FILE_NAME=$(basename "$dsymPath")"
-          } >> "$GITHUB_OUTPUT"
-
-      - name: Upload iOS build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-artifact-ipa
-          path: ${{ steps.build.outputs.IPA_PATH }}
-
-      - name: Upload iOS debug symbols artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-artifact-dsym
-          path: ${{ steps.build.outputs.DSYM_PATH }}
-
-      - name: Upload iOS sourcemaps
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-artifact-sourcemaps
-          path: ./main.jsbundle.map
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2053ce44aadb..555e7650193c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -203,73 +203,61 @@ jobs:
           name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'desktop-build-artifact' || 'desktop-staging-build-artifact' }}
           path: ./desktop-build/NewExpensify.dmg
 
-  buildIOS:
-    name: Build iOS app
-    uses: ./.github/workflows/buildIOS.yml
-    if: ${{ github.ref == 'refs/heads/staging' }}
+  iOS:
+    name: Build and deploy iOS
     needs: prep
-    secrets: inherit
-    with:
-      type: release
-      ref: staging
-
-  uploadIOS:
-    name: Upload iOS App to TestFlight
-    needs: buildIOS
-    runs-on: ubuntu-latest
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_15.2.0.app/Contents/Developer
+    runs-on: macos-13-xlarge
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Configure MapBox SDK
+        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+
+      - name: Setup Node
+        id: setup-node
+        uses: ./.github/actions/composite/setupNode
+
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1.190.0
         with:
           bundler-cache: true
 
-      - name: Decrypt App Store Connect API key
-        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output ios-fastlane-json-key.json ios-fastlane-json-key.json.gpg
-        env:
-          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
-
-      - name: Download iOS build artifacts
-        uses: actions/download-artifact@v4
+      - name: Cache Pod dependencies
+        uses: actions/cache@v4
+        id: pods-cache
         with:
-          path: /tmp/artifacts
-          pattern: ios-artifact-*
-          merge-multiple: true
+          path: ios/Pods
+          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }}
 
-      - name: Log downloaded artifact paths
-        run: ls -R /tmp/artifacts
+      - name: Compare Podfile.lock and Manifest.lock
+        id: compare-podfile-and-manifest
+        run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('ios/Podfile.lock') == hashFiles('ios/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
 
-      - name: Upload iOS app to TestFlight
-        run: bundle exec fastlane ios upload_testflight
-        env:
-          APPLE_CONTACT_EMAIL: ${{ secrets.APPLE_CONTACT_EMAIL }}
-          APPLE_CONTACT_PHONE: ${{ secrets.APPLE_CONTACT_PHONE }}
-          APPLE_DEMO_EMAIL: ${{ secrets.APPLE_DEMO_EMAIL }}
-          APPLE_DEMO_PASSWORD: ${{ secrets.APPLE_DEMO_PASSWORD }}
-          ipaPath: /tmp/artifacts/${{ needs.buildIOS.outputs.IPA_FILE_NAME }}
-          dsymPath: /tmp/artifacts/${{ needs.buildIOS.outputs.DSYM_FILE_NAME }}
+      - name: Install cocoapods
+        uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
+        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
+        with:
+          timeout_minutes: 10
+          max_attempts: 5
+          command: scripts/pod-install.sh
 
-      - name: Upload iOS build to Browser Stack
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@/tmp/artifacts/${{ needs.buildIOS.outputs.IPA_FILE_NAME }}"
+      - name: Decrypt AppStore profile
+        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output NewApp_AppStore.mobileprovision NewApp_AppStore.mobileprovision.gpg
         env:
-          BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
+          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
-  submitIOS:
-    name: Submit iOS app for Apple review
-    needs: prep
-    if: ${{ github.ref == 'refs/heads/production' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - name: Decrypt AppStore Notification Service profile
+        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output NewApp_AppStore_Notification_Service.mobileprovision NewApp_AppStore_Notification_Service.mobileprovision.gpg
+        env:
+          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.190.0
-        with:
-          bundler-cache: true
+      - name: Decrypt certificate
+        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output Certificates.p12 Certificates.p12.gpg
+        env:
+          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
       - name: Decrypt App Store Connect API key
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output ios-fastlane-json-key.json ios-fastlane-json-key.json.gpg
@@ -280,13 +268,47 @@ jobs:
         id: getIOSVersion
         run: echo "IOS_VERSION=$(echo '${{ needs.prep.outputs.APP_VERSION }}' | tr '-' '.')" >> "$GITHUB_OUTPUT"
 
+      - name: Build iOS release app
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: bundle exec fastlane ios build
+
+      - name: Upload release build to TestFlight
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: bundle exec fastlane ios upload_testflight
+        env:
+          APPLE_CONTACT_EMAIL: ${{ secrets.APPLE_CONTACT_EMAIL }}
+          APPLE_CONTACT_PHONE: ${{ secrets.APPLE_CONTACT_PHONE }}
+          APPLE_DEMO_EMAIL: ${{ secrets.APPLE_DEMO_EMAIL }}
+          APPLE_DEMO_PASSWORD: ${{ secrets.APPLE_DEMO_PASSWORD }}
+
       - name: Submit build for App Store review
+        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane ios submit_for_review
         env:
           VERSION: ${{ steps.getIOSVersion.outputs.IOS_VERSION }}
 
+      - name: Upload iOS build to Browser Stack
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@/Users/runner/work/App/App/New Expensify.ipa"
+        env:
+          BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
+
+      - name: Upload iOS sourcemaps artifact
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-sourcemaps-artifact
+          path: ./main.jsbundle.map
+
+      - name: Upload iOS build artifact
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-build-artifact
+          path: /Users/runner/work/App/App/New\ Expensify.ipa
+
       - name: Warn deployers if iOS production deploy failed
-        if: ${{ failure() }}
+        if: ${{ failure() && fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: 8398a7/action-slack@v3
         with:
           status: custom
@@ -389,7 +411,7 @@ jobs:
     name: Post a Slack message when any platform fails to build or deploy
     runs-on: ubuntu-latest
     if: ${{ failure() }}
-    needs: [buildAndroid, uploadAndroid, submitAndroid, desktop, buildIOS, uploadIOS, submitIOS, web]
+    needs: [buildAndroid, uploadAndroid, submitAndroid, desktop, iOS, web]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -415,7 +437,7 @@ jobs:
     outputs:
       IS_AT_LEAST_ONE_PLATFORM_DEPLOYED: ${{ steps.checkDeploymentSuccessOnAtLeastOnePlatform.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED }}
       IS_ALL_PLATFORMS_DEPLOYED: ${{ steps.checkDeploymentSuccessOnAllPlatforms.outputs.IS_ALL_PLATFORMS_DEPLOYED }}
-    needs: [buildAndroid, uploadAndroid, submitAndroid, desktop, buildIOS, uploadIOS, submitIOS, web]
+    needs: [buildAndroid, uploadAndroid, submitAndroid, desktop, iOS, web]
     if: ${{ always() }}
     steps:
       - name: Check deployment success on at least one platform
@@ -423,19 +445,18 @@ jobs:
         run: |
           isAtLeastOnePlatformDeployed="false"
           if [ ${{ github.ref }} == 'refs/heads/production' ]; then
-            if [ '${{ needs.submitAndroid.result }}' == 'success' ] || \
-               [ '${{ needs.submitIOS.result }}' == 'success' ]; then
+            if [ "${{ needs.submitAndroid.result }}" == "success" ]; then
               isAtLeastOnePlatformDeployed="true"
             fi
           else
-            if [ '${{ needs.uploadAndroid.result }}' == 'success' ] || \
-               [ '${{ needs.uploadIOS.result }}' == 'success' ]; then
+            if [ "${{ needs.uploadAndroid.result }}" == "success" ]; then
               isAtLeastOnePlatformDeployed="true"
             fi
           fi
-
-          if [ '${{ needs.desktop.result }}' == 'success' ] || \
-             [ '${{ needs.web.result }}' == 'success' ]; then
+          
+          if [ "${{ needs.iOS.result }}" == "success" ] || \
+            [ "${{ needs.desktop.result }}" == "success" ] || \
+            [ "${{ needs.web.result }}" == "success" ]; then
             isAtLeastOnePlatformDeployed="true"
           fi
           echo "IS_AT_LEAST_ONE_PLATFORM_DEPLOYED=$isAtLeastOnePlatformDeployed" >> "$GITHUB_OUTPUT"
@@ -444,20 +465,19 @@ jobs:
       - name: Check deployment success on all platforms
         id: checkDeploymentSuccessOnAllPlatforms
         run: |
-          isAllPlatformsDeployed='false'
-          if [ '${{ needs.desktop.result }}' == 'success' ] && \
-             [ '${{ needs.web.result }}' == 'success' ]; then
+          isAllPlatformsDeployed="false"
+          if [ "${{ needs.iOS.result }}" == "success" ] && \
+            [ "${{ needs.desktop.result }}" == "success" ] && \
+            [ "${{ needs.web.result }}" == "success" ]; then
             isAllPlatformsDeployed="true"
           fi
 
           if [ ${{ github.ref }} == 'refs/heads/production' ]; then
-            if [ '${{ needs.submitAndroid.result }}' != 'success' ] || \
-               [ '${{ needs.submitIOS.result }}' != 'success' ]; then
+            if [ "${{ needs.submitAndroid.result }}" != "success" ]; then
               isAllPlatformsDeployed="false"
             fi
           else
-            if [ '${{ needs.uploadAndroid.result }}' != 'success' ] || \
-               [ '${{ needs.uploadIOS.result }}' != 'success' ]; then
+            if [ "${{ needs.uploadAndroid.result }}" != "success" ]; then
               isAllPlatformsDeployed="false"
             fi
           fi
@@ -468,7 +488,7 @@ jobs:
   createPrerelease:
     runs-on: ubuntu-latest
     if: ${{ always() && github.ref == 'refs/heads/staging' && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
-    needs: [prep, checkDeploymentSuccess, buildAndroid, buildIOS]
+    needs: [prep, checkDeploymentSuccess]
     steps:
       - name: Download all workflow run artifacts
         uses: actions/download-artifact@v4
@@ -495,12 +515,12 @@ jobs:
         continue-on-error: true
         run: |
           gh release upload ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }} --clobber \
-            ./android-artifact-sourcemaps/index.android.bundle.map#android-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
-            ./android-artifact-aab/${{ needs.buildAndroid.outputs.AAB_FILE_NAME }} \
+            ./android-sourcemaps-artifact/index.android.bundle.map#android-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
+            ./android-build-artifact/app-production-release.aab \
             ./desktop-staging-sourcemaps-artifact/desktop-staging-merged-source-map.js.map#desktop-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
             ./desktop-staging-build-artifact/NewExpensify.dmg#NewExpensifyStaging.dmg \
-            ./ios-artifact-sourcemaps/main.jsbundle.map#ios-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
-            ./ios-artifact-ipa/${{ needs.buildIOS.outputs.IPA_FILE_NAME }} \
+            ./ios-sourcemaps-artifact/main.jsbundle.map#ios-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
+            ./ios-build-artifact/New\ Expensify.ipa \
             ./web-staging-sourcemaps-artifact/web-staging-merged-source-map.js.map#web-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \
             ./web-staging-build-tar-gz-artifact/webBuild.tar.gz#stagingWebBuild.tar.gz \
             ./web-staging-build-zip-artifact/webBuild.zip#stagingWebBuild.zip
@@ -581,7 +601,7 @@ jobs:
     name: Post a Slack message when all platforms deploy successfully
     runs-on: ubuntu-latest
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_ALL_PLATFORMS_DEPLOYED) }}
-    needs: [prep, buildAndroid, uploadAndroid, submitAndroid, desktop, buildIOS, uploadIOS, submitIOS, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
+    needs: [prep, buildAndroid, uploadAndroid, submitAndroid, desktop, iOS, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
     steps:
       - name: 'Announces the deploy in the #announce Slack room'
         uses: 8398a7/action-slack@v3
@@ -635,11 +655,11 @@ jobs:
   postGithubComments:
     uses: ./.github/workflows/postDeployComments.yml
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
-    needs: [prep, buildAndroid, uploadAndroid, submitAndroid, buildIOS, uploadIOS, submitIOS, desktop, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
+    needs: [prep, buildAndroid, uploadAndroid, submitAndroid, desktop, iOS, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
     with:
       version: ${{ needs.prep.outputs.APP_VERSION }}
       env: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }}
       android: ${{ github.ref == 'refs/heads/production' && needs.submitAndroid.result || needs.uploadAndroid.result }}
-      ios: ${{ github.ref == 'refs/heads/production' && needs.submitIOS.result || needs.uploadIOS.result }}
+      ios: ${{ needs.iOS.result }}
       web: ${{ needs.web.result }}
       desktop: ${{ needs.desktop.result }}
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index ac20a8d09141..672d468ed3b1 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -120,41 +120,73 @@ jobs:
           # $s3APKPath is set from within the Fastfile, android upload_s3 lane
           echo "S3_APK_PATH=$s3APKPath" >> "$GITHUB_OUTPUT"
 
-  buildIOS:
-    name: Build iOS app for testing
-    uses: ./.github/workflows/buildIOS.yml
-    if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
+  iOS:
+    name: Build and deploy iOS for testing
     needs: [validateActor, getBranchRef]
-    secrets: inherit
-    with:
-      type: adhoc
-      ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
-      pull_request_number: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-
-  uploadIOS:
-    name: Upload IOS app to S3
-    needs: buildIOS
-    runs-on: ubuntu-latest
-    outputs:
-      S3_IPA_PATH: ${{ steps.exportS3Path.outputs.S3_IPA_PATH }}
+    if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_15.2.0.app/Contents/Developer
+    runs-on: macos-13-xlarge
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
+
+      - name: Configure MapBox SDK
+        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
+      - name: Setup Node
+        id: setup-node
+        uses: ./.github/actions/composite/setupNode
+
+      - name: Setup XCode
+        run: sudo xcode-select -switch /Applications/Xcode_15.2.0.app
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1.190.0
         with:
           bundler-cache: true
 
-      - name: Download IOS build artifacts
-        uses: actions/download-artifact@v4
+      - name: Cache Pod dependencies
+        uses: actions/cache@v4
+        id: pods-cache
         with:
-          path: /tmp/artifacts
-          pattern: ios-artifact-*
-          merge-multiple: true
+          path: ios/Pods
+          key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }}
 
-      - name: Log downloaded artifact paths
-        run: ls -R /tmp/artifacts
+      - name: Compare Podfile.lock and Manifest.lock
+        id: compare-podfile-and-manifest
+        run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('ios/Podfile.lock') == hashFiles('ios/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
+
+      - name: Install cocoapods
+        uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
+        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
+        with:
+          timeout_minutes: 10
+          max_attempts: 5
+          command: scripts/pod-install.sh
+
+      - name: Decrypt AdHoc profile
+        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output NewApp_AdHoc.mobileprovision NewApp_AdHoc.mobileprovision.gpg
+        env:
+          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+
+      - name: Decrypt AdHoc Notification Service profile
+        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output NewApp_AdHoc_Notification_Service.mobileprovision NewApp_AdHoc_Notification_Service.mobileprovision.gpg
+        env:
+          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+
+      - name: Decrypt certificate
+        run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output Certificates.p12 Certificates.p12.gpg
+        env:
+          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -163,20 +195,22 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
 
+      - name: Build AdHoc app
+        run: bundle exec fastlane ios build_adhoc
+
       - name: Upload AdHoc build to S3
         run: bundle exec fastlane ios upload_s3
         env:
-          ipaPath: /tmp/artifacts/${{ needs.buildIOS.outputs.IPA_FILE_NAME }}
           S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           S3_BUCKET: ad-hoc-expensify-cash
           S3_REGION: us-east-1
 
-      - name: Export S3 paths
-        id: exportS3Path
-        run: |
-          # $s3IpaPath is set from within the Fastfile, ios upload_s3 lane
-          echo "S3_IPA_PATH=$s3IpaPath" >> "$GITHUB_OUTPUT"
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios
+          path: ./ios_paths.json
 
   desktop:
     name: Build and deploy Desktop for testing
@@ -257,27 +291,41 @@ jobs:
   postGithubComment:
     runs-on: ubuntu-latest
     name: Post a GitHub comment with app download links for testing
-    needs: [validateActor, getBranchRef, uploadAndroid, uploadIOS, desktop, web]
-    if: ${{ always() && fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
+    needs: [validateActor, getBranchRef, uploadAndroid, iOS, desktop, web]
+    if: ${{ always() }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
       - name: Download Artifact
         uses: actions/download-artifact@v4
+        if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
+
+      - name: Read JSONs with iOS paths
+        id: get_ios_path
+        if: ${{ needs.iOS.result == 'success' }}
+        run: |
+          content_ios="$(cat ./ios/ios_paths.json)"
+          content_ios="${content_ios//'%'/'%25'}"
+          content_ios="${content_ios//$'\n'/'%0A'}"
+          content_ios="${content_ios//$'\r'/'%0D'}"
+          ios_path=$(echo "$content_ios" | jq -r '.html_path')
+          echo "ios_path=$ios_path" >> "$GITHUB_OUTPUT"
 
       - name: Publish links to apps for download
+        if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
         uses: ./.github/actions/javascript/postTestBuildComment
         with:
           PR_NUMBER: ${{ env.PULL_REQUEST_NUMBER }}
           GITHUB_TOKEN: ${{ github.token }}
           ANDROID: ${{ needs.uploadAndroid.result }}
           DESKTOP: ${{ needs.desktop.result }}
-          IOS: ${{ needs.uploadIOS.result }}
+          IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
           ANDROID_LINK: ${{ needs.uploadAndroid.outputs.S3_APK_PATH }}
           DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
-          IOS_LINK: ${{ needs.uploadIOS.outputs.S3_IPA_PATH }}
+          IOS_LINK: ${{ steps.get_ios_path.outputs.ios_path }}
           WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1a7499a2a2c3..eed84acdc916 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -19,7 +19,6 @@ KEY_GRADLE_APK_PATH = "apkPath"
 KEY_S3_APK_PATH = "s3APKPath"
 KEY_GRADLE_AAB_PATH = "aabPath"
 KEY_IPA_PATH = "ipaPath"
-KEY_S3_IPA_PATH = "s3IpaPath"
 KEY_DSYM_PATH = "dsymPath"
 
 # Export environment variables to GITHUB_ENV
@@ -216,7 +215,7 @@ platform :ios do
     build_app(
       workspace: "./ios/NewExpensify.xcworkspace",
       scheme: "New Expensify",
-      output_name: "NewExpensify.ipa",
+      output_name: "New Expensify.ipa",
       export_options: {
         provisioningProfiles: {
           "com.chat.expensify.chat" => "(NewApp) AppStore",
@@ -257,7 +256,6 @@ platform :ios do
       workspace: "./ios/NewExpensify.xcworkspace",
       skip_profile_detection: true,
       scheme: "New Expensify AdHoc",
-      output_name: "NewExpensify_AdHoc.ipa",
       export_method: "ad-hoc",
       export_options: {
         method: "ad-hoc",
@@ -282,16 +280,12 @@ platform :ios do
       ipa: ENV[KEY_IPA_PATH],
       app_directory: "ios/#{ENV['PULL_REQUEST_NUMBER']}",
     )
-    puts "Saving S3 outputs in env..."
-    exportEnvVars({
-      KEY_S3_IPA_PATH => lane_context[SharedValues::S3_HTML_OUTPUT_PATH],
-    })
+    sh("echo '{\"ipa_path\": \"#{lane_context[SharedValues::S3_IPA_OUTPUT_PATH]}\",\"html_path\": \"#{lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}\"}' > ../ios_paths.json")
   end
 
   desc "Upload app to TestFlight"
   lane :upload_testflight do
     upload_to_testflight(
-      ipa: ENV[KEY_IPA_PATH],
       api_key_path: "./ios/ios-fastlane-json-key.json",
       distribute_external: true,
       notify_external_testers: true,

From 49b096d94cab2970d29cf2702d040646d8a62147 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 4 Oct 2024 19:43:15 +0000
Subject: [PATCH 63/70] Update version to 9.0.44-11

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4466f8558024..87e0d11b86de 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004410
-        versionName "9.0.44-10"
+        versionCode 1009004411
+        versionName "9.0.44-11"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 0a05e6af082f..80fe04c9c3e6 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.10</string>
+	<string>9.0.44.11</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 327dbf1bcc7e..8cde11c13509 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.44.10</string>
+	<string>9.0.44.11</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 94a98eb26032..b15d81284d97 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.44</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.10</string>
+	<string>9.0.44.11</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 1a02390f6c7b..c98b15512211 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-10",
+  "version": "9.0.44-11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.44-10",
+      "version": "9.0.44-11",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index f28c9e10740e..41352fc019fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-10",
+  "version": "9.0.44-11",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 69691038cd6e024e14ca42dfe8ca59387e0226f9 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 4 Oct 2024 19:46:59 +0000
Subject: [PATCH 64/70] Update version to 9.0.44-12

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 87e0d11b86de..abd8492fb20f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004411
-        versionName "9.0.44-11"
+        versionCode 1009004412
+        versionName "9.0.44-12"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 80fe04c9c3e6..0166a6a5dee8 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.11</string>
+	<string>9.0.44.12</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 8cde11c13509..a7316a4414f1 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.44.11</string>
+	<string>9.0.44.12</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index b15d81284d97..8e0564af0be2 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.44</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.11</string>
+	<string>9.0.44.12</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index c98b15512211..46912604ed2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-11",
+  "version": "9.0.44-12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.44-11",
+      "version": "9.0.44-12",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 41352fc019fa..eb8cdf2caf3c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-11",
+  "version": "9.0.44-12",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 52fce24c47aa9f734c04dfc5c66d27dc235eb171 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 4 Oct 2024 20:43:39 +0000
Subject: [PATCH 65/70] Update version to 9.0.45-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 abd8492fb20f..cc31b09234dd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004412
-        versionName "9.0.44-12"
+        versionCode 1009004500
+        versionName "9.0.45-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 0166a6a5dee8..12b063918cd9 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.44</string>
+	<string>9.0.45</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.12</string>
+	<string>9.0.45.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a7316a4414f1..30f0d86d6206 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.44</string>
+	<string>9.0.45</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.12</string>
+	<string>9.0.45.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 8e0564af0be2..f9b8084421de 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.44</string>
+	<string>9.0.45</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.44.12</string>
+	<string>9.0.45.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 46912604ed2b..fa81f7dbc10a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-12",
+  "version": "9.0.45-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.44-12",
+      "version": "9.0.45-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index eb8cdf2caf3c..58173a2cffa4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.44-12",
+  "version": "9.0.45-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 a004a5f0be607318486d94748d03c7ac4c00110f Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 4 Oct 2024 20:43:57 +0000
Subject: [PATCH 66/70] Update version to 9.0.45-1

---
 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 cc31b09234dd..4cb4ef1fb62e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004500
-        versionName "9.0.45-0"
+        versionCode 1009004501
+        versionName "9.0.45-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 12b063918cd9..3108ba6fc2e8 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.45.0</string>
+	<string>9.0.45.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 30f0d86d6206..4f84f32eb01b 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.45.0</string>
+	<string>9.0.45.1</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index f9b8084421de..9868898ab82b 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.45</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.45.0</string>
+	<string>9.0.45.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index fa81f7dbc10a..d8ac17ad8f08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.45-0",
+  "version": "9.0.45-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.45-0",
+      "version": "9.0.45-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 58173a2cffa4..15aca5e97146 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.45-0",
+  "version": "9.0.45-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 30a5280c58b75130c8657ec6d7012a27d50c9e3a Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Fri, 4 Oct 2024 13:53:20 -0700
Subject: [PATCH 67/70] Decrypt json Google Play key

---
 .github/workflows/deploy.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 555e7650193c..4ff1a2004d8f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -136,6 +136,10 @@ jobs:
         id: getAndroidVersion
         run: echo "VERSION_CODE=$(grep -o 'versionCode\s\+[0-9]\+' android/app/build.gradle | awk '{ print $2 }')" >> "$GITHUB_OUTPUT"
 
+      - name: Decrypt json w/ Google Play credentials
+        run: gpg --batch --yes --decrypt --passphrase="${{ secrets.LARGE_SECRET_PASSPHRASE }}" --output android-fastlane-json-key.json android-fastlane-json-key.json.gpg
+        working-directory: android/app
+
       - name: Submit Android build for review
         run: bundle exec fastlane android upload_google_play_production
         env:

From 10b8547c3fdad76e9a6f1986edef5b94507e1ae6 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 4 Oct 2024 21:14:35 +0000
Subject: [PATCH 68/70] Update version to 9.0.45-2

---
 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 4cb4ef1fb62e..56ae4bd0a873 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004501
-        versionName "9.0.45-1"
+        versionCode 1009004502
+        versionName "9.0.45-2"
         // 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 3108ba6fc2e8..9b44440ea8ce 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.45.1</string>
+	<string>9.0.45.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 4f84f32eb01b..f3fe791cc8a1 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.45.1</string>
+	<string>9.0.45.2</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 9868898ab82b..747676c49fc0 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.45</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.45.1</string>
+	<string>9.0.45.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index d8ac17ad8f08..22385023374c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.45-1",
+  "version": "9.0.45-2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.45-1",
+      "version": "9.0.45-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 15aca5e97146..1387bda002d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.45-1",
+  "version": "9.0.45-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 0bc1adaca688aa6599a2b70327211094472242ba Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Sat, 5 Oct 2024 07:49:58 +0530
Subject: [PATCH 69/70] minor update.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/actions/Policy/Category.ts | 2 +-
 src/libs/actions/Policy/Tag.ts      | 2 +-
 src/libs/actions/TaxRate.ts         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts
index ae09c5efcc45..a623989cfb6c 100644
--- a/src/libs/actions/Policy/Category.ts
+++ b/src/libs/actions/Policy/Category.ts
@@ -878,7 +878,7 @@ function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: stri
                     acc[categoryName] = {
                         pendingAction: null,
                         errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.deleteFailureMessage'),
-                        enabled: policyCategories?.[categoryName]?.enabled,
+                        enabled: !!policyCategories?.[categoryName]?.enabled,
                     };
                     return acc;
                 }, {}),
diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
index 3344ebcc73ec..7708921f57b5 100644
--- a/src/libs/actions/Policy/Tag.ts
+++ b/src/libs/actions/Policy/Tag.ts
@@ -391,7 +391,7 @@ function deletePolicyTags(policyID: string, tagsToDelete: string[]) {
                                 acc[tagName] = {
                                     pendingAction: null,
                                     errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.deleteFailureMessage'),
-                                    enabled: policyTag?.tags[tagName]?.enabled,
+                                    enabled: !!policyTag?.tags[tagName]?.enabled,
                                 };
                                 return acc;
                             }, {}),
diff --git a/src/libs/actions/TaxRate.ts b/src/libs/actions/TaxRate.ts
index 495faf9a4a0d..52a8b8e143b8 100644
--- a/src/libs/actions/TaxRate.ts
+++ b/src/libs/actions/TaxRate.ts
@@ -339,7 +339,7 @@ function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
                             acc[taxID] = {
                                 pendingAction: null,
                                 errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.deleteFailureMessage'),
-                                isDisabled: policyTaxRates?.[taxID]?.isDisabled,
+                                isDisabled: !!policyTaxRates?.[taxID]?.isDisabled,
                             };
                             return acc;
                         }, {}),

From 082240d0d38705c195ac89ee114ee6561ccafd68 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 7 Oct 2024 10:12:53 +0200
Subject: [PATCH 70/70] add shouldBeBlocked for QuickbooksDesktopExportPage

---
 .../accounting/qbd/export/QuickbooksDesktopExportPage.tsx    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
index 5a86dc9d5bce..9a3b415dc087 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
@@ -73,18 +73,17 @@ function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
         },
     ];
 
-    const accessVariants = canUseNewDotQBD ? [] : [CONST.POLICY.ACCESS_VARIANTS.ADMIN];
-
     return (
         <ConnectionLayout
             displayName={QuickbooksDesktopExportPage.displayName}
             headerTitle="workspace.accounting.export"
             title="workspace.qbd.exportDescription"
-            accessVariants={accessVariants}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
+            shouldBeBlocked={!canUseNewDotQBD} // TODO: remove it once the QBD beta is done
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO} // TODO: should be updated to use the new connection
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
         >