From 58833a1c59977079b34c594f6f178962c5d0b661 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Sun, 11 Aug 2024 17:42:22 +0300
Subject: [PATCH 001/100] rm padding from nested list

---
 docs/_sass/_main.scss                                     | 8 ++++++++
 .../Add-Expensify-Card-to-Apple-or-Google-Pay.md          | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index 82446fe08b3a..2b8627921958 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -374,6 +374,14 @@ button {
             }
         }
 
+        ol {
+            li {
+                ul {
+                    padding-bottom: 0;
+                }
+            }
+        }
+
         table {
             margin-bottom: 20px;
             border-radius: 8px;
diff --git a/docs/articles/new-expensify/expensify-card/Add-Expensify-Card-to-Apple-or-Google-Pay.md b/docs/articles/new-expensify/expensify-card/Add-Expensify-Card-to-Apple-or-Google-Pay.md
index 844a688e0011..3c147e33517b 100644
--- a/docs/articles/new-expensify/expensify-card/Add-Expensify-Card-to-Apple-or-Google-Pay.md
+++ b/docs/articles/new-expensify/expensify-card/Add-Expensify-Card-to-Apple-or-Google-Pay.md
@@ -9,7 +9,7 @@ You can use your Expensify Card for contactless in-person payments by adding it
 {% include selector.html values="mobile" %}
 
 {% include option.html value="mobile" %}
-**Apple Pay**
+### Apple Pay
 
 1. Open the Apple Pay app.
 2. Tap the + button.
@@ -17,7 +17,7 @@ You can use your Expensify Card for contactless in-person payments by adding it
 4. Tap **Continue**.
 5. Follow the steps provided to add your virtual card.
 
-**Google Pay**
+### Google Pay
 
 1. Open the Google Pay app.
 2. Tap **Add to Wallet**.

From 6e03be685267d8b52b4b9974f0d48733bcf7371a Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Sun, 11 Aug 2024 18:04:23 +0300
Subject: [PATCH 002/100] add 4px padding to li

---
 docs/_sass/_main.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index 2b8627921958..2d87df80a13d 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -374,6 +374,10 @@ button {
             }
         }
 
+        li {
+            padding-bottom: 4px;
+        }
+
         ol {
             li {
                 ul {

From d31cc9cc4446bddcd08c080faf1d6e03c51b3dce Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Fri, 18 Oct 2024 00:49:32 +0530
Subject: [PATCH 003/100] fix: update navigation for qab

---
 .../FloatingActionButtonAndPopover.tsx        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index a49b474b185e..700c2d5ad021 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -248,37 +248,37 @@ function FloatingActionButtonAndPopover(
 
         switch (quickAction?.action) {
             case CONST.QUICK_ACTIONS.REQUEST_MANUAL:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, undefined, true), true);
                 return;
             case CONST.QUICK_ACTIONS.REQUEST_SCAN:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, true), true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, undefined, true), true);
                 return;
             case CONST.QUICK_ACTIONS.REQUEST_DISTANCE:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.DISTANCE, true), true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, undefined, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SPLIT_MANUAL:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, undefined, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SPLIT_SCAN:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, true), true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, undefined, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SPLIT_DISTANCE:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.DISTANCE, false), true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, undefined, false), true);
                 return;
             case CONST.QUICK_ACTIONS.SEND_MONEY:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.PAY, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), false);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.PAY, quickActionReportID, undefined, true), false);
                 return;
             case CONST.QUICK_ACTIONS.ASSIGN_TASK:
                 selectOption(() => Task.startOutCreateTaskQuickAction(isValidReport ? quickActionReportID : '', quickAction.targetAccountID ?? -1), false);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_MANUAL:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), false);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, undefined, true), false);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_SCAN:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, true), false);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, undefined, true), false);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_DISTANCE:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, CONST.IOU.REQUEST_TYPE.DISTANCE, true), false);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, undefined, true), false);
                 break;
             default:
         }

From d726dcbfa13d8c8f1c0fe4177561dba2ce9b1a7a Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 15:51:19 -0600
Subject: [PATCH 004/100] add consts

---
 src/CONST.ts                                       | 3 +++
 src/components/SelectionList/Search/ActionCell.tsx | 3 +++
 src/libs/SearchUIUtils.ts                          | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/CONST.ts b/src/CONST.ts
index a3df980ff5dd..f5441e6f942d 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5644,6 +5644,9 @@ const CONST = {
         ACTION_TYPES: {
             VIEW: 'view',
             REVIEW: 'review',
+            SUBMIT: 'submit',
+            APPROVE: 'approve',
+            PAY: 'pay',
             DONE: 'done',
             PAID: 'paid',
         },
diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index faafa6159dc1..57db7e7d7969 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -15,6 +15,9 @@ import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
 const actionTranslationsMap: Record<SearchTransactionAction, TranslationPaths> = {
     view: 'common.view',
     review: 'common.review',
+    submit: 'common.submit',
+    approve: 'iou.approve',
+    pay: 'iou.pay',
     done: 'common.done',
     paid: 'iou.settledExpensify',
 };
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index a7ce065a6d23..ed865d6eac2d 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -223,6 +223,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
 
             return {
                 ...transactionItem,
+                action: 'submit',
                 from,
                 to,
                 formattedFrom,

From 2f4c9802966b65fc23163394222aaf8231216707 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 16:26:25 -0600
Subject: [PATCH 005/100] create getAction

---
 src/libs/SearchUIUtils.ts | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index ed865d6eac2d..7ce8cfb44c0a 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -4,6 +4,7 @@ import ChatListItem from '@components/SelectionList/ChatListItem';
 import ReportListItem from '@components/SelectionList/Search/ReportListItem';
 import TransactionListItem from '@components/SelectionList/Search/TransactionListItem';
 import type {ListItem, ReportActionListItemType, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
+import * as IOU from '@libs/actions/IOU';
 import * as Expensicons from '@src/components/Icon/Expensicons';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -11,7 +12,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
-import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction} from '@src/types/onyx/SearchResults';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {translateLocal} from './Localize';
@@ -223,7 +224,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
 
             return {
                 ...transactionItem,
-                action: 'submit',
+                action: getAction(data, key),
                 from,
                 to,
                 formattedFrom,
@@ -241,6 +242,35 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
         });
 }
 
+/**
+ * @private
+ * Returns the action that can be taken on a given transaction or report
+ *
+ * Do not use directly, use only via `getSections()` facade.
+ */
+function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTransactionAction {
+    if (!isTransactionEntry(key) && !isReportEntry(key)) {
+        return CONST.SEARCH.ACTION_TYPES.VIEW;
+    }
+
+    return CONST.SEARCH.ACTION_TYPES.VIEW;
+
+    // const report = isReportEntry(key) ? data[key] : data[data[key].reportID];
+    // const chatReport = isReportEntry(key) ? data[key].chatReportID
+    // iouReport
+    // chatReport
+    // policy
+    // transactions
+    // if (IOU.canIOUBePaid()) {
+    // pay
+    // approve
+    // submit
+    // review
+    // view
+    // done
+    // paid
+}
+
 /**
  * @private
  * Organizes data into List Sections for display, for the ReportActionListItemType of Search Results.

From 584a539d4ad69b2dc000765d87178a659931f264 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 16:49:39 -0600
Subject: [PATCH 006/100] create canReportBeSubmitted

---
 .../SelectionList/Search/ActionCell.tsx       |  4 +--
 src/libs/SearchUIUtils.ts                     | 26 +++++++++++++------
 src/libs/actions/IOU.ts                       | 21 +++++++++++++++
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index 57db7e7d7969..612f515791c0 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -80,7 +80,7 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
         ) : null;
     }
 
-    if (action === CONST.SEARCH.ACTION_TYPES.REVIEW) {
+    // if (action === CONST.SEARCH.ACTION_TYPES.REVIEW) {
         return (
             <Button
                 text={text}
@@ -90,7 +90,7 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
                 innerStyles={buttonInnerStyles}
             />
         );
-    }
+    // }
 }
 
 ActionCell.displayName = 'ActionCell';
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 7ce8cfb44c0a..831ef1f49285 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -253,15 +253,23 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
         return CONST.SEARCH.ACTION_TYPES.VIEW;
     }
 
-    return CONST.SEARCH.ACTION_TYPES.VIEW;
+    if (isTransactionEntry(key) && !data[key].isFromOneTransactionReport) {
+        return CONST.SEARCH.ACTION_TYPES.VIEW;
+    }
 
-    // const report = isReportEntry(key) ? data[key] : data[data[key].reportID];
-    // const chatReport = isReportEntry(key) ? data[key].chatReportID
-    // iouReport
-    // chatReport
-    // policy
-    // transactions
-    // if (IOU.canIOUBePaid()) {
+    const transaction = isTransactionEntry(key) ? data[key] : {};
+    const report = isTransactionEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`] : data[key] ?? {};
+    const chatReport = chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`] ?? {};
+    const policy = data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.policyID}`] ?? {};
+    const allTransaction = isTransactionEntry(key) ? transaction : report.transactions;
+
+    if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
+        return CONST.SEARCH.ACTION_TYPES.PAY;
+    }
+
+    if (IOU.canApproveIOU(report, policy)) {
+        return CONST.SEARCH.ACTION_TYPES.APPROVE;
+    }
     // pay
     // approve
     // submit
@@ -269,6 +277,8 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
     // view
     // done
     // paid
+
+    return CONST.SEARCH.ACTION_TYPES.VIEW;
 }
 
 /**
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 7ce9b9dfb272..6a79625cf55f 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7104,6 +7104,26 @@ function canIOUBePaid(
     );
 }
 
+function canReportBeSubmitted(
+    moneyRequestReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
+    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
+    currentUserAccountID: number,
+    transaction?: OnyxTypes.Transaction,
+) {
+    const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
+    const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);
+    const hasAllPendingRTERViolations = TransactionUtils.allHavePendingRTERViolation([transaction?.transactionID ?? '-1']);
+    const shouldShowBrokenConnectionViolation = TransactionUtils.shouldShowBrokenConnectionViolation(transaction?.transactionID ?? '-1', moneyRequestReport, policy);
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+
+   return !!moneyRequestReport &&
+    isDraft &&
+    reimbursableSpend !== 0 &&
+    !hasAllPendingRTERViolations &&
+    !shouldShowBrokenConnectionViolation &&
+    (moneyRequestReport?.ownerAccountID === currentUserAccountID || isAdmin || moneyRequestReport?.managerID === currentUserAccountID);
+}
+
 function getIOUReportActionToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report>, excludedIOUReportID: string): OnyxEntry<ReportAction> {
     const chatReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`] ?? {};
 
@@ -8615,5 +8635,6 @@ export {
     updateLastLocationPermissionPrompt,
     resolveDuplicates,
     getIOUReportActionToApproveOrPay,
+    canReportBeSubmitted,
 };
 export type {GPSPoint as GpsPoint, IOURequestType};

From 7724e84475d3fce8ca012b558498baedd0abd695 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 16:50:47 -0600
Subject: [PATCH 007/100] fix lint

---
 .../SelectionList/Search/ActionCell.tsx        | 18 +++++++++---------
 src/libs/SearchUIUtils.ts                      |  2 +-
 src/libs/actions/IOU.ts                        | 14 ++++++++------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index 612f515791c0..275767ba6b68 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -81,15 +81,15 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
     }
 
     // if (action === CONST.SEARCH.ACTION_TYPES.REVIEW) {
-        return (
-            <Button
-                text={text}
-                onPress={goToItem}
-                small
-                style={[styles.w100]}
-                innerStyles={buttonInnerStyles}
-            />
-        );
+    return (
+        <Button
+            text={text}
+            onPress={goToItem}
+            small
+            style={[styles.w100]}
+            innerStyles={buttonInnerStyles}
+        />
+    );
     // }
 }
 
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 831ef1f49285..05b17488bbf3 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -259,7 +259,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
 
     const transaction = isTransactionEntry(key) ? data[key] : {};
     const report = isTransactionEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`] : data[key] ?? {};
-    const chatReport = chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`] ?? {};
+    const chatReport = (chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`] ?? {});
     const policy = data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.policyID}`] ?? {};
     const allTransaction = isTransactionEntry(key) ? transaction : report.transactions;
 
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 6a79625cf55f..0a07184c0852 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7116,12 +7116,14 @@ function canReportBeSubmitted(
     const shouldShowBrokenConnectionViolation = TransactionUtils.shouldShowBrokenConnectionViolation(transaction?.transactionID ?? '-1', moneyRequestReport, policy);
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
 
-   return !!moneyRequestReport &&
-    isDraft &&
-    reimbursableSpend !== 0 &&
-    !hasAllPendingRTERViolations &&
-    !shouldShowBrokenConnectionViolation &&
-    (moneyRequestReport?.ownerAccountID === currentUserAccountID || isAdmin || moneyRequestReport?.managerID === currentUserAccountID);
+    return (
+        !!moneyRequestReport &&
+        isDraft &&
+        reimbursableSpend !== 0 &&
+        !hasAllPendingRTERViolations &&
+        !shouldShowBrokenConnectionViolation &&
+        (moneyRequestReport?.ownerAccountID === currentUserAccountID || isAdmin || moneyRequestReport?.managerID === currentUserAccountID)
+    );
 }
 
 function getIOUReportActionToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report>, excludedIOUReportID: string): OnyxEntry<ReportAction> {

From def5f27bdb496494e8bfce99a0f8b78df6b6ed99 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 17:08:27 -0600
Subject: [PATCH 008/100] add more logic

---
 src/libs/SearchUIUtils.ts | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 05b17488bbf3..efdbf2a41d58 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -4,7 +4,6 @@ import ChatListItem from '@components/SelectionList/ChatListItem';
 import ReportListItem from '@components/SelectionList/Search/ReportListItem';
 import TransactionListItem from '@components/SelectionList/Search/TransactionListItem';
 import type {ListItem, ReportActionListItemType, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
-import * as IOU from '@libs/actions/IOU';
 import * as Expensicons from '@src/components/Icon/Expensicons';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -13,11 +12,13 @@ import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction} from '@src/types/onyx/SearchResults';
+import * as IOU from './actions/IOU';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {translateLocal} from './Localize';
 import Navigation from './Navigation/Navigation';
 import * as ReportActionsUtils from './ReportActionsUtils';
+import * as ReportUtils from './ReportUtils';
 import * as TransactionUtils from './TransactionUtils';
 
 const columnNamesToSortingProperty = {
@@ -258,10 +259,20 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
     }
 
     const transaction = isTransactionEntry(key) ? data[key] : {};
-    const report = isTransactionEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`] : data[key] ?? {};
-    const chatReport = (chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`] ?? {});
+    const report = isTransactionEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`] ?? {} : data[key] ?? {};
+    const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`] ?? {};
     const policy = data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.policyID}`] ?? {};
-    const allTransaction = isTransactionEntry(key) ? transaction : report.transactions;
+    const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
+    const allViolations = Object.keys(data).filter(item => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
+    const allTransactions = isTransactionEntry(key) ? transaction : Object.keys(data).filter(item => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) ?? {};
+
+    if (ReportUtils.isSettled(report.reportID)) {
+        return CONST.SEARCH.ACTION_TYPES.PAID;
+    }
+
+    if (ReportUtils.isSettled(report.reportID)) {
+        return CONST.SEARCH.ACTION_TYPES.DONE;
+    }
 
     if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
         return CONST.SEARCH.ACTION_TYPES.PAY;
@@ -270,13 +281,15 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
     if (IOU.canApproveIOU(report, policy)) {
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
-    // pay
-    // approve
-    // submit
-    // review
-    // view
-    // done
-    // paid
+
+    if (IOU.canReportBeSubmitted(report, policy, 1, transaction)) {
+        return CONST.SEARCH.ACTION_TYPES.SUBMIT;
+    }
+
+    const hasViolations = isTransactionEntry(key) ? TransactionUtils.hasViolation(transaction.transactionID, violations) : ReportUtils.hasViolations(report.reportID, allViolations);
+    if (hasViolations) {
+        return CONST.SEARCH.ACTION_TYPES.REVIEW;
+    }
 
     return CONST.SEARCH.ACTION_TYPES.VIEW;
 }

From 2822472217d3d7db82a4adc35dd3b241a830a6f0 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 17:17:09 -0600
Subject: [PATCH 009/100] fix some ts

---
 src/libs/SearchUIUtils.ts | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index efdbf2a41d58..d105ece30656 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -13,6 +13,7 @@ import type * as OnyxTypes from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
+import * as Report from './actions/Report';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {translateLocal} from './Localize';
@@ -213,6 +214,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
     const shouldShowMerchant = getShouldShowMerchant(data);
 
     const doesDataContainAPastYearTransaction = shouldShowYear(data);
+    const currentUserAccountID = Report.getCurrentUserAccountID();
 
     return Object.keys(data)
         .filter(isTransactionEntry)
@@ -225,7 +227,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
 
             return {
                 ...transactionItem,
-                action: getAction(data, key),
+                action: getAction(data, key, currentUserAccountID),
                 from,
                 to,
                 formattedFrom,
@@ -249,7 +251,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
  *
  * Do not use directly, use only via `getSections()` facade.
  */
-function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTransactionAction {
+function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUserAccountID: number): SearchTransactionAction {
     if (!isTransactionEntry(key) && !isReportEntry(key)) {
         return CONST.SEARCH.ACTION_TYPES.VIEW;
     }
@@ -258,18 +260,20 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
         return CONST.SEARCH.ACTION_TYPES.VIEW;
     }
 
-    const transaction = isTransactionEntry(key) ? data[key] : {};
-    const report = isTransactionEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`] ?? {} : data[key] ?? {};
-    const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`] ?? {};
-    const policy = data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.policyID}`] ?? {};
+    const transaction = isTransactionEntry(key) ? data[key] : null;
+    const report = transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
+    const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`] ?? {};
+    const policy = data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.policyID}`] ?? {};
     const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
-    const allViolations = Object.keys(data).filter(item => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
-    const allTransactions = isTransactionEntry(key) ? transaction : Object.keys(data).filter(item => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) ?? {};
+    const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
+    const allTransactions = isTransactionEntry(key) ? transaction : Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) ?? {};
 
+    // TODO: update isSettled to take report object instead of connect to Onyx
     if (ReportUtils.isSettled(report.reportID)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
     }
 
+    // TODO: create function to determine if report is done
     if (ReportUtils.isSettled(report.reportID)) {
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
@@ -282,7 +286,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
 
-    if (IOU.canReportBeSubmitted(report, policy, 1, transaction)) {
+    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
         return CONST.SEARCH.ACTION_TYPES.SUBMIT;
     }
 

From 89b9c6b8f36999268b0997d8d98af4063e8dbc17 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 17:24:00 -0600
Subject: [PATCH 010/100] add types

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

diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 98e3aa66fa00..886f6a00a0d6 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -107,6 +107,40 @@ type SearchReport = {
 
     /** The action that can be performed for the report */
     action?: SearchTransactionAction;
+
+    /** The type of chat if this is a chat report */
+    chatType?: ValueOf<typeof CONST.REPORT.CHAT_TYPE>;
+
+    /** Invoice room receiver data */
+    invoiceReceiver?: Record<string, string>;
+
+    /** Whether the report has a single transaction */
+    isOneTransactionReport?: boolean;
+
+    /** Whether the report is policyExpenseChat */
+    isPolicyExpenseChat?: boolean;
+
+    /** Whether the report is waiting on a bank account */
+    isWaitingOnBankAccount?: boolean;
+
+    /** If the report contains nonreimbursable expenses, send the nonreimbursable total */
+    nonReimbursableTotal?: number;
+
+    /** Account ID of the report owner */
+    ownerAccountID?: number;
+
+    /** The state that the report is currently in */
+    stateNum?: ValueOf<typeof CONST.REPORT.STATE_NUM>;
+
+    /** The status of the current report */
+    statusNum?: ValueOf<typeof CONST.REPORT.STATUS_NUM>;
+
+    /** For expense reports, this is the total amount requested */
+    unheldTotal?: number;
+
+    /** Whether the report is archived */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    private_isArchived?: string;
 };
 
 /** Model of report action search result */

From a3302a82fecd1e564e7123995506c5192749d565 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 17:34:23 -0600
Subject: [PATCH 011/100] add more types

---
 src/libs/SearchUIUtils.ts |  4 ++--
 src/libs/actions/IOU.ts   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index d105ece30656..6fdfd8233df3 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -269,12 +269,12 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     const allTransactions = isTransactionEntry(key) ? transaction : Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) ?? {};
 
     // TODO: update isSettled to take report object instead of connect to Onyx
-    if (ReportUtils.isSettled(report.reportID)) {
+    if (ReportUtils.isSettled(report?.reportID)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
     }
 
     // TODO: create function to determine if report is done
-    if (ReportUtils.isSettled(report.reportID)) {
+    if (ReportUtils.isSettled(report?.reportID)) {
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 0a07184c0852..08fccd65a426 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -66,7 +66,7 @@ import type {ErrorFields, Errors} from '@src/types/onyx/OnyxCommon';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type {OnyxData} from '@src/types/onyx/Request';
-import type {SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
 import type {Comment, Receipt, ReceiptSource, Routes, SplitShares, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as CachedPDFPaths from './CachedPDFPaths';
@@ -7016,7 +7016,7 @@ function sendMoneyWithWallet(report: OnyxEntry<OnyxTypes.Report>, amount: number
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>) {
+function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>) {
     // Only expense reports can be approved
     const isPaidGroupPolicy = policy && PolicyUtils.isPaidGroupPolicy(policy);
     if (!isPaidGroupPolicy) {
@@ -7041,8 +7041,8 @@ function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
 }
 
 function canIOUBePaid(
-    iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
-    chatReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
+    iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
+    chatReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
     policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
     transactions?: OnyxTypes.Transaction[],
     onlyShowPayElsewhere = false,
@@ -7105,7 +7105,7 @@ function canIOUBePaid(
 }
 
 function canReportBeSubmitted(
-    moneyRequestReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
+    moneyRequestReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
     policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
     currentUserAccountID: number,
     transaction?: OnyxTypes.Transaction,

From d38592d505be6e80f6c697b4557dc9e075cb2828 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 17:41:34 -0600
Subject: [PATCH 012/100] create searchpolicy type

---
 src/libs/SearchUIUtils.ts       |  2 +-
 src/types/onyx/SearchResults.ts | 50 ++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 6fdfd8233df3..97c662da0521 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -11,7 +11,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
-import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction} from '@src/types/onyx/SearchResults';
+import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction, SearchPolicy} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
 import * as Report from './actions/Report';
 import * as CurrencyUtils from './CurrencyUtils';
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 886f6a00a0d6..dda45454af00 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -176,6 +176,43 @@ type SearchReportAction = {
     reportID: string;
 };
 
+/** Model of policy search result */
+type SearchPolicy = {
+    /** The policy type */
+    type: ValueOf<typeof CONST.POLICY.TYPE>;
+
+    /** Whether the auto reporting is enabled */
+    autoReporting?: boolean;
+
+    /**
+     * The scheduled submit frequency set up on this policy.
+     * Note that manual does not exist in the DB and thus should not exist in Onyx, only as a param for the API.
+     * "manual" really means "immediate" (aka "daily") && harvesting.enabled === false
+     */
+    autoReportingFrequency?: Exclude<ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>, typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL>;
+
+    /** The approval mode set up on this policy */
+    approvalMode?: ValueOf<typeof CONST.POLICY.APPROVAL_MODE>;
+
+    /** The reimbursement choice for policy */
+    reimbursementChoice?: ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES>;
+
+    /** The maximum report total allowed to trigger auto reimbursement */
+    autoReimbursementLimit?: number;
+
+    /** The verified bank account linked to the policy */
+    achAccount?: Record<string, string>;
+
+    /** The current user's role in the policy */
+    role: ValueOf<typeof CONST.POLICY.ROLE>;
+
+    /** The employee list of the policy */
+    employeeList?: Record<string, Record<string, string>>;
+
+    /** Detailed settings for the autoReimbursement */
+    autoReimbursement?: Record<string, string>;
+};
+
 /** Model of transaction search result */
 type SearchTransaction = {
     /** The ID of the transaction */
@@ -314,4 +351,15 @@ type SearchResults = {
 
 export default SearchResults;
 
-export type {ListItemType, ListItemDataType, SearchTransaction, SearchTransactionType, SearchTransactionAction, SearchPersonalDetails, SearchDataTypes, SearchReport, SearchReportAction};
+export type {
+    ListItemType,
+    ListItemDataType,
+    SearchTransaction,
+    SearchTransactionType,
+    SearchTransactionAction,
+    SearchPersonalDetails,
+    SearchDataTypes,
+    SearchReport,
+    SearchReportAction,
+    SearchPolicy,
+};

From d7593453cf1e6dc04feaf4e0d6560db068ef567e Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 24 Oct 2024 17:44:40 -0600
Subject: [PATCH 013/100] update searchpolicy type

---
 src/libs/SearchUIUtils.ts       | 2 +-
 src/libs/actions/IOU.ts         | 8 ++++----
 src/types/onyx/SearchResults.ts | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 97c662da0521..d69b040dcc9c 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -263,7 +263,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     const transaction = isTransactionEntry(key) ? data[key] : null;
     const report = transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
     const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`] ?? {};
-    const policy = data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.policyID}`] ?? {};
+    const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${transaction?.policyID}`] ?? {};
     const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
     const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
     const allTransactions = isTransactionEntry(key) ? transaction : Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) ?? {};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 08fccd65a426..2a87e13ca3ba 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -66,7 +66,7 @@ import type {ErrorFields, Errors} from '@src/types/onyx/OnyxCommon';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type {OnyxData} from '@src/types/onyx/Request';
