@orderly.network/wallet-connector-privy 2.8.12 → 2.8.13-alpha.0

package/dist/index.js

@@ -1009,7 +1009,7 @@ var getChainType = (chainId) => {
 // src/hooks/useWallet.tsx
 function useWallet2() {
   const { track } = hooks.useTrack();
-  const { walletChainTypeConfig } = useWalletConnectorPrivy();
+  const { walletChainTypeConfig, initChains, network } = useWalletConnectorPrivy();
   const [connectorKey, setConnectorKey] = hooks.useLocalStorage(types.ConnectorKey, "");
   const {
     disconnect: disconnectEVM,
@@ -1046,6 +1046,23 @@ function useWallet2() {
   const [walletType, setWalletType] = React19.useState(null);
   const { storageChain, setStorageChain } = hooks.useStorageChain();
   const { setOpenConnectDrawer, targetWalletType, setTargetWalletType } = useWalletConnectorPrivy();
+  const supportedEvmChainIds = React19.useMemo(() => {
+    const ids = initChains?.map((c) => c.id).filter((id) => !types.SolanaChains.has(id) && !types.AbstractChains.has(id));
+    return new Set(ids ?? []);
+  }, [initChains]);
+  const preferredEvmChainId = React19.useMemo(() => {
+    const preferredOrder = network === "mainnet" ? types.defaultMainnetChains : types.defaultTestnetChains;
+    return preferredOrder.map((c) => c.id).find((id) => supportedEvmChainIds.has(id));
+  }, [network, supportedEvmChainIds]);
+  const defaultEvmChainId = React19.useMemo(() => {
+    for (const chain of initChains ?? []) {
+      if (!types.SolanaChains.has(chain.id) && !types.AbstractChains.has(chain.id)) {
+        return chain.id;
+      }
+    }
+    return void 0;
+  }, [initChains]);
+  const fallbackEvmChainId = preferredEvmChainId ?? defaultEvmChainId;
   const isManual = React19.useRef(false);
   const connect = (params) => {
     setTargetWalletType(void 0);
@@ -1158,7 +1175,11 @@ function useWallet2() {
       switch (walletType2) {
         case "EVM" /* EVM */:
           if (privyWalletEVM) {
-            setStorageChain(privyWalletEVM.chain.id);
+            const desired = privyWalletEVM.chain.id;
+            const nextChainId = supportedEvmChainIds.has(desired) ? desired : fallbackEvmChainId;
+            if (typeof nextChainId === "number") {
+              setStorageChain(nextChainId);
+            }
             toWallet = privyWalletEVM.accounts[0].address;
           }
           break;
@@ -1254,6 +1275,11 @@ function useWallet2() {
       }
     }
   }, [connectorKey, privyWalletEVM, privyWalletSOL, storageChain]);
+  React19.useEffect(() => {
+    if (connectorKey === "privy" /* PRIVY */ && isConnectedPrivy && types.AbstractChains.has(storageChain.chainId)) {
+      setOpenConnectDrawer(true);
+    }
+  }, [connectorKey, isConnectedPrivy, storageChain]);
   React19.useEffect(() => {
     if (connectorKey === "privy" /* PRIVY */) {
       return;
@@ -3059,8 +3085,15 @@ function InitPrivyProvider({
   if (!privyConfig) {
     return children;
   }
+  const { network } = useWalletConnectorPrivy();
   const config = React19.useMemo(() => {
     const chains = initChains;
+    const preferredDefaultChainIds = (network === "mainnet" ? types.defaultMainnetChains : types.defaultTestnetChains).map((c) => c.id);
+    const preferredDefaultChain = preferredDefaultChainIds.map((id) => chains.find((c) => c.id === id)).find((c) => !!c);
+    const firstEvmChain = chains.find(
+      (chain) => !types.SolanaChains.has(chain.id) && !types.AbstractChains.has(chain.id)
+    );
+    const defaultEvmChain = preferredDefaultChain ?? firstEvmChain ?? chains[0];
     return {
       loginMethods: privyConfig.config?.loginMethods || [
         "email",
@@ -3084,10 +3117,10 @@ function InitPrivyProvider({
           enabled: false
         }
       },
-      defaultChain: chains[0],
+      defaultChain: defaultEvmChain,
       supportedChains: chains
     };
-  }, [initChains, privyConfig]);
+  }, [initChains, privyConfig, network]);
   if (!initChains.length) {
     return;
   }