Skip to content

Replace ActivityIndicator with FullScreenLoadingIndicator in WorkspaceExpensifyCardPage #79269

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 3 commits into from
Jan 14, 2026
Merged

Replace ActivityIndicator with FullScreenLoadingIndicator in WorkspaceExpensifyCardPage #79269

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e935ea3
Replace ActivityIndicator with FullScreenLoadingIndicator
PiyushChandra17 Jan 9, 2026
1af5fb5
remove styles
PiyushChandra17 Jan 10, 2026
9f3621c
Fix eslint error
PiyushChandra17 Jan 10, 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
11 changes: 2 additions & 9 deletions src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React, {useCallback, useEffect} from 'react';
import ActivityIndicator from '@components/ActivityIndicator';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import useDefaultFundID from '@hooks/useDefaultFundID';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
import useThemeStyles from '@hooks/useThemeStyles';
import {updateSelectedExpensifyCardFeed} from '@libs/actions/Card';
import {filterInactiveCards} from '@libs/CardUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
Expand All @@ -20,7 +19,6 @@ type WorkspaceExpensifyCardPageProps = PlatformStackScreenProps<WorkspaceSplitNa

function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
const policyID = route.params.policyID;
const styles = useThemeStyles();
const defaultFundID = useDefaultFundID(policyID);

const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`, {canBeMissing: true});
Expand All @@ -42,12 +40,7 @@ function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {

const renderContent = () => {
if (!!isLoading && !paymentBankAccountID) {
return (
<ActivityIndicator
size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
style={styles.flex1}
/>
);
return <FullScreenLoadingIndicator shouldUseGoBackButton />;
Comment thread
Julesssss marked this conversation as resolved.
}
if (paymentBankAccountID) {
return (
Expand Down
Loading