Merge pull request Expensify#88291 from parasharrajat/onyx/session-5

Update bulkDuplicateExpense function to currentUser data

Author: tgolen

src/hooks/useBulkDuplicateAction.ts

@@ -26,7 +26,7 @@ type UseBulkDuplicateActionParams = {
  * so these subscriptions don't exist for users who aren't actively duplicating.
  */
 function useBulkDuplicateAction({selectedTransactionsKeys, allTransactions, allReports, searchData, onAfterDuplicate}: UseBulkDuplicateActionParams) {
-    const {accountID} = useCurrentUserPersonalDetails();
+    const {accountID, login: currentUserLogin} = useCurrentUserPersonalDetails();
     const {clearSelectedTransactions} = useSearchActionsContext();
     const defaultExpensePolicy = useDefaultExpensePolicy();
     const {isBetaEnabled} = usePermissions();
@@ -78,6 +78,8 @@ function useBulkDuplicateAction({selectedTransactionsKeys, allTransactions, allR
             draftTransactionIDs,
             betas,
             recentWaypoints,
+            currentUserAccountID: accountID,
+            currentUserLogin: currentUserLogin ?? '',
         });
 
         if (onAfterDuplicate) {

src/hooks/useBulkDuplicateReportAction.ts

@@ -54,7 +54,6 @@ function useBulkDuplicateReportAction({selectedReports, allReports, searchData}:
             defaultExpensePolicy,
             activePolicyExpenseChat,
             ownerPersonalDetails: currentUserPersonalDetails,
-            currentUserLogin: currentUserPersonalDetails.login ?? '',
             isASAPSubmitBetaEnabled,
             betas,
             personalDetails,
@@ -65,6 +64,8 @@ function useBulkDuplicateReportAction({selectedReports, allReports, searchData}:
             transactionViolations: allTransactionViolations,
             translate,
             recentWaypoints,
+            currentUserLogin: currentUserPersonalDetails.login ?? '',
+            currentUserAccountID: currentUserPersonalDetails?.accountID,
         });
 
         clearSelectedTransactions(undefined, true);

src/libs/actions/IOU/Duplicate.ts

@@ -46,7 +46,7 @@ import type {Attendee, Participant} from '@src/types/onyx/IOU';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type {WaypointCollection} from '@src/types/onyx/Transaction';
 import type {RequestMoneyInformation} from '.';
-import {getAllReportActionsFromIOU, getAllReports, getAllTransactions, getAllTransactionViolations, getCurrentUserEmail, getMoneyRequestParticipantsFromReport, getUserAccountID} from '.';
+import {getAllReportActionsFromIOU, getAllReports, getAllTransactions, getAllTransactionViolations, getMoneyRequestParticipantsFromReport} from '.';
 import {getCleanUpTransactionThreadReportOnyxData} from './DeleteMoneyRequest';
 import type {PerDiemExpenseInformation} from './PerDiem';
 import {submitPerDiemExpense} from './PerDiem';
@@ -966,6 +966,8 @@ type BulkDuplicateExpensesParams = {
     draftTransactionIDs: string[];
     betas: OnyxEntry<OnyxTypes.Beta[]>;
     recentWaypoints: OnyxEntry<OnyxTypes.RecentWaypoint[]>;
+    currentUserLogin: string;
+    currentUserAccountID: number;
 };
 
 function bulkDuplicateExpenses({
@@ -987,6 +989,8 @@ function bulkDuplicateExpenses({
     draftTransactionIDs,
     betas,
     recentWaypoints,
+    currentUserAccountID,
+    currentUserLogin,
 }: BulkDuplicateExpensesParams) {
     const transactionsToDuplicate = transactionIDs.map((id) => allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]).filter((t): t is OnyxTypes.Transaction => !!t);
 
@@ -1082,8 +1086,8 @@ function bulkDuplicateExpenses({
             shouldDeferAutoSubmit,
             existingIOUReport: optimisticIOUReport,
             optimisticReportPreviewActionID: currentReportPreviewActionID,
-            currentUserAccountID: getUserAccountID(),
-            currentUserLogin: getCurrentUserEmail(),
+            currentUserAccountID,
+            currentUserLogin,
         });
 
         if (result?.iouReport) {
@@ -1108,7 +1112,6 @@ type BulkDuplicateReportsParams = {
     defaultExpensePolicy: OnyxEntry<OnyxTypes.Policy>;
     activePolicyExpenseChat: OnyxEntry<OnyxTypes.Report>;
     ownerPersonalDetails: CurrentUserPersonalDetails;
-    currentUserLogin: string;
     isASAPSubmitBetaEnabled: boolean;
     betas: OnyxEntry<OnyxTypes.Beta[]>;
     personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>;
@@ -1119,6 +1122,8 @@ type BulkDuplicateReportsParams = {
     transactionViolations: OnyxCollection<OnyxTypes.TransactionViolation[]>;
     translate: LocalizedTranslate;
     recentWaypoints: OnyxEntry<OnyxTypes.RecentWaypoint[]>;
+    currentUserLogin: string;
+    currentUserAccountID: number;
 };
 
 function bulkDuplicateReports({
@@ -1131,7 +1136,6 @@ function bulkDuplicateReports({
     defaultExpensePolicy,
     activePolicyExpenseChat,
     ownerPersonalDetails,
-    currentUserLogin,
     isASAPSubmitBetaEnabled,
     betas,
     personalDetails,
@@ -1142,6 +1146,8 @@ function bulkDuplicateReports({
     transactionViolations,
     translate,
     recentWaypoints,
+    currentUserLogin,
+    currentUserAccountID,
 }: BulkDuplicateReportsParams) {
     const allTransactionsMap = getAllTransactions();
     const transactionsByReportID = new Map<string, OnyxTypes.Transaction[]>();
@@ -1215,8 +1221,8 @@ function bulkDuplicateReports({
             translate,
             recentWaypoints,
             shouldPlaySound: false,
-            currentUserAccountID: getUserAccountID(),
-            currentUserLogin: getCurrentUserEmail(),
+            currentUserAccountID,
+            currentUserLogin,
         });
     }
 

tests/actions/IOUTest/DuplicateTest.ts

@@ -2486,6 +2486,8 @@ describe('actions/Duplicate', () => {
                 draftTransactionIDs: [],
                 betas: [CONST.BETAS.ALL],
                 recentWaypoints: [],
+                currentUserAccountID: RORY_ACCOUNT_ID,
+                currentUserLogin: RORY_EMAIL,
             });
 
             await waitForBatchedUpdates();
@@ -2588,6 +2590,7 @@ describe('actions/Duplicate', () => {
             activePolicyExpenseChat,
             ownerPersonalDetails: {accountID: RORY_ACCOUNT_ID, login: RORY_EMAIL, displayName: 'Rory'},
             currentUserLogin: RORY_EMAIL,
+            currentUserAccountID: RORY_ACCOUNT_ID,
             isASAPSubmitBetaEnabled: false,
             betas: [CONST.BETAS.ALL],
             personalDetails: {[RORY_ACCOUNT_ID]: {accountID: RORY_ACCOUNT_ID, login: RORY_EMAIL, displayName: 'Rory'}},