Merge pull request #48002 from bernhardoj/fix/47069-screen-behind-rhp-changes-to-profile-when-clicking-address-from-travel-page

Fix screen behind overlay changes to WS profile when open WS address page

Author: stitesExpensify

src/ROUTES.ts

@@ -547,7 +547,7 @@ const ROUTES = {
     },
     WORKSPACE_PROFILE_ADDRESS: {
         route: 'settings/workspaces/:policyID/profile/address',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile/address` as const,
+        getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo),
     },
     WORKSPACE_ACCOUNTING: {
         route: 'settings/workspaces/:policyID/accounting',

src/components/CountrySelector.tsx

@@ -75,7 +75,7 @@ function CountrySelector({errorText = '', value: countryCode, onInputChange = ()
             description={translate('common.country')}
             errorText={errorText}
             onPress={() => {
-                const activeRoute = Navigation.getActiveRouteWithoutParams();
+                const activeRoute = Navigation.getActiveRoute();
                 didOpenContrySelector.current = true;
                 Navigation.navigate(ROUTES.SETTINGS_ADDRESS_COUNTRY.getRoute(countryCode ?? '', activeRoute));
             }}

src/libs/Navigation/types.ts

@@ -184,6 +184,7 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ADDRESS]: {
         policyID: string;
         country?: Country | '';
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.NAME]: undefined;
     [SCREENS.WORKSPACE.DESCRIPTION]: undefined;

src/pages/AddressPage.tsx

@@ -7,6 +7,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import type {BackToParams} from '@libs/Navigation/types';
 import type {FormOnyxValues} from '@src/components/Form/types';
 import type {Country} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -22,9 +23,9 @@ type AddressPageProps = {
     updateAddress: (values: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>) => void;
     /** Title of address page */
     title: string;
-};
+} & BackToParams;
 
-function AddressPage({title, address, updateAddress, isLoadingApp = true}: AddressPageProps) {
+function AddressPage({title, address, updateAddress, isLoadingApp = true, backTo}: AddressPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
@@ -83,7 +84,7 @@ function AddressPage({title, address, updateAddress, isLoadingApp = true}: Addre
             <HeaderWithBackButton
                 title={title}
                 shouldShowBackButton
-                onBackButtonPress={() => Navigation.goBack()}
+                onBackButtonPress={() => Navigation.goBack(backTo)}
             />
             {isLoadingApp ? (
                 <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />

src/pages/Travel/ManageTrips.tsx

@@ -61,7 +61,7 @@ function ManageTrips() {
                     ctaAccessibilityLabel={translate('travel.bookTravel')}
                     onCtaPress={() => {
                         if (!hasPolicyAddress) {
-                            Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(activePolicyID ?? '-1'));
+                            Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(activePolicyID ?? '-1', Navigation.getActiveRoute()));
                             return;
                         }
                         if (!hasAcceptedTravelTerms) {

src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx

@@ -10,6 +10,7 @@ import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import type {CountryData} from '@libs/searchCountryOptions';
 import searchCountryOptions from '@libs/searchCountryOptions';
 import StringUtils from '@libs/StringUtils';
+import {appendParam} from '@libs/Url';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type {Route} from '@src/ROUTES';
@@ -49,10 +50,10 @@ function CountrySelectionPage({route, navigation}: CountrySelectionPageProps) {
                 Navigation.goBack();
             } else if (!!backTo && navigation.getState().routes.length === 1) {
                 // If "backTo" is not empty and there is only one route, go back to the specific route defined in "backTo" with a country parameter
-                Navigation.goBack(`${route.params.backTo}?country=${option.value}` as Route);
+                Navigation.goBack(appendParam(backTo, 'country', option.value));
             } else {
                 // Otherwise, navigate to the specific route defined in "backTo" with a country parameter
-                Navigation.navigate(`${route.params.backTo}?country=${option.value}` as Route);
+                Navigation.navigate(appendParam(backTo, 'country', option.value));
             }
         },
         [route, navigation],

src/pages/workspace/WorkspaceProfileAddressPage.tsx

@@ -16,8 +16,9 @@ type WorkspaceProfileAddressPagePolicyProps = WithPolicyProps;
 
 type WorkspaceProfileAddressPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ADDRESS> & WorkspaceProfileAddressPagePolicyProps;
 
-function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps) {
+function WorkspaceProfileAddressPage({policy, route}: WorkspaceProfileAddressPageProps) {
     const {translate} = useLocalize();
+    const backTo = route.params.backTo;
     const address: Address = useMemo(() => {
         const tempAddress = policy?.address;
         const [street1, street2] = (tempAddress?.addressStreet ?? '').split('\n');
@@ -43,11 +44,12 @@ function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps)
             zipCode: values?.zipPostCode?.trim().toUpperCase() ?? '',
             country: values.country,
         });
-        Navigation.goBack();
+        Navigation.goBack(backTo);
     };
 
     return (
         <AddressPage
+            backTo={backTo}
             address={address}
             isLoadingApp={false}
             updateAddress={updatePolicyAddress}