patch

WalletConnect · Jul 29, 2024 · 515f064 · 515f064
2 parents 650d706 + 441667e
commit 515f064
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/packages/appkit-universal/appKitClient.ts b/packages/appkit-universal/appKitClient.ts
@@ -21,6 +21,7 @@ export class WalletConnectModal extends Web3ModalScaffold {
 	private universalProvider: Awaited<ReturnType<(typeof UniversalProvider)['init']>>
 	private requestedScope: string
 	private requestedNamespaces: Exclude<ConnectParams['optionalNamespaces'], undefined>
+	private _onSyncAccount: WalletConnectModal['syncAccount'] | undefined
 
 	public constructor(options: Web3ModalClientOptions) {
 		const { universalProvider, namespaces, ...w3mOptions } = options
@@ -104,8 +105,10 @@ export class WalletConnectModal extends Web3ModalScaffold {
 		])
 		this.syncAccount()
 		this.syncNetwork()
-		universalProvider.client.on('session_update', this.syncAccount.bind(this))
-		universalProvider.client.on('session_delete', this.syncAccount.bind(this))
+
+		this._onSyncAccount = this.syncAccount.bind(this)
+		universalProvider.client.on('session_update', this._onSyncAccount)
+		universalProvider.client.on('session_delete', this._onSyncAccount)
 	}
 
 	async disconnect() {

diff --git a/packages/appkit-universal/package.json b/packages/appkit-universal/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@walletconnect/solana-adapter-ui",
-	"version": "0.0.3",
+	"version": "0.0.4",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "./dist/appKitClient.js",

diff --git a/packages/walletconnect-solana/package.json b/packages/walletconnect-solana/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@walletconnect/solana-adapter",
-	"version": "0.0.3",
+	"version": "0.0.4",
 	"license": "Apache-2.0",
 	"type": "module",
 	"sideEffects": false,

diff --git a/packages/walletconnect-solana/src/adapter.ts b/packages/walletconnect-solana/src/adapter.ts
@@ -39,6 +39,8 @@ export class WalletConnectWalletAdapter extends BaseSignerWalletAdapter {
 	private _readyState: WalletReadyState =
 		typeof window === 'undefined' ? WalletReadyState.Unsupported : WalletReadyState.Loadable
 
+	private _onDisconnect: WalletConnectWalletAdapter['disconnect'] | undefined
+
 	constructor(config: WalletConnectWalletAdapterConfig) {
 		super()
 
@@ -52,6 +54,8 @@ export class WalletConnectWalletAdapter extends BaseSignerWalletAdapter {
 					: WalletConnectChainID.Devnet,
 			options: this._config.options,
 		})
+
+		this._onDisconnect = this.disconnect.bind(this)
 	}
 
 	get publicKey() {
@@ -76,7 +80,7 @@ export class WalletConnectWalletAdapter extends BaseSignerWalletAdapter {
 			const { publicKey } = await this._wallet.connect()
 			this._publicKey = publicKey
 			this.emit('connect', publicKey)
-			this._wallet.client.on('session_delete', this.disconnect.bind(this))
+			this._wallet.client.on('session_delete', this._onDisconnect)
 		} catch (error: unknown) {
 			if ((error as Error).constructor.name === 'QRCodeModalError') throw new WalletWindowClosedError()
 			throw error
@@ -88,7 +92,7 @@ export class WalletConnectWalletAdapter extends BaseSignerWalletAdapter {
 	async disconnect(): Promise<void> {
 		const wallet = this._wallet
 		if (wallet) {
-			wallet.client.off('session_delete', this.disconnect)
+			wallet.client.off('session_delete', this._onDisconnect)
 			this._publicKey = null
 
 			try {