Skip to content

Use ActivityIndicator below the header while CollectDepositAccount loads #103420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Julesssss merged 2 commits into from
Oct 8, 2026
Merged

Use ActivityIndicator below the header while CollectDepositAccount loads #103420

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34d8ffd
Use ActivityIndicator below the header while CollectDepositAccount loads
MelvinBot Oct 8, 2026
1227211
Center the CollectDepositAccount loader with fullScreenLoading styles
MelvinBot Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/pages/settings/Wallet/CollectDepositAccount/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import ActivityIndicator from '@components/ActivityIndicator';
import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
import ScreenWrapper from '@components/ScreenWrapper';

Expand All @@ -7,6 +7,7 @@ import useLoadDepositAccountSetup from '@hooks/useLoadDepositAccountSetup';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useSubPage from '@hooks/useSubPage';
import useThemeStyles from '@hooks/useThemeStyles';

import {clearDraftValues} from '@libs/actions/FormActions';
import {getBankAccountFields, hasLocalBankAccountFields} from '@libs/BankAccountFields';
Expand All @@ -20,6 +21,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';

import {createIsInternationalCountrySelector} from '@selectors/Policy';
import React, {useEffect} from 'react';
import {View} from 'react-native';

import type CustomSubPageProps from './types';

Expand All @@ -40,6 +42,7 @@ const pages = [

function CollectDepositAccount() {
const {translate} = useLocalize();
const styles = useThemeStyles();
const isLoadingCountries = useLoadDepositAccountSetup();
const [draftValues] = useOnyx(ONYXKEYS.FORMS.COLLECT_DEPOSIT_ACCOUNT_FORM_DRAFT);

Expand Down Expand Up @@ -114,7 +117,9 @@ function CollectDepositAccount() {
onBackButtonPress={handleBackButtonPress}
/>
{isRedirecting || shouldReturnToCountryStep || (isLoadingCountries && pageIndex !== STEP_INDEXES.COUNTRY_SELECTOR) ? (
<FullScreenLoadingIndicator />
<View style={[styles.flex1, styles.fullScreenLoading]}>
<ActivityIndicator size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE} />
</View>
) : (
<CurrentPage
isEditing={isEditing}
Expand Down
Loading