diff --git a/packages/beacon-dapp/src/dapp-client/DAppClient.ts b/packages/beacon-dapp/src/dapp-client/DAppClient.ts index 19bb74c94..f3d375cb7 100644 --- a/packages/beacon-dapp/src/dapp-client/DAppClient.ts +++ b/packages/beacon-dapp/src/dapp-client/DAppClient.ts @@ -1078,11 +1078,8 @@ export class DAppClient extends Client { const isResolved = this._transport.isResolved() const isWCInstance = isResolved && (await this.transport) instanceof WalletConnectTransport const isLeader = this.multiTabChannel.isLeader() - const isMobile = isMobileOS(window) - return ( - !isResolved || (isResolved && (!isWCInstance || (isWCInstance && (isLeader || isMobile)))) - ) + return !isResolved || (isResolved && (!isWCInstance || (isWCInstance && isLeader))) } /** diff --git a/packages/beacon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts b/packages/beacon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts index 7cc132a54..cc50846e0 100644 --- a/packages/beacon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts +++ b/packages/beacon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts @@ -326,6 +326,10 @@ export class WalletConnectCommunicationClient extends CommunicationClient { } } + if (this.signClient && !this.isLeader() && this.isMobileOS()) { + await this.closeSignClient() + } + if (!publicKey) { throw new Error('Public Key in `tezos_getAccounts` is empty!') }