Skip to content

Commit c867aed

Browse files
committed
fix: Fixed an issue where some subscription functions did not return the corresponding unsubscription function
1 parent 7a5c67e commit c867aed

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

packages/appkit/src/client/appkit-base-client.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,12 +2357,15 @@ export abstract class AppKitBaseClient {
23572357
callback(account)
23582358
}
23592359

2360-
if (namespace) {
2361-
ChainController.subscribeChainProp('accountState', updateVal, namespace)
2362-
} else {
2363-
ChainController.subscribe(updateVal)
2360+
const unsubscribeChain = namespace
2361+
? ChainController.subscribeChainProp('accountState', updateVal, namespace)
2362+
: ChainController.subscribe(updateVal)
2363+
const unsubscribeConnector = ConnectorController.subscribe(updateVal)
2364+
2365+
return () => {
2366+
unsubscribeChain()
2367+
unsubscribeConnector()
23642368
}
2365-
ConnectorController.subscribe(updateVal)
23662369
}
23672370

23682371
public subscribeNetwork(
@@ -2389,11 +2392,11 @@ export abstract class AppKitBaseClient {
23892392
}
23902393

23912394
public subscribeShouldUpdateToAddress(callback: (newState?: string) => void) {
2392-
AccountController.subscribeKey('shouldUpdateToAddress', callback)
2395+
return AccountController.subscribeKey('shouldUpdateToAddress', callback)
23932396
}
23942397

23952398
public subscribeCaipNetworkChange(callback: (newState?: CaipNetwork) => void) {
2396-
ChainController.subscribeKey('activeCaipNetwork', callback)
2399+
return ChainController.subscribeKey('activeCaipNetwork', callback)
23972400
}
23982401

23992402
public getState() {

0 commit comments

Comments
 (0)