From 231fbae32006582a0e83606e547603c5d250ed15 Mon Sep 17 00:00:00 2001
From: Jayesh Bhole <111138421+jayeshbhole-rp@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:48:03 +0530
Subject: [PATCH] fix: solana autoconnect

---
 packages/react/CHANGELOG.md                            | 8 ++++++++
 packages/react/package.json                            | 2 +-
 packages/solana-react/CHANGELOG.md                     | 6 ++++++
 packages/solana-react/package.json                     | 2 +-
 packages/solana-react/src/providers/WalletProvider.tsx | 8 +++-----
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index 960e154e..2d202ed4 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @tangled3/react
 
+## 1.4.7
+
+### Patch Changes
+
+- fix solana autoconnect conditions
+- Updated dependencies
+  - @tangled3/solana-react@1.1.2
+
 ## 1.4.6
 
 ### Patch Changes
diff --git a/packages/react/package.json b/packages/react/package.json
index 985ef205..de9a298f 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tangled3/react",
   "private": false,
-  "version": "1.4.6",
+  "version": "1.4.7",
   "type": "module",
   "license": "MIT",
   "main": "./src/index.ts",
diff --git a/packages/solana-react/CHANGELOG.md b/packages/solana-react/CHANGELOG.md
index f0ba4872..1a0b7e6e 100644
--- a/packages/solana-react/CHANGELOG.md
+++ b/packages/solana-react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tangled3/solana-react
 
+## 1.1.2
+
+### Patch Changes
+
+- fix solana autoconnect conditions
+
 ## 1.1.1
 
 ### Patch Changes
diff --git a/packages/solana-react/package.json b/packages/solana-react/package.json
index 258aa84f..67040f87 100644
--- a/packages/solana-react/package.json
+++ b/packages/solana-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tangled3/solana-react",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "MIT",
   "type": "module",
   "main": "./src/index.ts",
diff --git a/packages/solana-react/src/providers/WalletProvider.tsx b/packages/solana-react/src/providers/WalletProvider.tsx
index 80f372e7..bfbd4d62 100644
--- a/packages/solana-react/src/providers/WalletProvider.tsx
+++ b/packages/solana-react/src/providers/WalletProvider.tsx
@@ -120,7 +120,7 @@ export const WalletProvider = ({
   const { mutateAsync: handleAutoConnectRequest, isPending: isAutoConnecting } = useMutation({
     mutationKey: ['autoConnect'],
     mutationFn: async () => {
-      if (!autoConnect || !connectedAdapter) return;
+      if (!autoConnect || !connectedAdapter || connectedAdapter.readyState !== WalletReadyState.Installed) return;
       // If autoConnect is true or returns true, use the default autoConnect behavior.
       if (autoConnect === true || (await autoConnect(connectedAdapter))) {
         if (walletName) {
@@ -300,10 +300,8 @@ export const WalletProvider = ({
     if (
       connected ||
       !handleAutoConnectRequest ||
-      !(
-        connectedWallet?.readyState === WalletReadyState.Installed ||
-        connectedWallet?.readyState === WalletReadyState.Loadable
-      )
+      connectedWallet?.readyState === WalletReadyState.Installed ||
+      connectedWallet?.readyState === WalletReadyState.Loadable
     )
       return;