From cc0141ed920ef3f6162ad8aaa1458a52e327b5ab Mon Sep 17 00:00:00 2001
From: Sheena Trepanier <sheena@expensify.com>
Date: Mon, 17 Jun 2024 16:44:51 -0700
Subject: [PATCH 001/132] Move articles out of Accounts Settings and delete
 Account Settings

---
 .../settings/{account-settings => }/Add-profile-photo.md    | 0
 .../{account-settings => }/Change-or-add-email-address.md   | 0
 .../{account-settings => }/Close-or-reopen-account.md       | 0
 .../settings/{account-settings => }/Manage-devices.md       | 0
 .../settings/{account-settings => }/Merge-accounts.md       | 0
 .../settings/{account-settings => }/Set-Notifications.md    | 0
 .../settings/{account-settings => }/Set-time-zone.md        | 0
 docs/expensify-classic/hubs/settings/account-settings.html  | 6 ------
 8 files changed, 6 deletions(-)
 rename docs/articles/expensify-classic/settings/{account-settings => }/Add-profile-photo.md (100%)
 rename docs/articles/expensify-classic/settings/{account-settings => }/Change-or-add-email-address.md (100%)
 rename docs/articles/expensify-classic/settings/{account-settings => }/Close-or-reopen-account.md (100%)
 rename docs/articles/expensify-classic/settings/{account-settings => }/Manage-devices.md (100%)
 rename docs/articles/expensify-classic/settings/{account-settings => }/Merge-accounts.md (100%)
 rename docs/articles/expensify-classic/settings/{account-settings => }/Set-Notifications.md (100%)
 rename docs/articles/expensify-classic/settings/{account-settings => }/Set-time-zone.md (100%)
 delete mode 100644 docs/expensify-classic/hubs/settings/account-settings.html

diff --git a/docs/articles/expensify-classic/settings/account-settings/Add-profile-photo.md b/docs/articles/expensify-classic/settings/Add-profile-photo.md
similarity index 100%
rename from docs/articles/expensify-classic/settings/account-settings/Add-profile-photo.md
rename to docs/articles/expensify-classic/settings/Add-profile-photo.md
diff --git a/docs/articles/expensify-classic/settings/account-settings/Change-or-add-email-address.md b/docs/articles/expensify-classic/settings/Change-or-add-email-address.md
similarity index 100%
rename from docs/articles/expensify-classic/settings/account-settings/Change-or-add-email-address.md
rename to docs/articles/expensify-classic/settings/Change-or-add-email-address.md
diff --git a/docs/articles/expensify-classic/settings/account-settings/Close-or-reopen-account.md b/docs/articles/expensify-classic/settings/Close-or-reopen-account.md
similarity index 100%
rename from docs/articles/expensify-classic/settings/account-settings/Close-or-reopen-account.md
rename to docs/articles/expensify-classic/settings/Close-or-reopen-account.md
diff --git a/docs/articles/expensify-classic/settings/account-settings/Manage-devices.md b/docs/articles/expensify-classic/settings/Manage-devices.md
similarity index 100%
rename from docs/articles/expensify-classic/settings/account-settings/Manage-devices.md
rename to docs/articles/expensify-classic/settings/Manage-devices.md
diff --git a/docs/articles/expensify-classic/settings/account-settings/Merge-accounts.md b/docs/articles/expensify-classic/settings/Merge-accounts.md
similarity index 100%
rename from docs/articles/expensify-classic/settings/account-settings/Merge-accounts.md
rename to docs/articles/expensify-classic/settings/Merge-accounts.md
diff --git a/docs/articles/expensify-classic/settings/account-settings/Set-Notifications.md b/docs/articles/expensify-classic/settings/Set-Notifications.md
similarity index 100%
rename from docs/articles/expensify-classic/settings/account-settings/Set-Notifications.md
rename to docs/articles/expensify-classic/settings/Set-Notifications.md
diff --git a/docs/articles/expensify-classic/settings/account-settings/Set-time-zone.md b/docs/articles/expensify-classic/settings/Set-time-zone.md
similarity index 100%
rename from docs/articles/expensify-classic/settings/account-settings/Set-time-zone.md
rename to docs/articles/expensify-classic/settings/Set-time-zone.md
diff --git a/docs/expensify-classic/hubs/settings/account-settings.html b/docs/expensify-classic/hubs/settings/account-settings.html
deleted file mode 100644
index e53f92312b7c..000000000000
--- a/docs/expensify-classic/hubs/settings/account-settings.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Account Settings
----
-
-{% include section.html %}

From f93e3ed82e90f55dfa5f9f5e80573e9a289bcaa3 Mon Sep 17 00:00:00 2001
From: Rachael Hopkins <32854888+RachCHopkins@users.noreply.github.com>
Date: Wed, 17 Jul 2024 17:05:05 +1200
Subject: [PATCH 002/132] Create deel.md

---
 .../integrations/HR-integrations/deel.md      | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 docs/articles/expensify-classic/integrations/HR-integrations/deel.md

diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/deel.md b/docs/articles/expensify-classic/integrations/HR-integrations/deel.md
new file mode 100644
index 000000000000..12e616d9657f
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/deel.md
@@ -0,0 +1,35 @@
+---
+title: Deel Integration
+description: Automatically sync expenses from Expensify to Deel
+---
+
+# Overview
+
+This guide is for business clients who want to set up policies and synchronize expenses from Expensify to Deel. This one-way synchronization ensures that Expensify becomes the definitive source for all employee expenses.
+
+If you are a contractor or employee working for a company using Expensify, please refer to:
+
+- [Employee Guide to Using Expensify with Deel](https://help.letsdeel.com/hc/en-gb/articles/7123572847761-Employee-s-Guide-to-Using-Expensify-With-Deel)
+- [Contractor Guide to Using Expensify with Deel](https://help.letsdeel.com/hc/en-gb/articles/9640208314897-How-Contractors-Can-Use-Expensify-With-Deel)
+
+## Introduction:
+
+By integrating Expensify with Deel, you can utilize Expensify’s approval workflows to ensure timely payment through Deel for your team.
+
+This process involves aligning user profiles and expense policies between Expensify and Deel. Once connected, Deel will scan for approved expenses from matched users included in selected workspaces for integration, allowing Deel to import these expenses for reimbursement.
+
+This synchronization is one-way. Expenses and receipts logged and approved in Expensify will sync to Deel. Expenses logged in Deel will not sync to Expensify.
+
+*Please note,* expense syncing is not immediate. For details on how syncing operates, refer to ["How Does Expense Syncing Work?"]([https://example.com](https://help.letsdeel.com/hc/en-gb/articles/5871319525521-How-To-Set-Up-The-Expensify-Integration-On-Deel-For-EOR-Employees-And-Contractors#h_01G25AWSW0KHWBA63C1AZ6X9E9))
+
+## Before you begin:
+
+To establish a connection, make sure you have the following:
+
+- Deel Organization Manager permissions
+- Expensify Admin permissions for policies you wish to integrate with Deel
+- A paid Expensify subscription to approve expenses and sync them to Deel
+
+Expensify Admin permissions can be intricate. Refer to [Expensify’s Introduction to Integration]([https://example.com](https://integrations.expensify.com/Integration-Server/doc/#introduction)) for more details.
+
+For further steps on integration, consult the [integration guide](https://help.letsdeel.com/hc/en-gb/articles/5871319525521-How-To-Set-Up-The-Expensify-Integration-On-Deel-For-EOR-Employees-And-Contractors).

From fdd7bb2e4cbdab06c1bd22da635baabbeede67c3 Mon Sep 17 00:00:00 2001
From: Rachael Hopkins <32854888+RachCHopkins@users.noreply.github.com>
Date: Wed, 17 Jul 2024 17:27:25 +1200
Subject: [PATCH 003/132] Rename deel.md to Deel.md

---
 .../integrations/HR-integrations/{deel.md => Deel.md}             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/articles/expensify-classic/integrations/HR-integrations/{deel.md => Deel.md} (100%)

diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/deel.md b/docs/articles/expensify-classic/integrations/HR-integrations/Deel.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/deel.md
rename to docs/articles/expensify-classic/integrations/HR-integrations/Deel.md

From a12bf41f900c4ff8fe78b2381fd64784ed46fc03 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Thu, 8 Aug 2024 08:35:34 +0100
Subject: [PATCH 004/132] Fix: The pressed state of option menu items uses a
 very dark BG color

---
 src/components/MenuItem.tsx | 1 +
 src/styles/utils/index.ts   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index 8af6cd492c03..4025e4cabc04 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -536,6 +536,7 @@ function MenuItem(
                                 onPressOut={ControlSelection.unblock}
                                 onSecondaryInteraction={onSecondaryInteraction}
                                 wrapperStyle={outerWrapperStyle}
+                                activeOpacity={0.8}
                                 style={({pressed}) =>
                                     [
                                         containerStyle,
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index ed76abd484d0..872b5ee52458 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1290,7 +1290,7 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
     getButtonBackgroundColorStyle: (buttonState: ButtonStateName = CONST.BUTTON_STATES.DEFAULT, isMenuItem = false): ViewStyle => {
         switch (buttonState) {
             case CONST.BUTTON_STATES.PRESSED:
-                return {backgroundColor: theme.buttonPressedBG};
+                return isMenuItem ? {backgroundColor: theme.buttonHoveredBG} : {backgroundColor: theme.buttonPressedBG};
             case CONST.BUTTON_STATES.ACTIVE:
                 return isMenuItem ? {backgroundColor: theme.border} : {backgroundColor: theme.buttonHoveredBG};
             case CONST.BUTTON_STATES.DISABLED:

From 33ed8e97d029481660daeebf724d759f7ea9e5ea Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:20:03 +0100
Subject: [PATCH 005/132] Update button pressed state background color style in
 BaseMiniContextMenuItem

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

diff --git a/src/components/BaseMiniContextMenuItem.tsx b/src/components/BaseMiniContextMenuItem.tsx
index 6e1a1e0fd229..fa0fdb45153f 100644
--- a/src/components/BaseMiniContextMenuItem.tsx
+++ b/src/components/BaseMiniContextMenuItem.tsx
@@ -79,7 +79,7 @@ function BaseMiniContextMenuItem(
                 role={CONST.ROLE.BUTTON}
                 style={({hovered, pressed}) => [
                     styles.reportActionContextMenuMiniButton,
-                    StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, isDelayButtonStateComplete)),
+                    StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, isDelayButtonStateComplete), true),
                     isDelayButtonStateComplete && styles.cursorDefault,
                 ]}
             >

From eba4b8ddf59cf71c20af489f0b52df1783af9820 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Fri, 16 Aug 2024 01:58:54 +0700
Subject: [PATCH 006/132] fix User is not task's author or task's assignee has
 ability to complete the task

---
 src/components/ReportActionItem/TaskPreview.tsx | 2 +-
 src/components/ReportActionItem/TaskView.tsx    | 3 ++-
 src/components/TaskHeaderActionButton.tsx       | 2 +-
 src/libs/actions/Task.ts                        | 8 ++++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index ca1324a31fa7..0fe498590d17 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -99,7 +99,7 @@ function TaskPreview({taskReport, taskReportID, action, contextMenuAnchor, chatR
                             style={[styles.mr2]}
                             containerStyle={[styles.taskCheckbox]}
                             isChecked={isTaskCompleted}
-                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID)}
+                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID) || !Task.canActionTask(taskReport, currentUserPersonalDetails.accountID)}
                             onPress={Session.checkIfActionIsAllowed(() => {
                                 if (isTaskCompleted) {
                                     Task.reopenTask(taskReport);
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 941e7cd5c610..2822e34a3d04 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -56,6 +56,7 @@ function TaskView({report, ...props}: TaskViewProps) {
     const isCompleted = ReportUtils.isCompletedTaskReport(report);
     const isOpen = ReportUtils.isOpenTaskReport(report);
     const canModifyTask = Task.canModifyTask(report, props.currentUserPersonalDetails.accountID);
+    const canActionTask = Task.canActionTask(report, props.currentUserPersonalDetails.accountID);
     const disableState = !canModifyTask;
     const isDisableInteractive = !canModifyTask || !isOpen;
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
@@ -113,7 +114,7 @@ function TaskView({report, ...props}: TaskViewProps) {
                                             containerBorderRadius={8}
                                             caretSize={16}
                                             accessibilityLabel={taskTitle || translate('task.task')}
-                                            disabled={!canModifyTask}
+                                            disabled={!canModifyTask || !canActionTask}
                                         />
                                         <View style={[styles.flexRow, styles.flex1]}>
                                             <Text
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index 5e563ea99763..9a7f15b8fdfd 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -34,7 +34,7 @@ function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps)
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1)}
+                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1) || !Task.canActionTask(report, session?.accountID ?? -1)}
                 medium
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
                 onPress={Session.checkIfActionIsAllowed(() => {
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 6105b7cffd9e..b77e86f74884 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1129,6 +1129,13 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
     return !isEmptyObject(taskReport) && ReportUtils.isAllowedToComment(taskReport);
 }
 
+/**
+ * Check if you can actually change the status of the task (mark complete or incomplete)
+ */
+function canActionTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number): boolean {
+    return sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport);
+}
+
 function clearTaskErrors(reportID: string) {
     const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
 
@@ -1169,6 +1176,7 @@ export {
     getTaskAssigneeAccountID,
     clearTaskErrors,
     canModifyTask,
+    canActionTask,
     setNewOptimisticAssignee,
 };
 

From ce49ad0ea3ceb437b643d343fbfab4bad1b14ac9 Mon Sep 17 00:00:00 2001
From: staszekscp <mariusz.stanisz@swmansion.com>
Date: Mon, 19 Aug 2024 11:30:30 +0200
Subject: [PATCH 007/132] add conversation shortcuts and styling

---
 .../CustomNotificationProvider.java           | 60 ++++++++++++-------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
index 8eff32dedf76..a19abcce7d92 100644
--- a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
+++ b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
@@ -8,6 +8,7 @@
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
@@ -30,6 +31,8 @@
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.app.Person;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.versionedparcelable.ParcelUtils;
 
@@ -47,6 +50,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -210,39 +214,53 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
             // create the Person object who sent the latest report comment
             Bitmap personIcon = fetchIcon(context, avatar);
             builder.setLargeIcon(personIcon);
+            Intent intent = new Intent(Intent.ACTION_VIEW,
+                    Uri.parse("new-expensify://r/" + reportID));
 
             Person person = createMessagePersonObject(IconCompat.createWithBitmap(personIcon), accountID, name);
+            ShortcutInfoCompat shortcutInfo = new ShortcutInfoCompat.Builder(context, accountID)
+                    .setShortLabel(name)
+                    .setLongLabel(name)
+                    .setCategories(Collections.singleton(CATEGORY_MESSAGE))
+                    .setIntent(intent)
+                    .setLongLived(true)
+                    .setPerson(person)
+                    .setIcon(IconCompat.createWithBitmap(personIcon))
+                    .build();
+
+            ShortcutManagerCompat.pushDynamicShortcut(context, shortcutInfo);
 
             // Create latest received message object
             long createdTimeInMillis = getMessageTimeInMillis(messageData.get("created").getString(""));
             NotificationCompat.MessagingStyle.Message newMessage = new NotificationCompat.MessagingStyle.Message(message, createdTimeInMillis, person);
 
-            // Conversational styling should be applied to groups chats, rooms, and any 1:1 chats with more than one notification (ensuring the large profile image is always shown)
-            if (!conversationName.isEmpty() || hasExistingNotification) {
-                // Create the messaging style notification builder for this notification, associating it with the person who sent the report comment
-                NotificationCompat.MessagingStyle messagingStyle = new NotificationCompat.MessagingStyle(person)
-                        .setGroupConversation(true)
-                        .setConversationTitle(conversationName);
+            NotificationCompat.MessagingStyle messagingStyle = new NotificationCompat.MessagingStyle(person);
 
+            // Add all conversation messages to the notification, including the last one we just received.
+            List<NotificationCompat.MessagingStyle.Message> messages;
+            if (hasExistingNotification) {
+                NotificationCompat.MessagingStyle previousStyle = NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification(existingReportNotification.getNotification());
+                messages = previousStyle != null ? previousStyle.getMessages() : new ArrayList<>(List.of(recreatePreviousMessage(existingReportNotification)));
+            } else {
+                messages = new ArrayList<>();
+            }
 
-                // Add all conversation messages to the notification, including the last one we just received.
-                List<NotificationCompat.MessagingStyle.Message> messages;
-                if (hasExistingNotification) {
-                    NotificationCompat.MessagingStyle previousStyle = NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification(existingReportNotification.getNotification());
-                    messages = previousStyle != null ? previousStyle.getMessages() : new ArrayList<>(List.of(recreatePreviousMessage(existingReportNotification)));
-                } else {
-                    messages = new ArrayList<>();
-                }
-
-                // add the last one message we just received.
-                messages.add(newMessage);
+            // add the last one message we just received.
+            messages.add(newMessage);
 
-                for (NotificationCompat.MessagingStyle.Message activeMessage : messages) {
-                    messagingStyle.addMessage(activeMessage);
-                }
+            for (NotificationCompat.MessagingStyle.Message activeMessage : messages) {
+                messagingStyle.addMessage(activeMessage);
+            }
 
-                builder.setStyle(messagingStyle);
+            // Conversational styling should be applied to groups chats, rooms, and any 1:1 chats with more than one notification (ensuring the large profile image is always shown)
+            if (!conversationName.isEmpty()) {
+                // Create the messaging style notification builder for this notification, associating it with the person who sent the report comment
+                messagingStyle
+                        .setGroupConversation(true)
+                        .setConversationTitle(conversationName);
             }
+            builder.setStyle(messagingStyle);
+            builder.setShortcutId(accountID);
 
             // save reportID and person info for future merging
             builder.addExtras(createMessageExtrasBundle(reportID, person));

From 8b2e648cea2e484bef39a62a10ffe59619a1593d Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:08:11 +0100
Subject: [PATCH 008/132] Remove hoverAndPressStyle prop

---
 src/components/ReportActionItem/MoneyReportView.tsx         | 1 -
 src/components/ReportActionItem/TripDetailsView.tsx         | 1 -
 src/pages/Search/SearchStatusMenu.tsx                       | 1 -
 src/pages/settings/InitialSettingsPage.tsx                  | 1 -
 src/pages/settings/Subscription/CardSection/CardSection.tsx | 1 -
 src/pages/settings/Wallet/PaymentMethodList.tsx             | 2 --
 src/pages/settings/Wallet/WalletPage/WalletPage.tsx         | 2 --
 src/pages/workspace/WorkspaceInitialPage.tsx                | 1 -
 8 files changed, 10 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index fbf03821fa16..025199d07f77 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -117,7 +117,6 @@ function MoneyReportView({report, policy, isCombinedReport = false, shouldShowTo
                                             interactive
                                             shouldStackHorizontally={false}
                                             onSecondaryInteraction={() => {}}
-                                            hoverAndPressStyle={false}
                                             titleWithTooltips={[]}
                                             brickRoadIndicator={violation ? 'error' : undefined}
                                             errorText={violationTranslation}
diff --git a/src/components/ReportActionItem/TripDetailsView.tsx b/src/components/ReportActionItem/TripDetailsView.tsx
index fe6831f72512..28408731d700 100644
--- a/src/components/ReportActionItem/TripDetailsView.tsx
+++ b/src/components/ReportActionItem/TripDetailsView.tsx
@@ -129,7 +129,6 @@ function ReservationView({reservation}: ReservationViewProps) {
             iconWidth={20}
             iconStyles={[StyleUtils.getTripReservationIconContainer(false), styles.mr3]}
             secondaryIconFill={theme.icon}
-            hoverAndPressStyle={styles.hoveredComponentBG}
         />
     );
 }
diff --git a/src/pages/Search/SearchStatusMenu.tsx b/src/pages/Search/SearchStatusMenu.tsx
index 9fd812ead9a1..2b28359a2bcd 100644
--- a/src/pages/Search/SearchStatusMenu.tsx
+++ b/src/pages/Search/SearchStatusMenu.tsx
@@ -92,7 +92,6 @@ function SearchStatusMenu({queryJSON, isCustomQuery}: SearchStatusMenuProps) {
                         iconHeight={variables.iconSizeNormal}
                         wrapperStyle={styles.sectionMenuItem}
                         focused={index === activeItemIndex}
-                        hoverAndPressStyle={styles.hoveredComponentBG}
                         onPress={onPress}
                         isPaneMenu
                     />
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index bc98a9432630..08ae12721c8b 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -328,7 +328,6 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                                 shouldStackHorizontally={item.shouldStackHorizontally}
                                 floatRightAvatarSize={item.avatarSize}
                                 ref={popoverAnchor}
-                                hoverAndPressStyle={styles.hoveredComponentBG}
                                 shouldBlockSelection={!!item.link}
                                 onSecondaryInteraction={item.link ? (event) => openPopover(item.link, event) : undefined}
                                 focused={
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 25a201bf6887..5ed91ff669e9 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -149,7 +149,6 @@ function CardSection() {
                         title={translate('subscription.cardSection.viewPaymentHistory')}
                         titleStyle={styles.textStrong}
                         onPress={() => Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL}))}
-                        hoverAndPressStyle={styles.hoveredComponentBG}
                     />
                 )}
 
diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index 0d127e3346ae..339706de96e9 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -319,7 +319,6 @@ function PaymentMethodList({
                 title={translate('walletPage.addBankAccount')}
                 icon={Expensicons.Plus}
                 wrapperStyle={[styles.paymentMethod, listItemStyle]}
-                hoverAndPressStyle={styles.hoveredComponentBG}
                 ref={buttonRef}
                 disabled={!isUserValidated}
             />
@@ -354,7 +353,6 @@ function PaymentMethodList({
                     wrapperStyle={[styles.paymentMethod, listItemStyle]}
                     iconRight={item.iconRight}
                     badgeStyle={styles.badgeBordered}
-                    hoverAndPressStyle={styles.hoveredComponentBG}
                     shouldShowRightIcon={item.shouldShowRightIcon}
                     shouldShowSelectedState={shouldShowSelectedState}
                     isSelected={selectedMethodID.toString() === item.methodID?.toString()}
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
index 7e242a5c8782..e4b2a3fbc5f7 100644
--- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
+++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -477,7 +477,6 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                                                 title={translate('common.transferBalance')}
                                                                 icon={Expensicons.Transfer}
                                                                 onPress={triggerKYCFlow}
-                                                                hoverAndPressStyle={styles.hoveredComponentBG}
                                                                 shouldShowRightIcon
                                                                 disabled={network.isOffline}
                                                                 wrapperStyle={[
@@ -522,7 +521,6 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                                             disabled={network.isOffline}
                                                             title={translate('walletPage.enableWallet')}
                                                             icon={Expensicons.Wallet}
-                                                            hoverAndPressStyle={styles.hoveredComponentBG}
                                                             wrapperStyle={[
                                                                 styles.transferBalance,
                                                                 shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8,
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 5e52aa8d0b86..e251d94a5564 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -424,7 +424,6 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
                                     wrapperStyle={styles.sectionMenuItem}
                                     highlighted={enabledItem?.routeName === item.routeName}
                                     focused={!!(item.routeName && activeRoute?.startsWith(item.routeName))}
-                                    hoverAndPressStyle={styles.hoveredComponentBG}
                                     isPaneMenu
                                 />
                             ))}

From d8aae2f5ebd3df2a9f8f765c8d0b41d6f2650816 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 21 Aug 2024 15:26:55 +0100
Subject: [PATCH 009/132] Fix lint warnings

---
 src/pages/settings/InitialSettingsPage.tsx      | 14 +-------------
 src/pages/settings/Wallet/PaymentMethodList.tsx |  4 ++--
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 08ae12721c8b..11eab09d8392 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -344,19 +344,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                 </View>
             );
         },
-        [
-            styles.pb4,
-            styles.mh3,
-            styles.sectionTitle,
-            styles.sectionMenuItem,
-            styles.hoveredComponentBG,
-            translate,
-            userWallet?.currentBalance,
-            isExecuting,
-            singleExecution,
-            activeCentralPaneRoute,
-            waitForNavigate,
-        ],
+        [styles.pb4, styles.mh3, styles.sectionTitle, styles.sectionMenuItem, translate, userWallet?.currentBalance, isExecuting, singleExecution, activeCentralPaneRoute, waitForNavigate],
     );
 
     const accountMenuItems = useMemo(() => getMenuItemsSection(accountMenuItemsData), [accountMenuItemsData, getMenuItemsSection]);
diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index 339706de96e9..fe48314dd9c3 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -324,7 +324,7 @@ function PaymentMethodList({
             />
         ),
 
-        [onPress, translate, styles.paymentMethod, styles.hoveredComponentBG, listItemStyle, buttonRef, isUserValidated],
+        [onPress, translate, styles.paymentMethod, listItemStyle, buttonRef, isUserValidated],
     );
 
     /**
@@ -363,7 +363,7 @@ function PaymentMethodList({
             </OfflineWithFeedback>
         ),
 
-        [styles.ph6, styles.paymentMethod, styles.badgeBordered, styles.hoveredComponentBG, filteredPaymentMethods, translate, listItemStyle, shouldShowSelectedState, selectedMethodID],
+        [styles.ph6, styles.paymentMethod, styles.badgeBordered, filteredPaymentMethods, translate, listItemStyle, shouldShowSelectedState, selectedMethodID],
     );
 
     return (

From 80a8f356809f442ca1bc227db24e647e71adfa08 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Mon, 26 Aug 2024 19:32:31 +0700
Subject: [PATCH 010/132] fix: prevent crash due to empty report

---
 src/pages/home/report/ReportActionItemContentCreated.tsx | 2 +-
 src/pages/iou/request/step/IOURequestStepDistance.tsx    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionItemContentCreated.tsx b/src/pages/home/report/ReportActionItemContentCreated.tsx
index 0c052fcb17d9..21bb6471f5b1 100644
--- a/src/pages/home/report/ReportActionItemContentCreated.tsx
+++ b/src/pages/home/report/ReportActionItemContentCreated.tsx
@@ -149,7 +149,7 @@ function ReportActionItemContentCreated({contextValue, parentReportAction, trans
     if (ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report) || ReportUtils.isInvoiceReport(report)) {
         return (
             <OfflineWithFeedback pendingAction={action.pendingAction}>
-                {transactionThreadReport && !isEmptyObject(transactionThreadReport) ? (
+                {!isEmptyObject(transactionThreadReport?.reportID) ? (
                     <>
                         <MoneyReportView
                             report={report}
diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx
index 1798a95490a7..0bb8def52a64 100644
--- a/src/pages/iou/request/step/IOURequestStepDistance.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistance.tsx
@@ -214,9 +214,11 @@ function IOURequestStepDistance({
      */
     const navigateToWaypointEditPage = useCallback(
         (index: number) => {
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID, index.toString(), Navigation.getActiveRoute()));
+            Navigation.navigate(
+                ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID ?? reportID, index.toString(), Navigation.getActiveRoute()),
+            );
         },
-        [action, transactionID, report?.reportID],
+        [action, transactionID, report?.reportID, reportID],
     );
 
     const navigateToParticipantPage = useCallback(() => {

From 8ba3ae55cf3e77a9d21723fa3346a5c7269ee4bd Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 26 Aug 2024 13:46:20 -0600
Subject: [PATCH 011/132] navigate to merchant filter

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

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 48caeed2bb96..b64d4797540f 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -17,6 +17,7 @@ import * as User from '@libs/actions/User';
 import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPaymentMethodDescription} from '@libs/PaymentUtils';
+import * as SearchUtils from '@libs/SearchUtils';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import * as Subscription from '@userActions/Subscription';
@@ -59,6 +60,16 @@ function CardSection() {
         Navigation.resetToHome();
     }, []);
 
+    const viewPurchases = useCallback(() => {
+        const query = SearchUtils.buildQueryStringFromFilters({merchant: '"Expensify, Inc."'});
+        Navigation.navigate(
+            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
+                query,
+                isCustomQuery: true,
+            }),
+        );
+    }, []);
+
     const [billingStatus, setBillingStatus] = useState<BillingStatusResult | undefined>(CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData ?? {}));
 
     const nextPaymentDate = !isEmptyObject(privateSubscription) ? CardSectionUtils.getNextBillingDate() : undefined;
@@ -166,17 +177,17 @@ function CardSection() {
                     />
                 )}
 
-                {!!account?.hasPurchases && (
+                {/* {!!account?.hasPurchases && ( */}
                     <MenuItem
                         shouldShowRightIcon
                         icon={Expensicons.History}
                         wrapperStyle={styles.sectionMenuItemTopDescription}
                         title={translate('subscription.cardSection.viewPaymentHistory')}
                         titleStyle={styles.textStrong}
-                        onPress={() => Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL}))}
+                        onPress={viewPurchases}
                         hoverAndPressStyle={styles.hoveredComponentBG}
                     />
-                )}
+                {/* )} */}
 
                 {!!(subscriptionPlan && account?.isEligibleForRefund) && (
                     <MenuItem

From 6f590b5aabcd38a1c29adcf7f4bfd7a3099346f6 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 26 Aug 2024 13:48:45 -0600
Subject: [PATCH 012/132] use const

---
 src/CONST.ts                                             | 1 +
 .../settings/Subscription/CardSection/CardSection.tsx    | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 7b5320e7c6ef..d45f2a93faad 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1311,6 +1311,7 @@ const CONST = {
     LHN_SKELETON_VIEW_ITEM_HEIGHT: 64,
     SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 108,
     EXPENSIFY_PARTNER_NAME: 'expensify.com',
+    EXPENSIFY_MERCHANT: '"Expensify, Inc."',
     EMAIL: {
         ACCOUNTING: 'accounting@expensify.com',
         ADMIN: 'admin@expensify.com',
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index b64d4797540f..b014611c172d 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -61,13 +61,8 @@ function CardSection() {
     }, []);
 
     const viewPurchases = useCallback(() => {
-        const query = SearchUtils.buildQueryStringFromFilters({merchant: '"Expensify, Inc."'});
-        Navigation.navigate(
-            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
-                query,
-                isCustomQuery: true,
-            }),
-        );
+        const query = SearchUtils.buildQueryStringFromFilters({merchant: CONST.EXPENSIFY_MERCHANT});
+        Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query, isCustomQuery: true}));
     }, []);
 
     const [billingStatus, setBillingStatus] = useState<BillingStatusResult | undefined>(CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData ?? {}));

From 6f997a0d18dc5d757f40e0da0cefabf4747df138 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 26 Aug 2024 17:48:24 -0600
Subject: [PATCH 013/132] fix lint

---
 .../Subscription/CardSection/CardSection.tsx   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index b014611c172d..17f71b53292a 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -173,15 +173,15 @@ function CardSection() {
                 )}
 
                 {/* {!!account?.hasPurchases && ( */}
