From 9566dbc68020e7940adeac5955b309722aafd953 Mon Sep 17 00:00:00 2001 From: Prince Mendiratta Date: Tue, 29 Aug 2023 17:04:18 +0530 Subject: [PATCH 1/6] feat: make fallback necessary for Navigation.goBack Signed-off-by: Prince Mendiratta --- src/components/HeaderWithBackButton/index.js | 2 +- src/libs/Navigation/Navigation.js | 2 +- .../subscribeToReportCommentPushNotifications.js | 2 +- src/libs/actions/App.js | 6 +++--- src/libs/actions/DemoActions.js | 4 ++-- src/libs/actions/IOU.js | 4 ++-- src/libs/actions/PaymentMethods.js | 4 ++-- src/libs/actions/Report.js | 8 ++++---- src/pages/ConciergePage.js | 3 ++- src/pages/DemoSetupPage.js | 3 ++- src/pages/EditRequestDescriptionPage.js | 3 ++- src/pages/EnablePayments/OnfidoStep.js | 3 ++- src/pages/iou/IOUCurrencySelection.js | 2 +- src/pages/signin/SignInModal.js | 3 ++- src/pages/workspace/WorkspaceInviteMessagePage.js | 4 ++-- 15 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/components/HeaderWithBackButton/index.js b/src/components/HeaderWithBackButton/index.js index bbf905cc1ac2..86f0f9c5d4c8 100755 --- a/src/components/HeaderWithBackButton/index.js +++ b/src/components/HeaderWithBackButton/index.js @@ -22,7 +22,7 @@ import useKeyboardState from '../../hooks/useKeyboardState'; function HeaderWithBackButton({ iconFill = undefined, guidesCallTaskID = '', - onBackButtonPress = () => Navigation.goBack(), + onBackButtonPress = () => Navigation.goBack(ROUTES.HOME), onCloseButtonPress = () => Navigation.dismissModal(), onDownloadButtonPress = () => {}, onThreeDotsButtonPress = () => {}, diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js index b574b4ffa205..1264ec777b28 100644 --- a/src/libs/Navigation/Navigation.js +++ b/src/libs/Navigation/Navigation.js @@ -97,7 +97,7 @@ function navigate(route = ROUTES.HOME, type) { * @param {Bool} shouldEnforceFallback - Enforces navigation to fallback route * @param {Bool} shouldPopToTop - Should we navigate to LHN on back press */ -function goBack(fallbackRoute = ROUTES.HOME, shouldEnforceFallback = false, shouldPopToTop = false) { +function goBack(fallbackRoute, shouldEnforceFallback = false, shouldPopToTop = false) { if (!canNavigate('goBack')) { return; } diff --git a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js index a36fef610a39..8e16bb72f656 100644 --- a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js +++ b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js @@ -27,7 +27,7 @@ export default function subscribeToReportCommentPushNotifications() { try { // If a chat is visible other than the one we are trying to navigate to, then we need to navigate back if (Navigation.getActiveRoute().slice(1, 2) === ROUTES.REPORT && !Navigation.isActiveRoute(`r/${reportID}`)) { - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); } Log.info('[PushNotification] onSelected() - Navigation is ready. Navigating...', false, {reportID, reportActionID}); diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index 6028e0468696..93b835da3601 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -306,7 +306,7 @@ function createWorkspaceAndNavigateToIt(policyOwnerEmail = '', makeMeAdmin = fal .then(() => { if (transitionFromOldDot) { // We must call goBack() to remove the /transition route from history - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); } if (shouldNavigateToAdminChat) { @@ -370,7 +370,7 @@ function setUpPoliciesAndNavigate(session, shouldNavigateToAdminChat) { Navigation.isNavigationReady() .then(() => { // We must call goBack() to remove the /transition route from history - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(exitTo); }) .then(endSignOnTransition); @@ -386,7 +386,7 @@ function redirectThirdPartyDesktopSignIn() { if (url.pathname === `/${ROUTES.GOOGLE_SIGN_IN}` || url.pathname === `/${ROUTES.APPLE_SIGN_IN}`) { Navigation.isNavigationReady().then(() => { - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.DESKTOP_SIGN_IN_REDIRECT); }); } diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js index fc4d2ece4b52..01c979b51c5e 100644 --- a/src/libs/actions/DemoActions.js +++ b/src/libs/actions/DemoActions.js @@ -18,7 +18,7 @@ function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) { const demoWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(workspaceOwnerEmail); if (demoWorkspaceChatReportID) { // We must call goBack() to remove the demo route from nav history - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.getReportRoute(demoWorkspaceChatReportID)); return; } @@ -40,7 +40,7 @@ function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) { // Navigate to the new policy expense chat report // Note: We must call goBack() to remove the demo route from history - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.getReportRoute(policyExpenseChatReport.reportID)); }); } diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index b4f04174c1ac..b593ea936489 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -1274,14 +1274,14 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView // STEP 7: Navigate the user depending on which page they are on and which resources were deleted if (isSingleTransactionView && shouldDeleteTransactionThread && !shouldDeleteIOUReport) { // Pop the deleted report screen before navigating. This prevents navigating to the Concierge chat due to the missing report. - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.getReportRoute(iouReport.reportID)); return; } if (shouldDeleteIOUReport) { // Pop the deleted report screen before navigating. This prevents navigating to the Concierge chat due to the missing report. - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.getReportRoute(iouReport.chatReportID)); } } diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index 95148c1d4367..87b962020319 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -26,12 +26,12 @@ const kycWallRef = createRef(); */ function continueSetup() { if (!kycWallRef.current || !kycWallRef.current.continue) { - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); return; } // Close the screen (Add Debit Card, Add Bank Account, or Enable Payments) on success and continue with setup - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); kycWallRef.current.continue(); } diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 8b898a6aaaea..1dbfa079d9f0 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -1241,7 +1241,7 @@ function updateNotificationPreferenceAndNavigate(reportID, previousValue, newVal function updateWelcomeMessage(reportID, previousValue, newValue) { // No change needed, navigate back if (previousValue === newValue) { - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); return; } @@ -1261,7 +1261,7 @@ function updateWelcomeMessage(reportID, previousValue, newValue) { }, ]; API.write('UpdateWelcomeMessage', {reportID, welcomeMessage: parsedWelcomeMessage}, {optimisticData, failureData}); - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); } /** @@ -1442,7 +1442,7 @@ function deleteReport(reportID) { */ function navigateToConciergeChatAndDeleteReport(reportID) { // Dismiss the current report screen and replace it with Concierge Chat - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); navigateToConciergeChat(); deleteReport(reportID); } @@ -1825,7 +1825,7 @@ function leaveRoom(reportID) { ); Navigation.dismissModal(); if (Navigation.getTopmostReportId() === reportID) { - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); } navigateToConciergeChat(); } diff --git a/src/pages/ConciergePage.js b/src/pages/ConciergePage.js index 610fa3587b7a..e8509024b469 100644 --- a/src/pages/ConciergePage.js +++ b/src/pages/ConciergePage.js @@ -7,6 +7,7 @@ import ONYXKEYS from '../ONYXKEYS'; import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator'; import Navigation from '../libs/Navigation/Navigation'; import * as Report from '../libs/actions/Report'; +import ROUTES from '../ROUTES'; const propTypes = { /** Session info for the currently logged in user. */ @@ -31,7 +32,7 @@ function ConciergePage(props) { useFocusEffect(() => { if (_.has(props.session, 'authToken')) { // Pop the concierge loading page before opening the concierge report. - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Report.navigateToConciergeChat(); } else { Navigation.navigate(); diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js index 53739820142b..6bb6352db822 100644 --- a/src/pages/DemoSetupPage.js +++ b/src/pages/DemoSetupPage.js @@ -5,6 +5,7 @@ import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator import CONST from '../CONST'; import * as DemoActions from '../libs/actions/DemoActions'; import Navigation from '../libs/Navigation/Navigation'; +import ROUTES from '../ROUTES'; const propTypes = { /** Navigation route context info provided by react navigation */ @@ -28,7 +29,7 @@ function DemoSetupPage(props) { } else if (props.route.name === CONST.DEMO_PAGES.SBE) { DemoActions.runSbeDemo(); } else { - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); } }); diff --git a/src/pages/EditRequestDescriptionPage.js b/src/pages/EditRequestDescriptionPage.js index 1db81c88daae..91d80d554745 100644 --- a/src/pages/EditRequestDescriptionPage.js +++ b/src/pages/EditRequestDescriptionPage.js @@ -10,6 +10,7 @@ import styles from '../styles/styles'; import Navigation from '../libs/Navigation/Navigation'; import CONST from '../CONST'; import useLocalize from '../hooks/useLocalize'; +import ROUTES from '../ROUTES'; const propTypes = { /** Transaction default description value */ @@ -30,7 +31,7 @@ function EditRequestDescriptionPage({defaultDescription, onSubmit}) { > Navigation.goBack()} + onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)} />
{ - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); }} onSuccess={(data) => { BankAccounts.verifyIdentity({ diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js index caf008939519..0605197173f2 100644 --- a/src/pages/iou/IOUCurrencySelection.js +++ b/src/pages/iou/IOUCurrencySelection.js @@ -82,7 +82,7 @@ function IOUCurrencySelection(props) { // Navigating to "backTo" will result in forward navigation instead, causing disruption to the currency selection. // To prevent any negative experience, we have made the decision to simply close the currency selection page. if (_.isEmpty(backTo) || props.navigation.getState().routes.length === 1) { - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); } else { Navigation.navigate(`${props.route.params.backTo}?currency=${option.currencyCode}`); } diff --git a/src/pages/signin/SignInModal.js b/src/pages/signin/SignInModal.js index 0cd566a47327..c367df44b16b 100644 --- a/src/pages/signin/SignInModal.js +++ b/src/pages/signin/SignInModal.js @@ -5,6 +5,7 @@ import HeaderWithBackButton from '../../components/HeaderWithBackButton'; import Navigation from '../../libs/Navigation/Navigation'; import styles from '../../styles/styles'; import * as Session from '../../libs/actions/Session'; +import ROUTES from '../../ROUTES'; const propTypes = {}; @@ -23,7 +24,7 @@ function SignInModal() { includeSafeAreaPaddingBottom={false} shouldEnableMaxHeight > - Navigation.goBack()} /> + Navigation.goBack(ROUTES.HOME)} /> ); diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js index 9a046d7fe4c2..739ec6687f91 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.js +++ b/src/pages/workspace/WorkspaceInviteMessagePage.js @@ -122,7 +122,7 @@ class WorkspaceInviteMessagePage extends React.Component { Policy.addMembersToWorkspace(this.props.invitedEmailsToAccountIDsDraft, this.state.welcomeNote, this.props.route.params.policyID); Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, {}); // Pop the invite message page before navigating to the members page. - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.getWorkspaceMembersRoute(this.props.route.params.policyID)); } @@ -171,7 +171,7 @@ class WorkspaceInviteMessagePage extends React.Component { guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS} shouldShowBackButton onCloseButtonPress={() => Navigation.dismissModal()} - onBackButtonPress={() => Navigation.goBack()} + onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)} /> Date: Tue, 5 Sep 2023 00:19:18 +0530 Subject: [PATCH 2/6] fix: add fallbackRoute for all occurrences Signed-off-by: Prince Mendiratta --- src/components/BlockingViews/FullPageNotFoundView.js | 3 ++- src/pages/AddPersonalBankAccountPage.js | 2 +- src/pages/EditRequestAmountPage.js | 2 +- src/pages/EditRequestCreatedPage.js | 3 ++- src/pages/EditRequestMerchantPage.js | 3 ++- src/pages/ProfilePage.js | 3 ++- src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 4 ++-- src/pages/TeachersUnite/SaveTheWorldPage.js | 2 +- src/pages/home/ReportScreen.js | 2 +- src/pages/iou/steps/NewRequestAmountPage.js | 2 +- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/components/BlockingViews/FullPageNotFoundView.js b/src/components/BlockingViews/FullPageNotFoundView.js index 54bdc015de37..a9c4bf63b65e 100644 --- a/src/components/BlockingViews/FullPageNotFoundView.js +++ b/src/components/BlockingViews/FullPageNotFoundView.js @@ -8,6 +8,7 @@ import Navigation from '../../libs/Navigation/Navigation'; import variables from '../../styles/variables'; import styles from '../../styles/styles'; import useLocalize from '../../hooks/useLocalize'; +import ROUTES from '../../ROUTES'; const propTypes = { /** Child elements */ @@ -44,7 +45,7 @@ const defaultProps = { titleKey: 'notFound.notHere', subtitleKey: 'notFound.pageNotFound', linkKey: 'notFound.goBackHome', - onBackButtonPress: Navigation.goBack, + onBackButtonPress: () => Navigation.goBack(ROUTES.HOME), shouldShowLink: true, shouldShowBackButton: true, onLinkPress: () => Navigation.dismissModal(), diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js index 8ef8b71b90d0..98bc09a7a217 100644 --- a/src/pages/AddPersonalBankAccountPage.js +++ b/src/pages/AddPersonalBankAccountPage.js @@ -132,7 +132,7 @@ class AddPersonalBankAccountPage extends React.Component { this.setState({selectedPlaidAccountID}); }} plaidData={this.props.plaidData} - onExitPlaid={Navigation.goBack} + onExitPlaid={() => Navigation.goBack(ROUTES.HOME)} receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()} selectedPlaidAccountID={this.state.selectedPlaidAccountID} /> diff --git a/src/pages/EditRequestAmountPage.js b/src/pages/EditRequestAmountPage.js index d087d86ebdf5..85968c3bf203 100644 --- a/src/pages/EditRequestAmountPage.js +++ b/src/pages/EditRequestAmountPage.js @@ -59,7 +59,7 @@ function EditRequestAmountPage({defaultAmount, defaultCurrency, onSubmit, report > Navigation.goBack(ROUTES.HOME)} /> Navigation.goBack(ROUTES.HOME)} /> Navigation.goBack(ROUTES.HOME)} /> diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js index 3160ad590c50..cdb3aeebe924 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js @@ -284,7 +284,7 @@ class ReimbursementAccountPage extends React.Component { const currentStep = achData.currentStep || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT; const subStep = achData.subStep; const shouldShowOnfido = this.props.onfidoToken && !achData.isOnfidoSetupComplete; - const backTo = lodashGet(this.props.route.params, 'backTo'); + const backTo = lodashGet(this.props.route.params, 'backTo', ROUTES.HOME); switch (currentStep) { case CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT: if (this.hasInProgressVBBA()) { @@ -405,7 +405,7 @@ class ReimbursementAccountPage extends React.Component { continue={this.continue} policyName={policyName} onBackButtonPress={() => { - Navigation.goBack(lodashGet(this.props.route.params, 'backTo')); + Navigation.goBack(lodashGet(this.props.route.params, 'backTo', ROUTES.HOME)); }} /> ); diff --git a/src/pages/TeachersUnite/SaveTheWorldPage.js b/src/pages/TeachersUnite/SaveTheWorldPage.js index 47c441ad934c..1fb863051da5 100644 --- a/src/pages/TeachersUnite/SaveTheWorldPage.js +++ b/src/pages/TeachersUnite/SaveTheWorldPage.js @@ -53,7 +53,7 @@ function SaveTheWorldPage(props) { Navigation.goBack(ROUTES.HOME)} backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[ROUTES.I_KNOW_A_TEACHER]} illustration={LottieAnimations.SaveTheWorld} > diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js index 6daa15785921..0d30c8373497 100644 --- a/src/pages/home/ReportScreen.js +++ b/src/pages/home/ReportScreen.js @@ -300,7 +300,7 @@ function ReportScreen({ subtitleKey="notFound.noAccess" shouldShowCloseButton={false} shouldShowBackButton={isSmallScreenWidth} - onBackButtonPress={Navigation.goBack} + onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)} shouldShowLink={false} > { - Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : null); + Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : ROUTES.HOME); }; const navigateToCurrencySelectionPage = () => { From 0700027d3434b66f31e94754a6351e21dab7b40a Mon Sep 17 00:00:00 2001 From: Prince Mendiratta Date: Fri, 8 Sep 2023 19:59:13 +0530 Subject: [PATCH 3/6] feat: update for latest main Signed-off-by: Prince Mendiratta --- src/libs/actions/DemoActions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js index abaef2855ea9..e8d7b122aaa4 100644 --- a/src/libs/actions/DemoActions.js +++ b/src/libs/actions/DemoActions.js @@ -30,7 +30,7 @@ function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) { const reportUpdate = _.find(response.onyxData, ({key}) => key === ONYXKEYS.COLLECTION.REPORT); if (!reportUpdate) { // If there's no related onyx data, navigate the user home so they're not stuck. - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.HOME); return; } @@ -39,7 +39,7 @@ function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) { const policyExpenseChatReport = _.find(reportUpdate.value, ({chatType}) => chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); if (!policyExpenseChatReport) { // If there's no related onyx data, navigate the user home so they're not stuck. - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); Navigation.navigate(ROUTES.HOME); return; } From fa42cb2645a0983bdd13197293c040b0ec463902 Mon Sep 17 00:00:00 2001 From: Prince Mendiratta Date: Tue, 19 Sep 2023 11:59:42 +0530 Subject: [PATCH 4/6] fix: remove onBackButton for route goBack Signed-off-by: Prince Mendiratta --- src/pages/DetailsPage.js | 3 --- src/pages/EditRequestAmountPage.js | 1 - src/pages/EditRequestCreatedPage.js | 3 --- src/pages/EditRequestDescriptionPage.js | 3 --- src/pages/EditRequestMerchantPage.js | 3 --- src/pages/home/ReportScreen.js | 1 - src/pages/signin/SignInModal.js | 3 +-- src/pages/workspace/WorkspaceInviteMessagePage.js | 1 - 8 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js index 7873c4daa00c..1e9215e894c0 100755 --- a/src/pages/DetailsPage.js +++ b/src/pages/DetailsPage.js @@ -27,8 +27,6 @@ import * as Report from '../libs/actions/Report'; import OfflineWithFeedback from '../components/OfflineWithFeedback'; import AutoUpdateTime from '../components/AutoUpdateTime'; import FullPageNotFoundView from '../components/BlockingViews/FullPageNotFoundView'; -import Navigation from '../libs/Navigation/Navigation'; -import ROUTES from '../ROUTES'; import * as UserUtils from '../libs/UserUtils'; const matchType = PropTypes.shape({ @@ -132,7 +130,6 @@ function DetailsPage(props) { Navigation.goBack(ROUTES.HOME)} /> Navigation.goBack(ROUTES.HOME)} /> Navigation.goBack(ROUTES.HOME)} /> Navigation.goBack(ROUTES.HOME)} /> Navigation.goBack(ROUTES.HOME)} /> Navigation.goBack(ROUTES.HOME)} shouldShowLink={false} > - Navigation.goBack(ROUTES.HOME)} /> + ); diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js index 739ec6687f91..3baf84f54ccf 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.js +++ b/src/pages/workspace/WorkspaceInviteMessagePage.js @@ -171,7 +171,6 @@ class WorkspaceInviteMessagePage extends React.Component { guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS} shouldShowBackButton onCloseButtonPress={() => Navigation.dismissModal()} - onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)} /> Date: Tue, 19 Sep 2023 12:07:02 +0530 Subject: [PATCH 5/6] feat: add default goBack to latest merge Signed-off-by: Prince Mendiratta --- src/components/DistanceRequest.js | 2 +- src/pages/PrivateNotes/PrivateNotesEditPage.js | 5 ++--- src/pages/PrivateNotes/PrivateNotesListPage.js | 2 -- src/pages/PrivateNotes/PrivateNotesViewPage.js | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js index 966f700e25d4..09500fd9847a 100644 --- a/src/components/DistanceRequest.js +++ b/src/components/DistanceRequest.js @@ -189,7 +189,7 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken, useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]); const navigateBack = () => { - Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : null); + Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : ROUTES.HOME); }; const navigateToNextPage = () => { diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.js b/src/pages/PrivateNotes/PrivateNotesEditPage.js index 4cada83941ac..8b556722e63f 100644 --- a/src/pages/PrivateNotes/PrivateNotesEditPage.js +++ b/src/pages/PrivateNotes/PrivateNotesEditPage.js @@ -24,6 +24,7 @@ import * as Report from '../../libs/actions/Report'; import useLocalize from '../../hooks/useLocalize'; import OfflineWithFeedback from '../../components/OfflineWithFeedback'; import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange'; +import ROUTES from '../../ROUTES'; const propTypes = { /** All of the personal details for everyone */ @@ -72,7 +73,7 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) { Keyboard.dismiss(); // Take user back to the PrivateNotesView page - Navigation.goBack(); + Navigation.goBack(ROUTES.HOME); }; return ( @@ -83,14 +84,12 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) { Navigation.goBack()} > Navigation.dismissModal()} - onBackButtonPress={() => Navigation.goBack()} /> diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.js b/src/pages/PrivateNotes/PrivateNotesListPage.js index 5ea081a12f25..0ae516466c4a 100644 --- a/src/pages/PrivateNotes/PrivateNotesListPage.js +++ b/src/pages/PrivateNotes/PrivateNotesListPage.js @@ -120,13 +120,11 @@ function PrivateNotesListPage({report, personalDetailsList, network, session}) { Navigation.goBack()} > Navigation.dismissModal()} - onBackButtonPress={() => Navigation.goBack()} /> {report.isLoadingPrivateNotes && _.isEmpty(lodashGet(report, 'privateNotes', {})) ? ( diff --git a/src/pages/PrivateNotes/PrivateNotesViewPage.js b/src/pages/PrivateNotes/PrivateNotesViewPage.js index 86814ed4dc92..fb716aacff68 100644 --- a/src/pages/PrivateNotes/PrivateNotesViewPage.js +++ b/src/pages/PrivateNotes/PrivateNotesViewPage.js @@ -60,14 +60,12 @@ function PrivateNotesViewPage({route, personalDetailsList, session, report}) { Navigation.goBack()} > Navigation.dismissModal()} - onBackButtonPress={() => Navigation.goBack()} /> From c07a5843bc2a59296ebd88ce43cee167bfdbe841 Mon Sep 17 00:00:00 2001 From: Prince Mendiratta Date: Tue, 19 Sep 2023 12:13:48 +0530 Subject: [PATCH 6/6] :sparkles: pretty Signed-off-by: Prince Mendiratta --- src/pages/DetailsPage.js | 4 +--- src/pages/EditRequestAmountPage.js | 4 +--- src/pages/EditRequestCreatedPage.js | 4 +--- src/pages/EditRequestDescriptionPage.js | 4 +--- src/pages/EditRequestMerchantPage.js | 4 +--- src/pages/PrivateNotes/PrivateNotesListPage.js | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js index 1e9215e894c0..52d5fe4a7842 100755 --- a/src/pages/DetailsPage.js +++ b/src/pages/DetailsPage.js @@ -128,9 +128,7 @@ function DetailsPage(props) { return ( - + - + - + descriptionInputRef.current && descriptionInputRef.current.focus()} > - + merchantInputRef.current && merchantInputRef.current.focus()} > - + - +