Skip to content

Commit dfb3cb0

Browse files
Add settings fallback route for Unit selector back navigation
1 parent d30774e commit dfb3cb0

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/pages/workspace/distanceRates/PolicyDistanceRateUnitPage.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
1414
import {setPolicyDistanceRatesUnit} from '@userActions/Policy/DistanceRate';
1515
import CONST from '@src/CONST';
1616
import ONYXKEYS from '@src/ONYXKEYS';
17+
import ROUTES from '@src/ROUTES';
1718
import type SCREENS from '@src/SCREENS';
1819

1920
type PolicyDistanceRateUnitPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DISTANCE_RATES_UNIT>;
@@ -31,7 +32,7 @@ function PolicyDistanceRateUnitPage({route}: PolicyDistanceRateUnitPageProps) {
3132
}
3233
const attributes = {...customUnit.attributes, unit: unit.value};
3334
setPolicyDistanceRatesUnit(policyID, customUnit, {...customUnit, attributes});
34-
Navigation.goBack();
35+
Navigation.goBack(ROUTES.WORKSPACE_DISTANCE_RATES_SETTINGS.getRoute(policyID));
3536
};
3637

3738
return (
@@ -46,7 +47,10 @@ function PolicyDistanceRateUnitPage({route}: PolicyDistanceRateUnitPageProps) {
4647
shouldEnableKeyboardAvoidingView={false}
4748
testID={PolicyDistanceRateUnitPage.displayName}
4849
>
49-
<HeaderWithBackButton title={translate('workspace.distanceRates.unit')} />
50+
<HeaderWithBackButton
51+
title={translate('workspace.distanceRates.unit')}
52+
onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_DISTANCE_RATES_SETTINGS.getRoute(policyID))}
53+
/>
5054
<UnitPicker
5155
defaultValue={customUnit?.attributes?.unit}
5256
onOptionSelected={onUnitSelected}

0 commit comments

Comments
 (0)