-                    <MenuItem
-                        shouldShowRightIcon
-                        icon={Expensicons.History}
-                        wrapperStyle={styles.sectionMenuItemTopDescription}
-                        title={translate('subscription.cardSection.viewPaymentHistory')}
-                        titleStyle={styles.textStrong}
-                        onPress={viewPurchases}
-                        hoverAndPressStyle={styles.hoveredComponentBG}
-                    />
+                <MenuItem
+                    shouldShowRightIcon
+                    icon={Expensicons.History}
+                    wrapperStyle={styles.sectionMenuItemTopDescription}
+                    title={translate('subscription.cardSection.viewPaymentHistory')}
+                    titleStyle={styles.textStrong}
+                    onPress={viewPurchases}
+                    hoverAndPressStyle={styles.hoveredComponentBG}
+                />
                 {/* )} */}
 
                 {!!(subscriptionPlan && account?.isEligibleForRefund) && (

From 26de0b829e70be097cd9f68e548eb74773229998 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Tue, 27 Aug 2024 09:38:23 +0700
Subject: [PATCH 014/132] Send magic code when validate contact page navigated

---
 src/components/ValidateAccountMessage.tsx              |  8 +++++++-
 .../settings/Profile/Contacts/ContactMethodsPage.tsx   | 10 +++++++++-
 .../Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx |  4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/ValidateAccountMessage.tsx b/src/components/ValidateAccountMessage.tsx
index be43c2985961..51b13dab4237 100644
--- a/src/components/ValidateAccountMessage.tsx
+++ b/src/components/ValidateAccountMessage.tsx
@@ -13,6 +13,7 @@ import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
 import TextLink from './TextLink';
+import * as User from '@userActions/User';
 
 type ValidateAccountMessageProps = {backTo?: string | undefined};
 function ValidateAccountMessage({backTo}: ValidateAccountMessageProps) {
@@ -41,7 +42,12 @@ function ValidateAccountMessage({backTo}: ValidateAccountMessageProps) {
                 <TextLink
                     fontSize={variables.fontSizeLabel}
                     onPress={() => {
-                        const login = loginList?.[loginNames?.[0]] ?? {};
+                        const loginName = loginNames?.[0]
+                        const login = loginList?.[loginName] ?? {};
+                        if (!login?.validatedDate && !login?.validateCodeSent) {
+                            User.requestContactMethodValidateCode(loginName);
+                        }
+                   
                         Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(login?.partnerUserID ?? loginNames?.[0], backTo));
                     }}
                 >
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
index e38f1a029d51..4e425f752e2a 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
+++ b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
@@ -23,6 +23,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {LoginList, Session} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import * as User from '@userActions/User';
 
 type ContactMethodsPageOnyxProps = {
     /** Login list for the user that is signed in */
@@ -80,7 +81,14 @@ function ContactMethodsPage({loginList, session, route}: ContactMethodsPageProps
                 <MenuItem
                     title={menuItemTitle}
                     description={description}
-                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(partnerUserID))}
+                    onPress={() => {
+                        const login = loginList?.[loginName] ?? {};
+                        if (!login?.validatedDate && !login?.validateCodeSent) {
+                            User.requestContactMethodValidateCode(loginName);
+                        }
+
+                        Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(partnerUserID))
+                    }}
                     brickRoadIndicator={indicator}
                     shouldShowBasicTitle
                     shouldShowRightIcon
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
index e0b7a23d5df3..c0ea1f5f3aff 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
@@ -73,6 +73,7 @@ function BaseValidateCodeForm({account = {}, contactMethod, hasMagicCodeBeenSent
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- nullish coalescing doesn't achieve the same result in this case
     const shouldDisableResendValidateCode = !!isOffline || account?.isLoading;
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+    const [validateCodeSentIsPressed, setValidateCodeSentIsPressed] = useState(false);
 
     useImperativeHandle(innerRef, () => ({
         focus() {
@@ -134,6 +135,7 @@ function BaseValidateCodeForm({account = {}, contactMethod, hasMagicCodeBeenSent
     const resendValidateCode = () => {
         User.requestContactMethodValidateCode(contactMethod);
         inputValidateCodeRef.current?.clear();
+        setValidateCodeSentIsPressed(true);
     };
 
     /**
@@ -201,7 +203,7 @@ function BaseValidateCodeForm({account = {}, contactMethod, hasMagicCodeBeenSent
                     >
                         <Text style={[StyleUtils.getDisabledLinkStyles(shouldDisableResendValidateCode)]}>{translate('validateCodeForm.magicCodeNotReceived')}</Text>
                     </PressableWithFeedback>
-                    {hasMagicCodeBeenSent && (
+                    {hasMagicCodeBeenSent && validateCodeSentIsPressed && (
                         <DotIndicatorMessage
                             type="success"
                             style={[styles.mt6, styles.flex0]}

From 5fdf8500aedce0f0a186d5ba0b0e839c5bd2cbed Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Tue, 27 Aug 2024 09:55:54 +0700
Subject: [PATCH 015/132] validateCodeSent when adding new contact method

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

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 74e5e5d869f9..d5015fbcddbe 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -301,6 +301,7 @@ function addNewContactMethodAndNavigate(contactMethod: string) {
                 [contactMethod]: {
                     partnerUserID: contactMethod,
                     validatedDate: '',
+                    validateCodeSent: true,
                     errorFields: {
                         addedLogin: null,
                     },

From 5eb7081c917d1d4e12368b952e319cf7fc90ec0d Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Tue, 27 Aug 2024 10:01:53 +0700
Subject: [PATCH 016/132] Lint and prettier fix

---
 src/components/ValidateAccountMessage.tsx                  | 6 +++---
 src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/ValidateAccountMessage.tsx b/src/components/ValidateAccountMessage.tsx
index 51b13dab4237..277b113b2351 100644
--- a/src/components/ValidateAccountMessage.tsx
+++ b/src/components/ValidateAccountMessage.tsx
@@ -7,13 +7,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
 import * as Session from '@userActions/Session';
+import * as User from '@userActions/User';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
 import TextLink from './TextLink';
-import * as User from '@userActions/User';
 
 type ValidateAccountMessageProps = {backTo?: string | undefined};
 function ValidateAccountMessage({backTo}: ValidateAccountMessageProps) {
@@ -42,12 +42,12 @@ function ValidateAccountMessage({backTo}: ValidateAccountMessageProps) {
                 <TextLink
                     fontSize={variables.fontSizeLabel}
                     onPress={() => {
-                        const loginName = loginNames?.[0]
+                        const loginName = loginNames?.[0];
                         const login = loginList?.[loginName] ?? {};
                         if (!login?.validatedDate && !login?.validateCodeSent) {
                             User.requestContactMethodValidateCode(loginName);
                         }
-                   
+
                         Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(login?.partnerUserID ?? loginNames?.[0], backTo));
                     }}
                 >
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
index 4e425f752e2a..0220311c692a 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
+++ b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
@@ -17,13 +17,13 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as User from '@userActions/User';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {LoginList, Session} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import * as User from '@userActions/User';
 
 type ContactMethodsPageOnyxProps = {
     /** Login list for the user that is signed in */
@@ -82,12 +82,11 @@ function ContactMethodsPage({loginList, session, route}: ContactMethodsPageProps
                     title={menuItemTitle}
                     description={description}
                     onPress={() => {
-                        const login = loginList?.[loginName] ?? {};
                         if (!login?.validatedDate && !login?.validateCodeSent) {
                             User.requestContactMethodValidateCode(loginName);
                         }
 
-                        Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(partnerUserID))
+                        Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(partnerUserID));
                     }}
                     brickRoadIndicator={indicator}
                     shouldShowBasicTitle

From c4fdf8d91e86ec886f568d68e9c582a76058a82e Mon Sep 17 00:00:00 2001
From: I Nyoman Jyotisa <jyotisa1616@gmail.com>
Date: Wed, 28 Aug 2024 22:19:12 +0800
Subject: [PATCH 017/132] Replace Enable your wallet with Add personal bank
 account task

---
 src/CONST.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 30b0b5364d83..c18f1a92e3e4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4249,16 +4249,16 @@ const CONST = {
                         'Then, send your request and wait for that sweet “Cha-ching!” when it’s complete.',
                 },
                 {
-                    type: 'enableWallet',
+                    type: 'addBankAccount',
                     autoCompleted: false,
-                    title: 'Enable your wallet',
+                    title: 'Add personal bank account',
                     description:
-                        'You’ll need to *enable your Expensify Wallet* to get paid back. Don’t worry, it’s easy!\n' +
+                        'You’ll need to add your personal bank account to get paid back. Don’t worry, it’s easy!\n' +
                         '\n' +
-                        'Here’s how to set up your wallet:\n' +
+                        'Here’s how to set up your bank account:\n' +
                         '\n' +
                         '1. Click your profile picture.\n' +
-                        '2. Click *Wallet* > *Enable wallet*.\n' +
+                        '2. Click *Wallet* > *Bank accounts* > *+ Add bank account*.\n' +
                         '3. Connect your bank account.\n' +
                         '\n' +
                         'Once that’s done, you can request money from anyone and get paid back right into your personal bank account.',
@@ -4423,19 +4423,19 @@ const CONST = {
                         'Feel free to add more details if you want, or just send it off. Let’s get you paid back!',
                 },
                 {
-                    type: 'enableWallet',
+                    type: 'addBankAccount',
                     autoCompleted: false,
-                    title: 'Enable your wallet',
+                    title: 'Add personal bank account',
                     description:
-                        'You’ll need to *enable your Expensify Wallet* to get paid back. Don’t worry, it’s easy!\n' +
+                        'You’ll need to add your personal bank account to get paid back. Don’t worry, it’s easy!\n' +
                         '\n' +
-                        'Here’s how to enable your wallet:\n' +
+                        'Here’s how to set up your bank account:\n' +
                         '\n' +
                         '1. Click your profile picture.\n' +
-                        '2. *Click Wallet* > *Enable wallet*.\n' +
-                        '3. Add your bank account.\n' +
+                        '2. Click *Wallet* > *Bank accounts* > *+ Add bank account*.\n' +
+                        '3. Connect your bank account.\n' +
                         '\n' +
-                        'Once that’s done, you can request money from anyone and get paid right into your personal bank account.',
+                        'Once that’s done, you can request money from anyone and get paid back right into your personal bank account.',
                 },
             ],
         },

From 95aef263be430b670d72a5ff3c760ccd60015dcb Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:22:43 +0100
Subject: [PATCH 018/132] Fix Lint error

---
 src/components/MenuItem.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index afecdc60b178..a55b5990b134 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -3,7 +3,6 @@ import type {ReactElement, ReactNode} from 'react';
 import React, {forwardRef, useContext, useMemo} from 'react';
 import type {GestureResponderEvent, StyleProp, TextStyle, ViewStyle} from 'react-native';
 import {ActivityIndicator, View} from 'react-native';
-import type {AnimatedStyle} from 'react-native-reanimated';
 import type {ValueOf} from 'type-fest';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';

From 2dda8123daf257c0334c89cb9de0a06b8f6b70db Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 29 Aug 2024 13:40:41 -0600
Subject: [PATCH 019/132] fix const

---
 src/CONST.ts                                                | 2 +-
 src/pages/settings/Subscription/CardSection/CardSection.tsx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index e782863af66c..a423a65c1fcd 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1321,7 +1321,7 @@ const CONST = {
     LHN_SKELETON_VIEW_ITEM_HEIGHT: 64,
     SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 108,
     EXPENSIFY_PARTNER_NAME: 'expensify.com',
-    EXPENSIFY_MERCHANT: '"Expensify, Inc."',
+    EXPENSIFY_MERCHANT: 'Expensify, Inc.',
     EMAIL: {
         ACCOUNTING: 'accounting@expensify.com',
         ADMIN: 'admin@expensify.com',
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 17f71b53292a..92ee9fdf3bf8 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -62,6 +62,7 @@ function CardSection() {
 
     const viewPurchases = useCallback(() => {
         const query = SearchUtils.buildQueryStringFromFilters({merchant: CONST.EXPENSIFY_MERCHANT});
+        console.log('over here', query)
         Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query, isCustomQuery: true}));
     }, []);
 

From fe33f7b16be9f3001e2be4e70015af631366a963 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 29 Aug 2024 14:11:11 -0600
Subject: [PATCH 020/132] rm comment

---
 src/pages/settings/Subscription/CardSection/CardSection.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 92ee9fdf3bf8..ad0d14d73095 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -62,7 +62,6 @@ function CardSection() {
 
     const viewPurchases = useCallback(() => {
         const query = SearchUtils.buildQueryStringFromFilters({merchant: CONST.EXPENSIFY_MERCHANT});
-        console.log('over here', query)
         Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query, isCustomQuery: true}));
     }, []);
 
@@ -173,7 +172,7 @@ function CardSection() {
                     />
                 )}
 
-                {/* {!!account?.hasPurchases && ( */}
+                {!!account?.hasPurchases && (
                 <MenuItem
                     shouldShowRightIcon
                     icon={Expensicons.History}
@@ -183,7 +182,7 @@ function CardSection() {
                     onPress={viewPurchases}
                     hoverAndPressStyle={styles.hoveredComponentBG}
                 />
-                {/* )} */}
+                )}
 
                 {!!(subscriptionPlan && account?.isEligibleForRefund) && (
                     <MenuItem

From ee3877e6992633605e693f52fcdab312506a9e4b Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 29 Aug 2024 14:15:54 -0600
Subject: [PATCH 021/132] fix lint

---
 .../Subscription/CardSection/CardSection.tsx   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index ad0d14d73095..2ad6d399c101 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -173,15 +173,15 @@ function CardSection() {
                 )}
 
                 {!!account?.hasPurchases && (
-                <MenuItem
-                    shouldShowRightIcon
-                    icon={Expensicons.History}
-                    wrapperStyle={styles.sectionMenuItemTopDescription}
-                    title={translate('subscription.cardSection.viewPaymentHistory')}
-                    titleStyle={styles.textStrong}
-                    onPress={viewPurchases}
-                    hoverAndPressStyle={styles.hoveredComponentBG}
-                />
+                    <MenuItem
+                        shouldShowRightIcon
+                        icon={Expensicons.History}
+                        wrapperStyle={styles.sectionMenuItemTopDescription}
+                        title={translate('subscription.cardSection.viewPaymentHistory')}
+                        titleStyle={styles.textStrong}
+                        onPress={viewPurchases}
+                        hoverAndPressStyle={styles.hoveredComponentBG}
+                    />
                 )}
 
                 {!!(subscriptionPlan && account?.isEligibleForRefund) && (

From 60c2a45a8ef25f403efbdf33e3a607ab4b06914a Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 29 Aug 2024 18:47:47 -0600
Subject: [PATCH 022/132] update grammar

---
 src/libs/SearchParser/searchParser.js         | 714 ++++++++----------
 src/libs/SearchParser/searchParser.peggy      | 244 +++---
 .../Subscription/CardSection/CardSection.tsx  |   4 +-
 3 files changed, 407 insertions(+), 555 deletions(-)

diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index cdc476f35b60..0766dd217bc8 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -4,10 +4,10 @@
 
 
 
-  function buildFilter(operator, left, right) {
-    return { operator, left, right };
-  }
-
+    function buildFilter(operator, left, right) {
+      return { operator, left, right };
+    }
+  
 function peg$subclass(child, parent) {
   function C() { this.constructor = child; }
   C.prototype = parent.prototype;
@@ -180,31 +180,31 @@ function peg$parse(input, options) {
   var peg$startRuleFunctions = { query: peg$parsequery };
   var peg$startRuleFunction = peg$parsequery;
 
-  var peg$c0 = "policyID";
-  var peg$c1 = "!=";
-  var peg$c2 = ">=";
-  var peg$c3 = ">";
-  var peg$c4 = "<=";
-  var peg$c5 = "<";
-  var peg$c6 = "date";
-  var peg$c7 = "amount";
-  var peg$c8 = "merchant";
-  var peg$c9 = "description";
-  var peg$c10 = "reportID";
-  var peg$c11 = "keyword";
-  var peg$c12 = "type";
-  var peg$c13 = "status";
-  var peg$c14 = "sortBy";
-  var peg$c15 = "sortOrder";
-  var peg$c16 = "in";
-  var peg$c17 = "currency";
-  var peg$c18 = "tag";
-  var peg$c19 = "category";
-  var peg$c20 = "to";
-  var peg$c21 = "taxRate";
-  var peg$c22 = "cardID";
-  var peg$c23 = "from";
-  var peg$c24 = "expenseType";
+  var peg$c0 = "!=";
+  var peg$c1 = ">=";
+  var peg$c2 = ">";
+  var peg$c3 = "<=";
+  var peg$c4 = "<";
+  var peg$c5 = "date";
+  var peg$c6 = "amount";
+  var peg$c7 = "merchant";
+  var peg$c8 = "description";
+  var peg$c9 = "reportID";
+  var peg$c10 = "keyword";
+  var peg$c11 = "in";
+  var peg$c12 = "currency";
+  var peg$c13 = "tag";
+  var peg$c14 = "category";
+  var peg$c15 = "to";
+  var peg$c16 = "taxRate";
+  var peg$c17 = "cardID";
+  var peg$c18 = "from";
+  var peg$c19 = "expenseType";
+  var peg$c20 = "type";
+  var peg$c21 = "status";
+  var peg$c22 = "sortBy";
+  var peg$c23 = "sortOrder";
+  var peg$c24 = "policyID";
   var peg$c25 = "\"";
 
   var peg$r0 = /^[:=]/;
@@ -212,106 +212,103 @@ function peg$parse(input, options) {
   var peg$r2 = /^[A-Za-z0-9_@.\/#&+\-\\',;]/;
   var peg$r3 = /^[ \t\r\n]/;
 
-  var peg$e0 = peg$otherExpectation("policyID filter");
-  var peg$e1 = peg$literalExpectation("policyID", false);
-  var peg$e2 = peg$otherExpectation("operator");
-  var peg$e3 = peg$classExpectation([":", "="], false, false);
-  var peg$e4 = peg$literalExpectation("!=", false);
-  var peg$e5 = peg$literalExpectation(">=", false);
-  var peg$e6 = peg$literalExpectation(">", false);
-  var peg$e7 = peg$literalExpectation("<=", false);
-  var peg$e8 = peg$literalExpectation("<", false);
-  var peg$e9 = peg$otherExpectation("key");
-  var peg$e10 = peg$literalExpectation("date", false);
-  var peg$e11 = peg$literalExpectation("amount", false);
-  var peg$e12 = peg$literalExpectation("merchant", false);
-  var peg$e13 = peg$literalExpectation("description", false);
-  var peg$e14 = peg$literalExpectation("reportID", false);
-  var peg$e15 = peg$literalExpectation("keyword", false);
-  var peg$e16 = peg$otherExpectation("default key");
-  var peg$e17 = peg$literalExpectation("type", false);
-  var peg$e18 = peg$literalExpectation("status", false);
-  var peg$e19 = peg$literalExpectation("sortBy", false);
-  var peg$e20 = peg$literalExpectation("sortOrder", false);
-  var peg$e21 = peg$otherExpectation("multiselect key");
-  var peg$e22 = peg$literalExpectation("in", false);
-  var peg$e23 = peg$literalExpectation("currency", false);
-  var peg$e24 = peg$literalExpectation("tag", false);
-  var peg$e25 = peg$literalExpectation("category", false);
-  var peg$e26 = peg$literalExpectation("to", false);
-  var peg$e27 = peg$literalExpectation("taxRate", false);
-  var peg$e28 = peg$literalExpectation("cardID", false);
-  var peg$e29 = peg$literalExpectation("from", false);
-  var peg$e30 = peg$literalExpectation("expenseType", false);
-  var peg$e31 = peg$otherExpectation("quote");
-  var peg$e32 = peg$literalExpectation("\"", false);
-  var peg$e33 = peg$classExpectation(["\"", "\r", "\n"], true, false);
-  var peg$e34 = peg$otherExpectation("word");
-  var peg$e35 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_", "@", ".", "/", "#", "&", "+", "-", "\\", "'", ",", ";"], false, false);
-  var peg$e36 = peg$otherExpectation("whitespace");
-  var peg$e37 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
+  var peg$e0 = peg$otherExpectation("operator");
+  var peg$e1 = peg$classExpectation([":", "="], false, false);
+  var peg$e2 = peg$literalExpectation("!=", false);
+  var peg$e3 = peg$literalExpectation(">=", false);
+  var peg$e4 = peg$literalExpectation(">", false);
+  var peg$e5 = peg$literalExpectation("<=", false);
+  var peg$e6 = peg$literalExpectation("<", false);
+  var peg$e7 = peg$otherExpectation("key");
+  var peg$e8 = peg$literalExpectation("date", false);
+  var peg$e9 = peg$literalExpectation("amount", false);
+  var peg$e10 = peg$literalExpectation("merchant", false);
+  var peg$e11 = peg$literalExpectation("description", false);
+  var peg$e12 = peg$literalExpectation("reportID", false);
+  var peg$e13 = peg$literalExpectation("keyword", false);
+  var peg$e14 = peg$literalExpectation("in", false);
+  var peg$e15 = peg$literalExpectation("currency", false);
+  var peg$e16 = peg$literalExpectation("tag", false);
+  var peg$e17 = peg$literalExpectation("category", false);
+  var peg$e18 = peg$literalExpectation("to", false);
+  var peg$e19 = peg$literalExpectation("taxRate", false);
+  var peg$e20 = peg$literalExpectation("cardID", false);
+  var peg$e21 = peg$literalExpectation("from", false);
+  var peg$e22 = peg$literalExpectation("expenseType", false);
+  var peg$e23 = peg$otherExpectation("default key");
+  var peg$e24 = peg$literalExpectation("type", false);
+  var peg$e25 = peg$literalExpectation("status", false);
+  var peg$e26 = peg$literalExpectation("sortBy", false);
+  var peg$e27 = peg$literalExpectation("sortOrder", false);
+  var peg$e28 = peg$literalExpectation("policyID", false);
+  var peg$e29 = peg$otherExpectation("quote");
+  var peg$e30 = peg$literalExpectation("\"", false);
+  var peg$e31 = peg$classExpectation(["\"", "\r", "\n"], true, false);
+  var peg$e32 = peg$otherExpectation("word");
+  var peg$e33 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_", "@", ".", "/", "#", "&", "+", "-", "\\", "'", ",", ";"], false, false);
+  var peg$e34 = peg$otherExpectation("whitespace");
+  var peg$e35 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
-      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-        .filter((filter) => filter !== null)
-        .filter(Boolean);
-      if (!allFilters.length) {
-        return null;
-      }
-
-      const keywords = allFilters.filter(
-        (filter) =>
-          filter.left === "keyword" || filter.right?.left === "keyword"
-      );
-      const nonKeywords = allFilters.filter(
-        (filter) =>
-          filter.left !== "keyword" && filter.right?.left !== "keyword"
-      );
-
-      if (!nonKeywords.length) {
-        return keywords.reduce((result, filter) =>
-          buildFilter("or", result, filter)
+        const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+          .filter((filter) => filter !== null)
+          .filter(Boolean);
+        if (!allFilters.length) {
+          return null;
+        }
+  
+        const keywords = allFilters.filter(
+          (filter) =>
+            filter.left === "keyword" || filter.right?.left === "keyword"
         );
-      }
-      if (!keywords.length) {
-        return nonKeywords.reduce((result, filter) =>
-          buildFilter("and", result, filter)
+        const nonKeywords = allFilters.filter(
+          (filter) =>
+            filter.left !== "keyword" && filter.right?.left !== "keyword"
         );
-      }
-
-      return buildFilter(
-        "and",
-        keywords.reduce((result, filter) => buildFilter("or", result, filter)),
-        nonKeywords.reduce((result, filter) =>
-          buildFilter("and", result, filter)
-        )
-      );
-    };
+  
+        if (!nonKeywords.length) {
+          return keywords.reduce((result, filter) =>
+            buildFilter("or", result, filter)
+          );
+        }
+        if (!keywords.length) {
+          return nonKeywords.reduce((result, filter) =>
+            buildFilter("and", result, filter)
+          );
+        }
+  
+        return buildFilter(
+          "and",
+          keywords.reduce((result, filter) => buildFilter("or", result, filter)),
+          nonKeywords.reduce((result, filter) =>
+            buildFilter("and", result, filter)
+          )
+        );
+      };
   var peg$f2 = function(key, op, value) {
-      updateDefaultValues(key, value.trim());
-    };
-  var peg$f3 = function(value) { return buildFilter("eq", "keyword", value.trim()); };
-  var peg$f4 = function(field, op, value) { return buildFilter(op, field, value); };
-  var peg$f5 = function(field, op, value) {
-      return buildFilter(op, field, value);
-    };
-  var peg$f6 = function(field, op, value) {
-  	  return buildFilter(op, field, value);
-    };
-  var peg$f7 = function(field, op, value) {
-      updateDefaultValues(field, value.trim());
-    };
-  var peg$f8 = function() { return "eq"; };
-  var peg$f9 = function() { return "neq"; };
-  var peg$f10 = function() { return "gte"; };
-  var peg$f11 = function() { return "gt"; };
-  var peg$f12 = function() { return "lte"; };
-  var peg$f13 = function() { return "lt"; };
-  var peg$f14 = function(parts) { return parts.join(""); };
-  var peg$f15 = function(chars) { return chars.join(""); };
-  var peg$f16 = function(chars) { return chars.join(""); };
-  var peg$f17 = function() { return "and"; };
+        updateDefaultValues(key, value);
+      };
+  var peg$f3 = function(value) { return buildFilter("eq", "keyword", value); };
+  var peg$f4 = function(field, op, value) {
+          return buildFilter(op, field, value);
+      };
+  var peg$f5 = function() { return "eq"; };
+  var peg$f6 = function() { return "neq"; };
+  var peg$f7 = function() { return "gte"; };
+  var peg$f8 = function() { return "gt"; };
+  var peg$f9 = function() { return "lte"; };
+  var peg$f10 = function() { return "lt"; };
+  var peg$f11 = function(parts) {
+      const value = parts.flat(); 
+      if (value.length > 1) {
+          return value;
+      }
+      return value[0];
+  };
+  var peg$f12 = function(chars) { return chars.join("").trim(); };
+  var peg$f13 = function(chars) { return chars.join("").trim().split(",").filter(val => val); };
+  var peg$f14 = function() { return "and"; };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -534,20 +531,11 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = peg$currPos;
-    s1 = peg$parsepolicyIDFilter();
+    s1 = peg$parsedefaultFilter();
     if (s1 === peg$FAILED) {
-      s1 = peg$parsequotedStringFilter();
+      s1 = peg$parsestandardFilter();
       if (s1 === peg$FAILED) {
-        s1 = peg$parsestandardFilter();
-        if (s1 === peg$FAILED) {
-          s1 = peg$parsedefaultFilter();
-          if (s1 === peg$FAILED) {
-            s1 = peg$parsemultiSelectFilter();
-            if (s1 === peg$FAILED) {
-              s1 = peg$parsefreeTextFilter();
-            }
-          }
-        }
+        s1 = peg$parsefreeTextFilter();
       }
     }
     if (s1 !== peg$FAILED) {
@@ -609,68 +597,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsequotedStringFilter() {
-    var s0, s1, s2, s3, s4, s5, s6;
-
-    s0 = peg$currPos;
-    s1 = peg$parse_();
-    s2 = peg$parsekey();
-    if (s2 !== peg$FAILED) {
-      s3 = peg$parse_();
-      s4 = peg$parseoperator();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parse_();
-        s6 = peg$parsequotedString();
-        if (s6 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f4(s2, s4, s6);
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsemultiSelectFilter() {
-    var s0, s1, s2, s3, s4, s5, s6;
-
-    s0 = peg$currPos;
-    s1 = peg$parse_();
-    s2 = peg$parsemultiselectKey();
-    if (s2 !== peg$FAILED) {
-      s3 = peg$parse_();
-      s4 = peg$parseoperator();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parse_();
-        s6 = peg$parseidentifier();
-        if (s6 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f5(s2, s4, s6);
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
   function peg$parsestandardFilter() {
     var s0, s1, s2, s3, s4, s5, s6;
 
@@ -685,45 +611,7 @@ function peg$parse(input, options) {
         s6 = peg$parseidentifier();
         if (s6 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f6(s2, s4, s6);
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsepolicyIDFilter() {
-    var s0, s1, s2, s3, s4, s5, s6;
-
-    peg$silentFails++;
-    s0 = peg$currPos;
-    s1 = peg$parse_();
-    if (input.substr(peg$currPos, 8) === peg$c0) {
-      s2 = peg$c0;
-      peg$currPos += 8;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e1); }
-    }
-    if (s2 !== peg$FAILED) {
-      s3 = peg$parse_();
-      s4 = peg$parseoperator();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parse_();
-        s6 = peg$parseidentifier();
-        if (s6 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f7(s2, s4, s6);
+          s0 = peg$f4(s2, s4, s6);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -736,11 +624,6 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    peg$silentFails--;
-    if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e0); }
-    }
 
     return s0;
   }
@@ -755,81 +638,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e3); }
+      if (peg$silentFails === 0) { peg$fail(peg$e1); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f8();
+      s1 = peg$f5();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c1) {
-        s1 = peg$c1;
+      if (input.substr(peg$currPos, 2) === peg$c0) {
+        s1 = peg$c0;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e4); }
+        if (peg$silentFails === 0) { peg$fail(peg$e2); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f9();
+        s1 = peg$f6();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c2) {
-          s1 = peg$c2;
+        if (input.substr(peg$currPos, 2) === peg$c1) {
+          s1 = peg$c1;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e5); }
+          if (peg$silentFails === 0) { peg$fail(peg$e3); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f10();
+          s1 = peg$f7();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c3;
+            s1 = peg$c2;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e6); }
+            if (peg$silentFails === 0) { peg$fail(peg$e4); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f11();
+            s1 = peg$f8();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c4) {
-              s1 = peg$c4;
+            if (input.substr(peg$currPos, 2) === peg$c3) {
+              s1 = peg$c3;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e7); }
+              if (peg$silentFails === 0) { peg$fail(peg$e5); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f12();
+              s1 = peg$f9();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c5;
+                s1 = peg$c4;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e8); }
+                if (peg$silentFails === 0) { peg$fail(peg$e6); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f13();
+                s1 = peg$f10();
               }
               s0 = s1;
             }
@@ -840,7 +723,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e2); }
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
     }
 
     return s0;
@@ -851,52 +734,133 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c6) {
-      s1 = peg$c6;
+    if (input.substr(peg$currPos, 4) === peg$c5) {
+      s1 = peg$c5;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      if (peg$silentFails === 0) { peg$fail(peg$e8); }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 6) === peg$c7) {
-        s1 = peg$c7;
+      if (input.substr(peg$currPos, 6) === peg$c6) {
+        s1 = peg$c6;
         peg$currPos += 6;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e11); }
+        if (peg$silentFails === 0) { peg$fail(peg$e9); }
       }
       if (s1 === peg$FAILED) {
-        if (input.substr(peg$currPos, 8) === peg$c8) {
-          s1 = peg$c8;
+        if (input.substr(peg$currPos, 8) === peg$c7) {
+          s1 = peg$c7;
           peg$currPos += 8;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e12); }
+          if (peg$silentFails === 0) { peg$fail(peg$e10); }
         }
         if (s1 === peg$FAILED) {
-          if (input.substr(peg$currPos, 11) === peg$c9) {
-            s1 = peg$c9;
+          if (input.substr(peg$currPos, 11) === peg$c8) {
+            s1 = peg$c8;
             peg$currPos += 11;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e13); }
+            if (peg$silentFails === 0) { peg$fail(peg$e11); }
           }
           if (s1 === peg$FAILED) {
-            if (input.substr(peg$currPos, 8) === peg$c10) {
-              s1 = peg$c10;
+            if (input.substr(peg$currPos, 8) === peg$c9) {
+              s1 = peg$c9;
               peg$currPos += 8;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e14); }
+              if (peg$silentFails === 0) { peg$fail(peg$e12); }
             }
             if (s1 === peg$FAILED) {
-              if (input.substr(peg$currPos, 7) === peg$c11) {
-                s1 = peg$c11;
+              if (input.substr(peg$currPos, 7) === peg$c10) {
+                s1 = peg$c10;
                 peg$currPos += 7;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e15); }
+                if (peg$silentFails === 0) { peg$fail(peg$e13); }
+              }
+              if (s1 === peg$FAILED) {
+                if (input.substr(peg$currPos, 2) === peg$c11) {
+                  s1 = peg$c11;
+                  peg$currPos += 2;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e14); }
+                }
+                if (s1 === peg$FAILED) {
+                  if (input.substr(peg$currPos, 8) === peg$c12) {
+                    s1 = peg$c12;
+                    peg$currPos += 8;
+                  } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) { peg$fail(peg$e15); }
+                  }
+                  if (s1 === peg$FAILED) {
+                    if (input.substr(peg$currPos, 3) === peg$c13) {
+                      s1 = peg$c13;
+                      peg$currPos += 3;
+                    } else {
+                      s1 = peg$FAILED;
+                      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+                    }
+                    if (s1 === peg$FAILED) {
+                      if (input.substr(peg$currPos, 8) === peg$c14) {
+                        s1 = peg$c14;
+                        peg$currPos += 8;
+                      } else {
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+                      }
+                      if (s1 === peg$FAILED) {
+                        if (input.substr(peg$currPos, 2) === peg$c15) {
+                          s1 = peg$c15;
+                          peg$currPos += 2;
+                        } else {
+                          s1 = peg$FAILED;
+                          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+                        }
+                        if (s1 === peg$FAILED) {
+                          if (input.substr(peg$currPos, 7) === peg$c16) {
+                            s1 = peg$c16;
+                            peg$currPos += 7;
+                          } else {
+                            s1 = peg$FAILED;
+                            if (peg$silentFails === 0) { peg$fail(peg$e19); }
+                          }
+                          if (s1 === peg$FAILED) {
+                            if (input.substr(peg$currPos, 6) === peg$c17) {
+                              s1 = peg$c17;
+                              peg$currPos += 6;
+                            } else {
+                              s1 = peg$FAILED;
+                              if (peg$silentFails === 0) { peg$fail(peg$e20); }
+                            }
+                            if (s1 === peg$FAILED) {
+                              if (input.substr(peg$currPos, 4) === peg$c18) {
+                                s1 = peg$c18;
+                                peg$currPos += 4;
+                              } else {
+                                s1 = peg$FAILED;
+                                if (peg$silentFails === 0) { peg$fail(peg$e21); }
+                              }
+                              if (s1 === peg$FAILED) {
+                                if (input.substr(peg$currPos, 11) === peg$c19) {
+                                  s1 = peg$c19;
+                                  peg$currPos += 11;
+                                } else {
+                                  s1 = peg$FAILED;
+                                  if (peg$silentFails === 0) { peg$fail(peg$e22); }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
               }
             }
           }
@@ -912,7 +876,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      if (peg$silentFails === 0) { peg$fail(peg$e7); }
     }
 
     return s0;
@@ -923,134 +887,44 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c12) {
-      s1 = peg$c12;
+    if (input.substr(peg$currPos, 4) === peg$c20) {
+      s1 = peg$c20;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 6) === peg$c13) {
-        s1 = peg$c13;
+      if (input.substr(peg$currPos, 6) === peg$c21) {
+        s1 = peg$c21;
         peg$currPos += 6;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e18); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 === peg$FAILED) {
-        if (input.substr(peg$currPos, 6) === peg$c14) {
-          s1 = peg$c14;
+        if (input.substr(peg$currPos, 6) === peg$c22) {
+          s1 = peg$c22;
           peg$currPos += 6;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e19); }
+          if (peg$silentFails === 0) { peg$fail(peg$e26); }
         }
         if (s1 === peg$FAILED) {
-          if (input.substr(peg$currPos, 9) === peg$c15) {
-            s1 = peg$c15;
+          if (input.substr(peg$currPos, 9) === peg$c23) {
+            s1 = peg$c23;
             peg$currPos += 9;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e20); }
-          }
-        }
-      }
-    }
-    if (s1 !== peg$FAILED) {
-      s0 = s1;
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    peg$silentFails--;
-    if (s0 === peg$FAILED) {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e16); }
-    }
-
-    return s0;
-  }
-
-  function peg$parsemultiselectKey() {
-    var s0, s1;
-
-    peg$silentFails++;
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c16) {
-      s1 = peg$c16;
-      peg$currPos += 2;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
-    }
-    if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 8) === peg$c17) {
-        s1 = peg$c17;
-        peg$currPos += 8;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e23); }
-      }
-      if (s1 === peg$FAILED) {
-        if (input.substr(peg$currPos, 3) === peg$c18) {
-          s1 = peg$c18;
-          peg$currPos += 3;
-        } else {
-          s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e24); }
-        }
-        if (s1 === peg$FAILED) {
-          if (input.substr(peg$currPos, 8) === peg$c19) {
-            s1 = peg$c19;
-            peg$currPos += 8;
-          } else {
-            s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e25); }
+            if (peg$silentFails === 0) { peg$fail(peg$e27); }
           }
           if (s1 === peg$FAILED) {
-            if (input.substr(peg$currPos, 2) === peg$c20) {
-              s1 = peg$c20;
-              peg$currPos += 2;
+            if (input.substr(peg$currPos, 8) === peg$c24) {
+              s1 = peg$c24;
+              peg$currPos += 8;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e26); }
-            }
-            if (s1 === peg$FAILED) {
-              if (input.substr(peg$currPos, 7) === peg$c21) {
-                s1 = peg$c21;
-                peg$currPos += 7;
-              } else {
-                s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e27); }
-              }
-              if (s1 === peg$FAILED) {
-                if (input.substr(peg$currPos, 6) === peg$c22) {
-                  s1 = peg$c22;
-                  peg$currPos += 6;
-                } else {
-                  s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e28); }
-                }
-                if (s1 === peg$FAILED) {
-                  if (input.substr(peg$currPos, 4) === peg$c23) {
-                    s1 = peg$c23;
-                    peg$currPos += 4;
-                  } else {
-                    s1 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$e29); }
-                  }
-                  if (s1 === peg$FAILED) {
-                    if (input.substr(peg$currPos, 11) === peg$c24) {
-                      s1 = peg$c24;
-                      peg$currPos += 11;
-                    } else {
-                      s1 = peg$FAILED;
-                      if (peg$silentFails === 0) { peg$fail(peg$e30); }
-                    }
-                  }
-                }
-              }
+              if (peg$silentFails === 0) { peg$fail(peg$e28); }
             }
           }
         }
@@ -1065,7 +939,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
 
     return s0;
@@ -1093,7 +967,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f14(s1);
+      s1 = peg$f11(s1);
     }
     s0 = s1;
 
@@ -1110,7 +984,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1119,7 +993,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -1128,7 +1002,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e33); }
+          if (peg$silentFails === 0) { peg$fail(peg$e31); }
         }
       }
       if (input.charCodeAt(peg$currPos) === 34) {
@@ -1136,11 +1010,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f15(s2);
+        s0 = peg$f12(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1152,7 +1026,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
 
     return s0;
@@ -1169,7 +1043,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -1179,7 +1053,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e35); }
+          if (peg$silentFails === 0) { peg$fail(peg$e33); }
         }
       }
     } else {
@@ -1187,13 +1061,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16(s1);
+      s1 = peg$f13(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
 
     return s0;
@@ -1205,7 +1079,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f17();
+    s1 = peg$f14();
     s0 = s1;
 
     return s0;
@@ -1221,7 +1095,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -1230,35 +1104,35 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e37); }
+        if (peg$silentFails === 0) { peg$fail(peg$e35); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e36); }
+    if (peg$silentFails === 0) { peg$fail(peg$e34); }
 
     return s0;
   }
 
 
