♻️ Refine session restore and disconnect logic

likecoin · Jun 26, 2023 · 947e544 · 947e544
1 parent 2b55d8f
commit 947e544
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/src/utils/cosmostation-mobile.ts b/src/utils/cosmostation-mobile.ts
@@ -35,14 +35,16 @@ export async function initCosmostationMobile(
   });
   client = wcConnector;
   // TODO: allow selecting sessions
-  const currentSessions = wcConnector.session.getAll();
-  const reuseSession = currentSessions
-    .reverse()
-    .find((session: SessionTypes.Struct) => {
-      return session.peer.metadata.name.includes('Cosmostation');
-    });
-  if (reuseSession) {
-    session = reuseSession;
+  if (!session) {
+    const currentSessions = wcConnector.session.getAll();
+    const reuseSession = currentSessions
+      .reverse()
+      .find((session: SessionTypes.Struct) => {
+        return session.peer.metadata.name.includes('Cosmostation');
+      });
+    if (reuseSession) {
+      session = reuseSession;
+    }
   }
   let accounts: AccountData[] = [];
 
@@ -152,12 +154,13 @@ export const checkIsInCosmostationMobileInAppBrowser = () =>
 export async function onCosmostationMobileDisconnect(topic = session?.topic) {
   if (topic) {
     if (!client) return;
-    client.disconnect({
+    await client.disconnect({
       topic,
       reason: {
         code: 6000,
         message: 'USER_DISCONNECTED',
       },
     });
+    session = null;
   }
 }
diff --git a/src/utils/keplr-mobile.ts b/src/utils/keplr-mobile.ts
@@ -35,14 +35,16 @@ export async function initKeplrMobile(
   });
   client = wcConnector;
   // TODO: allow selecting sessions
-  const currentSessions = wcConnector.session.getAll();
-  const reuseSession = currentSessions
-    .reverse()
-    .find((session: SessionTypes.Struct) => {
-      return session.peer.metadata.name.includes('Keplr');
-    });
-  if (reuseSession) {
-    session = reuseSession;
+  if (!session) {
+    const currentSessions = wcConnector.session.getAll();
+    const reuseSession = currentSessions
+      .reverse()
+      .find((session: SessionTypes.Struct) => {
+        return session.peer.metadata.name.includes('Keplr');
+      });
+    if (reuseSession) {
+      session = reuseSession;
+    }
   }
   let accounts: AccountData[] = [];
 
@@ -149,12 +151,13 @@ export async function initKeplrMobile(
 export async function onKeplrMobileDisconnect(topic = session?.topic) {
   if (topic) {
     if (!client) return;
-    client.disconnect({
+    await client.disconnect({
       topic,
       reason: {
         code: 6000,
         message: 'USER_DISCONNECTED',
       },
     });
+    session = null;
   }
 }
diff --git a/src/utils/wallet-connect-v2.ts b/src/utils/wallet-connect-v2.ts
@@ -61,11 +61,13 @@ export async function initWalletConnectV2Connector(
     projectId: options.walletConnectProjectId,
     metadata: options.walletConnectMetadata,
   });
-  const lastKeyIndex = wcConnector.session.getAll().length - 1;
-  // TODO: allow selecting sessions
-  if (lastKeyIndex > -1) {
-    const lastSession = wcConnector.session.getAll()[lastKeyIndex];
-    if (lastSession) session = lastSession;
+  if (!session) {
+    const lastKeyIndex = wcConnector.session.getAll().length - 1;
+    // TODO: allow selecting sessions
+    if (lastKeyIndex > -1) {
+      const lastSession = wcConnector.session.getAll()[lastKeyIndex];
+      if (lastSession) session = lastSession;
+    }
   }
   let accounts: AccountData[] = [];
 
@@ -237,12 +239,13 @@ export async function listenWalletConnectV2StoreChange(
 export async function onWalletConnectV2Disconnect(topic = session?.topic) {
   if (topic) {
     if (!client) return;
-    client.disconnect({
+    await client.disconnect({
       topic,
       reason: {
         code: 6000,
         message: 'USER_DISCONNECTED',
       },
     });
+    session = null;
   }
 }