diff --git a/src/hooks/useAccounts.tsx b/src/hooks/useAccounts.tsx index 07f27d7..f932d88 100644 --- a/src/hooks/useAccounts.tsx +++ b/src/hooks/useAccounts.tsx @@ -29,6 +29,7 @@ import { useWalletConnection } from './useWalletConnection'; import { useSignTypedData } from 'wagmi'; import { getSelectedNetwork } from '@/state/appSelectors'; import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; +import { usePrivy } from '@privy-io/react-auth'; const AccountsContext = createContext | undefined>(undefined); @@ -199,6 +200,7 @@ const useAccountsContext = () => { chainId, }, }); + const { ready, authenticated } = usePrivy(); useEffect(() => { (async () => { @@ -216,7 +218,7 @@ const useAccountsContext = () => { const evmDerivedAccount = evmDerivedAddresses[evmAddress]; - if (walletConnectionType === WalletConnectionType.Privy) { + if (walletConnectionType === WalletConnectionType.Privy && authenticated && ready) { try { const signature = await signTypedDataAsync(); diff --git a/src/hooks/useWalletConnection.ts b/src/hooks/useWalletConnection.ts index 4671c45..6ceee0e 100644 --- a/src/hooks/useWalletConnection.ts +++ b/src/hooks/useWalletConnection.ts @@ -105,7 +105,7 @@ export const useWalletConnection = () => { [walletConnectConfig, walletType, walletConnectionType] ); - const { connectAsync: connectWagmi } = useConnectWagmi({ connector: wagmiConnector }) + const { connectAsync: connectWagmi } = useConnectWagmi({ connector: wagmiConnector }); const { suggestAndConnect: connectGraz } = useConnectGraz(); const { login, ready, authenticated } = usePrivy(); const { logout } = useLogout(); @@ -118,6 +118,7 @@ export const useWalletConnection = () => { if (!walletConnection) { throw new Error('Onboarding: No wallet connection found.'); } else if (walletConnection.type === WalletConnectionType.Privy) { + console.log({ isConnectedWagmi, authenticated, ready }); if (!isConnectedWagmi && !authenticated && ready) { login(); }