-  const defaultValues = {
-    type: "expense",
-    status: "all",
-    sortBy: "date",
-    sortOrder: "desc",
-  };
-
-  function applyDefaults(filters) {
-    return {
-      ...defaultValues,
-      filters,
+    const defaultValues = {
+      type: "expense",
+      status: "all",
+      sortBy: "date",
+      sortOrder: "desc",
     };
-  }
-
-  function updateDefaultValues(field, value) {
-    defaultValues[field] = value;
-  }
-
+  
+    function applyDefaults(filters) {
+      return {
+        ...defaultValues,
+        filters,
+      };
+    }
+  
+    function updateDefaultValues(field, value) {
+      defaultValues[field] = value;
+    }
+  
   peg$result = peg$startRuleFunction();
 
   if (options.peg$library) {
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index a0d0960cbef1..2f1e1aa1dccb 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -23,141 +23,119 @@
 
 // global initializer (code executed only once)
 {{
-  function buildFilter(operator, left, right) {
-    return { operator, left, right };
-  }
-}}
-
-// per-parser initializer (code executed before every parse)
-{
-  const defaultValues = {
-    type: "expense",
-    status: "all",
-    sortBy: "date",
-    sortOrder: "desc",
-  };
-
-  function applyDefaults(filters) {
-    return {
-      ...defaultValues,
-      filters,
+    function buildFilter(operator, left, right) {
+      return { operator, left, right };
+    }
+  }}
+  
+  // per-parser initializer (code executed before every parse)
+  {
+    const defaultValues = {
+      type: "expense",
+      status: "all",
+      sortBy: "date",
+      sortOrder: "desc",
     };
+  
+    function applyDefaults(filters) {
+      return {
+        ...defaultValues,
+        filters,
+      };
+    }
+  
+    function updateDefaultValues(field, value) {
+      defaultValues[field] = value;
+    }
   }
-
-  function updateDefaultValues(field, value) {
-    defaultValues[field] = value;
-  }
-}
-
-query = _ filters:filterList? _ { return applyDefaults(filters); }
-
-filterList
-  = head:filter tail:(logicalAnd filter)* {
-      const allFilters = [head, ...tail.map(([_, filter]) => filter)]
-        .filter((filter) => filter !== null)
-        .filter(Boolean);
-      if (!allFilters.length) {
-        return null;
-      }
-
-      const keywords = allFilters.filter(
-        (filter) =>
-          filter.left === "keyword" || filter.right?.left === "keyword"
-      );
-      const nonKeywords = allFilters.filter(
-        (filter) =>
-          filter.left !== "keyword" && filter.right?.left !== "keyword"
-      );
-
-      if (!nonKeywords.length) {
-        return keywords.reduce((result, filter) =>
-          buildFilter("or", result, filter)
+  
+  query = _ filters:filterList? _ { return applyDefaults(filters); }
+  
+  filterList
+    = head:filter tail:(logicalAnd filter)* {
+        const allFilters = [head, ...tail.map(([_, filter]) => filter)]
+          .filter((filter) => filter !== null)
+          .filter(Boolean);
+        if (!allFilters.length) {
+          return null;
+        }
+  
+        const keywords = allFilters.filter(
+          (filter) =>
+            filter.left === "keyword" || filter.right?.left === "keyword"
         );
-      }
-      if (!keywords.length) {
-        return nonKeywords.reduce((result, filter) =>
-          buildFilter("and", result, filter)
+        const nonKeywords = allFilters.filter(
+          (filter) =>
+            filter.left !== "keyword" && filter.right?.left !== "keyword"
+        );
+  
+        if (!nonKeywords.length) {
+          return keywords.reduce((result, filter) =>
+            buildFilter("or", result, filter)
+          );
+        }
+        if (!keywords.length) {
+          return nonKeywords.reduce((result, filter) =>
+            buildFilter("and", result, filter)
+          );
+        }
+  
+        return buildFilter(
+          "and",
+          keywords.reduce((result, filter) => buildFilter("or", result, filter)),
+          nonKeywords.reduce((result, filter) =>
+            buildFilter("and", result, filter)
+          )
         );
       }
-
-      return buildFilter(
-        "and",
-        keywords.reduce((result, filter) => buildFilter("or", result, filter)),
-        nonKeywords.reduce((result, filter) =>
-          buildFilter("and", result, filter)
-        )
-      );
-    }
-
-filter
-  = @(
-      policyIDFilter
-      / quotedStringFilter
-      / standardFilter
-      / defaultFilter
-      / multiSelectFilter
-      / freeTextFilter
-    )
-
-defaultFilter
-  = _ key:defaultKey _ op:operator _ value:identifier {
-      updateDefaultValues(key, value.trim());
-    }
-
-freeTextFilter
-  = _ value:identifier _ { return buildFilter("eq", "keyword", value.trim()); }
-
-quotedStringFilter
-  = _ field:key _ op:operator _ value:quotedString { return buildFilter(op, field, value); }
-
-multiSelectFilter
-  = _ field:multiselectKey _ op:operator _ value:identifier {
-      return buildFilter(op, field, value);
-    }
-
-standardFilter
-  = _ field:key _ op:operator _ value:identifier {
-  	  return buildFilter(op, field, value);
-    }
-
-policyIDFilter "policyID filter"
-  = _ field:"policyID" _ op:operator _ value:identifier {
-      updateDefaultValues(field, value.trim());
-    }
-
-operator "operator"
-  = (":" / "=") { return "eq"; }
-  / "!=" { return "neq"; }
-  / ">=" { return "gte"; }
-  / ">" { return "gt"; }
-  / "<=" { return "lte"; }
-  / "<" { return "lt"; }
-
-key "key"
-  = @("date" / "amount" / "merchant" / "description" / "reportID" / "keyword")
-
-defaultKey "default key" = @("type" / "status" / "sortBy" / "sortOrder")
-
-multiselectKey "multiselect key"
-  = @(
-      "in"
-      / "currency"
-      / "tag"
-      / "category"
-      / "to"
-      / "taxRate"
-      / "cardID"
-      / "from"
-      / "expenseType"
-    )
-
-identifier = parts:(quotedString / alphanumeric)+ { return parts.join(""); }
-
-quotedString "quote" = "\"" chars:[^"\r\n]* "\"" { return chars.join(""); }
-
-alphanumeric "word"
-  = chars:[A-Za-z0-9_@./#&+\-\\',;]+ { return chars.join(""); }
-
-logicalAnd = _ { return "and"; }
-
-_ "whitespace" = [ \t\r\n]*
+  
+  filter
+    = @(
+        defaultFilter
+        / standardFilter
+        / freeTextFilter
+      )
+  
+  defaultFilter
+    = _ key:defaultKey _ op:operator _ value:identifier {
+        updateDefaultValues(key, value);
+      }
+  
+  freeTextFilter
+    = _ value:identifier _ { return buildFilter("eq", "keyword", value); }
+  
+  standardFilter
+    = _ field:key _ op:operator _ value:identifier {
+          return buildFilter(op, field, value);
+      }
+      
+  operator "operator"
+    = (":" / "=") { return "eq"; }
+    / "!=" { return "neq"; }
+    / ">=" { return "gte"; }
+    / ">" { return "gt"; }
+    / "<=" { return "lte"; }
+    / "<" { return "lt"; }
+  
+  key "key"
+    = @("date" / "amount" / "merchant" / "description" / "reportID" / "keyword" / "in" / "currency" / "tag" / "category" / "to" / "taxRate" / "cardID" / "from" / "expenseType")
+  
+  defaultKey "default key" = @("type" / "status" / "sortBy" / "sortOrder" / "policyID")
+  
+  identifier = parts:(quotedString / alphanumeric)+ {
+      const value = parts.flat(); 
+      if (value.length > 1) {
+          return value;
+      }
+      return value[0];
+  }
+  
+  quotedString "quote" = "\"" chars:[^"\r\n]* "\"" { return chars.join("").trim(); }
+  
+  alphanumeric "word"
+    = chars:[A-Za-z0-9_@./#&+\-\\',;]+ { return chars.join("").trim().split(",").filter(val => val); }
+  
+  logicalAnd = _ { return "and"; }
+  
+  _ "whitespace" = [ \t\r\n]*
+  
\ No newline at end of file
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 2ad6d399c101..b014611c172d 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -172,7 +172,7 @@ function CardSection() {
                     />
                 )}
 
-                {!!account?.hasPurchases && (
+                {/* {!!account?.hasPurchases && ( */}
                     <MenuItem
                         shouldShowRightIcon
                         icon={Expensicons.History}
@@ -182,7 +182,7 @@ function CardSection() {
                         onPress={viewPurchases}
                         hoverAndPressStyle={styles.hoveredComponentBG}
                     />
-                )}
+                {/* )} */}
 
                 {!!(subscriptionPlan && account?.isEligibleForRefund) && (
                     <MenuItem

From 91418577993607a6b1326e080c7c56529e16aa76 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Fri, 30 Aug 2024 23:30:16 +0300
Subject: [PATCH 023/132] replace correct canModifyReceipt logic in search
 receipt icon

---
 .../SelectionList/Search/TransactionListItemRow.tsx   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
index 64c5f6a768f4..7314446e75dd 100644
--- a/src/components/SelectionList/Search/TransactionListItemRow.tsx
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import Checkbox from '@components/Checkbox';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -16,11 +17,14 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import DateUtils from '@libs/DateUtils';
 import Parser from '@libs/Parser';
+import {getIOUActionForReportID} from '@libs/ReportActionsUtils';
+import * as ReportUtils from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchTransactionType} from '@src/types/onyx/SearchResults';
 import ActionCell from './ActionCell';
 import ExpenseItemHeaderNarrow from './ExpenseItemHeaderNarrow';
@@ -79,7 +83,12 @@ function ReceiptCell({transactionItem}: TransactionCellProps) {
     const backgroundStyles = transactionItem.isSelected ? StyleUtils.getBackgroundColorStyle(theme.buttonHoveredBG) : StyleUtils.getBackgroundColorStyle(theme.border);
 
     const isViewAction = transactionItem.action === CONST.SEARCH.ACTION_TYPES.VIEW;
-    const canModifyReceipt = isViewAction && transactionItem.canDelete;
+    const parentReportAction = getIOUActionForReportID(transactionItem.reportID, transactionItem.transactionID);
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.reportID ?? '-1'}`);
+    const canUserPerformWriteAction = !!ReportUtils.canUserPerformWriteAction(report);
+    const canEditReceipt = canUserPerformWriteAction && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT);
+
+    const canModifyReceipt = isViewAction && canEditReceipt;
 
     return (
         <View

From 5240cadd1ff43d860ef51d0e9ce610f15b0fd3eb Mon Sep 17 00:00:00 2001
From: Dysto coder <dystovskycoder@gmail.com>
Date: Mon, 2 Sep 2024 12:03:07 +0300
Subject: [PATCH 024/132] Display cleaned tag name on review page

---
 src/pages/TransactionDuplicate/ReviewTag.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/TransactionDuplicate/ReviewTag.tsx b/src/pages/TransactionDuplicate/ReviewTag.tsx
index abab4d3e03f3..405c4fbc9964 100644
--- a/src/pages/TransactionDuplicate/ReviewTag.tsx
+++ b/src/pages/TransactionDuplicate/ReviewTag.tsx
@@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize';
 import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
 import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
 import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import type SCREENS from '@src/SCREENS';
 import type {FieldItemType} from './ReviewFields';
@@ -26,7 +27,7 @@ function ReviewTag() {
                 !tag
                     ? {text: translate('violations.none'), value: ''}
                     : {
-                          text: tag,
+                          text: PolicyUtils.getCleanedTagName(tag),
                           value: tag,
                       },
             ),

From 09a8b0fa81bac5264aa7caadc9f00ba785eea329 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Mon, 2 Sep 2024 19:02:34 +0700
Subject: [PATCH 025/132] Remove unnecessary reset validateCodeSent

---
 .../Profile/Contacts/ContactMethodDetailsPage.tsx         | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
index 21321f5e6740..f5979f11949e 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
@@ -132,14 +132,6 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
         User.deleteContactMethod(contactMethod, loginList ?? {}, backTo);
     }, [contactMethod, loginList, toggleDeleteModal, backTo]);
 
-    useEffect(() => {
-        if (isEmptyObject(loginData)) {
-            return;
-        }
-        User.resetContactMethodValidateCodeSentState(contactMethod);
-        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, []);
-
     const prevValidatedDate = usePrevious(loginData?.validatedDate);
     useEffect(() => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing

From 29158fa2eee1e9bb4a249d6a8e4debea7a8d3596 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Mon, 2 Sep 2024 16:30:19 +0200
Subject: [PATCH 026/132] feat: bump haptic-feedback, remove old patch and add
 new one

---
 ios/Podfile.lock                              |  4 +-
 package-lock.json                             | 10 +++-
 package.json                                  |  2 +-
 .../react-native-haptic-feedback+2.2.0.patch  | 30 ----------
 .../react-native-haptic-feedback+2.3.1.patch  | 55 +++++++++++++++++++
 5 files changed, 65 insertions(+), 36 deletions(-)
 delete mode 100644 patches/react-native-haptic-feedback+2.2.0.patch
 create mode 100644 patches/react-native-haptic-feedback+2.3.1.patch

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d688213fafb4..e89c21fbec0f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2453,7 +2453,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNReactNativeHapticFeedback (2.2.0):
+  - RNReactNativeHapticFeedback (2.3.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3239,7 +3239,7 @@ SPEC CHECKSUMS:
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: 5ab6bfd249cd67262615153c648f8d809aab781c
   RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28
-  RNReactNativeHapticFeedback: a15b431d2903bc2eb3474ff8d9a05d3e67a70199
+  RNReactNativeHapticFeedback: 31833c3ef341d716dbbd9d64e940f0c230db46f6
   RNReanimated: 76901886830e1032f16bbf820153f7dc3f02d51d
   RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2
   RNShare: a3c2fbbca5682530b65ff405b34c91dad1e22442
diff --git a/package-lock.json b/package-lock.json
index a7c9fc4fb570..6d272bf140c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,7 +94,7 @@
         "react-native-fs": "^2.20.0",
         "react-native-gesture-handler": "2.18.0",
         "react-native-google-places-autocomplete": "2.5.6",
-        "react-native-haptic-feedback": "^2.2.0",
+        "react-native-haptic-feedback": "^2.3.1",
         "react-native-image-picker": "^7.0.3",
         "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#93399c6410de32966eb57085936ef6951398c2c3",
         "react-native-key-command": "^1.0.8",
@@ -37322,8 +37322,12 @@
       }
     },
     "node_modules/react-native-haptic-feedback": {
-      "version": "2.2.0",
-      "license": "MIT",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/react-native-haptic-feedback/-/react-native-haptic-feedback-2.3.1.tgz",
+      "integrity": "sha512-dPfjV4iVHfhVyfG+nRd88ygjahbdup7KFZDM5L2aNIAzqbNtKxHZn5O1pHegwSj1t15VJliu0GyTX7XpBDeXUw==",
+      "workspaces": [
+        "example"
+      ],
       "peerDependencies": {
         "react-native": ">=0.60.0"
       }
diff --git a/package.json b/package.json
index 2945464ec907..1cfbabe438f0 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "react-native-fs": "^2.20.0",
     "react-native-gesture-handler": "2.18.0",
     "react-native-google-places-autocomplete": "2.5.6",
-    "react-native-haptic-feedback": "^2.2.0",
+    "react-native-haptic-feedback": "^2.3.1",
     "react-native-image-picker": "^7.0.3",
     "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#93399c6410de32966eb57085936ef6951398c2c3",
     "react-native-key-command": "^1.0.8",
diff --git a/patches/react-native-haptic-feedback+2.2.0.patch b/patches/react-native-haptic-feedback+2.2.0.patch
deleted file mode 100644
index 4fb61b430869..000000000000
--- a/patches/react-native-haptic-feedback+2.2.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec b/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec
-index e692f2d..9dedd9b 100644
---- a/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec
-+++ b/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec
-@@ -17,24 +17,7 @@ Pod::Spec.new do |s|
-   s.source_files  = "ios/**/*.{h,m,mm}"
-   s.requires_arc = true
- 
--  s.dependency 'React-Core'
--
--  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
--  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
--    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
--
--    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
--    s.pod_target_xcconfig    = {
--        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
--        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
--    }
--
--    s.dependency "React-Codegen"
--    s.dependency "RCT-Folly"
--    s.dependency "RCTRequired"
--    s.dependency "RCTTypeSafety"
--    s.dependency "ReactCommon/turbomodule/core"
--  end
-+  install_modules_dependencies(s)
- end
- 
- 
diff --git a/patches/react-native-haptic-feedback+2.3.1.patch b/patches/react-native-haptic-feedback+2.3.1.patch
new file mode 100644
index 000000000000..342b20863995
--- /dev/null
+++ b/patches/react-native-haptic-feedback+2.3.1.patch
@@ -0,0 +1,55 @@
+diff --git a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
+index c1498b9..1a3afb7 100644
+--- a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
++++ b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
+@@ -1,5 +1,5 @@
+ #ifdef RCT_NEW_ARCH_ENABLED
+-#import "RNHapticFeedbackSpec.h"
++#import <RNHapticFeedbackSpec/RNHapticFeedbackSpec.h>
+ 
+ @interface RNHapticFeedback : NSObject <NativeHapticFeedbackSpec>
+ #else
+diff --git a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedbackSpec.h b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedbackSpec.h
+deleted file mode 100644
+index 6f0f81d..0000000
+--- a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedbackSpec.h
++++ /dev/null
+@@ -1,15 +0,0 @@
+-//
+-//  RNHapticFeedbackSpec.h
+-//  RNHapticFeedback
+-//
+-//  Created by Michael Kuczera on 05.08.24.
+-//  Copyright © 2024 Facebook. All rights reserved.
+-//
+-#import <Foundation/Foundation.h>
+-
+-@protocol NativeHapticFeedbackSpec <NSObject>
+-
+-// Indicates whether the device supports haptic feedback
+-- (Boolean)supportsHaptic;
+-
+-@end
+diff --git a/node_modules/react-native-haptic-feedback/package.json b/node_modules/react-native-haptic-feedback/package.json
+index 86dfaa4..b6d4d97 100644
+--- a/node_modules/react-native-haptic-feedback/package.json
++++ b/node_modules/react-native-haptic-feedback/package.json
+@@ -6,18 +6,6 @@
+   "source": "src/index.ts",
+   "main": "./lib/commonjs/index.js",
+   "module": "./lib/module/index.js",
+-  "exports": {
+-    ".": {
+-      "import": {
+-        "types": "./lib/typescript/module/src/index.d.ts",
+-        "default": "./lib/module/index.js"
+-      },
+-      "require": {
+-        "types": "./lib/typescript/commonjs/src/index.d.ts",
+-        "default": "./lib/commonjs/index.js"
+-      }
+-    }
+-  },
+   "scripts": {
+     "typecheck": "tsc --noEmit --project tsconfig.test.json",
+     "test": "jest",

From c7173de519adf46e9976cd0bc601c5270531f2b3 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Mon, 2 Sep 2024 17:38:28 +0200
Subject: [PATCH 027/132] feat: bump react-native-pdf to newest version, remove
 unnecessary patch and add new one

---
 ios/Podfile.lock                     |  4 +--
 package-lock.json                    |  7 ++--
 package.json                         |  2 +-
 patches/react-native-pdf+6.7.3.patch | 53 ----------------------------
 patches/react-native-pdf+6.7.5.patch | 12 +++++++
 5 files changed, 19 insertions(+), 59 deletions(-)
 delete mode 100644 patches/react-native-pdf+6.7.3.patch
 create mode 100644 patches/react-native-pdf+6.7.5.patch

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d688213fafb4..20717fbc2eb5 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1776,7 +1776,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-pdf (6.7.3):
+  - react-native-pdf (6.7.5):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3188,7 +3188,7 @@ SPEC CHECKSUMS:
   react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
   react-native-netinfo: fb5112b1fa754975485884ae85a3fb6a684f49d5
   react-native-pager-view: 6bff9b0883b902571530ddd1b2ea9dc570f321f6
-  react-native-pdf: dd6ae39a93607a80919bef9f3499e840c693989d
+  react-native-pdf: 2e2591ebd39422163850403b1c0cd7d6b351e168
   react-native-performance: 3c608307be10964f8a97d3af462f37125b6d8fa5
   react-native-plaid-link-sdk: f91a22b45b7c3d4cd6c47273200dc57df35068b0
   react-native-quick-sqlite: 7c793c9f5834e756b336257a8d8b8239b7ceb451
diff --git a/package-lock.json b/package-lock.json
index a7c9fc4fb570..3801d2ff4751 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,7 +105,7 @@
         "react-native-modal": "^13.0.0",
         "react-native-onyx": "2.0.66",
         "react-native-pager-view": "6.3.4",
-        "react-native-pdf": "6.7.3",
+        "react-native-pdf": "6.7.5",
         "react-native-performance": "^5.1.0",
         "react-native-permissions": "^3.10.0",
         "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf",
@@ -38209,8 +38209,9 @@
       }
     },
     "node_modules/react-native-pdf": {
-      "version": "6.7.3",
-      "license": "MIT",
+      "version": "6.7.5",
+      "resolved": "https://registry.npmjs.org/react-native-pdf/-/react-native-pdf-6.7.5.tgz",
+      "integrity": "sha512-d1S76p2Vwax2iG+kTnjINiUMvpjtJJvtMiYwHRbgGczT8GJjtXH49YCWOd+HfnUAU29cB+knzsKGYoZBMQM8Ow==",
       "dependencies": {
         "crypto-js": "4.2.0",
         "deprecated-react-native-prop-types": "^2.3.0"
diff --git a/package.json b/package.json
index 2945464ec907..dc9f87168897 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "react-native-modal": "^13.0.0",
     "react-native-onyx": "2.0.66",
     "react-native-pager-view": "6.3.4",
-    "react-native-pdf": "6.7.3",
+    "react-native-pdf": "6.7.5",
     "react-native-performance": "^5.1.0",
     "react-native-permissions": "^3.10.0",
     "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf",
diff --git a/patches/react-native-pdf+6.7.3.patch b/patches/react-native-pdf+6.7.3.patch
deleted file mode 100644
index 0f0f270cefd1..000000000000
--- a/patches/react-native-pdf+6.7.3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/node_modules/react-native-pdf/react-native-pdf.podspec b/node_modules/react-native-pdf/react-native-pdf.podspec
-index fb36140..5d5f19e 100644
---- a/node_modules/react-native-pdf/react-native-pdf.podspec
-+++ b/node_modules/react-native-pdf/react-native-pdf.podspec
-@@ -17,24 +17,11 @@ Pod::Spec.new do |s|
-   s.framework    = "PDFKit"
- 
-   if fabric_enabled
--    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
--
--    s.pod_target_xcconfig = {
--      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly"',
--      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
--    }
-     s.platforms       = { ios: '11.0', tvos: '11.0' }
--    s.compiler_flags  = folly_compiler_flags + ' -DRCT_NEW_ARCH_ENABLED'
-     s.source_files    = 'ios/**/*.{h,m,mm,cpp}'
-     s.requires_arc    = true
-     
--    s.dependency "React"
--    s.dependency "React-RCTFabric"
--    s.dependency "React-Codegen"
--    s.dependency "RCT-Folly"
--    s.dependency "RCTRequired"
--    s.dependency "RCTTypeSafety"
--    s.dependency "ReactCommon/turbomodule/core"
-+    install_modules_dependencies(s)
-   else
-     s.platform       = :ios, '8.0'
-     s.source_files   = 'ios/**/*.{h,m,mm}'
-diff --git a/node_modules/react-native-pdf/index.js b/node_modules/react-native-pdf/index.js
-index c05de52..bea7af8 100644
---- a/node_modules/react-native-pdf/index.js
-+++ b/node_modules/react-native-pdf/index.js
-@@ -367,11 +367,17 @@ export default class Pdf extends Component {
-                 message[4] = message.splice(4).join('|');
-             }
-             if (message[0] === 'loadComplete') {
-+                let tableContents;
-+                try {
-+                    tableContents = message[4]&&JSON.parse(message[4]);
-+                } catch(e) {
-+                    tableContents = message[4];
-+                }
-                 this.props.onLoadComplete && this.props.onLoadComplete(Number(message[1]), this.state.path, {
-                     width: Number(message[2]),
-                     height: Number(message[3]),
-                 },
--                message[4]&&JSON.parse(message[4]));
-+                tableContents);
-             } else if (message[0] === 'pageChanged') {
-                 this.props.onPageChanged && this.props.onPageChanged(Number(message[1]), Number(message[2]));
-             } else if (message[0] === 'error') {
diff --git a/patches/react-native-pdf+6.7.5.patch b/patches/react-native-pdf+6.7.5.patch
new file mode 100644
index 000000000000..0cdcf4d5b0c9
--- /dev/null
+++ b/patches/react-native-pdf+6.7.5.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native-pdf/fabric/RNPDFPdfNativeComponent.js b/node_modules/react-native-pdf/fabric/RNPDFPdfNativeComponent.js
+index 596d796..4e47061 100644
+--- a/node_modules/react-native-pdf/fabric/RNPDFPdfNativeComponent.js
++++ b/node_modules/react-native-pdf/fabric/RNPDFPdfNativeComponent.js
+@@ -22,6 +22,7 @@
+    enablePaging: ?boolean,
+    enableRTL: ?boolean,
+    enableAnnotationRendering: ?boolean,
++   enableDoubleTapZoom: ?boolean,
+    showsHorizontalScrollIndicator: ?boolean,
+    showsVerticalScrollIndicator: ?boolean,
+    enableAntialiasing: ?boolean,

From 56a274098634a78013a6101ac77fdb5e3d054046 Mon Sep 17 00:00:00 2001
From: Abdelrahman Khattab <abzokhattab@gmail.com>
Date: Tue, 3 Sep 2024 00:30:19 +0200
Subject: [PATCH 028/132] Fix system update messages for tags

---
 src/libs/ReportActionsUtils.ts             | 15 +++++++++++++++
 src/libs/SidebarUtils.ts                   |  2 +-
 src/pages/home/report/ReportActionItem.tsx |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 4d126cf9cbf4..57896fa602e7 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -957,6 +957,20 @@ function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
     );
 }
 
+/**
+ * @param actionName - The name of the action
+ * @returns - Whether the action is a tag modification action
+ * */
+function isTagModificationAction(actionName: string): boolean {
+    return (
+        actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG ||
+        actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_ENABLED ||
+        actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_NAME ||
+        actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_TAG ||
+        actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG
+    );
+}
+
 // Get all IOU report actions for the report.
 const iouRequestTypes = new Set<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>>([
     CONST.IOU.REPORT_ACTION_TYPE.CREATE,
@@ -1741,6 +1755,7 @@ export {
     isApprovedAction,
     isForwardedAction,
     isWhisperActionTargetedToOthers,
+    isTagModificationAction,
     shouldHideNewMarker,
     shouldReportActionBeVisible,
     shouldReportActionBeVisibleAsLastAction,
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index dedd608ce77d..c392f8608e61 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -425,7 +425,7 @@ function getOptionData({
             result.alternateText = Localize.translateLocal('workspace.invite.leftWorkspace');
         } else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
             result.alternateText = ReportUtils.formatReportLastMessageText(Parser.htmlToText(`${lastActorDisplayName}: ${lastMessageText}`));
-        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG) {
+        } else if (ReportActionsUtils.isTagModificationAction(lastAction?.actionName)) {
             result.alternateText = PolicyUtils.getCleanedTagName(ReportActionsUtils.getReportActionMessage(lastAction)?.text ?? '');
         } else if (lastAction && ReportActionsUtils.isOldDotReportAction(lastAction)) {
             result.alternateText = ReportActionsUtils.getMessageOfOldDotReportAction(lastAction);
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index bd19dff42038..d1170713a865 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -652,7 +652,7 @@ function ReportActionItem({
             children = <ReportActionItemBasicMessage message={translate('systemMessage.mergedWithCashTransaction')} />;
         } else if (ReportActionsUtils.isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION)) {
             children = <ReportActionItemBasicMessage message={ReportActionsUtils.getDismissedViolationMessageText(ReportActionsUtils.getOriginalMessage(action))} />;
-        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG) {
+        } else if (ReportActionsUtils.isTagModificationAction(action.actionName)) {
             children = <ReportActionItemBasicMessage message={PolicyUtils.getCleanedTagName(ReportActionsUtils.getReportActionMessage(action)?.text ?? '')} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_NAME) {
             children = <ReportActionItemBasicMessage message={ReportUtils.getWorkspaceNameUpdatedMessage(action)} />;

From 676e2f71a9d6ed5e7f8abeab61c2823706154dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Tue, 3 Sep 2024 19:38:03 +0200
Subject: [PATCH 029/132] Add Android native module

---
 .../com/expensify/chat/MainApplication.kt     |  2 +
 .../CustomNotificationProvider.java           | 18 ++------
 .../ShortcutManagerModule.java                | 42 +++++++++++++++++++
 .../ShortcutManagerPackage.java               | 29 +++++++++++++
 .../ShortcutManagerUtils.java                 | 38 +++++++++++++++++
 ...e-device-info+10.3.1+002+turbomodule.patch |  4 +-
 6 files changed, 117 insertions(+), 16 deletions(-)
 create mode 100644 android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java
 create mode 100644 android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerPackage.java
 create mode 100644 android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java

diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.kt b/android/app/src/main/java/com/expensify/chat/MainApplication.kt
index 26a28d9955a0..2cc8b7780253 100644
--- a/android/app/src/main/java/com/expensify/chat/MainApplication.kt
+++ b/android/app/src/main/java/com/expensify/chat/MainApplication.kt
@@ -8,6 +8,7 @@ import android.database.CursorWindow
 import android.os.Process
 import androidx.multidex.MultiDexApplication
 import com.expensify.chat.bootsplash.BootSplashPackage
+import com.expensify.chat.shortcutManagerModule.ShortcutManagerPackage
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactNativeHost
@@ -29,6 +30,7 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             PackageList(this).packages.apply {
             // Packages that cannot be autolinked yet can be added manually here, for example:
             // add(MyReactNativePackage());
+            add(ShortcutManagerPackage())
             add(BootSplashPackage())
             add(ExpensifyAppPackage())
             add(RNTextInputResetPackage())
diff --git a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
index a19abcce7d92..eb5b78aea744 100644
--- a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
+++ b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
@@ -37,6 +37,7 @@
 import androidx.versionedparcelable.ParcelUtils;
 
 import com.expensify.chat.R;
+import com.expensify.chat.shortcutManagerModule.ShortcutManagerUtils;
 import com.urbanairship.AirshipConfigOptions;
 import com.urbanairship.json.JsonMap;
 import com.urbanairship.json.JsonValue;
@@ -211,24 +212,13 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
             String message = alert != null ? alert : messageData.get("message").getList().get(0).getMap().get("text").getString();
             String conversationName = payload.get("roomName") == null ? "" : payload.get("roomName").getString("");
 
-            // create the Person object who sent the latest report comment
+            // Create the Person object who sent the latest report comment
             Bitmap personIcon = fetchIcon(context, avatar);
             builder.setLargeIcon(personIcon);
-            Intent intent = new Intent(Intent.ACTION_VIEW,
-                    Uri.parse("new-expensify://r/" + reportID));
 
             Person person = createMessagePersonObject(IconCompat.createWithBitmap(personIcon), accountID, name);
-            ShortcutInfoCompat shortcutInfo = new ShortcutInfoCompat.Builder(context, accountID)
-                    .setShortLabel(name)
-                    .setLongLabel(name)
-                    .setCategories(Collections.singleton(CATEGORY_MESSAGE))
-                    .setIntent(intent)
-                    .setLongLived(true)
-                    .setPerson(person)
-                    .setIcon(IconCompat.createWithBitmap(personIcon))
-                    .build();
-
-            ShortcutManagerCompat.pushDynamicShortcut(context, shortcutInfo);
+
+            ShortcutManagerUtils.addDynamicShortcut(context, reportId, name, accountID, personIcon, person);
 
             // Create latest received message object
             long createdTimeInMillis = getMessageTimeInMillis(messageData.get("created").getString(""));
diff --git a/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java
new file mode 100644
index 000000000000..07103f81d4b7
--- /dev/null
+++ b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java
@@ -0,0 +1,42 @@
+package com.expensify.chat.shortcutManagerModule;
+
+import static androidx.core.app.NotificationCompat.CATEGORY_MESSAGE;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.Person;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+import java.util.Collections;
+
+import com.expensify.chat.customairshipextender.CustomNotificationProvider;
+
+public class ShortcutManagerModule extends ReactContextBaseJavaModule {
+    private ReactApplicationContext context;
+
+    public ShortcutManagerModule(ReactApplicationContext context) {
+        super(context);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "ShortcutManager";
+    }
+
+    @ReactMethod
+    public void removeAllDynamicShortcuts() {
+        ShortcutManagerUtils.removeAllDynamicShortcuts(context);
+    }
+}
diff --git a/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerPackage.java b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerPackage.java
new file mode 100644
index 000000000000..d28f75592d93
--- /dev/null
+++ b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerPackage.java
@@ -0,0 +1,29 @@
+package com.expensify.chat.shortcutManagerModule;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ShortcutManagerPackage implements ReactPackage {
+
+    @NonNull
+    @Override
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+
+    @NonNull
+    @Override
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<>();
+        modules.add(new ShortcutManagerModule(reactContext));
+        return modules;
+    }
+}
diff --git a/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java
new file mode 100644
index 000000000000..a8d58d672db0
--- /dev/null
+++ b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java
@@ -0,0 +1,38 @@
+package com.expensify.chat.shortcutManagerModule;
+
+import static androidx.core.app.NotificationCompat.CATEGORY_MESSAGE;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+
+import androidx.core.app.Person;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
+
+import java.util.Collections;
+
+public class ShortcutManagerUtils {
+    public static void removeAllDynamicShortcuts(Context context) {
+        ShortcutManagerCompat.removeAllDynamicShortcuts(context);
+    }
+
+    public static void addDynamicShortcut(Context context, String reportID, String name, String accountID, Bitmap personIcon, Person person) {
+        Intent intent = new Intent(Intent.ACTION_VIEW,
+                Uri.parse("new-expensify://r/" + reportID));
+
+        ShortcutInfoCompat shortcutInfo = new ShortcutInfoCompat.Builder(context, accountID)
+                .setShortLabel(name)
+                .setLongLabel(name)
+                .setCategories(Collections.singleton(CATEGORY_MESSAGE))
+                .setIntent(intent)
+                .setLongLived(true)
+                .setPerson(person)
+                .setIcon(IconCompat.createWithBitmap(personIcon))
+                .build();
+        ShortcutManagerCompat.pushDynamicShortcut(context, shortcutInfo);
+    }
+
+}
diff --git a/patches/react-native-device-info+10.3.1+002+turbomodule.patch b/patches/react-native-device-info+10.3.1+002+turbomodule.patch
index 4b62c30947c2..b7698fd06c85 100644
--- a/patches/react-native-device-info+10.3.1+002+turbomodule.patch
+++ b/patches/react-native-device-info+10.3.1+002+turbomodule.patch
@@ -477,7 +477,7 @@ index b01e9d2..d954717 100644
    @ReactMethod(isBlockingSynchronousMethod = true)
 -  public int getApiLevelSync() { return Build.VERSION.SDK_INT; }
 +  public double getApiLevelSync() { return Build.VERSION.SDK_INT; }
-   @ReactMethod
+   hod
    public void getApiLevel(Promise p) { p.resolve(getApiLevelSync()); }
  
 @@ -858,11 +897,11 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
@@ -566,7 +566,7 @@ index 0000000..5aad02a
 +  @DoNotStrip
 +  public abstract void getSupported32BitAbis(Promise promise);
 +
-+  @ReactMethod(isBlockingSynchronousMethod = true)
++  hod(isBlockingSynchronousMethod = true)
 +  @DoNotStrip
 +  public abstract WritableArray getSupported32BitAbisSync();
 +

From 9d9e46c8ba1f70df70501d1482987157a1cb6550 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 4 Sep 2024 13:24:54 +0700
Subject: [PATCH 030/132] fix: don't set user's timezone if it's empty

---
 src/libs/Navigation/AppNavigator/AuthScreens.tsx   | 3 ++-
 src/pages/settings/Profile/TimezoneInitialPage.tsx | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 5ca9becf8986..72323b6bd180 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -1,3 +1,4 @@
+import lodashIsEmpty from 'lodash/isEmpty';
 import React, {memo, useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -152,7 +153,7 @@ Onyx.connect({
 
         // If the current timezone is different than the user's timezone, and their timezone is set to automatic
         // then update their timezone.
-        if (timezone?.automatic && timezone?.selected !== currentTimezone) {
+        if (!lodashIsEmpty(currentTimezone) && timezone?.automatic && timezone?.selected !== currentTimezone) {
             timezone.selected = currentTimezone;
             PersonalDetails.updateAutomaticTimezone({
                 automatic: true,
diff --git a/src/pages/settings/Profile/TimezoneInitialPage.tsx b/src/pages/settings/Profile/TimezoneInitialPage.tsx
index 433a49787681..b700e80e687e 100644
--- a/src/pages/settings/Profile/TimezoneInitialPage.tsx
+++ b/src/pages/settings/Profile/TimezoneInitialPage.tsx
@@ -1,3 +1,4 @@
+import lodashIsEmpty from 'lodash/isEmpty';
 import React from 'react';
 import {View} from 'react-native';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -23,6 +24,8 @@ function TimezoneInitialPage({currentUserPersonalDetails}: TimezoneInitialPagePr
 
     const {translate} = useLocalize();
 
+    const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone as SelectedTimezone;
+
     /**
      * Updates setting for automatic timezone selection.
      * Note: If we are updating automatically, we'll immediately calculate the user's timezone.
@@ -30,7 +33,7 @@ function TimezoneInitialPage({currentUserPersonalDetails}: TimezoneInitialPagePr
     const updateAutomaticTimezone = (isAutomatic: boolean) => {
         PersonalDetails.updateAutomaticTimezone({
             automatic: isAutomatic,
-            selected: isAutomatic ? (Intl.DateTimeFormat().resolvedOptions().timeZone as SelectedTimezone) : timezone.selected,
+            selected: isAutomatic && !lodashIsEmpty(currentTimezone) ? currentTimezone : timezone.selected,
         });
     };
 

From 746b59aab9c5e05d4dfe7e6c1129255498ff2f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Wed, 4 Sep 2024 10:07:42 +0200
Subject: [PATCH 031/132] Add dynamic shortcut clearing on signing out

---
 .../chat/shortcutManagerModule/ShortcutManagerModule.java   | 1 +
 src/libs/ShortcutManager/index.ts                           | 6 ++++++
 src/libs/actions/Session/index.ts                           | 3 +++
 src/types/modules/react-native.d.ts                         | 2 ++
 4 files changed, 12 insertions(+)
 create mode 100644 src/libs/ShortcutManager/index.ts

diff --git a/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java
index 07103f81d4b7..fdb6d0ba3b97 100644
--- a/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java
+++ b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerModule.java
@@ -27,6 +27,7 @@ public class ShortcutManagerModule extends ReactContextBaseJavaModule {
 
     public ShortcutManagerModule(ReactApplicationContext context) {
         super(context);
+        this.context = context;
     }
 
     @NonNull
diff --git a/src/libs/ShortcutManager/index.ts b/src/libs/ShortcutManager/index.ts
new file mode 100644
index 000000000000..f1aa501085f6
--- /dev/null
+++ b/src/libs/ShortcutManager/index.ts
@@ -0,0 +1,6 @@
+type ShortcutManagerModule = {
+    removeAllDynamicShortcuts: () => void;
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export type {ShortcutManagerModule};
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index e905464e551f..b093c171e9cf 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -56,6 +56,8 @@ import type Session from '@src/types/onyx/Session';
 import clearCache from './clearCache';
 import updateSessionAuthTokens from './updateSessionAuthTokens';
 
+const {ShortcutManager} = NativeModules;
+
 let session: Session = {};
 let authPromiseResolver: ((value: boolean) => void) | null = null;
 Onyx.connect({
@@ -204,6 +206,7 @@ function hasAuthToken(): boolean {
 function signOutAndRedirectToSignIn(shouldResetToHome?: boolean, shouldStashSession?: boolean, killHybridApp = true) {
     Log.info('Redirecting to Sign In because signOut() was called');
     hideContextMenu(false);
+    ShortcutManager.removeAllDynamicShortcuts();
     if (!isAnonymousUser()) {
         // In the HybridApp, we want the Old Dot to handle the sign out process
         if (NativeModules.HybridAppModule && killHybridApp) {
diff --git a/src/types/modules/react-native.d.ts b/src/types/modules/react-native.d.ts
index 7e3f299ad938..40c5b72ce1e4 100644
--- a/src/types/modules/react-native.d.ts
+++ b/src/types/modules/react-native.d.ts
@@ -2,6 +2,7 @@
 import type {TargetedEvent} from 'react-native';
 import type {BootSplashModule} from '@libs/BootSplash/types';
 import type {EnvironmentCheckerModule} from '@libs/Environment/betaChecker/types';
+import type {ShortcutManagerModule} from '@libs/ShortcutManager';
 import type StartupTimer from '@libs/StartupTimer/types';
 
 type HybridAppModule = {
@@ -42,6 +43,7 @@ declare module 'react-native' {
         StartupTimer: StartupTimer;
         RNTextInputReset: RNTextInputResetModule;
         EnvironmentChecker: EnvironmentCheckerModule;
+        ShortcutManager: ShortcutManagerModule;
     }
 
     namespace Animated {

From f7c30b069c8eab1945877ee549f308fe74170693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Wed, 4 Sep 2024 10:32:18 +0200
Subject: [PATCH 032/132] Add iOS native module

---
 ios/NewExpensify.xcodeproj/project.pbxproj | 10 +++++++++-
 ios/RCTShortcutManagerModule.h             |  4 ++++
 ios/RCTShortcutManagerModule.m             | 10 ++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 ios/RCTShortcutManagerModule.h
 create mode 100644 ios/RCTShortcutManagerModule.m

diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
index 0f9edeab601d..48b92ef30cba 100644
--- a/ios/NewExpensify.xcodeproj/project.pbxproj
+++ b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -16,6 +16,8 @@
 		0CDA8E35287DD650004ECBEC /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0CDA8E33287DD650004ECBEC /* AppDelegate.mm */; };
 		0CDA8E37287DD6A0004ECBEC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CDA8E36287DD6A0004ECBEC /* Images.xcassets */; };
 		0CDA8E38287DD6A0004ECBEC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CDA8E36287DD6A0004ECBEC /* Images.xcassets */; };
+		0DFC45942C884E0A00B56C91 /* RCTShortcutManagerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DFC45932C884E0A00B56C91 /* RCTShortcutManagerModule.m */; };
+		0DFC45952C884E0A00B56C91 /* RCTShortcutManagerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DFC45932C884E0A00B56C91 /* RCTShortcutManagerModule.m */; };
 		0F5BE0CE252686330097D869 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0F5BE0CD252686320097D869 /* GoogleService-Info.plist */; };
 		0F5E5350263B73FD004CA14F /* EnvironmentChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */; };
 		0F5E5351263B73FD004CA14F /* EnvironmentChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */; };
@@ -89,7 +91,9 @@
 		083353EA2B5AB22900C603C0 /* success.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = success.mp3; path = ../assets/sounds/success.mp3; sourceTree = "<group>"; };
 		0CDA8E33287DD650004ECBEC /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = NewExpensify/AppDelegate.mm; sourceTree = "<group>"; };
 		0CDA8E36287DD6A0004ECBEC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = NewExpensify/Images.xcassets; sourceTree = "<group>"; };
-		0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = NewExpensify/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = NewExpensify/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		0DFC45922C884D7900B56C91 /* RCTShortcutManagerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTShortcutManagerModule.h; sourceTree = "<group>"; };
+		0DFC45932C884E0A00B56C91 /* RCTShortcutManagerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTShortcutManagerModule.m; sourceTree = "<group>"; };
 		0F5BE0CD252686320097D869 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		0F5E534E263B73D5004CA14F /* EnvironmentChecker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnvironmentChecker.h; sourceTree = "<group>"; };
 		0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EnvironmentChecker.m; sourceTree = "<group>"; };
@@ -267,6 +271,8 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				0DFC45922C884D7900B56C91 /* RCTShortcutManagerModule.h */,
+				0DFC45932C884E0A00B56C91 /* RCTShortcutManagerModule.m */,
 				499B0DA92BE2A1C000CABFB0 /* PrivacyInfo.xcprivacy */,
 				374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */,
 				374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */,
@@ -876,6 +882,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				0F5E5351263B73FD004CA14F /* EnvironmentChecker.m in Sources */,
+				0DFC45952C884E0A00B56C91 /* RCTShortcutManagerModule.m in Sources */,
 				0CDA8E35287DD650004ECBEC /* AppDelegate.mm in Sources */,
 				7041848626A8E47D00E09F4D /* RCTStartupTimer.m in Sources */,
 				7F5E81F06BCCF61AD02CEA06 /* ExpoModulesProvider.swift in Sources */,
@@ -887,6 +894,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				18D050E0262400AF000D658B /* BridgingFile.swift in Sources */,
+				0DFC45942C884E0A00B56C91 /* RCTShortcutManagerModule.m in Sources */,
 				0F5E5350263B73FD004CA14F /* EnvironmentChecker.m in Sources */,
 				374FB8D728A133FE000D84EF /* OriginImageRequestHandler.mm in Sources */,
 				7041848526A8E47D00E09F4D /* RCTStartupTimer.m in Sources */,
diff --git a/ios/RCTShortcutManagerModule.h b/ios/RCTShortcutManagerModule.h
new file mode 100644
index 000000000000..5d596d5e7a5e
--- /dev/null
+++ b/ios/RCTShortcutManagerModule.h
@@ -0,0 +1,4 @@
+//  RCTShortcutManagerModule.h
+#import <React/RCTBridgeModule.h>
+@interface RCTShortcutManagerModule : NSObject <RCTBridgeModule>
+@end
diff --git a/ios/RCTShortcutManagerModule.m b/ios/RCTShortcutManagerModule.m
new file mode 100644
index 000000000000..024b25a625a3
--- /dev/null
+++ b/ios/RCTShortcutManagerModule.m
@@ -0,0 +1,10 @@
+// RCTCalendarModule.m
+#import "RCTShortcutManagerModule.h"
+
+@implementation RCTShortcutManagerModule
+
+RCT_EXPORT_METHOD(removeAllDynamicShortcuts){}
+
+RCT_EXPORT_MODULE(ShortcutManager);
+
+@end

From ce11ee577e4b558cd5d962bdfe6483fba65dbd11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Wed, 4 Sep 2024 11:59:17 +0200
Subject: [PATCH 033/132] Undo patch changes

---
 ios/NewExpensify.xcodeproj/project.pbxproj                  | 6 +++---
 .../react-native-device-info+10.3.1+002+turbomodule.patch   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
index 8297ff717145..768062717d4b 100644
--- a/ios/NewExpensify.xcodeproj/project.pbxproj
+++ b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -43,7 +43,7 @@
 		D27CE6B77196EF3EF450EEAC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */; };
 		DD79042B2792E76D004484B4 /* RCTBootSplash.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.mm */; };
 		DDCB2E57F334C143AC462B43 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */; };
-		E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+		E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 		E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9DF872C2525201700607FDC /* AirshipConfig.plist */; };
 		ED222ED90E074A5481A854FA /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8B28D84EF339436DBD42A203 /* ExpensifyNeue-BoldItalic.otf */; };
 		F0C450EA2705020500FD2970 /* colors.json in Resources */ = {isa = PBXBuildFile; fileRef = F0C450E92705020500FD2970 /* colors.json */; };
@@ -175,8 +175,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				383643682B6D4AE2005BB9AE /* DeviceCheck.framework in Frameworks */,
-				E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */,
-				E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */,
+				E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */,
+				E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */,
 				8744C5400E24E379441C04A4 /* libPods-NewExpensify.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/patches/react-native-device-info+10.3.1+002+turbomodule.patch b/patches/react-native-device-info+10.3.1+002+turbomodule.patch
index b7698fd06c85..4b62c30947c2 100644
--- a/patches/react-native-device-info+10.3.1+002+turbomodule.patch
+++ b/patches/react-native-device-info+10.3.1+002+turbomodule.patch
@@ -477,7 +477,7 @@ index b01e9d2..d954717 100644
    @ReactMethod(isBlockingSynchronousMethod = true)
 -  public int getApiLevelSync() { return Build.VERSION.SDK_INT; }
 +  public double getApiLevelSync() { return Build.VERSION.SDK_INT; }
-   hod
+   @ReactMethod
    public void getApiLevel(Promise p) { p.resolve(getApiLevelSync()); }
  
 @@ -858,11 +897,11 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
@@ -566,7 +566,7 @@ index 0000000..5aad02a
 +  @DoNotStrip
 +  public abstract void getSupported32BitAbis(Promise promise);
 +
-+  hod(isBlockingSynchronousMethod = true)
++  @ReactMethod(isBlockingSynchronousMethod = true)
 +  @DoNotStrip
 +  public abstract WritableArray getSupported32BitAbisSync();
 +

From c93af3ca441b1de5c65de10fba8892770f0ba89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Wed, 4 Sep 2024 11:59:31 +0200
Subject: [PATCH 034/132] Update JS module impoert

---
 src/libs/ShortcutManager/index.ts | 10 +++++++++-
 src/libs/actions/Session/index.ts |  3 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/libs/ShortcutManager/index.ts b/src/libs/ShortcutManager/index.ts
index f1aa501085f6..cc748caaa0de 100644
--- a/src/libs/ShortcutManager/index.ts
+++ b/src/libs/ShortcutManager/index.ts
@@ -1,6 +1,14 @@
+import {NativeModules} from 'react-native';
+
 type ShortcutManagerModule = {
     removeAllDynamicShortcuts: () => void;
 };
 
-// eslint-disable-next-line import/prefer-default-export
+const {ShortcutManager} = NativeModules;
+
 export type {ShortcutManagerModule};
+
+export default ShortcutManager ||
+    ({
+        removeAllDynamicShortcuts: () => {},
+    } as ShortcutManagerModule);
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index b093c171e9cf..1c92723aa8e8 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -36,6 +36,7 @@ import NetworkConnection from '@libs/NetworkConnection';
 import * as Pusher from '@libs/Pusher/pusher';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as SessionUtils from '@libs/SessionUtils';
+import ShortcutManager from '@libs/ShortcutManager';
 import Timers from '@libs/Timers';
 import {hideContextMenu} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import {KEYS_TO_PRESERVE, openApp} from '@userActions/App';
@@ -56,8 +57,6 @@ import type Session from '@src/types/onyx/Session';
 import clearCache from './clearCache';
 import updateSessionAuthTokens from './updateSessionAuthTokens';
 
-const {ShortcutManager} = NativeModules;
-
 let session: Session = {};
 let authPromiseResolver: ((value: boolean) => void) | null = null;
 Onyx.connect({

From c00ed8f691e21bc6571f3fa96f3831f850ff2401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Wed, 4 Sep 2024 12:36:32 +0200
Subject: [PATCH 035/132] Add review changes

---
 .../customairshipextender/CustomNotificationProvider.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
index eb5b78aea744..791371630821 100644
--- a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
+++ b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
@@ -210,7 +210,7 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
             
             // Use the formatted alert message from the backend. Otherwise fallback on the message in the Onyx data.
             String message = alert != null ? alert : messageData.get("message").getList().get(0).getMap().get("text").getString();
-            String conversationName = payload.get("roomName") == null ? "" : payload.get("roomName").getString("");
+            String roomName = payload.get("roomName") == null ? "" : payload.get("roomName").getString("");
 
             // Create the Person object who sent the latest report comment
             Bitmap personIcon = fetchIcon(context, avatar);
@@ -243,11 +243,11 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
             }
 
             // Conversational styling should be applied to groups chats, rooms, and any 1:1 chats with more than one notification (ensuring the large profile image is always shown)
-            if (!conversationName.isEmpty()) {
+            if (!roomName.isEmpty()) {
                 // Create the messaging style notification builder for this notification, associating it with the person who sent the report comment
                 messagingStyle
                         .setGroupConversation(true)
-                        .setConversationTitle(conversationName);
+                        .setConversationTitle(roomName);
             }
             builder.setStyle(messagingStyle);
             builder.setShortcutId(accountID);

From 973934e7cc6330164e59e394826060a1111fe65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Wed, 4 Sep 2024 12:40:44 +0200
Subject: [PATCH 036/132] Add comment to iOS module

---
 ios/RCTShortcutManagerModule.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ios/RCTShortcutManagerModule.m b/ios/RCTShortcutManagerModule.m
index 024b25a625a3..bab19019a967 100644
--- a/ios/RCTShortcutManagerModule.m
+++ b/ios/RCTShortcutManagerModule.m
@@ -1,4 +1,5 @@
 // RCTCalendarModule.m
+// iOS doesn't have dynamic shortcuts like Android, so this module contains noop functions to prevent iOS from crashing
 #import "RCTShortcutManagerModule.h"
 
 @implementation RCTShortcutManagerModule

From 7a14050a958642eef1a281176cbb7b9703cddd28 Mon Sep 17 00:00:00 2001
From: Sheena Trepanier <sheena@expensify.com>
Date: Wed, 4 Sep 2024 16:46:07 -0700
Subject: [PATCH 037/132] Adding redirects that I missed before.

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

diff --git a/docs/redirects.csv b/docs/redirects.csv
index 13463327d06d..6832880c278c 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -201,3 +201,10 @@ https://help.expensify.com/articles/expensify-classic/workspaces/reports/Report-
 https://help.expensify.com/articles/expensify-classic/workspaces/reports/Scheduled-Submit,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
 https://help.expensify.com/articles/new-expensify/chat/Expensify-Chat-For-Admins,https://help.expensify.com/new-expensify/hubs/chat/
 https://help.expensify.com/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.html,https://help.expensify.com/articles/new-expensify/expenses/Connect-a-Business-Bank-Account
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Add-profile-photo,https://help.expensify.com/articles/expensify-classic/settings/Add-profile-photo
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Change-or-add-email-address.https://help.expensify.com/articles/expensify-classic/settings/Change-or-add-email-address
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Close-or-reopen-account,https://help.expensify.com/articles/expensify-classic/settings/Close-or-reopen-account
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Manage-devices,https://help.expensify.com/articles/expensify-classic/settings/Manage-devices
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts,https://help.expensify.com/articles/expensify-classic/settings/Merge-accounts
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications,https://help.expensify.com/articles/expensify-classic/settings/Set-Notifications
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-time-zone,https://help.expensify.com/articles/expensify-classic/settings/Set-time-zone
\ No newline at end of file

From 48fb76e1f565b8ba9ee395c77eff5b141dc042aa Mon Sep 17 00:00:00 2001
From: Sheena Trepanier <sheena@expensify.com>
Date: Wed, 4 Sep 2024 16:55:24 -0700
Subject: [PATCH 038/132] Fixing error with change email address link.

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

diff --git a/docs/redirects.csv b/docs/redirects.csv
index bf36f63aa77d..dda606cba7b2 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -200,7 +200,7 @@ https://help.expensify.com/articles/expensify-classic/workspaces/reports/Schedul
 https://help.expensify.com/articles/new-expensify/chat/Expensify-Chat-For-Admins,https://help.expensify.com/new-expensify/hubs/chat/
 https://help.expensify.com/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.html,https://help.expensify.com/articles/new-expensify/expenses/Connect-a-Business-Bank-Account
 https://help.expensify.com/articles/expensify-classic/settings/account-settings/Add-profile-photo,https://help.expensify.com/articles/expensify-classic/settings/Add-profile-photo
-https://help.expensify.com/articles/expensify-classic/settings/account-settings/Change-or-add-email-address.https://help.expensify.com/articles/expensify-classic/settings/Change-or-add-email-address
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Change-or-add-email-address,https://help.expensify.com/articles/expensify-classic/settings/Change-or-add-email-address
 https://help.expensify.com/articles/expensify-classic/settings/account-settings/Close-or-reopen-account,https://help.expensify.com/articles/expensify-classic/settings/Close-or-reopen-account
 https://help.expensify.com/articles/expensify-classic/settings/account-settings/Manage-devices,https://help.expensify.com/articles/expensify-classic/settings/Manage-devices
 https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts,https://help.expensify.com/articles/expensify-classic/settings/Merge-accounts

From 11f2b65d6bcd15ac1a6a6e2b48c2fef8b4166948 Mon Sep 17 00:00:00 2001
From: Sheena Trepanier <sheena@expensify.com>
Date: Wed, 4 Sep 2024 17:02:42 -0700
Subject: [PATCH 039/132] Fixing redirect loop

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

diff --git a/docs/redirects.csv b/docs/redirects.csv
index dda606cba7b2..c9cafcada220 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -130,7 +130,6 @@ https://help.expensify.com/articles/expensify-classic/reports/Expense-Rules,http
 https://help.expensify.com/articles/expensify-classic/reports/Currency,https://help.expensify.com/articles/expensify-classic/workspaces/Currency
 https://help.expensify.com/articles/expensify-classic/reports/The-Expenses-Page,https://help.expensify.com/articles/expensify-classic/expenses/The-Expenses-Page
 https://help.expensify.com/articles/expensify-classic/reports/Attendee-Tracking,https://help.expensify.com/articles/expensify-classic/expenses/Track-group-expenses
-https://help.expensify.com/articles/expensify-classic/account-settings/Close-Account,https://help.expensify.com/articles/expensify-classic/settings/Close-or-reopen-account
 https://help.expensify.com/articles/expensify-classic/account-settings/Copilot,https://help.expensify.com/expensify-classic/hubs/copilots-and-delegates/
 https://help.expensify.com/articles/expensify-classic/account-settings/Notification-Troubleshooting,https://help.expensify.com/articles/expensify-classic/settings/Notification-Troubleshooting
 https://help.expensify.com/articles/expensify-classic/billing-and-subscriptions/Annual-Subscription,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview

From 8c6e5d55681f0ff43cb16fb96446eda9faee0151 Mon Sep 17 00:00:00 2001
From: Sheena Trepanier <sheena@expensify.com>
Date: Wed, 4 Sep 2024 17:07:47 -0700
Subject: [PATCH 040/132] Hopefully last loop fix

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

diff --git a/docs/redirects.csv b/docs/redirects.csv
index c9cafcada220..eddc24647f99 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -278,7 +278,6 @@ https://help.expensify.com/articles/expensify-classic/integrations/travel-integr
 https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Workday.html,https://help.expensify.com/articles/expensify-classic/connections/Workday
 https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Xero.html,https://help.expensify.com/expensify-classic/hubs/connections/xero
 https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Zenefits.html,https://help.expensify.com/articles/expensify-classic/connections/Zenefits
-https://help.expensify.com/articles/expensify-classic/settings/Close-or-reopen-account,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Close-or-reopen-account
 https://help.expensify.com/articles/new-expensify/connections/Set-Up-NetSuite-Connection,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite
 https://help.expensify.com/articles/new-expensify/connections/Set-Up-NetSuite-Connection.html,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite
 https://help.expensify.com/articles/new-expensify/connections/Set-up-QuickBooks-Online-connection,https://help.expensify.com/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online

From 158274bd8a15f09685a91a85128eeb583cf7d477 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Thu, 5 Sep 2024 11:00:16 +0700
Subject: [PATCH 041/132] Fix re-sent message flicker

---
 .../ValidateCodeForm/BaseValidateCodeForm.tsx | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
index 087800232e08..6ec1dbc5d67e 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
@@ -88,7 +88,8 @@ function BaseValidateCodeForm({
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- nullish coalescing doesn't achieve the same result in this case
     const shouldDisableResendValidateCode = !!isOffline || account?.isLoading;
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-    const [validateCodeSentIsPressed, setValidateCodeSentIsPressed] = useState(false);
+    const validateCodeSentIsPressedRef = useRef(false);
+    const [showDotIndicator, setShowDotIndicator] = useState(false);
 
     useImperativeHandle(innerRef, () => ({
         focus() {
@@ -144,6 +145,18 @@ function BaseValidateCodeForm({
         inputValidateCodeRef.current?.clear();
     }, [hasMagicCodeBeenSent]);
 
+    useEffect(() => {
+        // `validateCodeSent` is updated asynchronously,
+        // and `validateCodeSentIsPressedRef.current` is updated faster than `hasMagicCodeBeenSent`.
+        // This can cause the component to hide and show the `DotIndicatorMessage` multiple times
+        // in quick succession, leading to a flickering effect.
+        if ((hasMagicCodeBeenSent ?? !!pendingContact?.validateCodeSent) && validateCodeSentIsPressedRef.current) {
+            setShowDotIndicator(true);
+        } else {
+            setShowDotIndicator(false);
+        }
+    }, [hasMagicCodeBeenSent, pendingContact, validateCodeSentIsPressedRef]);
+
     /**
      * Request a validate code / magic code be sent to verify this contact method
      */
@@ -155,9 +168,8 @@ function BaseValidateCodeForm({
         }
 
         inputValidateCodeRef.current?.clear();
-        setValidateCodeSentIsPressed(true);
+        validateCodeSentIsPressedRef.current = true;
     };
-
     /**
      * Handle text input and clear formError upon text change
      */
@@ -229,7 +241,7 @@ function BaseValidateCodeForm({
                     >
                         <Text style={[StyleUtils.getDisabledLinkStyles(shouldDisableResendValidateCode)]}>{translate('validateCodeForm.magicCodeNotReceived')}</Text>
                     </PressableWithFeedback>
-                    {(hasMagicCodeBeenSent ?? !!pendingContact?.validateCodeSent) && validateCodeSentIsPressed && (
+                    {showDotIndicator && (
                         <DotIndicatorMessage
                             type="success"
                             style={[styles.mt6, styles.flex0]}

From aa0af2592b1746446f97d71ccf91f24946723b61 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 6 Sep 2024 10:23:58 -0600
Subject: [PATCH 042/132] uncomment code

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

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index b014611c172d..2ad6d399c101 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -172,7 +172,7 @@ function CardSection() {
                     />
                 )}
 
-                {/* {!!account?.hasPurchases && ( */}
+                {!!account?.hasPurchases && (
                     <MenuItem
                         shouldShowRightIcon
                         icon={Expensicons.History}
@@ -182,7 +182,7 @@ function CardSection() {
                         onPress={viewPurchases}
                         hoverAndPressStyle={styles.hoveredComponentBG}
                     />
-                {/* )} */}
+                )}
 
                 {!!(subscriptionPlan && account?.isEligibleForRefund) && (
                     <MenuItem

From 08cc09de21a5424e222bf440124a7fc410be5dc5 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 6 Sep 2024 10:46:59 -0600
Subject: [PATCH 043/132] fix ts

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

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 2ad6d399c101..8f9813ccc1b9 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -62,7 +62,7 @@ function CardSection() {
 
     const viewPurchases = useCallback(() => {
         const query = SearchUtils.buildQueryStringFromFilters({merchant: CONST.EXPENSIFY_MERCHANT});
-        Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query, isCustomQuery: true}));
+        Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query}));
     }, []);
 
     const [billingStatus, setBillingStatus] = useState<BillingStatusResult | undefined>(CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData ?? {}));

From 1c93560700ccf5ed6aa3bd5e9165f2e7cd5a9a39 Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Sat, 7 Sep 2024 13:19:23 +0700
Subject: [PATCH 044/132] Add support for viewing group avatar photo

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/libs/ReportUtils.ts             |  7 +++
 src/libs/actions/Report.ts          | 30 ++++++----
 src/pages/NewChatConfirmPage.tsx    | 17 +++++-
 src/pages/ReportAvatar.tsx          | 93 +++++++++++++++++++++++++----
 src/pages/ReportDetailsPage.tsx     |  2 +-
 src/pages/home/ReportScreen.tsx     |  2 +
 src/types/onyx/NewGroupChatDraft.ts |  3 +
 src/types/onyx/Report.ts            |  3 +
 8 files changed, 131 insertions(+), 26 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 7b226b2e5c8e..6247ec23628e 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -291,6 +291,7 @@ type OptimisticChatReport = Pick<
     | 'description'
     | 'writeCapability'
     | 'avatarUrl'
+    | 'avatarFileName'
     | 'invoiceReceiver'
     | 'isHidden'
 > & {
@@ -5038,6 +5039,7 @@ function buildOptimisticChatReport(
     parentReportID = '',
     description = '',
     avatarUrl = '',
+    avatarFileName = '',
     optimisticReportID = '',
     shouldShowParticipants = true,
 ): OptimisticChatReport {
@@ -5080,6 +5082,7 @@ function buildOptimisticChatReport(
         description,
         writeCapability,
         avatarUrl,
+        avatarFileName,
     };
 
     if (chatType === CONST.REPORT.CHAT_TYPE.INVOICE) {
@@ -5097,6 +5100,7 @@ function buildOptimisticGroupChatReport(
     participantAccountIDs: number[],
     reportName: string,
     avatarUri: string,
+    avatarFilename: string,
     optimisticReportID?: string,
     notificationPreference?: NotificationPreference,
 ) {
@@ -5115,6 +5119,7 @@ function buildOptimisticGroupChatReport(
         undefined,
         undefined,
         avatarUri,
+        avatarFilename,
         optimisticReportID,
     );
 }
@@ -5526,6 +5531,7 @@ function buildOptimisticWorkspaceChats(policyID: string, policyName: string, exp
         undefined,
         undefined,
         undefined,
+        undefined,
         expenseReportId,
     );
     const expenseChatReportID = expenseChatData.reportID;
@@ -5673,6 +5679,7 @@ function buildTransactionThread(
         '',
         '',
         '',
+        '',
         false,
     );
 }
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 923d23ca9636..aca8cf485e13 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -694,6 +694,7 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 avatarUrl: file?.uri ?? '',
+                avatarFileName: file ? file?.name ?? '' : null,
                 pendingFields: {
                     avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 },
@@ -704,12 +705,14 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
         },
     ];
 
+    const fetchedReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
-                avatarUrl: ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.avatarUrl ?? null,
+                avatarUrl: fetchedReport?.avatarUrl ?? null,
+                avatarFileName: fetchedReport?.avatarFileName ?? null,
                 pendingFields: {
                     avatar: null,
                 },
@@ -842,8 +845,6 @@ function openReport(
         if (avatar) {
             parameters.file = avatar;
         }
-
-        clearGroupChat();
     }
 
     if (isFromDeepLink) {
@@ -1007,7 +1008,14 @@ function navigateToAndOpenReport(
     if (isEmptyObject(chat)) {
         if (isGroupChat) {
             // If we are creating a group chat then participantAccountIDs is expected to contain currentUserAccountID
-            newChat = ReportUtils.buildOptimisticGroupChatReport(participantAccountIDs, reportName ?? '', avatarUri ?? '', optimisticReportID, CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+            newChat = ReportUtils.buildOptimisticGroupChatReport(
+                participantAccountIDs,
+                reportName ?? '',
+                avatarUri ?? '',
+                avatarFile?.name ?? '',
+                optimisticReportID,
+                CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+            );
         } else {
             newChat = ReportUtils.buildOptimisticChatReport(
                 [...participantAccountIDs, currentUserAccountID],
@@ -1027,12 +1035,14 @@ function navigateToAndOpenReport(
 
     // We want to pass newChat here because if anything is passed in that param (even an existing chat), we will try to create a chat on the server
     openReport(report?.reportID ?? '', '', userLogins, newChat, undefined, undefined, undefined, avatarFile);
-    if (shouldDismissModal) {
-        Navigation.dismissModalWithReport(report);
-    } else {
-        Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
-        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'), actionType);
-    }
+    InteractionManager.runAfterInteractions(() => {
+        if (shouldDismissModal) {
+            Navigation.dismissModalWithReport(report);
+        } else {
+            Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
+            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'), actionType);
+        }
+    });
 }
 
 /**
diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx
index d6b199def243..e6c33db687b1 100644
--- a/src/pages/NewChatConfirmPage.tsx
+++ b/src/pages/NewChatConfirmPage.tsx
@@ -45,7 +45,8 @@ function navigateToEditChatName() {
 }
 
 function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmPageProps) {
-    const optimisticReportID = useRef<string>(ReportUtils.generateReportID());
+    const optimisticReportID = useRef<string>(newGroupDraft?.optimisticReportID ?? ReportUtils.generateReportID());
+    const shouldClearGroupDraft = useRef<boolean>(false);
     const [avatarFile, setAvatarFile] = useState<File | CustomRNImageManipulatorResult | undefined>();
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -105,10 +106,21 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
 
         const logins: string[] = (newGroupDraft.participants ?? []).map((participant) => participant.login);
         Report.navigateToAndOpenReport(logins, true, undefined, newGroupDraft.reportName ?? '', newGroupDraft.avatarUri ?? '', avatarFile, optimisticReportID.current, true);
+        shouldClearGroupDraft.current = true;
     }, [newGroupDraft, avatarFile]);
 
     const stashedLocalAvatarImage = newGroupDraft?.avatarUri;
 
+    useEffect(() => {
+        Report.setGroupDraft({optimisticReportID: optimisticReportID.current});
+        return () => {
+            if (!shouldClearGroupDraft.current) {
+                return;
+            }
+            Report.clearGroupChat();
+        };
+    }, []);
+
     useEffect(() => {
         if (!stashedLocalAvatarImage) {
             return;
@@ -151,11 +163,12 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
                     }}
                     size={CONST.AVATAR_SIZE.XLARGE}
                     avatarStyle={styles.avatarXLarge}
-                    shouldDisableViewPhoto
+                    shouldDisableViewPhoto={!avatarFile}
                     editIcon={Expensicons.Camera}
                     editIconStyle={styles.smallEditIconAccount}
                     shouldUseStyleUtilityForAnchorPosition
                     style={styles.w100}
+                    onViewPhotoPress={() => Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(optimisticReportID.current))}
                 />
             </View>
             <MenuItemWithTopDescription
diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index eeb6829e7fc0..4eee9f32f516 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -1,8 +1,9 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -10,35 +11,98 @@ import * as UserUtils from '@libs/UserUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, Report} from '@src/types/onyx';
+import type {NewGroupChatDraft, Policy, Report} from '@src/types/onyx';
 
 type ReportAvatarOnyxProps = {
     report: OnyxEntry<Report>;
     isLoadingApp: OnyxEntry<boolean>;
     policies: OnyxCollection<Policy>;
+    newGroupDraft: OnyxEntry<NewGroupChatDraft>;
 };
 
 type ReportAvatarProps = ReportAvatarOnyxProps & StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
 
-function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true}: ReportAvatarProps) {
+function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true, newGroupDraft}: ReportAvatarProps) {
+    const reportIDFromRoute = String(route.params?.reportID || 0);
+    const isNewGroupDraftAvatar = reportIDFromRoute === newGroupDraft?.optimisticReportID;
+
     const policyID = route.params.policyID ?? '-1';
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
-    const policyName = ReportUtils.getPolicyName(report, false, policy);
-    const avatarURL = ReportUtils.getWorkspaceAvatar(report);
+    const policyName = ReportUtils.getPolicyName(report, true, policy);
+    const isPolicyRelatedReport = !!policyName;
+    const [shouldShowDefaultGroupAvatar, setShouldShowDefaultGroupAvatar] = useState(false);
+
+    const attachment = useMemo(() => {
+        if (isNewGroupDraftAvatar) {
+            return {
+                source: shouldShowDefaultGroupAvatar ? ReportUtils.getDefaultGroupAvatar(newGroupDraft?.optimisticReportID ?? '') : newGroupDraft?.avatarUri ?? '',
+                headerTitle: (newGroupDraft?.reportName ? newGroupDraft?.reportName : ReportUtils.getGroupChatName(newGroupDraft?.participants)) ?? '',
+                originalFileName: newGroupDraft?.avatarFileName ?? '',
+            };
+        }
+
+        if (isPolicyRelatedReport) {
+            return {
+                source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceAvatar(report), 0),
+                headerTitle: policyName,
+                originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',
+            };
+        }
+
+        if (ReportUtils.isGroupChat(report)) {
+            const rootGroupReport = ReportUtils.getRootParentReport(report);
+            const source =
+                UserUtils.getFullSizeAvatar(report?.avatarUrl, 0) ??
+                UserUtils.getFullSizeAvatar(rootGroupReport?.avatarUrl, 0) ??
+                ReportUtils.getDefaultGroupAvatar(ReportUtils.getRootParentReport(report)?.reportID ?? '') ??
+                '';
+            return {
+                source,
+                headerTitle: ReportUtils.getReportName(report),
+                originalFileName: report?.avatarFileName ?? rootGroupReport?.avatarFileName ?? '',
+            };
+        }
+
+        return {
+            source: UserUtils.getFullSizeAvatar(report?.avatarUrl ?? '', 0),
+            headerTitle: ReportUtils.getReportName(report),
+            originalFileName: report?.avatarFileName ?? '',
+        };
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [shouldShowDefaultGroupAvatar, newGroupDraft, report, policy]);
+
+    useEffect(() => {
+        const onError = () => {
+            setShouldShowDefaultGroupAvatar(true);
+        };
+        if (isNewGroupDraftAvatar) {
+            FileUtils.readFileAsync(newGroupDraft?.avatarUri ?? '', newGroupDraft?.avatarFileName ?? '', () => {}, onError);
+        }
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
+
+    const onModalClose = useCallback(() => {
+        if (isNewGroupDraftAvatar) {
+            Navigation.goBack();
+            Navigation.isNavigationReady().then(() => {
+                Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM);
+            });
+        } else {
+            Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? '-1'));
+        }
+    }, [isNewGroupDraftAvatar, report]);
 
     return (
         <AttachmentModal
-            headerTitle={policyName}
+            headerTitle={attachment.headerTitle}
             defaultOpen
-            source={UserUtils.getFullSizeAvatar(avatarURL, 0)}
-            onModalClose={() => {
-                Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? '-1'));
-            }}
-            isWorkspaceAvatar
+            source={attachment.source}
+            onModalClose={onModalClose}
+            isWorkspaceAvatar={isPolicyRelatedReport && !isNewGroupDraftAvatar}
             maybeIcon
             // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
-            originalFileName={policy?.originalFileName ?? policy?.id ?? report?.policyID}
-            shouldShowNotFoundPage={!report?.reportID && !isLoadingApp}
+            originalFileName={attachment.originalFileName}
+            shouldShowNotFoundPage={!isNewGroupDraftAvatar && !report?.reportID && !isLoadingApp}
             isLoading={(!report?.reportID || !policy?.id) && !!isLoadingApp}
         />
     );
@@ -56,4 +120,7 @@ export default withOnyx<ReportAvatarProps, ReportAvatarOnyxProps>({
     policies: {
         key: ONYXKEYS.COLLECTION.POLICY,
     },
+    newGroupDraft: {
+        key: ONYXKEYS.NEW_GROUP_CHAT_DRAFT,
+    },
 })(ReportAvatar);
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index de93ed7a3ced..4ff5c1b4957a 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -500,7 +500,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                     isUsingDefaultAvatar={!report.avatarUrl}
                     size={CONST.AVATAR_SIZE.XLARGE}
                     avatarStyle={styles.avatarXLarge}
-                    shouldDisableViewPhoto
+                    onViewPhotoPress={() => Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(report.reportID))}
                     onImageRemoved={() => {
                         // Calling this without a file will remove the avatar
                         Report.updateGroupChatAvatar(report.reportID ?? '');
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 56b9cf970d54..5452d49893a0 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -207,6 +207,7 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
             isOptimisticReport: reportOnyx?.isOptimisticReport,
             lastMentionedTime: reportOnyx?.lastMentionedTime,
             avatarUrl: reportOnyx?.avatarUrl,
+            avatarFileName: reportOnyx?.avatarFileName,
             permissions,
             invoiceReceiver: reportOnyx?.invoiceReceiver,
             policyAvatar: reportOnyx?.policyAvatar,
@@ -250,6 +251,7 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
             reportOnyx?.isOptimisticReport,
             reportOnyx?.lastMentionedTime,
             reportOnyx?.avatarUrl,
+            reportOnyx?.avatarFileName,
             permissions,
             reportOnyx?.invoiceReceiver,
             reportOnyx?.policyAvatar,
diff --git a/src/types/onyx/NewGroupChatDraft.ts b/src/types/onyx/NewGroupChatDraft.ts
index e075ed6e5e33..39fc2ff2844b 100644
--- a/src/types/onyx/NewGroupChatDraft.ts
+++ b/src/types/onyx/NewGroupChatDraft.ts
@@ -23,6 +23,9 @@ type NewGroupChatDraft = {
 
     /** New group chat avatar file type */
     avatarFileType: string | null;
+
+    /** Optimistic report ID of the new group chat */
+    optimisticReportID: string | null;
 };
 export type {SelectedParticipant};
 export default NewGroupChatDraft;
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index 0a545cb8e4dc..7c315c79595f 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -281,6 +281,9 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Collection of report permissions granted to the current user */
         permissions?: Array<ValueOf<typeof CONST.REPORT.PERMISSIONS>>;
 
+        /** The filename of the avatar */
+        avatarFileName?: string;
+
         /** The trip data for a trip room */
         tripData?: {
             /** The start date of a trip */

From 664c046d0791f243766f920426c4f60d45fe4a9f Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Sat, 7 Sep 2024 13:55:45 +0700
Subject: [PATCH 045/132] fix: The top of emojis are cut off on applying quote
 markdown

---
 .../BaseHTMLEngineProvider.tsx                | 22 ++++++++++++++++++-
 .../report/comment/TextCommentFragment.tsx    |  6 ++++-
 src/styles/index.ts                           |  2 ++
 .../emojiBlockquoteStyles/index.android.ts    |  7 ++++++
 .../utils/emojiBlockquoteStyles/index.ts      |  5 +++++
 .../utils/emojiBlockquoteStyles/types.ts      |  5 +++++
 6 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 src/styles/utils/emojiBlockquoteStyles/index.android.ts
 create mode 100644 src/styles/utils/emojiBlockquoteStyles/index.ts
 create mode 100644 src/styles/utils/emojiBlockquoteStyles/types.ts

diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
index 97be05049e3c..278e03ea392b 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
@@ -82,8 +82,28 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
                 mixedUAStyles: {...styles.textSupporting, ...styles.textLineThrough},
                 contentModel: HTMLContentModel.textual,
             }),
+            blockquote: HTMLElementModel.fromCustomModel({
+                tagName: 'blockquote',
+                contentModel: HTMLContentModel.block,
+                getMixedUAStyles: (tnode) => {
+                    if (tnode.attributes.islarge === undefined) {
+                        return;
+                    }
+                    return styles.onlyEmojisBlockquoteLineHeight;
+                },
+            }),
         }),
-        [styles.formError, styles.mb0, styles.colorMuted, styles.textLabelSupporting, styles.lh16, styles.textSupporting, styles.textLineThrough, styles.mutedNormalTextLabel],
+        [
+            styles.formError,
+            styles.mb0,
+            styles.colorMuted,
+            styles.textLabelSupporting,
+            styles.lh16,
+            styles.textSupporting,
+            styles.textLineThrough,
+            styles.mutedNormalTextLabel,
+            styles.onlyEmojisBlockquoteLineHeight,
+        ],
     );
     /* eslint-enable @typescript-eslint/naming-convention */
 
diff --git a/src/pages/home/report/comment/TextCommentFragment.tsx b/src/pages/home/report/comment/TextCommentFragment.tsx
index 9d1a4d9ad4b7..fe7ab8ea7bab 100644
--- a/src/pages/home/report/comment/TextCommentFragment.tsx
+++ b/src/pages/home/report/comment/TextCommentFragment.tsx
@@ -61,7 +61,11 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
         const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''} ${containsOnlyEmojis ? 'islarge' : ''}></edited>` : '';
         const htmlWithDeletedTag = styleAsDeleted ? `<del>${html}</del>` : html;
 
-        const htmlContent = containsOnlyEmojis ? Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji islarge>') : htmlWithDeletedTag;
+        let htmlContent = htmlWithDeletedTag;
+        if (containsOnlyEmojis) {
+            htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji islarge>');
+            htmlContent = Str.replaceAll(htmlContent, '<blockquote>', '<blockquote islarge>');
+        }
         let htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;
 
         if (styleAsMuted) {
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 179e886d08ff..a27bb9b15714 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -21,6 +21,7 @@ import codeStyles from './utils/codeStyles';
 import cursor from './utils/cursor';
 import display from './utils/display';
 import editedLabelStyles from './utils/editedLabelStyles';
+import onlyEmojisBlockquoteLineHeight from './utils/emojiBlockquoteStyles';
 import emojiDefaultStyles from './utils/emojiDefaultStyles';
 import flex from './utils/flex';
 import FontUtils from './utils/FontUtils';
@@ -262,6 +263,7 @@ const styles = (theme: ThemeColors) =>
         ...textDecorationLine,
         editedLabelStyles,
         emojiDefaultStyles,
+        onlyEmojisBlockquoteLineHeight,
 
         autoCompleteSuggestionsContainer: {
             backgroundColor: theme.appBG,
diff --git a/src/styles/utils/emojiBlockquoteStyles/index.android.ts b/src/styles/utils/emojiBlockquoteStyles/index.android.ts
new file mode 100644
index 000000000000..bc4384af4968
--- /dev/null
+++ b/src/styles/utils/emojiBlockquoteStyles/index.android.ts
@@ -0,0 +1,7 @@
+import type OnlyEmojisBlockquoteLineHeight from './types';
+
+const onlyEmojisBlockquoteLineHeight: OnlyEmojisBlockquoteLineHeight = {
+    lineHeight: 35,
+};
+
+export default onlyEmojisBlockquoteLineHeight;
diff --git a/src/styles/utils/emojiBlockquoteStyles/index.ts b/src/styles/utils/emojiBlockquoteStyles/index.ts
new file mode 100644
index 000000000000..3b837acf3f4d
--- /dev/null
+++ b/src/styles/utils/emojiBlockquoteStyles/index.ts
@@ -0,0 +1,5 @@
+import type OnlyEmojisBlockquoteLineHeight from './types';
+
+const onlyEmojisBlockquoteLineHeight: OnlyEmojisBlockquoteLineHeight = {};
+
+export default onlyEmojisBlockquoteLineHeight;
diff --git a/src/styles/utils/emojiBlockquoteStyles/types.ts b/src/styles/utils/emojiBlockquoteStyles/types.ts
new file mode 100644
index 000000000000..86ca4bbb2d21
--- /dev/null
+++ b/src/styles/utils/emojiBlockquoteStyles/types.ts
@@ -0,0 +1,5 @@
+type OnlyEmojisBlockquoteLineHeight = {
+    lineHeight?: number;
+};
+
+export default OnlyEmojisBlockquoteLineHeight;

From 8e5e9da814f96380f6f6b65268ccfdd1dc9dcc47 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Sat, 7 Sep 2024 18:27:31 +0700
Subject: [PATCH 046/132] fix: use isEmptyObject instead of lodash

---
 src/libs/Navigation/AppNavigator/AuthScreens.tsx   | 4 ++--
 src/pages/settings/Profile/TimezoneInitialPage.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 72323b6bd180..3b0dbf97d5a3 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -1,4 +1,3 @@
-import lodashIsEmpty from 'lodash/isEmpty';
 import React, {memo, useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -50,6 +49,7 @@ import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
 import CENTRAL_PANE_SCREENS from './CENTRAL_PANE_SCREENS';
 import createCustomStackNavigator from './createCustomStackNavigator';
@@ -153,7 +153,7 @@ Onyx.connect({
 
         // If the current timezone is different than the user's timezone, and their timezone is set to automatic
         // then update their timezone.
-        if (!lodashIsEmpty(currentTimezone) && timezone?.automatic && timezone?.selected !== currentTimezone) {
+        if (!isEmptyObject(currentTimezone) && timezone?.automatic && timezone?.selected !== currentTimezone) {
             timezone.selected = currentTimezone;
             PersonalDetails.updateAutomaticTimezone({
                 automatic: true,
diff --git a/src/pages/settings/Profile/TimezoneInitialPage.tsx b/src/pages/settings/Profile/TimezoneInitialPage.tsx
index b700e80e687e..1d2e4b62a2de 100644
--- a/src/pages/settings/Profile/TimezoneInitialPage.tsx
+++ b/src/pages/settings/Profile/TimezoneInitialPage.tsx
@@ -1,4 +1,3 @@
-import lodashIsEmpty from 'lodash/isEmpty';
 import React from 'react';
 import {View} from 'react-native';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -15,6 +14,7 @@ import * as PersonalDetails from '@userActions/PersonalDetails';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type TimezoneInitialPageProps = WithCurrentUserPersonalDetailsProps;
 
@@ -33,7 +33,7 @@ function TimezoneInitialPage({currentUserPersonalDetails}: TimezoneInitialPagePr
     const updateAutomaticTimezone = (isAutomatic: boolean) => {
         PersonalDetails.updateAutomaticTimezone({
             automatic: isAutomatic,
-            selected: isAutomatic && !lodashIsEmpty(currentTimezone) ? currentTimezone : timezone.selected,
+            selected: isAutomatic && !isEmptyObject(currentTimezone) ? currentTimezone : timezone.selected,
         });
     };
 

From 54723d39a2961ec013f8819f5477cabb5aa56ee0 Mon Sep 17 00:00:00 2001
From: Dominic <165644294+dominictb@users.noreply.github.com>
Date: Mon, 9 Sep 2024 09:35:46 +0700
Subject: [PATCH 047/132] Update comment

Co-authored-by: Joel Davies <joeld.dev@gmail.com>
---
 src/libs/actions/Task.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index b77e86f74884..f37e83712c3d 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1130,7 +1130,7 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
 }
 
 /**
- * Check if you can actually change the status of the task (mark complete or incomplete)
+ * Check if you can change the status of the task (mark complete or incomplete). Only the task owner and task assignee can do this.
  */
 function canActionTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number): boolean {
     return sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport);

From e2e2093c556438423b47ef32a6ca3f9d71b8ce28 Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Mon, 9 Sep 2024 10:20:13 +0700
Subject: [PATCH 048/132] Fix some issues

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/libs/actions/Report.ts       |  2 +-
 src/pages/NewChatConfirmPage.tsx |  1 -
 src/pages/ReportAvatar.tsx       | 39 ++++++++++++++++----------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index ff6334a97c97..ddff062fa4bf 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -697,7 +697,7 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
-                avatarUrl: file?.uri ?? '',
+                avatarUrl: file ? file?.uri ?? '' : null,
                 avatarFileName: file ? file?.name ?? '' : null,
                 pendingFields: {
                     avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx
index e6c33db687b1..16a41d23eb68 100644
--- a/src/pages/NewChatConfirmPage.tsx
+++ b/src/pages/NewChatConfirmPage.tsx
@@ -163,7 +163,6 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
                     }}
                     size={CONST.AVATAR_SIZE.XLARGE}
                     avatarStyle={styles.avatarXLarge}
-                    shouldDisableViewPhoto={!avatarFile}
                     editIcon={Expensicons.Camera}
                     editIconStyle={styles.smallEditIconAccount}
                     shouldUseStyleUtilityForAnchorPosition
diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index 4eee9f32f516..cbf69cf94218 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -1,13 +1,15 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo} from 'react';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
+import useLocalize from '@hooks/useLocalize';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as UserUtils from '@libs/UserUtils';
+import * as ReportAction from '@userActions/Report';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -23,6 +25,7 @@ type ReportAvatarOnyxProps = {
 type ReportAvatarProps = ReportAvatarOnyxProps & StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
 
 function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true, newGroupDraft}: ReportAvatarProps) {
+    const {translate} = useLocalize();
     const reportIDFromRoute = String(route.params?.reportID || 0);
     const isNewGroupDraftAvatar = reportIDFromRoute === newGroupDraft?.optimisticReportID;
 
@@ -30,14 +33,15 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const policyName = ReportUtils.getPolicyName(report, true, policy);
     const isPolicyRelatedReport = !!policyName;
-    const [shouldShowDefaultGroupAvatar, setShouldShowDefaultGroupAvatar] = useState(false);
+    const unavailableWorkspace = translate('workspace.common.unavailable');
 
     const attachment = useMemo(() => {
         if (isNewGroupDraftAvatar) {
             return {
-                source: shouldShowDefaultGroupAvatar ? ReportUtils.getDefaultGroupAvatar(newGroupDraft?.optimisticReportID ?? '') : newGroupDraft?.avatarUri ?? '',
-                headerTitle: (newGroupDraft?.reportName ? newGroupDraft?.reportName : ReportUtils.getGroupChatName(newGroupDraft?.participants)) ?? '',
+                source: newGroupDraft?.avatarUri ? newGroupDraft.avatarUri : ReportUtils.getDefaultGroupAvatar(newGroupDraft?.optimisticReportID ?? ''),
+                headerTitle: newGroupDraft?.reportName ? newGroupDraft.reportName : ReportUtils.getGroupChatName(newGroupDraft?.participants) ?? '',
                 originalFileName: newGroupDraft?.avatarFileName ?? '',
+                isWorkspaceAvatar: false,
             };
         }
 
@@ -46,34 +50,31 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
                 source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceAvatar(report), 0),
                 headerTitle: policyName,
                 originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',
+                isWorkspaceAvatar: true,
             };
         }
 
-        if (ReportUtils.isGroupChat(report)) {
-            const rootGroupReport = ReportUtils.getRootParentReport(report);
-            const source =
-                UserUtils.getFullSizeAvatar(report?.avatarUrl, 0) ??
-                UserUtils.getFullSizeAvatar(rootGroupReport?.avatarUrl, 0) ??
-                ReportUtils.getDefaultGroupAvatar(ReportUtils.getRootParentReport(report)?.reportID ?? '') ??
-                '';
+        if (ReportUtils.isGroupChat(report) && !ReportUtils.isThread(report)) {
             return {
-                source,
+                source: report?.avatarUrl ? UserUtils.getFullSizeAvatar(report.avatarUrl, 0) : ReportUtils.getDefaultGroupAvatar(report?.reportID ?? ''),
                 headerTitle: ReportUtils.getReportName(report),
-                originalFileName: report?.avatarFileName ?? rootGroupReport?.avatarFileName ?? '',
+                originalFileName: report?.avatarFileName ?? '',
+                isWorkspaceAvatar: false,
             };
         }
 
         return {
-            source: UserUtils.getFullSizeAvatar(report?.avatarUrl ?? '', 0),
-            headerTitle: ReportUtils.getReportName(report),
-            originalFileName: report?.avatarFileName ?? '',
+            source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceAvatar(report), 0),
+            headerTitle: unavailableWorkspace,
+            originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID,
+            isWorkspaceAvatar: true,
         };
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, [shouldShowDefaultGroupAvatar, newGroupDraft, report, policy]);
+    }, [newGroupDraft, report, policy]);
 
     useEffect(() => {
         const onError = () => {
-            setShouldShowDefaultGroupAvatar(true);
+            ReportAction.setGroupDraft({avatarUri: null, avatarFileName: null, avatarFileType: null});
         };
         if (isNewGroupDraftAvatar) {
             FileUtils.readFileAsync(newGroupDraft?.avatarUri ?? '', newGroupDraft?.avatarFileName ?? '', () => {}, onError);
@@ -98,7 +99,7 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
             defaultOpen
             source={attachment.source}
             onModalClose={onModalClose}
-            isWorkspaceAvatar={isPolicyRelatedReport && !isNewGroupDraftAvatar}
+            isWorkspaceAvatar={attachment.isWorkspaceAvatar}
             maybeIcon
             // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
             originalFileName={attachment.originalFileName}

From 8e3792291ba96ef4dd50bb96f5155164c840f9ad Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Mon, 9 Sep 2024 10:59:22 +0700
Subject: [PATCH 049/132] Revert the use of interaction manager when navigate

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/libs/actions/Report.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index ddff062fa4bf..fbcb596f0068 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1039,14 +1039,12 @@ function navigateToAndOpenReport(
 
     // We want to pass newChat here because if anything is passed in that param (even an existing chat), we will try to create a chat on the server
     openReport(report?.reportID ?? '', '', userLogins, newChat, undefined, undefined, undefined, avatarFile);
-    InteractionManager.runAfterInteractions(() => {
-        if (shouldDismissModal) {
-            Navigation.dismissModalWithReport(report);
-        } else {
-            Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'), actionType);
-        }
-    });
+    if (shouldDismissModal) {
+        Navigation.dismissModalWithReport(report);
+    } else {
+        Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'), actionType);
+    }
 }
 
 /**

From eb7d62549bccce36d74bc31820e728bf6d9325ef Mon Sep 17 00:00:00 2001
From: "Antony M. Kithinzi" <kithinzi97@gmail.com>
Date: Mon, 9 Sep 2024 20:03:42 +0300
Subject: [PATCH 050/132] Sorting multi-select fields in the advanced search
 filter page

---
 src/pages/Search/AdvancedSearchFilters.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 7775825f33de..cebac4c50ac8 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -15,6 +15,7 @@ import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils';
+import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import {getAllTaxRates} from '@libs/PolicyUtils';
@@ -182,7 +183,7 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
         filters[fieldName]
     ) {
         const filterArray = filters[fieldName] ?? [];
-        return filterArray.join(', ');
+        return filterArray.sort(localeCompare).join(', ');
     }
 
     if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION) {

From 631b4940fc54c8991fb7d300bc257e52d7df8f34 Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Tue, 10 Sep 2024 09:52:50 +0700
Subject: [PATCH 051/132] Use useOnyx instad of withOnyx

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/pages/ReportAvatar.tsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index cbf69cf94218..69ddca2aaf94 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -1,7 +1,7 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect, useMemo} from 'react';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
 import useLocalize from '@hooks/useLocalize';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
@@ -13,19 +13,19 @@ import * as ReportAction from '@userActions/Report';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {NewGroupChatDraft, Policy, Report} from '@src/types/onyx';
+import type {Policy, Report} from '@src/types/onyx';
 
 type ReportAvatarOnyxProps = {
     report: OnyxEntry<Report>;
     isLoadingApp: OnyxEntry<boolean>;
     policies: OnyxCollection<Policy>;
-    newGroupDraft: OnyxEntry<NewGroupChatDraft>;
 };
 
 type ReportAvatarProps = ReportAvatarOnyxProps & StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
 
-function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true, newGroupDraft}: ReportAvatarProps) {
+function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true}: ReportAvatarProps) {
     const {translate} = useLocalize();
+    const [newGroupDraft] = useOnyx(ONYXKEYS.NEW_GROUP_CHAT_DRAFT);
     const reportIDFromRoute = String(route.params?.reportID || 0);
     const isNewGroupDraftAvatar = reportIDFromRoute === newGroupDraft?.optimisticReportID;
 
@@ -121,7 +121,4 @@ export default withOnyx<ReportAvatarProps, ReportAvatarOnyxProps>({
     policies: {
         key: ONYXKEYS.COLLECTION.POLICY,
     },
-    newGroupDraft: {
-        key: ONYXKEYS.NEW_GROUP_CHAT_DRAFT,
-    },
 })(ReportAvatar);

From 47673f03d87debf96eb0d9402a8ff4a1402e43a2 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Tue, 10 Sep 2024 15:07:35 +0700
Subject: [PATCH 052/132] fix: remove unused styles

---
 .../HTMLEngineProvider/BaseHTMLEngineProvider.tsx          | 4 ++--
 src/styles/index.ts                                        | 2 --
 src/styles/utils/emojiBlockquoteStyles/index.android.ts    | 7 -------
 src/styles/utils/emojiBlockquoteStyles/index.ts            | 5 -----
 src/styles/utils/emojiBlockquoteStyles/types.ts            | 5 -----
 5 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 src/styles/utils/emojiBlockquoteStyles/index.android.ts
 delete mode 100644 src/styles/utils/emojiBlockquoteStyles/index.ts
 delete mode 100644 src/styles/utils/emojiBlockquoteStyles/types.ts

diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
index 278e03ea392b..256a5475be77 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
@@ -89,7 +89,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
                     if (tnode.attributes.islarge === undefined) {
                         return;
                     }
-                    return styles.onlyEmojisBlockquoteLineHeight;
+                    return styles.onlyEmojisTextLineHeight;
                 },
             }),
         }),
@@ -102,7 +102,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
             styles.textSupporting,
             styles.textLineThrough,
             styles.mutedNormalTextLabel,
-            styles.onlyEmojisBlockquoteLineHeight,
+            styles.onlyEmojisTextLineHeight,
         ],
     );
     /* eslint-enable @typescript-eslint/naming-convention */
diff --git a/src/styles/index.ts b/src/styles/index.ts
index a27bb9b15714..179e886d08ff 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -21,7 +21,6 @@ import codeStyles from './utils/codeStyles';
 import cursor from './utils/cursor';
 import display from './utils/display';
 import editedLabelStyles from './utils/editedLabelStyles';
-import onlyEmojisBlockquoteLineHeight from './utils/emojiBlockquoteStyles';
 import emojiDefaultStyles from './utils/emojiDefaultStyles';
 import flex from './utils/flex';
 import FontUtils from './utils/FontUtils';
@@ -263,7 +262,6 @@ const styles = (theme: ThemeColors) =>
         ...textDecorationLine,
         editedLabelStyles,
         emojiDefaultStyles,
-        onlyEmojisBlockquoteLineHeight,
 
         autoCompleteSuggestionsContainer: {
             backgroundColor: theme.appBG,
diff --git a/src/styles/utils/emojiBlockquoteStyles/index.android.ts b/src/styles/utils/emojiBlockquoteStyles/index.android.ts
deleted file mode 100644
index bc4384af4968..000000000000
--- a/src/styles/utils/emojiBlockquoteStyles/index.android.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type OnlyEmojisBlockquoteLineHeight from './types';
-
-const onlyEmojisBlockquoteLineHeight: OnlyEmojisBlockquoteLineHeight = {
-    lineHeight: 35,
-};
-
-export default onlyEmojisBlockquoteLineHeight;
diff --git a/src/styles/utils/emojiBlockquoteStyles/index.ts b/src/styles/utils/emojiBlockquoteStyles/index.ts
deleted file mode 100644
index 3b837acf3f4d..000000000000
--- a/src/styles/utils/emojiBlockquoteStyles/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type OnlyEmojisBlockquoteLineHeight from './types';
-
-const onlyEmojisBlockquoteLineHeight: OnlyEmojisBlockquoteLineHeight = {};
-
-export default onlyEmojisBlockquoteLineHeight;
diff --git a/src/styles/utils/emojiBlockquoteStyles/types.ts b/src/styles/utils/emojiBlockquoteStyles/types.ts
deleted file mode 100644
index 86ca4bbb2d21..000000000000
--- a/src/styles/utils/emojiBlockquoteStyles/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-type OnlyEmojisBlockquoteLineHeight = {
-    lineHeight?: number;
-};
-
-export default OnlyEmojisBlockquoteLineHeight;

From 2deac3c3bb7ea84cfc50c94d3242fa306b62ee4d Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Tue, 10 Sep 2024 22:42:16 +0700
Subject: [PATCH 053/132] fix: Error message for multiple GL code mappings
 displays "glCode"

---
 src/pages/workspace/categories/ImportedCategoriesPage.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/categories/ImportedCategoriesPage.tsx b/src/pages/workspace/categories/ImportedCategoriesPage.tsx
index 8e942b3060ff..6a8d8895aaaa 100644
--- a/src/pages/workspace/categories/ImportedCategoriesPage.tsx
+++ b/src/pages/workspace/categories/ImportedCategoriesPage.tsx
@@ -66,14 +66,15 @@ function ImportedCategoriesPage({route}: ImportedCategoriesPageProps) {
             });
         } else {
             const duplicate = findDuplicate(columns);
-            if (duplicate) {
-                errors.duplicates = translate('spreadsheet.singleFieldMultipleColumns', duplicate);
+            const duplicateColumn = columnRoles.find((role) => role.value === duplicate);
+            if (duplicateColumn) {
+                errors.duplicates = translate('spreadsheet.singleFieldMultipleColumns', duplicateColumn.text);
             } else {
                 errors = {};
             }
         }
         return errors;
-    }, [requiredColumns, spreadsheet?.columns, translate]);
+    }, [requiredColumns, spreadsheet?.columns, translate, columnRoles]);
 
     const importCategories = useCallback(() => {
         setIsValidationEnabled(true);

From e4b1e5af73329b79359cdc2ca04ebe2cb5eda1e0 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Tue, 10 Sep 2024 23:58:13 +0300
Subject: [PATCH 054/132] remove unnecessary import

---
 src/components/SelectionList/Search/TransactionListItemRow.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
index 956bcce385ac..4a59b58a8273 100644
--- a/src/components/SelectionList/Search/TransactionListItemRow.tsx
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -2,7 +2,6 @@ import {Str} from 'expensify-common';
 import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
 import Checkbox from '@components/Checkbox';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -25,7 +24,6 @@ import * as TransactionUtils from '@libs/TransactionUtils';
 import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchTransactionType} from '@src/types/onyx/SearchResults';
 import ActionCell from './ActionCell';
 import ExpenseItemHeaderNarrow from './ExpenseItemHeaderNarrow';

From a944614aa59239e601fc5fba22ecbd233f3f29fe Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 11 Sep 2024 10:43:54 +0700
Subject: [PATCH 055/132] fix: submit expense via QAB inconsistency

---
 src/pages/iou/request/step/IOURequestStepAmount.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx
index 069f86ce0899..a03c40e8c1f3 100644
--- a/src/pages/iou/request/step/IOURequestStepAmount.tsx
+++ b/src/pages/iou/request/step/IOURequestStepAmount.tsx
@@ -227,7 +227,7 @@ function IOURequestStepAmount({
                         backendAmount,
                         currency,
                         transaction?.created ?? '',
-                        '',
+                        CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
                         currentUserPersonalDetails.login,
                         currentUserPersonalDetails.accountID,
                         participants[0],
@@ -242,7 +242,7 @@ function IOURequestStepAmount({
                         backendAmount,
                         currency ?? 'USD',
                         transaction?.created ?? '',
-                        '',
+                        CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
                         currentUserPersonalDetails.login,
                         currentUserPersonalDetails.accountID,
                         participants[0],

From 58249b7881e779227b98e995ebda0b400217f4a3 Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Wed, 11 Sep 2024 17:14:46 +0700
Subject: [PATCH 056/132] Revert some changes

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/libs/actions/Report.ts       |  2 ++
 src/pages/NewChatConfirmPage.tsx | 16 ++---------
 src/pages/ReportAvatar.tsx       | 48 +++++---------------------------
 3 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index fbcb596f0068..0c962c25985f 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -849,6 +849,8 @@ function openReport(
         if (avatar) {
             parameters.file = avatar;
         }
+
+        clearGroupChat();
     }
 
     if (isFromDeepLink) {
diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx
index 16a41d23eb68..d6b199def243 100644
--- a/src/pages/NewChatConfirmPage.tsx
+++ b/src/pages/NewChatConfirmPage.tsx
@@ -45,8 +45,7 @@ function navigateToEditChatName() {
 }
 
 function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmPageProps) {
-    const optimisticReportID = useRef<string>(newGroupDraft?.optimisticReportID ?? ReportUtils.generateReportID());
-    const shouldClearGroupDraft = useRef<boolean>(false);
+    const optimisticReportID = useRef<string>(ReportUtils.generateReportID());
     const [avatarFile, setAvatarFile] = useState<File | CustomRNImageManipulatorResult | undefined>();
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -106,21 +105,10 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
 
         const logins: string[] = (newGroupDraft.participants ?? []).map((participant) => participant.login);
         Report.navigateToAndOpenReport(logins, true, undefined, newGroupDraft.reportName ?? '', newGroupDraft.avatarUri ?? '', avatarFile, optimisticReportID.current, true);
-        shouldClearGroupDraft.current = true;
     }, [newGroupDraft, avatarFile]);
 
     const stashedLocalAvatarImage = newGroupDraft?.avatarUri;
 
-    useEffect(() => {
-        Report.setGroupDraft({optimisticReportID: optimisticReportID.current});
-        return () => {
-            if (!shouldClearGroupDraft.current) {
-                return;
-            }
-            Report.clearGroupChat();
-        };
-    }, []);
-
     useEffect(() => {
         if (!stashedLocalAvatarImage) {
             return;
@@ -163,11 +151,11 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
                     }}
                     size={CONST.AVATAR_SIZE.XLARGE}
                     avatarStyle={styles.avatarXLarge}
+                    shouldDisableViewPhoto
                     editIcon={Expensicons.Camera}
                     editIconStyle={styles.smallEditIconAccount}
                     shouldUseStyleUtilityForAnchorPosition
                     style={styles.w100}
-                    onViewPhotoPress={() => Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(optimisticReportID.current))}
                 />
             </View>
             <MenuItemWithTopDescription
diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index 69ddca2aaf94..feebec642e25 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -1,15 +1,13 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo} from 'react';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import React, {useMemo} from 'react';
+import {withOnyx} from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
 import useLocalize from '@hooks/useLocalize';
-import * as FileUtils from '@libs/fileDownload/FileUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as UserUtils from '@libs/UserUtils';
-import * as ReportAction from '@userActions/Report';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -25,10 +23,6 @@ type ReportAvatarProps = ReportAvatarOnyxProps & StackScreenProps<AuthScreensPar
 
 function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true}: ReportAvatarProps) {
     const {translate} = useLocalize();
-    const [newGroupDraft] = useOnyx(ONYXKEYS.NEW_GROUP_CHAT_DRAFT);
-    const reportIDFromRoute = String(route.params?.reportID || 0);
-    const isNewGroupDraftAvatar = reportIDFromRoute === newGroupDraft?.optimisticReportID;
-
     const policyID = route.params.policyID ?? '-1';
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const policyName = ReportUtils.getPolicyName(report, true, policy);
@@ -36,15 +30,6 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
     const unavailableWorkspace = translate('workspace.common.unavailable');
 
     const attachment = useMemo(() => {
-        if (isNewGroupDraftAvatar) {
-            return {
-                source: newGroupDraft?.avatarUri ? newGroupDraft.avatarUri : ReportUtils.getDefaultGroupAvatar(newGroupDraft?.optimisticReportID ?? ''),
-                headerTitle: newGroupDraft?.reportName ? newGroupDraft.reportName : ReportUtils.getGroupChatName(newGroupDraft?.participants) ?? '',
-                originalFileName: newGroupDraft?.avatarFileName ?? '',
-                isWorkspaceAvatar: false,
-            };
-        }
-
         if (isPolicyRelatedReport) {
             return {
                 source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceAvatar(report), 0),
@@ -70,40 +55,21 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
             isWorkspaceAvatar: true,
         };
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, [newGroupDraft, report, policy]);
-
-    useEffect(() => {
-        const onError = () => {
-            ReportAction.setGroupDraft({avatarUri: null, avatarFileName: null, avatarFileType: null});
-        };
-        if (isNewGroupDraftAvatar) {
-            FileUtils.readFileAsync(newGroupDraft?.avatarUri ?? '', newGroupDraft?.avatarFileName ?? '', () => {}, onError);
-        }
-        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, []);
-
-    const onModalClose = useCallback(() => {
-        if (isNewGroupDraftAvatar) {
-            Navigation.goBack();
-            Navigation.isNavigationReady().then(() => {
-                Navigation.navigate(ROUTES.NEW_CHAT_CONFIRM);
-            });
-        } else {
-            Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? '-1'));
-        }
-    }, [isNewGroupDraftAvatar, report]);
+    }, [report, policy]);
 
     return (
         <AttachmentModal
             headerTitle={attachment.headerTitle}
             defaultOpen
             source={attachment.source}
-            onModalClose={onModalClose}
+            onModalClose={() => {
+                Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? '-1'));
+            }}
             isWorkspaceAvatar={attachment.isWorkspaceAvatar}
             maybeIcon
             // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
             originalFileName={attachment.originalFileName}
-            shouldShowNotFoundPage={!isNewGroupDraftAvatar && !report?.reportID && !isLoadingApp}
+            shouldShowNotFoundPage={!report?.reportID && !isLoadingApp}
             isLoading={(!report?.reportID || !policy?.id) && !!isLoadingApp}
         />
     );

From e0ad3ff741ef75cf671063e1a436af8545223d48 Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Wed, 11 Sep 2024 17:31:52 +0700
Subject: [PATCH 057/132] Revert newgroupchatdraft onyx types

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/types/onyx/NewGroupChatDraft.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/types/onyx/NewGroupChatDraft.ts b/src/types/onyx/NewGroupChatDraft.ts
index 39fc2ff2844b..e075ed6e5e33 100644
--- a/src/types/onyx/NewGroupChatDraft.ts
+++ b/src/types/onyx/NewGroupChatDraft.ts
@@ -23,9 +23,6 @@ type NewGroupChatDraft = {
 
     /** New group chat avatar file type */
     avatarFileType: string | null;
-
-    /** Optimistic report ID of the new group chat */
-    optimisticReportID: string | null;
 };
 export type {SelectedParticipant};
 export default NewGroupChatDraft;

From f27a9d48af1425be5213d44b2ffb5b9765f2aedb Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Wed, 11 Sep 2024 19:49:53 +0700
Subject: [PATCH 058/132] Fix typo

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/libs/actions/Report.ts      | 2 +-
 src/pages/ReportDetailsPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 0c962c25985f..15865c45aac6 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1020,7 +1020,7 @@ function navigateToAndOpenReport(
                 avatarUri ?? '',
                 avatarFile?.name ?? '',
                 optimisticReportID,
-                CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+                CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
             );
         } else {
             newChat = ReportUtils.buildOptimisticChatReport(
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index b160b2b563ef..c11d3d65933b 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -506,7 +506,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                     isUsingDefaultAvatar={!report.avatarUrl}
                     size={CONST.AVATAR_SIZE.XLARGE}
                     avatarStyle={styles.avatarXLarge}
-                    onViewPhotoPress={() => Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(report.reportID))}
+                    onViewPhotoPress={() => Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(report.reportID ?? '-1'))}
                     onImageRemoved={() => {
                         // Calling this without a file will remove the avatar
                         Report.updateGroupChatAvatar(report.reportID ?? '');

From 1f954151422b1a99643cd9677613b0184e53acf1 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Wed, 11 Sep 2024 22:35:59 +0700
Subject: [PATCH 059/132] fix: lottie and svg not render after switching from
 Inbox to Settings

---
 .../index.native.tsx}                         |  2 +-
 src/libs/Navigation/FreezeWrapper/index.tsx   | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 rename src/libs/Navigation/{FreezeWrapper.tsx => FreezeWrapper/index.native.tsx} (96%)
 create mode 100644 src/libs/Navigation/FreezeWrapper/index.tsx

diff --git a/src/libs/Navigation/FreezeWrapper.tsx b/src/libs/Navigation/FreezeWrapper/index.native.tsx
similarity index 96%
rename from src/libs/Navigation/FreezeWrapper.tsx
rename to src/libs/Navigation/FreezeWrapper/index.native.tsx
index fb5f769b19c1..670544a0926d 100644
--- a/src/libs/Navigation/FreezeWrapper.tsx
+++ b/src/libs/Navigation/FreezeWrapper/index.native.tsx
@@ -2,7 +2,7 @@ import {useIsFocused, useNavigation, useRoute} from '@react-navigation/native';
 import React, {useEffect, useRef, useState} from 'react';
 import {Freeze} from 'react-freeze';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
-import shouldSetScreenBlurred from './shouldSetScreenBlurred';
+import shouldSetScreenBlurred from '../shouldSetScreenBlurred';
 
 type FreezeWrapperProps = ChildrenProps & {
     /** Prop to disable freeze */
diff --git a/src/libs/Navigation/FreezeWrapper/index.tsx b/src/libs/Navigation/FreezeWrapper/index.tsx
new file mode 100644
index 000000000000..4c4d54e610b9
--- /dev/null
+++ b/src/libs/Navigation/FreezeWrapper/index.tsx
@@ -0,0 +1,46 @@
+import {useIsFocused, useNavigation, useRoute} from '@react-navigation/native';
+import React, {useEffect, useLayoutEffect, useRef, useState} from 'react';
+import {Freeze} from 'react-freeze';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import shouldSetScreenBlurred from '../shouldSetScreenBlurred';
+
+type FreezeWrapperProps = ChildrenProps & {
+    /** Prop to disable freeze */
+    keepVisible?: boolean;
+};
+
+function FreezeWrapper({keepVisible = false, children}: FreezeWrapperProps) {
+    const [isScreenBlurred, setIsScreenBlurred] = useState(false);
+    const [freezed, setFreezed] = useState(false);
+    // we need to know the screen index to determine if the screen can be frozen
+    const screenIndexRef = useRef<number | null>(null);
+    const isFocused = useIsFocused();
+    const navigation = useNavigation();
+    const currentRoute = useRoute();
+
+    useEffect(() => {
+        const index = navigation.getState()?.routes.findIndex((route) => route.key === currentRoute.key) ?? 0;
+        screenIndexRef.current = index;
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
+
+    useEffect(() => {
+        const unsubscribe = navigation.addListener('state', () => {
+            const navigationIndex = (navigation.getState()?.index ?? 0) - (screenIndexRef.current ?? 0);
+            setIsScreenBlurred(shouldSetScreenBlurred(navigationIndex));
+        });
+        return () => unsubscribe();
+    }, [isFocused, isScreenBlurred, navigation]);
+
+    // Decouple the Suspense render task so it won't be interuptted by React's concurrent mode
+    // and stuck in an infinite loop
+    useLayoutEffect(() => {
+        setFreezed(!isFocused && isScreenBlurred && !keepVisible);
+    }, [isFocused, isScreenBlurred, keepVisible]);
+
+    return <Freeze freeze={freezed}>{children}</Freeze>;
+}
+
+FreezeWrapper.displayName = 'FreezeWrapper';
+
+export default FreezeWrapper;

From 5067317b72d633b90c2624d6c9ef95bf80374894 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Wed, 11 Sep 2024 23:00:05 +0700
Subject: [PATCH 060/132] fix lint

---
 src/libs/Navigation/FreezeWrapper/index.native.tsx | 2 +-
 src/libs/Navigation/FreezeWrapper/index.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/FreezeWrapper/index.native.tsx b/src/libs/Navigation/FreezeWrapper/index.native.tsx
index 670544a0926d..b071a065bd31 100644
--- a/src/libs/Navigation/FreezeWrapper/index.native.tsx
+++ b/src/libs/Navigation/FreezeWrapper/index.native.tsx
@@ -1,8 +1,8 @@
 import {useIsFocused, useNavigation, useRoute} from '@react-navigation/native';
 import React, {useEffect, useRef, useState} from 'react';
 import {Freeze} from 'react-freeze';
+import shouldSetScreenBlurred from '@libs/Navigation/shouldSetScreenBlurred';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
-import shouldSetScreenBlurred from '../shouldSetScreenBlurred';
 
 type FreezeWrapperProps = ChildrenProps & {
     /** Prop to disable freeze */
diff --git a/src/libs/Navigation/FreezeWrapper/index.tsx b/src/libs/Navigation/FreezeWrapper/index.tsx
index 4c4d54e610b9..7219666b1b18 100644
--- a/src/libs/Navigation/FreezeWrapper/index.tsx
+++ b/src/libs/Navigation/FreezeWrapper/index.tsx
@@ -1,8 +1,8 @@
 import {useIsFocused, useNavigation, useRoute} from '@react-navigation/native';
 import React, {useEffect, useLayoutEffect, useRef, useState} from 'react';
 import {Freeze} from 'react-freeze';
+import shouldSetScreenBlurred from '@libs/Navigation/shouldSetScreenBlurred';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
-import shouldSetScreenBlurred from '../shouldSetScreenBlurred';
 
 type FreezeWrapperProps = ChildrenProps & {
     /** Prop to disable freeze */

From 9bda8f4d77d6a0b4f270818cb9c4c96499cc5505 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 11 Sep 2024 23:34:58 +0700
Subject: [PATCH 061/132] refactor: change only emoji attribute

---
 src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx | 2 +-
 src/pages/home/report/comment/TextCommentFragment.tsx        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
index 256a5475be77..c0f42ffd2fd9 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
@@ -86,7 +86,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
                 tagName: 'blockquote',
                 contentModel: HTMLContentModel.block,
                 getMixedUAStyles: (tnode) => {
-                    if (tnode.attributes.islarge === undefined) {
+                    if (tnode.attributes.isEmojisOnly === undefined) {
                         return;
                     }
                     return styles.onlyEmojisTextLineHeight;
diff --git a/src/pages/home/report/comment/TextCommentFragment.tsx b/src/pages/home/report/comment/TextCommentFragment.tsx
index fe7ab8ea7bab..6b18e455afe6 100644
--- a/src/pages/home/report/comment/TextCommentFragment.tsx
+++ b/src/pages/home/report/comment/TextCommentFragment.tsx
@@ -63,8 +63,8 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
 
         let htmlContent = htmlWithDeletedTag;
         if (containsOnlyEmojis) {
-            htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji islarge>');
-            htmlContent = Str.replaceAll(htmlContent, '<blockquote>', '<blockquote islarge>');
+            htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji isEmojisOnly>');
+            htmlContent = Str.replaceAll(htmlContent, '<blockquote>', '<blockquote isEmojisOnly>');
         }
         let htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;
 

From e77ed2e87038a04ed3a6e5dcad9f0db96e82fb76 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 11 Sep 2024 23:45:15 +0700
Subject: [PATCH 062/132] fix: revert islarge

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

diff --git a/src/pages/home/report/comment/TextCommentFragment.tsx b/src/pages/home/report/comment/TextCommentFragment.tsx
index 6b18e455afe6..4f68919af6e2 100644
--- a/src/pages/home/report/comment/TextCommentFragment.tsx
+++ b/src/pages/home/report/comment/TextCommentFragment.tsx
@@ -63,7 +63,7 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
 
         let htmlContent = htmlWithDeletedTag;
         if (containsOnlyEmojis) {
-            htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji isEmojisOnly>');
+            htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji islarge>');
             htmlContent = Str.replaceAll(htmlContent, '<blockquote>', '<blockquote isEmojisOnly>');
         }
         let htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;

From da450487f961c3fa88e1882e009d6672b250410d Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Wed, 11 Sep 2024 09:27:15 -1000
Subject: [PATCH 063/132] Add the setupTags task for MANAGE_TEAM choice

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

diff --git a/src/CONST.ts b/src/CONST.ts
index 0778478c2950..5482b29be2e0 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4547,6 +4547,24 @@ const CONST = {
                         '\n' +
                         `[Take me to workspace members](${workspaceMembersLink}). That’s it, happy expensing! :)`,
                 },
+                {
+                    type: 'setupTags',
+                    autoCompleted: false,
+                    title: 'Set up tags (optional)',
+                    description: ({workspaceMoreFeaturesLink}) =>
+                        'Tags can be used if you want more details with every expense. Use tags for projects, clients, locations, departments, and more. If you need multiple levels of tags you can upgrade to a control plan.' +
+                        '\n' +
+                        '*Here’s how to setup tags:*\n' +
+                        '1. Click your profile picture.\n' +
+                        '2. Go to Workspaces.\n' +
+                        '3. Select your workspace.\n' +
+                        '4. Click More features.\n' +
+                        '5. Enable tags.\n' +
+                        '6. Navigate to Tags in the workspace editor.\n' +
+                        '7. In Tags, click + Add tag to make your own.' +
+                        '\n' +
+                        `*[Take me to more features](${workspaceMoreFeaturesLink})*`,
+                },
             ],
         },
         [onboardingChoices.PERSONAL_SPEND]: {

From 239395d7d706afdac04059de4959212bdd6c6308 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Wed, 11 Sep 2024 10:01:20 -1000
Subject: [PATCH 064/132] Add new lines

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

diff --git a/src/CONST.ts b/src/CONST.ts
index 5482b29be2e0..79c6de19189a 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4552,16 +4552,17 @@ const CONST = {
                     autoCompleted: false,
                     title: 'Set up tags (optional)',
                     description: ({workspaceMoreFeaturesLink}) =>
-                        'Tags can be used if you want more details with every expense. Use tags for projects, clients, locations, departments, and more. If you need multiple levels of tags you can upgrade to a control plan.' +
+                        'Tags can be used if you want more details with every expense. Use tags for projects, clients, locations, departments, and more. If you need multiple levels of tags you can upgrade to a control plan.\n' +
                         '\n' +
                         '*Here’s how to setup tags:*\n' +
+                        '\n' +
                         '1. Click your profile picture.\n' +
                         '2. Go to Workspaces.\n' +
                         '3. Select your workspace.\n' +
                         '4. Click More features.\n' +
                         '5. Enable tags.\n' +
                         '6. Navigate to Tags in the workspace editor.\n' +
-                        '7. In Tags, click + Add tag to make your own.' +
+                        '7. In Tags, click + Add tag to make your own.\n' +
                         '\n' +
                         `*[Take me to more features](${workspaceMoreFeaturesLink})*`,
                 },

From 0638ed53c419dddfa02f6fae8398183e4b8fd65b Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Thu, 12 Sep 2024 06:34:37 +0700
Subject: [PATCH 065/132] Simplify code

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/pages/ReportAvatar.tsx | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index feebec642e25..bd826ab8ec8a 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -3,7 +3,6 @@ import React, {useMemo} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
-import useLocalize from '@hooks/useLocalize';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -22,23 +21,10 @@ type ReportAvatarOnyxProps = {
 type ReportAvatarProps = ReportAvatarOnyxProps & StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
 
 function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true}: ReportAvatarProps) {
-    const {translate} = useLocalize();
     const policyID = route.params.policyID ?? '-1';
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
-    const policyName = ReportUtils.getPolicyName(report, true, policy);
-    const isPolicyRelatedReport = !!policyName;
-    const unavailableWorkspace = translate('workspace.common.unavailable');
 
     const attachment = useMemo(() => {
-        if (isPolicyRelatedReport) {
-            return {
-                source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceAvatar(report), 0),
-                headerTitle: policyName,
-                originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',
-                isWorkspaceAvatar: true,
-            };
-        }
-
         if (ReportUtils.isGroupChat(report) && !ReportUtils.isThread(report)) {
             return {
                 source: report?.avatarUrl ? UserUtils.getFullSizeAvatar(report.avatarUrl, 0) : ReportUtils.getDefaultGroupAvatar(report?.reportID ?? ''),
@@ -50,8 +36,8 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
 
         return {
             source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceAvatar(report), 0),
-            headerTitle: unavailableWorkspace,
-            originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID,
+            headerTitle: ReportUtils.getPolicyName(report, false, policy),
+            originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',
             isWorkspaceAvatar: true,
         };
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps

From 07190e1c6b9340bd4fbe30dbd20706cf1935262b Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 12 Sep 2024 11:47:00 +0700
Subject: [PATCH 066/132] fix: No response when clicking back button and link
 on not found page

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

diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx
index 5ac849247ae0..7361a5eeea16 100644
--- a/src/pages/EditReportFieldPage.tsx
+++ b/src/pages/EditReportFieldPage.tsx
@@ -65,11 +65,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
                 shouldEnableMaxHeight
                 testID={EditReportFieldPage.displayName}
             >
-                <FullPageNotFoundView
-                    shouldShow
-                    onBackButtonPress={() => {}}
-                    onLinkPress={() => {}}
-                />
+                <FullPageNotFoundView shouldShow />
             </ScreenWrapper>
         );
     }

From bcfc0f59a6746548f4c3317d063612dbe32785ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Thu, 12 Sep 2024 13:24:17 +0200
Subject: [PATCH 067/132] Change shortcut reportID from string to long

---
 .../chat/customairshipextender/CustomNotificationProvider.java  | 2 +-
 .../chat/shortcutManagerModule/ShortcutManagerUtils.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
index 791371630821..b950921a0cd5 100644
--- a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
+++ b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
@@ -218,7 +218,7 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
 
             Person person = createMessagePersonObject(IconCompat.createWithBitmap(personIcon), accountID, name);
 
-            ShortcutManagerUtils.addDynamicShortcut(context, reportId, name, accountID, personIcon, person);
+            ShortcutManagerUtils.addDynamicShortcut(context, reportID, name, accountID, personIcon, person);
 
             // Create latest received message object
             long createdTimeInMillis = getMessageTimeInMillis(messageData.get("created").getString(""));
diff --git a/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java
index a8d58d672db0..5947faaa67c4 100644
--- a/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java
+++ b/android/app/src/main/java/com/expensify/chat/shortcutManagerModule/ShortcutManagerUtils.java
@@ -19,7 +19,7 @@ public static void removeAllDynamicShortcuts(Context context) {
         ShortcutManagerCompat.removeAllDynamicShortcuts(context);
     }
 
-    public static void addDynamicShortcut(Context context, String reportID, String name, String accountID, Bitmap personIcon, Person person) {
+    public static void addDynamicShortcut(Context context, long reportID, String name, String accountID, Bitmap personIcon, Person person) {
         Intent intent = new Intent(Intent.ACTION_VIEW,
                 Uri.parse("new-expensify://r/" + reportID));
 

From 8cc8377a4a2227f167034b87fac4f5b412d242ed Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 12 Sep 2024 13:09:47 -0600
Subject: [PATCH 068/132] update function name

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

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 8f9813ccc1b9..faf476c94961 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -61,7 +61,7 @@ function CardSection() {
     }, []);
 
     const viewPurchases = useCallback(() => {
-        const query = SearchUtils.buildQueryStringFromFilters({merchant: CONST.EXPENSIFY_MERCHANT});
+        const query = SearchUtils.buildQueryStringFromFilterValues({merchant: CONST.EXPENSIFY_MERCHANT});
         Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query}));
     }, []);
 

From bc53f95568acc32824fb973c6b1493f7a0325a88 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 13 Sep 2024 11:49:47 +0700
Subject: [PATCH 069/132] fix default ws avatar is shown instead of the custom
 one

---
 src/libs/ReportUtils.ts                       | 22 ++++++-------------
 src/pages/ReportAvatar.tsx                    |  2 +-
 .../home/report/ReportActionItemSingle.tsx    |  2 +-
 tests/perf-test/ReportUtils.perf-test.ts      |  7 ------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 7001dedea2f1..86f46fe65f75 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1866,12 +1866,6 @@ function getDefaultWorkspaceAvatarTestID(workspaceName: string): string {
     return !alphaNumeric ? defaultAvatarBuildingIconTestID : `SvgDefaultAvatar_${alphaNumeric[0]} Icon`;
 }
 
-function getWorkspaceAvatar(report: OnyxEntry<Report>): AvatarSource {
-    const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
-    const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL ?? '';
-    return !isEmpty(avatar) ? avatar : getDefaultWorkspaceAvatar(workspaceName);
-}
-
 /**
  * Helper method to return the default avatar associated with the given reportID
  */
@@ -1939,20 +1933,19 @@ function getWorkspaceIcon(report: OnyxInputOrEntry<Report>, policy?: OnyxInputOr
     const workspaceName = getPolicyName(report, false, policy);
     const cacheKey = report?.policyID ?? workspaceName;
     const iconFromCache = workSpaceIconsCache.get(cacheKey);
-    const avatarURL = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL;
-
-    const isSameAvatarURL = iconFromCache?.icon?.source === avatarURL;
-    const isDefaultWorkspaceAvatar = !avatarURL && typeof iconFromCache?.icon?.source !== 'string';
-    const hasWorkSpaceNameChanged = iconFromCache?.name !== workspaceName;
-    if (iconFromCache && (isSameAvatarURL || isDefaultWorkspaceAvatar) && !hasWorkSpaceNameChanged) {
-        return iconFromCache.icon;
-    }
     // disabling to protect against empty strings
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const policyAvatarURL = report?.policyAvatar || allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL;
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const policyExpenseChatAvatarSource = policyAvatarURL || getDefaultWorkspaceAvatar(workspaceName);
 
+    const isSameAvatarURL = iconFromCache?.icon?.source === policyExpenseChatAvatarSource;
+    const hasWorkSpaceNameChanged = iconFromCache?.name !== workspaceName;
+
+    if (iconFromCache && (isSameAvatarURL || report?.policyAvatar === undefined) && !hasWorkSpaceNameChanged) {
+        return iconFromCache.icon;
+    }
+
     const workspaceIcon: Icon = {
         source: policyExpenseChatAvatarSource ?? '',
         type: CONST.ICON_TYPE_WORKSPACE,
@@ -7945,7 +7938,6 @@ export {
     getTransactionsWithReceipts,
     getUserDetailTooltipText,
     getWhisperDisplayNames,
-    getWorkspaceAvatar,
     getWorkspaceChats,
     getWorkspaceIcon,
     goBackToDetailsPage,
diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index eeb6829e7fc0..eb921032979b 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -24,7 +24,7 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
     const policyID = route.params.policyID ?? '-1';
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const policyName = ReportUtils.getPolicyName(report, false, policy);
-    const avatarURL = ReportUtils.getWorkspaceAvatar(report);
+    const avatarURL = ReportUtils.getWorkspaceIcon(report).source;
 
     return (
         <AttachmentModal
diff --git a/src/pages/home/report/ReportActionItemSingle.tsx b/src/pages/home/report/ReportActionItemSingle.tsx
index 95a7332f0606..0e58296d39f2 100644
--- a/src/pages/home/report/ReportActionItemSingle.tsx
+++ b/src/pages/home/report/ReportActionItemSingle.tsx
@@ -100,7 +100,7 @@ function ReportActionItemSingle({
     if (isWorkspaceActor) {
         displayName = ReportUtils.getPolicyName(report);
         actorHint = displayName;
-        avatarSource = ReportUtils.getWorkspaceAvatar(report);
+        avatarSource = ReportUtils.getWorkspaceIcon(report).source;
         avatarId = report.policyID;
     } else if (action?.delegateAccountID && personalDetails[action?.delegateAccountID]) {
         // We replace the actor's email, name, and avatar with the Copilot manually for now. And only if we have their
diff --git a/tests/perf-test/ReportUtils.perf-test.ts b/tests/perf-test/ReportUtils.perf-test.ts
index 11c6d3772799..8cd531db8628 100644
--- a/tests/perf-test/ReportUtils.perf-test.ts
+++ b/tests/perf-test/ReportUtils.perf-test.ts
@@ -169,13 +169,6 @@ describe('ReportUtils', () => {
         await measureFunction(() => ReportUtils.temporary_getMoneyRequestOptions(report, policy, reportParticipants));
     });
 
-    test('[ReportUtils] getWorkspaceAvatar on 1k policies', async () => {
-        const report = createRandomReport(1);
-
-        await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getWorkspaceAvatar(report));
-    });
-
     test('[ReportUtils] getWorkspaceChat on 1k policies', async () => {
         const policyID = '1';
         const accountsID = Array.from({length: 20}, (v, i) => i + 1);

From 837e4132ae8b1357c11fce240b6956648cde0f6a Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 13 Sep 2024 11:49:57 +0700
Subject: [PATCH 070/132] fix ws avatar isn't dynamically updated

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

diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 3d69f029b8bd..8ea9a3c6aa40 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -1045,6 +1045,7 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
             prevProps.shouldHideThreadDividerLine === nextProps.shouldHideThreadDividerLine &&
             prevProps.report?.total === nextProps.report?.total &&
             prevProps.report?.nonReimbursableTotal === nextProps.report?.nonReimbursableTotal &&
+            prevProps.report?.policyAvatar === nextProps.report?.policyAvatar &&
             prevProps.linkedReportActionID === nextProps.linkedReportActionID &&
             lodashIsEqual(prevProps.report.fieldList, nextProps.report.fieldList) &&
             lodashIsEqual(prevProps.transactionThreadReport, nextProps.transactionThreadReport) &&

From 375585ebfae5240ba65ec56203fd0379662032d2 Mon Sep 17 00:00:00 2001
From: Anusha <anusharukhsar1@gmail.com>
Date: Fri, 13 Sep 2024 15:44:05 +0500
Subject: [PATCH 071/132] fix auto focus

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

diff --git a/src/pages/workspace/rules/RulesCustomNamePage.tsx b/src/pages/workspace/rules/RulesCustomNamePage.tsx
index afd8f455fee5..c32615415755 100644
--- a/src/pages/workspace/rules/RulesCustomNamePage.tsx
+++ b/src/pages/workspace/rules/RulesCustomNamePage.tsx
@@ -10,6 +10,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import TextLink from '@components/TextLink';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -30,7 +31,7 @@ function RulesCustomNamePage({route}: RulesCustomNamePageProps) {
 
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-
+    const {inputCallbackRef} = useAutoFocusInput();
     const RULE_EXAMPLE_BULLET_POINTS = [
         translate('workspace.rules.expenseReportRules.customNameEmailPhoneExample'),
         translate('workspace.rules.expenseReportRules.customNameStartDateExample'),
@@ -95,6 +96,7 @@ function RulesCustomNamePage({route}: RulesCustomNamePageProps) {
                         label={translate('workspace.rules.expenseReportRules.customNameInputLabel')}
                         aria-label={translate('workspace.rules.expenseReportRules.customNameInputLabel')}
                         maxLength={CONST.WORKSPACE_NAME_CHARACTER_LIMIT}
+                        ref={inputCallbackRef}
                     />
                     <BulletList
                         items={RULE_EXAMPLE_BULLET_POINTS}

From c411c002bdf944fcbc7ef09969584cab232453eb Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Fri, 13 Sep 2024 13:08:56 +0200
Subject: [PATCH 072/132] Add lint depracation script

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

diff --git a/package.json b/package.json
index 183590b7f305..6a67029a6575 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "test": "TZ=utc NODE_OPTIONS=--experimental-vm-modules jest",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
     "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=0 --cache --cache-location=node_modules/.cache/eslint",
+    "lint-deprecation": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only main -- \"*.ts\" \"*.tsx\")",
     "lint-changed": "eslint --fix $(git diff --diff-filter=AM --name-only main -- \"*.js\" \"*.ts\" \"*.tsx\")",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",

From de5a3b183bce53822027dcfa5c3ad9e0577ac345 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Fri, 13 Sep 2024 13:09:07 +0200
Subject: [PATCH 073/132] Update eslint ignore file

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index 3d966d096add..a5805dfe4ee9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,6 +3,7 @@
 .github/actions/**/index.js
 *.config.js
 **/.eslintrc.js
+**/.eslintrc.pr.js
 **/node_modules/**
 **/dist/**
 android/**/build/**

From 7d702701beaaa25269e702f805dcf230cf09dc21 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Fri, 13 Sep 2024 13:09:57 +0200
Subject: [PATCH 074/132] Adjust the deprecation eslint config

---
 .eslintrc.pr.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.pr.js b/.eslintrc.pr.js
index 63e058bf6005..c279c3e67a51 100644
--- a/.eslintrc.pr.js
+++ b/.eslintrc.pr.js
@@ -1,6 +1,9 @@
 module.exports = {
-    extends: './.eslintrc',
-    plugins: ['deprecation'],
+    plugins: ['@typescript-eslint', 'deprecation'],
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        project: './tsconfig.json',
+    },
     rules: {
         'deprecation/deprecation': 'error',
     },

From b77cb180cb24e6954d260e04a6534c50468cf46b Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Fri, 13 Sep 2024 13:10:11 +0200
Subject: [PATCH 075/132] Split actions into three files

---
 .github/workflows/deprecation-lint.yml | 31 +++++++++++++++++++++
 .github/workflows/lint.yml             | 22 ++-------------
 .github/workflows/prettier.yml         | 37 ++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 .github/workflows/deprecation-lint.yml
 create mode 100644 .github/workflows/prettier.yml

diff --git a/.github/workflows/deprecation-lint.yml b/.github/workflows/deprecation-lint.yml
new file mode 100644
index 000000000000..efe95ee2ba90
--- /dev/null
+++ b/.github/workflows/deprecation-lint.yml
@@ -0,0 +1,31 @@
+name: Deprecation ESLint check
+
+on:
+  workflow_call:
+  pull_request:
+    types: [opened, synchronize]
+    branches-ignore: [staging, production]
+    paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
+
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-deprecation-lint
+  cancel-in-progress: true
+
+jobs:
+  deprecation-lint:
+    name: Deprecation ESLint check
+    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+      
+      - name: Run ESLint to check for deprecation warnings
+        run: |
+          git fetch origin main --no-tags --depth=1
+
+          # shellcheck disable=SC2046
+          npm run lint-deprecation
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4cf5c3eb287f..af6bfa17fb6e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,4 +1,4 @@
-name: Lint code
+name: ESLint check
 
 on:
   workflow_call:
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   lint:
-    name: Run ESLint
+    name: ESLint check
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
@@ -27,21 +27,3 @@ jobs:
         run: npm run lint
         env:
           CI: true
-
-      - name: Run ESLint with stricter checks on changed files
-        run: |
-          # shellcheck disable=SC2046
-          npx eslint --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only main -- "*.js" "*.ts" "*.tsx")
-
-      - name: Verify there's no Prettier diff
-        run: |
-          npm run prettier -- --loglevel silent
-          if ! git diff --name-only --exit-code; then
-            # shellcheck disable=SC2016
-            echo 'Error: Prettier diff detected! Please run `npm run prettier` and commit the changes.'
-            exit 1
-          fi
-
-      - name: Run unused style searcher
-        shell: bash
-        run: ./.github/scripts/findUnusedKeys.sh
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
new file mode 100644
index 000000000000..d5cff2d9b838
--- /dev/null
+++ b/.github/workflows/prettier.yml
@@ -0,0 +1,37 @@
+name: Prettier check
+
+on:
+  workflow_call:
+  pull_request:
+    types: [opened, synchronize]
+    branches-ignore: [staging, production]
+    paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
+
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-prettier
+  cancel-in-progress: true
+
+jobs:
+  prettier:
+    name: Prettier check
+    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+
+      - name: Verify there's no Prettier diff
+        run: |
+          npm run prettier -- --loglevel silent
+          if ! git diff --name-only --exit-code; then
+            # shellcheck disable=SC2016
+            echo 'Error: Prettier diff detected! Please run `npm run prettier` and commit the changes.'
+            exit 1
+          fi
+
+      - name: Run unused style searcher
+        shell: bash
+        run: ./.github/scripts/findUnusedKeys.sh

From 6d080e7ed2535174101f111d4e714cc74ed8b0e0 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Fri, 13 Sep 2024 13:23:31 +0200
Subject: [PATCH 076/132] Fix git command

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

diff --git a/package.json b/package.json
index 6a67029a6575..95495424d95f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
     "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=0 --cache --cache-location=node_modules/.cache/eslint",
     "lint-deprecation": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only main -- \"*.ts\" \"*.tsx\")",
-    "lint-changed": "eslint --fix $(git diff --diff-filter=AM --name-only main -- \"*.js\" \"*.ts\" \"*.tsx\")",
+    "lint-changed": "eslint --fix $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.js\" \"*.ts\" \"*.tsx\")",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",
     "prettier": "prettier --write .",

From 1c0e7722d00c0e972f4289d73d7dafc04a4da0c7 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Fri, 13 Sep 2024 13:26:26 +0200
Subject: [PATCH 077/132] Fix git command v2

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

diff --git a/package.json b/package.json
index 95495424d95f..3ca14cdb4d69 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "test": "TZ=utc NODE_OPTIONS=--experimental-vm-modules jest",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
     "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=0 --cache --cache-location=node_modules/.cache/eslint",
-    "lint-deprecation": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only main -- \"*.ts\" \"*.tsx\")",
+    "lint-deprecation": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.ts\" \"*.tsx\")",
     "lint-changed": "eslint --fix $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.js\" \"*.ts\" \"*.tsx\")",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",

From ad9d9ec542f2a71c38d5d1a8580be8ac15db38bd Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Fri, 13 Sep 2024 13:36:14 +0200
Subject: [PATCH 078/132] Add endline

---
 .github/workflows/deprecation-lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deprecation-lint.yml b/.github/workflows/deprecation-lint.yml
index efe95ee2ba90..faa0c594ed53 100644
--- a/.github/workflows/deprecation-lint.yml
+++ b/.github/workflows/deprecation-lint.yml
@@ -28,4 +28,4 @@ jobs:
           git fetch origin main --no-tags --depth=1
 
           # shellcheck disable=SC2046
-          npm run lint-deprecation
\ No newline at end of file
+          npm run lint-deprecation

From 751e2e898ca851de2c6738d59bb5183695af5744 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 13 Sep 2024 18:51:29 +0700
Subject: [PATCH 079/132] fix: create isCardIssuedAction, apply for every
 location where necessary

---
 src/libs/ReportActionsUtils.ts                           | 5 +++++
 src/libs/ReportUtils.ts                                  | 3 +++
 src/libs/SidebarUtils.ts                                 | 2 ++
 src/pages/home/report/ContextMenu/ContextMenuActions.tsx | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 5a7f6602795c..b8e36bdb8564 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -1664,6 +1664,10 @@ function getRemovedFromApprovalChainMessage(reportAction: OnyxEntry<ReportAction
     return Localize.translateLocal('workspaceActions.removedFromApprovalWorkflow', {submittersNames});
 }
 
+function isCardIssuedAction(reportAction: OnyxEntry<ReportAction>) {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL, CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS);
+}
+
 export {
     doesReportHaveVisibleActions,
     extractLinksFromMessageHtml,
@@ -1766,6 +1770,7 @@ export {
     getPolicyChangeLogChangeRoleMessage,
     getPolicyChangeLogDeleteMemberMessage,
     getRenamedAction,
+    isCardIssuedAction,
 };
 
 export type {LastVisibleMessage};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 7001dedea2f1..4f1fbf22dde8 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3757,6 +3757,9 @@ function getReportName(
             return report?.reportName ?? '';
         }
 
+        if (ReportActionsUtils.isCardIssuedAction(parentReportAction)) {
+            return 'cardIssued';
+        }
         return reportActionMessage;
     }
 
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 4bd7e2714e25..4e9919a7f41d 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -432,6 +432,8 @@ function getOptionData({
             result.alternateText = ReportUtils.getWorkspaceNameUpdatedMessage(lastAction);
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY) {
             result.alternateText = Localize.translateLocal('workspace.invite.leftWorkspace');
+        } else if (ReportActionsUtils.isCardIssuedAction(lastAction)) {
+            result.alternateText = 'cardIssued';
         } else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
             result.alternateText = ReportUtils.formatReportLastMessageText(Parser.htmlToText(`${lastActorDisplayName}: ${lastMessageText}`));
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG) {
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index aa08c9c2b7d8..c87e8400d75e 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -476,6 +476,8 @@ const ContextMenuActions: ContextMenuAction[] = [
                 } else if (ReportActionsUtils.isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED)) {
                     const {label, errorMessage} = ReportActionsUtils.getOriginalMessage(reportAction) ?? {label: '', errorMessage: ''};
                     setClipboardMessage(Localize.translateLocal('report.actions.type.integrationSyncFailed', label, errorMessage));
+                } else if (ReportActionsUtils.isCardIssuedAction(reportAction)) {
+                    setClipboardMessage('cardIssued');
                 } else if (content) {
                     setClipboardMessage(
                         content.replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag: string, innerContent: string, closeTag: string): string => {

From f4823e16d36b2766072613dc0edff7918be31870 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 13 Sep 2024 20:54:19 +0700
Subject: [PATCH 080/132] fix: create getCardIssuedMessage to display a proper
 message

---
 .../ReportActionItem/IssueCardMessage.tsx     | 27 ++--------
 src/libs/ReportActionsUtils.ts                | 53 +++++++++++++++++--
 src/libs/ReportUtils.ts                       |  2 +-
 src/libs/SidebarUtils.ts                      |  2 +-
 .../report/ContextMenu/ContextMenuActions.tsx |  2 +-
 src/types/onyx/OriginalMessage.ts             | 10 +++-
 6 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/src/components/ReportActionItem/IssueCardMessage.tsx b/src/components/ReportActionItem/IssueCardMessage.tsx
index 16015311738f..d53275d92376 100644
--- a/src/components/ReportActionItem/IssueCardMessage.tsx
+++ b/src/components/ReportActionItem/IssueCardMessage.tsx
@@ -3,15 +3,15 @@ import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import RenderHTML from '@components/RenderHTML';
-import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {ReportAction} from '@src/types/onyx';
-import type OriginalMessage from '@src/types/onyx/OriginalMessage';
+import type {IssueNewCardOriginalMessage} from '@src/types/onyx/OriginalMessage';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type IssueCardMessageProps = {
@@ -20,22 +20,14 @@ type IssueCardMessageProps = {
     policyID: string | undefined;
 };
 
-type IssueNewCardOriginalMessage = OriginalMessage<
-    typeof CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS | typeof CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED | typeof CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL
->;
-
 function IssueCardMessage({action, policyID}: IssueCardMessageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {environmentURL} = useEnvironment();
     const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
     const [session] = useOnyx(ONYXKEYS.SESSION);
 
     const assigneeAccountID = (action?.originalMessage as IssueNewCardOriginalMessage)?.assigneeAccountID;
 
-    const assignee = `<mention-user accountID=${assigneeAccountID}></mention-user>`;
-    const link = `<a href='${environmentURL}/${ROUTES.SETTINGS_WALLET}'>${translate('cardPage.expensifyCard')}</a>`;
-
     const missingDetails =
         !privatePersonalDetails?.legalFirstName ||
         !privatePersonalDetails?.legalLastName ||
@@ -48,22 +40,9 @@ function IssueCardMessage({action, policyID}: IssueCardMessageProps) {
 
     const shouldShowDetailsButton = action?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails && isAssigneeCurrentUser;
 
-    const getTranslation = () => {
-        switch (action?.actionName) {
-            case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED:
-                return translate('workspace.expensifyCard.issuedCard', assignee);
-            case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL:
-                return translate('workspace.expensifyCard.issuedCardVirtual', {assignee, link});
-            case CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS:
-                return translate(`workspace.expensifyCard.${!isAssigneeCurrentUser || shouldShowDetailsButton ? 'issuedCardNoShippingDetails' : 'addedShippingDetails'}`, assignee);
-            default:
-                return '';
-        }
-    };
-
     return (
         <>
-            <RenderHTML html={`<muted-text>${getTranslation()}</muted-text>`} />
+            <RenderHTML html={`<muted-text>${ReportActionsUtils.getCardIssuedMessage(action, true)}</muted-text>`} />
             {shouldShowDetailsButton && (
                 <Button
                     onPress={() => {
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index b8e36bdb8564..f4feef037df6 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -7,8 +7,9 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {OnyxInputOrEntry} from '@src/types/onyx';
-import type {JoinWorkspaceResolution, OriginalMessageChangeLog, OriginalMessageExportIntegration} from '@src/types/onyx/OriginalMessage';
+import ROUTES from '@src/ROUTES';
+import type {OnyxInputOrEntry, PrivatePersonalDetails} from '@src/types/onyx';
+import type {IssueNewCardOriginalMessage, JoinWorkspaceResolution, OriginalMessageChangeLog, OriginalMessageExportIntegration} from '@src/types/onyx/OriginalMessage';
 import type Report from '@src/types/onyx/Report';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type {Message, OldDotReportAction, OriginalMessage, ReportActions} from '@src/types/onyx/ReportAction';
@@ -82,6 +83,14 @@ Onyx.connect({
     },
 });
 
+let privatePersonalDetails: PrivatePersonalDetails | undefined;
+Onyx.connect({
+    key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
+    callback: (personalDetails) => {
+        privatePersonalDetails = personalDetails;
+    },
+});
+
 let environmentURL: string;
 Environment.getEnvironmentURL().then((url: string) => (environmentURL = url));
 
@@ -152,6 +161,7 @@ function isReportPreviewAction(reportAction: OnyxInputOrEntry<ReportAction>): re
 function isSubmittedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.SUBMITTED> {
     return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.SUBMITTED);
 }
+
 function isApprovedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.APPROVED> {
     return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.APPROVED);
 }
@@ -237,7 +247,10 @@ function getWhisperedTo(reportAction: OnyxInputOrEntry<ReportAction>): number[]
     }
 
     if (typeof originalMessage !== 'object') {
-        Log.info('Original message is not an object for reportAction: ', true, {reportActionID: reportAction?.reportActionID, actionName: reportAction?.actionName});
+        Log.info('Original message is not an object for reportAction: ', true, {
+            reportActionID: reportAction?.reportActionID,
+            actionName: reportAction?.actionName,
+        });
     }
 
     return [];
@@ -965,6 +978,7 @@ const iouRequestTypes = new Set<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>>([
     CONST.IOU.REPORT_ACTION_TYPE.PAY,
     CONST.IOU.REPORT_ACTION_TYPE.TRACK,
 ]);
+
 /**
  * Gets the reportID for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions.
  * Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
@@ -1668,6 +1682,38 @@ function isCardIssuedAction(reportAction: OnyxEntry<ReportAction>) {
     return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL, CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS);
 }
 
+function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRenderHTML = false) {
+    const assigneeAccountID = (reportAction?.originalMessage as IssueNewCardOriginalMessage)?.assigneeAccountID;
+    const assigneeDetails = PersonalDetailsUtils.getPersonalDetailsByIDs([assigneeAccountID], currentUserAccountID ?? -1)[0];
+
+    const assignee = shouldRenderHTML ? `<mention-user accountID=${assigneeAccountID}></mention-user>` : assigneeDetails?.displayName ?? assigneeDetails.login ?? '';
+    const link = shouldRenderHTML
+        ? `<a href='${environmentURL}/${ROUTES.SETTINGS_WALLET}'>${Localize.translateLocal('cardPage.expensifyCard')}</a>`
+        : Localize.translateLocal('cardPage.expensifyCard');
+
+    const missingDetails =
+        !privatePersonalDetails?.legalFirstName ||
+        !privatePersonalDetails?.legalLastName ||
+        !privatePersonalDetails?.dob ||
+        !privatePersonalDetails?.phoneNumber ||
+        isEmptyObject(privatePersonalDetails?.addresses) ||
+        privatePersonalDetails.addresses.length === 0;
+
+    const isAssigneeCurrentUser = currentUserAccountID === assigneeAccountID;
+
+    const shouldShowDetailsButton = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails && isAssigneeCurrentUser;
+    switch (reportAction?.actionName) {
+        case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED:
+            return Localize.translateLocal('workspace.expensifyCard.issuedCard', assignee);
+        case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL:
+            return Localize.translateLocal('workspace.expensifyCard.issuedCardVirtual', {assignee, link});
+        case CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS:
+            return Localize.translateLocal(`workspace.expensifyCard.${shouldShowDetailsButton ? 'issuedCardNoShippingDetails' : 'addedShippingDetails'}`, assignee);
+        default:
+            return '';
+    }
+}
+
 export {
     doesReportHaveVisibleActions,
     extractLinksFromMessageHtml,
@@ -1771,6 +1817,7 @@ export {
     getPolicyChangeLogDeleteMemberMessage,
     getRenamedAction,
     isCardIssuedAction,
+    getCardIssuedMessage,
 };
 
 export type {LastVisibleMessage};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 4f1fbf22dde8..bdf36e71f650 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3758,7 +3758,7 @@ function getReportName(
         }
 
         if (ReportActionsUtils.isCardIssuedAction(parentReportAction)) {
-            return 'cardIssued';
+            return ReportActionsUtils.getCardIssuedMessage(parentReportAction);
         }
         return reportActionMessage;
     }
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 4e9919a7f41d..f2e97607a05c 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -433,7 +433,7 @@ function getOptionData({
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY) {
             result.alternateText = Localize.translateLocal('workspace.invite.leftWorkspace');
         } else if (ReportActionsUtils.isCardIssuedAction(lastAction)) {
-            result.alternateText = 'cardIssued';
+            result.alternateText = ReportActionsUtils.getCardIssuedMessage(lastAction);
         } else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
             result.alternateText = ReportUtils.formatReportLastMessageText(Parser.htmlToText(`${lastActorDisplayName}: ${lastMessageText}`));
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG) {
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index c87e8400d75e..8a8454b5d076 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -477,7 +477,7 @@ const ContextMenuActions: ContextMenuAction[] = [
                     const {label, errorMessage} = ReportActionsUtils.getOriginalMessage(reportAction) ?? {label: '', errorMessage: ''};
                     setClipboardMessage(Localize.translateLocal('report.actions.type.integrationSyncFailed', label, errorMessage));
                 } else if (ReportActionsUtils.isCardIssuedAction(reportAction)) {
-                    setClipboardMessage('cardIssued');
+                    setClipboardMessage(ReportActionsUtils.getCardIssuedMessage(reportAction));
                 } else if (content) {
                     setClipboardMessage(
                         content.replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag: string, innerContent: string, closeTag: string): string => {
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 500ac73fd9a4..c330d009a43d 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -523,13 +523,20 @@ type OriginalMessageIntegrationSyncFailed = {
 };
 
 /**
- * Original message for CARD_ISSUED, CARD_MISSING_ADDRESS, and CARD_ISSUED_VIRTUAL actions
+ * Model of CARD_ISSUED, CARD_MISSING_ADDRESS, and CARD_ISSUED_VIRTUAL actions
  */
 type OriginalMessageExpensifyCard = {
     /** The id of the user the card was assigned to */
     assigneeAccountID: number;
 };
 
+/**
+ * Original message for CARD_ISSUED, CARD_MISSING_ADDRESS, and CARD_ISSUED_VIRTUAL actions
+ */
+type IssueNewCardOriginalMessage = OriginalMessage<
+    typeof CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS | typeof CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED | typeof CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL
+>;
+
 /** The map type of original message */
 /* eslint-disable jsdoc/require-jsdoc */
 type OriginalMessageMap = {
@@ -620,4 +627,5 @@ export type {
     JoinWorkspaceResolution,
     OriginalMessageModifiedExpense,
     OriginalMessageExportIntegration,
+    IssueNewCardOriginalMessage,
 };

From 87b572b8a542248681fb041abccd5d4d0552bf54 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 13 Sep 2024 23:04:53 +0700
Subject: [PATCH 081/132] don't allow deleting optimistic invited room member

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

diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx
index a76d02a27b75..19e631098e40 100644
--- a/src/pages/RoomMembersPage.tsx
+++ b/src/pages/RoomMembersPage.tsx
@@ -223,7 +223,8 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
                 (isPolicyExpenseChat && isAdmin) ||
                 accountID === session?.accountID ||
                 pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
-                details.accountID === report.ownerAccountID;
+                details.accountID === report.ownerAccountID ||
+                details.isOptimisticPersonalDetail;
 
             result.push({
                 keyForList: String(accountID),

From 2d7fd88f2e876aa343d38bb7c8e3a45cd1465ff1 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:00:23 -0400
Subject: [PATCH 082/132] Update redirects.csv

https://github.com/Expensify/Expensify/issues/428150
---
 docs/redirects.csv | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/redirects.csv b/docs/redirects.csv
index 55cfd267f651..62b6c244855a 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -563,9 +563,14 @@ https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments
 https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
 https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Global-Reimbursements,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements
 https://community.expensify.com/discussion/4641/how-to-add-a-deposit-only-bank-account-both-personal-and-business,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account
-https://community.expensify.com/discussion/5940/how-to-get-reimbursed-outside-the-us-with-wise-for-non-us-employees,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments
+https://community.expensify.com/discussion/5940/how-to-get-reimbursed-outside-the-us-with-wise-for-non-us-employees,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Get-reimbursed-faster-as-a-non-US-employee
 https://help.expensify.com/articles/expensify-classic/spending-insights,https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates
 https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-notifications,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications
 https://help.expensify.com/articles/new-expensify/getting-started/Upgrade-to-a-Collect-Plan,https://help.expensify.com/Hidden/Upgrade-to-a-Collect-Plan
 https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports
 https://help.expensify.com/articles/new-expensify/expenses-&-payments/pay-an-invoice.html,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Pay-an-invoice
+https://community.expensify.com/discussion/4707/how-to-set-up-your-mobile-app,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace#download-the-mobile-app
+https://community.expensify.com//discussion/6927/deep-dive-how-can-i-estimate-the-savings-applied-to-my-bill,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview#savings-calculator
+https://community.expensify.com/discussion/7231/how-to-export-invoices-to-netsuite/p1?new=1,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Configure-Netsuite#export-invoices
+https://community.expensify.com/discussion/5179/faq-what-does-a-policy-for-which-you-are-an-admin-has-out-of-date-billing-information-mean,https://help.expensify.com/articles/expensify-classic/expensify-billing/Out-of-date-Billing
+https://community.expensify.com/discussion/6179/setting-up-a-receipt-or-travel-integration-with-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations

From ed6a9d63db0d913f33b2423e061a838ffdfff384 Mon Sep 17 00:00:00 2001
From: Subodh Pathak <subodhpathak1511@gmail.com>
Date: Tue, 10 Sep 2024 17:04:48 +0530
Subject: [PATCH 083/132] Fixed prefix script commands with ./scripts

---
 package.json | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 3de2dd47f3c6..7fe1fb03fa02 100644
--- a/package.json
+++ b/package.json
@@ -7,29 +7,29 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "configure-mapbox": "scripts/setup-mapbox-sdk-walkthrough.sh",
-    "setupNewDotWebForEmulators": "scripts/setup-newdot-web-emulators.sh",
-    "startAndroidEmulator": "scripts/start-android.sh",
-    "postinstall": "scripts/postInstall.sh",
+    "configure-mapbox": "./scripts/setup-mapbox-sdk-walkthrough.sh",
+    "setupNewDotWebForEmulators": "./scripts/setup-newdot-web-emulators.sh",
+    "startAndroidEmulator": "./scripts/start-android.sh",
+    "postinstall": "./scripts/postInstall.sh",
     "clean": "npx react-native clean-project-auto",
-    "android": "scripts/set-pusher-suffix.sh && npx react-native run-android --mode=developmentDebug --appId=com.expensify.chat.dev --active-arch-only",
-    "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --mode=\"DebugDevelopment\" --scheme=\"New Expensify Dev\"",
-    "pod-install": "scripts/pod-install.sh",
+    "android": "./scripts/set-pusher-suffix.sh && npx react-native run-android --mode=developmentDebug --appId=com.expensify.chat.dev --active-arch-only",
+    "ios": "./scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --mode=\"DebugDevelopment\" --scheme=\"New Expensify Dev\"",
+    "pod-install": "./scripts/pod-install.sh",
     "ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --mode=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
     "ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --mode=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
     "start": "npx react-native start",
-    "web": "scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server",
+    "web": "./scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server",
     "web-proxy": "ts-node web/proxy.ts",
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.ts",
     "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production && ts-node scripts/combine-web-sourcemaps.ts",
     "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging && ts-node scripts/combine-web-sourcemaps.ts",
     "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc && ts-node scripts/combine-web-sourcemaps.ts",
-    "desktop": "scripts/set-pusher-suffix.sh && ts-node desktop/start.ts",
-    "desktop-build": "scripts/build-desktop.sh production",
-    "desktop-build-staging": "scripts/build-desktop.sh staging",
+    "desktop": "./scripts/set-pusher-suffix.sh && ts-node desktop/start.ts",
+    "desktop-build": "./scripts/build-desktop.sh production",
+    "desktop-build-staging": "./scripts/build-desktop.sh staging",
     "createDocsRoutes": "ts-node .github/scripts/createDocsRoutes.ts",
     "detectRedirectCycle": "ts-node .github/scripts/detectRedirectCycle.ts",
-    "desktop-build-adhoc": "scripts/build-desktop.sh adhoc",
+    "desktop-build-adhoc": "./scripts/build-desktop.sh adhoc",
     "ios-build": "fastlane ios build_unsigned",
     "android-build": "fastlane android build",
     "android-build-e2e": "bundle exec fastlane android build_e2e",
@@ -51,11 +51,11 @@
     "analyze-packages": "ANALYZE_BUNDLE=true webpack --config config/webpack/webpack.common.ts --env file=.env.production",
     "symbolicate:android": "npx metro-symbolicate android/app/build/generated/sourcemaps/react/release/index.android.bundle.map",
     "symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
-    "symbolicate-release:ios": "scripts/release-profile.ts --platform=ios",
-    "symbolicate-release:android": "scripts/release-profile.ts --platform=android",
-    "symbolicate-release:web": "scripts/release-profile.ts --platform=web",
-    "symbolicate-profile": "scripts/symbolicate-profile.ts",
-    "combine-web-sourcemaps": "scripts/combine-web-sourcemaps.ts",
+    "symbolicate-release:ios": "./scripts/release-profile.ts --platform=ios",
+    "symbolicate-release:android": "./scripts/release-profile.ts --platform=android",
+    "symbolicate-release:web": "./scripts/release-profile.ts --platform=web",
+    "symbolicate-profile": "./scripts/symbolicate-profile.ts",
+    "combine-web-sourcemaps": "./scripts/combine-web-sourcemaps.ts",
     "test:e2e": "ts-node tests/e2e/testRunner.ts --config ./config.local.ts",
     "test:e2e:dev": "ts-node tests/e2e/testRunner.ts --config ./config.dev.ts",
     "gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
@@ -66,6 +66,7 @@
     "generate-search-parser": "peggy --format es -o src/libs/SearchParser/searchParser.js src/libs/SearchParser/searchParser.peggy ",
     "web:prod": "http-server ./dist --cors"
   },
+
   "dependencies": {
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",

From 7581f0b9fa8f7bff186d73c485c629c0a8bd5538 Mon Sep 17 00:00:00 2001
From: Subodh Pathak <subodhpathak1511@gmail.com>
Date: Wed, 11 Sep 2024 00:39:05 +0530
Subject: [PATCH 084/132] Update package.json for mac and linux compatibility

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 7fe1fb03fa02..0ace23f2ead2 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,6 @@
     "generate-search-parser": "peggy --format es -o src/libs/SearchParser/searchParser.js src/libs/SearchParser/searchParser.peggy ",
     "web:prod": "http-server ./dist --cors"
   },
-
   "dependencies": {
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",

From 39e3d5c573bf2b8273854281d45a8654e9641bd1 Mon Sep 17 00:00:00 2001
From: Subodh Pathak <subodhpathak1511@gmail.com>
Date: Wed, 11 Sep 2024 22:47:55 +0530
Subject: [PATCH 085/132] Updated versions of build, build-staging and
 build-adhoc

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0ace23f2ead2..18cdd112f93c 100644
--- a/package.json
+++ b/package.json
@@ -21,9 +21,9 @@
     "web": "./scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server",
     "web-proxy": "ts-node web/proxy.ts",
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.ts",
-    "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production && ts-node scripts/combine-web-sourcemaps.ts",
-    "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging && ts-node scripts/combine-web-sourcemaps.ts",
-    "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc && ts-node scripts/combine-web-sourcemaps.ts",
+    "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production && ts-node ./scripts/combine-web-sourcemaps.ts",
+    "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging && ts-node ./scripts/combine-web-sourcemaps.ts",
+    "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc && ts-node ./scripts/combine-web-sourcemaps.ts",
     "desktop": "./scripts/set-pusher-suffix.sh && ts-node desktop/start.ts",
     "desktop-build": "./scripts/build-desktop.sh production",
     "desktop-build-staging": "./scripts/build-desktop.sh staging",

From 85fe2aa22b598f897bac995b30d6187788ae2f33 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:51:02 -0400
Subject: [PATCH 086/132] Update redirects.csv

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

diff --git a/docs/redirects.csv b/docs/redirects.csv
index 62b6c244855a..6bdaee8a6fad 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -571,6 +571,6 @@ https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments
 https://help.expensify.com/articles/new-expensify/expenses-&-payments/pay-an-invoice.html,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Pay-an-invoice
 https://community.expensify.com/discussion/4707/how-to-set-up-your-mobile-app,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace#download-the-mobile-app
 https://community.expensify.com//discussion/6927/deep-dive-how-can-i-estimate-the-savings-applied-to-my-bill,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview#savings-calculator
-https://community.expensify.com/discussion/7231/how-to-export-invoices-to-netsuite/p1?new=1,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Configure-Netsuite#export-invoices
+https://community.expensify.com/discussion/7231/how-to-export-invoices-to-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Configure-Netsuite#export-invoices
 https://community.expensify.com/discussion/5179/faq-what-does-a-policy-for-which-you-are-an-admin-has-out-of-date-billing-information-mean,https://help.expensify.com/articles/expensify-classic/expensify-billing/Out-of-date-Billing
 https://community.expensify.com/discussion/6179/setting-up-a-receipt-or-travel-integration-with-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations

From 91e8709eb884a21d8b6899b826712836fa6d6457 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Fri, 13 Sep 2024 15:04:55 -0400
Subject: [PATCH 087/132] Update redirects.csv

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

diff --git a/docs/redirects.csv b/docs/redirects.csv
index 6bdaee8a6fad..b56f148fcd80 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -571,6 +571,5 @@ https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments
 https://help.expensify.com/articles/new-expensify/expenses-&-payments/pay-an-invoice.html,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Pay-an-invoice
 https://community.expensify.com/discussion/4707/how-to-set-up-your-mobile-app,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace#download-the-mobile-app
 https://community.expensify.com//discussion/6927/deep-dive-how-can-i-estimate-the-savings-applied-to-my-bill,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview#savings-calculator
-https://community.expensify.com/discussion/7231/how-to-export-invoices-to-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Configure-Netsuite#export-invoices
 https://community.expensify.com/discussion/5179/faq-what-does-a-policy-for-which-you-are-an-admin-has-out-of-date-billing-information-mean,https://help.expensify.com/articles/expensify-classic/expensify-billing/Out-of-date-Billing
 https://community.expensify.com/discussion/6179/setting-up-a-receipt-or-travel-integration-with-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations

From fb791eb9513ceb14d7ea5262e99fdf20a186ea62 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Fri, 13 Sep 2024 10:56:19 -1000
Subject: [PATCH 088/132] Move so that tags is next to categories task

---
 src/CONST.ts | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index e084917e1a93..9ebf45add8a7 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4615,6 +4615,25 @@ const CONST = {
                         '\n' +
                         `[Take me to workspace category settings](${workspaceCategoriesLink}).`,
                 },
+                {
+                    type: 'setupTags',
+                    autoCompleted: false,
+                    title: 'Set up tags (optional)',
+                    description: ({workspaceMoreFeaturesLink}) =>
+                        'Tags can be used if you want more details with every expense. Use tags for projects, clients, locations, departments, and more. If you need multiple levels of tags you can upgrade to a control plan.\n' +
+                        '\n' +
+                        '*Here’s how to setup tags:*\n' +
+                        '\n' +
+                        '1. Click your profile picture.\n' +
+                        '2. Go to Workspaces.\n' +
+                        '3. Select your workspace.\n' +
+                        '4. Click More features.\n' +
+                        '5. Enable tags.\n' +
+                        '6. Navigate to Tags in the workspace editor.\n' +
+                        '7. In Tags, click + Add tag to make your own.\n' +
+                        '\n' +
+                        `*[Take me to more features](${workspaceMoreFeaturesLink})*`,
+                },
                 {
                     type: 'addExpenseApprovals',
                     autoCompleted: false,
@@ -4652,25 +4671,6 @@ const CONST = {
                         '\n' +
                         `[Take me to workspace members](${workspaceMembersLink}). That’s it, happy expensing! :)`,
                 },
-                {
-                    type: 'setupTags',
-                    autoCompleted: false,
-                    title: 'Set up tags (optional)',
-                    description: ({workspaceMoreFeaturesLink}) =>
-                        'Tags can be used if you want more details with every expense. Use tags for projects, clients, locations, departments, and more. If you need multiple levels of tags you can upgrade to a control plan.\n' +
-                        '\n' +
-                        '*Here’s how to setup tags:*\n' +
-                        '\n' +
-                        '1. Click your profile picture.\n' +
-                        '2. Go to Workspaces.\n' +
-                        '3. Select your workspace.\n' +
-                        '4. Click More features.\n' +
-                        '5. Enable tags.\n' +
-                        '6. Navigate to Tags in the workspace editor.\n' +
-                        '7. In Tags, click + Add tag to make your own.\n' +
-                        '\n' +
-                        `*[Take me to more features](${workspaceMoreFeaturesLink})*`,
-                },
             ],
         },
         [onboardingChoices.PERSONAL_SPEND]: {

From 77c5300c3dde429e721c4275470d0d08200b31b1 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Sat, 14 Sep 2024 00:50:25 +0300
Subject: [PATCH 089/132] remove receipt plus icon asset

---
 assets/images/receipt-plus.svg     | 1 -
 src/components/Icon/Expensicons.ts | 2 --
 2 files changed, 3 deletions(-)
 delete mode 100644 assets/images/receipt-plus.svg

diff --git a/assets/images/receipt-plus.svg b/assets/images/receipt-plus.svg
deleted file mode 100644
index ca4d96b3dfa5..000000000000
--- a/assets/images/receipt-plus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M3,1.4v17.3c0,0.4,0.5,0.5,0.7,0.3L4.4,18c0.2-0.2,0.4-0.2,0.6,0l1.1,1.3c0.2,0.2,0.4,0.2,0.6,0L7.9,18	c0.2-0.2,0.4-0.2,0.6,0l1.1,1.3c0.2,0.2,0.4,0.2,0.6,0l1.1-1.3c0.2-0.2,0.4-0.2,0.6,0l0.3,0.3C12.1,17.9,12,17.5,12,17v-0.5h-0.5	c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3H12V10c0-1.7,1.3-3,3-3c0.8,0,1.5,0.3,2,0.8V1.4c0-0.4-0.5-0.5-0.7-0.3L15.6,2	c-0.2,0.2-0.4,0.2-0.6,0l-1.1-1.3c-0.2-0.2-0.4-0.2-0.6,0L12.1,2c-0.2,0.2-0.4,0.2-0.6,0l-1.1-1.3c-0.2-0.2-0.4-0.2-0.6,0L8.6,2	C8.4,2.1,8.1,2.1,7.9,2L6.8,0.6c-0.2-0.2-0.4-0.2-0.6,0L5.1,2C4.9,2.1,4.6,2.1,4.4,2L3.7,1.1C3.5,0.8,3,1,3,1.4z"/><path d="M15,9c0.6,0,1,0.4,1,1v2.5h2.5c0.6,0,1,0.4,1,1s-0.4,1-1,1H16V17c0,0.6-0.4,1-1,1s-1-0.4-1-1v-2.5h-2.5c-0.6,0-1-0.4-1-1	s0.4-1,1-1H14V10C14,9.4,14.4,9,15,9z"/></svg>
\ No newline at end of file
diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index 698dc33b4a03..22bcf710f864 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -149,7 +149,6 @@ import Printer from '@assets/images/printer.svg';
 import Profile from '@assets/images/profile.svg';
 import QrCode from '@assets/images/qrcode.svg';
 import QuestionMark from '@assets/images/question-mark-circle.svg';
-import ReceiptPlus from '@assets/images/receipt-plus.svg';
 import ReceiptScan from '@assets/images/receipt-scan.svg';
 import ReceiptSearch from '@assets/images/receipt-search.svg';
 import ReceiptSlash from '@assets/images/receipt-slash.svg';
@@ -335,7 +334,6 @@ export {
     QrCode,
     QuestionMark,
     Receipt,
-    ReceiptPlus,
     ReceiptScan,
     ReceiptSlash,
     RemoveMembers,

From 1937b1c0205edb04421d955bcb7721c851664328 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Sat, 14 Sep 2024 12:29:00 +0700
Subject: [PATCH 090/132] fix: apply requested changes

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

diff --git a/src/components/ReportActionItem/IssueCardMessage.tsx b/src/components/ReportActionItem/IssueCardMessage.tsx
index d53275d92376..d12a20c4598d 100644
--- a/src/components/ReportActionItem/IssueCardMessage.tsx
+++ b/src/components/ReportActionItem/IssueCardMessage.tsx
@@ -38,12 +38,12 @@ function IssueCardMessage({action, policyID}: IssueCardMessageProps) {
 
     const isAssigneeCurrentUser = !isEmptyObject(session) && session.accountID === assigneeAccountID;
 
-    const shouldShowDetailsButton = action?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails && isAssigneeCurrentUser;
+    const shouldShowAddMissingDetailsButton = action?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails && isAssigneeCurrentUser;
 
     return (
         <>
             <RenderHTML html={`<muted-text>${ReportActionsUtils.getCardIssuedMessage(action, true)}</muted-text>`} />
-            {shouldShowDetailsButton && (
+            {shouldShowAddMissingDetailsButton && (
                 <Button
                     onPress={() => {
                         if (!policyID) {
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index f4feef037df6..f54356799300 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -1686,7 +1686,7 @@ function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRende
     const assigneeAccountID = (reportAction?.originalMessage as IssueNewCardOriginalMessage)?.assigneeAccountID;
     const assigneeDetails = PersonalDetailsUtils.getPersonalDetailsByIDs([assigneeAccountID], currentUserAccountID ?? -1)[0];
 
-    const assignee = shouldRenderHTML ? `<mention-user accountID=${assigneeAccountID}></mention-user>` : assigneeDetails?.displayName ?? assigneeDetails.login ?? '';
+    const assignee = shouldRenderHTML ? `<mention-user accountID=${assigneeAccountID}></mention-user>` : assigneeDetails?.firstName ?? assigneeDetails.login ?? '';
     const link = shouldRenderHTML
         ? `<a href='${environmentURL}/${ROUTES.SETTINGS_WALLET}'>${Localize.translateLocal('cardPage.expensifyCard')}</a>`
         : Localize.translateLocal('cardPage.expensifyCard');
@@ -1701,14 +1701,14 @@ function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRende
 
     const isAssigneeCurrentUser = currentUserAccountID === assigneeAccountID;
 
-    const shouldShowDetailsButton = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails && isAssigneeCurrentUser;
+    const shouldShowAddMissingDetailsButton = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails && isAssigneeCurrentUser;
     switch (reportAction?.actionName) {
         case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED:
             return Localize.translateLocal('workspace.expensifyCard.issuedCard', assignee);
         case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL:
             return Localize.translateLocal('workspace.expensifyCard.issuedCardVirtual', {assignee, link});
         case CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS:
-            return Localize.translateLocal(`workspace.expensifyCard.${shouldShowDetailsButton ? 'issuedCardNoShippingDetails' : 'addedShippingDetails'}`, assignee);
+            return Localize.translateLocal(`workspace.expensifyCard.${shouldShowAddMissingDetailsButton ? 'issuedCardNoShippingDetails' : 'addedShippingDetails'}`, assignee);
         default:
             return '';
     }
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index 8a8454b5d076..7053509b63e4 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -477,7 +477,7 @@ const ContextMenuActions: ContextMenuAction[] = [
                     const {label, errorMessage} = ReportActionsUtils.getOriginalMessage(reportAction) ?? {label: '', errorMessage: ''};
                     setClipboardMessage(Localize.translateLocal('report.actions.type.integrationSyncFailed', label, errorMessage));
                 } else if (ReportActionsUtils.isCardIssuedAction(reportAction)) {
-                    setClipboardMessage(ReportActionsUtils.getCardIssuedMessage(reportAction));
+                    setClipboardMessage(ReportActionsUtils.getCardIssuedMessage(reportAction, true));
                 } else if (content) {
                     setClipboardMessage(
                         content.replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag: string, innerContent: string, closeTag: string): string => {

From c02516779d0232775897f1281ae59d23cc463123 Mon Sep 17 00:00:00 2001
From: c3024 <chaitanya3024@gmail.com>
Date: Sat, 14 Sep 2024 11:15:59 +0530
Subject: [PATCH 091/132] prevent dismiss onboarding modal on enlarging

---
 .../AppNavigator/createCustomStackNavigator/CustomRouter.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
index 5b3cefb63a2d..1278ecbb9d49 100644
--- a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
+++ b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
@@ -16,8 +16,8 @@ import SCREENS from '@src/SCREENS';
 import type {ResponsiveStackNavigatorRouterOptions} from './types';
 
 function insertRootRoute(state: State<RootStackParamList>, routeToInsert: NavigationPartialRoute) {
-    const nonModalRoutes = state.routes.filter((route) => route.name !== NAVIGATORS.RIGHT_MODAL_NAVIGATOR && route.name !== NAVIGATORS.LEFT_MODAL_NAVIGATOR);
-    const modalRoutes = state.routes.filter((route) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR || route.name === NAVIGATORS.LEFT_MODAL_NAVIGATOR);
+    const nonModalRoutes = state.routes.filter((route) => route.name !== NAVIGATORS.RIGHT_MODAL_NAVIGATOR && route.name !== NAVIGATORS.LEFT_MODAL_NAVIGATOR && route.name !== NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR);
+    const modalRoutes = state.routes.filter((route) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR || route.name === NAVIGATORS.LEFT_MODAL_NAVIGATOR || route.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR);
 
     // It's safe to modify this state before returning in getRehydratedState.
 

From 66e1d4e53baafec10ac96628489bac666cf0c569 Mon Sep 17 00:00:00 2001
From: c3024 <chaitanya3024@gmail.com>
Date: Sat, 14 Sep 2024 11:33:18 +0530
Subject: [PATCH 092/132] prettier

---
 .../createCustomStackNavigator/CustomRouter.ts            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
index 1278ecbb9d49..411cbf1d26b0 100644
--- a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
+++ b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
@@ -16,8 +16,12 @@ import SCREENS from '@src/SCREENS';
 import type {ResponsiveStackNavigatorRouterOptions} from './types';
 
 function insertRootRoute(state: State<RootStackParamList>, routeToInsert: NavigationPartialRoute) {
-    const nonModalRoutes = state.routes.filter((route) => route.name !== NAVIGATORS.RIGHT_MODAL_NAVIGATOR && route.name !== NAVIGATORS.LEFT_MODAL_NAVIGATOR && route.name !== NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR);
-    const modalRoutes = state.routes.filter((route) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR || route.name === NAVIGATORS.LEFT_MODAL_NAVIGATOR || route.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR);
+    const nonModalRoutes = state.routes.filter(
+        (route) => route.name !== NAVIGATORS.RIGHT_MODAL_NAVIGATOR && route.name !== NAVIGATORS.LEFT_MODAL_NAVIGATOR && route.name !== NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR,
+    );
+    const modalRoutes = state.routes.filter(
+        (route) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR || route.name === NAVIGATORS.LEFT_MODAL_NAVIGATOR || route.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR,
+    );
 
     // It's safe to modify this state before returning in getRehydratedState.
 

From f0b3a2afd1817c8617e4ab4184453dd7aa9926c3 Mon Sep 17 00:00:00 2001
From: Jay Damani <jaydamani567@gmail.com>
Date: Sat, 14 Sep 2024 22:57:16 +0530
Subject: [PATCH 093/132] fix(search): search now works with special characters
 and emojis

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

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 24872b5d90eb..7c3852428989 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -453,7 +453,7 @@ function buildAmountFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>
 }
 
 function sanitizeString(str: string) {
-    const regexp = /[<>,:= ]/g;
+    const regexp = /[^A-Za-z0-9_@./#&+\-\\';,"]/g;
     if (regexp.test(str)) {
         return `"${str}"`;
     }

From bf46cd920bceb35d0f26965cb909defd59d92c5a Mon Sep 17 00:00:00 2001
From: Andrii Vitiv <cyberandrii@gmail.com>
Date: Sun, 15 Sep 2024 01:57:45 +0300
Subject: [PATCH 094/132] Optimistically set `account.validated` on validation

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

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index d2513ce74454..1a2af62ba3aa 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -617,7 +617,10 @@ function validateSecondaryLogin(loginList: OnyxEntry<LoginList>, contactMethod:
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
-            value: {isLoading: false},
+            value: {
+                isLoading: false,
+                validated: true,
+            },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,

From 1db6abb66106b1a855321f907408357fbcc8f78c Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Sun, 15 Sep 2024 13:12:44 +0100
Subject: [PATCH 095/132] Fix opacity animation duration

---
 .../LHNOptionsList/OptionRowLHN.tsx           |  3 ++-
 src/components/MenuItem.tsx                   |  3 ++-
 src/components/OpacityView.tsx                | 21 +++++++++++++++----
 .../Pressable/PressableWithFeedback.tsx       |  8 +++++++
 .../index.tsx                                 |  2 ++
 .../types.ts                                  | 12 +++++++++++
 src/styles/variables.ts                       |  1 +
 7 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index 1686ed1c62d2..276e364e26c1 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -221,7 +221,8 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
                                     }
                                 }}
                                 withoutFocusOnSecondaryInteraction
-                                activeOpacity={0.8}
+                                activeOpacity={variables.pressDimValue}
+                                opacityAnimationDuration={0}
                                 style={[
                                     styles.flexRow,
                                     styles.alignItemsCenter,
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index f1cf55674184..2524658d6ffc 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -569,7 +569,8 @@ function MenuItem(
                                 onPressOut={ControlSelection.unblock}
                                 onSecondaryInteraction={onSecondaryInteraction}
                                 wrapperStyle={outerWrapperStyle}
-                                activeOpacity={0.8}
+                                activeOpacity={variables.pressDimValue}
+                                opacityAnimationDuration={0}
                                 style={({pressed}) =>
                                     [
                                         containerStyle,
diff --git a/src/components/OpacityView.tsx b/src/components/OpacityView.tsx
index d4a5c05167a0..f4884fd3c0f8 100644
--- a/src/components/OpacityView.tsx
+++ b/src/components/OpacityView.tsx
@@ -24,11 +24,24 @@ type OpacityViewProps = {
      */
     dimmingValue?: number;
 
+    /**
+     * The duration of the dimming animation
+     * @default variables.dimAnimationDuration
+     */
+    dimAnimationDuration?: number;
+
     /** Whether the view needs to be rendered offscreen (for Android only) */
     needsOffscreenAlphaCompositing?: boolean;
 };
 
-function OpacityView({shouldDim, children, style = [], dimmingValue = variables.hoverDimValue, needsOffscreenAlphaCompositing = false}: OpacityViewProps) {
+function OpacityView({
+    shouldDim,
+    dimAnimationDuration = variables.dimAnimationDuration,
+    children,
+    style = [],
+    dimmingValue = variables.hoverDimValue,
+    needsOffscreenAlphaCompositing = false,
+}: OpacityViewProps) {
     const opacity = useSharedValue(1);
     const opacityStyle = useAnimatedStyle(() => ({
         opacity: opacity.value,
@@ -37,11 +50,11 @@ function OpacityView({shouldDim, children, style = [], dimmingValue = variables.
     React.useEffect(() => {
         if (shouldDim) {
             // eslint-disable-next-line react-compiler/react-compiler
-            opacity.value = withTiming(dimmingValue, {duration: 50});
+            opacity.value = withTiming(dimmingValue, {duration: dimAnimationDuration});
         } else {
-            opacity.value = withTiming(1, {duration: 50});
+            opacity.value = withTiming(1, {duration: dimAnimationDuration});
         }
-    }, [shouldDim, dimmingValue, opacity]);
+    }, [shouldDim, dimmingValue, opacity, dimAnimationDuration]);
 
     return (
         <Animated.View
diff --git a/src/components/Pressable/PressableWithFeedback.tsx b/src/components/Pressable/PressableWithFeedback.tsx
index d50404873eeb..10e6ac7bbca6 100644
--- a/src/components/Pressable/PressableWithFeedback.tsx
+++ b/src/components/Pressable/PressableWithFeedback.tsx
@@ -26,6 +26,12 @@ type PressableWithFeedbackProps = PressableProps & {
      */
     hoverDimmingValue?: number;
 
+    /**
+     * The duration of the dimming animation
+     * @default variables.dimAnimationDuration
+     */
+    dimAnimationDuration?: number;
+
     /** Whether the view needs to be rendered offscreen (for Android only) */
     needsOffscreenAlphaCompositing?: boolean;
 
@@ -40,6 +46,7 @@ function PressableWithFeedback(
         needsOffscreenAlphaCompositing = false,
         pressDimmingValue = variables.pressDimValue,
         hoverDimmingValue = variables.hoverDimValue,
+        dimAnimationDuration,
         ...rest
     }: PressableWithFeedbackProps,
     ref: PressableRef,
@@ -51,6 +58,7 @@ function PressableWithFeedback(
         <OpacityView
             shouldDim={!!(!rest.disabled && (isPressed || isHovered))}
             dimmingValue={isPressed ? pressDimmingValue : hoverDimmingValue}
+            dimAnimationDuration={dimAnimationDuration}
             style={wrapperStyle}
             needsOffscreenAlphaCompositing={needsOffscreenAlphaCompositing}
         >
diff --git a/src/components/PressableWithSecondaryInteraction/index.tsx b/src/components/PressableWithSecondaryInteraction/index.tsx
index cbcf8523d9a4..810aa45ebf07 100644
--- a/src/components/PressableWithSecondaryInteraction/index.tsx
+++ b/src/components/PressableWithSecondaryInteraction/index.tsx
@@ -20,6 +20,7 @@ function PressableWithSecondaryInteraction(
         preventDefaultContextMenu = true,
         onSecondaryInteraction,
         activeOpacity = 1,
+        opacityAnimationDuration,
         ...rest
     }: PressableWithSecondaryInteractionProps,
     ref: PressableRef,
@@ -100,6 +101,7 @@ function PressableWithSecondaryInteraction(
             wrapperStyle={[StyleUtils.combineStyles(DeviceCapabilities.canUseTouchScreen() ? [styles.userSelectNone, styles.noSelect] : [], inlineStyle), wrapperStyle]}
             onLongPress={onSecondaryInteraction ? executeSecondaryInteraction : undefined}
             pressDimmingValue={activeOpacity}
+            dimAnimationDuration={opacityAnimationDuration}
             ref={pressableRef}
             style={(state) => [StyleUtils.parseStyleFromFunction(style, state), inlineStyle]}
             needsOffscreenAlphaCompositing={needsOffscreenAlphaCompositing}
diff --git a/src/components/PressableWithSecondaryInteraction/types.ts b/src/components/PressableWithSecondaryInteraction/types.ts
index b07c867daeb3..e097a6930654 100644
--- a/src/components/PressableWithSecondaryInteraction/types.ts
+++ b/src/components/PressableWithSecondaryInteraction/types.ts
@@ -40,6 +40,18 @@ type PressableWithSecondaryInteractionProps = PressableWithFeedbackProps & {
     /** Opacity to reduce to when active  */
     activeOpacity?: number;
 
+    /**
+     * The duration of the opacity animation
+     * @default variables.dimAnimationDuration
+     */
+    opacityAnimationDuration?: number;
+
+    /**
+     * The duration of the dimming animation
+     * @default variables.dimAnimationDuration
+     */
+    dimAnimationDuration?: number;
+
     /** Used to apply styles to the Pressable */
     style?: ParsableStyle;
 
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 2a84efc72814..300574514e59 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -221,6 +221,7 @@ export default {
     googleEmptyListViewHeight: 14,
     hoverDimValue: 1,
     pressDimValue: 0.8,
+    dimAnimationDuration: 50,
     qrShareHorizontalPadding: 32,
     menuIconSize: 48,
 

From f9137e9d7d8a24cb04179e1f9db8312545e9a89a Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Mon, 16 Sep 2024 08:50:09 +0700
Subject: [PATCH 096/132] useOnyx for other onyx entries instead of withonyx

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/pages/ReportAvatar.tsx | 35 +++++++++--------------------------
 src/types/onyx/Report.ts   |  6 +++---
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index bd826ab8ec8a..5921bfdbb21e 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -1,7 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useMemo} from 'react';
-import {withOnyx} from 'react-native-onyx';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
@@ -10,19 +9,15 @@ import * as UserUtils from '@libs/UserUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, Report} from '@src/types/onyx';
 
-type ReportAvatarOnyxProps = {
-    report: OnyxEntry<Report>;
-    isLoadingApp: OnyxEntry<boolean>;
-    policies: OnyxCollection<Policy>;
-};
+type ReportAvatarProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
 
-type ReportAvatarProps = ReportAvatarOnyxProps & StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
-
-function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true}: ReportAvatarProps) {
-    const policyID = route.params.policyID ?? '-1';
-    const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+function ReportAvatar({route}: ReportAvatarProps) {
+    const reportIDFromRoute = route.params?.reportID ?? '-1';
+    const policyIDFromRoute = route.params?.policyID ?? '-1';
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportIDFromRoute}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyIDFromRoute}`);
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {initialValue: true});
 
     const attachment = useMemo(() => {
         if (ReportUtils.isGroupChat(report) && !ReportUtils.isThread(report)) {
@@ -40,7 +35,6 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
             originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',
             isWorkspaceAvatar: true,
         };
-        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [report, policy]);
 
     return (
@@ -62,15 +56,4 @@ function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = tr
 }
 
 ReportAvatar.displayName = 'ReportAvatar';
-
-export default withOnyx<ReportAvatarProps, ReportAvatarOnyxProps>({
-    report: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '-1'}`,
-    },
-    isLoadingApp: {
-        key: ONYXKEYS.IS_LOADING_APP,
-    },
-    policies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-})(ReportAvatar);
+export default ReportAvatar;
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index a9ba59451758..ab3bb6bb7af3 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -71,6 +71,9 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The URL of the Group Chat report custom avatar */
         avatarUrl?: string;
 
+        /** The filename of the avatar */
+        avatarFileName?: string;
+
         /** The specific type of chat */
         chatType?: ValueOf<typeof CONST.REPORT.CHAT_TYPE>;
 
@@ -278,9 +281,6 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Collection of report permissions granted to the current user */
         permissions?: Array<ValueOf<typeof CONST.REPORT.PERMISSIONS>>;
 
-        /** The filename of the avatar */
-        avatarFileName?: string;
-
         /** The trip data for a trip room */
         tripData?: {
             /** The start date of a trip */

From d6020af6f9cb3636bfdb8d2a8008e7eb06170100 Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Mon, 16 Sep 2024 08:53:37 +0700
Subject: [PATCH 097/132] move comment

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/pages/ReportAvatar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index 5921bfdbb21e..383da0a48216 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -32,6 +32,7 @@ function ReportAvatar({route}: ReportAvatarProps) {
         return {
             source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceAvatar(report), 0),
             headerTitle: ReportUtils.getPolicyName(report, false, policy),
+            // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
             originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',
             isWorkspaceAvatar: true,
         };
@@ -47,7 +48,6 @@ function ReportAvatar({route}: ReportAvatarProps) {
             }}
             isWorkspaceAvatar={attachment.isWorkspaceAvatar}
             maybeIcon
-            // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
             originalFileName={attachment.originalFileName}
             shouldShowNotFoundPage={!report?.reportID && !isLoadingApp}
             isLoading={(!report?.reportID || !policy?.id) && !!isLoadingApp}

From 058e2bbe12608b0d859cc3de94b5532ab6340010 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Mon, 16 Sep 2024 10:36:47 +0700
Subject: [PATCH 098/132] disable focus trap for search bottom tab screen

---
 src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts b/src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts
index b472b80e5cbd..f6a4f5ba6e83 100644
--- a/src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts
+++ b/src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts
@@ -1,6 +1,6 @@
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
-const BOTTOM_TAB_SCREENS = [SCREENS.HOME, SCREENS.SETTINGS.ROOT, NAVIGATORS.BOTTOM_TAB_NAVIGATOR];
+const BOTTOM_TAB_SCREENS = [SCREENS.HOME, SCREENS.SETTINGS.ROOT, NAVIGATORS.BOTTOM_TAB_NAVIGATOR, SCREENS.SEARCH.BOTTOM_TAB];
 
 export default BOTTOM_TAB_SCREENS;

From 8ba1afbbb4d5594dea588b7b948d42c252492883 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Mon, 16 Sep 2024 10:37:19 +0700
Subject: [PATCH 099/132] disable press on enter

---
 src/components/SelectionList/Search/ActionCell.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index f535c0342e55..faafa6159dc1 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -69,7 +69,6 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
                 text={translate(actionTranslationsMap[CONST.SEARCH.ACTION_TYPES.VIEW])}
                 onPress={goToItem}
                 small
-                pressOnEnter
                 style={[styles.w100]}
                 innerStyles={buttonInnerStyles}
                 link={isChildListItem}
@@ -84,7 +83,6 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
                 text={text}
                 onPress={goToItem}
                 small
-                pressOnEnter
                 style={[styles.w100]}
                 innerStyles={buttonInnerStyles}
             />

From 94d3e0024475bfaab00ca8a292a59260f1c31d18 Mon Sep 17 00:00:00 2001
From: Robert Chen <robert@expensify.com>
Date: Mon, 16 Sep 2024 14:44:15 +0800
Subject: [PATCH 100/132] Unheld total needs to be multiplied against
 coefficient as well

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

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index f35ab637aea1..81ce57f2d788 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -7225,7 +7225,7 @@ function getNonHeldAndFullAmount(iouReport: OnyxEntry<Report>, policy: OnyxEntry
     if (hasUpdatedTotal(iouReport, policy) && hasPendingTransaction) {
         const unheldTotal = reportTransactions.reduce((currentVal, transaction) => currentVal + (!TransactionUtils.isOnHold(transaction) ? transaction.amount : 0), 0);
 
-        return [CurrencyUtils.convertToDisplayString(unheldTotal, iouReport?.currency), CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency)];
+        return [CurrencyUtils.convertToDisplayString(unheldTotal * coefficient, iouReport?.currency), CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency)];
     }
 
     return [

From 3f5457137dd04db9a55983f68f4c519056cae6ed Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Mon, 16 Sep 2024 14:21:35 +0700
Subject: [PATCH 101/132] fix: preserve scroll position and fixed the Saved
 title

---
 src/pages/Search/SearchTypeMenu.tsx | 40 +++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index ce30c0a8d782..a22b2820862c 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -1,12 +1,14 @@
-import React, {useCallback} from 'react';
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useContext, useLayoutEffect, useRef} from 'react';
 import {View} from 'react-native';
-import type {TextStyle, ViewStyle} from 'react-native';
+import type {ScrollView as RNScrollView, ScrollViewProps, TextStyle, ViewStyle} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import type {MenuItemBaseProps} from '@components/MenuItem';
 import MenuItem from '@components/MenuItem';
 import MenuItemList from '@components/MenuItemList';
 import type {MenuItemWithLink} from '@components/MenuItemList';
 import {usePersonalDetails} from '@components/OnyxProvider';
+import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
 import ScrollView from '@components/ScrollView';
 import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
@@ -165,8 +167,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
     const renderSavedSearchesSection = useCallback(
         (menuItems: MenuItemWithLink[]) => (
-            <View style={[styles.pb4, styles.mh3, styles.mt3]}>
-                <Text style={[styles.sectionTitle, styles.pb1]}>{translate('search.savedSearchesMenuItemTitle')}</Text>
+            <View style={[styles.pb4, styles.mh3]}>
                 <MenuItemList
                     menuItems={menuItems}
                     wrapperStyle={styles.sectionMenuItem}
@@ -198,6 +199,29 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         );
     }
 
+    const route = useRoute();
+    const scrollViewRef = useRef<RNScrollView>(null);
+    const {saveScrollOffset, getScrollOffset} = useContext(ScrollOffsetContext);
+    const onScroll = useCallback<NonNullable<ScrollViewProps['onScroll']>>(
+        (e) => {
+            // If the layout measurement is 0, it means the flashlist is not displayed but the onScroll may be triggered with offset value 0.
+            // We should ignore this case.
+            if (e.nativeEvent.layoutMeasurement.height === 0) {
+                return;
+            }
+            saveScrollOffset(route, e.nativeEvent.contentOffset.y);
+        },
+        [route, saveScrollOffset],
+    );
+
+    useLayoutEffect(() => {
+        const scrollOffset = getScrollOffset(route);
+        if (!scrollOffset || !scrollViewRef.current) {
+            return;
+        }
+        scrollViewRef.current.scrollTo({y: scrollOffset, animated: false});
+    }, [getScrollOffset, route]);
+
     return (
         <>
             <View style={[styles.pb4, styles.mh3, styles.mt3]}>
@@ -227,7 +251,13 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
             </View>
             {savedSearches && Object.keys(savedSearches).length > 0 && (
                 <>
-                    <ScrollView>{renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
+                    <Text style={[styles.sectionTitle, styles.pb1, styles.mh3, styles.mt3]}>{translate('search.savedSearchesMenuItemTitle')}</Text>
+                    <ScrollView
+                        onScroll={onScroll}
+                        ref={scrollViewRef}
+                    >
+                        {renderSavedSearchesSection(savedSearchesMenuItems())}
+                    </ScrollView>
                     <DeleteConfirmModal />
                 </>
             )}

From bec53767696fe39403ca69cf91148a65f7e7543c Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Mon, 16 Sep 2024 14:32:06 +0700
Subject: [PATCH 102/132] fix: attribute name

---
 src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx | 2 +-
 src/pages/home/report/comment/TextCommentFragment.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
index c0f42ffd2fd9..d211aac7fd4c 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
@@ -86,7 +86,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
                 tagName: 'blockquote',
                 contentModel: HTMLContentModel.block,
                 getMixedUAStyles: (tnode) => {
-                    if (tnode.attributes.isEmojisOnly === undefined) {
+                    if (tnode.attributes.isemojisonly === undefined) {
                         return;
                     }
                     return styles.onlyEmojisTextLineHeight;
diff --git a/src/pages/home/report/comment/TextCommentFragment.tsx b/src/pages/home/report/comment/TextCommentFragment.tsx
index 4f68919af6e2..2e64af6c534e 100644
--- a/src/pages/home/report/comment/TextCommentFragment.tsx
+++ b/src/pages/home/report/comment/TextCommentFragment.tsx
@@ -64,7 +64,7 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
         let htmlContent = htmlWithDeletedTag;
         if (containsOnlyEmojis) {
             htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji islarge>');
-            htmlContent = Str.replaceAll(htmlContent, '<blockquote>', '<blockquote isEmojisOnly>');
+            htmlContent = Str.replaceAll(htmlContent, '<blockquote>', '<blockquote isemojisonly>');
         }
         let htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;
 

From 979b90a60ab44bc93ed2efae1da382d214fa37fb Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Mon, 16 Sep 2024 09:47:08 +0200
Subject: [PATCH 103/132] Change depracation lint to changed files lint

---
 .../{deprecation-lint.yml => lint-changed.yml}        | 11 ++++++-----
 package.json                                          |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename .github/workflows/{deprecation-lint.yml => lint-changed.yml} (77%)

diff --git a/.github/workflows/deprecation-lint.yml b/.github/workflows/lint-changed.yml
similarity index 77%
rename from .github/workflows/deprecation-lint.yml
rename to .github/workflows/lint-changed.yml
index faa0c594ed53..ddb640bfe9cf 100644
--- a/.github/workflows/deprecation-lint.yml
+++ b/.github/workflows/lint-changed.yml
@@ -1,4 +1,4 @@
-name: Deprecation ESLint check
+name: Changed files ESLint check
 
 on:
   workflow_call:
@@ -8,12 +8,12 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
 
 concurrency:
-  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-deprecation-lint
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-changed-lint
   cancel-in-progress: true
 
 jobs:
-  deprecation-lint:
-    name: Deprecation ESLint check
+  lint-changed:
+    name: Changed files ESLint check
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
@@ -25,7 +25,8 @@ jobs:
       
       - name: Run ESLint to check for deprecation warnings
         run: |
+          # This will just fetch the latest commit from main
           git fetch origin main --no-tags --depth=1
 
           # shellcheck disable=SC2046
-          npm run lint-deprecation
+          npm run lint-changed
diff --git a/package.json b/package.json
index 862824fca0ef..28a3b7b244d0 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,7 @@
     "test": "TZ=utc NODE_OPTIONS=--experimental-vm-modules jest",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
     "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=0 --cache --cache-location=node_modules/.cache/eslint",
-    "lint-deprecation": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.ts\" \"*.tsx\")",
-    "lint-changed": "eslint --fix $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.js\" \"*.ts\" \"*.tsx\")",
+    "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.ts\" \"*.tsx\")",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",
     "prettier": "prettier --write .",

From 569c165b4090c30b589e784c6b189232cc90d552 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Mon, 16 Sep 2024 09:49:52 +0200
Subject: [PATCH 104/132] Change name of the file from pr to changed

---
 .eslintignore                           | 2 +-
 .eslintrc.pr.js => .eslintrc.changed.js | 0
 package.json                            | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename .eslintrc.pr.js => .eslintrc.changed.js (100%)

diff --git a/.eslintignore b/.eslintignore
index a5805dfe4ee9..5c4b73d8a682 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,7 +3,7 @@
 .github/actions/**/index.js
 *.config.js
 **/.eslintrc.js
-**/.eslintrc.pr.js
+**/.eslintrc.changed.js
 **/node_modules/**
 **/dist/**
 android/**/build/**
diff --git a/.eslintrc.pr.js b/.eslintrc.changed.js
similarity index 100%
rename from .eslintrc.pr.js
rename to .eslintrc.changed.js
diff --git a/package.json b/package.json
index 28a3b7b244d0..72f01fc06d91 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "test": "TZ=utc NODE_OPTIONS=--experimental-vm-modules jest",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
     "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=0 --cache --cache-location=node_modules/.cache/eslint",
-    "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.ts\" \"*.tsx\")",
+    "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 eslint --max-warnings=0 --config ./.eslintrc.changed.js $(git diff --diff-filter=AM --name-only origin/main HEAD -- \"*.ts\" \"*.tsx\")",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",
     "prettier": "prettier --write .",

From 8aa15ada08e51fa6e897bad1b865d28504d1a5eb Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Mon, 16 Sep 2024 15:10:32 +0700
Subject: [PATCH 105/132] fix lint

---
 src/pages/Search/SearchTypeMenu.tsx | 46 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index a22b2820862c..5dd79872d944 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -158,6 +158,29 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         return baseMenuItem;
     };
 
+    const route = useRoute();
+    const scrollViewRef = useRef<RNScrollView>(null);
+    const {saveScrollOffset, getScrollOffset} = useContext(ScrollOffsetContext);
+    const onScroll = useCallback<NonNullable<ScrollViewProps['onScroll']>>(
+        (e) => {
+            // If the layout measurement is 0, it means the flashlist is not displayed but the onScroll may be triggered with offset value 0.
+            // We should ignore this case.
+            if (e.nativeEvent.layoutMeasurement.height === 0) {
+                return;
+            }
+            saveScrollOffset(route, e.nativeEvent.contentOffset.y);
+        },
+        [route, saveScrollOffset],
+    );
+
+    useLayoutEffect(() => {
+        const scrollOffset = getScrollOffset(route);
+        if (!scrollOffset || !scrollViewRef.current) {
+            return;
+        }
+        scrollViewRef.current.scrollTo({y: scrollOffset, animated: false});
+    }, [getScrollOffset, route]);
+
     const savedSearchesMenuItems = () => {
         if (!savedSearches) {
             return [];
@@ -199,29 +222,6 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         );
     }
 
-    const route = useRoute();
-    const scrollViewRef = useRef<RNScrollView>(null);
-    const {saveScrollOffset, getScrollOffset} = useContext(ScrollOffsetContext);
-    const onScroll = useCallback<NonNullable<ScrollViewProps['onScroll']>>(
-        (e) => {
-            // If the layout measurement is 0, it means the flashlist is not displayed but the onScroll may be triggered with offset value 0.
-            // We should ignore this case.
-            if (e.nativeEvent.layoutMeasurement.height === 0) {
-                return;
-            }
-            saveScrollOffset(route, e.nativeEvent.contentOffset.y);
-        },
-        [route, saveScrollOffset],
-    );
-
-    useLayoutEffect(() => {
-        const scrollOffset = getScrollOffset(route);
-        if (!scrollOffset || !scrollViewRef.current) {
-            return;
-        }
-        scrollViewRef.current.scrollTo({y: scrollOffset, animated: false});
-    }, [getScrollOffset, route]);
-
     return (
         <>
             <View style={[styles.pb4, styles.mh3, styles.mt3]}>

From 1ec92a5f6091aa93c57193c00bfd2107f660f5b9 Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Fri, 13 Sep 2024 11:49:06 +0200
Subject: [PATCH 106/132] Stop displaying User info in SearchResults row if
 user missing or fake

---
 .../Search/ExpenseItemHeaderNarrow.tsx          | 17 +++++++++++------
 .../SelectionList/Search/UserInfoCell.tsx       |  4 ++++
 src/libs/SearchUtils.ts                         | 15 +++++++++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
index a74b6348a9b5..821aaff06041 100644
--- a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
+++ b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
@@ -48,6 +48,9 @@ function ExpenseItemHeaderNarrow({
     const StyleUtils = useStyleUtils();
     const theme = useTheme();
 
+    // It might happen that we are missing display names for `From` or `To`, we only display arrow icon if both names exist
+    const shouldDisplayArrowIcon = participantFromDisplayName && participantToDisplayName;
+
     return (
         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.mb3, styles.gap2, containerStyle]}>
             <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.flex1]}>
@@ -77,12 +80,14 @@ function ExpenseItemHeaderNarrow({
                         displayName={participantFromDisplayName}
                     />
                 </View>
-                <Icon
-                    src={Expensicons.ArrowRightLong}
-                    width={variables.iconSizeXXSmall}
-                    height={variables.iconSizeXXSmall}
-                    fill={theme.icon}
-                />
+                {shouldDisplayArrowIcon && (
+                    <Icon
+                        src={Expensicons.ArrowRightLong}
+                        width={variables.iconSizeXXSmall}
+                        height={variables.iconSizeXXSmall}
+                        fill={theme.icon}
+                    />
+                )}
                 <View style={[styles.flex1, styles.mw50]}>
                     <UserInfoCell
                         participant={participantTo}
diff --git a/src/components/SelectionList/Search/UserInfoCell.tsx b/src/components/SelectionList/Search/UserInfoCell.tsx
index f62c4904ad8e..dd379748c4b1 100644
--- a/src/components/SelectionList/Search/UserInfoCell.tsx
+++ b/src/components/SelectionList/Search/UserInfoCell.tsx
@@ -17,6 +17,10 @@ function UserInfoCell({participant, displayName}: UserInfoCellProps) {
     const {isLargeScreenWidth} = useResponsiveLayout();
     const avatarURL = participant?.avatar;
 
+    if (displayName === CONST.REPORT.OWNER_EMAIL_FAKE || displayName === '') {
+        return null;
+    }
+
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter]}>
             <Avatar
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 24872b5d90eb..807230986f29 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -58,6 +58,13 @@ const operatorToSignMap = {
     [CONST.SEARCH.SYNTAX_OPERATORS.OR]: ' ' as const,
 };
 
+const emptyPersonalDetails = {
+    accountID: CONST.REPORT.OWNER_ACCOUNT_ID_FAKE,
+    avatar: '',
+    displayName: undefined,
+    login: undefined,
+};
+
 /**
  * @private
  */
@@ -177,7 +184,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
         .map((key) => {
             const transactionItem = data[key];
             const from = data.personalDetailsList?.[transactionItem.accountID];
-            const to = data.personalDetailsList?.[transactionItem.managerID];
+            const to = transactionItem.managerID ? data.personalDetailsList?.[transactionItem.managerID] : emptyPersonalDetails;
 
             const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to);
 
@@ -225,7 +232,7 @@ function getReportActionsSections(data: OnyxTypes.SearchResults['data']): Report
 }
 
 function getIOUReportName(data: OnyxTypes.SearchResults['data'], reportItem: SearchReport) {
-    const payerPersonalDetails = data.personalDetailsList?.[reportItem.managerID ?? 0];
+    const payerPersonalDetails = reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails;
     const payerName = payerPersonalDetails?.displayName ?? payerPersonalDetails?.login ?? translateLocal('common.hidden');
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportItem.total ?? 0, reportItem.currency ?? CONST.CURRENCY.USD);
     if (reportItem.action === CONST.SEARCH.ACTION_TYPES.VIEW) {
@@ -262,7 +269,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
                 ...reportItem,
                 keyForList: reportItem.reportID,
                 from: data.personalDetailsList?.[reportItem.accountID ?? -1],
-                to: data.personalDetailsList?.[reportItem.managerID ?? -1],
+                to: reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails,
                 transactions,
                 reportName: isIOUReport ? getIOUReportName(data, reportItem) : reportItem.reportName,
             };
@@ -271,7 +278,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
             const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${transactionItem.reportID}`;
 
             const from = data.personalDetailsList?.[transactionItem.accountID];
-            const to = data.personalDetailsList?.[transactionItem.managerID];
+            const to = transactionItem.managerID ? data.personalDetailsList?.[transactionItem.managerID] : emptyPersonalDetails;
 
             const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to);
 

From 9b426380a3074b9ee258b93a150ea81162c8a679 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Mon, 16 Sep 2024 15:57:24 +0700
Subject: [PATCH 107/132] fix: add comment eslint-disable-next-line
 no-restricted-imports

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

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 5dd79872d944..91267871991c 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -1,6 +1,7 @@
 import {useRoute} from '@react-navigation/native';
 import React, {useCallback, useContext, useLayoutEffect, useRef} from 'react';
 import {View} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
 import type {ScrollView as RNScrollView, ScrollViewProps, TextStyle, ViewStyle} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import type {MenuItemBaseProps} from '@components/MenuItem';

From eab7d0e1a5b27386c7d5153355c3c8e37e7469d8 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Mon, 16 Sep 2024 16:03:35 +0700
Subject: [PATCH 108/132] fix: fix mentions copied on mobile

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

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index f54356799300..8d61ad864409 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -1686,7 +1686,7 @@ function getCardIssuedMessage(reportAction: OnyxEntry<ReportAction>, shouldRende
     const assigneeAccountID = (reportAction?.originalMessage as IssueNewCardOriginalMessage)?.assigneeAccountID;
     const assigneeDetails = PersonalDetailsUtils.getPersonalDetailsByIDs([assigneeAccountID], currentUserAccountID ?? -1)[0];
 
-    const assignee = shouldRenderHTML ? `<mention-user accountID=${assigneeAccountID}></mention-user>` : assigneeDetails?.firstName ?? assigneeDetails.login ?? '';
+    const assignee = shouldRenderHTML ? `<mention-user accountID="${assigneeAccountID}"/>` : assigneeDetails?.firstName ?? assigneeDetails.login ?? '';
     const link = shouldRenderHTML
         ? `<a href='${environmentURL}/${ROUTES.SETTINGS_WALLET}'>${Localize.translateLocal('cardPage.expensifyCard')}</a>`
         : Localize.translateLocal('cardPage.expensifyCard');

From 77bc236632752cba3aeae9d537f7ccbe2acff465 Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Mon, 16 Sep 2024 11:12:26 +0200
Subject: [PATCH 109/132] Correctly handle `__fake__` user display name

---
 .../SelectionList/Search/ExpenseItemHeaderNarrow.tsx         | 3 ++-
 src/components/SelectionList/Search/UserInfoCell.tsx         | 3 ++-
 src/libs/SearchUtils.ts                                      | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
index 821aaff06041..424bbd50d7b2 100644
--- a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
+++ b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
@@ -7,6 +7,7 @@ import {PressableWithFeedback} from '@components/Pressable';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as SearchUtils from '@libs/SearchUtils';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import type {SearchPersonalDetails, SearchTransactionAction} from '@src/types/onyx/SearchResults';
@@ -49,7 +50,7 @@ function ExpenseItemHeaderNarrow({
     const theme = useTheme();
 
     // It might happen that we are missing display names for `From` or `To`, we only display arrow icon if both names exist
-    const shouldDisplayArrowIcon = participantFromDisplayName && participantToDisplayName;
+    const shouldDisplayArrowIcon = SearchUtils.isCorrectSearchUserName(participantFromDisplayName) && SearchUtils.isCorrectSearchUserName(participantToDisplayName);
 
     return (
         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.mb3, styles.gap2, containerStyle]}>
diff --git a/src/components/SelectionList/Search/UserInfoCell.tsx b/src/components/SelectionList/Search/UserInfoCell.tsx
index dd379748c4b1..3a6c98178a3b 100644
--- a/src/components/SelectionList/Search/UserInfoCell.tsx
+++ b/src/components/SelectionList/Search/UserInfoCell.tsx
@@ -4,6 +4,7 @@ import Avatar from '@components/Avatar';
 import Text from '@components/Text';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as SearchUtils from '@libs/SearchUtils';
 import CONST from '@src/CONST';
 import type {SearchPersonalDetails} from '@src/types/onyx/SearchResults';
 
@@ -17,7 +18,7 @@ function UserInfoCell({participant, displayName}: UserInfoCellProps) {
     const {isLargeScreenWidth} = useResponsiveLayout();
     const avatarURL = participant?.avatar;
 
-    if (displayName === CONST.REPORT.OWNER_EMAIL_FAKE || displayName === '') {
+    if (!SearchUtils.isCorrectSearchUserName(displayName)) {
         return null;
     }
 
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 807230986f29..a848417ccce2 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -808,6 +808,10 @@ function isCannedSearchQuery(queryJSON: SearchQueryJSON) {
     return !queryJSON.filters;
 }
 
+function isCorrectSearchUserName(displayName?: string) {
+    return displayName && displayName.toUpperCase() !== CONST.REPORT.OWNER_EMAIL_FAKE;
+}
+
 export {
     buildQueryStringFromFilterValues,
     buildSearchQueryJSON,
@@ -830,4 +834,5 @@ export {
     isCannedSearchQuery,
     getExpenseTypeTranslationKey,
     getOverflowMenu,
+    isCorrectSearchUserName,
 };

From bf4ebdeab56db764eee1f42f0925c72d2d98db3d Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Mon, 16 Sep 2024 12:03:42 +0200
Subject: [PATCH 110/132] Add prettier to run on main

---
 .github/workflows/preDeploy.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
index e5ccdfa53076..796468170275 100644
--- a/.github/workflows/preDeploy.yml
+++ b/.github/workflows/preDeploy.yml
@@ -13,6 +13,9 @@ jobs:
   lint:
     uses: ./.github/workflows/lint.yml
 
+  prettier:
+    uses: ./.github/workflows/prettier.yml
+
   test:
     uses: ./.github/workflows/test.yml
 

From a0c8b553c8ed01efd44e016f7a33155e927b90bf Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Mon, 16 Sep 2024 17:41:58 +0700
Subject: [PATCH 111/132] fix: lint

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

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 91267871991c..0e59aa969b66 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -203,7 +203,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 />
             </View>
         ),
-        [styles, translate],
+        [styles],
     );
 
     const isCannedQuery = SearchUtils.isCannedSearchQuery(queryJSON);

From 32542baf6cafbbc46ec112c59f4290e2406d1e51 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 16 Sep 2024 17:50:29 +0700
Subject: [PATCH 112/132] fix: app crash when we save the user search value and
 reset the app

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

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 24872b5d90eb..7740c6aadcc3 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -699,7 +699,7 @@ function getPolicyIDFromSearchQuery(queryJSON: SearchQueryJSON) {
 
 function getDisplayValue(filterName: string, filter: string, personalDetails: OnyxTypes.PersonalDetailsList, cardList: OnyxTypes.CardList, reports: OnyxCollection<OnyxTypes.Report>) {
     if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM || filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO) {
-        return PersonalDetailsUtils.createDisplayName(personalDetails[filter]?.login ?? '', personalDetails[filter]);
+        return PersonalDetailsUtils.createDisplayName(personalDetails?.[filter]?.login ?? '', personalDetails?.[filter]);
     }
     if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID) {
         return cardList[filter].bank;

From 729bc4ad8bff880e9c2709945fc10632a01dde3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= <michal.skalka@swmansion.com>
Date: Mon, 16 Sep 2024 13:19:19 +0200
Subject: [PATCH 113/132] Add review changes

---
 src/libs/Notification/PushNotification/index.native.ts | 2 ++
 src/libs/actions/Session/index.ts                      | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/Notification/PushNotification/index.native.ts b/src/libs/Notification/PushNotification/index.native.ts
index 334317ec5d0a..448365c1cd1d 100644
--- a/src/libs/Notification/PushNotification/index.native.ts
+++ b/src/libs/Notification/PushNotification/index.native.ts
@@ -2,6 +2,7 @@ import type {PushPayload} from '@ua/react-native-airship';
 import Airship, {EventType} from '@ua/react-native-airship';
 import Onyx from 'react-native-onyx';
 import Log from '@libs/Log';
+import ShortcutManager from '@libs/ShortcutManager';
 import * as PushNotificationActions from '@userActions/PushNotification';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ForegroundNotifications from './ForegroundNotifications';
@@ -139,6 +140,7 @@ const deregister: Deregister = () => {
     Airship.removeAllListeners(EventType.PushReceived);
     Airship.removeAllListeners(EventType.NotificationResponse);
     ForegroundNotifications.disableForegroundNotifications();
+    ShortcutManager.removeAllDynamicShortcuts();
 };
 
 /**
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index de2cd60ece39..ab209e9bf928 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -36,7 +36,6 @@ import NetworkConnection from '@libs/NetworkConnection';
 import * as Pusher from '@libs/Pusher/pusher';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as SessionUtils from '@libs/SessionUtils';
-import ShortcutManager from '@libs/ShortcutManager';
 import Timers from '@libs/Timers';
 import {hideContextMenu} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import {KEYS_TO_PRESERVE, openApp} from '@userActions/App';
@@ -206,7 +205,6 @@ function hasAuthToken(): boolean {
 function signOutAndRedirectToSignIn(shouldResetToHome?: boolean, shouldStashSession?: boolean, killHybridApp = true) {
     Log.info('Redirecting to Sign In because signOut() was called');
     hideContextMenu(false);
-    ShortcutManager.removeAllDynamicShortcuts();
     if (!isAnonymousUser()) {
         // In the HybridApp, we want the Old Dot to handle the sign out process
         if (NativeModules.HybridAppModule && killHybridApp) {

From 1f6640162febe27ac1f48aeb7928f75624fa7f16 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Mon, 16 Sep 2024 11:52:13 +0000
Subject: [PATCH 114/132] Update version to 9.0.35-5

---
 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 c2aafd413875..8b1e1b7c1f0e 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 1009003504
-        versionName "9.0.35-4"
+        versionCode 1009003505
+        versionName "9.0.35-5"
         // 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 95672596671e..8f377fe3df92 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.4</string>
+	<string>9.0.35.5</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7098701e2645..3661fdc02f55 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.35.4</string>
+	<string>9.0.35.5</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 7d06f5441f72..fe5514f0f9e1 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.35</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.4</string>
+	<string>9.0.35.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 7a1826532e37..5fe5d48875b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-4",
+  "version": "9.0.35-5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.35-4",
+      "version": "9.0.35-5",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index e720366d3dd0..439da29077ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-4",
+  "version": "9.0.35-5",
   "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 1569a2043165fa2c4d842614e974bf5605c1d0c9 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Mon, 16 Sep 2024 15:09:08 +0300
Subject: [PATCH 115/132] Revert "remove receipt plus icon asset"

This reverts commit 77c5300c3dde429e721c4275470d0d08200b31b1.
---
 assets/images/receipt-plus.svg     | 1 +
 src/components/Icon/Expensicons.ts | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 assets/images/receipt-plus.svg

diff --git a/assets/images/receipt-plus.svg b/assets/images/receipt-plus.svg
new file mode 100644
index 000000000000..ca4d96b3dfa5
--- /dev/null
+++ b/assets/images/receipt-plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M3,1.4v17.3c0,0.4,0.5,0.5,0.7,0.3L4.4,18c0.2-0.2,0.4-0.2,0.6,0l1.1,1.3c0.2,0.2,0.4,0.2,0.6,0L7.9,18	c0.2-0.2,0.4-0.2,0.6,0l1.1,1.3c0.2,0.2,0.4,0.2,0.6,0l1.1-1.3c0.2-0.2,0.4-0.2,0.6,0l0.3,0.3C12.1,17.9,12,17.5,12,17v-0.5h-0.5	c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3H12V10c0-1.7,1.3-3,3-3c0.8,0,1.5,0.3,2,0.8V1.4c0-0.4-0.5-0.5-0.7-0.3L15.6,2	c-0.2,0.2-0.4,0.2-0.6,0l-1.1-1.3c-0.2-0.2-0.4-0.2-0.6,0L12.1,2c-0.2,0.2-0.4,0.2-0.6,0l-1.1-1.3c-0.2-0.2-0.4-0.2-0.6,0L8.6,2	C8.4,2.1,8.1,2.1,7.9,2L6.8,0.6c-0.2-0.2-0.4-0.2-0.6,0L5.1,2C4.9,2.1,4.6,2.1,4.4,2L3.7,1.1C3.5,0.8,3,1,3,1.4z"/><path d="M15,9c0.6,0,1,0.4,1,1v2.5h2.5c0.6,0,1,0.4,1,1s-0.4,1-1,1H16V17c0,0.6-0.4,1-1,1s-1-0.4-1-1v-2.5h-2.5c-0.6,0-1-0.4-1-1	s0.4-1,1-1H14V10C14,9.4,14.4,9,15,9z"/></svg>
\ No newline at end of file
diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index 22bcf710f864..698dc33b4a03 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -149,6 +149,7 @@ import Printer from '@assets/images/printer.svg';
 import Profile from '@assets/images/profile.svg';
 import QrCode from '@assets/images/qrcode.svg';
 import QuestionMark from '@assets/images/question-mark-circle.svg';
+import ReceiptPlus from '@assets/images/receipt-plus.svg';
 import ReceiptScan from '@assets/images/receipt-scan.svg';
 import ReceiptSearch from '@assets/images/receipt-search.svg';
 import ReceiptSlash from '@assets/images/receipt-slash.svg';
@@ -334,6 +335,7 @@ export {
     QrCode,
     QuestionMark,
     Receipt,
+    ReceiptPlus,
     ReceiptScan,
     ReceiptSlash,
     RemoveMembers,

From 4b41dd187dc63ab01af824f106f1ea1bb189523d Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Mon, 16 Sep 2024 12:20:43 +0000
Subject: [PATCH 116/132] Update version to 9.0.35-6

---
 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 8b1e1b7c1f0e..7212344de0f3 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 1009003505
-        versionName "9.0.35-5"
+        versionCode 1009003506
+        versionName "9.0.35-6"
         // 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 8f377fe3df92..1e5203202669 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.5</string>
+	<string>9.0.35.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 3661fdc02f55..ab2e24d348a4 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.35.5</string>
+	<string>9.0.35.6</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index fe5514f0f9e1..9d7d782f2896 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.35</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.5</string>
+	<string>9.0.35.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 5fe5d48875b8..59a7104f89c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-5",
+  "version": "9.0.35-6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.35-5",
+      "version": "9.0.35-6",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 439da29077ae..0ce7f978e26e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-5",
+  "version": "9.0.35-6",
   "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 d0a51b846cb42e230cd7ca659193fc147bf5ebbe Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Mon, 16 Sep 2024 12:29:51 +0000
Subject: [PATCH 117/132] Update version to 9.0.35-7

---
 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 7212344de0f3..19c634a10df8 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 1009003506
-        versionName "9.0.35-6"
+        versionCode 1009003507
+        versionName "9.0.35-7"
         // 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 1e5203202669..11f5430c3519 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.6</string>
+	<string>9.0.35.7</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ab2e24d348a4..8d3815a7990f 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.35.6</string>
+	<string>9.0.35.7</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 9d7d782f2896..f52205db454a 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.35</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.6</string>
+	<string>9.0.35.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 59a7104f89c6..9aaaf9f279dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-6",
+  "version": "9.0.35-7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.35-6",
+      "version": "9.0.35-7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 0ce7f978e26e..49c4ce3b8044 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-6",
+  "version": "9.0.35-7",
   "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 46960fdc80e1c1d8fc8b18ef9251a39c68b2f2cb Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Mon, 16 Sep 2024 15:16:55 +0200
Subject: [PATCH 118/132] Fix onboarding modal that flashes for user
 transitioning from OldDot

---
 src/libs/actions/Report.ts                      | 11 -----------
 src/libs/hasCompletedGuidedSetupFlowSelector.ts |  3 ++-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 40a7059b54b9..c70e9b271537 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -57,7 +57,6 @@ import {prepareDraftComment} from '@libs/DraftCommentUtils';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import * as Environment from '@libs/Environment/Environment';
 import * as ErrorUtils from '@libs/ErrorUtils';
-import hasCompletedGuidedSetupFlowSelector from '@libs/hasCompletedGuidedSetupFlowSelector';
 import HttpUtils from '@libs/HttpUtils';
 import isPublicScreenRoute from '@libs/isPublicScreenRoute';
 import * as Localize from '@libs/Localize';
@@ -110,7 +109,6 @@ import * as Modal from './Modal';
 import navigateFromNotification from './navigateFromNotification';
 import * as Session from './Session';
 import * as Welcome from './Welcome';
-import * as OnboardingFlow from './Welcome/OnboardingFlow';
 
 type SubscriberCallback = (isFromCurrentUser: boolean, reportActionID: string | undefined) => void;
 
@@ -2690,15 +2688,6 @@ function openReportFromDeepLink(url: string) {
 
                         const state = navigationRef.getRootState();
                         const currentFocusedRoute = findFocusedRoute(state);
-                        const hasCompletedGuidedSetupFlow = hasCompletedGuidedSetupFlowSelector(onboarding);
-
-                        // We need skip deeplinking if the user hasn't completed the guided setup flow.
-                        if (!hasCompletedGuidedSetupFlow) {
-                            Welcome.isOnboardingFlowCompleted({
-                                onNotCompleted: () => OnboardingFlow.startOnboardingFlow(),
-                            });
-                            return;
-                        }
 
                         if (isOnboardingFlowName(currentFocusedRoute?.name)) {
                             Welcome.setOnboardingErrorMessage(Localize.translateLocal('onboarding.purpose.errorBackButton'));
diff --git a/src/libs/hasCompletedGuidedSetupFlowSelector.ts b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
index 83cde0a0be8c..4934c83d7773 100644
--- a/src/libs/hasCompletedGuidedSetupFlowSelector.ts
+++ b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
@@ -6,7 +6,8 @@ function hasCompletedGuidedSetupFlowSelector(onboarding: OnyxValue<typeof ONYXKE
     if (Array.isArray(onboarding)) {
         return true;
     }
-    return onboarding?.hasCompletedGuidedSetupFlow ?? false;
+
+    return onboarding?.hasCompletedGuidedSetupFlow ?? true;
 }
 
 export default hasCompletedGuidedSetupFlowSelector;

From 13d82c3ee3c5fe2429d9c91534189e8872a26c88 Mon Sep 17 00:00:00 2001
From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:51:16 +0100
Subject: [PATCH 119/132] Remove unused property

---
 src/components/PressableWithSecondaryInteraction/types.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/PressableWithSecondaryInteraction/types.ts b/src/components/PressableWithSecondaryInteraction/types.ts
index e097a6930654..ebe08cfab4f2 100644
--- a/src/components/PressableWithSecondaryInteraction/types.ts
+++ b/src/components/PressableWithSecondaryInteraction/types.ts
@@ -46,12 +46,6 @@ type PressableWithSecondaryInteractionProps = PressableWithFeedbackProps & {
      */
     opacityAnimationDuration?: number;
 
-    /**
-     * The duration of the dimming animation
-     * @default variables.dimAnimationDuration
-     */
-    dimAnimationDuration?: number;
-
     /** Used to apply styles to the Pressable */
     style?: ParsableStyle;
 

From 476daa9880928cf514c3b6c302ee6ce8e2059159 Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <jakub.piasecki@swmansion.com>
Date: Mon, 16 Sep 2024 15:55:34 +0200
Subject: [PATCH 120/132] Update patch

---
 patches/react-native-haptic-feedback+2.3.1.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/patches/react-native-haptic-feedback+2.3.1.patch b/patches/react-native-haptic-feedback+2.3.1.patch
index 342b20863995..799bdaf7e53e 100644
--- a/patches/react-native-haptic-feedback+2.3.1.patch
+++ b/patches/react-native-haptic-feedback+2.3.1.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
-index c1498b9..1a3afb7 100644
+index c1498b9..250df1f 100644
 --- a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
 +++ b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
 @@ -1,5 +1,5 @@
@@ -31,10 +31,10 @@ index 6f0f81d..0000000
 -
 -@end
 diff --git a/node_modules/react-native-haptic-feedback/package.json b/node_modules/react-native-haptic-feedback/package.json
-index 86dfaa4..b6d4d97 100644
+index 86dfaa4..9cec8e4 100644
 --- a/node_modules/react-native-haptic-feedback/package.json
 +++ b/node_modules/react-native-haptic-feedback/package.json
-@@ -6,18 +6,6 @@
+@@ -6,18 +6,7 @@
    "source": "src/index.ts",
    "main": "./lib/commonjs/index.js",
    "module": "./lib/module/index.js",
@@ -50,6 +50,7 @@ index 86dfaa4..b6d4d97 100644
 -      }
 -    }
 -  },
++  "types": "./lib/typescript/module/src/index.d.ts",
    "scripts": {
      "typecheck": "tsc --noEmit --project tsconfig.test.json",
      "test": "jest",

From 11a19edef3dc0c3c581ee978d068e2b5bcdd4e53 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Mon, 16 Sep 2024 16:14:42 +0200
Subject: [PATCH 121/132] Revert "Fix onboarding modal that flashes for user
 transitioning from OldDot"

This reverts commit 46960fdc80e1c1d8fc8b18ef9251a39c68b2f2cb.
---
 src/libs/actions/Report.ts                      | 11 +++++++++++
 src/libs/hasCompletedGuidedSetupFlowSelector.ts |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index c70e9b271537..40a7059b54b9 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -57,6 +57,7 @@ import {prepareDraftComment} from '@libs/DraftCommentUtils';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import * as Environment from '@libs/Environment/Environment';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import hasCompletedGuidedSetupFlowSelector from '@libs/hasCompletedGuidedSetupFlowSelector';
 import HttpUtils from '@libs/HttpUtils';
 import isPublicScreenRoute from '@libs/isPublicScreenRoute';
 import * as Localize from '@libs/Localize';
@@ -109,6 +110,7 @@ import * as Modal from './Modal';
 import navigateFromNotification from './navigateFromNotification';
 import * as Session from './Session';
 import * as Welcome from './Welcome';
+import * as OnboardingFlow from './Welcome/OnboardingFlow';
 
 type SubscriberCallback = (isFromCurrentUser: boolean, reportActionID: string | undefined) => void;
 
@@ -2688,6 +2690,15 @@ function openReportFromDeepLink(url: string) {
 
                         const state = navigationRef.getRootState();
                         const currentFocusedRoute = findFocusedRoute(state);
+                        const hasCompletedGuidedSetupFlow = hasCompletedGuidedSetupFlowSelector(onboarding);
+
+                        // We need skip deeplinking if the user hasn't completed the guided setup flow.
+                        if (!hasCompletedGuidedSetupFlow) {
+                            Welcome.isOnboardingFlowCompleted({
+                                onNotCompleted: () => OnboardingFlow.startOnboardingFlow(),
+                            });
+                            return;
+                        }
 
                         if (isOnboardingFlowName(currentFocusedRoute?.name)) {
                             Welcome.setOnboardingErrorMessage(Localize.translateLocal('onboarding.purpose.errorBackButton'));
diff --git a/src/libs/hasCompletedGuidedSetupFlowSelector.ts b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
index 4934c83d7773..83cde0a0be8c 100644
--- a/src/libs/hasCompletedGuidedSetupFlowSelector.ts
+++ b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
@@ -6,8 +6,7 @@ function hasCompletedGuidedSetupFlowSelector(onboarding: OnyxValue<typeof ONYXKE
     if (Array.isArray(onboarding)) {
         return true;
     }
-
-    return onboarding?.hasCompletedGuidedSetupFlow ?? true;
+    return onboarding?.hasCompletedGuidedSetupFlow ?? false;
 }
 
 export default hasCompletedGuidedSetupFlowSelector;

From 8c510c027593e628abe83a52d8fb8179389093f6 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Mon, 16 Sep 2024 16:15:06 +0200
Subject: [PATCH 122/132] Change the default value to true

---
 src/libs/hasCompletedGuidedSetupFlowSelector.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/hasCompletedGuidedSetupFlowSelector.ts b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
index 83cde0a0be8c..4934c83d7773 100644
--- a/src/libs/hasCompletedGuidedSetupFlowSelector.ts
+++ b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
@@ -6,7 +6,8 @@ function hasCompletedGuidedSetupFlowSelector(onboarding: OnyxValue<typeof ONYXKE
     if (Array.isArray(onboarding)) {
         return true;
     }
-    return onboarding?.hasCompletedGuidedSetupFlow ?? false;
+
+    return onboarding?.hasCompletedGuidedSetupFlow ?? true;
 }
 
 export default hasCompletedGuidedSetupFlowSelector;

From 9be3a06779ff756ad53912e01a2a5fc981e5c1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Mon, 16 Sep 2024 16:20:30 +0100
Subject: [PATCH 123/132] Bump Onyx to v2.0.68

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

diff --git a/package-lock.json b/package-lock.json
index 2271cc6d6692..02078cd354e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,7 +95,7 @@
         "react-native-launch-arguments": "^4.0.2",
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
-        "react-native-onyx": "2.0.66",
+        "react-native-onyx": "2.0.68",
         "react-native-pager-view": "6.4.1",
         "react-native-pdf": "6.7.5",
         "react-native-performance": "^5.1.0",
@@ -36646,9 +36646,9 @@
       }
     },
     "node_modules/react-native-onyx": {
-      "version": "2.0.66",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.66.tgz",
-      "integrity": "sha512-Ns9WzcAjarAUl9g/bftf2EUJYdgcb6BAraxwqBWVeGWk3dGBR1hVEvZ7p/3rpKjidJQqiM3LWBaM6DkNHoYd1g==",
+      "version": "2.0.68",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.68.tgz",
+      "integrity": "sha512-KzcG8r6oIHRZhtiGu2XtHwYLm6eTp74r4NyhIawinfJEgcd1YMC6KdrVMqd1J7zFLTuBXPhtjiugTbUhXraFag==",
       "dependencies": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
diff --git a/package.json b/package.json
index bf7df2e8576a..bee2887c942e 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "react-native-launch-arguments": "^4.0.2",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "2.0.66",
+    "react-native-onyx": "2.0.68",
     "react-native-pager-view": "6.4.1",
     "react-native-pdf": "6.7.5",
     "react-native-performance": "^5.1.0",

From b09f94ed8e5214585f98b9a2d34d3022ad887ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Mon, 16 Sep 2024 16:24:07 +0100
Subject: [PATCH 124/132] Revert #49173

---
 src/libs/CardUtils.ts                         | 20 -------------------
 .../workspace/WorkspaceMoreFeaturesPage.tsx   |  4 ++--
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index 58dbc07aae8d..a317fccda550 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -27,14 +27,6 @@ Onyx.connect({
     },
 });
 
-let allCardsLists: OnyxCollection<WorkspaceCardsList>;
-
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST,
-    waitForCollectionCallback: true,
-    callback: (value) => (allCardsLists = value),
-});
-
 /**
  * @returns string with a month in MM format
  */
@@ -203,17 +195,6 @@ function getCardFeedIcon(cardFeed: string): IconAsset {
     return Illustrations.AmexCompanyCards;
 }
 
-/** Checks if the Expensify Card toggle should be disabled */
-function shouldExpensifyCardToggleBeDisabled(workspaceAccountID?: number, areExpensifyCardsEnabled?: boolean): boolean {
-    if (!areExpensifyCardsEnabled || !workspaceAccountID) {
-        return false;
-    }
-
-    const cardsList = allCardsLists?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`];
-
-    return !isEmptyObject(cardsList);
-}
-
 function getCardDetailsImage(cardFeed: string): IconAsset {
     if (cardFeed.startsWith(CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD)) {
         return Illustrations.MasterCardCompanyCardDetail;
@@ -262,7 +243,6 @@ export {
     getEligibleBankAccountsForCard,
     sortCardsByCardholderName,
     getCardFeedIcon,
-    shouldExpensifyCardToggleBeDisabled,
     getCardDetailsImage,
     getMemberCards,
 };
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index bd6f9ce158f3..0182f1ea8827 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -15,7 +15,6 @@ import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as CardUtils from '@libs/CardUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
@@ -72,6 +71,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         !!policy?.connections?.netsuite?.options?.config?.syncOptions?.syncTax;
     const policyID = policy?.id;
     const workspaceAccountID = policy?.workspaceAccountID ?? -1;
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID.toString()}_${CONST.EXPENSIFY_CARD.BANK}`);
     const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID.toString()}`);
     const [isOrganizeWarningModalOpen, setIsOrganizeWarningModalOpen] = useState(false);
     const [isIntegrateWarningModalOpen, setIsIntegrateWarningModalOpen] = useState(false);
@@ -110,7 +110,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             subtitleTranslationKey: 'workspace.moreFeatures.expensifyCard.subtitle',
             isActive: policy?.areExpensifyCardsEnabled ?? false,
             pendingAction: policy?.pendingFields?.areExpensifyCardsEnabled,
-            disabled: CardUtils.shouldExpensifyCardToggleBeDisabled(policy?.workspaceAccountID, policy?.areExpensifyCardsEnabled),
+            disabled: !isEmptyObject(cardsList),
             action: (isEnabled: boolean) => {
                 if (!policyID) {
                     return;

From 568467c8c29273233702c2566ce89677c99efa3f Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Mon, 16 Sep 2024 18:02:41 +0000
Subject: [PATCH 125/132] Update version to 9.0.36-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 19c634a10df8..06c990e279c0 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 1009003507
-        versionName "9.0.35-7"
+        versionCode 1009003600
+        versionName "9.0.36-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 11f5430c3519..57c9164f9404 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.35</string>
+	<string>9.0.36</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.7</string>
+	<string>9.0.36.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 8d3815a7990f..251a41528e88 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.35</string>
+	<string>9.0.36</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.7</string>
+	<string>9.0.36.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index f52205db454a..cba99258a068 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.35</string>
+	<string>9.0.36</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.35.7</string>
+	<string>9.0.36.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index dac93726d489..ecbe0a53fce4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-7",
+  "version": "9.0.36-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.35-7",
+      "version": "9.0.36-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index d5956c471a41..f42323ca8091 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.35-7",
+  "version": "9.0.36-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 531349e7beffc66a237c6b5325801cc121b57fe1 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Mon, 16 Sep 2024 21:39:30 +0300
Subject: [PATCH 126/132] move to correct hub

---
 .../{integrations/HR-integrations => connections}/Deel.md         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/articles/expensify-classic/{integrations/HR-integrations => connections}/Deel.md (100%)

diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Deel.md b/docs/articles/expensify-classic/connections/Deel.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/Deel.md
rename to docs/articles/expensify-classic/connections/Deel.md

From 2e5684ebf8152cdcff3ac9d2b55bb93562d99daf Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Mon, 16 Sep 2024 19:53:31 +0000
Subject: [PATCH 127/132] Update version to 9.0.36-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 06c990e279c0..7634aea8f5f9 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 1009003600
-        versionName "9.0.36-0"
+        versionCode 1009003601
+        versionName "9.0.36-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 57c9164f9404..717ffc789054 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.36.0</string>
+	<string>9.0.36.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 251a41528e88..ee36b22be568 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.36.0</string>
+	<string>9.0.36.1</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index cba99258a068..39dbe2194b38 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.36</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.36.0</string>
+	<string>9.0.36.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index ecbe0a53fce4..85c6fc1d0a45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.36-0",
+  "version": "9.0.36-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.36-0",
+      "version": "9.0.36-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index aa59a02d35a8..8c0da62cc548 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.36-0",
+  "version": "9.0.36-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 725eb9709c04b01b0af843074c7f11df580501dc Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 16 Sep 2024 10:31:08 -1000
Subject: [PATCH 128/132] Fix typo

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

diff --git a/src/CONST.ts b/src/CONST.ts
index 9ebf45add8a7..77edb3cc4399 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4622,7 +4622,7 @@ const CONST = {
                     description: ({workspaceMoreFeaturesLink}) =>
                         'Tags can be used if you want more details with every expense. Use tags for projects, clients, locations, departments, and more. If you need multiple levels of tags you can upgrade to a control plan.\n' +
                         '\n' +
-                        '*Here’s how to setup tags:*\n' +
+                        '*Here’s how to set up tags:*\n' +
                         '\n' +
                         '1. Click your profile picture.\n' +
                         '2. Go to Workspaces.\n' +

From f2a4b87675eccb73c143c8b217a90884bc3ff3d9 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 17 Sep 2024 08:02:15 +0900
Subject: [PATCH 129/132] rm deprecated const

---
 src/CONST.ts                    | 64 ---------------------------------
 src/components/Button/index.tsx |  4 +--
 2 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 86cbd4c28fc9..c869aafe441e 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4038,70 +4038,6 @@ const CONST = {
         EXPENSIFY_LOGO_MARGIN_RATIO: 0.03,
     },
 
-    /**
-     * Acceptable values for the `accessibilityRole` prop on react native components.
-     *
-     * **IMPORTANT:** Do not use with the `role` prop as it can cause errors.
-     *
-     * @deprecated ACCESSIBILITY_ROLE is deprecated. Please use CONST.ROLE instead.
-     */
-    ACCESSIBILITY_ROLE: {
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        BUTTON: 'button',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        LINK: 'link',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        MENUITEM: 'menuitem',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        TEXT: 'text',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        RADIO: 'radio',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        IMAGEBUTTON: 'imagebutton',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        CHECKBOX: 'checkbox',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        SWITCH: 'switch',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        ADJUSTABLE: 'adjustable',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        IMAGE: 'image',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        TEXTBOX: 'textbox',
-    },
-
     /**
      * Acceptable values for the `role` attribute on react native components.
      *
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 34710a2d897e..000445abb46d 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -143,13 +143,13 @@ type ButtonProps = Partial<ChildrenProps> & {
 
 type KeyboardShortcutComponentProps = Pick<ButtonProps, 'isDisabled' | 'isLoading' | 'onPress' | 'pressOnEnter' | 'allowBubble' | 'enterKeyEventListenerPriority'>;
 
-const accessibilityRoles: string[] = Object.values(CONST.ACCESSIBILITY_ROLE);
+const accessibilityRoles: string[] = Object.values(CONST.ROLE);
 
 function KeyboardShortcutComponent({isDisabled = false, isLoading = false, onPress = () => {}, pressOnEnter, allowBubble, enterKeyEventListenerPriority}: KeyboardShortcutComponentProps) {
     const isFocused = useIsFocused();
     const activeElementRole = useActiveElementRole();
 
-    const shouldDisableEnterShortcut = useMemo(() => accessibilityRoles.includes(activeElementRole ?? '') && activeElementRole !== CONST.ACCESSIBILITY_ROLE.TEXT, [activeElementRole]);
+    const shouldDisableEnterShortcut = useMemo(() => accessibilityRoles.includes(activeElementRole ?? ''), [activeElementRole]);
 
     const keyboardShortcutCallback = useCallback(
         (event?: GestureResponderEvent | KeyboardEvent) => {

From 1dce9acacd7ac3cfcbe31a98c96554addbad63b4 Mon Sep 17 00:00:00 2001
From: Tsaqif <tsaiinkwa@yahoo.com>
Date: Tue, 17 Sep 2024 06:59:21 +0700
Subject: [PATCH 130/132] Using fullsize avatar

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>
---
 src/pages/ReportAvatar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index 748a6866485c..b9a91705a401 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -30,7 +30,7 @@ function ReportAvatar({route}: ReportAvatarProps) {
         }
 
         return {
-            source: ReportUtils.getWorkspaceIcon(report).source,
+            source: UserUtils.getFullSizeAvatar(ReportUtils.getWorkspaceIcon(report).source, 0),
             headerTitle: ReportUtils.getPolicyName(report, false, policy),
             // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
             originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID ?? '',

From db3083222f226f66e90ee79112326e121bd2d00d Mon Sep 17 00:00:00 2001
From: Robert Chen <robert@expensify.com>
Date: Tue, 17 Sep 2024 09:13:25 +0800
Subject: [PATCH 131/132] style

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

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 81ce57f2d788..f6010246b068 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -7225,7 +7225,10 @@ function getNonHeldAndFullAmount(iouReport: OnyxEntry<Report>, policy: OnyxEntry
     if (hasUpdatedTotal(iouReport, policy) && hasPendingTransaction) {
         const unheldTotal = reportTransactions.reduce((currentVal, transaction) => currentVal + (!TransactionUtils.isOnHold(transaction) ? transaction.amount : 0), 0);
 
-        return [CurrencyUtils.convertToDisplayString(unheldTotal * coefficient, iouReport?.currency), CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency)];
+        return [
+            CurrencyUtils.convertToDisplayString(unheldTotal * coefficient, iouReport?.currency),
+            CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency)
+        ];
     }
 
     return [

From 4a2ed86789eb9075a8d6d6594927e45b53b10621 Mon Sep 17 00:00:00 2001
From: Robert Chen <robert@expensify.com>
Date: Tue, 17 Sep 2024 09:32:06 +0800
Subject: [PATCH 132/132] style,

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

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 71b414aa9304..d89f81ee81a0 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -7223,7 +7223,7 @@ function getNonHeldAndFullAmount(iouReport: OnyxEntry<Report>, policy: OnyxEntry
 
         return [
             CurrencyUtils.convertToDisplayString(unheldTotal * coefficient, iouReport?.currency),
-            CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency)
+            CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency),
         ];
     }