add tokens length check

gallery-so · Apr 26, 2024 · 51ff36e · 51ff36e
1 parent 29e077d
commit 51ff36e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/apps/mobile/src/screens/NftSelectorScreen/NftSelectorPickerGrid.tsx b/apps/mobile/src/screens/NftSelectorScreen/NftSelectorPickerGrid.tsx
@@ -38,6 +38,8 @@ import { contexts } from '~/shared/analytics/constants';
 import { removeNullValues } from '~/shared/relay/removeNullValues';
 import { doesUserOwnWalletFromChainFamily } from '~/shared/utils/doesUserOwnWalletFromChainFamily';
 
+import { NftSelectorLoadingSkeleton } from './NftSelectorLoadingSkeleton';
+
 type NftSelectorPickerGridProps = {
   style?: ViewProps['style'];
   searchCriteria: {
@@ -361,6 +363,10 @@ export function NftSelectorPickerGrid({
     );
   }
 
+  if (isRefreshing && !rows.length) {
+    return <NftSelectorLoadingSkeleton />;
+  }
+
   if (!rows.length) {
     return (
       <View className="flex flex-col flex-1 pt-16" style={style}>

diff --git a/apps/web/src/components/NftSelector/NftSelectorView.tsx b/apps/web/src/components/NftSelector/NftSelectorView.tsx
@@ -225,7 +225,7 @@ export function NftSelectorView({
     [columnCount, onSelectContract, onSelectToken, rows, selectedContractAddress]
   );
 
-  if (isLocked) {
+  if (isLocked && !rows.length) {
     return <NftSelectorLoadingView />;
   }