Skip to content

update navigation from dismiss modal to goBack #55479

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

Merged
MonilBhavsar merged 12 commits into from
Jan 28, 2025
Merged

update navigation from dismiss modal to goBack #55479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1f04f64
update navigation from dismiss modal to goBack
twilight2294 Jan 20, 2025
6311288
pass backTo to cancel payment
twilight2294 Jan 20, 2025
c060f3b
Merge branch 'Expensify:main' into patch-20
twilight2294 Jan 21, 2025
63cd61b
update imports
twilight2294 Jan 21, 2025
cf80427
fix wrong import
twilight2294 Jan 21, 2025
3624fea
Merge branch 'Expensify:main' into patch-20
twilight2294 Jan 22, 2025
fd930d3
use proper module names
twilight2294 Jan 22, 2025
6e5b8f0
Merge branch 'main' into patch-20
twilight2294 Jan 23, 2025
68252f5
remove extra line
twilight2294 Jan 23, 2025
f4c3fe7
correct function name
twilight2294 Jan 23, 2025
0501f3e
Merge branch 'Expensify:main' into patch-20
twilight2294 Jan 27, 2025
d76542b
Merge branch 'Expensify:main' into patch-20
twilight2294 Jan 28, 2025
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
4 changes: 2 additions & 2 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8386,7 +8386,7 @@ function submitReport(expenseReport: OnyxTypes.Report) {
API.write(WRITE_COMMANDS.SUBMIT_REPORT, parameters, {optimisticData, successData, failureData});
}

function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: OnyxTypes.Report) {
function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: OnyxTypes.Report, backTo?: Route) {
if (isEmptyObject(expenseReport)) {
return;
}
Expand Down Expand Up @@ -8529,7 +8529,7 @@ function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: O
},
{optimisticData, successData, failureData},
);
Navigation.dismissModal();
Navigation.goBack(backTo);
notifyNewAction(expenseReport.reportID, userAccountID);
}

Expand Down
4 changes: 2 additions & 2 deletions src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,9 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
return;
}

cancelPaymentAction(moneyRequestReport, chatReport);
cancelPaymentAction(moneyRequestReport, chatReport, backTo);
setIsConfirmModalVisible(false);
}, [moneyRequestReport, chatReport]);
}, [moneyRequestReport, chatReport, backTo]);

const menuItems: ReportDetailsPageMenuItem[] = useMemo(() => {
const items: ReportDetailsPageMenuItem[] = [];
Expand Down