fix: mf-5369 solana icon (#10839)

* fix: mf-5369 solana icon * fix: improve checking assets empty status
DimensionDev · Sep 24, 2023 · 7dc39bc · 7dc39bc
1 parent 77c920f
commit 7dc39bc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/packages/shared/src/UI/components/AssetsManagement/AssetsProvider.tsx b/packages/shared/src/UI/components/AssetsManagement/AssetsProvider.tsx
@@ -108,7 +108,8 @@ export const AssetsProvider = memo<Props>(function AssetsProvider({ children, bl
     const { collections } = CollectionsContext.useContainer()
     const isEmpty = useMemo(() => {
         // Collections assets are lazy loading, can't judge if not all collections been load
-        if (Object.keys(assetsMap).length < collections.length) return false
+        if (Object.keys(assetsMap).length < collections.length || Object.values(assetsMap).some((x) => x.loading))
+            return false
         // Spam score of some collections might be OK, but NFTs of them might be treated as spam #MF-5091
         return getAssetsTotal(assetsMap) === 0
     }, [assetsMap, collections.length])

diff --git a/packages/shared/src/UI/components/AssetsManagement/CollectionList.tsx b/packages/shared/src/UI/components/AssetsManagement/CollectionList.tsx
@@ -58,6 +58,7 @@ const useStyles = makeStyles<CollectibleGridProps>()((theme, { columns = 4, gap
         emptyMain: {
             display: 'flex',
             flexDirection: 'column',
+            alignSelf: 'center',
         },
         grid: {
             width: '100%',

diff --git a/packages/shared/src/UI/components/NetworkIcon/index.tsx b/packages/shared/src/UI/components/NetworkIcon/index.tsx
@@ -25,7 +25,7 @@ export const NetworkIcon = memo(function NetworkIcon(props: NetworkIconProps) {
     if (iconUrl && !network?.isCustomized) return <ImageIcon size={20} {...rest} icon={iconUrl} />
     return (
         <ChainIcon
-            size={rest?.size || 20}
+            size={rest.size || 20}
             name={network?.name}
             color={rest.color || network?.color}
             className={rest.className}

diff --git a/packages/web3-shared/solana/src/constants/descriptors.ts b/packages/web3-shared/solana/src/constants/descriptors.ts
@@ -36,6 +36,7 @@ export const CHAIN_DESCRIPTORS: Array<ChainDescriptor<ChainId, SchemaType, Netwo
             url: 'https://explorer.solana.com/',
         },
         rpcUrl: '',
+        iconUrl: new URL('../assets/solana.png', import.meta.url).href,
         isCustomized: false,
     },
     {
@@ -66,6 +67,7 @@ export const CHAIN_DESCRIPTORS: Array<ChainDescriptor<ChainId, SchemaType, Netwo
             },
         },
         rpcUrl: '',
+        iconUrl: new URL('../assets/solana.png', import.meta.url).href,
         isCustomized: false,
     },
     {
@@ -96,6 +98,7 @@ export const CHAIN_DESCRIPTORS: Array<ChainDescriptor<ChainId, SchemaType, Netwo
             },
         },
         rpcUrl: '',
+        iconUrl: new URL('../assets/solana.png', import.meta.url).href,
         isCustomized: false,
     },
 ]