diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 9972c03d7b68..54129b4af5d0 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -192,7 +192,7 @@ const ROUTES = {
     },
     SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME: {
         route: 'settings/wallet/card/:domain/get-physical/name',
-        getRoute: (domain: string) => `settings/wallet/card/${domain}/get-physical/name` as const,
+        getRoute: (domain: string, backTo?: string) => getUrlWithBackToParam(`settings/wallet/card/${domain}/get-physical/name`, backTo),
     },
     SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE: {
         route: 'settings/wallet/card/:domain/get-physical/phone',
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 362758c7a843..6689cadd47b4 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -195,7 +195,6 @@ const SCREENS = {
         DOMAIN_CARD: 'DomainCard',
         RESTRICTED_ACTION: 'RestrictedAction',
         REPORT_EXPORT: 'Report_Export',
-        MISSING_PERSONAL_DETAILS: 'MissingPersonalDetails',
         DEBUG: 'Debug',
     },
     ONBOARDING_MODAL: {
diff --git a/src/components/ReportActionItem/IssueCardMessage.tsx b/src/components/ReportActionItem/IssueCardMessage.tsx
index dcf657137d58..0787ab0876cc 100644
--- a/src/components/ReportActionItem/IssueCardMessage.tsx
+++ b/src/components/ReportActionItem/IssueCardMessage.tsx
@@ -1,16 +1,16 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import RenderHTML from '@components/RenderHTML';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {getUpdatedPrivatePersonalDetails, goToNextPhysicalCardRoute} from '@libs/GetPhysicalCardUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import * as PolicyUtils from '@libs/PolicyUtils';
-import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import {getPolicy, getWorkspaceAccountID, isPolicyAdmin as isPolicyAdminPolicyUtils} from '@libs/PolicyUtils';
+import {getCardIssuedMessage, getOriginalMessage, isActionOfType} from '@libs/ReportActionsUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type {ReportAction} from '@src/types/onyx';
 import type {IssueNewCardOriginalMessage} from '@src/types/onyx/OriginalMessage';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -25,11 +25,12 @@ function IssueCardMessage({action, policyID}: IssueCardMessageProps) {
     const styles = useThemeStyles();
     const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
     const [session] = useOnyx(ONYXKEYS.SESSION);
-    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID ?? '-1');
+    const workspaceAccountID = getWorkspaceAccountID(policyID);
     const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
+    const [draftValues] = useOnyx(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT);
 
-    const assigneeAccountID = (ReportActionsUtils.getOriginalMessage(action) as IssueNewCardOriginalMessage)?.assigneeAccountID;
+    const assigneeAccountID = (getOriginalMessage(action) as IssueNewCardOriginalMessage)?.assigneeAccountID;
 
     const missingDetails =
         !privatePersonalDetails?.legalFirstName ||
@@ -41,25 +42,30 @@ function IssueCardMessage({action, policyID}: IssueCardMessageProps) {
 
     const isAssigneeCurrentUser = !isEmptyObject(session) && session.accountID === assigneeAccountID;
 
-    const cardIssuedActionOriginalMessage = ReportActionsUtils.isActionOfType(
+    const cardIssuedActionOriginalMessage = isActionOfType(
         action,
         CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED,
         CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL,
         CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS,
     )
-        ? ReportActionsUtils.getOriginalMessage(action)
+        ? getOriginalMessage(action)
         : undefined;
-    const cardID = cardIssuedActionOriginalMessage?.cardID ?? -1;
-    const isPolicyAdmin = PolicyUtils.isPolicyAdmin(PolicyUtils.getPolicy(policyID));
+    const cardID = cardIssuedActionOriginalMessage?.cardID ?? CONST.DEFAULT_NUMBER_ID;
+    const isPolicyAdmin = isPolicyAdminPolicyUtils(getPolicy(policyID));
     const card = isPolicyAdmin ? cardsList?.[cardID] : cardList[cardID];
     const shouldShowAddMissingDetailsButton = !isEmptyObject(card) && action?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && missingDetails && isAssigneeCurrentUser;
 
+    const domain = cardList?.[cardID]?.domainName ?? '';
+    const goToNextRoute = useCallback(() => {
+        goToNextPhysicalCardRoute(domain, getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails), Navigation.getActiveRoute());
+    }, [domain, draftValues, privatePersonalDetails]);
+
     return (
         <>
-            <RenderHTML html={`<muted-text>${ReportActionsUtils.getCardIssuedMessage(action, true, policyID, !!card)}</muted-text>`} />
+            <RenderHTML html={`<muted-text>${getCardIssuedMessage(action, true, policyID, !!card)}</muted-text>`} />
             {shouldShowAddMissingDetailsButton && (
                 <Button
-                    onPress={() => Navigation.navigate(ROUTES.MISSING_PERSONAL_DETAILS)}
+                    onPress={goToNextRoute}
                     success
                     style={[styles.alignSelfStart, styles.mt3]}
                     text={translate('workspace.expensifyCard.addShippingDetails')}
diff --git a/src/libs/GetPhysicalCardUtils.ts b/src/libs/GetPhysicalCardUtils.ts
index 8dc46204db3c..00abd931b492 100644
--- a/src/libs/GetPhysicalCardUtils.ts
+++ b/src/libs/GetPhysicalCardUtils.ts
@@ -1,21 +1,22 @@
 import type {OnyxEntry} from 'react-native-onyx';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
-import type {GetPhysicalCardForm} from '@src/types/form';
+import type {GetPhysicalCardForm, PersonalDetailsForm} from '@src/types/form';
+import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
 import type {LoginList, PrivatePersonalDetails} from '@src/types/onyx';
-import * as LoginUtils from './LoginUtils';
+import {validateNumber} from './LoginUtils';
 import Navigation from './Navigation/Navigation';
-import * as PersonalDetailsUtils from './PersonalDetailsUtils';
-import * as UserUtils from './UserUtils';
+import {getCurrentAddress, getFormattedStreet} from './PersonalDetailsUtils';
+import {getSecondaryPhoneLogin} from './UserUtils';
 
-function getCurrentRoute(domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>): Route {
+function getCurrentRoute(domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, backTo?: string): Route {
     const {legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
-    const address = PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails);
+    const address = getCurrentAddress(privatePersonalDetails);
 
     if (!legalFirstName && !legalLastName) {
-        return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.getRoute(domain);
+        return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.getRoute(domain, backTo);
     }
-    if (!phoneNumber || !LoginUtils.validateNumber(phoneNumber)) {
+    if (!phoneNumber || !validateNumber(phoneNumber)) {
         return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE.getRoute(domain);
     }
     if (!(address?.street && address?.city && address?.state && address?.country && address?.zip)) {
@@ -25,8 +26,8 @@ function getCurrentRoute(domain: string, privatePersonalDetails: OnyxEntry<Priva
     return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_CONFIRM.getRoute(domain);
 }
 
-function goToNextPhysicalCardRoute(domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>) {
-    Navigation.navigate(getCurrentRoute(domain, privatePersonalDetails));
+function goToNextPhysicalCardRoute(domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, backTo?: string) {
+    Navigation.navigate(getCurrentRoute(domain, privatePersonalDetails, backTo));
 }
 
 /**
@@ -57,7 +58,7 @@ function setCurrentRoute(currentRoute: string, domain: string, privatePersonalDe
  */
 function getUpdatedDraftValues(draftValues: OnyxEntry<GetPhysicalCardForm>, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, loginList: OnyxEntry<LoginList>): GetPhysicalCardForm {
     const {legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
-    const address = PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails);
+    const address = getCurrentAddress(privatePersonalDetails);
 
     return {
         /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
@@ -68,7 +69,7 @@ function getUpdatedDraftValues(draftValues: OnyxEntry<GetPhysicalCardForm>, priv
         addressLine2: draftValues?.addressLine2 || address?.street.split('\n')[1] || '',
         city: draftValues?.city || address?.city || '',
         country: draftValues?.country || address?.country || '',
-        phoneNumber: draftValues?.phoneNumber || phoneNumber || UserUtils.getSecondaryPhoneLogin(loginList) || '',
+        phoneNumber: draftValues?.phoneNumber || phoneNumber || getSecondaryPhoneLogin(loginList) || '',
         state: draftValues?.state || address?.state || '',
         zipPostCode: draftValues?.zipPostCode || address?.zip || '',
         /* eslint-enable @typescript-eslint/prefer-nullish-coalescing */
@@ -86,9 +87,27 @@ function getUpdatedPrivatePersonalDetails(draftValues: OnyxEntry<GetPhysicalCard
         legalFirstName,
         legalLastName,
         phoneNumber,
-        addresses: [...(privatePersonalDetails?.addresses ?? []), {street: PersonalDetailsUtils.getFormattedStreet(addressLine1, addressLine2), city, country, state, zip: zipPostCode}],
+        addresses: [...(privatePersonalDetails?.addresses ?? []), {street: getFormattedStreet(addressLine1, addressLine2), city, country, state, zip: zipPostCode}],
     };
 }
 
-export {getUpdatedDraftValues, getUpdatedPrivatePersonalDetails, goToNextPhysicalCardRoute, setCurrentRoute};
+function getSubstepValues(privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, personalDetailsDraft: OnyxEntry<PersonalDetailsForm>): PersonalDetailsForm {
+    const address = getCurrentAddress(privatePersonalDetails);
+    const {street} = address ?? {};
+    const [street1, street2] = street ? street.split('\n') : [undefined, undefined];
+    return {
+        [INPUT_IDS.LEGAL_FIRST_NAME]: personalDetailsDraft?.[INPUT_IDS.LEGAL_FIRST_NAME] ?? privatePersonalDetails?.legalFirstName ?? '',
+        [INPUT_IDS.LEGAL_LAST_NAME]: personalDetailsDraft?.[INPUT_IDS.LEGAL_LAST_NAME] ?? privatePersonalDetails?.legalLastName ?? '',
+        [INPUT_IDS.DATE_OF_BIRTH]: personalDetailsDraft?.[INPUT_IDS.DATE_OF_BIRTH] ?? privatePersonalDetails?.dob ?? '',
+        [INPUT_IDS.PHONE_NUMBER]: personalDetailsDraft?.[INPUT_IDS.PHONE_NUMBER] ?? privatePersonalDetails?.phoneNumber ?? '',
+        [INPUT_IDS.ADDRESS_LINE_1]: personalDetailsDraft?.[INPUT_IDS.ADDRESS_LINE_1] ?? street1 ?? '',
+        [INPUT_IDS.ADDRESS_LINE_2]: personalDetailsDraft?.[INPUT_IDS.ADDRESS_LINE_2] ?? street2 ?? '',
+        [INPUT_IDS.CITY]: personalDetailsDraft?.[INPUT_IDS.CITY] ?? address?.city ?? '',
+        [INPUT_IDS.STATE]: personalDetailsDraft?.[INPUT_IDS.STATE] ?? address?.state ?? '',
+        [INPUT_IDS.ZIP_POST_CODE]: personalDetailsDraft?.[INPUT_IDS.ZIP_POST_CODE] ?? address?.zip ?? '',
+        [INPUT_IDS.COUNTRY]: personalDetailsDraft?.[INPUT_IDS.COUNTRY] ?? address?.country ?? '',
+    };
+}
+
+export {getUpdatedDraftValues, getUpdatedPrivatePersonalDetails, goToNextPhysicalCardRoute, setCurrentRoute, getSubstepValues};
 export type {PrivatePersonalDetails};
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index f96db7a81a02..dbfc9c8af087 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -7,7 +7,6 @@ import type {
     EditRequestNavigatorParamList,
     EnablePaymentsNavigatorParamList,
     FlagCommentNavigatorParamList,
-    MissingPersonalDetailsParamList,
     MoneyRequestNavigatorParamList,
     NewChatNavigatorParamList,
     NewTaskNavigatorParamList,
@@ -689,10 +688,6 @@ const RestrictedActionModalStackNavigator = createModalStackNavigator<SearchRepo
     [SCREENS.RESTRICTED_ACTION_ROOT]: () => require<ReactComponentModule>('../../../../pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage').default,
 });
 
-const MissingPersonalDetailsModalStackNavigator = createModalStackNavigator<MissingPersonalDetailsParamList>({
-    [SCREENS.MISSING_PERSONAL_DETAILS_ROOT]: () => require<ReactComponentModule>('../../../../pages/MissingPersonalDetails').default,
-});
-
 const DebugModalStackNavigator = createModalStackNavigator<DebugParamList>({
     [SCREENS.DEBUG.REPORT]: () => require<ReactComponentModule>('../../../../pages/Debug/Report/DebugReportPage').default,
     [SCREENS.DEBUG.REPORT_ACTION]: () => require<ReactComponentModule>('../../../../pages/Debug/ReportAction/DebugReportActionPage').default,
@@ -738,7 +733,6 @@ export {
     RestrictedActionModalStackNavigator,
     SearchAdvancedFiltersModalStackNavigator,
     SearchSavedSearchModalStackNavigator,
-    MissingPersonalDetailsModalStackNavigator,
     DebugModalStackNavigator,
     WorkspaceConfirmationModalStackNavigator,
 };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index ac53ad3b64d2..ab5973006290 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -215,10 +215,6 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
                         name={SCREENS.RIGHT_MODAL.SEARCH_SAVED_SEARCH}
                         component={ModalStackNavigators.SearchSavedSearchModalStackNavigator}
                     />
-                    <Stack.Screen
-                        name={SCREENS.RIGHT_MODAL.MISSING_PERSONAL_DETAILS}
-                        component={ModalStackNavigators.MissingPersonalDetailsModalStackNavigator}
-                    />
                 </Stack.Navigator>
             </View>
         </NoDropZone>
diff --git a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
index 96d3d8b74080..678e2068397f 100755
--- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
@@ -27,10 +27,6 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial<Record<CentralPaneName, string[]>> =
     [SCREENS.SETTINGS.PREFERENCES.ROOT]: [SCREENS.SETTINGS.PREFERENCES.PRIORITY_MODE, SCREENS.SETTINGS.PREFERENCES.LANGUAGE, SCREENS.SETTINGS.PREFERENCES.THEME],
     [SCREENS.SETTINGS.WALLET.ROOT]: [
         SCREENS.SETTINGS.WALLET.DOMAIN_CARD,
-        SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.NAME,
-        SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.PHONE,
-        SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.ADDRESS,
-        SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.CONFIRM,
         SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE,
         SCREENS.SETTINGS.WALLET.CHOOSE_TRANSFER_ACCOUNT,
         SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index efb2f3e9cb9a..a3e0a64d2fa9 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -148,6 +148,7 @@ type SettingsNavigatorParamList = {
     [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.NAME]: {
         /** domain of selected card */
         domain: string;
+        backTo?: Routes;
     };
     [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.PHONE]: {
         /** domain of selected card */
@@ -1487,7 +1488,6 @@ type RightModalNavigatorParamList = {
     [SCREENS.RIGHT_MODAL.RESTRICTED_ACTION]: NavigatorScreenParams<RestrictedActionParamList>;
     [SCREENS.RIGHT_MODAL.SEARCH_ADVANCED_FILTERS]: NavigatorScreenParams<SearchAdvancedFiltersParamList>;
     [SCREENS.RIGHT_MODAL.SEARCH_SAVED_SEARCH]: NavigatorScreenParams<SearchSavedSearchParamList>;
-    [SCREENS.RIGHT_MODAL.MISSING_PERSONAL_DETAILS]: NavigatorScreenParams<MissingPersonalDetailsParamList>;
     [SCREENS.RIGHT_MODAL.DEBUG]: NavigatorScreenParams<DebugParamList>;
 };
 
@@ -1769,10 +1769,6 @@ type RestrictedActionParamList = {
     };
 };
 
-type MissingPersonalDetailsParamList = {
-    [SCREENS.MISSING_PERSONAL_DETAILS_ROOT]: undefined;
-};
-
 type DebugParamList = {
     [SCREENS.DEBUG.REPORT]: {
         reportID: string;
@@ -1880,7 +1876,6 @@ export type {
     SearchAdvancedFiltersParamList,
     SearchSavedSearchParamList,
     RestrictedActionParamList,
-    MissingPersonalDetailsParamList,
     DebugParamList,
     MigratedUserModalNavigatorParamList,
     WorkspaceConfirmationNavigatorParamList,
diff --git a/src/libs/actions/PersonalDetails.ts b/src/libs/actions/PersonalDetails.ts
index 94a9dc95e846..123a6fdc1040 100644
--- a/src/libs/actions/PersonalDetails.ts
+++ b/src/libs/actions/PersonalDetails.ts
@@ -18,11 +18,11 @@ import type {
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
 import DateUtils from '@libs/DateUtils';
-import * as ErrorUtils from '@libs/ErrorUtils';
-import * as LoginUtils from '@libs/LoginUtils';
+import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+import {appendCountryCode} from '@libs/LoginUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
-import * as UserUtils from '@libs/UserUtils';
+import {createDisplayName, getFormattedStreet} from '@libs/PersonalDetailsUtils';
+import {getDefaultAvatarURL} from '@libs/UserUtils';
 import type {Country} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -37,7 +37,7 @@ Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
         currentUserEmail = val?.email ?? '';
-        currentUserAccountID = val?.accountID ?? -1;
+        currentUserAccountID = val?.accountID ?? CONST.DEFAULT_NUMBER_ID;
     },
 });
 
@@ -84,7 +84,7 @@ function setDisplayName(firstName: string, lastName: string) {
         [currentUserAccountID]: {
             firstName,
             lastName,
-            displayName: PersonalDetailsUtils.createDisplayName(currentUserEmail ?? '', {
+            displayName: createDisplayName(currentUserEmail ?? '', {
                 firstName,
                 lastName,
             }),
@@ -108,7 +108,7 @@ function updateDisplayName(firstName: string, lastName: string) {
                     [currentUserAccountID]: {
                         firstName,
                         lastName,
-                        displayName: PersonalDetailsUtils.createDisplayName(currentUserEmail ?? '', {
+                        displayName: createDisplayName(currentUserEmail ?? '', {
                             firstName,
                             lastName,
                         }),
@@ -178,7 +178,7 @@ function updatePhoneNumber(phoneNumber: string, currenPhoneNumber: string) {
                 value: {
                     phoneNumber: currenPhoneNumber,
                     errorFields: {
-                        phoneNumber: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('privatePersonalDetails.error.invalidPhoneNumber'),
+                        phoneNumber: getMicroSecondOnyxErrorWithTranslationKey('privatePersonalDetails.error.invalidPhoneNumber'),
                     },
                 },
             },
@@ -219,7 +219,7 @@ function updateAddress(street: string, street2: string, city: string, state: str
                     addresses: [
                         ...(privatePersonalDetails?.addresses ?? []),
                         {
-                            street: PersonalDetailsUtils.getFormattedStreet(street, street2),
+                            street: getFormattedStreet(street, street2),
                             city,
                             state,
                             zip,
@@ -415,7 +415,7 @@ function deleteAvatar() {
     }
 
     // We want to use the old dot avatar here as this affects both platforms.
-    const defaultAvatar = UserUtils.getDefaultAvatarURL(currentUserAccountID);
+    const defaultAvatar = getDefaultAvatarURL(currentUserAccountID);
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -465,11 +465,11 @@ function clearAvatarErrors() {
     });
 }
 
-function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>, validateCode: string) {
+function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>, validateCode: string, cardID: number) {
     const parameters: SetPersonalDetailsAndShipExpensifyCardsParams = {
         legalFirstName: values.legalFirstName?.trim() ?? '',
         legalLastName: values.legalLastName?.trim() ?? '',
-        phoneNumber: LoginUtils.appendCountryCode(values.phoneNumber?.trim() ?? ''),
+        phoneNumber: appendCountryCode(values.phoneNumber?.trim() ?? ''),
         addressCity: values.city.trim(),
         addressStreet: values.addressLine1?.trim() ?? '',
         addressStreet2: values.addressLine2?.trim() ?? '',
@@ -480,30 +480,108 @@ function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues<typeo
         validateCode,
     };
 
-    API.write(WRITE_COMMANDS.SET_PERSONAL_DETAILS_AND_SHIP_EXPENSIFY_CARDS, parameters, {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
-                value: {
-                    addresses: [
-                        ...(privatePersonalDetails?.addresses ?? []),
-                        {
-                            street: PersonalDetailsUtils.getFormattedStreet(parameters.addressStreet, parameters.addressStreet2),
-                            city: parameters.addressCity,
-                            state: parameters.addressState,
-                            zip: parameters.addressZip,
-                            country: parameters.addressCountry as Country | '',
-                            current: true,
-                        },
-                    ],
-                    legalFirstName: parameters.legalFirstName,
-                    legalLastName: parameters.legalLastName,
-                    dob: parameters.dob,
-                    phoneNumber: parameters.phoneNumber,
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
+            value: {
+                addresses: [
+                    ...(privatePersonalDetails?.addresses ?? []),
+                    {
+                        street: getFormattedStreet(parameters.addressStreet, parameters.addressStreet2),
+                        city: parameters.addressCity,
+                        zip: parameters.addressZip,
+                        country: parameters.addressCountry,
+                        state: parameters.addressState,
+                    },
+                ],
+                dob: parameters.dob,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.CARD_LIST,
+            value: {
+                [cardID]: {
+                    errors: null,
                 },
             },
-        ],
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
+            value: privatePersonalDetails,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM,
+            value: {
+                isLoading: true,
+                errors: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.VALIDATE_ACTION_CODE,
+            value: {
+                validateCodeSent: false,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.CARD_LIST,
+            value: {
+                [cardID]: {
+                    state: 4, // NOT_ACTIVATED
+                    errors: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM,
+            value: {
+                isLoading: false,
+                errors: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.VALIDATE_ACTION_CODE,
+            value: {
+                validateCodeSent: false,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.CARD_LIST,
+            value: {
+                [cardID]: {
+                    state: 2,
+                    isLoading: false,
+                    errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    API.write(WRITE_COMMANDS.SET_PERSONAL_DETAILS_AND_SHIP_EXPENSIFY_CARDS, parameters, {
+        optimisticData,
+        successData,
+        failureData,
     });
 }
 
diff --git a/src/libs/actions/Wallet.ts b/src/libs/actions/Wallet.ts
index ea7e86ef49b7..f9e8ef61f057 100644
--- a/src/libs/actions/Wallet.ts
+++ b/src/libs/actions/Wallet.ts
@@ -2,22 +2,13 @@ import type {OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
-import type {
-    AcceptWalletTermsParams,
-    AnswerQuestionsForWalletParams,
-    RequestPhysicalExpensifyCardParams,
-    UpdatePersonalDetailsForWalletParams,
-    VerifyIdentityParams,
-} from '@libs/API/parameters';
+import type {AcceptWalletTermsParams, AnswerQuestionsForWalletParams, UpdatePersonalDetailsForWalletParams, VerifyIdentityParams} from '@libs/API/parameters';
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
-import * as ErrorUtils from '@libs/ErrorUtils';
-import type {PrivatePersonalDetails} from '@libs/GetPhysicalCardUtils';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import type CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {WalletAdditionalQuestionDetails} from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
-import * as FormActions from './FormActions';
+import {clearErrors} from './FormActions';
 
 type WalletQuestionAnswer = {
     question: string;
@@ -259,107 +250,6 @@ function answerQuestionsForWallet(answers: WalletQuestionAnswer[], idNumber: str
     });
 }
 
-function requestPhysicalExpensifyCard(cardID: number, authToken: string, privatePersonalDetails: PrivatePersonalDetails, validateCode: string) {
-    const {legalFirstName = '', legalLastName = '', phoneNumber = ''} = privatePersonalDetails;
-    const {city = '', country = '', state = '', street = '', zip = ''} = PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails) ?? {};
-
-    const requestParams: RequestPhysicalExpensifyCardParams = {
-        authToken,
-        legalFirstName,
-        legalLastName,
-        phoneNumber,
-        addressCity: city,
-        addressCountry: country,
-        addressState: state,
-        addressStreet: street,
-        addressZip: zip,
-        validateCode,
-    };
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.CARD_LIST,
-            value: {
-                [cardID]: {
-                    errors: null,
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
-            value: privatePersonalDetails,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM,
-            value: {
-                isLoading: true,
-                errors: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.VALIDATE_ACTION_CODE,
-            value: {
-                validateCodeSent: false,
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.CARD_LIST,
-            value: {
-                [cardID]: {
-                    state: 4, // NOT_ACTIVATED
-                    errors: null,
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM,
-            value: {
-                isLoading: false,
-                errors: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.VALIDATE_ACTION_CODE,
-            value: {
-                validateCodeSent: false,
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.CARD_LIST,
-            value: {
-                [cardID]: {
-                    state: 2,
-                    isLoading: false,
-                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM,
-            value: {
-                isLoading: false,
-            },
-        },
-    ];
-
-    API.write(WRITE_COMMANDS.REQUEST_PHYSICAL_EXPENSIFY_CARD, requestParams, {optimisticData, failureData, successData});
-}
-
 function resetWalletAdditionalDetailsDraft() {
     Onyx.set(ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS_DRAFT, null);
 }
@@ -373,7 +263,7 @@ function clearPhysicalCardError(cardID?: string) {
         return;
     }
 
-    FormActions.clearErrors(ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM);
+    clearErrors(ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM);
     Onyx.merge(ONYXKEYS.CARD_LIST, {
         [cardID]: {
             errors: null,
@@ -393,7 +283,6 @@ export {
     verifyIdentity,
     acceptWalletTerms,
     setKYCWallSource,
-    requestPhysicalExpensifyCard,
     resetWalletAdditionalDetailsDraft,
     clearPhysicalCardError,
 };
diff --git a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx
deleted file mode 100644
index e09c58b54d5e..000000000000
--- a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import React, {useCallback, useMemo, useRef, useState} from 'react';
-import type {ForwardedRef} from 'react';
-import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
-import type {OnyxEntry} from 'react-native-onyx';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
-import type {InteractiveStepSubHeaderHandle} from '@components/InteractiveStepSubHeader';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
-import useLocalize from '@hooks/useLocalize';
-import useSubStep from '@hooks/useSubStep';
-import useThemeStyles from '@hooks/useThemeStyles';
-import * as FormActions from '@libs/actions/FormActions';
-import {requestValidateCodeAction} from '@libs/actions/User';
-import Navigation from '@libs/Navigation/Navigation';
-import * as PersonalDetails from '@userActions/PersonalDetails';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsForm} from '@src/types/form';
-import type {PrivatePersonalDetails} from '@src/types/onyx';
-import Address from './substeps/Address';
-import Confirmation from './substeps/Confirmation';
-import DateOfBirth from './substeps/DateOfBirth';
-import LegalName from './substeps/LegalName';
-import PhoneNumber from './substeps/PhoneNumber';
-import type {CustomSubStepProps} from './types';
-import {getInitialSubstep, getSubstepValues} from './utils';
-
-type MissingPersonalDetailsContentProps = {
-    privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>;
-    draftValues: OnyxEntry<PersonalDetailsForm>;
-};
-
-const formSteps = [LegalName, DateOfBirth, Address, PhoneNumber, Confirmation];
-
-function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: MissingPersonalDetailsContentProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
-    const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE);
-    const primaryLogin = account?.primaryLogin ?? '';
-    const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(false);
-
-    const ref: ForwardedRef<InteractiveStepSubHeaderHandle> = useRef(null);
-
-    const values = useMemo(() => getSubstepValues(privatePersonalDetails, draftValues), [privatePersonalDetails, draftValues]);
-
-    const startFrom = useMemo(() => getInitialSubstep(values), [values]);
-
-    const handleFinishStep = useCallback(() => {
-        if (!values) {
-            return;
-        }
-        setIsValidateCodeActionModalVisible(true);
-    }, [values]);
-
-    const {
-        componentToRender: SubStep,
-        isEditing,
-        nextScreen,
-        prevScreen,
-        screenIndex,
-        moveTo,
-        goToTheLastStep,
-    } = useSubStep<CustomSubStepProps>({bodyContent: formSteps, startFrom, onFinished: handleFinishStep});
-
-    const handleBackButtonPress = () => {
-        if (isEditing) {
-            goToTheLastStep();
-            return;
-        }
-
-        // Clicking back on the first screen should dismiss the modal
-        if (screenIndex === CONST.MISSING_PERSONAL_DETAILS_INDEXES.MAPPING.LEGAL_NAME) {
-            FormActions.clearDraftValues(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM);
-            Navigation.goBack();
-            return;
-        }
-        ref.current?.movePrevious();
-        prevScreen();
-    };
-
-    const handleValidateCodeEntered = useCallback(
-        (validateCode: string) => {
-            PersonalDetails.updatePersonalDetailsAndShipExpensifyCards(values, validateCode);
-            FormActions.clearDraftValues(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM);
-            Navigation.goBack();
-        },
-        [values],
-    );
-
-    const sendValidateCode = () => {
-        if (validateCodeAction?.validateCodeSent) {
-            return;
-        }
-
-        requestValidateCodeAction();
-    };
-
-    const handleNextScreen = useCallback(() => {
-        if (isEditing) {
-            goToTheLastStep();
-            return;
-        }
-        ref.current?.moveNext();
-        nextScreen();
-    }, [goToTheLastStep, isEditing, nextScreen]);
-
-    return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            shouldEnableMaxHeight
-            testID={MissingPersonalDetailsContent.displayName}
-        >
-            <HeaderWithBackButton
-                title={translate('workspace.expensifyCard.addShippingDetails')}
-                onBackButtonPress={handleBackButtonPress}
-            />
-            <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.NETSUITE_FORM_STEPS_HEADER_HEIGHT}]}>
-                <InteractiveStepSubHeader
-                    ref={ref}
-                    startStepIndex={startFrom}
-                    stepNames={CONST.MISSING_PERSONAL_DETAILS_INDEXES.INDEX_LIST}
-                />
-            </View>
-            <SubStep
-                isEditing={isEditing}
-                onNext={handleNextScreen}
-                onMove={moveTo}
-                screenIndex={screenIndex}
-                personalDetailsValues={values}
-            />
-
-            <ValidateCodeActionModal
-                handleSubmitForm={handleValidateCodeEntered}
-                sendValidateCode={sendValidateCode}
-                clearError={() => {}}
-                onClose={() => setIsValidateCodeActionModalVisible(false)}
-                isVisible={isValidateCodeActionModalVisible}
-                title={translate('cardPage.validateCardTitle')}
-                descriptionPrimary={translate('cardPage.enterMagicCode', {contactMethod: primaryLogin})}
-                hasMagicCodeBeenSent={!!validateCodeAction?.validateCodeSent}
-            />
-        </ScreenWrapper>
-    );
-}
-
-MissingPersonalDetailsContent.displayName = 'MissingPersonalDetailsContent';
-
-export default MissingPersonalDetailsContent;
diff --git a/src/pages/MissingPersonalDetails/index.tsx b/src/pages/MissingPersonalDetails/index.tsx
deleted file mode 100644
index 51f1b87c197a..000000000000
--- a/src/pages/MissingPersonalDetails/index.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import {useOnyx} from 'react-native-onyx';
-import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import ONYXKEYS from '@src/ONYXKEYS';
-import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
-import MissingPersonalDetailsContent from './MissingPersonalDetailsContent';
-
-function MissingPersonalDetails() {
-    const [privatePersonalDetails, privatePersonalDetailsMetadata] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
-    const [draftValues, draftValuesMetadata] = useOnyx(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM_DRAFT);
-
-    const isLoading = isLoadingOnyxValue(privatePersonalDetailsMetadata, draftValuesMetadata);
-
-    if (isLoading) {
-        return <FullScreenLoadingIndicator />;
-    }
-
-    return (
-        <MissingPersonalDetailsContent
-            privatePersonalDetails={privatePersonalDetails}
-            draftValues={draftValues}
-        />
-    );
-}
-
-MissingPersonalDetails.displayName = 'MissingPersonalDetails';
-
-export default MissingPersonalDetails;
diff --git a/src/pages/MissingPersonalDetails/substeps/Address.tsx b/src/pages/MissingPersonalDetails/substeps/Address.tsx
deleted file mode 100644
index 011d7e63cc55..000000000000
--- a/src/pages/MissingPersonalDetails/substeps/Address.tsx
+++ /dev/null
@@ -1,214 +0,0 @@
-import React, {useCallback, useState} from 'react';
-import {View} from 'react-native';
-import AddressSearch from '@components/AddressSearch';
-import CountryPicker from '@components/CountryPicker';
-import FormProvider from '@components/Form/FormProvider';
-import InputWrapper from '@components/Form/InputWrapper';
-import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import StatePicker from '@components/StatePicker';
-import type {State} from '@components/StateSelector';
-import Text from '@components/Text';
-import TextInput from '@components/TextInput';
-import useLocalize from '@hooks/useLocalize';
-import usePersonalDetailsFormSubmit from '@hooks/usePersonalDetailsFormSubmit';
-import useThemeStyles from '@hooks/useThemeStyles';
-import * as ValidationUtils from '@libs/ValidationUtils';
-import type {CountryZipRegex, CustomSubStepProps} from '@pages/MissingPersonalDetails/types';
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
-import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
-
-const STEP_FIELDS = [INPUT_IDS.ADDRESS_LINE_1, INPUT_IDS.ADDRESS_LINE_2, INPUT_IDS.CITY, INPUT_IDS.STATE, INPUT_IDS.ZIP_POST_CODE, INPUT_IDS.COUNTRY];
-
-function AddressStep({isEditing, onNext, personalDetailsValues}: CustomSubStepProps) {
-    const {translate} = useLocalize();
-    const styles = useThemeStyles();
-
-    const [currentCountry, setCurrentCountry] = useState(personalDetailsValues[INPUT_IDS.COUNTRY]);
-    const [state, setState] = useState(personalDetailsValues[INPUT_IDS.STATE]);
-    const [city, setCity] = useState(personalDetailsValues[INPUT_IDS.CITY]);
-    const [zipcode, setZipcode] = useState(personalDetailsValues[INPUT_IDS.ZIP_POST_CODE]);
-
-    const handleSubmit = usePersonalDetailsFormSubmit({
-        fieldIds: STEP_FIELDS,
-        onNext,
-        shouldSaveDraft: true,
-    });
-
-    const validate = useCallback(
-        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM> => {
-            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM> = {};
-            const addressRequiredFields = [INPUT_IDS.ADDRESS_LINE_1, INPUT_IDS.CITY, INPUT_IDS.COUNTRY, INPUT_IDS.STATE] as const;
-            addressRequiredFields.forEach((fieldKey) => {
-                const fieldValue = values[fieldKey] ?? '';
-                if (ValidationUtils.isRequiredFulfilled(fieldValue)) {
-                    return;
-                }
-                errors[fieldKey] = translate('common.error.fieldRequired');
-            });
-
-            // If no country is selected, default value is an empty string and there's no related regex data so we default to an empty object
-            const countryRegexDetails = (values.country ? CONST.COUNTRY_ZIP_REGEX_DATA?.[values.country] : {}) as CountryZipRegex;
-
-            // The postal code system might not exist for a country, so no regex either for them.
-            const countrySpecificZipRegex = countryRegexDetails?.regex;
-            const countryZipFormat = countryRegexDetails?.samples ?? '';
-            if (countrySpecificZipRegex) {
-                if (!countrySpecificZipRegex.test(values[INPUT_IDS.ZIP_POST_CODE]?.trim().toUpperCase())) {
-                    if (ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.ZIP_POST_CODE]?.trim())) {
-                        errors[INPUT_IDS.ZIP_POST_CODE] = translate('privatePersonalDetails.error.incorrectZipFormat', {zipFormat: countryZipFormat});
-                    } else {
-                        errors[INPUT_IDS.ZIP_POST_CODE] = translate('common.error.fieldRequired');
-                    }
-                }
-            } else if (!CONST.GENERIC_ZIP_CODE_REGEX.test(values[INPUT_IDS.ZIP_POST_CODE]?.trim()?.toUpperCase() ?? '')) {
-                errors[INPUT_IDS.ZIP_POST_CODE] = translate('privatePersonalDetails.error.incorrectZipFormat');
-            }
-            return errors;
-        },
-        [translate],
-    );
-
-    const handleAddressChange = useCallback((value: unknown, key: unknown) => {
-        const addressPart = value as string;
-        const addressPartKey = key as keyof Address;
-
-        if (addressPartKey !== INPUT_IDS.COUNTRY && addressPartKey !== INPUT_IDS.STATE && addressPartKey !== INPUT_IDS.CITY && addressPartKey !== INPUT_IDS.ZIP_POST_CODE) {
-            return;
-        }
-        if (addressPartKey === INPUT_IDS.COUNTRY) {
-            setCurrentCountry(addressPart as Country | '');
-            setState('');
-            setCity('');
-            setZipcode('');
-            return;
-        }
-        if (addressPartKey === INPUT_IDS.STATE) {
-            setState(addressPart);
-            setCity('');
-            setZipcode('');
-            return;
-        }
-        if (addressPartKey === INPUT_IDS.CITY) {
-            setCity(addressPart);
-            setZipcode('');
-            return;
-        }
-        setZipcode(addressPart);
-    }, []);
-
-    const isUSAForm = currentCountry === CONST.COUNTRY.US;
-
-    const zipSampleFormat = (currentCountry && (CONST.COUNTRY_ZIP_REGEX_DATA[currentCountry] as CountryZipRegex)?.samples) ?? '';
-
-    const zipFormat = translate('common.zipCodeExampleFormat', {zipSampleFormat});
-
-    return (
-        <FormProvider
-            formID={ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM}
-            submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
-            onSubmit={handleSubmit}
-            validate={validate}
-            style={[styles.flexGrow1, styles.mt3]}
-            submitButtonStyles={[styles.ph5, styles.mb0]}
-            enabledWhenOffline
-        >
-            <View style={styles.ph5}>
-                <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate('privatePersonalDetails.enterAddress')}</Text>
-                <View>
-                    <InputWrapper
-                        InputComponent={AddressSearch}
-                        inputID={INPUT_IDS.ADDRESS_LINE_1}
-                        label={translate('common.addressLine', {lineNumber: 1})}
-                        onValueChange={(data: unknown, key: unknown) => {
-                            handleAddressChange(data, key);
-                        }}
-                        defaultValue={personalDetailsValues[INPUT_IDS.ADDRESS_LINE_1]}
-                        renamedInputKeys={{
-                            street: INPUT_IDS.ADDRESS_LINE_1,
-                            street2: INPUT_IDS.ADDRESS_LINE_2,
-                            city: INPUT_IDS.CITY,
-                            state: INPUT_IDS.STATE,
-                            zipCode: INPUT_IDS.ZIP_POST_CODE,
-                            country: INPUT_IDS.COUNTRY as Country,
-                        }}
-                        maxInputLength={CONST.FORM_CHARACTER_LIMIT}
-                    />
-                </View>
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.ADDRESS_LINE_2}
-                    label={translate('common.addressLine', {lineNumber: 2})}
-                    aria-label={translate('common.addressLine', {lineNumber: 2})}
-                    role={CONST.ROLE.PRESENTATION}
-                    defaultValue={personalDetailsValues[INPUT_IDS.ADDRESS_LINE_2]}
-                    maxLength={CONST.FORM_CHARACTER_LIMIT}
-                    spellCheck={false}
-                    containerStyles={styles.mt5}
-                />
-                <View style={[styles.mt2, styles.mhn5]}>
-                    <InputWrapper
-                        InputComponent={CountryPicker}
-                        inputID={INPUT_IDS.COUNTRY}
-                        value={currentCountry}
-                        onValueChange={handleAddressChange}
-                    />
-                </View>
-                {isUSAForm ? (
-                    <View style={[styles.mt2, styles.mhn5]}>
-                        <InputWrapper
-                            InputComponent={StatePicker}
-                            inputID={INPUT_IDS.STATE}
-                            value={state as State}
-                            onValueChange={handleAddressChange}
-                        />
-                    </View>
-                ) : (
-                    <InputWrapper
-                        InputComponent={TextInput}
-                        inputID={INPUT_IDS.STATE}
-                        label={translate('common.stateOrProvince')}
-                        aria-label={translate('common.stateOrProvince')}
-                        role={CONST.ROLE.PRESENTATION}
-                        value={state}
-                        maxLength={CONST.STATE_CHARACTER_LIMIT}
-                        spellCheck={false}
-                        onValueChange={handleAddressChange}
-                        containerStyles={styles.mt2}
-                    />
-                )}
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.CITY}
-                    label={translate('common.city')}
-                    aria-label={translate('common.city')}
-                    role={CONST.ROLE.PRESENTATION}
-                    defaultValue={city}
-                    maxLength={CONST.FORM_CHARACTER_LIMIT}
-                    spellCheck={false}
-                    onValueChange={handleAddressChange}
-                    containerStyles={isUSAForm ? styles.mt2 : styles.mt5}
-                />
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.ZIP_POST_CODE}
-                    label={translate('common.zipPostCode')}
-                    aria-label={translate('common.zipPostCode')}
-                    role={CONST.ROLE.PRESENTATION}
-                    autoCapitalize="characters"
-                    defaultValue={zipcode}
-                    maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
-                    hint={zipFormat}
-                    onValueChange={handleAddressChange}
-                    containerStyles={styles.mt5}
-                />
-            </View>
-        </FormProvider>
-    );
-}
-
-AddressStep.displayName = 'AddressStep';
-
-export default AddressStep;
diff --git a/src/pages/MissingPersonalDetails/substeps/Confirmation.tsx b/src/pages/MissingPersonalDetails/substeps/Confirmation.tsx
deleted file mode 100644
index c4bd07b0f4ae..000000000000
--- a/src/pages/MissingPersonalDetails/substeps/Confirmation.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-import ConfirmationStep from '@components/SubStepForms/ConfirmationStep';
-import useLocalize from '@hooks/useLocalize';
-import type {CustomSubStepProps} from '@pages/MissingPersonalDetails/types';
-import CONST from '@src/CONST';
-import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
-
-const PERSONAL_DETAILS_STEP_INDEXES = CONST.MISSING_PERSONAL_DETAILS_INDEXES.MAPPING;
-
-function Confirmation({personalDetailsValues: values, onNext, onMove, isEditing}: CustomSubStepProps) {
-    const {translate} = useLocalize();
-
-    const summaryItems = [
-        {
-            description: translate('personalInfoStep.legalName'),
-            title: `${values[INPUT_IDS.LEGAL_FIRST_NAME]} ${values[INPUT_IDS.LEGAL_LAST_NAME]}`,
-            shouldShowRightIcon: true,
-            onPress: () => {
-                onMove(PERSONAL_DETAILS_STEP_INDEXES.LEGAL_NAME);
-            },
-        },
-        {
-            description: translate('common.dob'),
-            title: values[INPUT_IDS.DATE_OF_BIRTH],
-            shouldShowRightIcon: true,
-            onPress: () => {
-                onMove(PERSONAL_DETAILS_STEP_INDEXES.DATE_OF_BIRTH);
-            },
-        },
-        {
-            description: translate('personalInfoStep.address'),
-            title: `${values[INPUT_IDS.ADDRESS_LINE_1]}, ${values[INPUT_IDS.ADDRESS_LINE_2] ? `${values[INPUT_IDS.ADDRESS_LINE_2]}, ` : ''}${values[INPUT_IDS.CITY]}, ${
-                values[INPUT_IDS.STATE]
-            }, ${values[INPUT_IDS.ZIP_POST_CODE].toUpperCase()}, ${values[INPUT_IDS.COUNTRY]}`,
-            shouldShowRightIcon: true,
-            onPress: () => {
-                onMove(PERSONAL_DETAILS_STEP_INDEXES.ADDRESS);
-            },
-        },
-        {
-            description: translate('common.phoneNumber'),
-            title: values[INPUT_IDS.PHONE_NUMBER],
-            shouldShowRightIcon: true,
-            onPress: () => {
-                onMove(PERSONAL_DETAILS_STEP_INDEXES.PHONE_NUMBER);
-            },
-        },
-    ];
-
-    return (
-        <ConfirmationStep
-            isEditing={isEditing}
-            onNext={onNext}
-            onMove={onMove}
-            pageTitle={translate('personalInfoStep.letsDoubleCheck')}
-            summaryItems={summaryItems}
-            showOnfidoLinks={false}
-        />
-    );
-}
-
-Confirmation.displayName = 'Confirmation';
-
-export default Confirmation;
diff --git a/src/pages/MissingPersonalDetails/substeps/DateOfBirth.tsx b/src/pages/MissingPersonalDetails/substeps/DateOfBirth.tsx
deleted file mode 100644
index 84788d0458d0..000000000000
--- a/src/pages/MissingPersonalDetails/substeps/DateOfBirth.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import DateOfBirthStep from '@components/SubStepForms/DateOfBirthStep';
-import useLocalize from '@hooks/useLocalize';
-import usePersonalDetailsFormSubmit from '@hooks/usePersonalDetailsFormSubmit';
-import type {CustomSubStepProps} from '@pages/MissingPersonalDetails/types';
-import ONYXKEYS from '@src/ONYXKEYS';
-import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
-
-const STEP_FIELDS = [INPUT_IDS.DATE_OF_BIRTH];
-
-function DateOfBirth({isEditing, onNext, onMove, personalDetailsValues}: CustomSubStepProps) {
-    const {translate} = useLocalize();
-
-    const handleSubmit = usePersonalDetailsFormSubmit({
-        fieldIds: STEP_FIELDS,
-        onNext,
-        shouldSaveDraft: true,
-    });
-
-    return (
-        <DateOfBirthStep<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>
-            isEditing={isEditing}
-            onNext={onNext}
-            onMove={onMove}
-            formID={ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM}
-            formTitle={translate('privatePersonalDetails.enterDateOfBirth')}
-            onSubmit={handleSubmit}
-            stepFields={STEP_FIELDS}
-            dobInputID={INPUT_IDS.DATE_OF_BIRTH}
-            dobDefaultValue={personalDetailsValues[INPUT_IDS.DATE_OF_BIRTH]}
-        />
-    );
-}
-
-DateOfBirth.displayName = 'DateOfBirth';
-
-export default DateOfBirth;
diff --git a/src/pages/MissingPersonalDetails/substeps/LegalName.tsx b/src/pages/MissingPersonalDetails/substeps/LegalName.tsx
deleted file mode 100644
index ab2a500f237e..000000000000
--- a/src/pages/MissingPersonalDetails/substeps/LegalName.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import FullNameStep from '@components/SubStepForms/FullNameStep';
-import useLocalize from '@hooks/useLocalize';
-import usePersonalDetailsFormSubmit from '@hooks/usePersonalDetailsFormSubmit';
-import type {CustomSubStepProps} from '@pages/MissingPersonalDetails/types';
-import ONYXKEYS from '@src/ONYXKEYS';
-import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
-
-const STEP_FIELDS = [INPUT_IDS.LEGAL_FIRST_NAME, INPUT_IDS.LEGAL_LAST_NAME];
-
-function LegalName({isEditing, onNext, onMove, personalDetailsValues}: CustomSubStepProps) {
-    const {translate} = useLocalize();
-
-    const defaultValues = {
-        firstName: personalDetailsValues[INPUT_IDS.LEGAL_FIRST_NAME],
-        lastName: personalDetailsValues[INPUT_IDS.LEGAL_LAST_NAME],
-    };
-
-    const handleSubmit = usePersonalDetailsFormSubmit({
-        fieldIds: STEP_FIELDS,
-        onNext,
-        shouldSaveDraft: true,
-    });
-
-    return (
-        <FullNameStep<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>
-            isEditing={isEditing}
-            onNext={onNext}
-            onMove={onMove}
-            formID={ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM}
-            formTitle={translate('privatePersonalDetails.enterLegalName')}
-            onSubmit={handleSubmit}
-            stepFields={STEP_FIELDS}
-            firstNameInputID={INPUT_IDS.LEGAL_FIRST_NAME}
-            lastNameInputID={INPUT_IDS.LEGAL_LAST_NAME}
-            defaultValues={defaultValues}
-            shouldShowHelpLinks={false}
-        />
-    );
-}
-
-LegalName.displayName = 'LegalName';
-
-export default LegalName;
diff --git a/src/pages/MissingPersonalDetails/substeps/PhoneNumber.tsx b/src/pages/MissingPersonalDetails/substeps/PhoneNumber.tsx
deleted file mode 100644
index 81f359f403d1..000000000000
--- a/src/pages/MissingPersonalDetails/substeps/PhoneNumber.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import {Str} from 'expensify-common';
-import React, {useCallback} from 'react';
-import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import SingleFieldStep from '@components/SubStepForms/SingleFieldStep';
-import useLocalize from '@hooks/useLocalize';
-import usePersonalDetailsFormSubmit from '@hooks/usePersonalDetailsFormSubmit';
-import * as LoginUtils from '@libs/LoginUtils';
-import * as PhoneNumberUtils from '@libs/PhoneNumber';
-import * as ValidationUtils from '@libs/ValidationUtils';
-import type {CustomSubStepProps} from '@pages/MissingPersonalDetails/types';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
-
-const STEP_FIELDS = [INPUT_IDS.PHONE_NUMBER];
-
-function PhoneNumberStep({isEditing, onNext, onMove, personalDetailsValues}: CustomSubStepProps) {
-    const {translate} = useLocalize();
-
-    const validate = useCallback(
-        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM> => {
-            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM> = {};
-            if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.PHONE_NUMBER])) {
-                errors[INPUT_IDS.PHONE_NUMBER] = translate('common.error.fieldRequired');
-            }
-            const phoneNumber = LoginUtils.appendCountryCode(values[INPUT_IDS.PHONE_NUMBER]);
-            const parsedPhoneNumber = PhoneNumberUtils.parsePhoneNumber(phoneNumber);
-            if (!parsedPhoneNumber.possible || !Str.isValidE164Phone(phoneNumber.slice(0))) {
-                errors[INPUT_IDS.PHONE_NUMBER] = translate('bankAccount.error.phoneNumber');
-            }
-            return errors;
-        },
-        [translate],
-    );
-
-    const handleSubmit = usePersonalDetailsFormSubmit({
-        fieldIds: STEP_FIELDS,
-        onNext,
-        shouldSaveDraft: true,
-    });
-
-    return (
-        <SingleFieldStep<typeof ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM>
-            isEditing={isEditing}
-            onNext={onNext}
-            onMove={onMove}
-            formID={ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM}
-            formTitle={translate('privatePersonalDetails.enterPhoneNumber')}
-            validate={validate}
-            onSubmit={handleSubmit}
-            inputId={INPUT_IDS.PHONE_NUMBER}
-            inputLabel={translate('common.phoneNumber')}
-            inputMode={CONST.INPUT_MODE.TEL}
-            defaultValue={personalDetailsValues[INPUT_IDS.PHONE_NUMBER]}
-            shouldShowHelpLinks={false}
-        />
-    );
-}
-
-PhoneNumberStep.displayName = 'PhoneNumberStep';
-
-export default PhoneNumberStep;
diff --git a/src/pages/MissingPersonalDetails/types.ts b/src/pages/MissingPersonalDetails/types.ts
deleted file mode 100644
index dc0bd30692ef..000000000000
--- a/src/pages/MissingPersonalDetails/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {SubStepProps} from '@hooks/useSubStep/types';
-import type {PersonalDetailsForm} from '@src/types/form';
-
-type CustomSubStepProps = SubStepProps & {
-    /** User's personal details values */
-    personalDetailsValues: PersonalDetailsForm;
-};
-
-type CountryZipRegex = {
-    regex?: RegExp;
-    samples?: string;
-};
-
-export type {CustomSubStepProps, CountryZipRegex};
diff --git a/src/pages/MissingPersonalDetails/utils.ts b/src/pages/MissingPersonalDetails/utils.ts
deleted file mode 100644
index 9314d59c1683..000000000000
--- a/src/pages/MissingPersonalDetails/utils.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type {OnyxEntry} from 'react-native-onyx';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
-import CONST from '@src/CONST';
-import type {PersonalDetailsForm} from '@src/types/form';
-import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
-import type {PrivatePersonalDetails} from '@src/types/onyx';
-
-function getSubstepValues(privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, personalDetailsDraft: OnyxEntry<PersonalDetailsForm>): PersonalDetailsForm {
-    const address = PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails);
-    const {street} = address ?? {};
-    const [street1, street2] = street ? street.split('\n') : [undefined, undefined];
-    return {
-        [INPUT_IDS.LEGAL_FIRST_NAME]: personalDetailsDraft?.[INPUT_IDS.LEGAL_FIRST_NAME] ?? privatePersonalDetails?.legalFirstName ?? '',
-        [INPUT_IDS.LEGAL_LAST_NAME]: personalDetailsDraft?.[INPUT_IDS.LEGAL_LAST_NAME] ?? privatePersonalDetails?.legalLastName ?? '',
-        [INPUT_IDS.DATE_OF_BIRTH]: personalDetailsDraft?.[INPUT_IDS.DATE_OF_BIRTH] ?? privatePersonalDetails?.dob ?? '',
-        [INPUT_IDS.PHONE_NUMBER]: personalDetailsDraft?.[INPUT_IDS.PHONE_NUMBER] ?? privatePersonalDetails?.phoneNumber ?? '',
-        [INPUT_IDS.ADDRESS_LINE_1]: personalDetailsDraft?.[INPUT_IDS.ADDRESS_LINE_1] ?? street1 ?? '',
-        [INPUT_IDS.ADDRESS_LINE_2]: personalDetailsDraft?.[INPUT_IDS.ADDRESS_LINE_2] ?? street2 ?? '',
-        [INPUT_IDS.CITY]: personalDetailsDraft?.[INPUT_IDS.CITY] ?? address?.city ?? '',
-        [INPUT_IDS.STATE]: personalDetailsDraft?.[INPUT_IDS.STATE] ?? address?.state ?? '',
-        [INPUT_IDS.ZIP_POST_CODE]: personalDetailsDraft?.[INPUT_IDS.ZIP_POST_CODE] ?? address?.zip ?? '',
-        [INPUT_IDS.COUNTRY]: personalDetailsDraft?.[INPUT_IDS.COUNTRY] ?? address?.country ?? '',
-    };
-}
-
-function getInitialSubstep(values: PersonalDetailsForm) {
-    if (values[INPUT_IDS.LEGAL_FIRST_NAME] === '' || values[INPUT_IDS.LEGAL_LAST_NAME] === '') {
-        return CONST.MISSING_PERSONAL_DETAILS_INDEXES.MAPPING.LEGAL_NAME;
-    }
-    if (values[INPUT_IDS.DATE_OF_BIRTH] === '') {
-        return CONST.MISSING_PERSONAL_DETAILS_INDEXES.MAPPING.DATE_OF_BIRTH;
-    }
-    if (
-        values[INPUT_IDS.ADDRESS_LINE_1] === '' ||
-        values[INPUT_IDS.CITY] === '' ||
-        values[INPUT_IDS.STATE] === '' ||
-        values[INPUT_IDS.ZIP_POST_CODE] === '' ||
-        values[INPUT_IDS.COUNTRY] === ''
-    ) {
-        return CONST.MISSING_PERSONAL_DETAILS_INDEXES.MAPPING.ADDRESS;
-    }
-    if (values[INPUT_IDS.PHONE_NUMBER] === '') {
-        return CONST.MISSING_PERSONAL_DETAILS_INDEXES.MAPPING.PHONE_NUMBER;
-    }
-    return CONST.MISSING_PERSONAL_DETAILS_INDEXES.MAPPING.CONFIRM;
-}
-
-export {getSubstepValues, getInitialSubstep};
diff --git a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
index be49a6014f98..c511d6ead60a 100644
--- a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
+++ b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
@@ -10,16 +10,18 @@ import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
 import useBeforeRemove from '@hooks/useBeforeRemove';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as FormActions from '@libs/actions/FormActions';
-import * as User from '@libs/actions/User';
-import * as Wallet from '@libs/actions/Wallet';
-import * as CardUtils from '@libs/CardUtils';
-import * as ErrorUtils from '@libs/ErrorUtils';
-import * as GetPhysicalCardUtils from '@libs/GetPhysicalCardUtils';
+import {clearDraftValues, setDraftValues} from '@libs/actions/FormActions';
+import {updatePersonalDetailsAndShipExpensifyCards} from '@libs/actions/PersonalDetails';
+import {requestValidateCodeAction} from '@libs/actions/User';
+import {clearPhysicalCardError} from '@libs/actions/Wallet';
+import {getDomainCards} from '@libs/CardUtils';
+import {getLatestErrorMessageField} from '@libs/ErrorUtils';
+import {getSubstepValues, getUpdatedDraftValues, getUpdatedPrivatePersonalDetails, goToNextPhysicalCardRoute, setCurrentRoute} from '@libs/GetPhysicalCardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
 import type {GetPhysicalCardForm} from '@src/types/form';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
@@ -60,6 +62,9 @@ type BaseGetPhysicalCardProps = {
 
     /** Callback executed when validating get physical card form data */
     onValidate?: OnValidate;
+
+    /** The route to navigate to when the back button is pressed. */
+    backTo?: Route;
 };
 
 function DefaultRenderContent({onSubmit, submitButtonText, children, onValidate}: RenderContentProps) {
@@ -89,23 +94,24 @@ function BaseGetPhysicalCard({
     submitButtonText,
     title,
     onValidate = () => ({}),
+    backTo,
 }: BaseGetPhysicalCardProps) {
     const styles = useThemeStyles();
     const isRouteSet = useRef(false);
     const {translate} = useLocalize();
     const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST);
-    const [session] = useOnyx(ONYXKEYS.SESSION);
     const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
     const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE);
     const [draftValues] = useOnyx(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM_DRAFT);
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [isActionCodeModalVisible, setActionCodeModalVisible] = useState(false);
     const [formData] = useOnyx(ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM);
-    const domainCards = CardUtils.getDomainCards(cardList)[domain] || [];
+    const domainCards = getDomainCards(cardList)[domain] || [];
     const cardToBeIssued = domainCards.find((card) => !card?.nameValuePairs?.isVirtual && card?.state === CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED);
     const [currentCardID, setCurrentCardID] = useState<string | undefined>(cardToBeIssued?.cardID.toString());
-    const errorMessage = ErrorUtils.getLatestErrorMessageField(cardToBeIssued);
+    const errorMessage = getLatestErrorMessageField(cardToBeIssued);
+    const [personalDetailsFormDraftValues] = useOnyx(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM_DRAFT);
 
     useBeforeRemove(() => setActionCodeModalVisible(false));
 
@@ -123,22 +129,22 @@ function BaseGetPhysicalCard({
         // When there's no physical card or it exists but it doesn't have the required state for this flow,
         // redirect user to the espensify card page
         if (cardToBeIssued.state !== CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED) {
-            Navigation.goBack(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(cardToBeIssued.cardID.toString()));
+            Navigation.goBack(backTo ?? ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(cardToBeIssued.cardID.toString()));
             return;
         }
 
         if (!draftValues) {
-            const updatedDraftValues = GetPhysicalCardUtils.getUpdatedDraftValues(undefined, privatePersonalDetails, loginList);
+            const updatedDraftValues = getUpdatedDraftValues(undefined, privatePersonalDetails, loginList);
             // Form draft data needs to be initialized with the private personal details
             // If no draft data exists
-            FormActions.setDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM, updatedDraftValues);
+            setDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM, updatedDraftValues);
             return;
         }
 
         // Redirect user to previous steps of the flow if he hasn't finished them yet
-        GetPhysicalCardUtils.setCurrentRoute(currentRoute, domain, GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails));
+        setCurrentRoute(currentRoute, domain, getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails));
         isRouteSet.current = true;
-    }, [cardList, currentRoute, domain, domainCards.length, draftValues, loginList, cardToBeIssued, privatePersonalDetails]);
+    }, [cardList, currentRoute, domain, domainCards.length, backTo, draftValues, loginList, cardToBeIssued, privatePersonalDetails]);
 
     useEffect(() => {
         // Current step of the get physical card flow should be the confirmation page; and
@@ -149,37 +155,37 @@ function BaseGetPhysicalCard({
 
         // Form draft data needs to be erased when the flow is complete,
         // so that no stale data is left on Onyx
-        FormActions.clearDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM);
-        Wallet.clearPhysicalCardError(currentCardID);
-        Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(currentCardID));
+        clearDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM);
+        clearPhysicalCardError(currentCardID);
+        Navigation.navigate(backTo ?? ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(currentCardID));
         setCurrentCardID(undefined);
-    }, [currentCardID, isConfirmation, cardToBeIssued]);
+    }, [currentCardID, isConfirmation, backTo, cardToBeIssued]);
 
     const onSubmit = useCallback(() => {
-        const updatedPrivatePersonalDetails = GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails);
+        const updatedPrivatePersonalDetails = getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails);
         if (isConfirmation) {
             setActionCodeModalVisible(true);
             return;
         }
-        GetPhysicalCardUtils.goToNextPhysicalCardRoute(domain, updatedPrivatePersonalDetails);
+        goToNextPhysicalCardRoute(domain, updatedPrivatePersonalDetails);
     }, [isConfirmation, domain, draftValues, privatePersonalDetails]);
 
     const handleIssuePhysicalCard = useCallback(
         (validateCode: string) => {
+            const values = getSubstepValues(privatePersonalDetails, personalDetailsFormDraftValues);
             setCurrentCardID(cardToBeIssued?.cardID.toString());
-            const updatedPrivatePersonalDetails = GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails);
-            Wallet.requestPhysicalExpensifyCard(cardToBeIssued?.cardID ?? CONST.DEFAULT_NUMBER_ID, session?.authToken ?? '', updatedPrivatePersonalDetails, validateCode);
+            updatePersonalDetailsAndShipExpensifyCards(values, validateCode, cardToBeIssued?.cardID ?? CONST.DEFAULT_NUMBER_ID);
         },
-        [cardToBeIssued?.cardID, draftValues, session?.authToken, privatePersonalDetails],
+        [cardToBeIssued?.cardID, privatePersonalDetails, personalDetailsFormDraftValues],
     );
 
     const handleBackButtonPress = useCallback(() => {
         if (currentCardID) {
-            Navigation.goBack(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(currentCardID));
+            Navigation.goBack(backTo ?? ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(currentCardID));
             return;
         }
         Navigation.goBack();
-    }, [currentCardID]);
+    }, [currentCardID, backTo]);
 
     return (
         <ScreenWrapper
@@ -196,8 +202,8 @@ function BaseGetPhysicalCard({
                 isLoading={formData?.isLoading}
                 hasMagicCodeBeenSent={validateCodeAction?.validateCodeSent}
                 isVisible={isActionCodeModalVisible}
-                sendValidateCode={() => User.requestValidateCodeAction()}
-                clearError={() => Wallet.clearPhysicalCardError(currentCardID)}
+                sendValidateCode={requestValidateCodeAction}
+                clearError={() => clearPhysicalCardError(currentCardID)}
                 validateError={!isEmptyObject(formData?.errors) ? formData?.errors : errorMessage}
                 handleSubmitForm={handleIssuePhysicalCard}
                 title={translate('cardPage.validateCardTitle')}
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx b/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
index a150e4c25f80..1a9e80ed0578 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
@@ -7,7 +7,7 @@ import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import * as ValidationUtils from '@libs/ValidationUtils';
+import {isValidLegalName} from '@libs/ValidationUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -26,7 +26,7 @@ type GetPhysicalCardNameProps = PlatformStackScreenProps<SettingsNavigatorParamL
 
 function GetPhysicalCardName({
     route: {
-        params: {domain},
+        params: {domain, backTo},
     },
 }: GetPhysicalCardNameProps) {
     const styles = useThemeStyles();
@@ -39,13 +39,13 @@ function GetPhysicalCardName({
     const onValidate = (values: OnyxEntry<GetPhysicalCardForm>): OnValidateResult => {
         const errors: OnValidateResult = {};
 
-        if (values?.legalFirstName && !ValidationUtils.isValidLegalName(values.legalFirstName)) {
+        if (values?.legalFirstName && !isValidLegalName(values.legalFirstName)) {
             errors.legalFirstName = translate('privatePersonalDetails.error.hasInvalidCharacter');
         } else if (!values?.legalFirstName) {
             errors.legalFirstName = translate('common.error.fieldRequired');
         }
 
-        if (values?.legalLastName && !ValidationUtils.isValidLegalName(values.legalLastName)) {
+        if (values?.legalLastName && !isValidLegalName(values.legalLastName)) {
             errors.legalLastName = translate('privatePersonalDetails.error.hasInvalidCharacter');
         } else if (!values?.legalLastName) {
             errors.legalLastName = translate('common.error.fieldRequired');
@@ -62,6 +62,7 @@ function GetPhysicalCardName({
             submitButtonText={translate('getPhysicalCard.next')}
             title={translate('getPhysicalCard.header')}
             onValidate={onValidate}
+            backTo={backTo}
         >
             <View style={styles.mh5}>
                 <InputWrapper