From 2d968c2a57e40011ad1d36c634f4734fb26dd5f3 Mon Sep 17 00:00:00 2001 From: Joaquim Verges Date: Mon, 27 Jan 2025 13:49:01 -0800 Subject: [PATCH] [SDK] fix: Update ecosystem name and admin wallet handling --- .../src/components/in-app-wallet/ecosystem.tsx | 2 +- .../src/react/core/hooks/wallets/useAdminWallet.ts | 1 - .../web/ui/ConnectWallet/screens/ManageWalletScreen.tsx | 9 +++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/playground-web/src/components/in-app-wallet/ecosystem.tsx b/apps/playground-web/src/components/in-app-wallet/ecosystem.tsx index b2ae2f43c34..2e88edf37f2 100644 --- a/apps/playground-web/src/components/in-app-wallet/ecosystem.tsx +++ b/apps/playground-web/src/components/in-app-wallet/ecosystem.tsx @@ -11,7 +11,7 @@ const getEcosystem = () => { return "ecosystem.catlovers"; } // prod ecosystem - return "ecosystem.new-age"; + return "ecosystem.thirdweb-engs"; }; export function EcosystemConnectEmbed( diff --git a/packages/thirdweb/src/react/core/hooks/wallets/useAdminWallet.ts b/packages/thirdweb/src/react/core/hooks/wallets/useAdminWallet.ts index 321fd834c1b..8f4eb1b0d13 100644 --- a/packages/thirdweb/src/react/core/hooks/wallets/useAdminWallet.ts +++ b/packages/thirdweb/src/react/core/hooks/wallets/useAdminWallet.ts @@ -11,7 +11,6 @@ export function useAdminWallet() { const activeWallet = useActiveWallet(); const connectedWallets = useConnectedWallets(); const adminAccount = activeWallet?.getAdminAccount?.(); - if (!adminAccount) { // If the active wallet doesn't have an admin account, return the active wallet return activeWallet; diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx index 725adb802d7..73d1036a999 100644 --- a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx +++ b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx @@ -28,7 +28,8 @@ export function ManageWalletScreen(props: { client: ThirdwebClient; manageWallet?: ConnectButton_detailsModalOptions["manageWallet"]; }) { - const activeWallet = useAdminWallet(); + const adminWallet = useAdminWallet(); + const activeWallet = useActiveWallet(); return ( {/* Private Key Export (if enabled) */} - {activeWallet && - isInAppWallet(activeWallet) && - !activeWallet.getConfig()?.hidePrivateKeyExport && ( + {adminWallet && + isInAppWallet(adminWallet) && + !adminWallet.getConfig()?.hidePrivateKeyExport && ( { props.setScreen("private-key");