Skip to content

use chainId in SIWEProvider instead of chain #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use chainId in SIWEProvider instead of chain #440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions packages/connectkit/src/siwe/SIWEProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const SIWEProvider = ({
},
});

const { address, chain } = useAccount();
const { address, chainId } = useAccount();
const { signMessageAsync } = useSignMessage();

const onError = (error: any) => {
Expand All @@ -106,7 +106,6 @@ export const SIWEProvider = ({
throw new Error('SIWE not configured');
}

const chainId = chain?.id;
if (!address) throw new Error('No address found');
if (!chainId) throw new Error('No chainId found');

Expand Down Expand Up @@ -149,7 +148,7 @@ export const SIWEProvider = ({
// Skip if we're still fetching session state from backend
if (!sessionData || !sessionData.address || !sessionData.chainId) return;
// Skip if wallet isn't connected (i.e. initial page load)
if (!connectedAddress || !chain) return;
if (!connectedAddress || !chainId) return;

// If SIWE session no longer matches connected account, sign out
if (
Expand All @@ -163,11 +162,11 @@ export const SIWEProvider = ({
// so we're being extra cautious about keeping the SIWE session and the
// connected account/network in sync. But this can be disabled when
// configuring the SIWEProvider.
else if (signOutOnNetworkChange && sessionData.chainId !== chain.id) {
else if (signOutOnNetworkChange && sessionData.chainId !== chainId) {
console.warn('Wallet network changed, signing out of SIWE session');
signOutAndRefetch();
}
}, [sessionData, connectedAddress, chain]);
}, [sessionData, connectedAddress, chainId]);

return (
<SIWEContext.Provider
Expand Down