From bd16fcd261602bd0ee3984edeab3549863e12df1 Mon Sep 17 00:00:00 2001
From: Erdit Kurteshi <erdit.kurteshi@sqa-consulting.com>
Date: Tue, 9 Jan 2024 16:01:27 +0100
Subject: [PATCH 1/2] fix: added checks for walletSelectorState and
 fastAuthWallet in signin file

---
 src/pages/signin.tsx | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pages/signin.tsx b/src/pages/signin.tsx
index 2f121bf70..a38323c9f 100644
--- a/src/pages/signin.tsx
+++ b/src/pages/signin.tsx
@@ -30,12 +30,19 @@ const SignInPage: NextPageWithLayout = () => {
   useEffect(() => {
     if (vmNear?.selector && searchParams.get('account_id') && searchParams.get('public_key')) {
       vmNear.selector
-        .then((selector: any) => selector.wallet('fast-auth-wallet'))
-        .then((fastAuthWallet: any) =>
-          fastAuthWallet.signIn({
-            contractId: vmNear.config.contractName,
-          }),
-        );
+        .then((selector: any) => {
+          const walletSelectorState = selector.store.getState();
+          if (walletSelectorState === 'fast-auth-wallet') {
+            return selector.wallet('fast-auth-wallet');
+          }
+        })
+        .then((fastAuthWallet: any) => {
+          if (fastAuthWallet) {
+            fastAuthWallet.signIn({
+              contractId: vmNear.config.contractName,
+            });
+          }
+        });
     }
   }, [searchParams, vmNear]);
 

From 6756a27a41f32c4b7a0296f2af7a8a824f6738f5 Mon Sep 17 00:00:00 2001
From: Erdit Kurteshi <erdit.kurteshi@sqa-consulting.com>
Date: Wed, 10 Jan 2024 10:11:38 +0100
Subject: [PATCH 2/2] fix: updated the check for walletSelectorState

---
 src/pages/signin.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin.tsx b/src/pages/signin.tsx
index a38323c9f..c5aecd6cf 100644
--- a/src/pages/signin.tsx
+++ b/src/pages/signin.tsx
@@ -32,7 +32,8 @@ const SignInPage: NextPageWithLayout = () => {
       vmNear.selector
         .then((selector: any) => {
           const walletSelectorState = selector.store.getState();
-          if (walletSelectorState === 'fast-auth-wallet') {
+
+          if (walletSelectorState.selectedWalletId === 'fast-auth-wallet') {
             return selector.wallet('fast-auth-wallet');
           }
         })