fix: broken state internal hang

airgap-it · Oct 3, 2023 · 14a00a3 · 14a00a3
1 parent 10d0600
commit 14a00a3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/beacon-dapp/src/dapp-client/DAppClient.ts b/packages/beacon-dapp/src/dapp-client/DAppClient.ts
@@ -610,7 +610,7 @@ export class DAppClient extends Client {
    * @param account The account that will be set as the active account
    */
   public async setActiveAccount(account?: AccountInfo): Promise<void> {
-    if (account && (await this.isInvalidState(account))) {
+    if (account && this._activeAccount.isSettled() && (await this.isInvalidState(account))) {
       setTimeout(() => this.events.emit(BeaconEvent.HIDE_UI), 1000)
       this.destroy()
       this.setActiveAccount(undefined)