@rango-dev/widget-embedded 0.60.2-next.8 → 0.61.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.60.2-next.8",
+  "version": "0.61.0",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -27,16 +27,16 @@
     "@hub3js/std": "^0.1.1",
     "@lingui/core": "4.2.1",
     "@lingui/react": "4.2.1",
-    "@rango-dev/logging-core": "^0.12.2-next.0",
-    "@rango-dev/provider-all": "^0.62.2-next.4",
+    "@rango-dev/logging-core": "^0.13.0",
+    "@rango-dev/provider-all": "^0.63.0",
     "@rango-dev/queue-manager-core": "^0.33.0",
-    "@rango-dev/queue-manager-rango-preset": "^0.62.1-next.4",
+    "@rango-dev/queue-manager-rango-preset": "^0.63.0",
     "@rango-dev/queue-manager-react": "^0.33.0",
     "@rango-dev/signer-solana": "^0.48.0",
-    "@rango-dev/ui": "^0.63.1-next.3",
-    "@rango-dev/wallets-core": "^0.59.1-next.1",
-    "@rango-dev/wallets-react": "^0.46.1-next.3",
-    "@rango-dev/wallets-shared": "^0.60.1-next.2",
+    "@rango-dev/ui": "^0.64.0",
+    "@rango-dev/wallets-core": "^0.60.0",
+    "@rango-dev/wallets-react": "^0.47.0",
+    "@rango-dev/wallets-shared": "^0.61.0",
     "bignumber.js": "^9.1.1",
     "copy-to-clipboard": "^3.3.3",
     "crypto-browserify": "^3.12.1",
@@ -66,4 +66,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/containers/Wallets/Wallets.tsx

@@ -109,6 +109,9 @@ function Main(props: PropsWithChildren<PropTypes>) {
             [WalletTypes.TON_CONNECT]: {
               provider: { manifestUrl: config.tonConnect?.manifestUrl },
             },
+            [WalletTypes.TREZOR]: {
+              provider: { manifest: config.trezorManifest },
+            },
           },
         }}>
         {props.children}

package/src/store/slices/config.ts

@@ -93,9 +93,6 @@ function generateProviders(config: WidgetConfig) {
         options?.walletConnectListedDesktopWalletLink,
     },
     selectedProviders: config.wallets,
-    trezor: options?.trezorManifest
-      ? { manifest: options.trezorManifest }
-      : undefined,
     tonConnect: options?.tonConnect?.manifestUrl
       ? { manifestUrl: options?.tonConnect.manifestUrl }
       : undefined,

package/src/utils/wallets.ts

@@ -23,6 +23,8 @@ import {
 import { legacyReadAccountAddress as readAccountAddress } from '@rango-dev/wallets-core/legacy';
 import {
   detectInstallLink,
+  HYPERLIQUID_SIGN_NETWORK,
+  getBlockChainNameFromId,
   isEvmAddress,
   Networks,
 } from '@rango-dev/wallets-shared';
@@ -44,6 +46,20 @@ import { formatThousandsWithCommas } from './sanitizers';
 export type ExtendedModalWalletInfo = WalletInfoWithExtra &
   Pick<ExtendedWalletInfo, 'properties' | 'isHub'>;
 
+function getConnectedEvmChainName(
+  namespaces: ReturnType<ProviderContext['state']>['namespaces'],
+  supportedChains: BlockchainMeta[]
+): string | null {
+  const evmNamespace = namespaces?.get('EVM');
+  if (!!evmNamespace?.network) {
+    return (
+      getBlockChainNameFromId(evmNamespace.network, supportedChains) ??
+      evmNamespace.network
+    );
+  }
+  return null;
+}
+
 export function getWalletConnectionStatus(
   wallet: ExtendedWalletInfo,
   walletState: ReturnType<ProviderContext['state']>
@@ -74,9 +90,12 @@ export function mapWalletTypesToWalletInfo(
     .filter((wallet) => {
       const { supportedChains, isContractWallet } = getWalletInfo(wallet);
 
-      const { installed, network } = getState(wallet);
+      const { installed, namespaces } = getState(wallet);
       const filterContractWallets =
-        isContractWallet && (!installed || (!!chain && network !== chain));
+        isContractWallet &&
+        (!installed ||
+          (!!chain &&
+            getConnectedEvmChainName(namespaces, supportedChains) !== chain));
       if (filterContractWallets) {
         return false;
       }
@@ -223,6 +242,14 @@ export function prepareAccountsForWalletStore(
            */
           addAccount(network, address.toLowerCase());
         });
+
+        const shouldAddHyperliquidAccount = evmChainsSupportedByWallet.includes(
+          HYPERLIQUID_SIGN_NETWORK
+        );
+
+        if (shouldAddHyperliquidAccount) {
+          addAccount(Networks.HYPERLIQUID, address.toLowerCase());
+        }
       }
     } else {
       addAccount(network, address);