From 1c27da3b735202addf369f407bf6eac424ba041c Mon Sep 17 00:00:00 2001
From: Brandon Stites <bstites+1@expensify.com>
Date: Mon, 22 Dec 2025 15:32:30 -0500
Subject: [PATCH 1/2] Remove screenwrapper since addressPage already has a
 screenWrapper in it

---
 .../Travel/WorkspaceAddressForTravelPage.tsx      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/pages/Travel/WorkspaceAddressForTravelPage.tsx b/src/pages/Travel/WorkspaceAddressForTravelPage.tsx
index ff33e60a28e5..066e4bace768 100644
--- a/src/pages/Travel/WorkspaceAddressForTravelPage.tsx
+++ b/src/pages/Travel/WorkspaceAddressForTravelPage.tsx
@@ -1,7 +1,6 @@
 import {isUserValidatedSelector} from '@selectors/Account';
 import React from 'react';
 import type {FormOnyxValues} from '@components/Form/types';
-import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
@@ -51,14 +50,12 @@ function WorkspaceAddressForTravelPage({route}: WorkspaceAddressForTravelPagePro
 
     return (
         <AccessOrNotFoundWrapper policyID={policyID}>
-            <ScreenWrapper testID="WorkspaceAddressForTravelPage">
-                <AddressPage
-                    isLoadingApp={false}
-                    updateAddress={updatePolicyAddress}
-                    title={translate('common.companyAddress')}
-                    backTo={route.params.backTo}
-                />
-            </ScreenWrapper>
+            <AddressPage
+                isLoadingApp={false}
+                updateAddress={updatePolicyAddress}
+                title={translate('common.companyAddress')}
+                backTo={route.params.backTo}
+            />
         </AccessOrNotFoundWrapper>
     );
 }

From 27d214ef44fc14fb6d8af4e7e2817c09b8b6c169 Mon Sep 17 00:00:00 2001
From: Brandon Stites <bstites+1@expensify.com>
Date: Mon, 22 Dec 2025 17:24:22 -0500
Subject: [PATCH 2/2] fix route

---
 src/pages/Travel/MyTripsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx
index 59cfa4ef08a8..fcdb941259ab 100644
--- a/src/pages/Travel/MyTripsPage.tsx
+++ b/src/pages/Travel/MyTripsPage.tsx
@@ -11,7 +11,7 @@ import ManageTrips from './ManageTrips';
 type MyTripsPageProps = StackScreenProps<TravelNavigatorParamList, typeof SCREENS.TRAVEL.MY_TRIPS>;
 
 function MyTripsPage({route}: MyTripsPageProps) {
-    const {policyID} = route.params;
+    const policyID = route.params?.policyID;
     const {translate} = useLocalize();
 
     return (