-import type {SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {SearchPolicy, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
 import type {Comment, Receipt, ReceiptSource, Routes, SplitShares, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as CachedPDFPaths from './CachedPDFPaths';
@@ -7016,7 +7016,7 @@ function sendMoneyWithWallet(report: OnyxEntry<OnyxTypes.Report>, amount: number
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>) {
+function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy) {
     // Only expense reports can be approved
     const isPaidGroupPolicy = policy && PolicyUtils.isPaidGroupPolicy(policy);
     if (!isPaidGroupPolicy) {
@@ -7043,7 +7043,7 @@ function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> |
 function canIOUBePaid(
     iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
     chatReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
-    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
+    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
     transactions?: OnyxTypes.Transaction[],
     onlyShowPayElsewhere = false,
 ) {
@@ -7106,7 +7106,7 @@ function canIOUBePaid(
 
 function canReportBeSubmitted(
     moneyRequestReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
-    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
+    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
     currentUserAccountID: number,
     transaction?: OnyxTypes.Transaction,
 ) {
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index dda45454af00..bd1277805932 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -343,7 +343,8 @@ type SearchResults = {
     data: PrefixedRecord<typeof ONYXKEYS.COLLECTION.TRANSACTION, SearchTransaction> &
         Record<typeof ONYXKEYS.PERSONAL_DETAILS_LIST, Record<string, SearchPersonalDetails>> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS, Record<string, SearchReportAction>> &
-        PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT, SearchReport>;
+        PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT, SearchReport> &
+        PrefixedRecord<typeof ONYXKEYS.COLLECTION.POLICY, SearchPolicy>;
 
     /** Whether search data is being fetched from server */
     isLoading?: boolean;

From aec1b7b7eb981b09c62b3d47da849057b950086e Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sat, 26 Oct 2024 00:10:39 +0530
Subject: [PATCH 014/100] refactor: deprecate withOnyx with useOnyx

---
 .../FloatingActionButtonAndPopover.tsx        | 85 +++----------------
 1 file changed, 14 insertions(+), 71 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 700c2d5ad021..983898e7eb1a 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -1,10 +1,10 @@
 import {useIsFocused as useIsFocusedOriginal, useNavigationState} from '@react-navigation/native';
 import type {ImageContentFit} from 'expo-image';
-import type {ForwardedRef, RefAttributes} from 'react';
+import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg';
 import FloatingActionButton from '@components/FloatingActionButton';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -51,33 +51,7 @@ const useIsFocused = () => {
 
 type PolicySelector = Pick<OnyxTypes.Policy, 'type' | 'role' | 'isPolicyExpenseChatEnabled' | 'pendingAction' | 'avatarURL' | 'name' | 'id' | 'areInvoicesEnabled'>;
 
-type FloatingActionButtonAndPopoverOnyxProps = {
-    /** The list of policies the user has access to. */
-    allPolicies: OnyxCollection<PolicySelector>;
-
-    /** Whether app is in loading state */
-    isLoading: OnyxEntry<boolean>;
-
-    /** Information on the last taken action to display as Quick Action */
-    quickAction: OnyxEntry<OnyxTypes.QuickAction>;
-
-    /** The report data of the quick action */
-    quickActionReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** The policy data of the quick action */
-    quickActionPolicy: OnyxEntry<OnyxTypes.Policy>;
-
-    /** The current session */
-    session: OnyxEntry<OnyxTypes.Session>;
-
-    /** Personal details of all the users */
-    personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>;
-
-    /** Has user seen track expense training interstitial */
-    hasSeenTrackTraining: OnyxEntry<boolean>;
-};
-
-type FloatingActionButtonAndPopoverProps = FloatingActionButtonAndPopoverOnyxProps & {
+type FloatingActionButtonAndPopoverProps = {
     /* Callback function when the menu is shown */
     onShowCreateMenu?: () => void;
 
@@ -161,23 +135,18 @@ const getQuickActionTitle = (action: QuickActionName): TranslationPaths => {
  * Responsible for rendering the {@link PopoverMenu}, and the accompanying
  * FAB that can open or close the menu.
  */
-function FloatingActionButtonAndPopover(
-    {
-        onHideCreateMenu,
-        onShowCreateMenu,
-        isLoading = false,
-        allPolicies,
-        quickAction,
-        quickActionReport,
-        quickActionPolicy,
-        session,
-        personalDetails,
-        hasSeenTrackTraining,
-    }: FloatingActionButtonAndPopoverProps,
-    ref: ForwardedRef<FloatingActionButtonAndPopoverRef>,
-) {
+function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: FloatingActionButtonAndPopoverProps, ref: ForwardedRef<FloatingActionButtonAndPopoverRef>) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const [isLoading] = useOnyx(ONYXKEYS.IS_LOADING_APP, {initialValue: false});
+    const [hasSeenTrackTraining] = useOnyx(ONYXKEYS.NVP_HAS_SEEN_TRACK_TRAINING);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policySelector});
+    const [quickActionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${quickAction?.chatReportID}`);
+    const [quickActionPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport?.policyID}`);
+
     const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${quickActionReport?.reportID ?? -1}`);
     const [isCreateMenuActive, setIsCreateMenuActive] = useState(false);
     const fabRef = useRef<HTMLDivElement>(null);
@@ -510,32 +479,6 @@ function FloatingActionButtonAndPopover(
 
 FloatingActionButtonAndPopover.displayName = 'FloatingActionButtonAndPopover';
 
-export default withOnyx<FloatingActionButtonAndPopoverProps & RefAttributes<FloatingActionButtonAndPopoverRef>, FloatingActionButtonAndPopoverOnyxProps>({
-    allPolicies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-        selector: policySelector,
-    },
-    isLoading: {
-        key: ONYXKEYS.IS_LOADING_APP,
-    },
-    quickAction: {
-        key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
-    },
-    quickActionReport: {
-        key: ({quickAction}) => `${ONYXKEYS.COLLECTION.REPORT}${quickAction?.chatReportID}`,
-    },
-    quickActionPolicy: {
-        key: ({quickActionReport}) => `${ONYXKEYS.COLLECTION.POLICY}${quickActionReport?.policyID}`,
-    },
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-    hasSeenTrackTraining: {
-        key: ONYXKEYS.NVP_HAS_SEEN_TRACK_TRAINING,
-    },
-})(forwardRef(FloatingActionButtonAndPopover));
+export default forwardRef(FloatingActionButtonAndPopover);
 
 export type {PolicySelector};

From 066d5b4a1299066e91813ccc7952963d6fa39243 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sat, 26 Oct 2024 00:16:55 +0530
Subject: [PATCH 015/100] fix: update the onyx selector

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

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 983898e7eb1a..2f16b4f4d68e 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -39,6 +39,7 @@ import SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {QuickActionName} from '@src/types/onyx/QuickAction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import mapOnyxCollectionItems from '@src/utils/mapOnyxCollectionItems';
 
 // On small screen we hide the search page from central pane to show the search bottom tab page with bottom tab bar.
 // We need to take this in consideration when checking if the screen is focused.
@@ -143,7 +144,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
-    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policySelector});
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: (c) => mapOnyxCollectionItems(c, policySelector)});
     const [quickActionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${quickAction?.chatReportID}`);
     const [quickActionPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${quickActionReport?.policyID}`);
 

From ad9081af3509c3c1acfd7dcc9f66f0e647437eda Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 25 Oct 2024 13:17:52 -0600
Subject: [PATCH 016/100] update button logic and styles

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

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index 275767ba6b68..d922f0a488d2 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -80,7 +80,6 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
         ) : null;
     }
 
-    // if (action === CONST.SEARCH.ACTION_TYPES.REVIEW) {
     return (
         <Button
             text={text}
@@ -88,9 +87,9 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
             small
             style={[styles.w100]}
             innerStyles={buttonInnerStyles}
+            success
         />
     );
-    // }
 }
 
 ActionCell.displayName = 'ActionCell';

From 21cf24d58af9a500ae2b993da4274d4f214f7dca Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 25 Oct 2024 15:00:48 -0600
Subject: [PATCH 017/100] use getActions in reports

---
 src/components/Search/index.tsx | 2 +-
 src/libs/SearchUIUtils.ts       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 5ff0882ea026..564621eadfa9 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -240,7 +240,7 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
                 });
             });
         }
-        setSelectedTransactions(newTransactionList, data);
+        // setSelectedTransactions(newTransactionList, data);
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [data, setSelectedTransactions]);
 
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index d69b040dcc9c..32771715dffe 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -335,6 +335,7 @@ function getReportActionsSections(data: OnyxTypes.SearchResults['data']): Report
  * Do not use directly, use only via `getSections()` facade.
  */
 function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']): ReportListItemType[] {
+    const currentUserAccountID = Report.getCurrentUserAccountID();
     const shouldShowMerchant = getShouldShowMerchant(data);
 
     const doesDataContainAPastYearTransaction = shouldShowYear(data);
@@ -366,6 +367,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
 
             const transaction = {
                 ...transactionItem,
+                action: getAction(data, key, currentUserAccountID),
                 from,
                 to,
                 formattedFrom,

From a1bcb5d798856c475233715a58fd117876c61802 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 25 Oct 2024 15:20:30 -0600
Subject: [PATCH 018/100] update isSettled

---
 src/libs/ReportUtils.ts   | 12 +++++++----
 src/libs/SearchUIUtils.ts | 43 +++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 6bc027fcc45d..891064f02eaa 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -57,6 +57,7 @@ import type {Message, ReportActions} from '@src/types/onyx/ReportAction';
 import type {Comment, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
+import type {SearchReport} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
 import * as PolicyActions from './actions/Policy/Policy';
 import * as store from './actions/ReimbursementAccount/store';
@@ -950,12 +951,15 @@ function hasParticipantInArray(report: OnyxEntry<Report>, memberAccountIDs: numb
 /**
  * Whether the Money Request report is settled
  */
-function isSettled(reportID: string | undefined): boolean {
-    const allReports = ReportConnection.getAllReports();
-    if (!allReports || !reportID) {
+function isSettled(reportOrID: OnyxEntry<Report> | SearchReport | string | undefined): boolean {
+    if (!reportOrID) {
+        return false;
+    }
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+    if (!report) {
         return false;
     }
-    const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? null;
+
     if (isEmptyObject(report) || report.isWaitingOnBankAccount) {
         return false;
     }
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 32771715dffe..67b77e953524 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -268,32 +268,31 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
     const allTransactions = isTransactionEntry(key) ? transaction : Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) ?? {};
 
-    // TODO: update isSettled to take report object instead of connect to Onyx
-    if (ReportUtils.isSettled(report?.reportID)) {
+    if (ReportUtils.isSettled(report)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
     }
 
     // TODO: create function to determine if report is done
-    if (ReportUtils.isSettled(report?.reportID)) {
-        return CONST.SEARCH.ACTION_TYPES.DONE;
-    }
-
-    if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
-        return CONST.SEARCH.ACTION_TYPES.PAY;
-    }
-
-    if (IOU.canApproveIOU(report, policy)) {
-        return CONST.SEARCH.ACTION_TYPES.APPROVE;
-    }
-
-    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
-        return CONST.SEARCH.ACTION_TYPES.SUBMIT;
-    }
-
-    const hasViolations = isTransactionEntry(key) ? TransactionUtils.hasViolation(transaction.transactionID, violations) : ReportUtils.hasViolations(report.reportID, allViolations);
-    if (hasViolations) {
-        return CONST.SEARCH.ACTION_TYPES.REVIEW;
-    }
+    // if (ReportUtils.isSettled(report?.reportID)) {
+    //     return CONST.SEARCH.ACTION_TYPES.DONE;
+    // }
+
+    // if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
+    //     return CONST.SEARCH.ACTION_TYPES.PAY;
+    // }
+
+    // if (IOU.canApproveIOU(report, policy)) {
+    //     return CONST.SEARCH.ACTION_TYPES.APPROVE;
+    // }
+
+    // if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
+    //     return CONST.SEARCH.ACTION_TYPES.SUBMIT;
+    // }
+
+    // const hasViolations = isTransactionEntry(key) ? TransactionUtils.hasViolation(transaction.transactionID, violations) : ReportUtils.hasViolations(report.reportID, allViolations);
+    // if (hasViolations) {
+    //     return CONST.SEARCH.ACTION_TYPES.REVIEW;
+    // }
 
     return CONST.SEARCH.ACTION_TYPES.VIEW;
 }

From bd272b437b9bbdef5981d76aad8c821fd3abceed Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 25 Oct 2024 15:28:24 -0600
Subject: [PATCH 019/100] add done condition

---
 src/libs/ReportUtils.ts   | 2 +-
 src/libs/SearchUIUtils.ts | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 891064f02eaa..6602a557a60a 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1452,7 +1452,7 @@ function isArchivedRoomWithID(reportID?: string) {
 /**
  * Whether the provided report is a closed report
  */
-function isClosedReport(report: OnyxEntry<Report>): boolean {
+function isClosedReport(report: OnyxEntry<Report> | SearchReport): boolean {
     return report?.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;
 }
 
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 67b77e953524..98bdae487757 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -272,10 +272,9 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.PAID;
     }
 
-    // TODO: create function to determine if report is done
-    // if (ReportUtils.isSettled(report?.reportID)) {
-    //     return CONST.SEARCH.ACTION_TYPES.DONE;
-    // }
+    if (ReportUtils.isClosedReport(report)) {
+        return CONST.SEARCH.ACTION_TYPES.DONE;
+    }
 
     // if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
     //     return CONST.SEARCH.ACTION_TYPES.PAY;

From f87db13728e7e167f4577f394c61f5ee2a1d39ba Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 25 Oct 2024 16:30:53 -0600
Subject: [PATCH 020/100] fix logic for all transactions

---
 src/libs/SearchUIUtils.ts       | 19 +++++++++++++------
 src/libs/actions/IOU.ts         |  2 +-
 src/types/onyx/SearchResults.ts |  3 +++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 98bdae487757..965fb2bc8df9 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -261,12 +261,18 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     const transaction = isTransactionEntry(key) ? data[key] : null;
-    const report = transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
+    const report = transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : (data[key] as SearchReport);
+
+    // We don't need to run the logic if this is not a transaction or iou/expense report
+    if (!ReportUtils.isMoneyRequestReport(report)) {
+        return CONST.SEARCH.ACTION_TYPES.VIEW;
+    }
+
     const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`] ?? {};
-    const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${transaction?.policyID}`] ?? {};
+    const allTransactions = Object.values(data).filter((item) => item?.transactionID && item?.reportID === report.reportID);
+    const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? {};
     const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
     const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
-    const allTransactions = isTransactionEntry(key) ? transaction : Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) ?? {};
 
     if (ReportUtils.isSettled(report)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
@@ -276,9 +282,9 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
-    // if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
-    //     return CONST.SEARCH.ACTION_TYPES.PAY;
-    // }
+    if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
+        return CONST.SEARCH.ACTION_TYPES.PAY;
+    }
 
     // if (IOU.canApproveIOU(report, policy)) {
     //     return CONST.SEARCH.ACTION_TYPES.APPROVE;
@@ -348,6 +354,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
 
             reportIDToTransactions[reportKey] = {
                 ...reportItem,
+                action: getAction(data, key, currentUserAccountID),
                 keyForList: reportItem.reportID,
                 from: data.personalDetailsList?.[reportItem.accountID ?? -1],
                 to: reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 2a87e13ca3ba..7222b40813d8 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7044,7 +7044,7 @@ function canIOUBePaid(
     iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
     chatReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
     policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
-    transactions?: OnyxTypes.Transaction[],
+    transactions?: OnyxTypes.Transaction[] | SearchTransaction[],
     onlyShowPayElsewhere = false,
 ) {
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index bd1277805932..f06224190db6 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -81,6 +81,9 @@ type SearchReport = {
     /** The ID of the report */
     reportID?: string;
 
+    /** ID of the chat report */
+    chatReportID?: string;
+
     /** The name of the report */
     reportName?: string;
 

From 1de744c5e1af6ae002deb87404ed78dc5dd7ba5b Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 25 Oct 2024 16:37:45 -0600
Subject: [PATCH 021/100] enable approve logic

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

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 965fb2bc8df9..797558b2c69c 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -286,9 +286,9 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.PAY;
     }
 
-    // if (IOU.canApproveIOU(report, policy)) {
-    //     return CONST.SEARCH.ACTION_TYPES.APPROVE;
-    // }
+    if (IOU.canApproveIOU(report, policy)) {
+        return CONST.SEARCH.ACTION_TYPES.APPROVE;
+    }
 
     // if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
     //     return CONST.SEARCH.ACTION_TYPES.SUBMIT;

From 53421fc65108bb126df01b925aab04d31d629853 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 25 Oct 2024 16:43:42 -0600
Subject: [PATCH 022/100] refactor code

---
 src/libs/SearchUIUtils.ts | 7 ++++---
 src/libs/actions/IOU.ts   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 797558b2c69c..1107e2c79d7a 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -290,9 +290,10 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
 
-    // if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
-    //     return CONST.SEARCH.ACTION_TYPES.SUBMIT;
-    // }
+    // TODO: update allHavePendingRTERViolation to take in array of transactions
+    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
+        return CONST.SEARCH.ACTION_TYPES.SUBMIT;
+    }
 
     // const hasViolations = isTransactionEntry(key) ? TransactionUtils.hasViolation(transaction.transactionID, violations) : ReportUtils.hasViolations(report.reportID, allViolations);
     // if (hasViolations) {
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 7222b40813d8..6e67832774b6 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7108,7 +7108,7 @@ function canReportBeSubmitted(
     moneyRequestReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
     policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
     currentUserAccountID: number,
-    transaction?: OnyxTypes.Transaction,
+    transaction?: OnyxTypes.Transaction | SearchTransaction,
 ) {
     const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
     const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);

From 82a7f0c29b3fcd392a58623e895fda33653e966b Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 28 Oct 2024 17:30:36 -0600
Subject: [PATCH 023/100] fix some ts errors

---
 src/libs/ReportUtils.ts   | 6 +++---
 src/libs/SearchUIUtils.ts | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index f087c14c5c5c..dc4d119169e3 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -835,14 +835,14 @@ function isInvoiceReport(report: OnyxInputOrEntry<Report>): boolean {
 /**
  * Checks if a report is an Expense report.
  */
-function isExpenseReport(report: OnyxInputOrEntry<Report>): boolean {
+function isExpenseReport(report: OnyxInputOrEntry<Report> | SearchReport): boolean {
     return report?.type === CONST.REPORT.TYPE.EXPENSE;
 }
 
 /**
  * Checks if a report is an IOU report using report or reportID
  */
-function isIOUReport(reportOrID: OnyxInputOrEntry<Report> | string): boolean {
+function isIOUReport(reportOrID: OnyxInputOrEntry<Report> | SearchReport| string): boolean {
     const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
     return report?.type === CONST.REPORT.TYPE.IOU;
 }
@@ -1639,7 +1639,7 @@ function isMoneyRequest(reportOrID: OnyxEntry<Report> | string): boolean {
 /**
  * Checks if a report is an IOU or expense report.
  */
-function isMoneyRequestReport(reportOrID: OnyxInputOrEntry<Report> | string): boolean {
+function isMoneyRequestReport(reportOrID: OnyxInputOrEntry<Report> | SearchReport | string): boolean {
     const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
     return isIOUReport(report) || isExpenseReport(report);
 }
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 1107e2c79d7a..cd3420d130bd 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -261,7 +261,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     const transaction = isTransactionEntry(key) ? data[key] : null;
-    const report = transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : (data[key] as SearchReport);
+    const report = (transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key]) as SearchReport;
 
     // We don't need to run the logic if this is not a transaction or iou/expense report
     if (!ReportUtils.isMoneyRequestReport(report)) {
@@ -269,7 +269,8 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`] ?? {};
-    const allTransactions = Object.values(data).filter((item) => item?.transactionID && item?.reportID === report.reportID);
+    const allReportTransactions = isReportEntry(key) ? Object.entries(data).filter(([itemKey, value]) => isTransactionEntry(itemKey) && (value as SearchTransaction)?.reportID === report.reportID).map(item => item[1]) : [];
+    console.log('over here', allReportTransactions)
     const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? {};
     const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
     const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
@@ -282,7 +283,8 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
-    if (IOU.canIOUBePaid(report, chatReport, policy, allTransactions, false)) {
+    // TODO: Fix TS error
+    if (IOU.canIOUBePaid(report, chatReport, policy, allReportTransactions, false)) {
         return CONST.SEARCH.ACTION_TYPES.PAY;
     }
 

From 4445a3a9627bc18123a5179ad3f0620bb1ead095 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 28 Oct 2024 18:07:57 -0600
Subject: [PATCH 024/100] fix more ts errors

---
 src/libs/PolicyUtils.ts         |  5 +++--
 src/libs/ReportUtils.ts         |  8 ++++----
 src/libs/SearchUIUtils.ts       | 18 ++++++++++++++----
 src/types/onyx/Report.ts        |  2 +-
 src/types/onyx/SearchResults.ts | 14 ++++++++++----
 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 36e5ccef3308..33e3b0c0d459 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -35,6 +35,7 @@ import * as Localize from './Localize';
 import Navigation from './Navigation/Navigation';
 import * as NetworkStore from './Network/NetworkStore';
 import {getAccountIDsByLogins, getLoginsByAccountIDs, getPersonalDetailByEmail} from './PersonalDetailsUtils';
+import { SearchPolicy } from '@src/types/onyx/SearchResults';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
 
@@ -369,7 +370,7 @@ function isPendingDeletePolicy(policy: OnyxEntry<Policy>): boolean {
     return policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 }
 
-function isPaidGroupPolicy(policy: OnyxEntry<Policy>): boolean {
+function isPaidGroupPolicy(policy: OnyxEntry<Policy> | SearchPolicy): boolean {
     return policy?.type === CONST.POLICY.TYPE.TEAM || policy?.type === CONST.POLICY.TYPE.CORPORATE;
 }
 
@@ -424,7 +425,7 @@ function getCorrectedAutoReportingFrequency(policy: OnyxInputOrEntry<Policy>): V
 /**
  * Checks if policy's approval mode is "optional", a.k.a. "Submit & Close"
  */
-function isSubmitAndClose(policy: OnyxInputOrEntry<Policy>): boolean {
+function isSubmitAndClose(policy: OnyxInputOrEntry<Policy> | SearchPolicy): boolean {
     return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL;
 }
 
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index dc4d119169e3..4233572a3051 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -57,7 +57,7 @@ import type {Message, ReportActions} from '@src/types/onyx/ReportAction';
 import type {Comment, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
-import type {SearchReport} from '@src/types/onyx/SearchResults';
+import type {SearchPolicy, SearchReport} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
 import * as PolicyActions from './actions/Policy/Policy';
 import * as store from './actions/ReimbursementAccount/store';
@@ -828,7 +828,7 @@ function isChatReport(report: OnyxEntry<Report>): boolean {
     return report?.type === CONST.REPORT.TYPE.CHAT;
 }
 
-function isInvoiceReport(report: OnyxInputOrEntry<Report>): boolean {
+function isInvoiceReport(report: OnyxInputOrEntry<Report> | SearchReport): boolean {
     return report?.type === CONST.REPORT.TYPE.INVOICE;
 }
 
@@ -1436,7 +1436,7 @@ function isClosedExpenseReportWithNoExpenses(report: OnyxEntry<Report>): boolean
  * Whether the provided report is an archived room
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function isArchivedRoom(report: OnyxInputOrEntry<Report>, reportNameValuePairs?: OnyxInputOrEntry<ReportNameValuePairs>): boolean {
+function isArchivedRoom(report: OnyxInputOrEntry<Report> | SearchReport, reportNameValuePairs?: OnyxInputOrEntry<ReportNameValuePairs>): boolean {
     return !!report?.private_isArchived;
 }
 
@@ -7870,7 +7870,7 @@ function getOptimisticDataForParentReportAction(reportID: string, lastVisibleAct
     });
 }
 
-function canBeAutoReimbursed(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>): boolean {
+function canBeAutoReimbursed(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy> | SearchPolicy): boolean {
     if (isEmptyObject(policy)) {
         return false;
     }
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index cd3420d130bd..e159340b66d2 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -12,6 +12,7 @@ import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction, SearchPolicy} from '@src/types/onyx/SearchResults';
+import type {TransactionViolation} from '@src/types/onyx';
 import * as IOU from './actions/IOU';
 import * as Report from './actions/Report';
 import * as CurrencyUtils from './CurrencyUtils';
@@ -260,7 +261,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.VIEW;
     }
 
-    const transaction = isTransactionEntry(key) ? data[key] : null;
+    const transaction = isTransactionEntry(key) ? data[key] : undefined;
     const report = (transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key]) as SearchReport;
 
     // We don't need to run the logic if this is not a transaction or iou/expense report
@@ -269,8 +270,13 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`] ?? {};
-    const allReportTransactions = isReportEntry(key) ? Object.entries(data).filter(([itemKey, value]) => isTransactionEntry(itemKey) && (value as SearchTransaction)?.reportID === report.reportID).map(item => item[1]) : [];
-    console.log('over here', allReportTransactions)
+    const allReportTransactions = (
+        isReportEntry(key)
+            ? Object.entries(data)
+                  .filter(([itemKey, value]) => isTransactionEntry(itemKey) && (value as SearchTransaction)?.reportID === report.reportID)
+                  .map((item) => item[1])
+            : []
+    ) as SearchTransaction[];
     const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? {};
     const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
     const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
@@ -283,11 +289,15 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
-    // TODO: Fix TS error
+    // TODO: pass reportNameValuePairs here so we don't get it in ReportUtils.isArchivedRoom and canApproveIOU
+    // TODO: pass receiver policy so that we don't get it from Onyx in PolicyUtils.getPolicy
+    // TODO: pass policy to ReportUtils.isPayer and isPaidGroupPolicy
+    // TODO: in Auth, send invoiceReceiver as accountID if type is individual
     if (IOU.canIOUBePaid(report, chatReport, policy, allReportTransactions, false)) {
         return CONST.SEARCH.ACTION_TYPES.PAY;
     }
 
+    // TODO: pass reportNameValuePairs to ReportUtils.getReportNameValuePairs
     if (IOU.canApproveIOU(report, policy)) {
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index 43c82cfdc227..c4b9ebe97b9d 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -311,4 +311,4 @@ type ReportCollectionDataSet = CollectionDataSet<typeof ONYXKEYS.COLLECTION.REPO
 
 export default Report;
 
-export type {NotificationPreference, RoomVisibility, WriteCapability, Note, ReportCollectionDataSet, PendingChatMember, Participant, Participants};
+export type {NotificationPreference, RoomVisibility, WriteCapability, Note, ReportCollectionDataSet, PendingChatMember, Participant, Participants, InvoiceReceiver};
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index f06224190db6..c04c597fef0a 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -6,7 +6,9 @@ import type TransactionListItem from '@components/SelectionList/Search/Transacti
 import type {ReportActionListItemType, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
 import type CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
+import type {InvoiceReceiver} from './Report';
 import type ReportActionName from './ReportActionName';
+import type {TransactionViolation} from './TransactionViolation';
 
 /** Types of search data */
 type SearchDataTypes = ValueOf<typeof CONST.SEARCH.DATA_TYPES>;
@@ -79,7 +81,7 @@ type SearchTransactionAction = ValueOf<typeof CONST.SEARCH.ACTION_TYPES>;
 /** Model of report search result */
 type SearchReport = {
     /** The ID of the report */
-    reportID?: string;
+    reportID: string;
 
     /** ID of the chat report */
     chatReportID?: string;
@@ -115,7 +117,7 @@ type SearchReport = {
     chatType?: ValueOf<typeof CONST.REPORT.CHAT_TYPE>;
 
     /** Invoice room receiver data */
-    invoiceReceiver?: Record<string, string>;
+    invoiceReceiver?: InvoiceReceiver;
 
     /** Whether the report has a single transaction */
     isOneTransactionReport?: boolean;
@@ -213,7 +215,10 @@ type SearchPolicy = {
     employeeList?: Record<string, Record<string, string>>;
 
     /** Detailed settings for the autoReimbursement */
-    autoReimbursement?: Record<string, string>;
+    autoReimbursement?: {
+        /** The auto reimbursement limit */
+        limit: number;
+    };
 };
 
 /** Model of transaction search result */
@@ -347,7 +352,8 @@ type SearchResults = {
         Record<typeof ONYXKEYS.PERSONAL_DETAILS_LIST, Record<string, SearchPersonalDetails>> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS, Record<string, SearchReportAction>> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT, SearchReport> &
-        PrefixedRecord<typeof ONYXKEYS.COLLECTION.POLICY, SearchPolicy>;
+        PrefixedRecord<typeof ONYXKEYS.COLLECTION.POLICY, SearchPolicy> &
+        PrefixedRecord<typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, TransactionViolation>;
 
     /** Whether search data is being fetched from server */
     isLoading?: boolean;

From f9055ad56e369a118aa08fa73f86981335a2ac82 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 28 Oct 2024 18:11:27 -0600
Subject: [PATCH 025/100] fix more ts errors

---
 src/libs/PolicyUtils.ts            | 6 +++---
 src/libs/SearchUIUtils.ts          | 1 +
 src/libs/TransactionUtils/index.ts | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 33e3b0c0d459..f7ce47747247 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -176,7 +176,7 @@ function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>, isConnecti
     return undefined;
 }
 
-function getPolicyRole(policy: OnyxInputOrEntry<Policy>, currentUserLogin: string | undefined) {
+function getPolicyRole(policy: OnyxInputOrEntry<Policy> | SearchPolicy, currentUserLogin: string | undefined) {
     return policy?.role ?? policy?.employeeList?.[currentUserLogin ?? '-1']?.role;
 }
 
@@ -209,7 +209,7 @@ const isUserPolicyAdmin = (policy: OnyxInputOrEntry<Policy>, login?: string) =>
 /**
  * Checks if the current user is an admin of the policy.
  */
-const isPolicyAdmin = (policy: OnyxInputOrEntry<Policy>, currentUserLogin?: string): boolean => getPolicyRole(policy, currentUserLogin) === CONST.POLICY.ROLE.ADMIN;
+const isPolicyAdmin = (policy: OnyxInputOrEntry<Policy> | SearchPolicy, currentUserLogin?: string): boolean => getPolicyRole(policy, currentUserLogin) === CONST.POLICY.ROLE.ADMIN;
 
 /**
  * Checks if the current user is of the role "user" on the policy.
@@ -395,7 +395,7 @@ function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Po
  * Checks if policy's scheduled submit / auto reporting frequency is "instant".
  * Note: Free policies have "instant" submit always enabled.
  */
-function isInstantSubmitEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
+function isInstantSubmitEnabled(policy: OnyxInputOrEntry<Policy> | SearchPolicy): boolean {
     return policy?.autoReporting === true && policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT;
 }
 
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index e159340b66d2..af2fa767b061 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -303,6 +303,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     // TODO: update allHavePendingRTERViolation to take in array of transactions
+    // TODO: update hasBrokenConnectionViolation to take in violations instead of connecting directly to Onyx
     if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
         return CONST.SEARCH.ACTION_TYPES.SUBMIT;
     }
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index bf5073aba27c..3f048e461d36 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -28,6 +28,7 @@ import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey,
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import getDistanceInMeters from './getDistanceInMeters';
+import { SearchPolicy, SearchReport } from '@src/types/onyx/SearchResults';
 
 let allTransactions: OnyxCollection<Transaction> = {};
 Onyx.connect({
@@ -659,7 +660,7 @@ function hasBrokenConnectionViolation(transactionID: string): boolean {
 /**
  * Check if user should see broken connection violation warning.
  */
-function shouldShowBrokenConnectionViolation(transactionID: string, report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
+function shouldShowBrokenConnectionViolation(transactionID: string, report: OnyxEntry<Report> | SearchReport, policy: OnyxEntry<Policy> | SearchPolicy): boolean {
     return (
         hasBrokenConnectionViolation(transactionID) &&
         (!PolicyUtils.isPolicyAdmin(policy) || ReportUtils.isOpenExpenseReport(report) || (ReportUtils.isProcessingReport(report) && PolicyUtils.isInstantSubmitEnabled(policy)))

From b8568f4e04cf47f77f5ca5a0bc80e0a86f3387c9 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 28 Oct 2024 18:17:21 -0600
Subject: [PATCH 026/100] fix lint

---
 src/libs/PolicyUtils.ts            |  2 +-
 src/libs/ReportUtils.ts            |  4 ++--
 src/libs/SearchUIUtils.ts          | 13 +++++++++++--
 src/libs/TransactionUtils/index.ts |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index f7ce47747247..0174f39c2657 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -29,13 +29,13 @@ import type {
     Tenant,
 } from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
+import {SearchPolicy} from '@src/types/onyx/SearchResults';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import {hasSynchronizationErrorMessage} from './actions/connections';
 import * as Localize from './Localize';
 import Navigation from './Navigation/Navigation';
 import * as NetworkStore from './Network/NetworkStore';
 import {getAccountIDsByLogins, getLoginsByAccountIDs, getPersonalDetailByEmail} from './PersonalDetailsUtils';
-import { SearchPolicy } from '@src/types/onyx/SearchResults';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
 
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 4233572a3051..b1e28990dd8d 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -54,10 +54,10 @@ import type {Status} from '@src/types/onyx/PersonalDetails';
 import type {ConnectionName} from '@src/types/onyx/Policy';
 import type {NotificationPreference, Participants, PendingChatMember, Participant as ReportParticipant} from '@src/types/onyx/Report';
 import type {Message, ReportActions} from '@src/types/onyx/ReportAction';
+import type {SearchPolicy, SearchReport} from '@src/types/onyx/SearchResults';
 import type {Comment, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
-import type {SearchPolicy, SearchReport} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
 import * as PolicyActions from './actions/Policy/Policy';
 import * as store from './actions/ReimbursementAccount/store';
@@ -842,7 +842,7 @@ function isExpenseReport(report: OnyxInputOrEntry<Report> | SearchReport): boole
 /**
  * Checks if a report is an IOU report using report or reportID
  */
-function isIOUReport(reportOrID: OnyxInputOrEntry<Report> | SearchReport| string): boolean {
+function isIOUReport(reportOrID: OnyxInputOrEntry<Report> | SearchReport | string): boolean {
     const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
     return report?.type === CONST.REPORT.TYPE.IOU;
 }
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index af2fa767b061..806ed12c1ee2 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -10,9 +10,18 @@ import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type SearchResults from '@src/types/onyx/SearchResults';
-import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction, SearchPolicy} from '@src/types/onyx/SearchResults';
 import type {TransactionViolation} from '@src/types/onyx';
+import type SearchResults from '@src/types/onyx/SearchResults';
+import type {
+    ListItemDataType,
+    ListItemType,
+    SearchDataTypes,
+    SearchPersonalDetails,
+    SearchPolicy,
+    SearchReport,
+    SearchTransaction,
+    SearchTransactionAction,
+} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
 import * as Report from './actions/Report';
 import * as CurrencyUtils from './CurrencyUtils';
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 3f048e461d36..5a96cf3c34c8 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -24,11 +24,11 @@ import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Beta, OnyxInputOrEntry, Policy, RecentWaypoint, Report, ReviewDuplicates, TaxRate, TaxRates, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
 import type {Attendee} from '@src/types/onyx/IOU';
+import {SearchPolicy, SearchReport} from '@src/types/onyx/SearchResults';
 import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import getDistanceInMeters from './getDistanceInMeters';
-import { SearchPolicy, SearchReport } from '@src/types/onyx/SearchResults';
 
 let allTransactions: OnyxCollection<Transaction> = {};
 Onyx.connect({

From 97ee8fc1f4102e0bb477d853bda0e038492a710e Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 29 Oct 2024 14:28:28 -0600
Subject: [PATCH 027/100] finish requirements for pay action

---
 src/libs/ReportUtils.ts         |  6 +++---
 src/libs/SearchUIUtils.ts       | 11 ++++++-----
 src/libs/actions/IOU.ts         |  9 ++++++---
 src/types/onyx/SearchResults.ts |  2 ++
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index b1e28990dd8d..f9accc482065 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -951,7 +951,7 @@ function hasParticipantInArray(report: OnyxEntry<Report>, memberAccountIDs: numb
 /**
  * Whether the Money Request report is settled
  */
-function isSettled(reportOrID: OnyxEntry<Report> | SearchReport | string | undefined): boolean {
+function isSettled(reportOrID: OnyxInputOrEntry<Report> | SearchReport | string | undefined): boolean {
     if (!reportOrID) {
         return false;
     }
@@ -1706,9 +1706,9 @@ function isOneOnOneChat(report: OnyxEntry<Report>): boolean {
  * Checks if the current user is a payer of the expense
  */
 
-function isPayer(session: OnyxEntry<Session>, iouReport: OnyxEntry<Report>, onlyShowPayElsewhere = false) {
+function isPayer(session: OnyxEntry<Session>, iouReport: OnyxEntry<Report>, onlyShowPayElsewhere = false, reportPolicy?: OnyxInputOrEntry<Policy> | SearchPolicy) {
     const isApproved = isReportApproved(iouReport);
-    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`] ?? null;
+    const policy = reportPolicy ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`] ?? null;
     const policyType = policy?.type;
     const isAdmin = policyType !== CONST.POLICY.TYPE.PERSONAL && policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isManager = iouReport?.managerID === session?.accountID;
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 806ed12c1ee2..81567efeda67 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -279,6 +279,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`] ?? {};
+    const chatReportRNVP = data[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.chatReportID}`] ?? undefined;
     const allReportTransactions = (
         isReportEntry(key)
             ? Object.entries(data)
@@ -287,6 +288,10 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
             : []
     ) as SearchTransaction[];
     const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? {};
+    const invoiceReceiverPolicy =
+        ReportUtils.isInvoiceReport(report) && report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS
+            ? data[`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver?.policyID}`]
+            : undefined;
     const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
     const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
 
@@ -298,11 +303,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
-    // TODO: pass reportNameValuePairs here so we don't get it in ReportUtils.isArchivedRoom and canApproveIOU
-    // TODO: pass receiver policy so that we don't get it from Onyx in PolicyUtils.getPolicy
-    // TODO: pass policy to ReportUtils.isPayer and isPaidGroupPolicy
-    // TODO: in Auth, send invoiceReceiver as accountID if type is individual
-    if (IOU.canIOUBePaid(report, chatReport, policy, allReportTransactions, false)) {
+    if (IOU.canIOUBePaid(report, chatReport, policy, allReportTransactions, false, chatReportRNVP, invoiceReceiverPolicy)) {
         return CONST.SEARCH.ACTION_TYPES.PAY;
     }
 
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 6e67832774b6..b349baf113bc 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7046,11 +7046,13 @@ function canIOUBePaid(
     policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
     transactions?: OnyxTypes.Transaction[] | SearchTransaction[],
     onlyShowPayElsewhere = false,
+    chatReportRNVP?: OnyxTypes.ReportNameValuePairs,
+    invoiceReceiverPolicy?: SearchPolicy,
 ) {
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
-    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(chatReport?.reportID);
+    const reportNameValuePairs = chatReportRNVP ?? ReportUtils.getReportNameValuePairs(chatReport?.reportID);
     const isChatReportArchived = ReportUtils.isArchivedRoom(chatReport, reportNameValuePairs);
-    const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
+    const iouSettled = ReportUtils.isSettled(iouReport);
 
     if (isEmptyObject(iouReport)) {
         return false;
@@ -7072,7 +7074,7 @@ function canIOUBePaid(
         if (chatReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
             return chatReport?.invoiceReceiver?.accountID === userAccountID;
         }
-        return PolicyUtils.getPolicy(chatReport?.invoiceReceiver?.policyID)?.role === CONST.POLICY.ROLE.ADMIN;
+        return (invoiceReceiverPolicy ?? PolicyUtils.getPolicy(chatReport?.invoiceReceiver?.policyID))?.role === CONST.POLICY.ROLE.ADMIN;
     }
 
     const isPayer = ReportUtils.isPayer(
@@ -7082,6 +7084,7 @@ function canIOUBePaid(
         },
         iouReport,
         onlyShowPayElsewhere,
+        policy,
     );
 
     const isOpenExpenseReport = isPolicyExpenseChat && ReportUtils.isOpenExpenseReport(iouReport);
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index c04c597fef0a..117eaf79c598 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -9,6 +9,7 @@ import type ONYXKEYS from '@src/ONYXKEYS';
 import type {InvoiceReceiver} from './Report';
 import type ReportActionName from './ReportActionName';
 import type {TransactionViolation} from './TransactionViolation';
+import ReportNameValuePairs from './ReportNameValuePairs';
 
 /** Types of search data */
 type SearchDataTypes = ValueOf<typeof CONST.SEARCH.DATA_TYPES>;
@@ -353,6 +354,7 @@ type SearchResults = {
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS, Record<string, SearchReportAction>> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT, SearchReport> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.POLICY, SearchPolicy> &
+        PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, ReportNameValuePairs> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, TransactionViolation>;
 
     /** Whether search data is being fetched from server */

From 8be05076b93d863ab1d76be1a248357b15ebe31d Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 29 Oct 2024 14:30:30 -0600
Subject: [PATCH 028/100] finish approve

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

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 81567efeda67..34f68466fe6b 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -307,7 +307,6 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.PAY;
     }
 
-    // TODO: pass reportNameValuePairs to ReportUtils.getReportNameValuePairs
     if (IOU.canApproveIOU(report, policy)) {
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index b349baf113bc..b7087c91a0db 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7016,7 +7016,7 @@ function sendMoneyWithWallet(report: OnyxEntry<OnyxTypes.Report>, amount: number
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy) {
+function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy, chatReportRNVP?: OnyxTypes.ReportNameValuePairs) {
     // Only expense reports can be approved
     const isPaidGroupPolicy = policy && PolicyUtils.isPaidGroupPolicy(policy);
     if (!isPaidGroupPolicy) {
@@ -7033,7 +7033,7 @@ function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> |
     const isOpenExpenseReport = ReportUtils.isOpenExpenseReport(iouReport);
     const isApproved = ReportUtils.isReportApproved(iouReport);
     const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
-    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(iouReport?.reportID);
+    const reportNameValuePairs = chatReportRNVP ?? ReportUtils.getReportNameValuePairs(iouReport?.reportID);
     const isArchivedReport = ReportUtils.isArchivedRoom(iouReport, reportNameValuePairs);
     const unheldTotalIsZero = iouReport && iouReport.unheldTotal === 0;
 

From faa0ba482255a31120bc499a9179266c2c46d239 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 29 Oct 2024 14:58:40 -0600
Subject: [PATCH 029/100] pass violations to submit

---
 src/libs/SearchUIUtils.ts          | 21 ++++++---------------
 src/libs/TransactionUtils/index.ts | 17 +++++++++++------
 src/libs/actions/IOU.ts            |  5 +++--
 src/types/onyx/SearchResults.ts    |  4 ++--
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 34f68466fe6b..814d1f4a6b52 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -1,3 +1,4 @@
+import type {OnyxCollection} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {SearchColumnType, SearchStatus, SortOrder} from '@components/Search/types';
 import ChatListItem from '@components/SelectionList/ChatListItem';
@@ -10,18 +11,8 @@ import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {TransactionViolation} from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
-import type {
-    ListItemDataType,
-    ListItemType,
-    SearchDataTypes,
-    SearchPersonalDetails,
-    SearchPolicy,
-    SearchReport,
-    SearchTransaction,
-    SearchTransactionAction,
-} from '@src/types/onyx/SearchResults';
+import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
 import * as Report from './actions/Report';
 import * as CurrencyUtils from './CurrencyUtils';
@@ -293,7 +284,9 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
             ? data[`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver?.policyID}`]
             : undefined;
     const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
-    const allViolations = Object.keys(data).filter((item) => item.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)) ?? {};
+    const allViolations = (Object.entries(data)
+        .filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS))
+        .map((item) => item[1]) ?? undefined) as unknown as OnyxCollection<OnyxTypes.TransactionViolations>;
 
     if (ReportUtils.isSettled(report)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
@@ -311,9 +304,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
 
-    // TODO: update allHavePendingRTERViolation to take in array of transactions
-    // TODO: update hasBrokenConnectionViolation to take in violations instead of connecting directly to Onyx
-    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction)) {
+    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction, allViolations)) {
         return CONST.SEARCH.ACTION_TYPES.SUBMIT;
     }
 
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 5a96cf3c34c8..715d51b8a387 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -648,8 +648,8 @@ function hasPendingRTERViolation(transactionViolations?: TransactionViolations |
 /**
  * Check if there is broken connection violation.
  */
-function hasBrokenConnectionViolation(transactionID: string): boolean {
-    const violations = getTransactionViolations(transactionID, allTransactionViolations);
+function hasBrokenConnectionViolation(transactionID: string, allViolations?: TransactionViolations): boolean {
+    const violations = allViolations ?? getTransactionViolations(transactionID, allTransactionViolations);
     return !!violations?.find(
         (violation) =>
             violation.name === CONST.VIOLATIONS.RTER &&
@@ -660,9 +660,14 @@ function hasBrokenConnectionViolation(transactionID: string): boolean {
 /**
  * Check if user should see broken connection violation warning.
  */
-function shouldShowBrokenConnectionViolation(transactionID: string, report: OnyxEntry<Report> | SearchReport, policy: OnyxEntry<Policy> | SearchPolicy): boolean {
+function shouldShowBrokenConnectionViolation(
+    transactionID: string,
+    report: OnyxEntry<Report> | SearchReport,
+    policy: OnyxEntry<Policy> | SearchPolicy,
+    allViolations?: TransactionViolations,
+): boolean {
     return (
-        hasBrokenConnectionViolation(transactionID) &&
+        hasBrokenConnectionViolation(transactionID, allViolations) &&
         (!PolicyUtils.isPolicyAdmin(policy) || ReportUtils.isOpenExpenseReport(report) || (ReportUtils.isProcessingReport(report) && PolicyUtils.isInstantSubmitEnabled(policy)))
     );
 }
@@ -670,9 +675,9 @@ function shouldShowBrokenConnectionViolation(transactionID: string, report: Onyx
 /**
  * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
  */
-function allHavePendingRTERViolation(transactionIds: string[]): boolean {
+function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: OnyxCollection<TransactionViolations>): boolean {
     const transactionsWithRTERViolations = transactionIds.map((transactionId) => {
-        const transactionViolations = getTransactionViolations(transactionId, allTransactionViolations);
+        const transactionViolations = getTransactionViolations(transactionId, searchTransactionViolations ?? allTransactionViolations);
         return hasPendingRTERViolation(transactionViolations);
     });
     return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index b7087c91a0db..d7040247c7a2 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7112,11 +7112,12 @@ function canReportBeSubmitted(
     policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
     currentUserAccountID: number,
     transaction?: OnyxTypes.Transaction | SearchTransaction,
+    violations?: OnyxCollection<OnyxTypes.TransactionViolations>,
 ) {
     const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
     const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);
-    const hasAllPendingRTERViolations = TransactionUtils.allHavePendingRTERViolation([transaction?.transactionID ?? '-1']);
-    const shouldShowBrokenConnectionViolation = TransactionUtils.shouldShowBrokenConnectionViolation(transaction?.transactionID ?? '-1', moneyRequestReport, policy);
+    const hasAllPendingRTERViolations = TransactionUtils.allHavePendingRTERViolation([transaction?.transactionID ?? '-1'], violations);
+    const shouldShowBrokenConnectionViolation = TransactionUtils.shouldShowBrokenConnectionViolation(transaction?.transactionID ?? '-1', moneyRequestReport, policy, violations);
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
 
     return (
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 117eaf79c598..22270497e6a5 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -8,7 +8,7 @@ import type CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
 import type {InvoiceReceiver} from './Report';
 import type ReportActionName from './ReportActionName';
-import type {TransactionViolation} from './TransactionViolation';
+import type TransactionViolations from './TransactionViolation';
 import ReportNameValuePairs from './ReportNameValuePairs';
 
 /** Types of search data */
@@ -355,7 +355,7 @@ type SearchResults = {
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT, SearchReport> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.POLICY, SearchPolicy> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, ReportNameValuePairs> &
-        PrefixedRecord<typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, TransactionViolation>;
+        PrefixedRecord<typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, TransactionViolations>;
 
     /** Whether search data is being fetched from server */
     isLoading?: boolean;

From 69e1aa9354929ad2f51d8f19e2752ed46da3688a Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 29 Oct 2024 15:41:30 -0600
Subject: [PATCH 030/100] add review action

---
 src/libs/SearchUIUtils.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 814d1f4a6b52..594fdbb91de5 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -283,7 +283,6 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         ReportUtils.isInvoiceReport(report) && report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS
             ? data[`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver?.policyID}`]
             : undefined;
-    const violations = data[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`] ?? {};
     const allViolations = (Object.entries(data)
         .filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS))
         .map((item) => item[1]) ?? undefined) as unknown as OnyxCollection<OnyxTypes.TransactionViolations>;
@@ -308,10 +307,10 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.SUBMIT;
     }
 
-    // const hasViolations = isTransactionEntry(key) ? TransactionUtils.hasViolation(transaction.transactionID, violations) : ReportUtils.hasViolations(report.reportID, allViolations);
-    // if (hasViolations) {
-    //     return CONST.SEARCH.ACTION_TYPES.REVIEW;
-    // }
+    const hasViolations = transaction ? TransactionUtils.hasViolation(transaction.transactionID, allViolations) : ReportUtils.hasViolations(report.reportID, allViolations);
+    if (hasViolations) {
+        return CONST.SEARCH.ACTION_TYPES.REVIEW;
+    }
 
     return CONST.SEARCH.ACTION_TYPES.VIEW;
 }

From 6f9d848b4eccf293a0a4d87a4cab270062effc93 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 12:10:48 -0600
Subject: [PATCH 031/100] fix prettier, lint

---
 src/components/Search/SearchPageHeader.tsx | 2 +-
 src/libs/PolicyUtils.ts                    | 2 +-
 src/libs/TransactionUtils/index.ts         | 2 +-
 src/libs/actions/IOU.ts                    | 6 +++++-
 src/types/onyx/SearchResults.ts            | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 5665909185c4..9fb19ff16288 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -182,7 +182,7 @@ function SearchPageHeader({queryJSON, hash}: SearchPageHeaderProps) {
                     return;
                 }
 
-                const reportIDList = (selectedReports?.filter((report) => !!report) as string[]) ?? [];
+                const reportIDList = selectedReports?.filter((report) => !!report) ?? [];
                 SearchActions.exportSearchItemsToCSV(
                     {query: status, jsonQuery: JSON.stringify(queryJSON), reportIDList, transactionIDList: selectedTransactionsKeys, policyIDs: [activeWorkspaceID ?? '']},
                     () => {
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 0f018d8583a9..0cc833f69f82 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -29,7 +29,7 @@ import type {
     Tenant,
 } from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
-import {SearchPolicy} from '@src/types/onyx/SearchResults';
+import type {SearchPolicy} from '@src/types/onyx/SearchResults';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import {hasSynchronizationErrorMessage} from './actions/connections';
 import * as Localize from './Localize';
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 715d51b8a387..b1dcbfa5f5a9 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -24,7 +24,7 @@ import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Beta, OnyxInputOrEntry, Policy, RecentWaypoint, Report, ReviewDuplicates, TaxRate, TaxRates, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
 import type {Attendee} from '@src/types/onyx/IOU';
-import {SearchPolicy, SearchReport} from '@src/types/onyx/SearchResults';
+import type {SearchPolicy, SearchReport} from '@src/types/onyx/SearchResults';
 import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index d7040247c7a2..812cebe08713 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7016,7 +7016,11 @@ function sendMoneyWithWallet(report: OnyxEntry<OnyxTypes.Report>, amount: number
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy, chatReportRNVP?: OnyxTypes.ReportNameValuePairs) {
+function canApproveIOU(
+    iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
+    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
+    chatReportRNVP?: OnyxTypes.ReportNameValuePairs,
+) {
     // Only expense reports can be approved
     const isPaidGroupPolicy = policy && PolicyUtils.isPaidGroupPolicy(policy);
     if (!isPaidGroupPolicy) {
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 22270497e6a5..26d258a0142a 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -8,8 +8,8 @@ import type CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
 import type {InvoiceReceiver} from './Report';
 import type ReportActionName from './ReportActionName';
+import type ReportNameValuePairs from './ReportNameValuePairs';
 import type TransactionViolations from './TransactionViolation';
-import ReportNameValuePairs from './ReportNameValuePairs';
 
 /** Types of search data */
 type SearchDataTypes = ValueOf<typeof CONST.SEARCH.DATA_TYPES>;

From 65b00e322c6ace76fc11e238334d27e9933c7c36 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 12:30:07 -0600
Subject: [PATCH 032/100] fix types

---
 src/libs/SearchUIUtils.ts          | 6 +++---
 src/libs/TransactionUtils/index.ts | 4 ++--
 src/libs/actions/IOU.ts            | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 594fdbb91de5..dd5abfae40b6 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -262,7 +262,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     const transaction = isTransactionEntry(key) ? data[key] : undefined;
-    const report = (transaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key]) as SearchReport;
+    const report = isReportEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : (data[key] as SearchReport);
 
     // We don't need to run the logic if this is not a transaction or iou/expense report
     if (!ReportUtils.isMoneyRequestReport(report)) {
@@ -283,9 +283,9 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         ReportUtils.isInvoiceReport(report) && report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS
             ? data[`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver?.policyID}`]
             : undefined;
-    const allViolations = (Object.entries(data)
+    const allViolations = Object.entries(data)
         .filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS))
-        .map((item) => item[1]) ?? undefined) as unknown as OnyxCollection<OnyxTypes.TransactionViolations>;
+        .map((item) => item[1]);
 
     if (ReportUtils.isSettled(report)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index b1dcbfa5f5a9..dba0ff7b25cf 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -675,9 +675,9 @@ function shouldShowBrokenConnectionViolation(
 /**
  * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
  */
-function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: OnyxCollection<TransactionViolations>): boolean {
+function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: TransactionViolations): boolean {
     const transactionsWithRTERViolations = transactionIds.map((transactionId) => {
-        const transactionViolations = getTransactionViolations(transactionId, searchTransactionViolations ?? allTransactionViolations);
+        const transactionViolations = searchTransactionViolations ?? getTransactionViolations(transactionId, allTransactionViolations);
         return hasPendingRTERViolation(transactionViolations);
     });
     return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 812cebe08713..c6f58d8352c6 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7112,11 +7112,11 @@ function canIOUBePaid(
 }
 
 function canReportBeSubmitted(
-    moneyRequestReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report> | SearchReport,
-    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy> | SearchPolicy,
+    moneyRequestReport: OnyxEntry<OnyxTypes.Report> | SearchReport,
+    policy: OnyxEntry<OnyxTypes.Policy> | SearchPolicy,
     currentUserAccountID: number,
     transaction?: OnyxTypes.Transaction | SearchTransaction,
-    violations?: OnyxCollection<OnyxTypes.TransactionViolations>,
+    violations?: OnyxTypes.TransactionViolations,
 ) {
     const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
     const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);

From d259dc864b04835b3cedaf84ea29e80f712234b0 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 12:32:24 -0600
Subject: [PATCH 033/100] fix more types

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

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index dd5abfae40b6..cc9869582e8c 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -1,4 +1,3 @@
-import type {OnyxCollection} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {SearchColumnType, SearchStatus, SortOrder} from '@components/Search/types';
 import ChatListItem from '@components/SelectionList/ChatListItem';

From 7919753e927f5d5699b3f11b75c9813f5486de63 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 13:03:58 -0600
Subject: [PATCH 034/100] fix violations types

---
 src/libs/SearchUIUtils.ts          | 13 +++++++------
 src/libs/TransactionUtils/index.ts | 10 +++++-----
 src/libs/actions/IOU.ts            |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index cc9869582e8c..1e22170f3946 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -21,6 +21,7 @@ import Navigation from './Navigation/Navigation';
 import * as ReportActionsUtils from './ReportActionsUtils';
 import * as ReportUtils from './ReportUtils';
 import * as TransactionUtils from './TransactionUtils';
+import { OnyxCollection } from 'react-native-onyx';
 
 const columnNamesToSortingProperty = {
     [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,
@@ -261,7 +262,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
     }
 
     const transaction = isTransactionEntry(key) ? data[key] : undefined;
-    const report = isReportEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : (data[key] as SearchReport);
+    const report = isTransactionEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
 
     // We don't need to run the logic if this is not a transaction or iou/expense report
     if (!ReportUtils.isMoneyRequestReport(report)) {
@@ -282,9 +283,9 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         ReportUtils.isInvoiceReport(report) && report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS
             ? data[`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver?.policyID}`]
             : undefined;
-    const allViolations = Object.entries(data)
-        .filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS))
-        .map((item) => item[1]);
+    const violationsCollection = Object.fromEntries(
+        Object.entries(data).filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)),
+    ) as unknown as OnyxCollection<OnyxTypes.TransactionViolations>;
 
     if (ReportUtils.isSettled(report)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
@@ -302,11 +303,11 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
 
-    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction, allViolations)) {
+    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction, violationsCollection)) {
         return CONST.SEARCH.ACTION_TYPES.SUBMIT;
     }
 
-    const hasViolations = transaction ? TransactionUtils.hasViolation(transaction.transactionID, allViolations) : ReportUtils.hasViolations(report.reportID, allViolations);
+    const hasViolations = transaction ? TransactionUtils.hasViolation(transaction.transactionID, violationsCollection) : ReportUtils.hasViolations(report.reportID, violationsCollection);
     if (hasViolations) {
         return CONST.SEARCH.ACTION_TYPES.REVIEW;
     }
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index dba0ff7b25cf..f8f9f9e9dc7e 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -648,8 +648,8 @@ function hasPendingRTERViolation(transactionViolations?: TransactionViolations |
 /**
  * Check if there is broken connection violation.
  */
-function hasBrokenConnectionViolation(transactionID: string, allViolations?: TransactionViolations): boolean {
-    const violations = allViolations ?? getTransactionViolations(transactionID, allTransactionViolations);
+function hasBrokenConnectionViolation(transactionID: string, allViolations?: OnyxCollection<TransactionViolations>): boolean {
+    const violations = getTransactionViolations(transactionID, allViolations ?? allTransactionViolations);
     return !!violations?.find(
         (violation) =>
             violation.name === CONST.VIOLATIONS.RTER &&
@@ -664,7 +664,7 @@ function shouldShowBrokenConnectionViolation(
     transactionID: string,
     report: OnyxEntry<Report> | SearchReport,
     policy: OnyxEntry<Policy> | SearchPolicy,
-    allViolations?: TransactionViolations,
+    allViolations?: OnyxCollection<TransactionViolations>,
 ): boolean {
     return (
         hasBrokenConnectionViolation(transactionID, allViolations) &&
@@ -675,9 +675,9 @@ function shouldShowBrokenConnectionViolation(
 /**
  * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
  */
-function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: TransactionViolations): boolean {
+function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: OnyxCollection<TransactionViolations>): boolean {
     const transactionsWithRTERViolations = transactionIds.map((transactionId) => {
-        const transactionViolations = searchTransactionViolations ?? getTransactionViolations(transactionId, allTransactionViolations);
+        const transactionViolations = getTransactionViolations(transactionId, searchTransactionViolations ?? allTransactionViolations);
         return hasPendingRTERViolation(transactionViolations);
     });
     return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index c6f58d8352c6..d3b54cb4e1aa 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7116,7 +7116,7 @@ function canReportBeSubmitted(
     policy: OnyxEntry<OnyxTypes.Policy> | SearchPolicy,
     currentUserAccountID: number,
     transaction?: OnyxTypes.Transaction | SearchTransaction,
-    violations?: OnyxTypes.TransactionViolations,
+    violations?: OnyxCollection<OnyxTypes.TransactionViolations>,
 ) {
     const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
     const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);

From 88f199eb28dbc1d3d524df52a05365d368043465 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 13:41:32 -0600
Subject: [PATCH 035/100] fix lint

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

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 1e22170f3946..6ee352657879 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -1,3 +1,4 @@
+import type {OnyxCollection} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {SearchColumnType, SearchStatus, SortOrder} from '@components/Search/types';
 import ChatListItem from '@components/SelectionList/ChatListItem';
@@ -21,7 +22,6 @@ import Navigation from './Navigation/Navigation';
 import * as ReportActionsUtils from './ReportActionsUtils';
 import * as ReportUtils from './ReportUtils';
 import * as TransactionUtils from './TransactionUtils';
-import { OnyxCollection } from 'react-native-onyx';
 
 const columnNamesToSortingProperty = {
     [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,

From c5b87404d999f1ee1d687b5d5e9f69799dc73d76 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 14:15:13 -0600
Subject: [PATCH 036/100] refactor code for performance

---
 src/libs/SearchUIUtils.ts | 47 ++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 6ee352657879..c53638b61aa6 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -253,39 +253,21 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
  * Do not use directly, use only via `getSections()` facade.
  */
 function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUserAccountID: number): SearchTransactionAction {
-    if (!isTransactionEntry(key) && !isReportEntry(key)) {
+    const isTransaction = isTransactionEntry(key);
+    if ((!isTransaction && !isReportEntry(key)) || (isTransaction && !data[key].isFromOneTransactionReport)) {
         return CONST.SEARCH.ACTION_TYPES.VIEW;
     }
 
-    if (isTransactionEntry(key) && !data[key].isFromOneTransactionReport) {
-        return CONST.SEARCH.ACTION_TYPES.VIEW;
-    }
-
-    const transaction = isTransactionEntry(key) ? data[key] : undefined;
-    const report = isTransactionEntry(key) ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
+    const transaction = isTransaction ? data[key] : undefined;
+    const report = isTransaction ? data[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] : data[key];
 
-    // We don't need to run the logic if this is not a transaction or iou/expense report
+    // We don't need to run the logic if this is not a transaction or iou/expense report, so let's shortcircuit the logic for performance reasons
     if (!ReportUtils.isMoneyRequestReport(report)) {
         return CONST.SEARCH.ACTION_TYPES.VIEW;
     }
 
     const chatReport = data[`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`] ?? {};
     const chatReportRNVP = data[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.chatReportID}`] ?? undefined;
-    const allReportTransactions = (
-        isReportEntry(key)
-            ? Object.entries(data)
-                  .filter(([itemKey, value]) => isTransactionEntry(itemKey) && (value as SearchTransaction)?.reportID === report.reportID)
-                  .map((item) => item[1])
-            : []
-    ) as SearchTransaction[];
-    const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? {};
-    const invoiceReceiverPolicy =
-        ReportUtils.isInvoiceReport(report) && report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS
-            ? data[`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver?.policyID}`]
-            : undefined;
-    const violationsCollection = Object.fromEntries(
-        Object.entries(data).filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)),
-    ) as unknown as OnyxCollection<OnyxTypes.TransactionViolations>;
 
     if (ReportUtils.isSettled(report)) {
         return CONST.SEARCH.ACTION_TYPES.PAID;
@@ -295,6 +277,21 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.DONE;
     }
 
+    const policy = data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? {};
+
+    const invoiceReceiverPolicy =
+        ReportUtils.isInvoiceReport(report) && report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS
+            ? data[`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver?.policyID}`]
+            : undefined;
+
+    const allReportTransactions = (
+        isReportEntry(key)
+            ? Object.entries(data)
+                  .filter(([itemKey, value]) => isTransactionEntry(itemKey) && (value as SearchTransaction)?.reportID === report.reportID)
+                  .map((item) => item[1])
+            : []
+    ) as SearchTransaction[];
+
     if (IOU.canIOUBePaid(report, chatReport, policy, allReportTransactions, false, chatReportRNVP, invoiceReceiverPolicy)) {
         return CONST.SEARCH.ACTION_TYPES.PAY;
     }
@@ -303,6 +300,10 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
 
+    const violationsCollection = Object.fromEntries(
+        Object.entries(data).filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)),
+    ) as unknown as OnyxCollection<OnyxTypes.TransactionViolations>;
+
     if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction, violationsCollection)) {
         return CONST.SEARCH.ACTION_TYPES.SUBMIT;
     }

From 17ce03d32bd091c8272b4a7bc59a2b622d13e9f2 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 14:38:34 -0600
Subject: [PATCH 037/100] rm violations code since its not ready yet

---
 src/libs/SearchUIUtils.ts          | 13 -------------
 src/libs/TransactionUtils/index.ts |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index c53638b61aa6..5df592c0acef 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -300,19 +300,6 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUs
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
 
-    const violationsCollection = Object.fromEntries(
-        Object.entries(data).filter(([itemKey]) => itemKey.startsWith(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS)),
-    ) as unknown as OnyxCollection<OnyxTypes.TransactionViolations>;
-
-    if (IOU.canReportBeSubmitted(report, policy, currentUserAccountID, transaction, violationsCollection)) {
-        return CONST.SEARCH.ACTION_TYPES.SUBMIT;
-    }
-
-    const hasViolations = transaction ? TransactionUtils.hasViolation(transaction.transactionID, violationsCollection) : ReportUtils.hasViolations(report.reportID, violationsCollection);
-    if (hasViolations) {
-        return CONST.SEARCH.ACTION_TYPES.REVIEW;
-    }
-
     return CONST.SEARCH.ACTION_TYPES.VIEW;
 }
 
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index f8f9f9e9dc7e..8935b8d8ec54 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -678,6 +678,7 @@ function shouldShowBrokenConnectionViolation(
 function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: OnyxCollection<TransactionViolations>): boolean {
     const transactionsWithRTERViolations = transactionIds.map((transactionId) => {
         const transactionViolations = getTransactionViolations(transactionId, searchTransactionViolations ?? allTransactionViolations);
+        console.log('over here', transactionViolations)
         return hasPendingRTERViolation(transactionViolations);
     });
     return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);

From 01aa98f0eaa0de6b0697685ab3da9956fc34ac92 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 14:49:10 -0600
Subject: [PATCH 038/100] add callbacks

---
 src/components/SelectionList/Search/ReportListItem.tsx | 9 ++++++++-
 src/libs/TransactionUtils/index.ts                     | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
index 4a88c9ef9b26..6ed9a7831583 100644
--- a/src/components/SelectionList/Search/ReportListItem.tsx
+++ b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -94,7 +94,14 @@ function ReportListItem<TItem extends ListItem>({
     ];
 
     const handleOnButtonPress = () => {
-        onSelectRow(item);
+        switch (reportItem.action) {
+            case CONST.SEARCH.ACTION_TYPES.APPROVE:
+                return console.log('approve');
+            case CONST.SEARCH.ACTION_TYPES.PAY:
+                return console.log('pay');
+            default:
+                return onSelectRow(item);
+        }
     };
 
     const openReportInRHP = (transactionItem: TransactionListItemType) => {
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 8935b8d8ec54..f8f9f9e9dc7e 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -678,7 +678,6 @@ function shouldShowBrokenConnectionViolation(
 function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: OnyxCollection<TransactionViolations>): boolean {
     const transactionsWithRTERViolations = transactionIds.map((transactionId) => {
         const transactionViolations = getTransactionViolations(transactionId, searchTransactionViolations ?? allTransactionViolations);
-        console.log('over here', transactionViolations)
         return hasPendingRTERViolation(transactionViolations);
     });
     return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);

From 0ad354c96b75e7f9ebc635119757e5ee2d377484 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 17:27:58 -0600
Subject: [PATCH 039/100] create action to handle callbacks

---
 .../SelectionList/Search/ReportListItem.tsx   | 12 +++----
 src/libs/actions/Search.ts                    | 36 ++++++++++++++-----
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
index 6ed9a7831583..20a9970e77c3 100644
--- a/src/components/SelectionList/Search/ReportListItem.tsx
+++ b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import {View} from 'react-native';
 import Checkbox from '@components/Checkbox';
+import {useSearchContext} from '@components/Search/SearchContext';
 import BaseListItem from '@components/SelectionList/BaseListItem';
 import type {ListItem, ReportListItemProps, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
 import Text from '@components/Text';
@@ -10,6 +11,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {handleActionButtonPress} from '@libs/actions/Search';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
@@ -69,6 +71,7 @@ function ReportListItem<TItem extends ListItem>({
     const styles = useThemeStyles();
     const {isLargeScreenWidth} = useResponsiveLayout();
     const StyleUtils = useStyleUtils();
+    const {currentSearchHash} = useSearchContext();
 
     const animatedHighlightStyle = useAnimatedHighlightStyle({
         borderRadius: variables.componentBorderRadius,
@@ -94,14 +97,7 @@ function ReportListItem<TItem extends ListItem>({
     ];
 
     const handleOnButtonPress = () => {
-        switch (reportItem.action) {
-            case CONST.SEARCH.ACTION_TYPES.APPROVE:
-                return console.log('approve');
-            case CONST.SEARCH.ACTION_TYPES.PAY:
-                return console.log('pay');
-            default:
-                return onSelectRow(item);
-        }
+        handleActionButtonPress(currentSearchHash, reportItem, () => onSelectRow(item));
     };
 
     const openReportInRHP = (transactionItem: TransactionListItemType) => {
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index caef871571ed..3fe073d7f944 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import type {OnyxUpdate} from 'react-native-onyx';
+import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {FormOnyxValues} from '@components/Form/types';
 import type {SearchQueryJSON} from '@components/Search/types';
@@ -12,7 +12,8 @@ import enhanceParameters from '@libs/Network/enhanceParameters';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
-import type {SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {LastPaymentMethod} from '@src/types/onyx';
+import type {SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
 import * as Report from './Report';
 
 let currentUserEmail: string;
@@ -23,6 +24,26 @@ Onyx.connect({
     },
 });
 
+let lastPaymentMethod: OnyxEntry<LastPaymentMethod>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
+    callback: (val) => {
+        lastPaymentMethod = val;
+    },
+});
+
+function handleActionButtonPress(hash: number, item: SearchTransaction | SearchReport, callback: () => void) {
+    const lastPolicyPaymentMethod = item.policyID ? lastPaymentMethod?.policyID : null;
+    switch (item.action) {
+        case CONST.SEARCH.ACTION_TYPES.PAY:
+            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, lastPolicyPaymentMethod, {[item.reportID]: 0}) : callback();
+        case CONST.SEARCH.ACTION_TYPES.APPROVE:
+            return approveMoneyRequestOnSearch(hash, [item.reportID]);
+        default:
+            return callback();
+    }
+}
+
 function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finallyData: OnyxUpdate[]} {
     const optimisticData: OnyxUpdate[] = [
         {
@@ -164,20 +185,16 @@ function holdMoneyRequestOnSearch(hash: number, transactionIDList: string[], com
     API.write(WRITE_COMMANDS.HOLD_MONEY_REQUEST_ON_SEARCH, {hash, transactionIDList, comment}, {optimisticData, finallyData});
 }
 
-// this function will be used once https://github.com/Expensify/App/pull/51445 is merged
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function approveMoneyRequestOnSearch(hash: number, reportIDList: string[]) {
     const {optimisticData, finallyData} = getOnyxLoadingData(hash);
 
     API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH, {hash, reportIDList}, {optimisticData, finallyData});
 }
 
-// this function will be used once https://github.com/Expensify/App/pull/51445 is merged
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function payMoneyRequestOnSearch(hash: number, paymentType: string, reportsAndAmounts: string) {
+function payMoneyRequestOnSearch(hash: number, paymentType: string, reportsAndAmounts: Record<string, number>) {
     const {optimisticData, finallyData} = getOnyxLoadingData(hash);
 
-    API.write(WRITE_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH, {hash, paymentType, reportsAndAmounts}, {optimisticData, finallyData});
+    API.write(WRITE_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH, {hash, paymentType, reportsAndAmounts: JSON.stringify(reportsAndAmounts)}, {optimisticData, finallyData});
 }
 
 function unholdMoneyRequestOnSearch(hash: number, transactionIDList: string[]) {
@@ -261,4 +278,7 @@ export {
     deleteSavedSearch,
     dismissSavedSearchRenameTooltip,
     showSavedSearchRenameTooltip,
+    payMoneyRequestOnSearch,
+    approveMoneyRequestOnSearch,
+    handleActionButtonPress,
 };

From 89f4ebe0b5dd67e92633e38ccb220476d12314ba Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 30 Oct 2024 17:29:32 -0600
Subject: [PATCH 040/100] add callback to transaction list item

---
 src/components/SelectionList/Search/TransactionListItem.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/SelectionList/Search/TransactionListItem.tsx b/src/components/SelectionList/Search/TransactionListItem.tsx
index 4fd1ec4cce75..d5df46cb2e19 100644
--- a/src/components/SelectionList/Search/TransactionListItem.tsx
+++ b/src/components/SelectionList/Search/TransactionListItem.tsx
@@ -1,10 +1,12 @@
 import React from 'react';
+import {useSearchContext} from '@components/Search/SearchContext';
 import BaseListItem from '@components/SelectionList/BaseListItem';
 import type {ListItem, TransactionListItemProps, TransactionListItemType} from '@components/SelectionList/types';
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {handleActionButtonPress} from '@libs/actions/Search';
 import variables from '@styles/variables';
 import TransactionListItemRow from './TransactionListItemRow';
 
@@ -26,6 +28,7 @@ function TransactionListItem<TItem extends ListItem>({
     const theme = useTheme();
 
     const {isLargeScreenWidth} = useResponsiveLayout();
+    const {currentSearchHash} = useSearchContext();
 
     const listItemPressableStyle = [
         styles.selectionListPressableItemWrapper,
@@ -76,7 +79,7 @@ function TransactionListItem<TItem extends ListItem>({
                 item={transactionItem}
                 showTooltip={showTooltip}
                 onButtonPress={() => {
-                    onSelectRow(item);
+                    handleActionButtonPress(currentSearchHash, transactionItem, () => onSelectRow(item));
                 }}
                 onCheckboxPress={() => onCheckboxPress?.(item)}
                 isDisabled={!!isDisabled}

From 4a4481fdbf0d889929b3650da20b2d7348083a54 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 31 Oct 2024 14:29:38 -0600
Subject: [PATCH 041/100] rename param

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

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 3fe073d7f944..b3ae8b1d8faf 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -32,15 +32,15 @@ Onyx.connect({
     },
 });
 
-function handleActionButtonPress(hash: number, item: SearchTransaction | SearchReport, callback: () => void) {
+function handleActionButtonPress(hash: number, item: SearchTransaction | SearchReport, goToItem: () => void) {
     const lastPolicyPaymentMethod = item.policyID ? lastPaymentMethod?.policyID : null;
     switch (item.action) {
         case CONST.SEARCH.ACTION_TYPES.PAY:
-            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, lastPolicyPaymentMethod, {[item.reportID]: 0}) : callback();
+            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, lastPolicyPaymentMethod, {[item.reportID]: 0}) : goToItem();
         case CONST.SEARCH.ACTION_TYPES.APPROVE:
             return approveMoneyRequestOnSearch(hash, [item.reportID]);
         default:
-            return callback();
+            return goToItem();
     }
 }
 

From ee12a893b7ac890d4eab0c6c86113ed00ab12432 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 31 Oct 2024 14:30:57 -0600
Subject: [PATCH 042/100] fix payment method

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

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index b3ae8b1d8faf..9395e58d4099 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -33,7 +33,7 @@ Onyx.connect({
 });
 
 function handleActionButtonPress(hash: number, item: SearchTransaction | SearchReport, goToItem: () => void) {
-    const lastPolicyPaymentMethod = item.policyID ? lastPaymentMethod?.policyID : null;
+    const lastPolicyPaymentMethod = item.policyID ? lastPaymentMethod?.[item.policyID] : null;
     switch (item.action) {
         case CONST.SEARCH.ACTION_TYPES.PAY:
             return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, lastPolicyPaymentMethod, {[item.reportID]: 0}) : goToItem();

From 3ee97f8b231295967545764eea5ed80c428eaae7 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 31 Oct 2024 16:20:07 -0600
Subject: [PATCH 043/100] revert unrelated change

---
 src/components/Search/index.tsx | 2 +-
 src/libs/SearchUIUtils.ts       | 1 -
 src/libs/actions/Search.ts      | 9 ++++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 52ada9fb9328..9238488361b0 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -249,7 +249,7 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
                 });
             });
         }
-        // setSelectedTransactions(newTransactionList, data);
+        setSelectedTransactions(newTransactionList, data);
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [data, setSelectedTransactions]);
 
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 5df592c0acef..88c417f9ce7e 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -1,4 +1,3 @@
-import type {OnyxCollection} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {SearchColumnType, SearchStatus, SortOrder} from '@components/Search/types';
 import ChatListItem from '@components/SelectionList/ChatListItem';
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 9395e58d4099..556fe76df4d1 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -3,17 +3,19 @@ import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {FormOnyxValues} from '@components/Form/types';
 import type {SearchQueryJSON} from '@components/Search/types';
+import type {ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
 import * as API from '@libs/API';
 import type {ExportSearchItemsToCSVParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import * as ApiUtils from '@libs/ApiUtils';
 import fileDownload from '@libs/fileDownload';
 import enhanceParameters from '@libs/Network/enhanceParameters';
+import {isReportListItemType} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {LastPaymentMethod} from '@src/types/onyx';
-import type {SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {SearchTransaction} from '@src/types/onyx/SearchResults';
 import * as Report from './Report';
 
 let currentUserEmail: string;
@@ -32,11 +34,12 @@ Onyx.connect({
     },
 });
 
-function handleActionButtonPress(hash: number, item: SearchTransaction | SearchReport, goToItem: () => void) {
+function handleActionButtonPress(hash: number, item: TransactionListItemType | ReportListItemType, goToItem: () => void) {
     const lastPolicyPaymentMethod = item.policyID ? lastPaymentMethod?.[item.policyID] : null;
+    const amount = isReportListItemType(item) ? item.total ?? 0 : item.formattedTotal;
     switch (item.action) {
         case CONST.SEARCH.ACTION_TYPES.PAY:
-            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, lastPolicyPaymentMethod, {[item.reportID]: 0}) : goToItem();
+            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, lastPolicyPaymentMethod, {[item.reportID]: amount}) : goToItem();
         case CONST.SEARCH.ACTION_TYPES.APPROVE:
             return approveMoneyRequestOnSearch(hash, [item.reportID]);
         default:

From 77ae5ef37340bb480103a6ef91e344dc93b0d91c Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 31 Oct 2024 16:25:37 -0600
Subject: [PATCH 044/100] fix tscheck

---
 src/libs/SearchUIUtils.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 88c417f9ce7e..29537b9c8368 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -13,7 +13,6 @@ import type * as OnyxTypes from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction, SearchTransactionAction} from '@src/types/onyx/SearchResults';
 import * as IOU from './actions/IOU';
-import * as Report from './actions/Report';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {translateLocal} from './Localize';
@@ -212,9 +211,7 @@ function getIOUReportName(data: OnyxTypes.SearchResults['data'], reportItem: Sea
  */
 function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']): TransactionListItemType[] {
     const shouldShowMerchant = getShouldShowMerchant(data);
-
     const doesDataContainAPastYearTransaction = shouldShowYear(data);
-    const currentUserAccountID = Report.getCurrentUserAccountID();
 
     return Object.keys(data)
         .filter(isTransactionEntry)
@@ -227,7 +224,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
 
             return {
                 ...transactionItem,
-                action: getAction(data, key, currentUserAccountID),
+                action: getAction(data, key),
                 from,
                 to,
                 formattedFrom,
@@ -251,7 +248,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
  *
  * Do not use directly, use only via `getSections()` facade.
  */
-function getAction(data: OnyxTypes.SearchResults['data'], key: string, currentUserAccountID: number): SearchTransactionAction {
+function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTransactionAction {
     const isTransaction = isTransactionEntry(key);
     if ((!isTransaction && !isReportEntry(key)) || (isTransaction && !data[key].isFromOneTransactionReport)) {
         return CONST.SEARCH.ACTION_TYPES.VIEW;
@@ -339,7 +336,6 @@ function getReportActionsSections(data: OnyxTypes.SearchResults['data']): Report
  * Do not use directly, use only via `getSections()` facade.
  */
 function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']): ReportListItemType[] {
-    const currentUserAccountID = Report.getCurrentUserAccountID();
     const shouldShowMerchant = getShouldShowMerchant(data);
 
     const doesDataContainAPastYearTransaction = shouldShowYear(data);
@@ -354,7 +350,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
 
             reportIDToTransactions[reportKey] = {
                 ...reportItem,
-                action: getAction(data, key, currentUserAccountID),
+                action: getAction(data, key),
                 keyForList: reportItem.reportID,
                 from: data.personalDetailsList?.[reportItem.accountID ?? -1],
                 to: reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails,
@@ -372,7 +368,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
 
             const transaction = {
                 ...transactionItem,
-                action: getAction(data, key, currentUserAccountID),
+                action: getAction(data, key),
                 from,
                 to,
                 formattedFrom,

From a49494b773d953bbf7c026488570288909bb32a5 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 1 Nov 2024 15:08:45 -0600
Subject: [PATCH 045/100] rm violations code because its not ready

---
 src/libs/TransactionUtils/index.ts | 17 ++++++-----------
 src/libs/actions/IOU.ts            | 24 ------------------------
 src/types/onyx/SearchResults.ts    |  4 +---
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index f8f9f9e9dc7e..faeebdf7e426 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -648,8 +648,8 @@ function hasPendingRTERViolation(transactionViolations?: TransactionViolations |
 /**
  * Check if there is broken connection violation.
  */
-function hasBrokenConnectionViolation(transactionID: string, allViolations?: OnyxCollection<TransactionViolations>): boolean {
-    const violations = getTransactionViolations(transactionID, allViolations ?? allTransactionViolations);
+function hasBrokenConnectionViolation(transactionID: string): boolean {
+    const violations = getTransactionViolations(transactionID, allTransactionViolations);
     return !!violations?.find(
         (violation) =>
             violation.name === CONST.VIOLATIONS.RTER &&
@@ -660,14 +660,9 @@ function hasBrokenConnectionViolation(transactionID: string, allViolations?: Ony
 /**
  * Check if user should see broken connection violation warning.
  */
-function shouldShowBrokenConnectionViolation(
-    transactionID: string,
-    report: OnyxEntry<Report> | SearchReport,
-    policy: OnyxEntry<Policy> | SearchPolicy,
-    allViolations?: OnyxCollection<TransactionViolations>,
-): boolean {
+function shouldShowBrokenConnectionViolation(transactionID: string, report: OnyxEntry<Report> | SearchReport, policy: OnyxEntry<Policy> | SearchPolicy): boolean {
     return (
-        hasBrokenConnectionViolation(transactionID, allViolations) &&
+        hasBrokenConnectionViolation(transactionID) &&
         (!PolicyUtils.isPolicyAdmin(policy) || ReportUtils.isOpenExpenseReport(report) || (ReportUtils.isProcessingReport(report) && PolicyUtils.isInstantSubmitEnabled(policy)))
     );
 }
@@ -675,9 +670,9 @@ function shouldShowBrokenConnectionViolation(
 /**
  * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
  */
-function allHavePendingRTERViolation(transactionIds: string[], searchTransactionViolations?: OnyxCollection<TransactionViolations>): boolean {
+function allHavePendingRTERViolation(transactionIds: string[]): boolean {
     const transactionsWithRTERViolations = transactionIds.map((transactionId) => {
-        const transactionViolations = getTransactionViolations(transactionId, searchTransactionViolations ?? allTransactionViolations);
+        const transactionViolations = getTransactionViolations(transactionId, allTransactionViolations);
         return hasPendingRTERViolation(transactionViolations);
     });
     return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index d3b54cb4e1aa..bb6c1a94c88b 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7111,29 +7111,6 @@ function canIOUBePaid(
     );
 }
 
-function canReportBeSubmitted(
-    moneyRequestReport: OnyxEntry<OnyxTypes.Report> | SearchReport,
-    policy: OnyxEntry<OnyxTypes.Policy> | SearchPolicy,
-    currentUserAccountID: number,
-    transaction?: OnyxTypes.Transaction | SearchTransaction,
-    violations?: OnyxCollection<OnyxTypes.TransactionViolations>,
-) {
-    const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
-    const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);
-    const hasAllPendingRTERViolations = TransactionUtils.allHavePendingRTERViolation([transaction?.transactionID ?? '-1'], violations);
-    const shouldShowBrokenConnectionViolation = TransactionUtils.shouldShowBrokenConnectionViolation(transaction?.transactionID ?? '-1', moneyRequestReport, policy, violations);
-    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
-
-    return (
-        !!moneyRequestReport &&
-        isDraft &&
-        reimbursableSpend !== 0 &&
-        !hasAllPendingRTERViolations &&
-        !shouldShowBrokenConnectionViolation &&
-        (moneyRequestReport?.ownerAccountID === currentUserAccountID || isAdmin || moneyRequestReport?.managerID === currentUserAccountID)
-    );
-}
-
 function getIOUReportActionToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report>, excludedIOUReportID: string): OnyxEntry<ReportAction> {
     const chatReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`] ?? {};
 
@@ -8645,6 +8622,5 @@ export {
     updateLastLocationPermissionPrompt,
     resolveDuplicates,
     getIOUReportActionToApproveOrPay,
-    canReportBeSubmitted,
 };
 export type {GPSPoint as GpsPoint, IOURequestType};
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 26d258a0142a..af9b2c06265f 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -9,7 +9,6 @@ import type ONYXKEYS from '@src/ONYXKEYS';
 import type {InvoiceReceiver} from './Report';
 import type ReportActionName from './ReportActionName';
 import type ReportNameValuePairs from './ReportNameValuePairs';
-import type TransactionViolations from './TransactionViolation';
 
 /** Types of search data */
 type SearchDataTypes = ValueOf<typeof CONST.SEARCH.DATA_TYPES>;
@@ -354,8 +353,7 @@ type SearchResults = {
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS, Record<string, SearchReportAction>> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT, SearchReport> &
         PrefixedRecord<typeof ONYXKEYS.COLLECTION.POLICY, SearchPolicy> &
-        PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, ReportNameValuePairs> &
-        PrefixedRecord<typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, TransactionViolations>;
+        PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, ReportNameValuePairs>;
 
     /** Whether search data is being fetched from server */
     isLoading?: boolean;

From 460e4aa34c55256936afbd47d3a76c3156404ceb Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 4 Nov 2024 23:26:15 +0530
Subject: [PATCH 046/100] v1 changes

---
 .../FloatingActionButtonAndPopover.tsx        | 67 +++++++++++++++----
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index a49b474b185e..f3caffa2a7a0 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -6,6 +6,7 @@ import {View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg';
+import ConfirmModal from '@components/ConfirmModal';
 import FloatingActionButton from '@components/FloatingActionButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import type {PopoverMenuItem} from '@components/PopoverMenu';
@@ -28,6 +29,7 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as App from '@userActions/App';
 import * as IOU from '@userActions/IOU';
+import * as Link from '@userActions/Link';
 import * as Policy from '@userActions/Policy/Policy';
 import * as Report from '@userActions/Report';
 import * as Task from '@userActions/Task';
@@ -180,6 +182,7 @@ function FloatingActionButtonAndPopover(
     const {translate} = useLocalize();
     const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${quickActionReport?.reportID ?? -1}`);
     const [isCreateMenuActive, setIsCreateMenuActive] = useState(false);
+    const [modalVisible, setModalVisible] = useState(false);
     const fabRef = useRef<HTMLDivElement>(null);
     const {windowHeight} = useWindowDimensions();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -190,6 +193,14 @@ function FloatingActionButtonAndPopover(
     const {canUseSpotnanaTravel, canUseCombinedTrackSubmit} = usePermissions();
     const canSendInvoice = useMemo(() => PolicyUtils.canSendInvoice(allPolicies as OnyxCollection<OnyxTypes.Policy>, session?.email), [allPolicies, session?.email]);
 
+    const shouldRedirectToOD = useMemo(() => {
+        const groupPolicies = Object.values(allPolicies ?? {}).filter((policy) => ReportUtils.isGroupPolicy(policy?.type ?? ''));
+        if (groupPolicies.length === 0) {
+            return false;
+        }
+        return groupPolicies.every((policy) => !policy?.isPolicyExpenseChatEnabled);
+    }, [allPolicies]);
+
     const quickActionAvatars = useMemo(() => {
         if (quickActionReport) {
             const avatars = ReportUtils.getIcons(quickActionReport, personalDetails);
@@ -360,14 +371,18 @@ function FloatingActionButtonAndPopover(
                     icon: getIconForAction(CONST.IOU.TYPE.CREATE),
                     text: translate('iou.createExpense'),
                     onSelected: () =>
-                        interceptAnonymousUser(() =>
+                        interceptAnonymousUser(() => {
+                            if (shouldRedirectToOD) {
+                                setModalVisible(true);
+                                return;
+                            }
                             IOU.startMoneyRequest(
                                 CONST.IOU.TYPE.CREATE,
                                 // When starting to create an expense from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
                                 // for all of the routes in the creation flow.
                                 ReportUtils.generateReportID(),
-                            ),
-                        ),
+                            );
+                        }),
                 },
             ];
         }
@@ -379,15 +394,19 @@ function FloatingActionButtonAndPopover(
                           icon: getIconForAction(CONST.IOU.TYPE.TRACK),
                           text: translate('iou.trackExpense'),
                           onSelected: () => {
-                              interceptAnonymousUser(() =>
+                              if (shouldRedirectToOD) {
+                                  setModalVisible(true);
+                                  return;
+                              }
+                              interceptAnonymousUser(() => {
                                   IOU.startMoneyRequest(
                                       CONST.IOU.TYPE.TRACK,
                                       // When starting to create a track expense from the global FAB, we need to retrieve selfDM reportID.
                                       // If it doesn't exist, we generate a random optimistic reportID and use it for all of the routes in the creation flow.
                                       // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                                       ReportUtils.findSelfDMReportID() || ReportUtils.generateReportID(),
-                                  ),
-                              );
+                                  );
+                              });
                               if (!hasSeenTrackTraining && !isOffline) {
                                   setTimeout(() => {
                                       Navigation.navigate(ROUTES.TRACK_TRAINING_MODAL);
@@ -401,17 +420,22 @@ function FloatingActionButtonAndPopover(
                 icon: getIconForAction(CONST.IOU.TYPE.REQUEST),
                 text: translate('iou.submitExpense'),
                 onSelected: () =>
-                    interceptAnonymousUser(() =>
+                    interceptAnonymousUser(() => {
+                        if (shouldRedirectToOD) {
+                            setModalVisible(true);
+                            return;
+                        }
+
                         IOU.startMoneyRequest(
                             CONST.IOU.TYPE.SUBMIT,
                             // When starting to create an expense from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
                             // for all of the routes in the creation flow.
                             ReportUtils.generateReportID(),
-                        ),
-                    ),
+                        );
+                    }),
             },
         ];
-    }, [canUseCombinedTrackSubmit, translate, selfDMReportID, hasSeenTrackTraining, isOffline]);
+    }, [canUseCombinedTrackSubmit, translate, selfDMReportID, hasSeenTrackTraining, isOffline, shouldRedirectToOD]);
 
     return (
         <View style={styles.flexGrow1}>
@@ -434,14 +458,19 @@ function FloatingActionButtonAndPopover(
                                   icon: Expensicons.InvoiceGeneric,
                                   text: translate('workspace.invoices.sendInvoice'),
                                   onSelected: () =>
-                                      interceptAnonymousUser(() =>
+                                      interceptAnonymousUser(() => {
+                                          if (shouldRedirectToOD) {
+                                              setModalVisible(true);
+                                              return;
+                                          }
+
                                           IOU.startMoneyRequest(
                                               CONST.IOU.TYPE.INVOICE,
                                               // When starting to create an invoice from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
                                               // for all of the routes in the creation flow.
                                               ReportUtils.generateReportID(),
-                                          ),
-                                      ),
+                                          );
+                                      }),
                               },
                           ]
                         : []),
@@ -497,6 +526,18 @@ function FloatingActionButtonAndPopover(
                 withoutOverlay
                 anchorRef={fabRef}
             />
+            <ConfirmModal
+                prompt="Due to how your workspace is set up, submitting and tracking expenses has been disabled for now. Please go to Expensify Classic to add an expense."
+                isVisible={modalVisible}
+                onConfirm={() => {
+                    setModalVisible(false);
+                    Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX)
+                }}
+                onCancel={() => setModalVisible(false)}
+                title="Your workspace is not ready for New Expensify"
+                confirmText={translate('exitSurvey.goToExpensifyClassic')}
+                cancelText={translate('common.cancel')}
+            />
             <FloatingActionButton
                 accessibilityLabel={translate('sidebarScreen.fabNewChatExplained')}
                 role={CONST.ROLE.BUTTON}

From e4d7501c519a3134700953b2880625457407efdc Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 4 Nov 2024 23:34:13 +0530
Subject: [PATCH 047/100] prettier diffs

---
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index f3caffa2a7a0..64f094cf2332 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -531,7 +531,7 @@ function FloatingActionButtonAndPopover(
                 isVisible={modalVisible}
                 onConfirm={() => {
                     setModalVisible(false);
-                    Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX)
+                    Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX);
                 }}
                 onCancel={() => setModalVisible(false)}
                 title="Your workspace is not ready for New Expensify"

From e5ebd97fc43d87a8692cd8c2f6214a7d73e2b8b5 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 4 Nov 2024 14:48:46 -0700
Subject: [PATCH 048/100] fix selected color

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

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index d922f0a488d2..bf709c172d48 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -64,9 +64,8 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
         );
     }
 
-    const buttonInnerStyles = isSelected ? styles.buttonDefaultHovered : {};
-
     if (action === CONST.SEARCH.ACTION_TYPES.VIEW || shouldUseViewAction) {
+        const buttonInnerStyles = isSelected ? styles.buttonDefaultHovered : {};
         return isLargeScreenWidth ? (
             <Button
                 text={translate(actionTranslationsMap[CONST.SEARCH.ACTION_TYPES.VIEW])}
@@ -80,6 +79,7 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
         ) : null;
     }
 
+    const buttonInnerStyles = isSelected ? styles.buttonSuccessHovered : {};
     return (
         <Button
             text={text}

From ca22276d9dc0647a59f2e803d0e5936c43c4d036 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 5 Nov 2024 15:42:52 -0700
Subject: [PATCH 049/100] update code to handle array in pay action

---
 src/components/Search/types.ts                         |  8 ++++++++
 .../API/parameters/PayMoneyRequestOnSearchParams.ts    |  5 ++---
 src/libs/actions/Search.ts                             | 10 +++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 2fb034131c86..d496d05acec2 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -24,6 +24,13 @@ type SelectedTransactionInfo = {
 /** Model of selected results */
 type SelectedTransactions = Record<string, SelectedTransactionInfo>;
 
+/** Model of payment data used by Search bulk actions */
+type PaymentData = {
+    reportID: string;
+    amount: number;
+    paymentType: ValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
+};
+
 type SortOrder = ValueOf<typeof CONST.SEARCH.SORT_ORDER>;
 type SearchColumnType = ValueOf<typeof CONST.SEARCH.TABLE_COLUMNS>;
 type ExpenseSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.EXPENSE>;
@@ -114,4 +121,5 @@ export type {
     ChatSearchStatus,
     SearchAutocompleteResult,
     AutocompleteRange,
+    PaymentData,
 };
diff --git a/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts b/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts
index 10174f0baa37..ee51a1961448 100644
--- a/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts
+++ b/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts
@@ -1,11 +1,10 @@
 type PayMoneyRequestOnSearchParams = {
     hash: number;
-    paymentType: string;
     /**
      * Stringified JSON object with type of following structure:
-     * Array<{reportID: string, amount: number}>
+     * Array<{reportID: string, amount: number, paymentMethod: string}>
      */
-    reportsAndAmounts: string;
+    paymentData: string;
 };
 
 export default PayMoneyRequestOnSearchParams;
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 556fe76df4d1..f343d0d6b849 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -2,7 +2,7 @@ import Onyx from 'react-native-onyx';
 import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {FormOnyxValues} from '@components/Form/types';
-import type {SearchQueryJSON} from '@components/Search/types';
+import type {PaymentData, SearchQueryJSON} from '@components/Search/types';
 import type {ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
 import * as API from '@libs/API';
 import type {ExportSearchItemsToCSVParams} from '@libs/API/parameters';
@@ -35,11 +35,11 @@ Onyx.connect({
 });
 
 function handleActionButtonPress(hash: number, item: TransactionListItemType | ReportListItemType, goToItem: () => void) {
-    const lastPolicyPaymentMethod = item.policyID ? lastPaymentMethod?.[item.policyID] : null;
+    const lastPolicyPaymentMethod = item.policyID ? (lastPaymentMethod?.[item.policyID] as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>) : null;
     const amount = isReportListItemType(item) ? item.total ?? 0 : item.formattedTotal;
     switch (item.action) {
         case CONST.SEARCH.ACTION_TYPES.PAY:
-            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, lastPolicyPaymentMethod, {[item.reportID]: amount}) : goToItem();
+            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, [{reportID: item.reportID, amount, paymentType: lastPolicyPaymentMethod}]) : goToItem();
         case CONST.SEARCH.ACTION_TYPES.APPROVE:
             return approveMoneyRequestOnSearch(hash, [item.reportID]);
         default:
@@ -194,10 +194,10 @@ function approveMoneyRequestOnSearch(hash: number, reportIDList: string[]) {
     API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH, {hash, reportIDList}, {optimisticData, finallyData});
 }
 
-function payMoneyRequestOnSearch(hash: number, paymentType: string, reportsAndAmounts: Record<string, number>) {
+function payMoneyRequestOnSearch(hash: number, paymentData: PaymentData[]) {
     const {optimisticData, finallyData} = getOnyxLoadingData(hash);
 
-    API.write(WRITE_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH, {hash, paymentType, reportsAndAmounts: JSON.stringify(reportsAndAmounts)}, {optimisticData, finallyData});
+    API.write(WRITE_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH, {hash, paymentData: JSON.stringify(paymentData)}, {optimisticData, finallyData});
 }
 
 function unholdMoneyRequestOnSearch(hash: number, transactionIDList: string[]) {

From 148c72b7106f15c834c004966c47b8ccb5767a63 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 5 Nov 2024 15:46:30 -0700
Subject: [PATCH 050/100] update docs

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

diff --git a/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts b/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts
index ee51a1961448..a12c0fdc32f2 100644
--- a/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts
+++ b/src/libs/API/parameters/PayMoneyRequestOnSearchParams.ts
@@ -2,7 +2,7 @@ type PayMoneyRequestOnSearchParams = {
     hash: number;
     /**
      * Stringified JSON object with type of following structure:
-     * Array<{reportID: string, amount: number, paymentMethod: string}>
+     * Array<{reportID: string, amount: number, paymentType: string}>
      */
     paymentData: string;
 };

From 432dd76a200a3da76ad991b0f262c1638966a0af Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 6 Nov 2024 11:02:33 +0700
Subject: [PATCH 051/100] fix: hold and unhold expense page is not scrolling
 down

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

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 7a72df9f1d87..772f4c183c45 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8111,6 +8111,11 @@ function putOnHold(transactionID: string, comment: string, reportID: string, sea
         },
         {optimisticData, successData, failureData},
     );
+
+    const report = ReportUtils.getReport(reportID);
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
+    const currentReportID = ReportUtils.isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID;
+    Report.notifyNewAction(currentReportID ?? '', userAccountID);
 }
 
 /**
@@ -8210,6 +8215,11 @@ function unholdRequest(transactionID: string, reportID: string, searchHash?: num
         },
         {optimisticData, successData, failureData},
     );
+
+    const report = ReportUtils.getReport(reportID);
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
+    const currentReportID = ReportUtils.isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID;
+    Report.notifyNewAction(currentReportID ?? '', userAccountID);
 }
 // eslint-disable-next-line rulesdir/no-negated-variables
 function navigateToStartStepIfScanFileCannotBeRead(

From 9861eed014155e3daca052676dfb31308a1934ea Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Wed, 6 Nov 2024 23:37:20 +0530
Subject: [PATCH 052/100] update copy

---
 src/languages/en.ts                                          | 4 ++++
 src/languages/es.ts                                          | 5 +++++
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 38b11e9fea38..506cdd4a7903 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -740,6 +740,10 @@ const translations = {
         listOfChats: 'List of chats',
         saveTheWorld: 'Save the world',
         tooltip: 'Get started here!',
+        redirectToOldDotModal: {
+            title: '🚧 Under construction 🚧',
+            description: "We're fine-tuning a few more bits and pieces of New Expensify to accommodate your specific setup. In the meantime, head over to Expensify Classic.",
+        },
     },
     allSettingsScreen: {
         subscription: 'Subscription',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 11a31c836add..1c12167c37a6 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -734,6 +734,11 @@ const translations = {
         listOfChats: 'lista de chats',
         saveTheWorld: 'Salvar el mundo',
         tooltip: '¡Comienza aquí!',
+        // TODO: ASK FOR TRANSLATIONS
+        redirectToOldDotModal: {
+            title: '🚧 Under construction 🚧',
+            description: "We're fine-tuning a few more bits and pieces of New Expensify to accommodate your specific setup. In the meantime, head over to Expensify Classic.",
+        },
     },
     allSettingsScreen: {
         subscription: 'Suscripcion',
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index d0df88cd48df..676b6d17eef5 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -525,14 +525,14 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                 anchorRef={fabRef}
             />
             <ConfirmModal
-                prompt="Due to how your workspace is set up, submitting and tracking expenses has been disabled for now. Please go to Expensify Classic to add an expense."
+                prompt={translate('sidebarScreen.redirectToOldDotModal.description')}
                 isVisible={modalVisible}
                 onConfirm={() => {
                     setModalVisible(false);
                     Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX);
                 }}
                 onCancel={() => setModalVisible(false)}
-                title="Your workspace is not ready for New Expensify"
+                title={translate('sidebarScreen.redirectToOldDotModal.title')}
                 confirmText={translate('exitSurvey.goToExpensifyClassic')}
                 cancelText={translate('common.cancel')}
             />

From c977d358793bc32f2e095e0d190fa26c573a412b Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 7 Nov 2024 01:06:42 +0530
Subject: [PATCH 053/100] fix trnslation

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

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1c12167c37a6..9b215ee3fcc8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -734,10 +734,9 @@ const translations = {
         listOfChats: 'lista de chats',
         saveTheWorld: 'Salvar el mundo',
         tooltip: '¡Comienza aquí!',
-        // TODO: ASK FOR TRANSLATIONS
         redirectToOldDotModal: {
-            title: '🚧 Under construction 🚧',
-            description: "We're fine-tuning a few more bits and pieces of New Expensify to accommodate your specific setup. In the meantime, head over to Expensify Classic.",
+            title: '🚧 En construcción 🚧',
+            description: 'Estamos ajustando algunos detalles de New Expensify para adaptarla a tu configuración específica. Mientras tanto, dirígete a Expensify Classic.',
         },
     },
     allSettingsScreen: {

From 826b51c70aea696ca59b75e990e19d09843ea747 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Thu, 7 Nov 2024 02:57:40 +0530
Subject: [PATCH 054/100] fix modal hide

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

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 676b6d17eef5..56a812d73ec8 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -353,6 +353,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                 {
                     icon: getIconForAction(CONST.IOU.TYPE.CREATE),
                     text: translate('iou.createExpense'),
+                    shouldCallAfterModalHide: shouldRedirectToOD,
                     onSelected: () =>
                         interceptAnonymousUser(() => {
                             if (shouldRedirectToOD) {
@@ -376,6 +377,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                       {
                           icon: getIconForAction(CONST.IOU.TYPE.TRACK),
                           text: translate('iou.trackExpense'),
+                          shouldCallAfterModalHide: shouldRedirectToOD,
                           onSelected: () => {
                               if (shouldRedirectToOD) {
                                   setModalVisible(true);
@@ -402,6 +404,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
             {
                 icon: getIconForAction(CONST.IOU.TYPE.REQUEST),
                 text: translate('iou.submitExpense'),
+                shouldCallAfterModalHide: shouldRedirectToOD,
                 onSelected: () =>
                     interceptAnonymousUser(() => {
                         if (shouldRedirectToOD) {

From 75ef6fd0e0d72491d186149e3526c5b318034455 Mon Sep 17 00:00:00 2001
From: James Dean <james@expensify.com>
Date: Wed, 6 Nov 2024 15:06:22 -0800
Subject: [PATCH 055/100] Update en.ts

minor grammatical tweaks for consistency
---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 38b11e9fea38..f0f9973278b2 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3402,7 +3402,7 @@ const translations = {
             },
             rules: {
                 title: 'Rules',
-                subtitle: 'Configure when receipts are required, flag high spend, and more.',
+                subtitle: 'Require receipts, flag high spend, and more.',
             },
         },
         reportFields: {

From ff68df4488cb800f88b0ff0f0a61fb108f936b07 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 7 Nov 2024 11:32:42 +0700
Subject: [PATCH 056/100] add utils function

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

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a62716975c01..8d555bb0b1b4 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1698,6 +1698,13 @@ function isOneTransactionThread(reportID: string, parentReportID: string, thread
     return reportID === transactionThreadReportID && !ReportActionsUtils.isSentMoneyReportAction(threadParentReportAction);
 }
 
+function getCurrentReportIDInOneTransactionThread(reportID: string) {
+    const report = getReport(reportID);
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
+    const currentReportID = isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID;
+    return currentReportID;
+}
+
 /**
  * Should return true only for personal 1:1 report
  *
@@ -8553,6 +8560,7 @@ export {
     getTaskAssigneeChatOnyxData,
     getTransactionDetails,
     getTransactionReportName,
+    getCurrentReportIDInOneTransactionThread,
     getTransactionsWithReceipts,
     getUserDetailTooltipText,
     getWhisperDisplayNames,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 772f4c183c45..a27459eab835 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8112,9 +8112,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string, sea
         {optimisticData, successData, failureData},
     );
 
-    const report = ReportUtils.getReport(reportID);
-    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
-    const currentReportID = ReportUtils.isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID;
+    const currentReportID = ReportUtils.getCurrentReportIDInOneTransactionThread(reportID);
     Report.notifyNewAction(currentReportID ?? '', userAccountID);
 }
 
@@ -8216,9 +8214,7 @@ function unholdRequest(transactionID: string, reportID: string, searchHash?: num
         {optimisticData, successData, failureData},
     );
 
-    const report = ReportUtils.getReport(reportID);
-    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
-    const currentReportID = ReportUtils.isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID;
+    const currentReportID = ReportUtils.getCurrentReportIDInOneTransactionThread(reportID);
     Report.notifyNewAction(currentReportID ?? '', userAccountID);
 }
 // eslint-disable-next-line rulesdir/no-negated-variables

From a798c010bba7dca8ac0ea1a8d991cdb70db15f36 Mon Sep 17 00:00:00 2001
From: Garrett Knight <gknight@expensify.com>
Date: Thu, 7 Nov 2024 11:55:09 +0000
Subject: [PATCH 057/100] Create plan-types-and-pricing.md

---
 .../plan-types-and-pricing.md                 | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 docs/articles/new-expensify/billing-and-subscriptions/plan-types-and-pricing.md

diff --git a/docs/articles/new-expensify/billing-and-subscriptions/plan-types-and-pricing.md b/docs/articles/new-expensify/billing-and-subscriptions/plan-types-and-pricing.md
new file mode 100644
index 000000000000..bc39e33bab4a
--- /dev/null
+++ b/docs/articles/new-expensify/billing-and-subscriptions/plan-types-and-pricing.md
@@ -0,0 +1,48 @@
+---
+title: Expensify plan types and pricing 
+description: An overview of plan types and pricing
+---
+<div id="new-expensify" markdown="1">
+
+Expensify offers plans and flexible pricing to cater to different business sizes and needs, whether you’re self-employed, part of a large organization, or anything in between.
+
+# Choosing the Right Plan
+
+Expensify offers two pricing plans:
+
+
+|                    | Collect Plan                                         | Control Plan                             |
+|--------------------|---------------------------|---------------------------------------------------------|
+| **Ideal for:**         | Sole proprietors and small teams or businesses with 1-10 employees                | Larger companies with 10-1000 employees and more complex expense management needs |
+| **Pricing starts at:** | $5 USD per user/month on an annual subscription (Non-USD prices available in FAQ) | $9 USD per user/month on an annual subscription (Non-USD prices available in FAQ) |
+|                    | ✔ Unlimited SmartScans and distance tracking                                      | ✔ All Collect Plan features                                                       |
+|                    | ✔ Expensify Cards with Smart Limits and cash back                                                | ✔ Third-party card feeds and reconciliation                                       |
+|                    | ✔ Expense approvals                                                               | ✔ Integration with NetSuite, Sage Intacct, and QuickBooks Desktop                 |
+|                    | ✔ Unlimited ACH reimbursement                                                     | ✔ Gusto, Zenefits, Certinia, and Workday sync                                     |
+|                    | ✔ Integration with QuickBooks Online and Xero                                     | ✔ Multiple expense approvers                                                      |
+|                    |                                                                                   | ✔ SAML/SSO for added security                                                     |
+|                    |                                                                                   | ✔ Admin-enforced controls                                                         |
+
+Expensify Card usage on both plans generates 1% cash back with every swipe on US purchases --- no minimums necessary --- and 2% back if you spend $250k+/month across cards.
+
+# FAQ
+
+## How much does Expensify cost?
+
+The cost depends on your plan and subscription type. Expensify offers a 50% discount for annual subscriptions and up to another 50% discount for using Expensify Cards. Try out our [savings calculator](https://use.expensify.com/savings-calculator) for an easy estimate based on your numbers.
+
+## Does Expensify bill in non-USD currencies?
+
+Yes! Customers can pay for Expensify in AUD, GBP, or NZD in addition to USD. 
+- The Collect plan begins at A$14, £8, or NZ$16 per user/month on an annual subscription
+- The Control plan begins at A$30, £14, or NZ$32 per user/month on an annual subscription
+
+## Is Expensify free for individuals?
+
+Yes! Individuals can use Expensify for free to track expenses.
+
+## How do I get more info about pricing?
+
+For customized information or help choosing the right plan, reach out to Expensify Concierge or email concierge@expensify.com.
+
+</div> 

From 26552e3904ea6480a678567f3ccb45ac0dc9ec3a Mon Sep 17 00:00:00 2001
From: Garrett Knight <gknight@expensify.com>
Date: Thu, 7 Nov 2024 12:02:20 +0000
Subject: [PATCH 058/100] Rename plan-types-and-pricing.md to
 Plan-types-and-pricing.md

---
 .../{plan-types-and-pricing.md => Plan-types-and-pricing.md}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/articles/new-expensify/billing-and-subscriptions/{plan-types-and-pricing.md => Plan-types-and-pricing.md} (100%)

diff --git a/docs/articles/new-expensify/billing-and-subscriptions/plan-types-and-pricing.md b/docs/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing.md
similarity index 100%
rename from docs/articles/new-expensify/billing-and-subscriptions/plan-types-and-pricing.md
rename to docs/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing.md

From b43bf9979a424d2d74488f9bbef864f6bf910c18 Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Thu, 7 Nov 2024 16:49:37 +0100
Subject: [PATCH 059/100] Refactor & remove IOU operations

---
 .../API/parameters/EditMoneyRequestParams.ts  |  14 -
 src/libs/API/parameters/index.ts              |   1 -
 src/libs/API/types.ts                         |   4 -
 src/libs/TransactionUtils/index.ts            |  18 +-
 src/libs/actions/IOU.ts                       | 390 +++---------------
 tests/actions/IOUTest.ts                      |  25 +-
 6 files changed, 72 insertions(+), 380 deletions(-)
 delete mode 100644 src/libs/API/parameters/EditMoneyRequestParams.ts

diff --git a/src/libs/API/parameters/EditMoneyRequestParams.ts b/src/libs/API/parameters/EditMoneyRequestParams.ts
deleted file mode 100644
index 6d320510e267..000000000000
--- a/src/libs/API/parameters/EditMoneyRequestParams.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-type EditMoneyRequestParams = {
-    transactionID: string;
-    reportActionID: string;
-    created?: string;
-    amount?: number;
-    currency?: string;
-    comment?: string;
-    merchant?: string;
-    category?: string;
-    billable?: boolean;
-    tag?: string;
-};
-
-export default EditMoneyRequestParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index fb5558fb0350..a6fca0ea19e8 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -157,7 +157,6 @@ export type {default as StartSplitBillParams} from './StartSplitBillParams';
 export type {default as SendMoneyParams} from './SendMoneyParams';
 export type {default as ApproveMoneyRequestParams} from './ApproveMoneyRequestParams';
 export type {default as UnapproveExpenseReportParams} from './UnapproveExpenseReportParams';
-export type {default as EditMoneyRequestParams} from './EditMoneyRequestParams';
 export type {default as ReplaceReceiptParams} from './ReplaceReceiptParams';
 export type {default as SubmitReportParams} from './SubmitReportParams';
 export type {default as DetachReceiptParams} from './DetachReceiptParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index b8b4bb749701..855e0c26950f 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -192,7 +192,6 @@ const WRITE_COMMANDS = {
     HOLD_MONEY_REQUEST: 'HoldRequest',
     UPDATE_BILLING_CARD_CURRENCY: 'UpdateBillingCardCurrency',
     UNHOLD_MONEY_REQUEST: 'UnHoldRequest',
-    UPDATE_DISTANCE_REQUEST: 'UpdateDistanceRequest',
     REQUEST_MONEY: 'RequestMoney',
     SPLIT_BILL: 'SplitBill',
     SPLIT_BILL_AND_OPEN_REPORT: 'SplitBillAndOpenReport',
@@ -203,7 +202,6 @@ const WRITE_COMMANDS = {
     SEND_MONEY_WITH_WALLET: 'SendMoneyWithWallet',
     APPROVE_MONEY_REQUEST: 'ApproveMoneyRequest',
     UNAPPROVE_EXPENSE_REPORT: 'UnapproveExpenseReport',
-    EDIT_MONEY_REQUEST: 'EditMoneyRequest',
     REPLACE_RECEIPT: 'ReplaceReceipt',
     SUBMIT_REPORT: 'SubmitReport',
     DETACH_RECEIPT: 'DetachReceipt',
@@ -616,7 +614,6 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DESCRIPTION]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.HOLD_MONEY_REQUEST]: Parameters.HoldMoneyRequestParams;
     [WRITE_COMMANDS.UNHOLD_MONEY_REQUEST]: Parameters.UnHoldMoneyRequestParams;
-    [WRITE_COMMANDS.UPDATE_DISTANCE_REQUEST]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_AMOUNT_AND_CURRENCY]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.REQUEST_MONEY]: Parameters.RequestMoneyParams;
     [WRITE_COMMANDS.SPLIT_BILL]: Parameters.SplitBillParams;
@@ -628,7 +625,6 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SEND_MONEY_WITH_WALLET]: Parameters.SendMoneyParams;
     [WRITE_COMMANDS.APPROVE_MONEY_REQUEST]: Parameters.ApproveMoneyRequestParams;
     [WRITE_COMMANDS.UNAPPROVE_EXPENSE_REPORT]: Parameters.UnapproveExpenseReportParams;
-    [WRITE_COMMANDS.EDIT_MONEY_REQUEST]: Parameters.EditMoneyRequestParams;
     [WRITE_COMMANDS.REPLACE_RECEIPT]: Parameters.ReplaceReceiptParams;
     [WRITE_COMMANDS.SUBMIT_REPORT]: Parameters.SubmitReportParams;
     [WRITE_COMMANDS.DETACH_RECEIPT]: Parameters.DetachReceiptParams;
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 99a97ea08672..802a998fed37 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -248,7 +248,19 @@ function areRequiredFieldsEmpty(transaction: OnyxEntry<Transaction>): boolean {
 /**
  * Given the edit made to the expense, return an updated transaction object.
  */
-function getUpdatedTransaction(transaction: Transaction, transactionChanges: TransactionChanges, isFromExpenseReport: boolean, shouldUpdateReceiptState = true): Transaction {
+function getUpdatedTransaction({
+    transaction,
+    transactionChanges,
+    isFromExpenseReport,
+    shouldUpdateReceiptState = true,
+    policy = undefined,
+}: {
+    transaction: Transaction;
+    transactionChanges: TransactionChanges;
+    isFromExpenseReport: boolean;
+    shouldUpdateReceiptState?: boolean;
+    policy?: OnyxEntry<Policy>;
+}): Transaction {
     // Only changing the first level fields so no need for deep clone now
     const updatedTransaction = lodashDeepClone(transaction);
     let shouldStopSmartscan = false;
@@ -289,10 +301,6 @@ function getUpdatedTransaction(transaction: Transaction, transactionChanges: Tra
         shouldStopSmartscan = true;
 
         const existingDistanceUnit = transaction?.comment?.customUnit?.distanceUnit;
-        const allReports = ReportConnection.getAllReports();
-        const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`] ?? null;
-        const policyID = report?.policyID ?? '';
-        const policy = PolicyUtils.getPolicy(policyID);
 
         // Get the new distance unit from the rate's unit
         const newDistanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction: updatedTransaction, policy});
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 3d0324d81549..feb3ed784e83 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -13,7 +13,6 @@ import type {
     CreateWorkspaceParams,
     DeleteMoneyRequestParams,
     DetachReceiptParams,
-    EditMoneyRequestParams,
     PayInvoiceParams,
     PayMoneyRequestParams,
     ReplaceReceiptParams,
@@ -2486,10 +2485,6 @@ function calculateDiffAmount(
  * @param policy  May be undefined, an empty object, or an object matching the Policy type (src/types/onyx/Policy.ts)
  * @param policyTagList
  * @param policyCategories
- * @param onlyIncludeChangedFields
- *               When 'true', then the returned params will only include the transaction details for the fields that were changed.
- *               When `false`, then the returned params will include all the transaction details, regardless of which fields were changed.
- *               This setting is necessary while the UpdateDistanceRequest API is refactored to be fully 1:1:1 in https://github.com/Expensify/App/issues/28358
  */
 function getUpdateMoneyRequestParams(
     transactionID: string,
@@ -2498,7 +2493,6 @@ function getUpdateMoneyRequestParams(
     policy: OnyxEntry<OnyxTypes.Policy>,
     policyTagList: OnyxTypes.OnyxInputOrEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxTypes.OnyxInputOrEntry<OnyxTypes.PolicyCategories>,
-    onlyIncludeChangedFields: boolean,
     violations?: OnyxEntry<OnyxTypes.TransactionViolations>,
 ): UpdateMoneyRequestData {
     const optimisticData: OnyxUpdate[] = [];
@@ -2516,7 +2510,14 @@ function getUpdateMoneyRequestParams(
     const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.parentReportID}`] ?? null;
     const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
-    let updatedTransaction: OnyxEntry<OnyxTypes.Transaction> = transaction ? TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, isFromExpenseReport) : undefined;
+    let updatedTransaction: OnyxEntry<OnyxTypes.Transaction> = transaction
+        ? TransactionUtils.getUpdatedTransaction({
+              transaction,
+              transactionChanges,
+              isFromExpenseReport,
+              policy,
+          })
+        : undefined;
     const transactionDetails = ReportUtils.getTransactionDetails(updatedTransaction);
 
     if (updatedTransaction?.pendingFields) {
@@ -2531,9 +2532,7 @@ function getUpdateMoneyRequestParams(
         transactionDetails.waypoints = JSON.stringify(transactionDetails.waypoints);
     }
 
-    const dataToIncludeInParams: Partial<TransactionDetails> | undefined = onlyIncludeChangedFields
-        ? Object.fromEntries(Object.entries(transactionDetails ?? {}).filter(([key]) => Object.keys(transactionChanges).includes(key)))
-        : transactionDetails;
+    const dataToIncludeInParams: Partial<TransactionDetails> = Object.fromEntries(Object.entries(transactionDetails ?? {}).filter(([key]) => Object.keys(transactionChanges).includes(key)));
 
     const params: UpdateMoneyRequestParams = {
         ...dataToIncludeInParams,
@@ -2834,18 +2833,13 @@ function getUpdateMoneyRequestParams(
  * @param transactionThreadReportID
  * @param transactionChanges
  * @param [transactionChanges.created] Present when updated the date field
- * @param onlyIncludeChangedFields
- *               When 'true', then the returned params will only include the transaction details for the fields that were changed.
- *               When `false`, then the returned params will include all the transaction details, regardless of which fields were changed.
- *               This setting is necessary while the UpdateDistanceRequest API is refactored to be fully 1:1:1 in https://github.com/Expensify/App/issues/28358
  * @param policy  May be undefined, an empty object, or an object matching the Policy type (src/types/onyx/Policy.ts)
  */
 function getUpdateTrackExpenseParams(
     transactionID: string,
     transactionThreadReportID: string,
     transactionChanges: TransactionChanges,
-    onlyIncludeChangedFields: boolean,
-    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
+    policy: OnyxEntry<OnyxTypes.Policy>,
 ): UpdateMoneyRequestData {
     const optimisticData: OnyxUpdate[] = [];
     const successData: OnyxUpdate[] = [];
@@ -2861,7 +2855,14 @@ function getUpdateTrackExpenseParams(
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.parentReportID}`] ?? null;
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
-    let updatedTransaction = transaction ? TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, false) : null;
+    let updatedTransaction = transaction
+        ? TransactionUtils.getUpdatedTransaction({
+              transaction,
+              transactionChanges,
+              isFromExpenseReport: false,
+              policy,
+          })
+        : null;
     const transactionDetails = ReportUtils.getTransactionDetails(updatedTransaction);
 
     if (transactionDetails?.waypoints) {
@@ -2869,9 +2870,7 @@ function getUpdateTrackExpenseParams(
         transactionDetails.waypoints = JSON.stringify(transactionDetails.waypoints);
     }
 
-    const dataToIncludeInParams: Partial<TransactionDetails> | undefined = onlyIncludeChangedFields
-        ? Object.fromEntries(Object.entries(transactionDetails ?? {}).filter(([key]) => Object.keys(transactionChanges).includes(key)))
-        : transactionDetails;
+    const dataToIncludeInParams: Partial<TransactionDetails> = Object.fromEntries(Object.entries(transactionDetails ?? {}).filter(([key]) => Object.keys(transactionChanges).includes(key)));
 
     const params: UpdateMoneyRequestParams = {
         ...dataToIncludeInParams,
@@ -2913,7 +2912,7 @@ function getUpdateTrackExpenseParams(
     // - we're updating the distance rate while the waypoints are still pending
     // In these cases, there isn't a valid optimistic mileage data we can use,
     // and the report action is created on the server with the distance-related response from the MapBox API
-    const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, false, policy);
+    const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, false, policy, updatedTransaction);
     if (!hasPendingWaypoints && !(hasModifiedDistanceRate && TransactionUtils.isFetchingWaypointsFromServer(transaction))) {
         params.reportActionID = updatedReportAction.reportActionID;
 
@@ -3033,9 +3032,9 @@ function updateMoneyRequestDate(
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
     if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
-        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, true, policy);
+        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, policy);
     } else {
-        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories, true);
+        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories);
     }
     const {params, onyxData} = data;
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DATE, params, onyxData);
@@ -3053,7 +3052,7 @@ function updateMoneyRequestBillable(
     const transactionChanges: TransactionChanges = {
         billable: value,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_BILLABLE, params, onyxData);
 }
 
@@ -3074,9 +3073,9 @@ function updateMoneyRequestMerchant(
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
     if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
-        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, true, policy);
+        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, policy);
     } else {
-        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
     }
     const {params, onyxData} = data;
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_MERCHANT, params, onyxData);
@@ -3095,7 +3094,7 @@ function updateMoneyRequestAttendees(
     const transactionChanges: TransactionChanges = {
         attendees,
     };
-    const data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true, violations);
+    const data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, violations);
     const {params, onyxData} = data;
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_ATTENDEES, params, onyxData);
 }
@@ -3112,7 +3111,7 @@ function updateMoneyRequestTag(
     const transactionChanges: TransactionChanges = {
         tag,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_TAG, params, onyxData);
 }
 
@@ -3128,7 +3127,7 @@ function updateMoneyRequestTaxAmount(
     const transactionChanges = {
         taxAmount,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, optimisticReportActionID, transactionChanges, policy, policyTagList, policyCategories, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, optimisticReportActionID, transactionChanges, policy, policyTagList, policyCategories);
     API.write('UpdateMoneyRequestTaxAmount', params, onyxData);
 }
 
@@ -3148,7 +3147,7 @@ function updateMoneyRequestTaxRate({transactionID, optimisticReportActionID, tax
         taxCode,
         taxAmount,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, optimisticReportActionID, transactionChanges, policy, policyTagList, policyCategories, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, optimisticReportActionID, transactionChanges, policy, policyTagList, policyCategories);
     API.write('UpdateMoneyRequestTaxRate', params, onyxData);
 }
 
@@ -3181,9 +3180,9 @@ function updateMoneyRequestDistance({
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
     if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
-        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, true, policy);
+        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, policy);
     } else {
-        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
     }
     const {params, onyxData} = data;
 
@@ -3209,7 +3208,7 @@ function updateMoneyRequestCategory(
     const transactionChanges: TransactionChanges = {
         category,
     };
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_CATEGORY, params, onyxData);
 }
 
@@ -3230,9 +3229,9 @@ function updateMoneyRequestDescription(
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
     if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
-        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, true, policy);
+        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, policy);
     } else {
-        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
     }
     const {params, onyxData} = data;
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DESCRIPTION, params, onyxData);
@@ -3259,9 +3258,9 @@ function updateMoneyRequestDistanceRate(
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
     if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
-        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, true, policy);
+        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, policy);
     } else {
-        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories);
     }
     const {params, onyxData} = data;
     // `taxAmount` & `taxCode` only needs to be updated in the optimistic data, so we need to remove them from the params
