Merge pull request #926 from Magickbase/fix/some-pages-are-displayed-…

…abnormally-online
Magickbase · Mar 20, 2023 · 2fd7e63 · 2fd7e63
2 parents 73bac23 + f78b06f
commit 2fd7e63
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/components/AccountOverview/index.tsx b/components/AccountOverview/index.tsx
@@ -348,7 +348,7 @@ const AccountOverview: React.FC<AccountOverviewProps & { refetch: () => Promise<
 
   const getInfoBlock = account => {
     const { type } = account
-    const domain = account.bit_alias
+    const domain = account?.bit_alias
 
     const blockMap = {
       [`${GraphQLSchema.AccountType.MetaContract}`]: <MetaContract {...(account.script as MetaContract['script'])} />,

diff --git a/components/MultiTokenActivityList/index.tsx b/components/MultiTokenActivityList/index.tsx
@@ -125,8 +125,8 @@ const ActivityList: React.FC<
           {transfers?.metadata.total_count ? (
             transfers.entries.map(item => {
               const method = item.transaction.method_name || item.transaction.method_id
-              const fromBitAlias = item.from_account.bit_alias
-              const toBitAlias = item.to_account.bit_alias
+              const fromBitAlias = item.from_account?.bit_alias
+              const toBitAlias = item.to_account?.bit_alias
 
               const token_ids = Array.isArray(item.token_ids) ? item.token_ids : [item.token_id]
               const amounts = Array.isArray(item.amounts) ? item.amounts : [item.amount]

diff --git a/components/NFTActivityList/index.tsx b/components/NFTActivityList/index.tsx
@@ -118,8 +118,8 @@ const ActivityList: React.FC<
           {transfers?.metadata.total_count ? (
             transfers.entries.map(item => {
               const method = item.transaction.method_name || item.transaction.method_id
-              const fromBitAlias = item.from_account.bit_alias
-              const toBitAlias = item.to_account.bit_alias
+              const fromBitAlias = item.from_account?.bit_alias
+              const toBitAlias = item.to_account?.bit_alias
 
               return (
                 <tr key={item.transaction.eth_hash + item.log_index}>

diff --git a/components/TxList/index.tsx b/components/TxList/index.tsx
@@ -227,7 +227,7 @@ const TxList: React.FC<TxListProps & { maxCount?: string; pageSize?: number }> =
               if (item.polyjuice?.native_transfer_account) {
                 to = item.polyjuice.native_transfer_account.eth_address
                 toType = GraphQLSchema.AccountType.EthUser
-                to_alias = item.polyjuice.native_transfer_account.bit_alias
+                to_alias = item.polyjuice.native_transfer_account?.bit_alias
               }
 
               const method = item.method_name || item.method_id

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -465,7 +465,7 @@ const TxList: React.FC<{ list: HomeLists['transactions']['entries']; isLoading:
 
         if (tx.polyjuice?.native_transfer_account) {
           to = tx.polyjuice.native_transfer_account.eth_address
-          to_bit_alias = tx.polyjuice.native_transfer_account.bit_alias
+          to_bit_alias = tx.polyjuice.native_transfer_account?.bit_alias
           toType = GraphQLSchema.AccountType.EthUser
         }
         const isSpecialFrom = SPECIAL_ADDR_TYPES.includes(tx.from_account.type)