Skip to content

[SDK] fix: Account linking for ecosystem smart wallets #6074

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 1 commit into from
Jan 27, 2025
Merged

[SDK] fix: Account linking for ecosystem smart wallets #6074

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .changeset/new-maps-enjoy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

Fix account linking for ecosystem smart wallets
16 changes: 10 additions & 6 deletions packages/thirdweb/src/react/web/ui/ConnectWallet/screens/LinkProfileScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { isEcosystemWallet } from "../../../../../wallets/ecosystem/is-ecosystem
import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
import type { EcosystemWalletId } from "../../../../../wallets/wallet-types.js";
import { iconSize } from "../../../../core/design-system/index.js";
import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
import { useAdminWallet } from "../../../../core/hooks/wallets/useAdminWallet.js";
import EcosystemWalletConnectUI from "../../../wallets/ecosystem/EcosystemWalletConnectUI.js";
Expand All @@ -28,20 +29,23 @@ export function LinkProfileScreen(props: {
client: ThirdwebClient;
walletConnect: { projectId?: string } | undefined;
}) {
const activeWallet = useAdminWallet();
const adminWallet = useAdminWallet();
const activeWallet = useActiveWallet();
const chain = useActiveWalletChain();
const queryClient = useQueryClient();

if (!activeWallet) {
const wallet = adminWallet || activeWallet;

if (!wallet) {
return <LoadingScreen />;
}

if (activeWallet.id === "inApp") {
if (wallet.id === "inApp") {
return (
<Suspense fallback={<LoadingScreen />}>
<InAppWalletConnectUI
walletConnect={props.walletConnect}
wallet={activeWallet as Wallet<"inApp">}
wallet={wallet as Wallet<"inApp">}
done={() => {
setTimeout(() => {
queryClient.invalidateQueries({ queryKey: ["profiles"] });
Expand All @@ -63,11 +67,11 @@ export function LinkProfileScreen(props: {
);
}

if (isEcosystemWallet(activeWallet)) {
if (isEcosystemWallet(wallet)) {
return (
<Suspense fallback={<LoadingScreen />}>
<EcosystemWalletConnectUI
wallet={activeWallet as Wallet<EcosystemWalletId>}
wallet={wallet as Wallet<EcosystemWalletId>}
done={() => {
setTimeout(() => {
queryClient.invalidateQueries({ queryKey: ["profiles"] });
Expand Down
Loading