diff --git a/src/ROUTES.js b/src/ROUTES.js index 6c0365e40568..90d08e5b13c8 100644 --- a/src/ROUTES.js +++ b/src/ROUTES.js @@ -20,7 +20,10 @@ export default { BANK_ACCOUNT_NEW: 'bank-account/new', BANK_ACCOUNT_WITH_STEP_TO_OPEN: 'bank-account/:stepToOpen?', BANK_ACCOUNT_PERSONAL: 'bank-account/personal', - getBankAccountRoute: (stepToOpen = '', policyID = '') => `bank-account/${stepToOpen}?policyID=${policyID}`, + getBankAccountRoute: (stepToOpen = '', policyID = '', backTo = '') => { + const backToParam = backTo ? `&backTo=${encodeURIComponent(backTo)}` : ''; + return `bank-account/${stepToOpen}?policyID=${policyID}${backToParam}`; + }, HOME: '', SETTINGS: 'settings', SETTINGS_PROFILE: 'settings/profile', diff --git a/src/components/ConnectBankAccountButton.js b/src/components/ConnectBankAccountButton.js index b62d46170768..f5e0afe1d52e 100644 --- a/src/components/ConnectBankAccountButton.js +++ b/src/components/ConnectBankAccountButton.js @@ -10,6 +10,7 @@ import compose from '../libs/compose'; import withLocalize, {withLocalizePropTypes} from './withLocalize'; import networkPropTypes from './networkPropTypes'; import Text from './Text'; +import Navigation from '../libs/Navigation/Navigation'; const propTypes = { ...withLocalizePropTypes, @@ -29,6 +30,7 @@ const defaultProps = { }; function ConnectBankAccountButton(props) { + const activeRoute = Navigation.getActiveRoute().replace(/\?.*/, ''); return props.network.isOffline ? ( {`${props.translate('common.youAppearToBeOffline')} ${props.translate('common.thisFeatureRequiresInternet')}`} @@ -36,7 +38,7 @@ function ConnectBankAccountButton(props) { ) : (