latest wagmi + updates

family · Jul 17, 2024 · 63ba37a · 63ba37a
1 parent f09a43e
commit 63ba37a
Show file tree

Hide file tree

Showing 13 changed files with 2,751 additions and 2,656 deletions.
diff --git a/examples/cra/package.json b/examples/cra/package.json
@@ -12,8 +12,8 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-scripts": "5.0.1",
-    "viem": "^2.13.0",
-    "wagmi": "^2.10.2",
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0",
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {

diff --git a/examples/nextjs-app/package.json b/examples/nextjs-app/package.json
@@ -14,8 +14,8 @@
     "next": "14.0.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "viem": "^2.13.0",
-    "wagmi": "^2.10.2"
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.3",

diff --git a/examples/nextjs-siwe/package.json b/examples/nextjs-siwe/package.json
@@ -15,8 +15,8 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "siwe": "^2.1.4",
-    "viem": "^2.13.0",
-    "wagmi": "^2.10.2"
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0"
   },
   "devDependencies": {
     "@types/node": "18.7.18",

diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -14,8 +14,8 @@
     "next": "14.0.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "viem": "^2.13.0",
-    "wagmi": "^2.10.2"
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.3",

diff --git a/examples/testbench/package.json b/examples/testbench/package.json
@@ -16,8 +16,8 @@
     "next": "14.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "viem": "^2.13.6",
-    "wagmi": "^2.10.2"
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0"
   },
   "devDependencies": {
     "@types/node": "18.7.18",

diff --git a/examples/vite/package.json b/examples/vite/package.json
@@ -13,8 +13,8 @@
     "connectkit": "workspace:packages/connectkit",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "viem": "^2.13.0",
-    "wagmi": "^2.10.2"
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0"
   },
   "devDependencies": {
     "@types/react": "^18.0.17",

diff --git a/package.json b/package.json
@@ -39,8 +39,8 @@
     "rollup-plugin-visualizer": "^5.5.4",
     "tslib": "^1.9.3",
     "typescript-plugin-styled-components": "^2.0.0",
-    "viem": "^2.13.0",
-    "wagmi": "^2.10.2"
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0"
   },
   "packageManager": "yarn@3.2.0",
   "dependencies": {

diff --git a/packages/connectkit-next-siwe/package.json b/packages/connectkit-next-siwe/package.json
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "iron-session": "^6.2.1",
-    "viem": "^2.13.0"
+    "viem": "^2.17.0"
   },
   "peerDependencies": {
     "connectkit": ">=1.2.0",

diff --git a/packages/connectkit/package.json b/packages/connectkit/package.json
@@ -66,7 +66,7 @@
   "resolutions": {
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "viem": "^2.13.0",
-    "wagmi": "^2.10.2"
+    "viem": "^2.17.0",
+    "wagmi": "^2.11.0"
   }
 }
diff --git a/packages/connectkit/src/defaultConnectors.ts b/packages/connectkit/src/defaultConnectors.ts
@@ -44,15 +44,12 @@ const defaultConnectors = ({
       dappMetadata: {
         name: app.name,
         iconUrl: app.icon,
+        //source: "connectkit"
       },
-      // disables metamask modal /*
+      // disables metamask modal
       extensionOnly: true,
       modals: {
-        install: ({ link }) => {
-          console.log('dispatch metaMaskUri', link);
-          window.dispatchEvent(
-            new CustomEvent('metaMaskUri', { detail: link })
-          );
+        install: () => {
           return {};
         },
       },

diff --git a/packages/connectkit/src/hooks/connectors/useMetaMaskUri.tsx b/packages/connectkit/src/hooks/connectors/useMetaMaskUri.tsx
@@ -23,24 +23,16 @@ export function useMetaMaskUri(
   const { isConnected } = useAccount();
   const { connectAsync } = useConnect();
 
-  useEffect(() => {
-    window.addEventListener('metaMaskUri', (e: any) => {
-      console.log('link', e.detail);
-      setUri(e.detail);
-    });
-  }, []);
-
   useEffect(() => {
     if (typeof window !== 'undefined' && !window.mmsdk) return;
     if (window.mmsdk?.isExtensionActive()) return;
     if (!enabled) return;
 
     async function handleMessage(message) {
-      const { type } = message;
+      const { type, data } = message;
       log('MM Message', message);
-      if (type === 'connecting') {
-        const p: any = await connector.getProvider();
-        //if (p?.qrUrl) setUri(p.qrUrl);
+      if (type === 'display_uri') {
+        setUri(data);
       }
     }
     async function handleDisconnect() {
@@ -67,7 +59,6 @@ export function useMetaMaskUri(
           switch (error.code) {
             case 4001:
               log('error.code - User rejected');
-              tryConnect(connector); // Regenerate QR code
               break;
             default:
               log('error.code - Unknown Error');

diff --git a/packages/cra-template/template.json b/packages/cra-template/template.json
@@ -10,8 +10,8 @@
       "@types/react-dom": "^18.0.0",
       "connectkit": "latest",
       "typescript": "^5.0.4",
-      "viem": "^2.13.0",
-      "wagmi": "^2.10.2",
+      "viem": "^2.17.0",
+      "wagmi": "^2.11.0",
       "web-vitals": "^2.1.0"
     },
     "eslintConfig": {