Skip to content

Fix: Exclude IAW when smart wallets are used #7454

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 4 commits into from
Jun 27, 2025
Merged

Fix: Exclude IAW when smart wallets are used #7454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6ebd54
Merge branch 'main' into greg/tool-4864-handle-sponsored-gas-in-new-w…
gregfromstl Jun 27, 2025
134573f
fix: include AA props in default wallets
gregfromstl Jun 27, 2025
abdb47c
Merge branch 'main' into greg/tool-4864-handle-sponsored-gas-in-new-w…
gregfromstl Jun 27, 2025
35341cb
changeset
gregfromstl Jun 27, 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/fifty-turtles-sneeze.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

Prevent admin wallet from connecting when no IAW config is specified
8 changes: 7 additions & 1 deletion packages/thirdweb/src/react/web/ui/ConnectWallet/ConnectButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,14 @@
getDefaultWallets({
appMetadata: props.appMetadata,
chains: props.chains,
executionMode: props.accountAbstraction
? {
mode: "EIP4337",
smartAccount: props.accountAbstraction,
}

Check warning on line 299 in packages/thirdweb/src/react/web/ui/ConnectWallet/ConnectButton.tsx

View check run for this annotation

Codecov / codecov/patch

packages/thirdweb/src/react/web/ui/ConnectWallet/ConnectButton.tsx#L296-L299 

Added lines #L296 - L299 were not covered by tests
: undefined,
}),
[props.wallets, props.appMetadata, props.chains],
[props.wallets, props.appMetadata, props.chains, props.accountAbstraction],
);
const localeQuery = useConnectLocale(props.locale || "en_US");
const connectionManager = useConnectionManager();
Expand Down
6 changes: 5 additions & 1 deletion packages/thirdweb/src/wallets/defaultWallets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Chain } from "../chains/types.js";
import { COINBASE, METAMASK, RAINBOW, ZERION } from "./constants.js";
import { createWallet } from "./create-wallet.js";
import type { ExecutionModeOptions } from "./in-app/core/wallet/types.js";
import type { Wallet } from "./interfaces/wallet.js";
import type { AppMetadata } from "./types.js";

Expand All @@ -10,9 +11,12 @@ import type { AppMetadata } from "./types.js";
export function getDefaultWallets(options?: {
appMetadata?: AppMetadata;
chains?: Chain[];
executionMode?: ExecutionModeOptions;
}): Wallet[] {
return [
createWallet("inApp"),
createWallet("inApp", {
executionMode: options?.executionMode,
}),
createWallet(METAMASK),
createWallet(COINBASE, {
appMetadata: options?.appMetadata,
Expand Down
Loading