Merge pull request #38849 from GandalfGwaihir/issue37904

[FIX]: Workspace - Categories load without loading spinner
Expensify · Mar 22, 2024 · 51e2cf2 · 51e2cf2
2 parents 2caf070 + adc26ae
commit 51e2cf2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -310,7 +310,7 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
                                 subtitle={translate('workspace.categories.emptyCategories.subtitle')}
                             />
                         )}
-                        {!shouldShowEmptyState && (
+                        {!shouldShowEmptyState && !isLoading && (
                             <SelectionList
                                 canSelectMultiple
                                 sections={[{data: categoryList, indexOffset: 0, isDisabled: false}]}

diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -301,7 +301,7 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
                                 subtitle={translate('workspace.tags.emptyTags.subtitle')}
                             />
                         )}
-                        {tagList.length > 0 && (
+                        {tagList.length > 0 && !isLoading && (
                             <SelectionList
                                 canSelectMultiple
                                 sections={[{data: tagList, indexOffset: 0, isDisabled: false}]}