diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js index 1baf0b6151d9..98f7694533e4 100644 --- a/src/pages/ReportDetailsPage.js +++ b/src/pages/ReportDetailsPage.js @@ -137,10 +137,7 @@ const ReportDetailsPage = (props) => { return ( - Navigation.goBack()} - /> + diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js index 6d92f1a94afb..456fbe78d6db 100644 --- a/src/pages/ShareCodePage.js +++ b/src/pages/ShareCodePage.js @@ -18,6 +18,7 @@ import getPlatform from '../libs/getPlatform'; import CONST from '../CONST'; import ContextMenuItem from '../components/ContextMenuItem'; import * as UserUtils from '../libs/UserUtils'; +import ROUTES from '../ROUTES'; const propTypes = { /** The report currently being looked at */ @@ -49,7 +50,7 @@ class ShareCodePage extends React.Component { Navigation.goBack()} + onBackButtonPress={() => Navigation.goBack(isReport ? ROUTES.getReportDetailsRoute(this.props.report.reportID) : ROUTES.SETTINGS)} /> diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js index dd73d0174863..9000c86ab091 100644 --- a/src/pages/settings/Payments/TransferBalancePage.js +++ b/src/pages/settings/Payments/TransferBalancePage.js @@ -178,12 +178,12 @@ class TransferBalancePage extends React.Component { subtitleKey="transferAmountPage.notHereSubTitle" shouldShowLink linkKey="transferAmountPage.goToPayment" - onLinkPress={() => Navigation.navigate(ROUTES.SETTINGS_PAYMENTS)} + onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_PAYMENTS)} > Navigation.navigate(ROUTES.SETTINGS_PAYMENTS)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PAYMENTS)} /> diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 6c70f0f20b16..92d8e0fe0f3d 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -164,7 +164,7 @@ const WorkspaceInitialPage = (props) => { {({safeAreaPaddingBottomStyle}) => ( Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} > Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} > Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} > ( Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} > Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} >