@@ -3269,19 +3268,6 @@ function updateMoneyRequestDistanceRate(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DISTANCE_RATE, paramsWithoutTaxUpdated, onyxData);
 }
 
-/** Edits an existing distance expense */
-function updateDistanceRequest(
-    transactionID: string,
-    transactionThreadReportID: string,
-    transactionChanges: TransactionChanges,
-    policy: OnyxTypes.Policy,
-    policyTagList: OnyxTypes.PolicyTagLists,
-    policyCategories: OnyxTypes.PolicyCategories,
-) {
-    const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, false);
-    API.write(WRITE_COMMANDS.UPDATE_DISTANCE_REQUEST, params, onyxData);
-}
-
 const getConvertTrackedExpenseInformation = (
     transactionID: string,
     actionableWhisperReportActionID: string,
@@ -5165,7 +5151,14 @@ function setDraftSplitTransaction(transactionID: string, transactionChanges: Tra
         draftSplitTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     }
 
-    const updatedTransaction = draftSplitTransaction ? TransactionUtils.getUpdatedTransaction(draftSplitTransaction, transactionChanges, false, false) : null;
+    const updatedTransaction = draftSplitTransaction
+        ? TransactionUtils.getUpdatedTransaction({
+              transaction: draftSplitTransaction,
+              transactionChanges,
+              isFromExpenseReport: false,
+              shouldUpdateReceiptState: false,
+          })
+        : null;
 
     Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`, updatedTransaction);
 }
@@ -5329,296 +5322,6 @@ function createDistanceRequest(
     Report.notifyNewAction(activeReportID, userAccountID);
 }
 
-function editRegularMoneyRequest(
-    transactionID: string,
-    transactionThreadReportID: string,
-    transactionChanges: TransactionChanges,
-    policy: OnyxTypes.Policy,
-    policyTags: OnyxTypes.PolicyTagLists,
-    policyCategories: OnyxTypes.PolicyCategories,
-) {
-    const allReports = ReportConnection.getAllReports();
-    // STEP 1: Get all collections we're updating
-    const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
-    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
-    const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.parentReportID}`] ?? null;
-    const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`] ?? null;
-    const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
-
-    // STEP 2: Build new modified expense report action.
-    const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, isFromExpenseReport, policy);
-    const updatedTransaction = transaction ? TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, isFromExpenseReport) : null;
-
-    // STEP 3: Compute the IOU total and update the report preview message so LHN amount owed is correct
-    // Should only update if the transaction matches the currency of the report, else we wait for the update
-    // from the server with the currency conversion
-    let updatedMoneyRequestReport = {...iouReport};
-    const updatedChatReport = {...chatReport};
-    const diff = TransactionUtils.getAmount(transaction, true) - TransactionUtils.getAmount(updatedTransaction, true);
-    if (updatedTransaction?.currency === iouReport?.currency && updatedTransaction?.modifiedAmount && diff !== 0) {
-        if (ReportUtils.isExpenseReport(iouReport) && typeof updatedMoneyRequestReport.total === 'number') {
-            updatedMoneyRequestReport.total += diff;
-        } else {
-            updatedMoneyRequestReport = iouReport
-                ? IOUUtils.updateIOUOwnerAndTotal(iouReport, updatedReportAction.actorAccountID ?? -1, diff, TransactionUtils.getCurrency(transaction), false)
-                : {};
-        }
-
-        updatedMoneyRequestReport.cachedTotal = CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedTransaction.currency);
-
-        // Update the last message of the IOU report
-        const lastMessage = ReportUtils.getIOUReportActionMessage(
-            iouReport?.reportID ?? '-1',
-            CONST.IOU.REPORT_ACTION_TYPE.CREATE,
-            updatedMoneyRequestReport.total ?? 0,
-            '',
-            updatedTransaction.currency,
-            '',
-            false,
-        );
-        updatedMoneyRequestReport.lastMessageText = ReportActionsUtils.getTextFromHtml(lastMessage.at(0)?.html);
-        updatedMoneyRequestReport.lastMessageHtml = lastMessage.at(0)?.html;
-
-        // Update the last message of the chat report
-        const hasNonReimbursableTransactions = ReportUtils.hasNonReimbursableTransactions(iouReport?.reportID);
-        const messageText = Localize.translateLocal(hasNonReimbursableTransactions ? 'iou.payerSpentAmount' : 'iou.payerOwesAmount', {
-            payer: ReportUtils.getPersonalDetailsForAccountID(updatedMoneyRequestReport.managerID ?? -1).login ?? '',
-            amount: CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedMoneyRequestReport.currency),
-        });
-        updatedChatReport.lastMessageText = messageText;
-        updatedChatReport.lastMessageHtml = messageText;
-    }
-
-    const isScanning = TransactionUtils.hasReceipt(updatedTransaction) && TransactionUtils.isReceiptBeingScanned(updatedTransaction);
-
-    // STEP 4: Compose the optimistic data
-    const currentTime = DateUtils.getDBTime();
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
-            value: {
-                [updatedReportAction.reportActionID]: updatedReportAction as OnyxTypes.ReportAction,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: updatedTransaction,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
-            value: updatedMoneyRequestReport,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`,
-            value: updatedChatReport,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
-            value: {
-                lastReadTime: currentTime,
-                lastVisibleActionCreated: currentTime,
-            },
-        },
-    ];
-
-    if (!isScanning) {
-        optimisticData.push(
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
-                value: {
-                    [transactionThread?.parentReportActionID ?? '-1']: {
-                        originalMessage: {
-                            whisperedTo: [],
-                        },
-                    },
-                },
-            },
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.parentReportID}`,
-                value: {
-                    [iouReport?.parentReportActionID ?? '-1']: {
-                        originalMessage: {
-                            whisperedTo: [],
-                        },
-                    },
-                },
-            },
-        );
-    }
-
-    // Update recently used categories if the category is changed
-    if ('category' in transactionChanges) {
-        const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
-        if (optimisticPolicyRecentlyUsedCategories.length) {
-            optimisticData.push({
-                onyxMethod: Onyx.METHOD.SET,
-                key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport?.policyID}`,
-                value: optimisticPolicyRecentlyUsedCategories,
-            });
-        }
-    }
-
-    // Update recently used currencies if the currency is changed
-    if ('currency' in transactionChanges) {
-        const optimisticRecentlyUsedCurrencies = Policy.buildOptimisticRecentlyUsedCurrencies(transactionChanges.currency);
-        if (optimisticRecentlyUsedCurrencies.length) {
-            optimisticData.push({
-                onyxMethod: Onyx.METHOD.SET,
-                key: ONYXKEYS.RECENTLY_USED_CURRENCIES,
-                value: optimisticRecentlyUsedCurrencies,
-            });
-        }
-    }
-
-    // Update recently used categories if the tag is changed
-    if ('tag' in transactionChanges) {
-        const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
-        if (!isEmptyObject(optimisticPolicyRecentlyUsedTags)) {
-            optimisticData.push({
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport?.policyID}`,
-                value: optimisticPolicyRecentlyUsedTags,
-            });
-        }
-    }
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
-            value: {
-                [updatedReportAction.reportActionID]: {pendingAction: null},
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: {
-                pendingFields: {
-                    comment: null,
-                    amount: null,
-                    created: null,
-                    currency: null,
-                    merchant: null,
-                    billable: null,
-                    category: null,
-                    tag: null,
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
-            value: {pendingAction: null},
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
-            value: {
-                [updatedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericEditFailureMessage'),
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: {
-                ...transaction,
-                modifiedCreated: transaction?.modifiedCreated ? transaction.modifiedCreated : null,
-                modifiedAmount: transaction?.modifiedAmount ? transaction.modifiedAmount : null,
-                modifiedCurrency: transaction?.modifiedCurrency ? transaction.modifiedCurrency : null,
-                modifiedMerchant: transaction?.modifiedMerchant ? transaction.modifiedMerchant : null,
-                modifiedWaypoints: transaction?.modifiedWaypoints ? transaction.modifiedWaypoints : null,
-                pendingFields: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
-            value: {
-                ...iouReport,
-                cachedTotal: iouReport?.cachedTotal ? iouReport?.cachedTotal : null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`,
-            value: chatReport,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
-            value: {
-                lastReadTime: transactionThread?.lastReadTime,
-                lastVisibleActionCreated: transactionThread?.lastVisibleActionCreated,
-            },
-        },
-    ];
-
-    // Add transaction violations if we have a paid policy and an updated transaction
-    if (policy && PolicyUtils.isPaidGroupPolicy(policy) && updatedTransaction) {
-        const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? [];
-        const updatedViolationsOnyxData = ViolationsUtils.getViolationsOnyxData(
-            updatedTransaction,
-            currentTransactionViolations,
-            policy,
-            policyTags,
-            policyCategories,
-            PolicyUtils.hasDependentTags(policy, policyTags),
-        );
-        optimisticData.push(updatedViolationsOnyxData);
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
-            value: currentTransactionViolations,
-        });
-    }
-
-    // STEP 6: Call the API endpoint
-    const {created, amount, currency, comment, merchant, category, billable, tag} = ReportUtils.getTransactionDetails(updatedTransaction) ?? {};
-
-    const parameters: EditMoneyRequestParams = {
-        transactionID,
-        reportActionID: updatedReportAction.reportActionID,
-        created,
-        amount,
-        currency,
-        comment,
-        merchant,
-        category,
-        billable,
-        tag,
-    };
-
-    API.write(WRITE_COMMANDS.EDIT_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
-}
-
-function editMoneyRequest(
-    transaction: OnyxTypes.Transaction,
-    transactionThreadReportID: string,
-    transactionChanges: TransactionChanges,
-    policy: OnyxTypes.Policy,
-    policyTags: OnyxTypes.PolicyTagLists,
-    policyCategories: OnyxTypes.PolicyCategories,
-) {
-    if (TransactionUtils.isDistanceRequest(transaction)) {
-        updateDistanceRequest(transaction.transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories);
-    } else {
-        editRegularMoneyRequest(transaction.transactionID, transactionThreadReportID, transactionChanges, policy, policyTags, policyCategories);
-    }
-}
-
 type UpdateMoneyRequestAmountAndCurrencyParams = {
     transactionID: string;
     transactionThreadReportID: string;
@@ -5654,9 +5357,9 @@ function updateMoneyRequestAmountAndCurrency({
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
     if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
-        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, true, policy ?? null);
+        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, policy);
     } else {
-        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList ?? null, policyCategories ?? null, true);
+        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList ?? null, policyCategories ?? null);
     }
     const {params, onyxData} = data;
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_AMOUNT_AND_CURRENCY, params, onyxData);
@@ -8585,7 +8288,6 @@ export {
     deleteTrackExpense,
     detachReceipt,
     dismissHoldUseExplanation,
-    editMoneyRequest,
     getIOURequestPolicyID,
     initMoneyRequest,
     navigateToStartStepIfScanFileCannotBeRead,
diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
index c2005d221273..991441b66b9c 100644
--- a/tests/actions/IOUTest.ts
+++ b/tests/actions/IOUTest.ts
@@ -1613,6 +1613,8 @@ describe('actions/IOU', () => {
         const comment = '💸💸💸💸';
         const merchant = 'NASDAQ';
 
+        const modifiedComment = 'Modified the comment!';
+
         afterEach(() => {
             mockFetch?.resume?.();
         });
@@ -1684,10 +1686,10 @@ describe('actions/IOU', () => {
                 })
                 .then(() => {
                     if (transaction) {
-                        IOU.editMoneyRequest(
-                            transaction,
+                        IOU.updateMoneyRequestDescription(
+                            transaction.transactionID,
                             thread.reportID,
-                            {amount: 20000, comment: 'Double the amount!'},
+                            modifiedComment,
                             {
                                 id: '123',
                                 role: 'user',
@@ -1713,8 +1715,7 @@ describe('actions/IOU', () => {
                                     Onyx.disconnect(connection);
 
                                     const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                    expect(updatedTransaction?.modifiedAmount).toBe(20000);
-                                    expect(updatedTransaction?.comment).toMatchObject({comment: 'Double the amount!'});
+                                    expect(updatedTransaction?.comment).toMatchObject({comment: modifiedComment});
                                     resolve();
                                 },
                             });
@@ -1731,7 +1732,7 @@ describe('actions/IOU', () => {
                                     const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
                                     expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
                                     expect(updatedAction && ReportActionsUtils.getOriginalMessage(updatedAction)).toEqual(
-                                        expect.objectContaining({amount: 20000, newComment: 'Double the amount!', oldAmount: amount, oldComment: comment}),
+                                        expect.objectContaining({newComment: modifiedComment, oldComment: comment}),
                                     );
                                     resolve();
                                 },
@@ -1839,10 +1840,10 @@ describe('actions/IOU', () => {
                     mockFetch?.fail?.();
 
                     if (transaction) {
-                        IOU.editMoneyRequest(
-                            transaction,
+                        IOU.updateMoneyRequestDescription(
+                            transaction.transactionID,
                             thread.reportID,
-                            {amount: 20000, comment: 'Double the amount!'},
+                            modifiedComment,
                             {
                                 id: '123',
                                 role: 'user',
@@ -2596,10 +2597,10 @@ describe('actions/IOU', () => {
 
             jest.advanceTimersByTime(10);
             if (transaction && createIOUAction) {
-                IOU.editMoneyRequest(
-                    transaction,
+                IOU.updateMoneyRequestDescription(
+                    transaction.transactionID,
                     thread.reportID,
-                    {amount: 20000, comment: 'Double the amount!'},
+                    'Modified the comment!',
                     {
                         id: '123',
                         role: 'user',

From 18c393a0968df3bf8ee8cf2a8acf5ea9061d1ea5 Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Thu, 7 Nov 2024 17:08:26 +0100
Subject: [PATCH 060/100] Cleat customUnit.quantity on waypoint update

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

diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index fe15515bcb4a..11fad82208ed 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -322,6 +322,9 @@ function updateWaypoints(transactionID: string, waypoints: WaypointCollection, i
     return Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
         comment: {
             waypoints,
+            customUnit: {
+                quantity: null,
+            },
         },
         // We want to reset the amount only for draft transactions (when creating the expense).
         // When modifying an existing transaction, the amount will be updated on the actual IOU update operation.

From 8ee928c30ed51b35f3aeb0e10ca6b5c335146cbb Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Thu, 7 Nov 2024 17:09:43 +0100
Subject: [PATCH 061/100] MODIFIEDEXPENSE: Use modified fields of
 updatedTransaction

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

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a62716975c01..36113112cb8f 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -3702,12 +3702,10 @@ function getModifiedExpenseOriginalMessage(
         originalMessage.oldCurrency = TransactionUtils.getCurrency(oldTransaction);
         originalMessage.oldMerchant = TransactionUtils.getMerchant(oldTransaction);
 
-        const modifiedDistanceFields = TransactionUtils.calculateAmountForUpdatedWaypointOrRate(updatedTransaction, transactionChanges, policy, isFromExpenseReport);
-
         // For the originalMessage, we should use the non-negative amount, similar to what TransactionUtils.getAmount does for oldAmount
-        originalMessage.amount = Math.abs(modifiedDistanceFields.modifiedAmount);
-        originalMessage.currency = modifiedDistanceFields.modifiedCurrency ?? CONST.CURRENCY.USD;
-        originalMessage.merchant = modifiedDistanceFields.modifiedMerchant;
+        originalMessage.amount = Math.abs(updatedTransaction.modifiedAmount ?? 0);
+        originalMessage.currency = updatedTransaction.modifiedCurrency ?? CONST.CURRENCY.USD;
+        originalMessage.merchant = updatedTransaction.modifiedMerchant;
     }
 
     return originalMessage;

From b04c16bba6d2cb6dbe016ef45deb8c205824a48e Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Thu, 7 Nov 2024 17:42:19 +0100
Subject: [PATCH 062/100] Fix tests

---
 tests/actions/IOUTest.ts | 83 +++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 44 deletions(-)

diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
index 991441b66b9c..cf016a301351 100644
--- a/tests/actions/IOUTest.ts
+++ b/tests/actions/IOUTest.ts
@@ -1613,7 +1613,26 @@ describe('actions/IOU', () => {
         const comment = '💸💸💸💸';
         const merchant = 'NASDAQ';
 
-        const modifiedComment = 'Modified the comment!';
+        const buildUpdateParams = (transactionID: string, transactionThreadReportID: string) => ({
+            transactionID,
+            transactionThreadReportID,
+            amount: 20000,
+            currency: CONST.CURRENCY.USD,
+            taxAmount: 0,
+            taxCode: '',
+            policy: {
+                id: '123',
+                role: 'user',
+                type:
+                CONST.POLICY.TYPE.TEAM,
+                name: '',
+                owner: '',
+                outputCurrency: '',
+                isPolicyExpenseChatEnabled: false,
+            } as OnyxTypes.Policy,
+            policyTagList: {},
+            policyCategories: {},
+        });
 
         afterEach(() => {
             mockFetch?.resume?.();
@@ -1686,22 +1705,8 @@ describe('actions/IOU', () => {
                 })
                 .then(() => {
                     if (transaction) {
-                        IOU.updateMoneyRequestDescription(
-                            transaction.transactionID,
-                            thread.reportID,
-                            modifiedComment,
-                            {
-                                id: '123',
-                                role: 'user',
-                                type: CONST.POLICY.TYPE.TEAM,
-                                name: '',
-                                owner: '',
-                                outputCurrency: '',
-                                isPolicyExpenseChatEnabled: false,
-                            },
-                            {},
-                            {},
-                        );
+                        const params = buildUpdateParams(transaction.transactionID, thread.reportID);
+                        IOU.updateMoneyRequestAmountAndCurrency(params);
                     }
                     return waitForBatchedUpdates();
                 })
@@ -1715,7 +1720,7 @@ describe('actions/IOU', () => {
                                     Onyx.disconnect(connection);
 
                                     const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                    expect(updatedTransaction?.comment).toMatchObject({comment: modifiedComment});
+                                    expect(updatedTransaction?.modifiedAmount).toBe(20000);
                                     resolve();
                                 },
                             });
@@ -1732,7 +1737,7 @@ describe('actions/IOU', () => {
                                     const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
                                     expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
                                     expect(updatedAction && ReportActionsUtils.getOriginalMessage(updatedAction)).toEqual(
-                                        expect.objectContaining({newComment: modifiedComment, oldComment: comment}),
+                                        expect.objectContaining({amount: 20000, oldAmount: amount}),
                                     );
                                     resolve();
                                 },
@@ -1840,22 +1845,8 @@ describe('actions/IOU', () => {
                     mockFetch?.fail?.();
 
                     if (transaction) {
-                        IOU.updateMoneyRequestDescription(
-                            transaction.transactionID,
-                            thread.reportID,
-                            modifiedComment,
-                            {
-                                id: '123',
-                                role: 'user',
-                                type: CONST.POLICY.TYPE.TEAM,
-                                name: '',
-                                owner: '',
-                                outputCurrency: '',
-                                isPolicyExpenseChatEnabled: false,
-                            },
-                            {},
-                            {},
-                        );
+                        const params = buildUpdateParams(transaction.transactionID, thread.reportID);
+                        IOU.updateMoneyRequestAmountAndCurrency(params);
                     }
                     return waitForBatchedUpdates();
                 })
@@ -2597,22 +2588,26 @@ describe('actions/IOU', () => {
 
             jest.advanceTimersByTime(10);
             if (transaction && createIOUAction) {
-                IOU.updateMoneyRequestDescription(
-                    transaction.transactionID,
-                    thread.reportID,
-                    'Modified the comment!',
-                    {
+                IOU.updateMoneyRequestAmountAndCurrency({
+                    transactionID: transaction.transactionID,
+                    transactionThreadReportID: thread.reportID,
+                    amount: 20000,
+                    currency: CONST.CURRENCY.USD,
+                    taxAmount: 0,
+                    taxCode: '',
+                    policy: {
                         id: '123',
                         role: 'user',
-                        type: CONST.POLICY.TYPE.TEAM,
+                        type:
+                        CONST.POLICY.TYPE.TEAM,
                         name: '',
                         owner: '',
                         outputCurrency: '',
                         isPolicyExpenseChatEnabled: false,
                     },
-                    {},
-                    {},
-                );
+                    policyTagList: {},
+                    policyCategories: {},
+                });
             }
             await waitForBatchedUpdates();
 

From e0aec6ff87a2cfecf4b174296022256dac2df5e2 Mon Sep 17 00:00:00 2001
From: James Dean <james@expensify.com>
Date: Thu, 7 Nov 2024 09:42:17 -0800
Subject: [PATCH 063/100] Update es.ts

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

diff --git a/src/languages/es.ts b/src/languages/es.ts
index ab404143d030..9dddafe48604 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3445,7 +3445,7 @@ const translations = {
             },
             rules: {
                 title: 'Reglas',
-                subtitle: 'Configura cuándo se exigen los recibos, marca los gastos elevados y mucho más.',
+                subtitle: 'Solicita recibos, resalta gastos de alto importe y mucho más.',
             },
         },
         reportFields: {

From 7023fb172740d8ba90f3c4d94a6ecde71b548591 Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Thu, 7 Nov 2024 18:52:59 +0100
Subject: [PATCH 064/100] Fix tests

---
 tests/actions/IOUTest.ts | 310 +--------------------------------------
 1 file changed, 1 insertion(+), 309 deletions(-)

diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
index cf016a301351..1c26390f7b09 100644
--- a/tests/actions/IOUTest.ts
+++ b/tests/actions/IOUTest.ts
@@ -1608,313 +1608,6 @@ describe('actions/IOU', () => {
         });
     });
 
-    describe('edit expense', () => {
-        const amount = 10000;
-        const comment = '💸💸💸💸';
-        const merchant = 'NASDAQ';
-
-        const buildUpdateParams = (transactionID: string, transactionThreadReportID: string) => ({
-            transactionID,
-            transactionThreadReportID,
-            amount: 20000,
-            currency: CONST.CURRENCY.USD,
-            taxAmount: 0,
-            taxCode: '',
-            policy: {
-                id: '123',
-                role: 'user',
-                type:
-                CONST.POLICY.TYPE.TEAM,
-                name: '',
-                owner: '',
-                outputCurrency: '',
-                isPolicyExpenseChatEnabled: false,
-            } as OnyxTypes.Policy,
-            policyTagList: {},
-            policyCategories: {},
-        });
-
-        afterEach(() => {
-            mockFetch?.resume?.();
-        });
-
-        it('updates the IOU request and IOU report when offline', () => {
-            let thread: OptimisticChatReport;
-            let iouReport: OnyxEntry<OnyxTypes.Report>;
-            let iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
-            let transaction: OnyxEntry<OnyxTypes.Transaction>;
-
-            mockFetch?.pause?.();
-            IOU.requestMoney({reportID: ''}, amount, [], CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
-            return waitForBatchedUpdates()
-                .then(() => {
-                    Onyx.set(ONYXKEYS.SESSION, {email: RORY_EMAIL, accountID: RORY_ACCOUNT_ID});
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connection);
-                                    iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
-
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
-                                waitForCollectionCallback: false,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connection);
-
-                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter(
-                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connection);
-
-                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    thread = ReportUtils.buildTransactionThread(iouAction, iouReport) ?? null;
-                    Onyx.set(`report_${thread?.reportID ?? '-1'}`, thread);
-                    return waitForBatchedUpdates();
-                })
-                .then(() => {
-                    if (transaction) {
-                        const params = buildUpdateParams(transaction.transactionID, thread.reportID);
-                        IOU.updateMoneyRequestAmountAndCurrency(params);
-                    }
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connection);
-
-                                    const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                    expect(updatedTransaction?.modifiedAmount).toBe(20000);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                                waitForCollectionCallback: false,
-                                callback: (allActions) => {
-                                    Onyx.disconnect(connection);
-                                    const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
-                                    expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
-                                    expect(updatedAction && ReportActionsUtils.getOriginalMessage(updatedAction)).toEqual(
-                                        expect.objectContaining({amount: 20000, oldAmount: amount}),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connection);
-                                    const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
-                                    const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === iouReport?.chatReportID);
-                                    expect(updatedIOUReport).toEqual(
-                                        expect.objectContaining({
-                                            total: 20000,
-                                            cachedTotal: '$200.00',
-                                            lastMessageHtml: 'submitted $200.00',
-                                            lastMessageText: 'submitted $200.00',
-                                        }),
-                                    );
-                                    expect(updatedChatReport).toEqual(
-                                        expect.objectContaining({
-                                            lastMessageHtml: `${CARLOS_EMAIL} owes $200.00`,
-                                            lastMessageText: `${CARLOS_EMAIL} owes $200.00`,
-                                        }),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    mockFetch?.resume?.();
-                });
-        });
-
-        it('resets the IOU request and IOU report when api returns an error', () => {
-            let thread: OptimisticChatReport;
-            let iouReport: OnyxEntry<OnyxTypes.Report>;
-            let iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
-            let transaction: OnyxEntry<OnyxTypes.Transaction>;
-
-            IOU.requestMoney({reportID: ''}, amount, [], CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
-            return waitForBatchedUpdates()
-                .then(() => {
-                    Onyx.set(ONYXKEYS.SESSION, {email: RORY_EMAIL, accountID: RORY_ACCOUNT_ID});
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connection);
-                                    [iouReport] = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.IOU);
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
-                                waitForCollectionCallback: false,
-                                callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connection);
-
-                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter(
-                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connection);
-
-                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(() => {
-                    thread = ReportUtils.buildTransactionThread(iouAction, iouReport);
-                    Onyx.set(`report_${thread.reportID}`, thread);
-                    return waitForBatchedUpdates();
-                })
-                .then(() => {
-                    mockFetch?.fail?.();
-
-                    if (transaction) {
-                        const params = buildUpdateParams(transaction.transactionID, thread.reportID);
-                        IOU.updateMoneyRequestAmountAndCurrency(params);
-                    }
-                    return waitForBatchedUpdates();
-                })
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                waitForCollectionCallback: true,
-                                callback: (allTransactions) => {
-                                    Onyx.disconnect(connection);
-
-                                    const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                    expect(updatedTransaction?.modifiedAmount).toBe(undefined);
-                                    expect(updatedTransaction?.amount).toBe(10000);
-                                    expect(updatedTransaction?.comment).toMatchObject({comment});
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
-                                waitForCollectionCallback: false,
-                                callback: (allActions) => {
-                                    Onyx.disconnect(connection);
-                                    const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
-                                    expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
-                                    expect(Object.values(updatedAction?.errors ?? {}).at(0)).toEqual(Localize.translateLocal('iou.error.genericEditFailureMessage'));
-                                    resolve();
-                                },
-                            });
-                        }),
-                )
-                .then(
-                    () =>
-                        new Promise<void>((resolve) => {
-                            const connection = Onyx.connect({
-                                key: ONYXKEYS.COLLECTION.REPORT,
-                                waitForCollectionCallback: true,
-                                callback: (allReports) => {
-                                    Onyx.disconnect(connection);
-                                    const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
-                                    const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === iouReport?.chatReportID);
-                                    expect(updatedIOUReport).toEqual(
-                                        expect.objectContaining({
-                                            total: 10000,
-                                            cachedTotal: '$100.00',
-                                            lastMessageHtml: `submitted $${amount / 100}.00 for ${comment}`,
-                                            lastMessageText: `submitted $${amount / 100}.00 for ${comment}`,
-                                        }),
-                                    );
-                                    expect(updatedChatReport).toEqual(
-                                        expect.objectContaining({
-                                            lastMessageHtml: '',
-                                        }),
-                                    );
-                                    resolve();
-                                },
-                            });
-                        }),
-                );
-        });
-    });
-
     describe('pay expense report via ACH', () => {
         const amount = 10000;
         const comment = '💸💸💸💸';
@@ -2598,8 +2291,7 @@ describe('actions/IOU', () => {
                     policy: {
                         id: '123',
                         role: 'user',
-                        type:
-                        CONST.POLICY.TYPE.TEAM,
+                        type: CONST.POLICY.TYPE.TEAM,
                         name: '',
                         owner: '',
                         outputCurrency: '',

From 2fd062cc041e197de02897ac790f75fcd037f168 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Fri, 8 Nov 2024 10:42:55 +0700
Subject: [PATCH 065/100] fix: rename and add comment to function

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

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 8d555bb0b1b4..2430889b1098 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1698,11 +1698,13 @@ function isOneTransactionThread(reportID: string, parentReportID: string, thread
     return reportID === transactionThreadReportID && !ReportActionsUtils.isSentMoneyReportAction(threadParentReportAction);
 }
 
-function getCurrentReportIDInOneTransactionThread(reportID: string) {
+/**
+ * Get displayed repport ID in one transaction thread
+ */
+function getDisplayedReportID(reportID: string): string {
     const report = getReport(reportID);
     const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
-    const currentReportID = isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID;
-    return currentReportID;
+    return (isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID) ?? '';
 }
 
 /**
@@ -8560,7 +8562,7 @@ export {
     getTaskAssigneeChatOnyxData,
     getTransactionDetails,
     getTransactionReportName,
-    getCurrentReportIDInOneTransactionThread,
+    getDisplayedReportID,
     getTransactionsWithReceipts,
     getUserDetailTooltipText,
     getWhisperDisplayNames,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 83b354c085bc..8eed2dd44092 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8127,7 +8127,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string, sea
         {optimisticData, successData, failureData},
     );
 
-    const currentReportID = ReportUtils.getCurrentReportIDInOneTransactionThread(reportID);
+    const currentReportID = ReportUtils.getDisplayedReportID(reportID);
     Report.notifyNewAction(currentReportID ?? '', userAccountID);
 }
 
@@ -8229,7 +8229,7 @@ function unholdRequest(transactionID: string, reportID: string, searchHash?: num
         {optimisticData, successData, failureData},
     );
 
-    const currentReportID = ReportUtils.getCurrentReportIDInOneTransactionThread(reportID);
+    const currentReportID = ReportUtils.getDisplayedReportID(reportID);
     Report.notifyNewAction(currentReportID ?? '', userAccountID);
 }
 // eslint-disable-next-line rulesdir/no-negated-variables

From 7a0cf247d2b3a47e851e32f8209d414727a28eab Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Fri, 8 Nov 2024 13:57:02 +0100
Subject: [PATCH 066/100] Fix incorrect pending fields while editing requests

---
 .../ReportActionItem/MoneyRequestView.tsx     |  3 +-
 src/libs/TransactionUtils/index.ts            | 90 +++++++++----------
 src/libs/actions/IOU.ts                       | 50 +++++------
 3 files changed, 68 insertions(+), 75 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index ee87f8f12c7d..300fe6562c80 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -200,8 +200,9 @@ function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = fals
     let amountDescription = `${translate('iou.amount')}`;
 
     const hasRoute = TransactionUtils.hasRoute(transactionBackup ?? transaction, isDistanceRequest);
-    const {unit, rate, currency} = DistanceRequestUtils.getRate({transaction, policy});
+    const {unit, rate} = DistanceRequestUtils.getRate({transaction, policy});
     const distance = TransactionUtils.getDistanceInMeters(transactionBackup ?? transaction, unit);
+    const currency = transactionCurrency ?? CONST.CURRENCY.USD;
     const rateToDisplay = DistanceRequestUtils.getRateForDisplay(unit, rate, currency, translate, toLocaleDigit, isOffline);
     const distanceToDisplay = DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, rate, translate);
     let merchantTitle = isEmptyMerchant ? '' : transactionMerchant;
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 802a998fed37..b26307d4028f 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -292,7 +292,29 @@ function getUpdatedTransaction({
 
     if (Object.hasOwn(transactionChanges, 'waypoints')) {
         updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
+        updatedTransaction.isLoading = true;
         shouldStopSmartscan = true;
+
+        if (isEmptyObject(transactionChanges.routes?.route0?.geometry)) {
+            // The waypoints were changed, but there is no route – it is pending from the BE and we should mark the fields as pending
+            updatedTransaction.amount = CONST.IOU.DEFAULT_AMOUNT;
+            updatedTransaction.modifiedAmount = CONST.IOU.DEFAULT_AMOUNT;
+            updatedTransaction.modifiedMerchant = Localize.translateLocal('iou.fieldPending');
+        } else {
+            const mileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy});
+            const {unit, rate} = mileageRate;
+
+            const distanceInMeters = getDistanceInMeters(transaction, unit);
+            const amount = DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
+            const updatedAmount = isFromExpenseReport ? -amount : amount;
+            const updatedMerchant = DistanceRequestUtils.getDistanceMerchant(true, distanceInMeters, unit, rate, transaction.currency, Localize.translateLocal, (digit) =>
+                toLocaleDigit(preferredLocale, digit),
+            );
+
+            updatedTransaction.amount = updatedAmount;
+            updatedTransaction.modifiedAmount = updatedAmount;
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+        }
     }
 
     if (Object.hasOwn(transactionChanges, 'customUnitRateID')) {
@@ -304,13 +326,35 @@ function getUpdatedTransaction({
 
         // Get the new distance unit from the rate's unit
         const newDistanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction: updatedTransaction, policy});
+        lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', newDistanceUnit);
 
         // If the distanceUnit is set and the rate is changed to one that has a different unit, convert the distance to the new unit
         if (existingDistanceUnit && newDistanceUnit !== existingDistanceUnit) {
             const conversionFactor = existingDistanceUnit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? CONST.CUSTOM_UNITS.MILES_TO_KILOMETERS : CONST.CUSTOM_UNITS.KILOMETERS_TO_MILES;
             const distance = NumberUtils.roundToTwoDecimalPlaces((transaction?.comment?.customUnit?.quantity ?? 0) * conversionFactor);
             lodashSet(updatedTransaction, 'comment.customUnit.quantity', distance);
-            lodashSet(updatedTransaction, 'pendingFields.merchant', CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+        }
+
+        if (!isFetchingWaypointsFromServer(transaction)) {
+            // When the waypoints are being fetched from the server, we have no information about the distance, and cannot recalculate the updated amount.
+            // Otherwise, recalculate the fields based on the new rate.
+
+            const oldMileageRate = DistanceRequestUtils.getRate({transaction, policy});
+            const updatedMileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, useTransactionDistanceUnit: false});
+            const {unit, rate} = updatedMileageRate;
+
+            const distanceInMeters = getDistanceInMeters(transaction, oldMileageRate?.unit);
+            const amount = DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
+            const updatedAmount = isFromExpenseReport ? -amount : amount;
+            const updatedCurrency = updatedMileageRate.currency ?? CONST.CURRENCY.USD;
+            const updatedMerchant = DistanceRequestUtils.getDistanceMerchant(true, distanceInMeters, unit, rate, updatedCurrency, Localize.translateLocal, (digit) =>
+                toLocaleDigit(preferredLocale, digit),
+            );
+
+            updatedTransaction.amount = updatedAmount;
+            updatedTransaction.modifiedAmount = updatedAmount;
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+            updatedTransaction.modifiedCurrency = updatedCurrency;
         }
     }
 
@@ -868,49 +912,6 @@ function calculateTaxAmount(percentage: string, amount: number, currency: string
     return parseFloat(taxAmount.toFixed(decimals));
 }
 
-/**
- * Calculates updated amount, currency, and merchant for a distance request with modified waypoints or customUnitRateID
- */
-function calculateAmountForUpdatedWaypointOrRate(
-    transaction: OnyxInputOrEntry<Transaction>,
-    transactionChanges: TransactionChanges,
-    policy: OnyxInputOrEntry<Policy>,
-    isFromExpenseReport: boolean,
-) {
-    const hasModifiedRouteWithPendingWaypoints = !isEmptyObject(transactionChanges.waypoints) && isEmptyObject(transactionChanges?.routes?.route0?.geometry);
-    const hasModifiedRateWithPendingWaypoints = !!transactionChanges?.customUnitRateID && isFetchingWaypointsFromServer(transaction);
-    if (hasModifiedRouteWithPendingWaypoints || hasModifiedRateWithPendingWaypoints) {
-        return {
-            amount: CONST.IOU.DEFAULT_AMOUNT,
-            modifiedAmount: CONST.IOU.DEFAULT_AMOUNT,
-            modifiedMerchant: Localize.translateLocal('iou.fieldPending'),
-        };
-    }
-
-    const customUnitRateID = transactionChanges.customUnitRateID ?? getRateID(transaction) ?? '';
-    const mileageRates = DistanceRequestUtils.getMileageRates(policy, true);
-    const policyCurrency = policy?.outputCurrency ?? PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD;
-    const mileageRate = isCustomUnitRateIDForP2P(transaction)
-        ? DistanceRequestUtils.getRateForP2P(policyCurrency, transaction ?? undefined)
-        : mileageRates?.[customUnitRateID] ?? DistanceRequestUtils.getDefaultMileageRate(policy);
-    const {unit, rate, currency} = mileageRate;
-
-    const distanceInMeters = getDistanceInMeters(transaction, unit);
-    const amount = DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
-    const updatedAmount = isFromExpenseReport ? -amount : amount;
-    const updatedCurrency = currency ?? CONST.CURRENCY.USD;
-    const updatedMerchant = DistanceRequestUtils.getDistanceMerchant(true, distanceInMeters, unit, rate, updatedCurrency, Localize.translateLocal, (digit) =>
-        toLocaleDigit(preferredLocale, digit),
-    );
-
-    return {
-        amount: updatedAmount,
-        modifiedAmount: updatedAmount,
-        modifiedMerchant: updatedMerchant,
-        modifiedCurrency: updatedCurrency,
-    };
-}
-
 /**
  * Calculates count of all tax enabled options
  */
@@ -1223,7 +1224,6 @@ function buildTransactionsMergeParams(reviewDuplicates: OnyxEntry<ReviewDuplicat
 export {
     buildOptimisticTransaction,
     calculateTaxAmount,
-    calculateAmountForUpdatedWaypointOrRate,
     getWorkspaceTaxesSettingsName,
     getDefaultTaxCode,
     transformedTaxRates,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index feb3ed784e83..d56d19f2f1d9 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -2500,7 +2500,8 @@ function getUpdateMoneyRequestParams(
     const failureData: OnyxUpdate[] = [];
 
     // Step 1: Set any "pending fields" (ones updated while the user was offline) to have error messages in the failureData
-    let pendingFields: OnyxTypes.Transaction['pendingFields'] = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE]));
+    const pendingFields: OnyxTypes.Transaction['pendingFields'] = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE]));
+    const clearedPendingFields = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null]));
     const errorFields = Object.fromEntries(Object.keys(pendingFields).map((key) => [key, {[DateUtils.getMicroseconds()]: Localize.translateLocal('iou.error.genericEditFailureMessage')}]));
 
     const allReports = ReportConnection.getAllReports();
@@ -2510,7 +2511,7 @@ function getUpdateMoneyRequestParams(
     const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.parentReportID}`] ?? null;
     const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
-    let updatedTransaction: OnyxEntry<OnyxTypes.Transaction> = transaction
+    const updatedTransaction: OnyxEntry<OnyxTypes.Transaction> = transaction
         ? TransactionUtils.getUpdatedTransaction({
               transaction,
               transactionChanges,
@@ -2520,13 +2521,6 @@ function getUpdateMoneyRequestParams(
         : undefined;
     const transactionDetails = ReportUtils.getTransactionDetails(updatedTransaction);
 
-    if (updatedTransaction?.pendingFields) {
-        pendingFields = {
-            ...pendingFields,
-            ...updatedTransaction?.pendingFields,
-        };
-    }
-
     if (transactionDetails?.waypoints) {
         // This needs to be a JSON string since we're sending this to the MapBox API
         transactionDetails.waypoints = JSON.stringify(transactionDetails.waypoints);
@@ -2543,14 +2537,6 @@ function getUpdateMoneyRequestParams(
     const hasPendingWaypoints = 'waypoints' in transactionChanges;
     const hasModifiedDistanceRate = 'customUnitRateID' in transactionChanges;
     if (transaction && updatedTransaction && (hasPendingWaypoints || hasModifiedDistanceRate)) {
-        updatedTransaction = {
-            ...updatedTransaction,
-            ...TransactionUtils.calculateAmountForUpdatedWaypointOrRate(updatedTransaction, transactionChanges, policy, ReportUtils.isExpenseReport(iouReport)),
-        };
-
-        // Update the distanceUnit
-        lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', DistanceRequestUtils.getUpdatedDistanceUnit({transaction: updatedTransaction, policy}));
-
         // Delete the draft transaction when editing waypoints when the server responds successfully and there are no errors
         successData.push({
             onyxMethod: Onyx.METHOD.SET,
@@ -2567,6 +2553,7 @@ function getUpdateMoneyRequestParams(
                 amount: transaction.amount,
                 modifiedAmount: transaction.modifiedAmount,
                 modifiedMerchant: transaction.modifiedMerchant,
+                modifiedCurrency: transaction.modifiedCurrency,
             },
         });
     }
@@ -2671,7 +2658,6 @@ function getUpdateMoneyRequestParams(
         value: {
             ...updatedTransaction,
             pendingFields,
-            isLoading: hasPendingWaypoints,
             errorFields: null,
         },
     });
@@ -2762,8 +2748,6 @@ function getUpdateMoneyRequestParams(
         }
     }
 
-    const clearedPendingFields = Object.fromEntries(Object.keys(updatedTransaction?.pendingFields ?? transactionChanges).map((key) => [key, null]));
-
     // Clear out the error fields and loading states on success
     successData.push({
         onyxMethod: Onyx.METHOD.MERGE,
@@ -2847,6 +2831,7 @@ function getUpdateTrackExpenseParams(
 
     // Step 1: Set any "pending fields" (ones updated while the user was offline) to have error messages in the failureData
     const pendingFields = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE]));
+    const clearedPendingFields = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null]));
     const errorFields = Object.fromEntries(Object.keys(pendingFields).map((key) => [key, {[DateUtils.getMicroseconds()]: Localize.translateLocal('iou.error.genericEditFailureMessage')}]));
 
     const allReports = ReportConnection.getAllReports();
@@ -2855,7 +2840,7 @@ function getUpdateTrackExpenseParams(
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.parentReportID}`] ?? null;
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
-    let updatedTransaction = transaction
+    const updatedTransaction = transaction
         ? TransactionUtils.getUpdatedTransaction({
               transaction,
               transactionChanges,
@@ -2881,11 +2866,6 @@ function getUpdateTrackExpenseParams(
     const hasPendingWaypoints = 'waypoints' in transactionChanges;
     const hasModifiedDistanceRate = 'customUnitRateID' in transactionChanges;
     if (transaction && updatedTransaction && (hasPendingWaypoints || hasModifiedDistanceRate)) {
-        updatedTransaction = {
-            ...updatedTransaction,
-            ...TransactionUtils.calculateAmountForUpdatedWaypointOrRate(transaction, transactionChanges, policy, false),
-        };
-
         // Delete the draft transaction when editing waypoints when the server responds successfully and there are no errors
         successData.push({
             onyxMethod: Onyx.METHOD.SET,
@@ -2950,7 +2930,6 @@ function getUpdateTrackExpenseParams(
         value: {
             ...updatedTransaction,
             pendingFields,
-            isLoading: hasPendingWaypoints,
             errorFields: null,
         },
     });
@@ -2977,8 +2956,6 @@ function getUpdateTrackExpenseParams(
         });
     }
 
-    const clearedPendingFields = Object.fromEntries(Object.keys(updatedTransaction?.pendingFields ?? transactionChanges).map((key) => [key, null]));
-
     // Clear out the error fields and loading states on success
     successData.push({
         onyxMethod: Onyx.METHOD.MERGE,
@@ -3256,6 +3233,21 @@ function updateMoneyRequestDistanceRate(
     const allReports = ReportConnection.getAllReports();
     const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
+
+    const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+    if (transaction) {
+        lodashSet(transaction, 'comment.customUnit.customUnitRateID', transactionChanges.customUnitRateID);
+        lodashSet(transaction, 'comment.customUnit.defaultP2PRate', null);
+
+        const existingDistanceUnit = transaction?.comment?.customUnit?.distanceUnit;
+        const newDistanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction, policy});
+
+        // If the distanceUnit is set and the rate is changed to one that has a different unit, mark the merchant as modified to make the distance field pending
+        if (existingDistanceUnit && newDistanceUnit !== existingDistanceUnit) {
+            transactionChanges.merchant = TransactionUtils.getMerchant(transaction);
+        }
+    }
+
     let data: UpdateMoneyRequestData;
     if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
         data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, policy);

From ba450cf12a9277930196674eb49277cad353bc6d Mon Sep 17 00:00:00 2001
From: nkdengineer <161821005+nkdengineer@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:07:22 +0700
Subject: [PATCH 067/100] Update src/libs/ReportUtils.ts

Co-authored-by: dukenv0307 <129500732+dukenv0307@users.noreply.github.com>
---
 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 2430889b1098..a978fbaf325d 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1699,7 +1699,7 @@ function isOneTransactionThread(reportID: string, parentReportID: string, thread
 }
 
 /**
- * Get displayed repport ID in one transaction thread
+ * Get displayed report ID, it will be parentReportID if the report is one transaction thread
  */
 function getDisplayedReportID(reportID: string): string {
     const report = getReport(reportID);

From 04c530a484d4772a7048030d681f381aa8aa1d5b Mon Sep 17 00:00:00 2001
From: nkdengineer <161821005+nkdengineer@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:07:29 +0700
Subject: [PATCH 068/100] Update src/libs/actions/IOU.ts

Co-authored-by: dukenv0307 <129500732+dukenv0307@users.noreply.github.com>
---
 src/libs/actions/IOU.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 8eed2dd44092..8f837bcbf175 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8230,7 +8230,7 @@ function unholdRequest(transactionID: string, reportID: string, searchHash?: num
     );
 
     const currentReportID = ReportUtils.getDisplayedReportID(reportID);
-    Report.notifyNewAction(currentReportID ?? '', userAccountID);
+    Report.notifyNewAction(currentReportID, userAccountID);
 }
 // eslint-disable-next-line rulesdir/no-negated-variables
 function navigateToStartStepIfScanFileCannotBeRead(

From 15e308e684a39290c80d620f5abcc052d48526c6 Mon Sep 17 00:00:00 2001
From: nkdengineer <161821005+nkdengineer@users.noreply.github.com>
Date: Fri, 8 Nov 2024 22:07:40 +0700
Subject: [PATCH 069/100] Update src/libs/actions/IOU.ts

Co-authored-by: dukenv0307 <129500732+dukenv0307@users.noreply.github.com>
---
 src/libs/actions/IOU.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 8f837bcbf175..b6c4377eb54b 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8128,7 +8128,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string, sea
     );
 
     const currentReportID = ReportUtils.getDisplayedReportID(reportID);
-    Report.notifyNewAction(currentReportID ?? '', userAccountID);
+    Report.notifyNewAction(currentReportID, userAccountID);
 }
 
 /**

From b11ed9e402a467b72da5554caa37cb6dbe09b2ee Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 8 Nov 2024 15:57:41 +0000
Subject: [PATCH 070/100] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-ELECTRON-8352921
- https://snyk.io/vuln/SNYK-JS-ELECTRON-8310521
- https://snyk.io/vuln/SNYK-JS-ELECTRON-8310517
- https://snyk.io/vuln/SNYK-JS-ELECTRON-8310519
---
 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 594888c76972..b10b20d4ce21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -215,7 +215,7 @@
         "csv-writer": "^1.6.0",
         "diff-so-fancy": "^1.3.0",
         "dotenv": "^16.0.3",
-        "electron": "^29.4.6",
+        "electron": "^32.2.3",
         "electron-builder": "25.0.0",
         "eslint": "^8.57.0",
         "eslint-config-airbnb-typescript": "^18.0.0",
@@ -22115,9 +22115,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "29.4.6",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-29.4.6.tgz",
-      "integrity": "sha512-fz8ndj8cmmf441t4Yh2FDP3Rn0JhLkVGvtUf2YVMbJ5SdJPlc0JWll9jYkhh60jDKVVCr/tBAmfxqRnXMWJpzg==",
+      "version": "32.2.3",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.3.tgz",
+      "integrity": "sha512-ClTJrFuwBdZpDNEnVZSV1gTIYSq7c/TYoUv9AmOypL43/xtbfxXkz2vE67ehVoamFobWsIU2by087R5Av8cxJg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/package.json b/package.json
index a7f306235c0f..66bd5f088549 100644
--- a/package.json
+++ b/package.json
@@ -272,7 +272,7 @@
     "csv-writer": "^1.6.0",
     "diff-so-fancy": "^1.3.0",
     "dotenv": "^16.0.3",
-    "electron": "^29.4.6",
+    "electron": "^32.2.3",
     "electron-builder": "25.0.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb-typescript": "^18.0.0",

From 37f326356a970a9fb0301ed8d52ac05490529fe9 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Fri, 8 Nov 2024 22:14:21 +0530
Subject: [PATCH 071/100] refactor: simplify switch blocks

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

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 549dec9149c2..19f57c24f7b7 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -247,17 +247,11 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
 
         switch (quickAction?.action) {
             case CONST.QUICK_ACTIONS.REQUEST_MANUAL:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, undefined, true), true);
-                return;
             case CONST.QUICK_ACTIONS.REQUEST_SCAN:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, undefined, true), true);
-                return;
             case CONST.QUICK_ACTIONS.REQUEST_DISTANCE:
                 selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, undefined, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SPLIT_MANUAL:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, undefined, true), true);
-                return;
             case CONST.QUICK_ACTIONS.SPLIT_SCAN:
                 selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, undefined, true), true);
                 return;
@@ -271,11 +265,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                 selectOption(() => Task.startOutCreateTaskQuickAction(isValidReport ? quickActionReportID : '', quickAction.targetAccountID ?? -1), false);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_MANUAL:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, undefined, true), false);
-                break;
             case CONST.QUICK_ACTIONS.TRACK_SCAN:
-                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, undefined, true), false);
-                break;
             case CONST.QUICK_ACTIONS.TRACK_DISTANCE:
                 selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, undefined, true), false);
                 break;

From 8d2222f1303a2b1d5a302c6d6a99d880373667a2 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 12:37:13 -0700
Subject: [PATCH 072/100] add loading indicator

---
 .../SelectionList/Search/ActionCell.tsx           | 12 +++++++++++-
 .../Search/ExpenseItemHeaderNarrow.tsx            |  3 +++
 .../SelectionList/Search/ReportListItem.tsx       |  1 +
 .../SelectionList/Search/TransactionListItem.tsx  |  1 +
 .../Search/TransactionListItemRow.tsx             |  3 +++
 src/libs/actions/Search.ts                        | 15 +++++++++++++--
 src/types/onyx/SearchResults.ts                   |  3 +++
 7 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
index bf709c172d48..55e2cf6f849d 100644
--- a/src/components/SelectionList/Search/ActionCell.tsx
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -29,9 +29,18 @@ type ActionCellProps = {
     goToItem: () => void;
     isChildListItem?: boolean;
     parentAction?: string;
+    isLoading?: boolean;
 };
 
-function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth = true, isSelected = false, goToItem, isChildListItem = false, parentAction = ''}: ActionCellProps) {
+function ActionCell({
+    action = CONST.SEARCH.ACTION_TYPES.VIEW,
+    isLargeScreenWidth = true,
+    isSelected = false,
+    goToItem,
+    isChildListItem = false,
+    parentAction = '',
+    isLoading = false,
+}: ActionCellProps) {
     const {translate} = useLocalize();
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -87,6 +96,7 @@ function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth
             small
             style={[styles.w100]}
             innerStyles={buttonInnerStyles}
+            isLoading={isLoading}
             success
         />
     );
diff --git a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
index 185b9991e0a6..384262a78b15 100644
--- a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
+++ b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
@@ -28,6 +28,7 @@ type ExpenseItemHeaderNarrowProps = {
     isDisabled?: boolean | null;
     isDisabledCheckbox?: boolean;
     handleCheckboxPress?: () => void;
+    isLoading?: boolean;
 };
 
 function ExpenseItemHeaderNarrow({
@@ -44,6 +45,7 @@ function ExpenseItemHeaderNarrow({
     isDisabled,
     handleCheckboxPress,
     text,
+    isLoading = false,
 }: ExpenseItemHeaderNarrowProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -102,6 +104,7 @@ function ExpenseItemHeaderNarrow({
                     goToItem={onButtonPress}
                     isLargeScreenWidth={false}
                     isSelected={isSelected}
+                    isLoading={isLoading}
                 />
             </View>
         </View>
diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
index bdaeb915d943..4474ba7676aa 100644
--- a/src/components/SelectionList/Search/ReportListItem.tsx
+++ b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -202,6 +202,7 @@ function ReportListItem<TItem extends ListItem>({
                                 action={reportItem.action}
                                 goToItem={handleOnButtonPress}
                                 isSelected={item.isSelected}
+                                isLoading={reportItem.isActionLoading}
                             />
                         </View>
                     )}
diff --git a/src/components/SelectionList/Search/TransactionListItem.tsx b/src/components/SelectionList/Search/TransactionListItem.tsx
index db97985a1612..5d52c243e44d 100644
--- a/src/components/SelectionList/Search/TransactionListItem.tsx
+++ b/src/components/SelectionList/Search/TransactionListItem.tsx
@@ -85,6 +85,7 @@ function TransactionListItem<TItem extends ListItem>({
                 canSelectMultiple={!!canSelectMultiple}
                 isButtonSelected={item.isSelected}
                 shouldShowTransactionCheckbox={false}
+                isLoading={false}
             />
         </BaseListItem>
     );
diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
index 37b0429b7caa..99ad5436aab2 100644
--- a/src/components/SelectionList/Search/TransactionListItemRow.tsx
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -59,6 +59,7 @@ type TransactionListItemRowProps = {
     isButtonSelected?: boolean;
     parentAction?: string;
     shouldShowTransactionCheckbox?: boolean;
+    isLoading?: boolean;
 };
 
 const getTypeIcon = (type?: SearchTransactionType) => {
@@ -257,6 +258,7 @@ function TransactionListItemRow({
     isButtonSelected = false,
     parentAction = '',
     shouldShowTransactionCheckbox,
+    isLoading = false,
 }: TransactionListItemRowProps) {
     const styles = useThemeStyles();
     const {isLargeScreenWidth} = useResponsiveLayout();
@@ -445,6 +447,7 @@ function TransactionListItemRow({
                         isChildListItem={isChildListItem}
                         parentAction={parentAction}
                         goToItem={onButtonPress}
+                        isLoading={isLoading}
                     />
                 </View>
             </View>
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index f343d0d6b849..c7bb384c5a11 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -15,7 +15,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {LastPaymentMethod} from '@src/types/onyx';
-import type {SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
 import * as Report from './Report';
 
 let currentUserEmail: string;
@@ -189,7 +189,18 @@ function holdMoneyRequestOnSearch(hash: number, transactionIDList: string[], com
 }
 
 function approveMoneyRequestOnSearch(hash: number, reportIDList: string[]) {
-    const {optimisticData, finallyData} = getOnyxLoadingData(hash);
+    const createOnyxLoadingData = (isLoading: boolean): OnyxUpdate[] => [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
+            value: {
+                data: Object.fromEntries(reportIDList.map((reportID) => [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {isActionLoading: isLoading}])) as Partial<SearchReport>,
+            },
+        },
+    ];
+
+    const optimisticData: OnyxUpdate[] = createOnyxLoadingData(true);
+    const finallyData: OnyxUpdate[] = createOnyxLoadingData(false);
 
     API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH, {hash, reportIDList}, {optimisticData, finallyData});
 }
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index af9b2c06265f..513aef080f93 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -146,6 +146,9 @@ type SearchReport = {
     /** Whether the report is archived */
     // eslint-disable-next-line @typescript-eslint/naming-convention
     private_isArchived?: string;
+
+    /** Whether the action is loading */
+    isActionLoading?: boolean;
 };
 
 /** Model of report action search result */

From ba3f84814d28bbc898a7bb442b83ed0713a4339f Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Fri, 8 Nov 2024 22:38:00 +0300
Subject: [PATCH 073/100] fix double graying out

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

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index ee87f8f12c7d..46b89619f76f 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -447,7 +447,7 @@ function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = fals
                 )}
                 {(hasReceipt || !!errors) && (
                     <OfflineWithFeedback
-                        pendingAction={pendingAction}
+                        pendingAction={isDistanceRequest ? getPendingFieldAction('waypoints') : getPendingFieldAction('receipt')}
                         errors={errors}
                         errorRowStyles={[styles.mh4]}
                         onClose={() => {

From c46c57111fc365abc678b26cd1bbb646c6dcc8af Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 12:38:10 -0700
Subject: [PATCH 074/100] pass more props

---
 src/components/SelectionList/Search/ReportListItem.tsx         | 1 +
 src/components/SelectionList/Search/TransactionListItemRow.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
index 4474ba7676aa..b03932db2532 100644
--- a/src/components/SelectionList/Search/ReportListItem.tsx
+++ b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -168,6 +168,7 @@ function ReportListItem<TItem extends ListItem>({
                         action={reportItem.action}
                         onButtonPress={handleOnButtonPress}
                         containerStyle={[styles.ph3, styles.pt1half, styles.mb1half]}
+                        isLoading={reportItem.isActionLoading}
                     />
                 )}
                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap3, styles.ph3, styles.pv1half]}>
diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
index 99ad5436aab2..6bd071fa5ded 100644
--- a/src/components/SelectionList/Search/TransactionListItemRow.tsx
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -282,6 +282,7 @@ function TransactionListItemRow({
                         isDisabled={item.isDisabled}
                         isDisabledCheckbox={item.isDisabledCheckbox}
                         handleCheckboxPress={onCheckboxPress}
+                        isLoading={isLoading}
                     />
                 )}
 

From e5b5ed2571e1d754f083c6107e9f84915a82f562 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 12:59:03 -0700
Subject: [PATCH 075/100] update callback to handle single transaction reports

---
 .../Search/TransactionListItem.tsx            |  2 +-
 src/libs/actions/Search.ts                    | 24 +++++++++++--------
 src/types/onyx/SearchResults.ts               |  3 +++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/SelectionList/Search/TransactionListItem.tsx b/src/components/SelectionList/Search/TransactionListItem.tsx
index 5d52c243e44d..a23a7048644e 100644
--- a/src/components/SelectionList/Search/TransactionListItem.tsx
+++ b/src/components/SelectionList/Search/TransactionListItem.tsx
@@ -85,7 +85,7 @@ function TransactionListItem<TItem extends ListItem>({
                 canSelectMultiple={!!canSelectMultiple}
                 isButtonSelected={item.isSelected}
                 shouldShowTransactionCheckbox={false}
-                isLoading={false}
+                isLoading={transactionItem.isActionLoading}
             />
         </BaseListItem>
     );
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index c7bb384c5a11..bb671fe7720d 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -10,7 +10,7 @@ import {WRITE_COMMANDS} from '@libs/API/types';
 import * as ApiUtils from '@libs/ApiUtils';
 import fileDownload from '@libs/fileDownload';
 import enhanceParameters from '@libs/Network/enhanceParameters';
-import {isReportListItemType} from '@libs/SearchUIUtils';
+import {isReportListItemType, isTransactionListItemType} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
@@ -35,13 +35,15 @@ Onyx.connect({
 });
 
 function handleActionButtonPress(hash: number, item: TransactionListItemType | ReportListItemType, goToItem: () => void) {
-    const lastPolicyPaymentMethod = item.policyID ? (lastPaymentMethod?.[item.policyID] as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>) : null;
-    const amount = isReportListItemType(item) ? item.total ?? 0 : item.formattedTotal;
+    const transactionID = isTransactionListItemType(item) ? item.transactionID : undefined;
     switch (item.action) {
-        case CONST.SEARCH.ACTION_TYPES.PAY:
+        case CONST.SEARCH.ACTION_TYPES.PAY: {
+            const lastPolicyPaymentMethod = item.policyID ? (lastPaymentMethod?.[item.policyID] as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>) : null;
+            const amount = isReportListItemType(item) ? item.total ?? 0 : item.formattedTotal;
             return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, [{reportID: item.reportID, amount, paymentType: lastPolicyPaymentMethod}]) : goToItem();
+        }
         case CONST.SEARCH.ACTION_TYPES.APPROVE:
-            return approveMoneyRequestOnSearch(hash, [item.reportID]);
+            return approveMoneyRequestOnSearch(hash, [item.reportID], transactionID);
         default:
             return goToItem();
     }
@@ -188,19 +190,21 @@ function holdMoneyRequestOnSearch(hash: number, transactionIDList: string[], com
     API.write(WRITE_COMMANDS.HOLD_MONEY_REQUEST_ON_SEARCH, {hash, transactionIDList, comment}, {optimisticData, finallyData});
 }
 
-function approveMoneyRequestOnSearch(hash: number, reportIDList: string[]) {
-    const createOnyxLoadingData = (isLoading: boolean): OnyxUpdate[] => [
+function approveMoneyRequestOnSearch(hash: number, reportIDList: string[], transactionID?: string) {
+    const createActionLoadingData = (isLoading: boolean): OnyxUpdate[] => [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
             value: {
-                data: Object.fromEntries(reportIDList.map((reportID) => [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {isActionLoading: isLoading}])) as Partial<SearchReport>,
+                data: transactionID
+                    ? {[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]: {isActionLoading: isLoading}}
+                    : (Object.fromEntries(reportIDList.map((reportID) => [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {isActionLoading: isLoading}])) as Partial<SearchReport>),
             },
         },
     ];
 
-    const optimisticData: OnyxUpdate[] = createOnyxLoadingData(true);
-    const finallyData: OnyxUpdate[] = createOnyxLoadingData(false);
+    const optimisticData: OnyxUpdate[] = createActionLoadingData(true);
+    const finallyData: OnyxUpdate[] = createActionLoadingData(false);
 
     API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH, {hash, reportIDList}, {optimisticData, finallyData});
 }
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 513aef080f93..56ae9cc62379 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -333,6 +333,9 @@ type SearchTransaction = {
 
     /** Whether the transaction report has only a single transaction */
     isFromOneTransactionReport?: boolean;
+
+    /** Whether the action is loading */
+    isActionLoading?: boolean;
 };
 
 /** Types of searchable transactions */

From 66acf61a496c23428176c8f0fda8d6b3b93783b5 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 13:22:46 -0700
Subject: [PATCH 076/100] add loading for pay action

---
 src/libs/actions/Search.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index bb671fe7720d..a6aee93f8ac3 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -40,7 +40,7 @@ function handleActionButtonPress(hash: number, item: TransactionListItemType | R
         case CONST.SEARCH.ACTION_TYPES.PAY: {
             const lastPolicyPaymentMethod = item.policyID ? (lastPaymentMethod?.[item.policyID] as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>) : null;
             const amount = isReportListItemType(item) ? item.total ?? 0 : item.formattedTotal;
-            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, [{reportID: item.reportID, amount, paymentType: lastPolicyPaymentMethod}]) : goToItem();
+            return lastPolicyPaymentMethod ? payMoneyRequestOnSearch(hash, [{reportID: item.reportID, amount, paymentType: lastPolicyPaymentMethod}], transactionID) : goToItem();
         }
         case CONST.SEARCH.ACTION_TYPES.APPROVE:
             return approveMoneyRequestOnSearch(hash, [item.reportID], transactionID);
@@ -209,8 +209,21 @@ function approveMoneyRequestOnSearch(hash: number, reportIDList: string[], trans
     API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH, {hash, reportIDList}, {optimisticData, finallyData});
 }
 
-function payMoneyRequestOnSearch(hash: number, paymentData: PaymentData[]) {
-    const {optimisticData, finallyData} = getOnyxLoadingData(hash);
+function payMoneyRequestOnSearch(hash: number, paymentData: PaymentData[], transactionID?: string) {
+    const createActionLoadingData = (isLoading: boolean): OnyxUpdate[] => [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
+            value: {
+                data: transactionID
+                    ? {[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]: {isActionLoading: isLoading}}
+                    : (Object.fromEntries(paymentData.map((item) => [`${ONYXKEYS.COLLECTION.REPORT}${item.reportID}`, {isActionLoading: isLoading}])) as Partial<SearchReport>),
+            },
+        },
+    ];
+
+    const optimisticData: OnyxUpdate[] = createActionLoadingData(true);
+    const finallyData: OnyxUpdate[] = createActionLoadingData(false);
 
     API.write(WRITE_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH, {hash, paymentData: JSON.stringify(paymentData)}, {optimisticData, finallyData});
 }

From 7c2034205afdbdf6b296293d0bcc5bf2db455aed Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 13:26:42 -0700
Subject: [PATCH 077/100] add comment

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

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index a6aee93f8ac3..ecd0fc26785a 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -35,7 +35,10 @@ Onyx.connect({
 });
 
 function handleActionButtonPress(hash: number, item: TransactionListItemType | ReportListItemType, goToItem: () => void) {
+    // The transactionID is needed to handle actions taken on `status:all` where transactions on single expense reports can be approved/paid.
+    // We need the transactionID to display the loading indicator for that list item's action.
     const transactionID = isTransactionListItemType(item) ? item.transactionID : undefined;
+
     switch (item.action) {
         case CONST.SEARCH.ACTION_TYPES.PAY: {
             const lastPolicyPaymentMethod = item.policyID ? (lastPaymentMethod?.[item.policyID] as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>) : null;

From ea0ae146a96d716c4980897d156a31f84c164777 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 13:35:42 -0700
Subject: [PATCH 078/100] delete empty file

---
 src/components/SelectionList/SearchTableHeaderColumn.tsx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/components/SelectionList/SearchTableHeaderColumn.tsx

diff --git a/src/components/SelectionList/SearchTableHeaderColumn.tsx b/src/components/SelectionList/SearchTableHeaderColumn.tsx
deleted file mode 100644
index e69de29bb2d1..000000000000

From 81b3cc9184098d7d47b055072f20d0c2afdafe91 Mon Sep 17 00:00:00 2001
From: Shahidullah Muffakir <shahidmuffakir@gmail.com>
Date: Sat, 9 Nov 2024 02:34:51 +0530
Subject: [PATCH 079/100] hide 'Request early cancellation' option until after
 first billing

---
 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 bc074793d837..ca38d98f0b12 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -195,7 +195,7 @@ function CardSection() {
                     />
                 )}
 
-                {privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL && <RequestEarlyCancellationMenuItem />}
+                {privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL && account?.hasPurchases && <RequestEarlyCancellationMenuItem />}
             </Section>
 
             {!!account?.isEligibleForRefund && (

From 81a0bdc2d2aa6f37ba4cb1f671af8afab6ba496e Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 14:23:11 -0700
Subject: [PATCH 080/100] fix sort on multiple statuses

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

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 77d50e0e4ed5..0ab52f633e81 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -406,7 +406,7 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
     };
 
     const shouldShowYear = SearchUIUtils.shouldShowYear(searchResults?.data);
-    const shouldShowSorting = Array.isArray(status) ? status.some((s) => sortableSearchStatuses.includes(s)) : sortableSearchStatuses.includes(status);
+    const shouldShowSorting = Array.isArray(status) ? false : sortableSearchStatuses.includes(status);
 
     return (
         <SelectionListWithModal<ReportListItemType | TransactionListItemType | ReportActionListItemType>

From 754a11c8dbc3532bb4201055c8bdceb4c75c674d Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Fri, 8 Nov 2024 14:29:44 -0700
Subject: [PATCH 081/100] simplify condition

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

diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 0ab52f633e81..bb2af7d81358 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -406,7 +406,7 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
     };
 
     const shouldShowYear = SearchUIUtils.shouldShowYear(searchResults?.data);
-    const shouldShowSorting = Array.isArray(status) ? false : sortableSearchStatuses.includes(status);
+    const shouldShowSorting = !Array.isArray(status) && sortableSearchStatuses.includes(status);
 
     return (
         <SelectionListWithModal<ReportListItemType | TransactionListItemType | ReportActionListItemType>

From b2a10a05b305863ec9f583b22eb8ded0f6d54bb5 Mon Sep 17 00:00:00 2001
From: Shahidullah Muffakir <shahidmuffakir@gmail.com>
Date: Sat, 9 Nov 2024 03:09:53 +0530
Subject: [PATCH 082/100] resolve eslint error

---
 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 ca38d98f0b12..bf0fdcbb6da3 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -195,7 +195,7 @@ function CardSection() {
                     />
                 )}
 
-                {privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL && account?.hasPurchases && <RequestEarlyCancellationMenuItem />}
+                {!!(privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL && account?.hasPurchases) && <RequestEarlyCancellationMenuItem />}
             </Section>
 
             {!!account?.isEligibleForRefund && (

From 522b1837f010f19578a251249ceb353f04e05348 Mon Sep 17 00:00:00 2001
From: QichenZhu <57348009+QichenZhu@users.noreply.github.com>
Date: Sat, 9 Nov 2024 13:30:46 +1300
Subject: [PATCH 083/100] Bump react-native-live-markdown to 0.1.183

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

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 5268e5e9fb24..18d030a38ce9 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2391,7 +2391,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.180):
+  - RNLiveMarkdown (0.1.183):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2411,9 +2411,9 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/newarch (= 0.1.180)
+    - RNLiveMarkdown/newarch (= 0.1.183)
     - Yoga
-  - RNLiveMarkdown/newarch (0.1.180):
+  - RNLiveMarkdown/newarch (0.1.183):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3264,7 +3264,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 8781e2529230a1bc3ea8d75e5c3cd071b6c6aed7
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: fc07b203a3ed832e2e5d3950e69cd4fc3b0568b6
+  RNLiveMarkdown: fa9c6451960d09209bb5698745a0a66330ec53cc
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: 460d6ff97ae49c7d5708c3212c6521697c36a0c4
   RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28
diff --git a/package-lock.json b/package-lock.json
index 594888c76972..dcdb0e692536 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "license": "MIT",
       "dependencies": {
         "@dotlottie/react-player": "^1.6.3",
-        "@expensify/react-native-live-markdown": "0.1.180",
+        "@expensify/react-native-live-markdown": "0.1.183",
         "@expo/metro-runtime": "~3.2.3",
         "@firebase/app": "^0.10.10",
         "@firebase/performance": "^0.6.8",
@@ -3631,9 +3631,9 @@
       }
     },
     "node_modules/@expensify/react-native-live-markdown": {
-      "version": "0.1.180",
-      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.180.tgz",
-      "integrity": "sha512-toyFMl5nXQiC2lY6x/bGagsXaeCevZjVuebnClwVZskrPMI65o8OH/Y1VvTly9eNWD04Br++ANmOPJZYMisEiQ==",
+      "version": "0.1.183",
+      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.183.tgz",
+      "integrity": "sha512-egxknos7ghe4M5Z2rK7DvphcaxQBdxyppu5N2tdCVc/3oPO2ZtBNjDjtksqywC12wPtIYgHSgxrzvLEfbh5skw==",
       "license": "MIT",
       "workspaces": [
         "parser",
diff --git a/package.json b/package.json
index a7f306235c0f..c85bae962e0f 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.180",
+    "@expensify/react-native-live-markdown": "0.1.183",
     "@expo/metro-runtime": "~3.2.3",
     "@firebase/app": "^0.10.10",
     "@firebase/performance": "^0.6.8",

From 2436a60f0f5733b8bb2f696b2457f52405a6d132 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 9 Nov 2024 18:40:36 +0530
Subject: [PATCH 084/100] review comments

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

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 066fea5bacdd..f27d8a0a7029 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -191,7 +191,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
         if (groupPolicies.length === 0) {
             return false;
         }
-        return groupPolicies.every((policy) => !policy?.isPolicyExpenseChatEnabled);
+        return !groupPolicies.some((policy) => policy?.isPolicyExpenseChatEnabled === true);
     }, [allPolicies]);
 
     const quickActionAvatars = useMemo(() => {
@@ -529,6 +529,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                               {
                                   icon: Expensicons.InvoiceGeneric,
                                   text: translate('workspace.invoices.sendInvoice'),
+                                  shouldCallAfterModalHide: shouldRedirectToOD,
                                   onSelected: () =>
                                       interceptAnonymousUser(() => {
                                           if (shouldRedirectToOD) {

From a48bd916d08f09c71151b8cfdf7752d27c88ab30 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 9 Nov 2024 18:48:11 +0530
Subject: [PATCH 085/100] fix copy

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

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1f8750c46277..002b727fdbfb 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -743,7 +743,7 @@ const translations = {
         saveTheWorld: 'Save the world',
         tooltip: 'Get started here!',
         redirectToOldDotModal: {
-            title: '🚧 Under construction 🚧',
+            title: 'Coming soon',
             description: "We're fine-tuning a few more bits and pieces of New Expensify to accommodate your specific setup. In the meantime, head over to Expensify Classic.",
         },
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 31216318b1bb..0f9197c6855c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -737,7 +737,7 @@ const translations = {
         saveTheWorld: 'Salvar el mundo',
         tooltip: '¡Comienza aquí!',
         redirectToOldDotModal: {
-            title: '🚧 En construcción 🚧',
+            title: 'Próximamente',
             description: 'Estamos ajustando algunos detalles de New Expensify para adaptarla a tu configuración específica. Mientras tanto, dirígete a Expensify Classic.',
         },
     },

From 162469385789147ff650dd2bf5bf3900f5ee5c5b Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Sat, 9 Nov 2024 21:05:28 +0500
Subject: [PATCH 086/100] fix type checks

---
 desktop/main.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/main.ts b/desktop/main.ts
index 1221b05a8388..57673384571f 100644
--- a/desktop/main.ts
+++ b/desktop/main.ts
@@ -1,5 +1,5 @@
 import {app, BrowserWindow, clipboard, dialog, ipcMain, Menu, shell} from 'electron';
-import type {BrowserView, MenuItem, MenuItemConstructorOptions, WebContents, WebviewTag} from 'electron';
+import type {BaseWindow, BrowserView, MenuItem, MenuItemConstructorOptions, WebContents, WebviewTag} from 'electron';
 import contextMenu from 'electron-context-menu';
 import log from 'electron-log';
 import type {ElectronLog} from 'electron-log';
@@ -132,7 +132,7 @@ const quitAndInstallWithUpdate = () => {
 };
 
 /** Menu Item callback to trigger an update check */
-const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BrowserWindow) => {
+const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BaseWindow) => {
     if (menuItem) {
         // Disable item until the check (and download) is complete
         // eslint-disable-next-line no-param-reassign -- menu item flags like enabled or visible can be dynamically toggled by mutating the object

From f30c30790abd05cd53406bf99e5248f98e5a3f03 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Sat, 9 Nov 2024 21:30:44 +0500
Subject: [PATCH 087/100] fix deprecations

---
 desktop/main.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/desktop/main.ts b/desktop/main.ts
index 57673384571f..4f24756b92dd 100644
--- a/desktop/main.ts
+++ b/desktop/main.ts
@@ -107,7 +107,7 @@ process.argv.forEach((arg) => {
         return;
     }
 
-    expectedUpdateVersion = arg.substr(`${EXPECTED_UPDATE_VERSION_FLAG}=`.length);
+    expectedUpdateVersion = arg.slice(`${EXPECTED_UPDATE_VERSION_FLAG}=`.length);
 });
 
 // Add the listeners and variables required to ensure that auto-updating
@@ -427,7 +427,7 @@ const mainWindow = (): Promise<void> => {
                                 id: 'back',
                                 accelerator: process.platform === 'darwin' ? 'Cmd+[' : 'Shift+[',
                                 click: () => {
-                                    browserWindow.webContents.goBack();
+                                    browserWindow.webContents.navigationHistory.goBack();
                                 },
                             },
                             {
@@ -435,14 +435,14 @@ const mainWindow = (): Promise<void> => {
                                 visible: false,
                                 accelerator: process.platform === 'darwin' ? 'Cmd+Left' : 'Shift+Left',
                                 click: () => {
-                                    browserWindow.webContents.goBack();
+                                    browserWindow.webContents.navigationHistory.goBack();
                                 },
                             },
                             {
                                 id: 'forward',
                                 accelerator: process.platform === 'darwin' ? 'Cmd+]' : 'Shift+]',
                                 click: () => {
-                                    browserWindow.webContents.goForward();
+                                    browserWindow.webContents.navigationHistory.goForward();
                                 },
                             },
                             {
@@ -450,7 +450,7 @@ const mainWindow = (): Promise<void> => {
                                 visible: false,
                                 accelerator: process.platform === 'darwin' ? 'Cmd+Right' : 'Shift+Right',
                                 click: () => {
-                                    browserWindow.webContents.goForward();
+                                    browserWindow.webContents.navigationHistory.goForward();
                                 },
                             },
                         ],
@@ -507,7 +507,7 @@ const mainWindow = (): Promise<void> => {
                     const denial = {action: 'deny'} as const;
 
                     // Make sure local urls stay in electron perimeter
-                    if (url.substr(0, 'file://'.length).toLowerCase() === 'file://') {
+                    if (url.slice(0, 'file://'.length).toLowerCase() === 'file://') {
                         return denial;
                     }
 
@@ -539,19 +539,19 @@ const mainWindow = (): Promise<void> => {
                 // Initiating a browser-back or browser-forward with mouse buttons should navigate history.
                 browserWindow.on('app-command', (e, cmd) => {
                     if (cmd === 'browser-backward') {
-                        browserWindow.webContents.goBack();
+                        browserWindow.webContents.navigationHistory.goBack();
                     }
                     if (cmd === 'browser-forward') {
-                        browserWindow.webContents.goForward();
+                        browserWindow.webContents.navigationHistory.goForward();
                     }
                 });
 
                 browserWindow.on('swipe', (e, direction) => {
                     if (direction === 'left') {
-                        browserWindow.webContents.goBack();
+                        browserWindow.webContents.navigationHistory.goBack();
                     }
                     if (direction === 'right') {
-                        browserWindow.webContents.goForward();
+                        browserWindow.webContents.navigationHistory.goForward();
                     }
                 });
 

From 6d5159c914905c5d31d508bf0fa0c8ae26ebebe8 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Sat, 9 Nov 2024 21:56:23 +0500
Subject: [PATCH 088/100] fix deprecations

---
 desktop/main.ts           |   1 +
 desktop/package-lock.json | 433 ++++++++++++++++++++------------------
 desktop/package.json      |   2 +-
 3 files changed, 232 insertions(+), 204 deletions(-)

diff --git a/desktop/main.ts b/desktop/main.ts
index 4f24756b92dd..098ddfff0bd0 100644
--- a/desktop/main.ts
+++ b/desktop/main.ts
@@ -47,6 +47,7 @@ function pasteAsPlainText(browserWindow: BrowserWindow | BrowserView | WebviewTa
     const text = clipboard.readText();
 
     if ('webContents' in browserWindow) {
+        // eslint-disable-next-line deprecation/deprecation
         browserWindow.webContents.insertText(text);
     }
 }
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index 926fb1e24d22..be1b0fdc6154 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -7,7 +7,7 @@
       "name": "new.expensify.desktop",
       "license": "MIT",
       "dependencies": {
-        "electron-context-menu": "^2.3.0",
+        "electron-context-menu": "^4.0.4",
         "electron-log": "^4.4.8",
         "electron-updater": "^6.3.9",
         "mime-types": "^2.1.35",
@@ -24,22 +24,24 @@
       "dev": true
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -50,14 +52,6 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/builder-util-runtime": {
       "version": "9.2.10",
       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz",
@@ -72,36 +66,21 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
+      "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/debug": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
@@ -120,35 +99,50 @@
       }
     },
     "node_modules/electron-context-menu": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-2.5.2.tgz",
-      "integrity": "sha512-1cEQR6fA9ktFsRBc+eXPwvrOgAPytUD7rUV4iBAA5zTrLAPKokJ23xeMjcK2fjrDPrlFRBxcLz0KP+GUhMrSCQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-4.0.4.tgz",
+      "integrity": "sha512-XPGj35npL8+MG9Lx5ukmK/h8KLmjYJ3e1GvwWKrNZvf2ocv746WXIyltoV1yWtkEPT7g2kQ8hFmu0ZupK5KieA==",
+      "license": "MIT",
       "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "electron-dl": "^3.1.0",
-        "electron-is-dev": "^1.2.0"
+        "cli-truncate": "^4.0.0",
+        "electron-dl": "^4.0.0",
+        "electron-is-dev": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/electron-dl": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.3.0.tgz",
-      "integrity": "sha512-Zwaz/OMGPIfBLV2SQH4sTsdDOs/U4y5AOHfremMBXEpjIxX+SiTx845DZAvJJwgb5hfowyWOBLiJhd/emBNLLQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-4.0.0.tgz",
+      "integrity": "sha512-USiB9816d2JzKv0LiSbreRfTg5lDk3lWh0vlx/gugCO92ZIJkHVH0UM18EHvKeadErP6Xn4yiTphWzYfbA2Ong==",
+      "license": "MIT",
       "dependencies": {
         "ext-name": "^5.0.0",
-        "pupa": "^2.0.1",
-        "unused-filename": "^2.1.0"
+        "pupa": "^3.1.0",
+        "unused-filename": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/electron-is-dev": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
-      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-3.0.1.tgz",
+      "integrity": "sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/electron-log": {
       "version": "4.4.8",
@@ -172,22 +166,40 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "license": "MIT"
     },
     "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
+      "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ext-list": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
       "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "^1.28.0"
       },
@@ -199,6 +211,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
       "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "license": "MIT",
       "dependencies": {
         "ext-list": "^2.0.0",
         "sort-keys-length": "^1.0.0"
@@ -220,23 +233,40 @@
         "node": ">=12"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -297,14 +327,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/modify-filename": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
-      "integrity": "sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -317,22 +339,27 @@
       "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="
     },
     "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
     "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
+      "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
+      "license": "MIT",
       "dependencies": {
-        "escape-goat": "^2.0.0"
+        "escape-goat": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/sax": {
@@ -354,22 +381,26 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+      "license": "MIT",
       "dependencies": {
         "is-plain-obj": "^1.0.0"
       },
@@ -380,7 +411,8 @@
     "node_modules/sort-keys-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
-      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
+      "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
+      "license": "MIT",
       "dependencies": {
         "sort-keys": "^1.0.0"
       },
@@ -389,27 +421,35 @@
       }
     },
     "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/tiny-typed-emitter": {
@@ -426,15 +466,19 @@
       }
     },
     "node_modules/unused-filename": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-2.1.0.tgz",
-      "integrity": "sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-4.0.1.tgz",
+      "integrity": "sha512-ZX6U1J04K1FoSUeoX1OicAhw4d0aro2qo+L8RhJkiGTNtBNkd/Fi1Wxoc9HzcVu6HfOzm0si/N15JjxFmD1z6A==",
+      "license": "MIT",
       "dependencies": {
-        "modify-filename": "^1.1.0",
-        "path-exists": "^4.0.0"
+        "escape-string-regexp": "^5.0.0",
+        "path-exists": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     }
   },
@@ -446,28 +490,20 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="
     },
     "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
     },
     "argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
-    },
     "builder-util-runtime": {
       "version": "9.2.10",
       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz",
@@ -478,27 +514,14 @@
       }
     },
     "cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-      "requires": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "requires": {
-        "color-name": "~1.1.4"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
       }
     },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "debug": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
@@ -508,29 +531,29 @@
       }
     },
     "electron-context-menu": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-2.5.2.tgz",
-      "integrity": "sha512-1cEQR6fA9ktFsRBc+eXPwvrOgAPytUD7rUV4iBAA5zTrLAPKokJ23xeMjcK2fjrDPrlFRBxcLz0KP+GUhMrSCQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-4.0.4.tgz",
+      "integrity": "sha512-XPGj35npL8+MG9Lx5ukmK/h8KLmjYJ3e1GvwWKrNZvf2ocv746WXIyltoV1yWtkEPT7g2kQ8hFmu0ZupK5KieA==",
       "requires": {
-        "cli-truncate": "^2.1.0",
-        "electron-dl": "^3.1.0",
-        "electron-is-dev": "^1.2.0"
+        "cli-truncate": "^4.0.0",
+        "electron-dl": "^4.0.0",
+        "electron-is-dev": "^3.0.1"
       }
     },
     "electron-dl": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.3.0.tgz",
-      "integrity": "sha512-Zwaz/OMGPIfBLV2SQH4sTsdDOs/U4y5AOHfremMBXEpjIxX+SiTx845DZAvJJwgb5hfowyWOBLiJhd/emBNLLQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-4.0.0.tgz",
+      "integrity": "sha512-USiB9816d2JzKv0LiSbreRfTg5lDk3lWh0vlx/gugCO92ZIJkHVH0UM18EHvKeadErP6Xn4yiTphWzYfbA2Ong==",
       "requires": {
         "ext-name": "^5.0.0",
-        "pupa": "^2.0.1",
-        "unused-filename": "^2.1.0"
+        "pupa": "^3.1.0",
+        "unused-filename": "^4.0.1"
       }
     },
     "electron-is-dev": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
-      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-3.0.1.tgz",
+      "integrity": "sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q=="
     },
     "electron-log": {
       "version": "4.4.8",
@@ -553,14 +576,19 @@
       }
     },
     "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw=="
     },
     "escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
+      "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg=="
+    },
+    "escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="
     },
     "ext-list": {
       "version": "2.2.2",
@@ -589,20 +617,25 @@
         "universalify": "^2.0.0"
       }
     },
+    "get-east-asian-width": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ=="
+    },
     "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="
     },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="
     },
     "js-yaml": {
       "version": "4.1.0",
@@ -649,11 +682,6 @@
         "mime-db": "1.52.0"
       }
     },
-    "modify-filename": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
-      "integrity": "sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE="
-    },
     "ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -665,16 +693,16 @@
       "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="
     },
     "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ=="
     },
     "pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
+      "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
       "requires": {
-        "escape-goat": "^2.0.0"
+        "escape-goat": "^4.0.0"
       }
     },
     "sax": {
@@ -688,19 +716,18 @@
       "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
     },
     "slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       }
     },
     "sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
       "requires": {
         "is-plain-obj": "^1.0.0"
       }
@@ -708,27 +735,27 @@
     "sort-keys-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
-      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
+      "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
       "requires": {
         "sort-keys": "^1.0.0"
       }
     },
     "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       }
     },
     "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "requires": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^6.0.1"
       }
     },
     "tiny-typed-emitter": {
@@ -742,12 +769,12 @@
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
     "unused-filename": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-2.1.0.tgz",
-      "integrity": "sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-4.0.1.tgz",
+      "integrity": "sha512-ZX6U1J04K1FoSUeoX1OicAhw4d0aro2qo+L8RhJkiGTNtBNkd/Fi1Wxoc9HzcVu6HfOzm0si/N15JjxFmD1z6A==",
       "requires": {
-        "modify-filename": "^1.1.0",
-        "path-exists": "^4.0.0"
+        "escape-string-regexp": "^5.0.0",
+        "path-exists": "^5.0.0"
       }
     }
   }
diff --git a/desktop/package.json b/desktop/package.json
index ac66df7e9aed..0afe38dd069b 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -4,7 +4,7 @@
   "main": "dist/main.js",
   "scripts": {},
   "dependencies": {
-    "electron-context-menu": "^2.3.0",
+    "electron-context-menu": "^4.0.4",
     "electron-log": "^4.4.8",
     "electron-updater": "^6.3.9",
     "mime-types": "^2.1.35",

From e9beef2645738cfbf36fb671353cac3e52ac3df0 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Sat, 9 Nov 2024 22:00:23 +0500
Subject: [PATCH 089/100] add comment for the deprecation warning ignore

---
 desktop/main.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/desktop/main.ts b/desktop/main.ts
index 098ddfff0bd0..04aa3e1b478e 100644
--- a/desktop/main.ts
+++ b/desktop/main.ts
@@ -47,6 +47,7 @@ function pasteAsPlainText(browserWindow: BrowserWindow | BrowserView | WebviewTa
     const text = clipboard.readText();
 
     if ('webContents' in browserWindow) {
+        // https://github.com/sindresorhus/electron-context-menu is passing in deprecated `BrowserView` to this function
         // eslint-disable-next-line deprecation/deprecation
         browserWindow.webContents.insertText(text);
     }

From ef8237fb7a530655136720fac82af5e1040c5385 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Sat, 9 Nov 2024 22:09:43 +0500
Subject: [PATCH 090/100] revert electron-context-menu upgrade

---
 desktop/package-lock.json | 406 +++++++++++++++++++-------------------
 desktop/package.json      |   2 +-
 2 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index be1b0fdc6154..a8bbd48c1818 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -7,7 +7,7 @@
       "name": "new.expensify.desktop",
       "license": "MIT",
       "dependencies": {
-        "electron-context-menu": "^4.0.4",
+        "electron-context-menu": "^2.3.0",
         "electron-log": "^4.4.8",
         "electron-updater": "^6.3.9",
         "mime-types": "^2.1.35",
@@ -24,24 +24,24 @@
       "dev": true
     },
     "node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -52,6 +52,15 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/builder-util-runtime": {
       "version": "9.2.10",
       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz",
@@ -66,21 +75,39 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
-      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^7.0.0"
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
+    },
     "node_modules/debug": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
@@ -99,50 +126,41 @@
       }
     },
     "node_modules/electron-context-menu": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-4.0.4.tgz",
-      "integrity": "sha512-XPGj35npL8+MG9Lx5ukmK/h8KLmjYJ3e1GvwWKrNZvf2ocv746WXIyltoV1yWtkEPT7g2kQ8hFmu0ZupK5KieA==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-2.5.2.tgz",
+      "integrity": "sha512-1cEQR6fA9ktFsRBc+eXPwvrOgAPytUD7rUV4iBAA5zTrLAPKokJ23xeMjcK2fjrDPrlFRBxcLz0KP+GUhMrSCQ==",
       "license": "MIT",
       "dependencies": {
-        "cli-truncate": "^4.0.0",
-        "electron-dl": "^4.0.0",
-        "electron-is-dev": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=18"
+        "cli-truncate": "^2.1.0",
+        "electron-dl": "^3.1.0",
+        "electron-is-dev": "^1.2.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/electron-dl": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-4.0.0.tgz",
-      "integrity": "sha512-USiB9816d2JzKv0LiSbreRfTg5lDk3lWh0vlx/gugCO92ZIJkHVH0UM18EHvKeadErP6Xn4yiTphWzYfbA2Ong==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.2.tgz",
+      "integrity": "sha512-i104cl+u8yJ0lhpRAtUWfeGuWuL1PL6TBiw2gLf0MMIBjfgE485Ags2mcySx4uWU9P9uj/vsD3jd7X+w1lzZxw==",
       "license": "MIT",
       "dependencies": {
         "ext-name": "^5.0.0",
-        "pupa": "^3.1.0",
-        "unused-filename": "^4.0.1"
+        "pupa": "^2.0.1",
+        "unused-filename": "^2.1.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/electron-is-dev": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-3.0.1.tgz",
-      "integrity": "sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
+      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw==",
+      "license": "MIT"
     },
     "node_modules/electron-log": {
       "version": "4.4.8",
@@ -166,33 +184,18 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "license": "MIT"
     },
     "node_modules/escape-goat": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
-      "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/ext-list": {
@@ -233,33 +236,18 @@
         "node": ">=12"
       }
     },
-    "node_modules/get-east-asian-width": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
-      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/is-plain-obj": {
@@ -327,6 +315,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/modify-filename": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
+      "integrity": "sha512-EickqnKq3kVVaZisYuCxhtKbZjInCuwgwZWyAmRIp1NTMhri7r3380/uqwrUHfaDiPzLVTuoNy4whX66bxPVog==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -339,27 +336,24 @@
       "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="
     },
     "node_modules/path-exists": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "license": "MIT",
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=8"
       }
     },
     "node_modules/pupa": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
