Merge pull request #77 from argentlabs/fix/wallets-ordering-and-recon…

…nect Fix/wallets ordering and reconnect
argentlabs · Feb 13, 2024 · 1e2d1fb · 1e2d1fb
2 parents cdcbf7a + 191eea0
commit 1e2d1fb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/helpers/mapModalWallets.ts b/src/helpers/mapModalWallets.ts
@@ -25,7 +25,16 @@ export const mapModalWallets = ({
     return []
   }
 
-  return availableConnectors
+  const allInstalledWallets = installedWallets.map((w) =>
+    availableConnectors.find((c) => c.id === w.id),
+  )
+
+  const orderedByInstall = [
+    ...availableConnectors.filter((c) => allInstalledWallets.includes(c)),
+    ...availableConnectors.filter((c) => !allInstalledWallets.includes(c)),
+  ]
+
+  const connectors = orderedByInstall
     .map<ModalWallet | null>((c) => {
       const installed = installedWallets.find((w) => w.id === c.id)
       if (installed) {
@@ -74,4 +83,6 @@ export const mapModalWallets = ({
       }
     })
     .filter((c): c is ModalWallet => c !== null)
+
+  return connectors
 }
diff --git a/src/main.ts b/src/main.ts
@@ -48,17 +48,22 @@ export const connect = async ({
 
   const lastWalletId = localStorage.getItem("starknetLastConnectedWallet")
   if (modalMode === "neverAsk") {
-    const connector = availableConnectors.find((c) => c.id === lastWalletId)
+    try {
+      const connector = availableConnectors.find((c) => c.id === lastWalletId)
 
-    if (resultType === "wallet") {
-      await connector?.connect()
-    }
+      if (resultType === "wallet") {
+        await connector?.connect()
+      }
 
-    selectedConnector = connector ?? null
+      selectedConnector = connector ?? null
 
-    return {
-      connector,
-      wallet: connector?.wallet ?? null,
+      return {
+        connector,
+        wallet: connector?.wallet ?? null,
+      }
+    } catch (error) {
+      removeStarknetLastConnectedWallet()
+      throw new Error(error)
     }
   }