@orderly.network/wallet-connector-privy 2.8.1 → 2.8.2

package/dist/index.mjs

@@ -2,8 +2,8 @@ import React19, { createContext, useState, useEffect, useMemo, useContext, useRe
 import * as viemExport from 'viem';
 import { defineChain } from 'viem';
 import { mainnet, abstract, abstractTestnet } from 'viem/chains';
-import { useWalletConnector, useAccount, useSWR, fetcher, WalletConnectorContext, useTrack, useStorageLedgerAddress, useLocalStorage, useStorageChain } from '@orderly.network/hooks';
-import { SOLANA_TESTNET_CHAINID, SOLANA_MAINNET_CHAINID, ChainNamespace, TesntTokenFallback, ArbitrumSepoliaTokenInfo, SolanaDevnetTokenInfo, ABSTRACT_CHAIN_ID_MAP, AccountStatusEnum, ABSTRACT_TESTNET_CHAINID, ABSTRACT_MAINNET_CHAINID, SolanaChains as SolanaChains$1, AbstractChains, ArbitrumSepoliaChainInfo, SolanaDevnetChainInfo, EMPTY_OBJECT, TrackerEventName, ConnectorKey } from '@orderly.network/types';
+import { useWalletConnector, useAccount, useMainnetChainsStore, useTestnetChainsStore, useSwapSupportStore, WalletConnectorContext, useTrack, useStorageLedgerAddress, useLocalStorage, useStorageChain } from '@orderly.network/hooks';
+import { SOLANA_TESTNET_CHAINID, SOLANA_MAINNET_CHAINID, ChainNamespace, ABSTRACT_CHAIN_ID_MAP, AccountStatusEnum, ABSTRACT_TESTNET_CHAINID, ABSTRACT_MAINNET_CHAINID, SolanaChains as SolanaChains$1, AbstractChains, ArbitrumSepoliaChainInfo, SolanaDevnetChainInfo, EMPTY_OBJECT, TrackerEventName, ConnectorKey } from '@orderly.network/types';
 import { modal, useModal, SimpleSheet, SheetHeader, Text, Flex, Divider, cn, installExtension, ExtensionPositionEnum, useScreen, formatAddress, Button, SimpleDialog, TooltipProvider, CloseSquareFillIcon, ScrollArea, ExclamationFillIcon, Tooltip, CopyIcon, Checkbox, toast, DropdownMenuRoot, DropdownMenuTrigger, DropdownMenuPortal, DropdownMenuContent, DropdownMenuItem, ChevronDownIcon, ChevronUpIcon, Grid, ChainIcon, Popover } from '@orderly.network/ui';
 import { useTranslation, Trans } from '@orderly.network/i18n';
 import { AbstractWalletProvider as AbstractWalletProvider$1, useLoginWithAbstract, useAbstractClient, useGlobalWalletSignerAccount } from '@abstract-foundation/agw-react';
@@ -25,11 +25,11 @@ var Network = /* @__PURE__ */ ((Network3) => {
   Network3["testnet"] = "testnet";
   return Network3;
 })(Network || {});
-var WalletType = /* @__PURE__ */ ((WalletType5) => {
-  WalletType5["EVM"] = "EVM";
-  WalletType5["SOL"] = "SOL";
-  WalletType5["ABSTRACT"] = "Abstract";
-  return WalletType5;
+var WalletType = /* @__PURE__ */ ((WalletType4) => {
+  WalletType4["EVM"] = "EVM";
+  WalletType4["SOL"] = "SOL";
+  WalletType4["ABSTRACT"] = "Abstract";
+  return WalletType4;
 })(WalletType || {});
 var WalletConnectType = /* @__PURE__ */ ((WalletConnectType2) => {
   WalletConnectType2["EVM"] = "EVM";
@@ -1622,7 +1622,24 @@ function EVMConnectArea({
 // src/components/renderConnector/index.tsx
 function RenderConnector() {
   const { connect } = useWallet2();
-  const { setOpenConnectDrawer, connectorWalletType, walletChainTypeConfig } = useWalletConnectorPrivy();
+  const {
+    setOpenConnectDrawer,
+    connectorWalletType,
+    walletChainTypeConfig,
+    targetWalletType
+  } = useWalletConnectorPrivy();
+  const { storageChain } = useStorageChain();
+  const selectedWalletType = (() => {
+    if (targetWalletType)
+      return targetWalletType;
+    if (!storageChain?.chainId)
+      return void 0;
+    try {
+      return getChainType(parseInt(storageChain.chainId));
+    } catch {
+      return void 0;
+    }
+  })();
   const handleConnect = (params) => {
     connect(params);
     if (params.walletType === "privy" /* PRIVY */) {
@@ -1691,7 +1708,30 @@ function RenderConnector() {
       }
     );
   };
-  return /* @__PURE__ */ React19.createElement(ScrollArea, { className: "oui-flex oui-grow oui-shrik oui-basis-auto oui-custom-scrollbar" }, /* @__PURE__ */ React19.createElement("div", { className: cn("oui-flex oui-flex-col oui-gap-4", "md:oui-gap-5") }, renderPrivyConnectArea(), renderWagmiConnectArea(), renderSolanaConnectArea(), renderAbstractConnectArea()));
+  const walletOrder = ["evm", "sol", "abstract"];
+  const typeToKey = {
+    ["EVM" /* EVM */]: "evm",
+    ["SOL" /* SOL */]: "sol",
+    ["Abstract" /* ABSTRACT */]: "abstract"
+  };
+  const prioritizedKey = selectedWalletType ? typeToKey[selectedWalletType] : void 0;
+  const orderedWalletKeys = prioritizedKey ? [
+    prioritizedKey,
+    ...walletOrder.filter((k) => k !== prioritizedKey)
+  ] : walletOrder;
+  const renderByKey = (key) => {
+    switch (key) {
+      case "evm":
+        return renderWagmiConnectArea();
+      case "sol":
+        return renderSolanaConnectArea();
+      case "abstract":
+        return renderAbstractConnectArea();
+      default:
+        return null;
+    }
+  };
+  return /* @__PURE__ */ React19.createElement(ScrollArea, { className: "oui-flex oui-grow oui-shrik oui-basis-auto oui-custom-scrollbar" }, /* @__PURE__ */ React19.createElement("div", { className: cn("oui-flex oui-flex-col oui-gap-4", "md:oui-gap-5") }, renderPrivyConnectArea(), orderedWalletKeys.map((key) => /* @__PURE__ */ React19.createElement(React19.Fragment, { key }, renderByKey(key)))));
 }
 function SwitchNetworkTips({
   tipsContent
@@ -3123,19 +3163,6 @@ var WagmiWallet = (props) => {
 };
 
 // src/provider.tsx
-var commonSwrOpts = {
-  revalidateIfStale: false,
-  revalidateOnFocus: false,
-  revalidateOnReconnect: false,
-  // If false, undefined data gets cached against the key.
-  revalidateOnMount: true,
-  // don't duplicate a request with the same key for 1hr
-  dedupingInterval: 36e5
-};
-TesntTokenFallback([
-  ArbitrumSepoliaTokenInfo,
-  SolanaDevnetTokenInfo
-]);
 var testnetChainFallback = [ArbitrumSepoliaChainInfo, SolanaDevnetChainInfo];
 var formatSwapChainInfo = (data = {}) => {
   return Object.keys(data).map((key) => {
@@ -3220,7 +3247,18 @@ function WalletConnectorPrivyProvider(props) {
   const [initChains, setInitChains] = useState([]);
   const [mainnetChains, setMainnetChains] = useState([]);
   const [testnetChains, setTestnetChains] = useState([]);
-  const initRef = useRef(false);
+  const [mainnetChainInfos, setMainnetChainInfos] = useState(null);
+  const [testChainInfos, setTestChainInfos] = useState(
+    null
+  );
+  const fetchMainChains = useMainnetChainsStore((state) => state.fetchData);
+  const fetchTestChains = useTestnetChainsStore((state) => state.fetchData);
+  const mainnetChainInfosFromStore = useMainnetChainsStore(
+    (state) => state.data
+  );
+  const testChainInfosFromStore = useTestnetChainsStore((state) => state.data);
+  const hasCustomChains = Array.isArray(props.customChains) && props.customChains.length > 0;
+  const initRef = useRef(hasCustomChains);
   const [openConnectDrawer, setOpenConnectDrawer] = useState(false);
   const [targetWalletType, setTargetWalletType] = useState();
   const [privyConfig, setPrivyConfig] = useState({
@@ -3265,24 +3303,24 @@ function WalletConnectorPrivyProvider(props) {
     });
     return chainTypeObj;
   }, [initChains]);
-  const { data: swapChainInfoRes, isLoading: swapLoading } = useSWR(
-    !props.customChains && props.enableSwapDeposit ? "https://fi-api.woo.org/swap_support" : null,
-    (url) => fetch(url).then((res) => res.json()),
-    commonSwrOpts
-  );
-  const { data: mainnetChainInfos } = useSWR(
-    !props.customChains ? "https://api.orderly.org/v1/public/chain_info" : null,
-    fetcher,
-    commonSwrOpts
-  );
-  const { data: testChainInfos } = useSWR(
-    !props.customChains ? "https://testnet-api.orderly.org/v1/public/chain_info" : null,
-    fetcher,
-    {
-      ...commonSwrOpts,
-      fallbackData: testnetChainFallback
-    }
-  );
+  const {
+    data: swapChainInfoRes,
+    // loading: swapLoading,
+    fetchData: fetchSwapData
+  } = useSwapSupportStore();
+  useEffect(() => {
+    if (!props.enableSwapDeposit || !!props.customChains)
+      return;
+    fetchSwapData();
+  }, [props.enableSwapDeposit, props.customChains]);
+  useEffect(() => {
+    fetchMainChains().then((data) => {
+      setMainnetChainInfos(data);
+    });
+    fetchTestChains().then((data) => {
+      setTestChainInfos(data);
+    });
+  }, []);
   const handleCustomerChains = () => {
     const testChains = processChainInfo(
       props.customChains.testnet?.map((item) => item.network_infos)
@@ -3365,21 +3403,33 @@ function WalletConnectorPrivyProvider(props) {
     ]
   );
   useEffect(() => {
-    if (props.customChains) {
+    if (initRef.current)
+      return;
+    if (hasCustomChains) {
       return;
     }
-    if (!mainnetChainInfos || !testChainInfos || swapLoading) {
+    const hasStoreData = mainnetChainInfosFromStore && testChainInfosFromStore;
+    const hasApiData = mainnetChainInfos && testChainInfos;
+    if (!hasStoreData && !hasApiData) {
+      return;
+    }
+    if (!swapChainInfoRes) {
       return;
     }
     let testChainsList = [];
     let mainnetChainsList = [];
     try {
-      testChainsList = testChainInfos;
-      mainnetChainsList = mainnetChainInfos;
+      if (hasStoreData) {
+        testChainsList = testChainInfosFromStore;
+        mainnetChainsList = mainnetChainInfosFromStore;
+      } else {
+        testChainsList = testChainInfos || testnetChainFallback;
+        mainnetChainsList = mainnetChainInfos || [];
+      }
       const testChains = processChainInfo(testChainsList);
       const mainnetChains2 = processChainInfo(mainnetChainsList);
       const swapChains = processChainInfo(
-        formatSwapChainInfo(swapChainInfoRes?.data || {})
+        formatSwapChainInfo(swapChainInfoRes || {})
       );
       const chains = [...testChains, ...mainnetChains2];
       const filterSwapChains = swapChains.filter(
@@ -3397,8 +3447,10 @@ function WalletConnectorPrivyProvider(props) {
     props.customChains,
     mainnetChainInfos,
     testChainInfos,
-    swapChainInfoRes,
-    swapLoading
+    mainnetChainInfosFromStore,
+    testChainInfosFromStore,
+    swapChainInfoRes
+    // swapLoading,
   ]);
   useEffect(() => {
     if (props.customChains) {