From eae079ca67b5f90a35ec6e00841895db6ff40df0 Mon Sep 17 00:00:00 2001
From: pdelfan <pdelfan@gmail.com>
Date: Fri, 8 May 2026 16:27:50 -0700
Subject: [PATCH] feat: only suspend tab component on collection selector

---
 .../collectionSelector/CollectionSelector.tsx | 19 +++++++++------
 .../features/composer/components/Composer.tsx | 24 +++++++++----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/webapp/features/collections/components/collectionSelector/CollectionSelector.tsx b/src/webapp/features/collections/components/collectionSelector/CollectionSelector.tsx
index 009a1e11..ee3c8518 100644
--- a/src/webapp/features/collections/components/collectionSelector/CollectionSelector.tsx
+++ b/src/webapp/features/collections/components/collectionSelector/CollectionSelector.tsx
@@ -58,19 +58,24 @@ export default function CollectionSelector(props: Props) {
         </Tabs.List>
 
         <Tabs.Panel value="myCollections">
-          <CollectionSelectorMyCollections
-            selectedCollections={props.selectedCollections}
-            onSelectedCollectionsChange={props.onSelectedCollectionsChange}
-          />
+          <Suspense
+            fallback={
+              <Stack align="center" gap="xs">
+                <Loader color="gray" />
+              </Stack>
+            }
+          >
+            <CollectionSelectorMyCollections
+              selectedCollections={props.selectedCollections}
+              onSelectedCollectionsChange={props.onSelectedCollectionsChange}
+            />
+          </Suspense>
         </Tabs.Panel>
 
         <Tabs.Panel value="openCollections">
           <Suspense
             fallback={
               <Stack align="center" gap="xs">
-                <Text fw={500} c="gray">
-                  Loading open collections...
-                </Text>
                 <Loader color="gray" />
               </Stack>
             }
diff --git a/src/webapp/features/composer/components/Composer.tsx b/src/webapp/features/composer/components/Composer.tsx
index 8392f29a..9f9f5bcd 100644
--- a/src/webapp/features/composer/components/Composer.tsx
+++ b/src/webapp/features/composer/components/Composer.tsx
@@ -514,19 +514,17 @@ export default function Composer(props: Props) {
           </Drawer.Title>
         </Drawer.Header>
         <Container size={'xs'} p={0}>
-          <Suspense fallback={<CollectionSelectorSkeleton />}>
-            <CollectionSelector
-              isOpen={collectionSelectorOpened}
-              onCancel={() => {
-                setSelectedCollections(initialCollections);
-                toggleCollectionSelector();
-              }}
-              onClose={toggleCollectionSelector}
-              onSave={toggleCollectionSelector}
-              selectedCollections={selectedCollections}
-              onSelectedCollectionsChange={setSelectedCollections}
-            />
-          </Suspense>
+          <CollectionSelector
+            isOpen={collectionSelectorOpened}
+            onCancel={() => {
+              setSelectedCollections(initialCollections);
+              toggleCollectionSelector();
+            }}
+            onClose={toggleCollectionSelector}
+            onSave={toggleCollectionSelector}
+            selectedCollections={selectedCollections}
+            onSelectedCollectionsChange={setSelectedCollections}
+          />
         </Container>
       </Drawer>
     </>
-- 
2.51.2