fix: some release bug (#6151)

* fix: should show tip on other chain * fix: should not query profile table when linked profile size is 0
DimensionDev · Apr 26, 2022 · 3c3b4d8 · 3c3b4d8
1 parent c790d7e
commit 3c3b4d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx
@@ -152,7 +152,7 @@ export const FungibleTokenTableRow = memo<TokenTableRowProps>(({ asset, onSend,
                         </span>
                     </Tooltip>
                     <Tooltip
-                        disableHoverListener={isOnCurrentChain || asset.token.chainId !== ChainId.Conflux}
+                        disableHoverListener={isOnCurrentChain || asset.token.chainId === ChainId.Conflux}
                         disableTouchListener
                         title={<ChangeNetworkTip chainId={asset.token.chainId} />}
                         placement="top"

diff --git a/packages/mask/background/services/identity/persona/query.ts b/packages/mask/background/services/identity/persona/query.ts
@@ -42,9 +42,14 @@ export async function queryOwnedPersonaInformation(): Promise<PersonaInformation
                 linkedProfiles: map,
                 publicHexKey: persona.publicHexKey,
             })
-            const profiles = await queryProfilesDB({ identifiers: [...persona.linkedProfiles.keys()] }, t)
-            // we must not await toProfileInformation cause it is tx of another db.
-            extraPromises.push(toProfileInformation(profiles).then((x) => map.push(...x)))
+
+            if (!persona.linkedProfiles.size) {
+                extraPromises.push(toProfileInformation([]).then((x) => map.push(...x)))
+            } else {
+                const profiles = await queryProfilesDB({ identifiers: [...persona.linkedProfiles.keys()] }, t)
+                // we must not await toProfileInformation cause it is tx of another db.
+                extraPromises.push(toProfileInformation(profiles).then((x) => map.push(...x)))
+            }
         }
     })
     await Promise.all(extraPromises)