Skip to content

[Wagmi Adapter] Fix: Fallback to smart account chain in autoconnect #6100

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

Merged
merged 2 commits into from
Jan 29, 2025
Merged

[Wagmi Adapter] Fix: Fallback to smart account chain in autoconnect #6100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fe5e97
fix(wagmi-adapter): fallback to user specified smart account chain
gregfromstl Jan 29, 2025
0c2d80f
Merge branch 'main' into greg/fix-wagmi-adapter-autoconnect
gregfromstl Jan 29, 2025
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
5 changes: 5 additions & 0 deletions .changeset/thick-vans-do.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@thirdweb-dev/wagmi-adapter": patch
---

Fix wagmi adapter usage with account factories
12 changes: 9 additions & 3 deletions packages/wagmi-adapter/src/connector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ export function inAppWalletConnector(
const lastChainId = await config.storage?.getItem("tw.lastChainId");
if (params?.isReconnecting) {
const { autoConnect } = await import("thirdweb/wallets");
const chainId = lastChainId || args.smartAccount?.chain?.id || 1;
await autoConnect({
client,
chain: defineChain(lastChainId || 1),
chain: defineChain(chainId),
wallets: [wallet],
});

Expand All @@ -108,7 +109,7 @@ export function inAppWalletConnector(

return {
accounts: [getAddress(account.address)],
chainId: lastChainId || 1,
chainId: chainId,
};
}
const inAppOptions = params && "strategy" in params ? params : undefined;
Expand All @@ -117,7 +118,12 @@ export function inAppWalletConnector(
"Missing strategy prop, pass it to connect() when connecting to this connector",
);
}
const chain = defineChain(inAppOptions?.chainId || lastChainId || 1);
const chain = defineChain(
inAppOptions?.chainId ||
lastChainId ||
args.smartAccount?.chain?.id ||
1,
);
const decoratedOptions = {
...inAppOptions,
client,
Expand Down
Loading