fix: merge conflicts

Author: magiziz

package.json

@@ -71,9 +71,9 @@
     "react-dom": "^18.2.0",
     "recursive-readdir-files": "^2.3.1",
     "typescript": "^5.0.4",
-    "viem": "^2.0.6",
+    "viem": "^2.4.1",
     "vitest": "^0.33.0",
-    "wagmi": "^2.2.0"
+    "wagmi": "^2.3.1"
   },
   "packageManager": "[email protected]",
   "pnpm": {

packages/create-rainbowkit/generated-test-app/package.json

@@ -14,8 +14,8 @@
     "next": "^14.0.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "viem": "^2.0.6",
-    "wagmi": "^2.2.0"
+    "viem": "^2.4.1",
+    "wagmi": "^2.3.1"
   },
   "devDependencies": {
     "@types/node": "^18.19.3",

packages/create-rainbowkit/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rainbow-me/create-rainbowkit",
   "description": "Scaffold a new RainbowKit project",
-  "version": "0.3.0-beta.1",
+  "version": "0.3.0-beta.2",
   "files": [
     "dist",
     "templates"

packages/create-rainbowkit/templates/next-app/package.json

@@ -14,8 +14,8 @@
     "next": "^14.0.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "viem": "^2.0.6",
-    "wagmi": "^2.2.0"
+    "viem": "^2.4.1",
+    "wagmi": "^2.3.1"
   },
   "devDependencies": {
     "@types/node": "^18.19.3",

packages/example/package.json

@@ -15,8 +15,8 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "siwe": "^2.1.4",
-    "viem": "^2.0.6",
-    "wagmi": "^2.2.0"
+    "viem": "^2.4.1",
+    "wagmi": "^2.3.1"
   },
   "scripts": {
     "dev": "next dev",

packages/rainbow-button/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rainbow-me/rainbow-button",
   "description": "Rainbow connector button",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "files": [
     "dist",
     "styles.css"
@@ -39,8 +39,8 @@
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "viem": "2.x.x",
-    "wagmi": "2.x.x"
+    "viem": "2.x",
+    "wagmi": "2.x"
   },
   "repository": {
     "type": "git",

packages/rainbowkit-siwe-next-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainbow-me/rainbowkit-siwe-next-auth",
-  "version": "0.4.0-beta.1",
+  "version": "0.4.0-beta.2",
   "description": "RainbowKit authentication adapter for Sign-In with Ethereum and NextAuth.js",
   "files": [
     "dist"

packages/rainbowkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainbow-me/rainbowkit",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "The best way to connect a wallet",
   "files": [
     "dist",
@@ -44,8 +44,8 @@
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "viem": "2.x.x",
-    "wagmi": "2.x.x"
+    "viem": "2.x",
+    "wagmi": "2.x"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.2.0",

packages/rainbowkit/src/components/RainbowKitProvider/AuthenticationContext.tsx

@@ -86,17 +86,23 @@ export function RainbowKitAuthenticationProvider<Message = unknown>({
   // Wait for user authentication before listening to "change" event.
   // Avoid listening immediately after wallet connection due to potential SIWE authentication delay.
   // Ensure to turn off the "change" event listener for cleanup.
+  // biome-ignore lint/correctness/useExhaustiveDependencies: <explanation>
   useEffect(() => {
-    if (connector && status === 'authenticated') {
+    // Wagmi renders emitter's partially on page load. We wanna make sure
+    // the event emitters gets updated before proceeding
+    if (
+      typeof connector?.emitter?.on === 'function' &&
+      status === 'authenticated'
+    ) {
       // Attach the event listener when status is 'authenticated'
-      connector.emitter?.on?.('change', handleChangedAccount);
+      connector.emitter.on('change', handleChangedAccount);
 
       // Cleanup function to remove the event listener
       return () => {
-        connector.emitter?.off?.('change', handleChangedAccount);
+        connector.emitter.off('change', handleChangedAccount);
       };
     }
-  }, [connector, status, handleChangedAccount]);
+  }, [connector?.emitter, status]);
 
   return (
     <AuthenticationContext.Provider