Skip to content

Commit 3cb5383

Browse files
authored
Merge pull request Expensify#65953 from callstack-internal/fix/65849-fix-changing-participant-to-self-dm-v2
fix: lint errors from pull 65898
2 parents 010fc4e + ca6440b commit 3cb5383

6 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function SearchFiltersGroupByPage() {
2929
keyForList: groupOption.value,
3030
isSelected: selectedItem === groupOption.value,
3131
}));
32-
}, [selectedItem, translate]);
32+
}, [selectedItem]);
3333

3434
const updateSelectedItem = useCallback((type: ListItem<SearchGroupBy>) => {
3535
setSelectedItem(type?.keyForList ?? undefined);

src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function SearchFiltersTypePage() {
3232
keyForList: typeOption.value,
3333
isSelected: selectedItem === typeOption.value,
3434
}));
35-
}, [allPolicies, selectedItem, session?.email, translate]);
35+
}, [allPolicies, selectedItem, session?.email]);
3636

3737
const updateSelectedItem = useCallback((type: ListItem<SearchDataTypes>) => {
3838
setSelectedItem(type?.keyForList ?? CONST.SEARCH.DATA_TYPES.EXPENSE);

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,15 +351,16 @@ function IOURequestStepConfirmation({
351351
transaction?.isFromGlobalCreate,
352352
transaction?.receipt?.isTestReceipt,
353353
transaction?.receipt?.isTestDriveReceipt,
354+
transaction?.participants,
354355
transaction?.participantsAutoAssigned,
355356
transaction?.reportID,
356-
transaction?.participants,
357357
requestType,
358358
iouType,
359359
initialTransactionID,
360360
reportID,
361-
participantsAutoAssignedFromRoute,
362361
isMovingTransactionFromTrackExpense,
362+
participantsAutoAssignedFromRoute,
363+
isBetaEnabled,
363364
]);
364365

365366
const navigateToAddReceipt = useCallback(() => {

src/pages/iou/request/step/IOURequestStepParticipants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ function IOURequestStepParticipants({
173173
Navigation.navigate(iouConfirmationPageRoute);
174174
}
175175
});
176-
}, [action, backTo, selfDMReport, selfDMReportID, transactions, initialTransactionID, waitForKeyboardDismiss]);
176+
}, [selfDMReportID, transactions, action, initialTransactionID, waitForKeyboardDismiss, isBetaEnabled, iouType, selfDMReport, isActivePolicyRequest, backTo]);
177177

178178
const addParticipant = useCallback(
179179
(val: Participant[]) => {

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,6 @@ function IOURequestStepScan({
486486
report,
487487
reportNameValuePairs,
488488
iouType,
489-
initialTransaction?.participants,
490-
initialTransaction?.currency,
491-
initialTransaction?.reportID,
492489
activePolicy,
493490
initialTransactionID,
494491
navigateToConfirmationPage,
@@ -498,9 +495,13 @@ function IOURequestStepScan({
498495
currentUserPersonalDetails?.login,
499496
currentUserPersonalDetails.accountID,
500497
reportID,
498+
initialTransaction?.currency,
499+
initialTransaction?.participants,
500+
initialTransaction?.reportID,
501501
transactionTaxCode,
502502
transactionTaxAmount,
503503
policy,
504+
selfDMReportID,
504505
],
505506
);
506507

src/pages/workspace/accounting/PolicyAccountingPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
514514
}
515515
// Else, display the following and link to their Concierge DM.
516516
return [translate('workspace.accounting.talkToConcierge'), conciergeReportID];
517-
}, [account, conciergeReportID, translate]);
517+
}, [account?.accountManagerAccountID, account?.accountManagerReportID, conciergeReportID, policy?.chatReportIDAdmins, translate]);
518518

519519
return (
520520
<AccessOrNotFoundWrapper

0 commit comments

Comments
 (0)