Merge branch 'master' of https://github.com/snapshot-labs/lock

snapshot-labs · Aug 1, 2024 · c371f9a · c371f9a
2 parents f578200 + b5a3203
commit c371f9a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/connectors/injected.ts b/connectors/injected.ts
@@ -7,8 +7,20 @@ export default class Connector extends LockConnector {
       provider = window['ethereum'];
       try {
         await window['ethereum'].request({ method: 'eth_requestAccounts' })
-      } catch (e) {
+      } catch (e: any) {
         console.error(e);
+        if (e.message = "Already processing eth_requestAccounts. Please wait.") {
+          try {
+            await provider.request({
+              method: "wallet_requestPermissions",
+              params: [{ eth_accounts: {} }],
+            });
+          } catch (e: any) {
+            console.error(e);
+            if (e.code === 4001 || -32002) return;
+          }
+        }
+
         if (e.code === 4001) return;
       }
     } else if (window['web3']) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/lock",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "repository": "snapshot-labs/lock",
   "license": "MIT",
   "main": "dist/lock.cjs.js",

diff --git a/src/utils.ts b/src/utils.ts
@@ -21,6 +21,11 @@ export function getInjected() {
     id: 'trustwallet',
     icon: 'ipfs://QmQzchPwEa7UnRqSS7kSt4EJWMw5mcj9u3YtTp9uig9UT5'
   };
+  if (web3.isMixin) injected = {
+    name: 'Mixin Messenger',
+    id: 'mixinmessenger',
+    icon: 'ipfs://QmT4ZcGMNoW34ZNgzjPJ6pqaoB5Fpk7z2d9yQqwGtCuEJC'
+  };
   if (web3.isStatus) injected = {
     name: 'Status',
     id: 'status',