-      "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
+      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
       "license": "MIT",
       "dependencies": {
-        "escape-goat": "^4.0.0"
+        "escape-goat": "^2.0.0"
       },
       "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/sax": {
@@ -381,19 +375,17 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+        "node": ">=8"
       }
     },
     "node_modules/sort-keys": {
@@ -421,35 +413,29 @@
       }
     },
     "node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "node": ">=8"
       }
     },
     "node_modules/tiny-typed-emitter": {
@@ -466,19 +452,16 @@
       }
     },
     "node_modules/unused-filename": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-4.0.1.tgz",
-      "integrity": "sha512-ZX6U1J04K1FoSUeoX1OicAhw4d0aro2qo+L8RhJkiGTNtBNkd/Fi1Wxoc9HzcVu6HfOzm0si/N15JjxFmD1z6A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-2.1.0.tgz",
+      "integrity": "sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg==",
       "license": "MIT",
       "dependencies": {
-        "escape-string-regexp": "^5.0.0",
-        "path-exists": "^5.0.0"
+        "modify-filename": "^1.1.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     }
   },
@@ -490,20 +473,28 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
     },
     "argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
+    },
     "builder-util-runtime": {
       "version": "9.2.10",
       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz",
@@ -514,14 +505,27 @@
       }
     },
     "cli-truncate": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
