From f97bc5b5f2860ae3285b1b6b775c197ecca3c928 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Tue, 3 Aug 2021 18:19:09 +0200 Subject: [PATCH] Fix walletconnect rejection from mobile --- src/config.ts | 10 ++++++++-- src/session.ts | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/config.ts b/src/config.ts index 820ee8315..687130acb 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,4 +1,4 @@ -import { writable } from "svelte/store"; +import { get, writable } from "svelte/store"; import type { Writable } from "svelte/store"; import { ethers } from "ethers"; import type { TypedDataSigner } from '@ethersproject/abstract-signer'; @@ -150,7 +150,7 @@ export class Config { state.set({ state: "open", uri, onClose }); }, close: () => { - state.set({ state: "close" }); + // We handle the "close" event through the "disconnect" handler. } }, clientMeta: { @@ -165,6 +165,12 @@ export class Config { walletConnect.on("modal_closed", () => { state.set({ state: "close" }); }); + walletConnect.on("disconnect", () => { + const wcs = get(state); + if (wcs.state === "open") { + wcs.onClose(); + } + }); const walletConnectSigner = new WalletConnectSigner(walletConnect, provider); diff --git a/src/session.ts b/src/session.ts index 4ce4a584e..51045fea2 100644 --- a/src/session.ts +++ b/src/session.ts @@ -87,6 +87,7 @@ export const loadState = (initial: State): Store => { try { await config.walletConnect.client.connect(); + console.log("WalletConnect: connected."); const address = await signer.getAddress(); const tokenBalance: BigNumber = await config.token.balanceOf(address); @@ -103,6 +104,7 @@ export const loadState = (initial: State): Store => { } store.set({ connection: Connection.Connected, session }); } catch (e) { + console.log("WalletConnect: connection failed."); store.set({ connection: Connection.Disconnected }); // There seems to be no way to detect this "error" caused by the user