Skip to content

Replace FullscreenLoadingIndicator with ActivityIndicator in WorkspacePageWithSections #88749

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

Draft
MelvinBot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Replace FullscreenLoadingIndicator with ActivityIndicator in WorkspacePageWithSections #88749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions src/pages/workspace/WorkspacePageWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import type {ReactNode} from 'react';
import React, {useEffect, useMemo, useRef} from 'react';
import {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import ActivityIndicator from '@components/ActivityIndicator';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import type HeaderWithBackButtonProps from '@components/HeaderWithBackButton/types';
import ScreenWrapper from '@components/ScreenWrapper';
Expand Down Expand Up @@ -228,16 +228,18 @@ function WorkspacePageWithSections({
{headerContent}
</HeaderWithBackButton>
{!isOffline && (isLoading || firstRender.current) && shouldShowLoading && isFocused ? (
<FullScreenLoadingIndicator
style={[styles.flex1, styles.pRelative]}
reasonAttributes={
{
context: 'WorkspacePageWithSections',
isLoading,
isFirstRender: firstRender.current,
} satisfies SkeletonSpanReasonAttributes
}
/>
<View style={[styles.flex1, styles.fullScreenLoading]}>
<ActivityIndicator
size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
reasonAttributes={
{
context: 'WorkspacePageWithSections',
isLoading,
isFirstRender: firstRender.current,
} satisfies SkeletonSpanReasonAttributes
}
/>
</View>
) : (
<>
{shouldUseScrollView ? (
Expand Down
Loading