-      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "requires": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "requires": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^7.0.0"
+        "color-name": "~1.1.4"
       }
     },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
     "debug": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
@@ -531,29 +535,29 @@
       }
     },
     "electron-context-menu": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-4.0.4.tgz",
-      "integrity": "sha512-XPGj35npL8+MG9Lx5ukmK/h8KLmjYJ3e1GvwWKrNZvf2ocv746WXIyltoV1yWtkEPT7g2kQ8hFmu0ZupK5KieA==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-2.5.2.tgz",
+      "integrity": "sha512-1cEQR6fA9ktFsRBc+eXPwvrOgAPytUD7rUV4iBAA5zTrLAPKokJ23xeMjcK2fjrDPrlFRBxcLz0KP+GUhMrSCQ==",
       "requires": {
-        "cli-truncate": "^4.0.0",
-        "electron-dl": "^4.0.0",
-        "electron-is-dev": "^3.0.1"
+        "cli-truncate": "^2.1.0",
+        "electron-dl": "^3.1.0",
+        "electron-is-dev": "^1.2.0"
       }
     },
     "electron-dl": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-4.0.0.tgz",
-      "integrity": "sha512-USiB9816d2JzKv0LiSbreRfTg5lDk3lWh0vlx/gugCO92ZIJkHVH0UM18EHvKeadErP6Xn4yiTphWzYfbA2Ong==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.2.tgz",
+      "integrity": "sha512-i104cl+u8yJ0lhpRAtUWfeGuWuL1PL6TBiw2gLf0MMIBjfgE485Ags2mcySx4uWU9P9uj/vsD3jd7X+w1lzZxw==",
       "requires": {
         "ext-name": "^5.0.0",
-        "pupa": "^3.1.0",
-        "unused-filename": "^4.0.1"
+        "pupa": "^2.0.1",
+        "unused-filename": "^2.1.0"
       }
     },
     "electron-is-dev": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-3.0.1.tgz",
