From cbf2fc19fbedbe323fa71234659e795eb4718377 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 17 Mar 2026 09:03:36 +0000
Subject: [PATCH 1/2] Replace FullscreenLoadingIndicator with ActivityIndicator
 in BaseLegalNamePage

Migrate BaseLegalNamePage to use a View + ActivityIndicator instead of
FullscreenLoadingIndicator, matching the established pattern from the
HelpContent migration. This prevents a future double-back-button when
shouldUseGoBackButton is enabled by default.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 .../Profile/PersonalDetails/BaseLegalNamePage.tsx    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx b/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx
index 6572cbbb822b4..880531d8ca576 100644
--- a/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx
@@ -5,7 +5,7 @@ import DelegateNoAccessWrapper from '@components/DelegateNoAccessWrapper';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import ActivityIndicator from '@components/ActivityIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -109,10 +109,12 @@ function BaseLegalNamePage<TFormID extends OnyxFormKey>({
                     onBackButtonPress={onBackButtonPress ?? (() => Navigation.goBack())}
                 />
                 {isLoadingApp ? (
-                    <FullscreenLoadingIndicator
-                        style={[styles.flex1, styles.pRelative]}
-                        reasonAttributes={{context: 'BaseLegalNamePage', isLoadingApp} satisfies SkeletonSpanReasonAttributes}
-                    />
+                    <View style={[styles.flex1, styles.fullScreenLoading]}>
+                        <ActivityIndicator
+                            size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                            reasonAttributes={{context: 'BaseLegalNamePage', isLoadingApp} satisfies SkeletonSpanReasonAttributes}
+                        />
+                    </View>
                 ) : (
                     <FormProvider
                         style={[styles.flexGrow1, styles.ph5]}

From c8405734e0dd3ba4e231ba4ff64320708f828f10 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 17 Mar 2026 09:07:49 +0000
Subject: [PATCH 2/2] Fix: sort ActivityIndicator import alphabetically for
 Prettier

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 .../settings/Profile/PersonalDetails/BaseLegalNamePage.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx b/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx
index 880531d8ca576..c5ac59d1cd3fc 100644
--- a/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx
@@ -1,11 +1,11 @@
 import type {ReactNode} from 'react';
 import React from 'react';
 import {View} from 'react-native';
+import ActivityIndicator from '@components/ActivityIndicator';
 import DelegateNoAccessWrapper from '@components/DelegateNoAccessWrapper';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import ActivityIndicator from '@components/ActivityIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 import ScreenWrapper from '@components/ScreenWrapper';