Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/components/MoneyRequestHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ type MoneyRequestHeaderProps = {
parentReportAction: OnyxEntry<ReportAction>;

/** Method to trigger when pressing close button of the header */
onBackButtonPress: () => void;
onBackButtonPress: (prioritizeModalDismiss?: boolean) => void;
};

function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPress}: MoneyRequestHeaderProps) {
Expand Down Expand Up @@ -431,7 +431,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
deleteMoneyRequest(transaction.transactionID, parentReportAction, duplicateTransactions, duplicateTransactionViolations, true);
removeTransaction(transaction.transactionID);
}
onBackButtonPress();
onBackButtonPress(true);
}}
onCancel={() => setIsDeleteModalVisible(false)}
prompt={translate('iou.deleteConfirmation', {count: 1})}
Expand Down
43 changes: 25 additions & 18 deletions src/pages/home/ReportScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -357,25 +357,32 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
}, [report]);

const backTo = route?.params?.backTo as string;
const onBackButtonPress = useCallback(() => {
if (backTo === SCREENS.SEARCH.REPORT_RHP) {
const onBackButtonPress = useCallback(
(prioritizeModalDismiss = false) => {
if (backTo === SCREENS.SEARCH.REPORT_RHP) {
Navigation.goBack();
return;
}
if (prioritizeModalDismiss && isInNarrowPaneModal) {
Navigation.dismissModal();
return;
}
if (backTo) {
Navigation.goBack(backTo as Route);
return;
}
if (isInNarrowPaneModal) {
Navigation.dismissModal();
return;
}
if (Navigation.getShouldPopToSidebar()) {
Navigation.popToSidebar();
return;
}
Navigation.goBack();
return;
}
if (backTo) {
Navigation.goBack(backTo as Route);
return;
}
if (isInNarrowPaneModal) {
Navigation.dismissModal();
return;
}
if (Navigation.getShouldPopToSidebar()) {
Navigation.popToSidebar();
return;
}
Navigation.goBack();
}, [isInNarrowPaneModal, backTo]);
},
[isInNarrowPaneModal, backTo],
);

let headerView = (
<HeaderView
Expand Down