-      "integrity": "sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
+      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
     },
     "electron-log": {
       "version": "4.4.8",
@@ -576,19 +580,14 @@
       }
     },
     "emoji-regex": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "escape-goat": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
-      "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg=="
-    },
-    "escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="
     },
     "ext-list": {
       "version": "2.2.2",
@@ -617,20 +616,15 @@
         "universalify": "^2.0.0"
       }
     },
-    "get-east-asian-width": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
-      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ=="
-    },
     "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-plain-obj": {
       "version": "1.1.0",
@@ -682,6 +676,11 @@
         "mime-db": "1.52.0"
       }
     },
+    "modify-filename": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
+      "integrity": "sha512-EickqnKq3kVVaZisYuCxhtKbZjInCuwgwZWyAmRIp1NTMhri7r3380/uqwrUHfaDiPzLVTuoNy4whX66bxPVog=="
+    },
     "ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -693,16 +692,16 @@
       "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="
     },
     "path-exists": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
     },
     "pupa": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
-      "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
+      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
       "requires": {
-        "escape-goat": "^4.0.0"
+        "escape-goat": "^2.0.0"
       }
     },
     "sax": {
@@ -716,12 +715,13 @@
       "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
     },
     "slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "requires": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
       }
     },
     "sort-keys": {
@@ -741,21 +741,21 @@
       }
     },
     "string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "requires": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       }
     },
     "strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "requires": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^5.0.1"
       }
     },
     "tiny-typed-emitter": {
@@ -769,12 +769,12 @@
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
     "unused-filename": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-4.0.1.tgz",
-      "integrity": "sha512-ZX6U1J04K1FoSUeoX1OicAhw4d0aro2qo+L8RhJkiGTNtBNkd/Fi1Wxoc9HzcVu6HfOzm0si/N15JjxFmD1z6A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-2.1.0.tgz",
+      "integrity": "sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg==",
       "requires": {
-        "escape-string-regexp": "^5.0.0",
-        "path-exists": "^5.0.0"
+        "modify-filename": "^1.1.0",
+        "path-exists": "^4.0.0"
       }
     }
   }
