fix: bugfix for avatar setting (#10597)

DimensionDev · Aug 23, 2023 · 174a6cf · 174a6cf
1 parent d3a4515
commit 174a6cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/mask/src/extension/popups/components/NFTAvatarPicker/index.tsx b/packages/mask/src/extension/popups/components/NFTAvatarPicker/index.tsx
@@ -53,7 +53,14 @@ export const NFTAvatarPicker = memo<NFTAvatarPickerProps>(function NFTAvatarPick
 
     const { account, chainId, setAccount, setChainId } = useChainContext()
 
-    const { value: assets, done, next, error, retry, loading } = useNonFungibleAssets(pluginID)
+    const {
+        value: assets,
+        done,
+        next,
+        error,
+        retry,
+        loading,
+    } = useNonFungibleAssets(pluginID, undefined, { chainId, account })
 
     const tokens = useMemo(() => {
         return uniqBy(assets, (x) => x.contract?.address.toLowerCase() + x.tokenId).filter((x) => x.chainId === chainId)

diff --git a/packages/mask/src/extension/popups/pages/Personas/index.tsx b/packages/mask/src/extension/popups/pages/Personas/index.tsx
@@ -27,7 +27,7 @@ const Persona = memo(() => {
         return CrossIsolationMessages.events.popupWalletConnectEvent.on(({ open, uri }) => {
             if (!open || location.href.includes(PopupRoutes.WalletConnect)) return
             navigate(PopupRoutes.WalletConnect, {
-                replace: true,
+                replace: location.hash.includes('/modal/select-provider'),
                 state: {
                     uri,
                 },