Skip to content

Fix: All categories disappear instead of crossed out when deleted offline #43735

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
Beamanator merged 5 commits into from
Jul 1, 2024
Merged

Fix: All categories disappear instead of crossed out when deleted offline #43735

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cec23d2
Fix: All categories disappear instead of crossed out when deleted off…
rayane-d Jun 13, 2024
4a7c03e
Merge branch 'main' into Fix-All-categories-disappear-instead-of-cros…
rayane-d Jun 21, 2024
1110e86
make the condition consistent
rayane-d Jun 26, 2024
19d383d
Merge branch 'main' into Fix-All-categories-disappear-instead-of-cros…
rayane-d Jun 26, 2024
5c2d278
Merge branch 'Expensify:main' into Fix-All-categories-disappear-inste…
rayane-d Jun 26, 2024
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
8 changes: 4 additions & 4 deletions src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {

const isLoading = !isOffline && policyCategories === null;

const shouldShowEmptyState = !categoryList.some((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) && !isLoading;
const hasVisibleCategories = categoryList.some((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline);

const getHeaderText = () => (
<View style={[styles.ph5, styles.pb5, styles.pt3]}>
Expand Down Expand Up @@ -309,22 +309,22 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
danger
/>
{shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
{(!shouldUseNarrowLayout || shouldShowEmptyState || isLoading) && getHeaderText()}
{(!shouldUseNarrowLayout || categoryList.length === 0 || isLoading) && getHeaderText()}
{isLoading && (
<ActivityIndicator
size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
style={[styles.flex1]}
color={theme.spinner}
/>
)}
{shouldShowEmptyState && (
{!hasVisibleCategories && !isLoading && (
<WorkspaceEmptyStateSection
title={translate('workspace.categories.emptyCategories.title')}
icon={Illustrations.EmptyStateExpenses}
subtitle={translate('workspace.categories.emptyCategories.subtitle')}
/>
)}
{!shouldShowEmptyState && !isLoading && (
{hasVisibleCategories && !isLoading && (
<SelectionList
canSelectMultiple
sections={[{data: categoryList, isDisabled: false}]}
Expand Down