diff --git a/desktop/package.json b/desktop/package.json
index 0afe38dd069b..ac66df7e9aed 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -4,7 +4,7 @@
   "main": "dist/main.js",
   "scripts": {},
   "dependencies": {
-    "electron-context-menu": "^4.0.4",
+    "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
     "electron-updater": "^6.3.9",
     "mime-types": "^2.1.35",

From afd62776d5d7adf11a26c1182c050c7091e2fbd3 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Mon, 11 Nov 2024 01:52:09 +0530
Subject: [PATCH 091/100] add line height 1.2 for h1 h2 h3

---
 docs/_sass/_main.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index 2d87df80a13d..97f1a1060540 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -429,6 +429,12 @@ button {
             flex-wrap: wrap;
         }
 
+        h1,
+        h2,
+        h3 {
+            line-height: 1.2;
+        }
+
         h1,
         summary {
             font-size: 1.5em;

From 0ef4a532a5502ad51c169681181c1b2291072eca Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Mon, 11 Nov 2024 01:58:02 +0530
Subject: [PATCH 092/100] line height 1.33 for page

---
 docs/_sass/_main.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index 97f1a1060540..bc2b9e8499fa 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -149,7 +149,7 @@ button,
 input,
 select,
 textarea {
-    line-height: 1.4;
+    line-height: 1.33;
     font-weight: 400;
     font-family: 'Expensify Neue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
     font-size: 16px;

From fc1c35ae3ef64d87c5bf81dba6eb37f9da54cdcd Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Sun, 10 Nov 2024 23:02:54 +0100
Subject: [PATCH 093/100] Use getRateByCustomUnitRateID

---
 src/libs/DistanceRequestUtils.ts | 10 ++++++++++
 src/libs/actions/IOU.ts          |  7 ++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
index 86e9c23af97b..b7e724b21976 100644
--- a/src/libs/DistanceRequestUtils.ts
+++ b/src/libs/DistanceRequestUtils.ts
@@ -364,6 +364,15 @@ function getUpdatedDistanceUnit({transaction, policy, policyDraft}: {transaction
     return getRate({transaction, policy, policyDraft, useTransactionDistanceUnit: false}).unit;
 }
 
+/**
+ * Get the mileage rate by its ID in the form it's configured for the policy.
+ * If not found, return undefined.
+ */
+function getRateByCustomUnitRateID({customUnitRateID, policy}: {customUnitRateID: string; policy: OnyxEntry<Policy>}): MileageRate | undefined {
+    const mileageRates = getMileageRates(policy, true, customUnitRateID);
+    return mileageRates[customUnitRateID];
+}
+
 export default {
     getDefaultMileageRate,
     getDistanceMerchant,
@@ -378,6 +387,7 @@ export default {
     getDistanceUnit,
     getUpdatedDistanceUnit,
     getRate,
+    getRateByCustomUnitRateID,
 };
 
 export type {MileageRate};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index d56d19f2f1d9..c4613d961df3 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -3236,14 +3236,11 @@ function updateMoneyRequestDistanceRate(
 
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     if (transaction) {
-        lodashSet(transaction, 'comment.customUnit.customUnitRateID', transactionChanges.customUnitRateID);
-        lodashSet(transaction, 'comment.customUnit.defaultP2PRate', null);
-
         const existingDistanceUnit = transaction?.comment?.customUnit?.distanceUnit;
-        const newDistanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction, policy});
+        const newDistanceUnit = DistanceRequestUtils.getRateByCustomUnitRateID({customUnitRateID: rateID, policy})?.unit;
 
         // If the distanceUnit is set and the rate is changed to one that has a different unit, mark the merchant as modified to make the distance field pending
-        if (existingDistanceUnit && newDistanceUnit !== existingDistanceUnit) {
+        if (existingDistanceUnit && newDistanceUnit && newDistanceUnit !== existingDistanceUnit) {
             transactionChanges.merchant = TransactionUtils.getMerchant(transaction);
         }
     }

From dc009901a9950a6a9eb2de5a4b7982640148dfaf Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Sun, 10 Nov 2024 23:06:25 +0100
Subject: [PATCH 094/100] Make getRateByCustomUnitRateID inline

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

diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
index b7e724b21976..3b8e26c9cd33 100644
--- a/src/libs/DistanceRequestUtils.ts
+++ b/src/libs/DistanceRequestUtils.ts
@@ -369,8 +369,7 @@ function getUpdatedDistanceUnit({transaction, policy, policyDraft}: {transaction
  * If not found, return undefined.
  */
 function getRateByCustomUnitRateID({customUnitRateID, policy}: {customUnitRateID: string; policy: OnyxEntry<Policy>}): MileageRate | undefined {
-    const mileageRates = getMileageRates(policy, true, customUnitRateID);
-    return mileageRates[customUnitRateID];
+    return getMileageRates(policy, true, customUnitRateID)[customUnitRateID];
 }
 
 export default {

From 8cd6b23e4e02bd8d8036eaf78f7971a773a76c6c Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Sun, 10 Nov 2024 23:09:03 +0100
Subject: [PATCH 095/100] Lint

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

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index c4613d961df3..1be5a3f63b7d 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -1,6 +1,5 @@
 import {format} from 'date-fns';
 import {fastMerge, Str} from 'expensify-common';
-import lodashSet from 'lodash/set';
 import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxInputValue, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {PartialDeep, SetRequired, ValueOf} from 'type-fest';

From 139154c07cff95c033835442fe312a50701ff53e Mon Sep 17 00:00:00 2001
From: Pavlo Tsimura <paultsimura@gmail.com>
Date: Mon, 11 Nov 2024 14:00:10 +0100
Subject: [PATCH 096/100] Use coordinates to determine a pending route

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

diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index b26307d4028f..aa46d28e6899 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -295,7 +295,7 @@ function getUpdatedTransaction({
         updatedTransaction.isLoading = true;
         shouldStopSmartscan = true;
 
-        if (isEmptyObject(transactionChanges.routes?.route0?.geometry)) {
+        if (!transactionChanges.routes?.route0?.geometry?.coordinates) {
             // The waypoints were changed, but there is no route – it is pending from the BE and we should mark the fields as pending
             updatedTransaction.amount = CONST.IOU.DEFAULT_AMOUNT;
             updatedTransaction.modifiedAmount = CONST.IOU.DEFAULT_AMOUNT;

From 8142c68eb440f3d8e4422f8e0928c3a68ee63975 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 11 Nov 2024 22:36:44 +0700
Subject: [PATCH 097/100] fix: refactor function code

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

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index ec9818ef8db2..a48613a633c4 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1705,8 +1705,9 @@ function isOneTransactionThread(reportID: string, parentReportID: string, thread
  */
 function getDisplayedReportID(reportID: string): string {
     const report = getReport(reportID);
-    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
-    return (isOneTransactionThread(report?.reportID ?? '', report?.parentReportID ?? '', parentReportAction) ? report?.parentReportID : reportID) ?? '';
+    const parentReportID = report?.parentReportID ?? '';
+    const parentReportAction = ReportActionsUtils.getReportAction(parentReportID, report?.parentReportActionID ?? '');
+    return isOneTransactionThread(reportID, parentReportID, parentReportAction) ? parentReportID : reportID;
 }
 
 /**

From 1aae8726df5c8576b0b7ce23290670d7fa556f44 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Mon, 11 Nov 2024 22:14:04 +0530
Subject: [PATCH 098/100] handles legacy isPolicyExpenseChatEnabled

---
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 4609e8f3f22a..8fc55928e230 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -191,7 +191,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
         if (groupPolicies.length === 0) {
             return false;
         }
-        return !groupPolicies.some((policy) => policy?.isPolicyExpenseChatEnabled === true);
+        return !groupPolicies.some((policy) => !!policy?.isPolicyExpenseChatEnabled);
     }, [allPolicies]);
 
     const quickActionAvatars = useMemo(() => {

From 3a7269013731a89ed11fbbb1547e650ce821d226 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Mon, 11 Nov 2024 17:58:37 +0000
Subject: [PATCH 099/100] Update version to 9.0.60-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 9ee6e3cb6d03..2ec58aab1afa 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 1009005903
-        versionName "9.0.59-3"
+        versionCode 1009006000
+        versionName "9.0.60-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 c785ffc5047f..7b263d98cf27 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.59</string>
+	<string>9.0.60</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.59.3</string>
+	<string>9.0.60.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 85937c6a2e9d..90916937f184 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.59</string>
+	<string>9.0.60</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.59.3</string>
+	<string>9.0.60.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 497d3e801495..5e3c61e29256 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.59</string>
+	<string>9.0.60</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.59.3</string>
+	<string>9.0.60.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index c6afb639b327..000e8e6a572a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.59-3",
+  "version": "9.0.60-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.59-3",
+      "version": "9.0.60-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 1c4624689c91..d46ed383fe7d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.59-3",
+  "version": "9.0.60-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 539de6e9de74be5241464856c2d88ada82ca67ec Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 12 Nov 2024 00:18:44 +0530
Subject: [PATCH 100/100] review comment changes

---
 src/languages/en.ts                           |  2 +-
 src/languages/es.ts                           |  2 +-
 .../FloatingActionButtonAndPopover.tsx        | 30 +++++++++++--------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 0b2a0d67e464..574e6be196f9 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -742,7 +742,7 @@ const translations = {
         listOfChats: 'List of chats',
         saveTheWorld: 'Save the world',
         tooltip: 'Get started here!',
-        redirectToOldDotModal: {
+        redirectToExpensifyClassicModal: {
             title: 'Coming soon',
             description: "We're fine-tuning a few more bits and pieces of New Expensify to accommodate your specific setup. In the meantime, head over to Expensify Classic.",
         },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 4f5aaabd6efc..b0a8f910b6cb 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -736,7 +736,7 @@ const translations = {
         listOfChats: 'lista de chats',
         saveTheWorld: 'Salvar el mundo',
         tooltip: '¡Comienza aquí!',
-        redirectToOldDotModal: {
+        redirectToExpensifyClassicModal: {
             title: 'Próximamente',
             description: 'Estamos ajustando algunos detalles de New Expensify para adaptarla a tu configuración específica. Mientras tanto, dirígete a Expensify Classic.',
         },
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 8fc55928e230..03378e5e46f7 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -185,8 +185,12 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
     const [hasSeenTour = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
         selector: hasSeenTourSelector,
     });
-
-    const shouldRedirectToOD = useMemo(() => {
+    /**
+     * There are scenarios where users who have not yet had their group workspace-chats in NewDot (isPolicyExpenseChatEnabled). In those scenarios, things can get confusing if they try to submit/track expenses. To address this, we block them from Creating, Tracking, Submitting expenses from NewDot if they are:
+     * 1. on at least one group policy
+     * 2. none of the group policies they are a member of have isPolicyExpenseChatEnabled=true
+     */
+    const shouldRedirectToExpensifyClassic = useMemo(() => {
         const groupPolicies = Object.values(allPolicies ?? {}).filter((policy) => ReportUtils.isGroupPolicy(policy?.type ?? ''));
         if (groupPolicies.length === 0) {
             return false;
@@ -368,10 +372,10 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                 {
                     icon: getIconForAction(CONST.IOU.TYPE.CREATE),
                     text: translate('iou.createExpense'),
-                    shouldCallAfterModalHide: shouldRedirectToOD,
+                    shouldCallAfterModalHide: shouldRedirectToExpensifyClassic,
                     onSelected: () =>
                         interceptAnonymousUser(() => {
-                            if (shouldRedirectToOD) {
+                            if (shouldRedirectToExpensifyClassic) {
                                 setModalVisible(true);
                                 return;
                             }
@@ -392,9 +396,9 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                       {
                           icon: getIconForAction(CONST.IOU.TYPE.TRACK),
                           text: translate('iou.trackExpense'),
-                          shouldCallAfterModalHide: shouldRedirectToOD,
+                          shouldCallAfterModalHide: shouldRedirectToExpensifyClassic,
                           onSelected: () => {
-                              if (shouldRedirectToOD) {
+                              if (shouldRedirectToExpensifyClassic) {
                                   setModalVisible(true);
                                   return;
                               }
@@ -419,10 +423,10 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
             {
                 icon: getIconForAction(CONST.IOU.TYPE.REQUEST),
                 text: translate('iou.submitExpense'),
-                shouldCallAfterModalHide: shouldRedirectToOD,
+                shouldCallAfterModalHide: shouldRedirectToExpensifyClassic,
                 onSelected: () =>
                     interceptAnonymousUser(() => {
-                        if (shouldRedirectToOD) {
+                        if (shouldRedirectToExpensifyClassic) {
                             setModalVisible(true);
                             return;
                         }
@@ -436,7 +440,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                     }),
             },
         ];
-    }, [canUseCombinedTrackSubmit, translate, selfDMReportID, hasSeenTrackTraining, isOffline, shouldRedirectToOD]);
+    }, [canUseCombinedTrackSubmit, translate, selfDMReportID, hasSeenTrackTraining, isOffline, shouldRedirectToExpensifyClassic]);
 
     const quickActionMenuItems = useMemo(() => {
         // Define common properties in baseQuickAction
@@ -529,10 +533,10 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                               {
                                   icon: Expensicons.InvoiceGeneric,
                                   text: translate('workspace.invoices.sendInvoice'),
-                                  shouldCallAfterModalHide: shouldRedirectToOD,
+                                  shouldCallAfterModalHide: shouldRedirectToExpensifyClassic,
                                   onSelected: () =>
                                       interceptAnonymousUser(() => {
-                                          if (shouldRedirectToOD) {
+                                          if (shouldRedirectToExpensifyClassic) {
                                               setModalVisible(true);
                                               return;
                                           }
@@ -591,14 +595,14 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
                 anchorRef={fabRef}
             />
             <ConfirmModal
-                prompt={translate('sidebarScreen.redirectToOldDotModal.description')}
+                prompt={translate('sidebarScreen.redirectToExpensifyClassicModal.description')}
                 isVisible={modalVisible}
                 onConfirm={() => {
                     setModalVisible(false);
                     Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX);
                 }}
                 onCancel={() => setModalVisible(false)}
-                title={translate('sidebarScreen.redirectToOldDotModal.title')}
+                title={translate('sidebarScreen.redirectToExpensifyClassicModal.title')}
                 confirmText={translate('exitSurvey.goToExpensifyClassic')}
                 cancelText={translate('common.cancel')}
             />