From b00e653e75fb77cde10300eb4148c22c38f64d99 Mon Sep 17 00:00:00 2001
From: nuanyang233 <528944303@qq.com>
Date: Sat, 25 Dec 2021 18:35:23 +0800
Subject: [PATCH 1/2] fix: add fallback when import erc721 in popup asset list

---
 .../popups/pages/Wallet/components/AssetsList/index.tsx     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx
index 3d40603050a0..0120473e661b 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx
@@ -8,6 +8,7 @@ import { makeStyles } from '@masknet/theme'
 import { ArrowRightIcon } from '@masknet/icons'
 import { TokenIcon, FormattedBalance } from '@masknet/shared'
 import { WalletContext } from '../../hooks/useWalletContext'
+import { isNaN } from 'lodash-unified'
 
 const useStyles = makeStyles()({
     list: {
@@ -57,6 +58,7 @@ export interface AssetsListUIProps {
 
 export const AssetsListUI = memo<AssetsListUIProps>(({ dataSource, onItemClick }) => {
     const { classes } = useStyles()
+    console.log(dataSource)
     return (
         <List dense className={classes.list}>
             {dataSource.map((asset, index) => {
@@ -73,8 +75,8 @@ export const AssetsListUI = memo<AssetsListUIProps>(({ dataSource, onItemClick }
                         <ListItemText className={classes.text}>
                             <FormattedBalance
                                 classes={{ symbol: classes.symbol, balance: classes.balance }}
-                                value={asset.balance}
-                                decimals={asset.token.decimals}
+                                value={isNaN(asset.balance) ? 0 : asset.balance}
+                                decimals={isNaN(asset.token.decimals) ? 0 : asset.token.decimals}
                                 symbol={asset.token.symbol}
                                 significant={6}
                                 formatter={formatBalance}

From 670d76a3fb6d76d35883a48b37096b1244f53bc8 Mon Sep 17 00:00:00 2001
From: Jack Works <jackworks@protonmail.com>
Date: Sun, 26 Dec 2021 00:27:04 +0800
Subject: [PATCH 2/2] Update
 packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx

---
 .../popups/pages/Wallet/components/AssetsList/index.tsx          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx
index 0120473e661b..75137948261d 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/components/AssetsList/index.tsx
@@ -58,7 +58,6 @@ export interface AssetsListUIProps {
 
 export const AssetsListUI = memo<AssetsListUIProps>(({ dataSource, onItemClick }) => {
     const { classes } = useStyles()
-    console.log(dataSource)
     return (
         <List dense className={classes.list}>
             {dataSource.map((asset, index) => {