fix: error shows connect wallet (#8782)

DimensionDev · Feb 23, 2023 · 55e0fd0 · 55e0fd0
1 parent 87d75d3
commit 55e0fd0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/plugins/Avatar/src/contexts/AvatarManagement/index.tsx b/packages/plugins/Avatar/src/contexts/AvatarManagement/index.tsx
@@ -69,12 +69,13 @@ export const AvatarManagementProvider: FC<Props> = memo(({ children, socialIdent
     const [proofs, setProofs] = useState<BindingProof[]>(EMPTY_LIST)
     const [tokenInfo, setTokenInfo] = useState<Web3Helper.NonFungibleTokenAll>()
     const { account } = useChainContext()
-    const [selectedAccount, setSelectedAccount] = useState(nextIDWallets[0]?.identity || account)
+    const [selectedAccount, setSelectedAccount] = useState('')
     const [selectedTokenInfo, setSelectedTokenInfo] = useState<SelectTokenInfo>()
 
     const contextValue: AvatarManagementContextOptions = useMemo(() => {
         setProof(first(nextIDPersonas))
         setProofs(nextIDWallets)
+        setSelectedAccount(first(nextIDWallets)?.identity || account || '')
         return {
             pfpType: PFP_TYPE.PFP,
             targetAccount: selectedAccount,
@@ -88,7 +89,7 @@ export const AvatarManagementProvider: FC<Props> = memo(({ children, socialIdent
             selectedTokenInfo,
             setSelectedTokenInfo,
         }
-    }, [selectedAccount, proof, proofs, tokenInfo, selectedTokenInfo, nextIDPersonas, nextIDWallets])
+    }, [selectedAccount, proof, proofs, tokenInfo, selectedTokenInfo, nextIDPersonas, nextIDWallets, account])
 
     return <AvatarManagementContext.Provider value={contextValue}>{children}</AvatarManagementContext.Provider>
 })

diff --git a/packages/shared/src/UI/components/ChainBoundary/index.tsx b/packages/shared/src/UI/components/ChainBoundary/index.tsx
@@ -87,8 +87,12 @@ export function ChainBoundaryWithoutContext<T extends NetworkPluginID>(props: Ch
     const expectedPlugin = useActivatedPlugin(expectedPluginID, 'any')
 
     const { Others: actualOthers } = useWeb3State(actualPluginID)
-    const { account, chainId: actualChainId, providerType: actualProviderType } = useChainContext()
 
+    const {
+        account,
+        chainId: actualChainId,
+        providerType: actualProviderType,
+    } = useChainContext({ account: expectedAccount })
     const actualProviderDescriptor = useProviderDescriptor(actualPluginID)
     const actualChainName = actualOthers?.chainResolver.chainName(actualChainId)