Add missing setProvider call (#3048)

reown-com · Oct 9, 2024 · 2751feb · 2751feb
1 parent e95ecde
commit 2751feb
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 48 deletions.
diff --git a/.changeset/fair-wombats-move.md b/.changeset/fair-wombats-move.md
@@ -0,0 +1,23 @@
+---
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-utils': patch
+'@apps/laboratory': patch
+'@reown/appkit': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-core': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+---
+
+fix: add missing setProvider and setProviderId call for connector other than walletconnect on syncAccount
diff --git a/apps/laboratory/src/components/Wagmi/WagmiRequestPermissionsAsyncTest.tsx b/apps/laboratory/src/components/Wagmi/WagmiRequestPermissionsAsyncTest.tsx
@@ -14,10 +14,10 @@ import {
 } from '@reown/appkit-experimental/smart-session'
 
 export function WagmiRequestPermissionsAsyncTest() {
-  const { address, isConnected } = useAppKitAccount()
+  const { address, isConnected, status } = useAppKitAccount()
 
   const { chainId } = useAppKitNetwork()
-  const isSupported = useMemo(() => isSmartSessionSupported(), [address])
+  const isSupported = useMemo(() => isSmartSessionSupported(), [status])
 
   if (!isConnected || !address || !chainId) {
     return (

diff --git a/apps/laboratory/src/components/Wagmi/WagmiRequestPermissionsSyncTest.tsx b/apps/laboratory/src/components/Wagmi/WagmiRequestPermissionsSyncTest.tsx
@@ -15,9 +15,9 @@ import {
 } from '@reown/appkit-experimental/smart-session'
 
 export function WagmiRequestPermissionsSyncTest() {
-  const { address, isConnected } = useAppKitAccount()
+  const { address, isConnected, status } = useAppKitAccount()
   const { chainId } = useAppKitNetwork()
-  const isSupported = useMemo(() => isSmartSessionSupported(), [address])
+  const isSupported = useMemo(() => isSmartSessionSupported(), [status])
 
   if (!isConnected || !address || !chainId) {
     return (

diff --git a/packages/adapters/ethers/src/client.ts b/packages/adapters/ethers/src/client.ts
@@ -20,7 +20,6 @@ import {
   EthersHelpersUtil,
   type Provider,
   type ProviderType,
-  type ProviderId,
   type Address
 } from '@reown/appkit-utils/ethers'
 import type { AppKit } from '@reown/appkit'
@@ -45,7 +44,7 @@ import { WcConstantsUtil } from '@reown/appkit'
 import { EthersMethods } from './utils/EthersMethods.js'
 import { formatEther, InfuraProvider, JsonRpcProvider } from 'ethers'
 import type { PublicStateControllerState } from '@reown/appkit-core'
-import { ProviderUtil } from '@reown/appkit/store'
+import { ProviderUtil, type ProviderIdType } from '@reown/appkit/store'
 import { CoinbaseWalletSDK, type ProviderInterface } from '@coinbase/wallet-sdk'
 import { W3mFrameProviderSingleton } from '@reown/appkit/auth-provider'
 
@@ -301,7 +300,7 @@ export class EthersAdapter {
           }
           await this.setProvider(
             selectedProvider,
-            selectedConnector.providerType as ProviderId,
+            selectedConnector.providerType as ProviderIdType,
             info?.name
           )
         } catch (error) {
@@ -613,12 +612,12 @@ export class EthersAdapter {
     const activeConfig = providerConfigs[walletId as unknown as keyof typeof providerConfigs]
 
     if (activeConfig?.provider) {
-      this.setProvider(activeConfig.provider, walletId as ProviderId)
-      this.setupProviderListeners(activeConfig.provider, walletId as ProviderId)
+      this.setProvider(activeConfig.provider, walletId as ProviderIdType)
+      this.setupProviderListeners(activeConfig.provider, walletId as ProviderIdType)
     }
   }
 
-  private async setProvider(provider: Provider, providerId: ProviderId, name?: string) {
+  private async setProvider(provider: Provider, providerId: ProviderIdType, name?: string) {
     if (providerId === 'w3mAuth') {
       this.setAuthProvider()
     } else {
@@ -685,7 +684,7 @@ export class EthersAdapter {
         )
         this.appKit?.setSmartAccountDeployed(Boolean(smartAccountDeployed), this.chainNamespace)
         ProviderUtil.setProvider<Provider>('eip155', this.authProvider as unknown as Provider)
-        ProviderUtil.setProviderId('eip155', ConstantsUtil.AUTH_CONNECTOR_ID as ProviderId)
+        ProviderUtil.setProviderId('eip155', ConstantsUtil.AUTH_CONNECTOR_ID as ProviderIdType)
         this.setupProviderListeners(this.authProvider as unknown as Provider, 'w3mAuth')
         this.watchModal()
       }
@@ -703,7 +702,7 @@ export class EthersAdapter {
     }
   }
 
-  private setupProviderListeners(provider: Provider, providerId: ProviderId) {
+  private setupProviderListeners(provider: Provider, providerId: ProviderIdType) {
     const disconnectHandler = () => {
       SafeLocalStorage.removeItem(SafeLocalStorageKeys.WALLET_ID)
       this.removeListeners(provider)

diff --git a/packages/adapters/ethers/src/tests/client.test.ts b/packages/adapters/ethers/src/tests/client.test.ts
@@ -5,7 +5,7 @@ import { mockOptions } from './mocks/Options'
 import { mockCreateEthersConfig } from './mocks/EthersConfig'
 import mockAppKit from './mocks/AppKit'
 import { mockAuthConnector } from './mocks/AuthConnector'
-import { EthersHelpersUtil, type ProviderId, type ProviderType } from '@reown/appkit-utils/ethers'
+import { EthersHelpersUtil, type ProviderType } from '@reown/appkit-utils/ethers'
 import { CaipNetworksUtil, ConstantsUtil } from '@reown/appkit-utils'
 import {
   arbitrum as AppkitArbitrum,
@@ -14,7 +14,7 @@ import {
   optimism as AppkitOptimism,
   bsc as AppkitBsc
 } from '@reown/appkit/networks'
-import { ProviderUtil } from '@reown/appkit/store'
+import { ProviderUtil, type ProviderIdType } from '@reown/appkit/store'
 import { SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common'
 import { type BlockchainApiLookupEnsName } from '@reown/appkit'
 import { InfuraProvider, JsonRpcProvider } from 'ethers'
@@ -813,7 +813,7 @@ describe('EthersAdapter', () => {
       vi.spyOn(ProviderUtil.state, 'providerIds', 'get').mockReturnValue({
         eip155: ConstantsUtil.EIP6963_CONNECTOR_ID,
         solana: undefined
-      } as Record<ChainNamespace, ProviderId | undefined>)
+      } as Record<ChainNamespace, ProviderIdType | undefined>)
       client['EIP6963Providers'] = [
         {
           info: { name: 'MetaMask', icon: 'icon-url', uuid: 'test-uuid', rdns: 'com.metamask' },
@@ -833,7 +833,7 @@ describe('EthersAdapter', () => {
       vi.spyOn(ProviderUtil.state, 'providerIds', 'get').mockReturnValue({
         eip155: ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID,
         solana: undefined
-      } as Record<ChainNamespace, ProviderId | undefined>)
+      } as Record<ChainNamespace, ProviderIdType | undefined>)
       const mockProvider = {
         session: {
           peer: {
@@ -862,7 +862,7 @@ describe('EthersAdapter', () => {
       vi.spyOn(ProviderUtil.state, 'providerIds', 'get').mockReturnValue({
         eip155: ConstantsUtil.COINBASE_SDK_CONNECTOR_ID,
         solana: undefined
-      } as Record<ChainNamespace, ProviderId | undefined>)
+      } as Record<ChainNamespace, ProviderIdType | undefined>)
       vi.spyOn(mockAppKit, 'getConnectors').mockReturnValue([
         {
           id: ConstantsUtil.COINBASE_SDK_CONNECTOR_ID,

diff --git a/packages/adapters/ethers5/src/client.ts b/packages/adapters/ethers5/src/client.ts
@@ -20,7 +20,6 @@ import {
   EthersHelpersUtil,
   type Provider,
   type ProviderType,
-  type ProviderId,
   type Address
 } from '@reown/appkit-utils/ethers'
 import type { AppKit } from '@reown/appkit'
@@ -45,7 +44,7 @@ import { WcConstantsUtil } from '@reown/appkit'
 import { Ethers5Methods } from './utils/Ethers5Methods.js'
 import { ethers } from 'ethers'
 import type { PublicStateControllerState } from '@reown/appkit-core'
-import { ProviderUtil } from '@reown/appkit/store'
+import { ProviderUtil, type ProviderIdType } from '@reown/appkit/store'
 import { CoinbaseWalletSDK, type ProviderInterface } from '@coinbase/wallet-sdk'
 import { W3mFrameProviderSingleton } from '@reown/appkit/auth-provider'
 
@@ -301,7 +300,7 @@ export class Ethers5Adapter {
           }
           await this.setProvider(
             selectedProvider,
-            selectedConnector.providerType as ProviderId,
+            selectedConnector.providerType as ProviderIdType,
             info?.name
           )
         } catch (error) {
@@ -589,12 +588,12 @@ export class Ethers5Adapter {
     const activeConfig = providerConfigs[walletId as unknown as keyof typeof providerConfigs]
 
     if (activeConfig?.provider) {
-      this.setProvider(activeConfig.provider, walletId as ProviderId)
-      this.setupProviderListeners(activeConfig.provider, walletId as ProviderId)
+      this.setProvider(activeConfig.provider, walletId as ProviderIdType)
+      this.setupProviderListeners(activeConfig.provider, walletId as ProviderIdType)
     }
   }
 
-  private async setProvider(provider: Provider, providerId: ProviderId, name?: string) {
+  private async setProvider(provider: Provider, providerId: ProviderIdType, name?: string) {
     if (providerId === 'w3mAuth') {
       this.setAuthProvider()
     } else {
@@ -661,7 +660,7 @@ export class Ethers5Adapter {
         )
         this.appKit?.setSmartAccountDeployed(Boolean(smartAccountDeployed), this.chainNamespace)
         ProviderUtil.setProvider<Provider>('eip155', this.authProvider as unknown as Provider)
-        ProviderUtil.setProviderId('eip155', ConstantsUtil.AUTH_CONNECTOR_ID as ProviderId)
+        ProviderUtil.setProviderId('eip155', ConstantsUtil.AUTH_CONNECTOR_ID as ProviderIdType)
         this.setupProviderListeners(this.authProvider as unknown as Provider, 'w3mAuth')
         this.watchModal()
       }
@@ -679,7 +678,7 @@ export class Ethers5Adapter {
     }
   }
 
-  private setupProviderListeners(provider: Provider, providerId: ProviderId) {
+  private setupProviderListeners(provider: Provider, providerId: ProviderIdType) {
     const disconnectHandler = () => {
       SafeLocalStorage.removeItem(SafeLocalStorageKeys.WALLET_ID)
       this.removeListeners(provider)

diff --git a/packages/adapters/ethers5/src/tests/client.test.ts b/packages/adapters/ethers5/src/tests/client.test.ts
@@ -5,7 +5,7 @@ import { mockOptions } from './mocks/Options'
 import { mockCreateEthersConfig } from './mocks/EthersConfig'
 import mockAppKit from './mocks/AppKit'
 import { mockAuthConnector } from './mocks/AuthConnector'
-import { EthersHelpersUtil, type ProviderId, type ProviderType } from '@reown/appkit-utils/ethers'
+import { EthersHelpersUtil, type ProviderType } from '@reown/appkit-utils/ethers'
 import { CaipNetworksUtil, ConstantsUtil } from '@reown/appkit-utils'
 import {
   arbitrum as AppkitArbitrum,
@@ -14,7 +14,7 @@ import {
   optimism as AppkitOptimism,
   bsc as AppkitBsc
 } from '@reown/appkit/networks'
-import { ProviderUtil } from '@reown/appkit/store'
+import { ProviderUtil, type ProviderIdType } from '@reown/appkit/store'
 import { SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common'
 import { type BlockchainApiLookupEnsName } from '@reown/appkit'
 import { ethers } from 'ethers'
@@ -824,7 +824,7 @@ describe('EthersAdapter', () => {
       vi.spyOn(ProviderUtil.state, 'providerIds', 'get').mockReturnValue({
         eip155: ConstantsUtil.EIP6963_CONNECTOR_ID,
         solana: undefined
-      } as Record<ChainNamespace, ProviderId | undefined>)
+      } as Record<ChainNamespace, ProviderIdType | undefined>)
       client['EIP6963Providers'] = [
         {
           info: { name: 'MetaMask', icon: 'icon-url', uuid: 'test-uuid', rdns: 'com.metamask' },
@@ -844,7 +844,7 @@ describe('EthersAdapter', () => {
       vi.spyOn(ProviderUtil.state, 'providerIds', 'get').mockReturnValue({
         eip155: ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID,
         solana: undefined
-      } as Record<ChainNamespace, ProviderId | undefined>)
+      } as Record<ChainNamespace, ProviderIdType | undefined>)
       const mockProvider = {
         session: {
           peer: {
@@ -873,7 +873,7 @@ describe('EthersAdapter', () => {
       vi.spyOn(ProviderUtil.state, 'providerIds', 'get').mockReturnValue({
         eip155: ConstantsUtil.COINBASE_SDK_CONNECTOR_ID,
         solana: undefined
-      } as Record<ChainNamespace, ProviderId | undefined>)
+      } as Record<ChainNamespace, ProviderIdType | undefined>)
       vi.spyOn(mockAppKit, 'getConnectors').mockReturnValue([
         {
           id: ConstantsUtil.COINBASE_SDK_CONNECTOR_ID,

diff --git a/packages/adapters/wagmi/src/client.ts b/packages/adapters/wagmi/src/client.ts
@@ -82,7 +82,7 @@ import type { AppKit } from '@reown/appkit'
 import { walletConnect } from './connectors/UniversalConnector.js'
 import { coinbaseWallet } from '@wagmi/connectors'
 import { authConnector } from './connectors/AuthConnector.js'
-import { ProviderUtil } from '@reown/appkit/store'
+import { ProviderUtil, type ProviderIdType } from '@reown/appkit/store'
 
 // -- Types ---------------------------------------------------------------------
 export interface AdapterOptions<C extends Config>
@@ -682,7 +682,7 @@ export class WagmiAdapter implements ChainAdapter {
 
     if (this.wagmiConfig) {
       if (connector) {
-        if (connector && connector.name === 'WalletConnect' && connector.getProvider && address) {
+        if (connector.name === 'WalletConnect' && connector.getProvider && address) {
           const activeCaipNetwork = this.appKit?.getCaipNetwork()
           const currentChainId = chainId || (activeCaipNetwork?.id as number | undefined)
           const provider = (await connector.getProvider()) as UniversalProvider
@@ -715,19 +715,18 @@ export class WagmiAdapter implements ChainAdapter {
             ])
           }
         } else if (status === 'connected' && address && chainId) {
+          ProviderUtil.setProvider(this.chainNamespace, await connector.getProvider())
+          ProviderUtil.setProviderId(this.chainNamespace, connector.id as ProviderIdType)
           const caipAddress = `eip155:${chainId}:${address}` as CaipAddress
           this.syncNetwork(address, chainId, true)
-          this.appKit?.setCaipAddress(caipAddress, this.chainNamespace)
           await Promise.all([
             this.syncProfile(address, chainId),
             this.syncBalance(address, chainId),
             this.syncConnectedWalletInfo(connector),
             this.appKit?.setApprovedCaipNetworksData(this.chainNamespace)
           ])
-          if (connector) {
-            this.syncConnectedWalletInfo(connector)
-          }
-
+          this.appKit?.setCaipAddress(caipAddress, this.chainNamespace)
+          this.appKit?.setStatus('connected', this.chainNamespace)
           // Set by authConnector.onIsConnectedHandler as we need the account type
           if (!isAuthConnector && addresses?.length) {
             this.appKit?.setAllAccounts(

diff --git a/packages/adapters/wagmi/src/tests/client.test.ts b/packages/adapters/wagmi/src/tests/client.test.ts
@@ -147,7 +147,11 @@ describe('Wagmi Client', () => {
     it('should sync account correctly when connected', async () => {
       const mockAddress = '0x1234567890123456789012345678901234567890'
       const mockChainId = 1
-      const mockConnector = { id: 'mockConnector', name: 'Mock Connector' }
+      const mockConnector = {
+        id: 'mockConnector',
+        name: 'Mock Connector',
+        getProvider: vi.fn().mockResolvedValue({})
+      }
 
       const setCaipAddressSpy = vi.spyOn(mockAppKit, 'setCaipAddress')
 

diff --git a/packages/appkit-utils/src/ethers/EthersTypesUtil.ts b/packages/appkit-utils/src/ethers/EthersTypesUtil.ts
@@ -65,11 +65,3 @@ export type Chain = {
   chain: string
   imageId: string | undefined
 }
-
-export type ProviderId =
-  | 'walletConnect'
-  | 'injected'
-  | 'coinbaseWallet'
-  | 'eip6963'
-  | 'w3mAuth'
-  | 'coinbaseWalletSDK'
diff --git a/packages/appkit/src/store/ProviderUtil.ts b/packages/appkit/src/store/ProviderUtil.ts
@@ -11,7 +11,7 @@ export interface ProviderStoreUtilState {
   providerIds: Record<ChainNamespace, ProviderIdType | undefined>
 }
 
-type ProviderIdType =
+export type ProviderIdType =
   | 'walletConnect'
   | 'injected'
   | 'coinbaseWallet'

diff --git a/packages/appkit/src/store/index.ts b/packages/appkit/src/store/index.ts
@@ -1,2 +1,2 @@
 export { ProviderUtil } from './ProviderUtil.js'
-export type { ProviderStoreUtilState } from './ProviderUtil.js'
+export type { ProviderStoreUtilState, ProviderIdType } from './ProviderUtil.js'