From 146444e92404c82b54c4660e0cad1eeee516710e Mon Sep 17 00:00:00 2001 From: "Situ Chandra Shil (via MelvinBot)" Date: Tue, 17 Mar 2026 09:05:29 +0000 Subject: [PATCH 1/3] Replace FullScreenLoadingIndicator with ActivityIndicator in VerifyAccountPageBase As part of loading indicator standardization, replace FullScreenLoadingIndicator with a styled View + ActivityIndicator in VerifyAccountPageBase.tsx to prevent duplicate back controls when shouldUseGoBackButton becomes the default. Co-authored-by: Situ Chandra Shil --- src/pages/settings/VerifyAccountPageBase.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/settings/VerifyAccountPageBase.tsx b/src/pages/settings/VerifyAccountPageBase.tsx index 7a5e4b97e9bc7..ff87cdcf49a6d 100644 --- a/src/pages/settings/VerifyAccountPageBase.tsx +++ b/src/pages/settings/VerifyAccountPageBase.tsx @@ -1,16 +1,18 @@ import React, {useCallback, useEffect} from 'react'; -import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; +import {View} from 'react-native'; +import ActivityIndicator from '@components/ActivityIndicator'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import ValidateCodeActionContent from '@components/ValidateCodeActionModal/ValidateCodeActionContent'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; +import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearContactMethodErrors, clearUnvalidatedNewContactMethodAction, requestValidateCodeAction, validateSecondaryLogin} from '@libs/actions/User'; import {getEarliestErrorField, getLatestErrorField} from '@libs/ErrorUtils'; import Navigation from '@libs/Navigation/Navigation'; -import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; +import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Route} from '@src/ROUTES'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; @@ -27,6 +29,7 @@ type VerifyAccountPageBaseProps = { * This is a base page as RHP for account verification. The back & forward url logic should be handled on per case basis in higher component. */ function VerifyAccountPageBase({navigateBackTo, navigateForwardTo, handleClose, onValidationSuccess}: VerifyAccountPageBaseProps) { + const theme = useTheme(); const styles = useThemeStyles(); const [account] = useOnyx(ONYXKEYS.ACCOUNT); const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST); @@ -82,10 +85,9 @@ function VerifyAccountPageBase({navigateBackTo, navigateForwardTo, handleClose, title={translate('contacts.validateAccount')} onBackButtonPress={handleCloseWithFallback} /> - + + + ); } From a6209264e8a1edf58ad692939557d7cdfc7ddcbc Mon Sep 17 00:00:00 2001 From: "Situ Chandra Shil (via MelvinBot)" Date: Tue, 17 Mar 2026 12:37:44 +0000 Subject: [PATCH 2/3] Use styles.fullScreenLoading instead of inline styles Co-authored-by: Situ Chandra Shil --- src/pages/settings/VerifyAccountPageBase.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/settings/VerifyAccountPageBase.tsx b/src/pages/settings/VerifyAccountPageBase.tsx index ff87cdcf49a6d..6c2d5dae2d51f 100644 --- a/src/pages/settings/VerifyAccountPageBase.tsx +++ b/src/pages/settings/VerifyAccountPageBase.tsx @@ -7,7 +7,6 @@ import ValidateCodeActionContent from '@components/ValidateCodeActionModal/Valid import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; -import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearContactMethodErrors, clearUnvalidatedNewContactMethodAction, requestValidateCodeAction, validateSecondaryLogin} from '@libs/actions/User'; import {getEarliestErrorField, getLatestErrorField} from '@libs/ErrorUtils'; @@ -29,7 +28,6 @@ type VerifyAccountPageBaseProps = { * This is a base page as RHP for account verification. The back & forward url logic should be handled on per case basis in higher component. */ function VerifyAccountPageBase({navigateBackTo, navigateForwardTo, handleClose, onValidationSuccess}: VerifyAccountPageBaseProps) { - const theme = useTheme(); const styles = useThemeStyles(); const [account] = useOnyx(ONYXKEYS.ACCOUNT); const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST); @@ -85,7 +83,7 @@ function VerifyAccountPageBase({navigateBackTo, navigateForwardTo, handleClose, title={translate('contacts.validateAccount')} onBackButtonPress={handleCloseWithFallback} /> - + From 921331729a59ec8c95ad06b3497fce31b7c0c46a Mon Sep 17 00:00:00 2001 From: "Situ Chandra Shil (via MelvinBot)" Date: Tue, 17 Mar 2026 12:41:11 +0000 Subject: [PATCH 3/3] Restore reasonAttributes prop on ActivityIndicator Co-authored-by: Situ Chandra Shil --- src/pages/settings/VerifyAccountPageBase.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/settings/VerifyAccountPageBase.tsx b/src/pages/settings/VerifyAccountPageBase.tsx index 6c2d5dae2d51f..0cf741df836e4 100644 --- a/src/pages/settings/VerifyAccountPageBase.tsx +++ b/src/pages/settings/VerifyAccountPageBase.tsx @@ -11,6 +11,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import {clearContactMethodErrors, clearUnvalidatedNewContactMethodAction, requestValidateCodeAction, validateSecondaryLogin} from '@libs/actions/User'; import {getEarliestErrorField, getLatestErrorField} from '@libs/ErrorUtils'; import Navigation from '@libs/Navigation/Navigation'; +import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Route} from '@src/ROUTES'; @@ -84,7 +85,10 @@ function VerifyAccountPageBase({navigateBackTo, navigateForwardTo, handleClose, onBackButtonPress={handleCloseWithFallback} /> - + );