@orderly.network/wallet-connector-privy 2.9.1 → 2.10.0-alpha.1

package/dist/index.d.mts

@@ -125,7 +125,6 @@ interface WalletConnectorPrivyProps extends PropsWithChildren {
     headerProps?: {
         mobile: React.ReactNode;
     };
-    enableSwapDeposit?: boolean;
 }
 declare function WalletConnectorPrivyProvider(props: WalletConnectorPrivyProps): React.JSX.Element | null;
 

package/dist/index.d.ts

@@ -125,7 +125,6 @@ interface WalletConnectorPrivyProps extends PropsWithChildren {
     headerProps?: {
         mobile: React.ReactNode;
     };
-    enableSwapDeposit?: boolean;
 }
 declare function WalletConnectorPrivyProvider(props: WalletConnectorPrivyProps): React.JSX.Element | null;
 

package/dist/index.js

@@ -529,6 +529,7 @@ var defaultUseSolanaWallet = {
   connect: () => Promise.resolve(),
   wallet: null,
   publicKey: null,
+  connecting: false,
   signMessage: () => Promise.resolve(),
   signTransaction: () => Promise.resolve(),
   sendTransaction: () => Promise.resolve(),
@@ -548,6 +549,7 @@ var SolanaWalletProvider = ({
     connect: connectSolana,
     wallet: walletSolana,
     publicKey,
+    connecting,
     signMessage,
     signTransaction,
     sendTransaction,
@@ -611,6 +613,7 @@ var SolanaWalletProvider = ({
       connectSolana,
       walletSolana,
       publicKey,
+      connecting,
       signMessage,
       signTransaction,
       sendTransaction,
@@ -623,6 +626,7 @@ var SolanaWalletProvider = ({
     connectSolana,
     walletSolana,
     publicKey,
+    connecting,
     signMessage,
     signTransaction,
     sendTransaction,
@@ -630,9 +634,18 @@ var SolanaWalletProvider = ({
     network,
     solanaInfo
   ]);
+  const dedupedWallets = React19.useMemo(() => {
+    const seen = /* @__PURE__ */ new Set();
+    return wallets.filter((w) => {
+      const name = w?.adapter?.name?.toLowerCase?.();
+      if (!name || seen.has(name)) return !name;
+      seen.add(name);
+      return true;
+    });
+  }, [wallets]);
   const value = React19.useMemo(
     () => ({
-      wallets,
+      wallets: dedupedWallets,
       connectedChain: publicKey ? {
         id: SolanaChainsMap.get(network),
         namespace: types.ChainNamespace.solana
@@ -642,7 +655,7 @@ var SolanaWalletProvider = ({
       disconnect: disconnectWallet,
       isConnected: !!publicKey
     }),
-    [wallets, publicKey, wallet, network]
+    [dedupedWallets, publicKey, wallet, network]
   );
   return /* @__PURE__ */ React19__default.default.createElement(SolanaWalletContext.Provider, { value }, children);
 };
@@ -1009,6 +1022,7 @@ var getChainType = (chainId) => {
 // src/hooks/useWallet.tsx
 function useWallet2() {
   const { track } = hooks.useTrack();
+  const ee = hooks.useEventEmitter();
   const { walletChainTypeConfig, initChains, network } = useWalletConnectorPrivy();
   const [connectorKey, setConnectorKey] = hooks.useLocalStorage(types.ConnectorKey, "");
   const {
@@ -1073,7 +1087,15 @@ function useWallet2() {
       }
       if (params.walletType === "SOL" /* SOL */) {
         setConnectorKey("SOL" /* SOL */);
-        connectSOL(params.walletAdapter.name).then();
+        connectSOL(params.walletAdapter.name).catch((err) => {
+          const message = String(err?.message ?? "").toLowerCase();
+          if (message === "wallet not connected") {
+            return;
+          }
+          ee.emit("wallet:connect-error", {
+            message: err?.message || "Please switch to a wallet with Solana address."
+          });
+        });
       }
       if (params.walletType === "privy" /* PRIVY */) {
         setConnectorKey("privy" /* PRIVY */);
@@ -3145,6 +3167,7 @@ function InitSolanaProvider({
   onError,
   children
 }) {
+  const ee = hooks.useEventEmitter();
   const { network, setSolanaInfo, connectorWalletType } = useWalletConnectorPrivy();
   if (connectorWalletType.disableSolana) {
     return children;
@@ -3164,7 +3187,19 @@ function InitSolanaProvider({
       network: network === "mainnet" ? walletAdapterBase.WalletAdapterNetwork.Mainnet : walletAdapterBase.WalletAdapterNetwork.Devnet
     });
   }, [network, mainnetRpc, devnetRpc, setSolanaInfo]);
-  return /* @__PURE__ */ React19__default.default.createElement(walletAdapterReact.WalletProvider, { wallets, onError, autoConnect: true }, children);
+  const handleOnError = React19.useCallback(
+    (error, adapter) => {
+      if (error.name === "WalletAccountError") {
+        ee.emit("wallet:connect-error", {
+          message: "Please switch to a wallet with Solana address."
+        });
+        return;
+      }
+      onError?.(error, adapter);
+    },
+    [ee, onError]
+  );
+  return /* @__PURE__ */ React19__default.default.createElement(walletAdapterReact.WalletProvider, { wallets, onError: handleOnError, autoConnect: true }, children);
 }
 
 // src/providers/solana/index.tsx
@@ -3220,21 +3255,6 @@ var WagmiWallet = (props) => {
 
 // src/provider.tsx
 var testnetChainFallback = [types.ArbitrumSepoliaChainInfo, types.SolanaDevnetChainInfo];
-var formatSwapChainInfo = (data = {}) => {
-  return Object.keys(data).map((key) => {
-    const chain = data[key];
-    const { network_infos, token_infos } = chain;
-    const nativeToken = token_infos.find(
-      (item) => item.symbol === network_infos.currency_symbol
-    );
-    if (nativeToken) {
-      network_infos.currency_decimal = nativeToken.decimals;
-    } else {
-      network_infos.currency_decimal = 18;
-    }
-    return network_infos;
-  });
-};
 var processChainInfo = (chainInfo) => chainInfo.map(
   (row) => viemExport.defineChain({
     id: Number(row.chain_id),
@@ -3363,15 +3383,6 @@ function WalletConnectorPrivyProvider(props) {
     });
     return chainTypeObj;
   }, [initChains]);
-  const {
-    data: swapChainInfoRes,
-    // loading: swapLoading,
-    fetchData: fetchSwapData
-  } = hooks.useSwapSupportStore();
-  React19.useEffect(() => {
-    if (!props.enableSwapDeposit || !!props.customChains) return;
-    fetchSwapData();
-  }, [props.enableSwapDeposit, props.customChains]);
   React19.useEffect(() => {
     if (!mainnetChainsHydrated || !testChainsHydrated) return;
     if (Array.isArray(hooks.useMainnetChainsStore.getState().data) && hooks.useTestnetChainsStore.getState().data) {
@@ -3475,9 +3486,6 @@ function WalletConnectorPrivyProvider(props) {
     if (!hasStoreData && !hasApiData) {
       return;
     }
-    if (props.enableSwapDeposit && !swapChainInfoRes) {
-      return;
-    }
     let testChainsList = [];
     let mainnetChainsList = [];
     try {
@@ -3490,16 +3498,10 @@ function WalletConnectorPrivyProvider(props) {
       }
       const testChains = processChainInfo(testChainsList);
       const mainnetChains2 = processChainInfo(mainnetChainsList);
-      const swapChains = processChainInfo(
-        formatSwapChainInfo(swapChainInfoRes || {})
-      );
       const chains = [...testChains, ...mainnetChains2];
-      const filterSwapChains = swapChains.filter(
-        (item) => !chains.some((chain) => chain.id === item.id)
-      );
       setTestnetChains(testChains);
       setMainnetChains(mainnetChains2);
-      setInitChains([...chains, ...filterSwapChains]);
+      setInitChains(chains);
     } catch (error) {
       testChainsList = [types.ArbitrumSepoliaChainInfo, types.SolanaDevnetChainInfo];
       mainnetChainsList = [];
@@ -3510,10 +3512,7 @@ function WalletConnectorPrivyProvider(props) {
     mainnetChainInfos,
     testChainInfos,
     mainnetChainInfosFromStore,
-    testChainInfosFromStore,
-    swapChainInfoRes,
-    props.enableSwapDeposit
-    // swapLoading,
+    testChainInfosFromStore
   ]);
   React19.useEffect(() => {
     if (props.customChains) {