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: back button after deleting expense #44537

Merged
merged 9 commits into from
Jul 16, 2024
Merged

fix: back button after deleting expense #44537

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c31b1d3
fix: back button after deleting expense
kosmydel Jun 27, 2024
6306040
fix
kosmydel Jun 28, 2024
0c2bbc3
Merge branch 'Expensify:main' into @kosmydel/fix/expense-delete-back-…
kosmydel Jul 4, 2024
138b5b5
Merge branch 'Expensify:main' into @kosmydel/fix/expense-delete-back-…
kosmydel Jul 5, 2024
68a6655
Merge branch 'main' into @kosmydel/fix/expense-delete-back-button
kosmydel Jul 8, 2024
a730fcb
Merge branch 'main' into @kosmydel/fix/expense-delete-back-button
kosmydel Jul 9, 2024
ba0bcac
Merge branch 'main' into @kosmydel/fix/expense-delete-back-button
kosmydel Jul 9, 2024
43140ef
Merge branch 'main' into @kosmydel/fix/expense-delete-back-button
kosmydel Jul 15, 2024
ce5ae9c
Merge branch 'main' into @kosmydel/fix/expense-delete-back-button
cdOut Jul 16, 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
9 changes: 7 additions & 2 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3559,7 +3559,7 @@ function goBackToDetailsPage(report: OnyxEntry<Report>) {
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? '-1'));
}

function navigateBackAfterDeleteTransaction(backRoute: Route | undefined) {
function navigateBackAfterDeleteTransaction(backRoute: Route | undefined, isFromRHP?: boolean) {
if (!backRoute) {
return;
}
Expand All @@ -3568,7 +3568,12 @@ function navigateBackAfterDeleteTransaction(backRoute: Route | undefined) {
Navigation.dismissModal();
return;
}
Navigation.goBack(backRoute);
if (isFromRHP) {
Navigation.dismissModal();
}
Navigation.isNavigationReady().then(() => {
Navigation.goBack(backRoute);
});
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
isVisible={isDeleteModalVisible}
onConfirm={deleteTransaction}
onCancel={() => setIsDeleteModalVisible(false)}
onModalHide={() => ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current)}
onModalHide={() => ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current, true)}
prompt={caseID === CASES.DEFAULT ? translate('task.deleteConfirmation') : translate('iou.deleteConfirmation')}
confirmText={translate('common.delete')}
cancelText={translate('common.cancel')}
Expand Down
Loading