Merge branch 'main' into crosschain-ui

Author: kumaryash90

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(

packages/thirdweb/CHANGELOG.md

@@ -1,5 +1,11 @@
 # thirdweb
 
+## 5.86.5
+
+### Patch Changes
+
+- [#6072](https://github.com/thirdweb-dev/js/pull/6072) [`2cebb42`](https://github.com/thirdweb-dev/js/commit/2cebb420e6a381cf41a48e17762f6c655ebe7d8c) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix showing link profiles for ecosystem smart wallets
+
 ## 5.86.4
 
 ### Patch Changes

packages/thirdweb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.86.4",
+  "version": "5.86.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"

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;

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 (
     <Container
@@ -92,9 +93,9 @@ export function ManageWalletScreen(props: {
           </MenuButton>
 
           {/* Private Key Export (if enabled) */}
-          {activeWallet &&
-            isInAppWallet(activeWallet) &&
-            !activeWallet.getConfig()?.hidePrivateKeyExport && (
+          {adminWallet &&
+            isInAppWallet(adminWallet) &&
+            !adminWallet.getConfig()?.hidePrivateKeyExport && (
               <MenuButton
                 onClick={() => {
                   props.setScreen("private-key");

packages/wagmi-adapter/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @thirdweb-dev/wagmi-adapter
 
+## 0.2.5
+
 ## 0.2.4
 
 ## 0.2.3

packages/wagmi-adapter/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@thirdweb-dev/wagmi-adapter",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/thirdweb-dev/js.git#main"