Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix inconsistency in dismissing report details RHP when deleting expense with comments #44777

Merged
merged 9 commits into from
Jul 15, 2024
Merged

Fix inconsistency in dismissing report details RHP when deleting expense with comments #44777

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift click to select a range
5f6cae1
fix inconsistency behavior when deleting expense
bernhardoj Jul 3, 2024
55504f0
Merge branch 'main' into fix/44336-inconsistency-behavior-when-delete…
bernhardoj Jul 3, 2024
c3da03e
dismiss the modal after deleting transaction
bernhardoj Jul 3, 2024
aac8461
add missing deps
bernhardoj Jul 3, 2024
7999cf5
prettier
bernhardoj Jul 4, 2024
8bc9c1d
Merge branch 'main' into fix/44336-inconsistency-behavior-when-delete…
bernhardoj Jul 10, 2024
c5c0799
Merge branch 'main' into fix/44336-inconsistency-behavior-when-delete…
bernhardoj Jul 13, 2024
089c0fa
add comment and restructure code to make it easier to read
bernhardoj Jul 13, 2024
90fe533
lint
bernhardoj Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 637,9 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
</OfflineWithFeedback>
);

// A flag to indicate whether the user choose to delete the transaction or not
const isTransactionDeleted = useRef<boolean>(false);
// Where to go back after deleting the transaction and its report. It's empty if the transaction report isn't deleted.
const navigateBackToAfterDelete = useRef<Route>();

const deleteTransaction = useCallback(() => {
Expand All @@ -653,11 656,13 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
}

if (ReportActionsUtils.isTrackExpenseAction(requestParentReportAction)) {
navigateBackToAfterDelete.current = IOU.deleteTrackExpense(moneyRequestReport?.reportID ?? '', iouTransactionID, requestParentReportAction, true);
navigateBackToAfterDelete.current = IOU.deleteTrackExpense(moneyRequestReport?.reportID ?? '', iouTransactionID, requestParentReportAction, isSingleTransactionView);
} else {
navigateBackToAfterDelete.current = IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, true);
navigateBackToAfterDelete.current = IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, isSingleTransactionView);
}
}, [caseID, iouTransactionID, moneyRequestReport?.reportID, report, requestParentReportAction]);

isTransactionDeleted.current = true;
}, [caseID, iouTransactionID, moneyRequestReport?.reportID, report, requestParentReportAction, isSingleTransactionView]);
return (
<ScreenWrapper testID={ReportDetailsPage.displayName}>
<FullPageNotFoundView shouldShow={isEmptyObject(report)}>
Expand Down Expand Up @@ -746,7 751,18 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
isVisible={isDeleteModalVisible}
onConfirm={deleteTransaction}
onCancel={() => setIsDeleteModalVisible(false)}
onModalHide={() => ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current)}
onModalHide={() => {
// We use isTransactionDeleted to know if the modal hides because the user deletes the transaction.
if (!isTransactionDeleted.current) {
return;
}

if (!navigateBackToAfterDelete.current) {
Navigation.dismissModal();
} else {
ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current);
}
}}
prompt={caseID === CASES.DEFAULT ? translate('task.deleteConfirmation') : translate('iou.deleteConfirmation')}
confirmText={translate('common.delete')}
cancelText={translate('common.cancel')}
Expand Down
Loading