@coin-voyage/crypto 2.2.3-beta.0 → 2.2.3

package/dist/evm/create-default-evm-config.js

@@ -35,7 +35,7 @@ export function createDefaultEVMConfig(props) {
         }
     }
     if (isWalletInstalled("app.phantom.ethereum")) {
-        connectors.push(extendConnector(injected({ target: "phantom" }), "phantom", "Phantom"));
+        connectors.push(extendConnector(injected({ target: "phantom" }), "app.phantom", "Phantom"));
     }
     if (!isWalletInstalled("coinbase")) {
         const coinbase = createCoinbaseConnector(props?.coinbase ?? {

package/dist/hooks/use-account.js

@@ -7,6 +7,7 @@ import { useCallback, useRef, useSyncExternalStore } from "react";
 import { useAccount as useAccountInternal } from "wagmi";
 import { getConnector } from "../lib/utils/connector";
 import { extendsWalletAdapter } from "../solana/utils";
+import { useLastConnector } from "./use-last-connector";
 const defaultAccount = {
     chainType: ChainType.EVM,
     isConnected: false,
@@ -110,11 +111,12 @@ const buildUtxoAccount = (btcAccount) => {
  * @bigmi/react for Bitcoin, and @mysten/dapp-kit for Sui) and normalizes their responses into a unified Account type.
  */
 export const useAccount = (args) => {
+    const { lastConnector } = useLastConnector();
+    const wagmiAccount = useAccountInternal();
+    const { wallet } = useWallet();
+    const suiWallet = useCurrentWallet();
+    const suiAccount = useCurrentAccount();
     const btcConfig = useBigmiConfig();
-    // Use @bigmi/client primitives directly instead of @bigmi/react's useAccount
-    // to fix "getServerSnapshot should be cached" error. The upstream hook passes
-    // an uncached getServerSnapshot to useSyncExternalStore, causing infinite loops
-    // during SSR/hydration in Next.js.
     const btcSnapshotCache = useRef(getBtcAccount(btcConfig));
     const btcSubscribe = useCallback((onChange) => watchBtcAccount(btcConfig, {
         onChange: () => {
@@ -124,33 +126,29 @@ export const useAccount = (args) => {
     }), [btcConfig]);
     const btcGetSnapshot = useCallback(() => btcSnapshotCache.current, []);
     const btcAccount = useSyncExternalStore(btcSubscribe, btcGetSnapshot, btcGetSnapshot);
-    const wagmiAccount = useAccountInternal();
-    const { wallet } = useWallet();
-    const suiWallet = useCurrentWallet();
-    const suiAccount = useCurrentAccount();
     const lastConnectedAccount = args?.selectedWallet
-        ? getConnector(args?.selectedWallet.connectors, args?.chainType)
+        ? getConnector(args?.selectedWallet.connectors, args.chainType ?? lastConnector?.chainType)
         : undefined;
-    const solana = buildSolanaAccount(wallet);
-    const sui = buildSuiAccount(suiWallet, suiAccount);
-    const evm = buildEvmAccount(wagmiAccount);
-    const utxo = buildUtxoAccount(btcAccount);
-    const accounts = [evm, solana, sui, utxo];
+    const accounts = [
+        buildEvmAccount(wagmiAccount),
+        buildSolanaAccount(wallet),
+        buildSuiAccount(suiWallet, suiAccount),
+        buildUtxoAccount(btcAccount),
+    ];
     const connectedAccounts = accounts.filter((account) => account.isConnected);
     const selectedChainTypeAccount = args?.chainType
-        ? connectedAccounts.find((account) => account.chainType === args?.chainType) || defaultAccount
+        ? connectedAccounts.find((account) => account.chainType === args.chainType)
         : undefined;
     // If lastConnectedAccount exists, attempt to find a connected account with a matching connector ID or name.
     // If no matching account is found, fallback to the first connected account.
     // If lastConnectedAccount is not present, simply select the first connected account.
     const selectedAccount = lastConnectedAccount
         ? connectedAccounts.find((account) => {
-            const connectorIdMatch = lastConnectedAccount?.id === account.connector?.id;
-            const connectorNameMatch = !lastConnectedAccount?.id &&
-                lastConnectedAccount?.name === account.connector?.name;
-            return connectorIdMatch || connectorNameMatch;
-        }) || connectedAccounts[0]
-        : connectedAccounts[0];
+            return (account.chainType === args?.chainType &&
+                (account.connector?.id === lastConnectedAccount?.id ||
+                    account.connector?.name === lastConnectedAccount?.name));
+        }) || connectedAccounts.find((account) => account.chainType === args?.chainType)
+        : connectedAccounts.find((account) => account.chainType === args?.chainType) || connectedAccounts[0];
     return {
         account: selectedChainTypeAccount || selectedAccount || defaultAccount,
         accounts: connectedAccounts,

package/dist/hooks/use-installed-wallets.js

@@ -9,6 +9,18 @@ import { getConnectorIcon } from "../lib/utils/get-connector-icon";
 import { getWalletPriority } from "../lib/utils/get-wallet-priority";
 import { isWalletInstalled } from "../lib/utils/is-wallet-installed";
 import { extendsWalletAdapter } from "../solana/utils";
+// canonical wallet ID for multi-chain wallets 
+const getCanonicalWalletId = (idOrName) => {
+    const lower = idOrName.toLowerCase();
+    // Explicit multi-chain wallet mapping
+    if (lower.includes("phantom"))
+        return "app.phantom";
+    if (lower.includes("rainbow"))
+        return "me.rainbow";
+    if (lower.includes("metamask"))
+        return "io.metamask";
+    return lower.split(" ")[0];
+};
 export const useInstalledWallets = (filterChainType) => {
     const bigmiConfig = useBigmiConfig?.() ?? null;
     const wagmiConfig = useContext(WagmiContext) ?? null;
@@ -17,7 +29,7 @@ export const useInstalledWallets = (filterChainType) => {
     return useMemo(() => {
         const shouldInclude = (chainType) => !filterChainType || filterChainType === chainType;
         const installedUTXO = shouldInclude(ChainType.UTXO)
-            ? (bigmiConfig?.connectors.filter((c) => isWalletInstalled(c.id)) ?? [])
+            ? bigmiConfig?.connectors.filter((c) => isWalletInstalled(c.id)) ?? []
             : [];
         const installedEVM = shouldInclude(ChainType.EVM)
             ? Array.from(wagmiConfig?.connectors ?? []).filter((c) => isWalletInstalled(c.id))
@@ -26,55 +38,38 @@ export const useInstalledWallets = (filterChainType) => {
             ? solanaWallets.filter((w) => [WalletReadyState.Installed, WalletReadyState.Loadable].includes(w.adapter.readyState))
             : [];
         const installedSui = shouldInclude(ChainType.SUI) && suiWallets ? suiWallets : [];
-        return combineWalletLists(installedUTXO, installedEVM, installedSol, installedSui);
+        return combineWalletLists(installedUTXO, installedEVM, installedSol, installedSui, filterChainType);
     }, [bigmiConfig?.connectors, wagmiConfig?.connectors, solanaWallets, suiWallets, filterChainType]);
 };
-const combineWalletLists = (utxoConnectorList, evmConnectorList, solanaWalletList, suiWalletList) => {
-    const allConnectors = [];
+const combineWalletLists = (utxoConnectorList, evmConnectorList, solanaWalletList, suiWalletList, filterChainType) => {
+    const walletMap = new Map();
+    const addConnector = (rawId, displayName, icon, connector) => {
+        const walletId = getCanonicalWalletId(rawId);
+        if (filterChainType && connector.chainType !== filterChainType)
+            return;
+        const existing = walletMap.get(walletId);
+        if (existing) {
+            existing.connectors.push(connector);
+        }
+        else {
+            walletMap.set(walletId, { id: walletId, name: displayName, icon, connectors: [connector] });
+        }
+    };
     utxoConnectorList.forEach((utxo) => {
-        allConnectors.push({
-            id: utxo.id,
-            name: utxo.name,
-            icon: getConnectorIcon(utxo),
-            connector: { connector: utxo, chainType: ChainType.UTXO },
-        });
+        addConnector(utxo.id, utxo.name, getConnectorIcon(utxo), { connector: utxo, chainType: ChainType.UTXO });
     });
     evmConnectorList.forEach((evm) => {
-        allConnectors.push({
-            id: evm.id,
-            name: evm?.displayName || evm?.name,
-            icon: getConnectorIcon(evm),
-            connector: { connector: evm, chainType: ChainType.EVM },
-        });
+        const name = evm?.displayName || evm?.name;
+        addConnector(evm.id, name, getConnectorIcon(evm), { connector: evm, chainType: ChainType.EVM });
     });
     solanaWalletList.forEach((svm) => {
-        allConnectors.push({
-            id: svm.adapter.name,
-            name: svm.adapter.name,
-            icon: svm.adapter.icon,
-            connector: {
-                connector: extendsWalletAdapter(svm.adapter, svm.adapter.name),
-                chainType: ChainType.SOL,
-            },
+        addConnector(svm.adapter.name, svm.adapter.name, svm.adapter.icon, {
+            connector: extendsWalletAdapter(svm.adapter, svm.adapter.name),
+            chainType: ChainType.SOL,
         });
     });
     suiWalletList.forEach((moveVM) => {
-        allConnectors.push({
-            id: moveVM.name,
-            name: moveVM.name,
-            icon: moveVM.icon,
-            connector: { connector: moveVM, chainType: ChainType.SUI },
-        });
-    });
-    const walletMap = new Map();
-    allConnectors.forEach(({ id, name, icon, connector }) => {
-        const existing = walletMap.get(id);
-        if (existing) {
-            existing.connectors.push(connector);
-        }
-        else {
-            walletMap.set(id, { id, name, icon, connectors: [connector] });
-        }
+        addConnector(moveVM.name, moveVM.name, moveVM.icon, { connector: moveVM, chainType: ChainType.SUI });
     });
     const combinedWallets = Array.from(walletMap.values());
     combinedWallets.sort(walletComparator);
@@ -83,8 +78,7 @@ const combineWalletLists = (utxoConnectorList, evmConnectorList, solanaWalletLis
 const walletComparator = (a, b) => {
     const priorityA = getWalletPriority(a.id);
     const priorityB = getWalletPriority(b.id);
-    if (priorityA !== priorityB) {
+    if (priorityA !== priorityB)
         return priorityA - priorityB;
-    }
-    return a.id?.localeCompare(b.id);
+    return a.id.localeCompare(b.id);
 };

package/dist/hooks/use-last-connector.d.ts

@@ -1,4 +1,10 @@
+import type { ChainType } from "@coin-voyage/shared/types";
+import type { WalletConnector } from "../types/wallet-connector";
 export declare const useLastConnector: () => {
-    lastConnectorId: string | null;
-    updateLastConnectorId: (id: string) => void;
+    lastConnectorId: string | undefined;
+    lastConnector: {
+        id: string;
+        chainType: ChainType;
+    } | null;
+    updateLastConnectorId: (connector: WalletConnector, chainType: ChainType) => void;
 };

package/dist/hooks/use-last-connector.js

@@ -1,13 +1,24 @@
 import { getValue, setValue } from "@coin-voyage/shared/common";
-import { useState } from "react";
+import { useCallback, useState } from "react";
+import { getConnectorId } from "../lib/utils/connector";
 export const useLastConnector = () => {
-    const [lastConnectorId] = useState(() => {
-        // Initialize from localStorage on mount
-        const id = getValue("@coin-voyage/recentConnectorId");
-        return id ?? "";
+    const [lastConnectorIdWithChain, setLastConnectorIdWithChain] = useState(() => {
+        const stored = getValue("@coin-voyage/recentConnectorId");
+        return stored ?? null;
     });
-    const updateLastConnectorId = (id) => {
-        setValue("@coin-voyage/recentConnectorId", id);
-    };
-    return { lastConnectorId, updateLastConnectorId };
+    const updateLastConnectorId = useCallback((connector, chainType) => {
+        const idWithChain = `${getConnectorId(connector)}-${chainType}`;
+        setValue("@coin-voyage/recentConnectorId", idWithChain);
+        setLastConnectorIdWithChain(idWithChain);
+    }, []);
+    // Parse into ID + chainType for easy access
+    const lastConnector = lastConnectorIdWithChain
+        ? (() => {
+            const split = lastConnectorIdWithChain.split("-");
+            const id = split[0];
+            const chainType = split[1];
+            return { id, chainType };
+        })()
+        : null;
+    return { lastConnectorId: lastConnector?.id, lastConnector, updateLastConnectorId };
 };

package/dist/hooks/use-universal-connect.js

@@ -4,7 +4,6 @@ import { useConnectWallet } from "@mysten/dapp-kit";
 import { useWallet } from "@solana/wallet-adapter-react";
 import { useCallback } from "react";
 import { useConfig as useWagmiConfig, useConnect as useWagmiConnect } from "wagmi";
-import { getConnectorId } from "../lib/utils/connector";
 import { useLastConnector } from "./use-last-connector";
 export const useUniversalConnect = (props) => {
     const utxoConfig = useBigmiConfig();
@@ -19,7 +18,7 @@ export const useUniversalConnect = (props) => {
             ...props,
             onSuccess(data, variables) {
                 const connector = variables.connector || variables.connector;
-                updateLastConnectorId(getConnectorId(connector));
+                updateLastConnectorId(connector, ChainType.EVM);
                 onSuccess?.(data, {
                     chainId: variables?.chainId,
                     connector,
@@ -34,7 +33,7 @@ export const useUniversalConnect = (props) => {
             ...props,
             onSuccess(data, variables) {
                 const connector = variables.connector;
-                updateLastConnectorId(getConnectorId(connector));
+                updateLastConnectorId(connector, ChainType.UTXO);
                 onSuccess?.(data, {
                     chainId: ChainId.BTC,
                     connector,
@@ -83,7 +82,7 @@ export const useUniversalConnect = (props) => {
                             walletAdapter.connect().catch(handleError);
                         });
                     }
-                    updateLastConnectorId(getConnectorId(connector));
+                    updateLastConnectorId(connector, ChainType.SOL);
                     onSuccess?.(undefined, { connector: walletAdapter });
                     break;
                 }
@@ -93,7 +92,7 @@ export const useUniversalConnect = (props) => {
                     }, {
                         onError,
                         onSuccess: async (data) => {
-                            updateLastConnectorId(getConnectorId(connector));
+                            updateLastConnectorId(connector, ChainType.SUI);
                             onSuccess?.(data, { connector });
                         },
                         onSettled: onSettled,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coin-voyage/crypto",
   "description": "Crypto utilities for Coin Voyage",
-  "version": "2.2.3-beta.0",
+  "version": "2.2.3",
   "private": false,
   "sideEffects": false,
   "author": "Lars <lars@coinvoyage.io>",
@@ -50,7 +50,7 @@
     "@solana/wallet-adapter-walletconnect": "0.1.21",
     "@solana/wallet-adapter-base": "0.9.27",
     "@solana/wallet-adapter-coinbase": "0.1.23",
-    "@coin-voyage/shared": "2.2.5-beta.8"
+    "@coin-voyage/shared": "2.2.5"
   },
   "devDependencies": {
     "@types/elliptic": "6.4.18"