diff --git a/src/pages/signin.tsx b/src/pages/signin.tsx index 2f121bf70..c5aecd6cf 100644 --- a/src/pages/signin.tsx +++ b/src/pages/signin.tsx @@ -30,12 +30,20 @@ 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.selectedWalletId === 'fast-auth-wallet') { + return selector.wallet('fast-auth-wallet'); + } + }) + .then((fastAuthWallet: any) => { + if (fastAuthWallet) { + fastAuthWallet.signIn({ + contractId: vmNear.config.contractName, + }); + } + }); } }, [searchParams, vmNear]);