@orderly.network/wallet-connector-privy 3.0.0-beta.1 → 3.0.0-beta.2

package/dist/index.js

@@ -188,16 +188,35 @@ var getPrivyEmbeddedWalletChainId = (chainId) => {
   }
   return parseInt(chainId.split("eip155:")[1]);
 };
-var defaultUseSolanaWallets = {
-  ready: false,
-  wallets: [],
-  createWallet: () => Promise.resolve(),
-  exportWallet: () => Promise.resolve()
+var defaultPrivyWalletContextValue = {
+  connect: () => {
+  },
+  walletEVM: null,
+  walletSOL: null,
+  allWalletsEVM: [],
+  allWalletsSOL: [],
+  isConnected: false,
+  switchChain: () => Promise.reject(new Error("Privy is disabled")),
+  linkedAccount: null,
+  exportWallet: () => Promise.reject(new Error("Privy is disabled")),
+  createEvmWallet: () => Promise.reject(new Error("Privy is disabled")),
+  createSolanaWallet: () => Promise.reject(new Error("Privy is disabled")),
+  selectWallet: () => {
+  },
+  disconnect: () => Promise.resolve()
 };
-var defaultUseWallets = { wallets: [] };
 var PrivyWalletContext = React19.createContext(null);
 var PrivyWalletProvider = ({
   children
+}) => {
+  const { connectorWalletType } = useWalletConnectorPrivy();
+  if (connectorWalletType.disablePrivy) {
+    return /* @__PURE__ */ React19__default.default.createElement(PrivyWalletContext.Provider, { value: defaultPrivyWalletContextValue }, children);
+  }
+  return /* @__PURE__ */ React19__default.default.createElement(PrivyWalletProviderInner, null, children);
+};
+var PrivyWalletProviderInner = ({
+  children
 }) => {
   const { network, solanaInfo, setSolanaInfo, connectorWalletType } = useWalletConnectorPrivy();
   const {
@@ -209,66 +228,115 @@ var PrivyWalletProvider = ({
     exportWallet: exportEvmWallet,
     createWallet: createEvmWallet
   } = reactAuth.usePrivy();
-  const { wallets: walletsEVM } = connectorWalletType.disablePrivy ? defaultUseWallets : reactAuth.useWallets();
+  const { wallets: walletsEVM } = reactAuth.useWallets();
   const connectedRef = React19.useRef(false);
   const {
     ready: solanaReady,
     wallets: walletsSOL,
     createWallet: createSolanaWallet,
     exportWallet: exportSolanaWallet
-  } = connectorWalletType.disablePrivy ? defaultUseSolanaWallets : reactAuth.useSolanaWallets();
+  } = reactAuth.useSolanaWallets();
   const [walletEVM, setWalletEVM] = React19.useState(null);
   const [walletSOL, setWalletSOL] = React19.useState(null);
+  const [allWalletsEVM, setAllWalletsEVM] = React19.useState([]);
+  const [allWalletsSOL, setAllWalletsSOL] = React19.useState([]);
+  const [selectedEvmAddress, setSelectedEvmAddress] = hooks.useLocalStorage(
+    "privy_selected_evm_address",
+    ""
+  );
+  const [selectedSolAddress, setSelectedSolAddress] = hooks.useLocalStorage(
+    "privy_selected_sol_address",
+    ""
+  );
+  const rawEvmWalletsRef = React19.useRef(/* @__PURE__ */ new Map());
   const { track } = hooks.useTrack();
   const linkedAccount = React19.useMemo(() => {
-    if (user && user.linkedAccounts) {
-      const account = user.linkedAccounts.filter((item) => item.type !== "wallet").sort(
-        (a, b) => (b.latestVerifiedAt?.getTime() ?? 0) - (a.latestVerifiedAt?.getTime() ?? 0)
-      )[0];
-      let address = null;
-      if (account.type === "email") {
-        address = account.address;
-      } else if (account.type === "twitter_oauth") {
-        address = `@${account.username}`;
-      } else if (account.type === "google_oauth") {
-        address = `@${account.name}`;
-      } else if (account.type === "telegram") {
-        address = `@${account.username}`;
-      }
-      return {
-        type: account.type,
-        address
-      };
+    const account = user?.linkedAccounts?.filter((item) => item.type !== "wallet" && item.type !== "smart_wallet").sort(
+      (a, b) => (b.latestVerifiedAt?.getTime() ?? 0) - (a.latestVerifiedAt?.getTime() ?? 0)
+    )[0];
+    if (!account) {
+      return null;
     }
-    return null;
+    let address = null;
+    if (account.type === "email") {
+      address = account.address;
+    } else if (account.type === "twitter_oauth") {
+      address = `@${account.username}`;
+    } else if (account.type === "google_oauth") {
+      address = `@${account.name}`;
+    } else if (account.type === "telegram") {
+      address = `@${account.username}`;
+    }
+    return {
+      type: account.type,
+      address
+    };
   }, [user]);
   const switchChain = (chainId) => {
-    const wallet = walletsEVM[0];
-    if (wallet) {
-      return wallet.switchChain(chainId);
+    const selectedAddress = walletEVM?.accounts[0]?.address;
+    const rawWallet = selectedAddress ? rawEvmWalletsRef.current.get(selectedAddress) : void 0;
+    if (rawWallet) {
+      return rawWallet.switchChain(chainId);
+    }
+    const fallback = walletsEVM.find((w) => w.connectorType === "embedded") ?? walletsEVM[0];
+    if (fallback) {
+      return fallback.switchChain(chainId);
     }
     return Promise.reject("no wallet");
   };
-  const connect = () => {
+  const connect = (params) => {
+    if (params?.extraType) {
+      login({ loginMethods: [params.extraType] });
+      return;
+    }
     login();
   };
   const disconnect = () => {
     return logout();
   };
-  const exportWallet = (namespace) => {
+  const exportWallet = (namespace, address) => {
     if (namespace === types.ChainNamespace.evm) {
       track(types.TrackerEventName.clickExportPrivateKey, {
         type: "evm"
       });
-      return exportEvmWallet();
+      const addr = address ?? walletEVM?.accounts[0]?.address;
+      return exportEvmWallet(addr ? { address: addr } : void 0);
     } else if (namespace === types.ChainNamespace.solana) {
       track(types.TrackerEventName.clickExportPrivateKey, {
         type: "solana"
       });
-      return exportSolanaWallet();
+      const addr = address ?? walletSOL?.accounts[0]?.address;
+      return exportSolanaWallet(addr ? { address: addr } : void 0);
     }
     return Promise.reject("no namespace");
   };
+  const selectWallet = React19.useCallback(
+    (namespace, address) => {
+      if (namespace === types.ChainNamespace.evm) {
+        const found = allWalletsEVM.find(
+          (w) => w.accounts[0]?.address === address
+        );
+        if (found) {
+          setWalletEVM(found);
+          setSelectedEvmAddress(address);
+        }
+      } else if (namespace === types.ChainNamespace.solana) {
+        const found = allWalletsSOL.find(
+          (w) => w.accounts[0]?.address === address
+        );
+        if (found) {
+          setWalletSOL(found);
+          setSelectedSolAddress(address);
+        }
+      }
+    },
+    [
+      allWalletsEVM,
+      allWalletsSOL,
+      setSelectedEvmAddress,
+      setSelectedSolAddress
+    ]
+  );
   const isConnected = React19.useMemo(() => {
     if (ready && authenticated) {
       return true;
@@ -277,76 +345,81 @@ var PrivyWalletProvider = ({
   }, [ready, authenticated]);
   React19.useEffect(() => {
     if (!authenticated || !walletsEVM || !walletsEVM[0]) {
+      setAllWalletsEVM([]);
       setWalletEVM(null);
       return;
     }
-    const wallet = walletsEVM[0];
-    wallet.getEthereumProvider().then((provider) => {
-      setWalletEVM({
-        label: "privy",
-        icon: "",
-        provider,
-        accounts: [
-          {
-            address: wallet.address
-          }
-        ],
-        chains: [
-          {
-            id: getPrivyEmbeddedWalletChainId(wallet.chainId) ?? 1,
-            namespace: types.ChainNamespace.evm
-          }
-        ],
-        chain: {
-          id: getPrivyEmbeddedWalletChainId(wallet.chainId) ?? 1,
-          namespace: types.ChainNamespace.evm
-        }
-      });
+    const embeddedWallets = walletsEVM.filter(
+      (w) => w.connectorType === "embedded"
+    );
+    const wallets = embeddedWallets.length > 0 ? embeddedWallets : [walletsEVM[0]];
+    const newMap = /* @__PURE__ */ new Map();
+    for (const w of wallets) {
+      newMap.set(w.address, w);
+    }
+    rawEvmWalletsRef.current = newMap;
+    Promise.all(
+      wallets.map(
+        (w) => w.getEthereumProvider().then(
+          (provider) => ({
+            label: "privy",
+            icon: "",
+            provider,
+            accounts: [{ address: w.address }],
+            chains: [
+              {
+                id: getPrivyEmbeddedWalletChainId(w.chainId) ?? 1,
+                namespace: types.ChainNamespace.evm
+              }
+            ],
+            chain: {
+              id: getPrivyEmbeddedWalletChainId(w.chainId) ?? 1,
+              namespace: types.ChainNamespace.evm
+            }
+          })
+        )
+      )
+    ).then((builtWallets) => {
+      setAllWalletsEVM(builtWallets);
+      const preferred = selectedEvmAddress ? builtWallets.find(
+        (w) => w.accounts[0]?.address === selectedEvmAddress
+      ) : void 0;
+      setWalletEVM(preferred ?? builtWallets[0] ?? null);
+    }).catch((e) => {
+      setAllWalletsEVM([]);
+      setWalletEVM(null);
     });
   }, [walletsEVM, authenticated]);
   React19.useEffect(() => {
     if (!authenticated) {
+      setAllWalletsSOL([]);
       setWalletSOL(null);
       return;
     }
     if (!solanaReady) {
       return;
     }
-    if (!user) {
-      return;
-    }
-    const embededSolanaWallet = (user?.linkedAccounts).find(
-      (item) => item.chainType === "solana" && item.connectorType === "embedded"
-    );
-    if (!embededSolanaWallet) {
-      createSolanaWallet().then();
-      return;
-    }
     if (!walletsSOL || !walletsSOL[0]) {
+      setAllWalletsSOL([]);
+      setWalletSOL(null);
       return;
     }
-    const wallet = walletsSOL.find((w) => w.connectorType === "embedded");
-    if (wallet) {
-      if (walletSOL && wallet.address === walletSOL.accounts[0].address) {
-        if (walletSOL.chain.id === SolanaChainsMap.get(network)) {
-          return;
-        }
-      }
-      setWalletSOL({
+    const embeddedWallets = walletsSOL.filter(
+      (w) => w.connectorType === "embedded"
+    );
+    const wallets = embeddedWallets.length > 0 ? embeddedWallets : [walletsSOL[0]];
+    const builtWallets = wallets.map(
+      (w) => ({
         label: "privy",
         icon: "",
         provider: {
-          signMessage: wallet.signMessage,
-          signTransaction: wallet.signTransaction,
-          sendTransaction: wallet.sendTransaction,
+          signMessage: w.signMessage,
+          signTransaction: w.signTransaction,
+          sendTransaction: w.sendTransaction,
           network: solanaInfo?.network ?? walletAdapterBase.WalletAdapterNetwork.Devnet,
           rpcUrl: solanaInfo?.rpcUrl ?? void 0
         },
-        accounts: [
-          {
-            address: wallet.address
-          }
-        ],
+        accounts: [{ address: w.address }],
         chains: [
           {
             id: SolanaChainsMap.get(network),
@@ -357,18 +430,12 @@ var PrivyWalletProvider = ({
           id: SolanaChainsMap.get(network),
           namespace: types.ChainNamespace.solana
         }
-      });
-    }
-  }, [
-    walletsSOL,
-    authenticated,
-    createSolanaWallet,
-    solanaReady,
-    user,
-    walletSOL,
-    network,
-    solanaInfo
-  ]);
+      })
+    );
+    setAllWalletsSOL(builtWallets);
+    const preferred = selectedSolAddress ? builtWallets.find((w) => w.accounts[0]?.address === selectedSolAddress) : void 0;
+    setWalletSOL(preferred ?? builtWallets[0] ?? null);
+  }, [walletsSOL, authenticated, solanaReady, network, solanaInfo]);
   React19.useEffect(() => {
     if (isConnected && linkedAccount) {
       if (connectedRef.current) {
@@ -386,25 +453,31 @@ var PrivyWalletProvider = ({
       connect,
       walletEVM,
       walletSOL,
+      allWalletsEVM,
+      allWalletsSOL,
       isConnected,
       disconnect,
       switchChain,
       linkedAccount,
       exportWallet,
       createEvmWallet,
-      createSolanaWallet
+      createSolanaWallet,
+      selectWallet
     }),
     [
       connect,
       walletEVM,
       walletSOL,
+      allWalletsEVM,
+      allWalletsSOL,
       isConnected,
       disconnect,
       switchChain,
       linkedAccount,
       exportWallet,
       createEvmWallet,
-      createSolanaWallet
+      createSolanaWallet,
+      selectWallet
     ]
   );
   return /* @__PURE__ */ React19__default.default.createElement(PrivyWalletContext.Provider, { value }, children);
@@ -1991,7 +2064,8 @@ function PrivyWalletHandleOption({
       {
         className: "oui-cursor-pointer oui-px-2 oui-py-1 oui-text-2xs oui-text-base-contrast-54 hover:oui-text-base-contrast",
         onClick: () => {
-          exportWallet(type);
+          const ns = type === "EVM" /* EVM */ ? types.ChainNamespace.evm : types.ChainNamespace.solana;
+          exportWallet(ns, address);
         }
       },
       /* @__PURE__ */ React19__default.default.createElement("div", null, t("common.export"))
@@ -2510,33 +2584,38 @@ function RenderPrivyWallet() {
     walletChainTypeConfig,
     connectorWalletType
   } = useWalletConnectorPrivy();
-  const { walletEVM, walletSOL, linkedAccount } = usePrivyWallet();
+  const {
+    walletEVM,
+    walletSOL,
+    allWalletsEVM,
+    allWalletsSOL,
+    linkedAccount,
+    selectWallet
+  } = usePrivyWallet();
   const { switchWallet, disconnect } = useWallet2();
   const { storageChain } = hooks.useStorageChain();
   const [walletList, setWalletList] = React19.useState([]);
   const [addWallet, setAddWallet] = React19.useState([]);
   const [loading, setLoading] = React19.useState(true);
   const isActive = React19.useCallback(
-    (walletType) => {
+    (walletType, address) => {
       if (storageChain?.namespace === types.ChainNamespace.evm) {
         if (walletType === "EVM" /* EVM */) {
-          return !types.AbstractChains.has(storageChain?.chainId);
+          if (types.AbstractChains.has(storageChain?.chainId)) return false;
+          return walletEVM?.accounts[0]?.address === address;
         }
         return false;
       }
       if (storageChain?.namespace === types.ChainNamespace.solana) {
-        return walletType === "SOL" /* SOL */;
+        if (walletType === "SOL" /* SOL */) {
+          return walletSOL?.accounts[0]?.address === address;
+        }
+        return false;
       }
       return false;
     },
-    [storageChain]
+    [storageChain, walletEVM, walletSOL]
   );
-  const isHaveEvmWallet = React19.useMemo(() => {
-    return walletEVM && walletEVM.accounts.length;
-  }, [walletEVM]);
-  const isHaveSolWallet = React19.useMemo(() => {
-    return walletSOL && walletSOL.accounts.length;
-  }, [walletSOL]);
   const renderWarning = React19.useCallback(() => {
     let showWarning = false;
     if (types.AbstractChains.has(storageChain?.chainId)) {
@@ -2577,18 +2656,31 @@ function RenderPrivyWallet() {
     return /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-mt-5 oui-flex oui-flex-col oui-gap-5" }, walletList.map((wallet) => /* @__PURE__ */ React19__default.default.createElement(
       WalletCard,
       {
-        key: wallet.type,
+        key: wallet.address,
         type: wallet.type,
         address: wallet.address,
-        isActive: isActive(wallet.type),
+        isActive: isActive(wallet.type, wallet.address),
         isPrivy: true,
         isMulti: walletList.length > 1,
         onActiveChange: () => {
-          switchWallet(wallet.type);
+          const walletNamespace = wallet.type === "EVM" /* EVM */ ? types.ChainNamespace.evm : types.ChainNamespace.solana;
+          selectWallet(walletNamespace, wallet.address);
+          if (storageChain?.namespace !== walletNamespace) {
+            switchWallet(wallet.type);
+          }
         }
       }
     )), addWallet.map((node, index) => /* @__PURE__ */ React19__default.default.createElement("div", { key: index }, /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-my-5 oui-h-px oui-w-full oui-bg-line" }), /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-flex oui-w-full oui-flex-col oui-gap-2" }, node))));
-  }, [walletList, addWallet, isActive, switchWallet, t, loading]);
+  }, [
+    walletList,
+    addWallet,
+    isActive,
+    switchWallet,
+    selectWallet,
+    storageChain,
+    t,
+    loading
+  ]);
   React19.useEffect(() => {
     new Promise(
       (resolve) => setTimeout(() => {
@@ -2601,21 +2693,25 @@ function RenderPrivyWallet() {
     const tempWalletList = [];
     const tempAddWallet = [];
     if (!connectorWalletType.disableWagmi && walletChainTypeConfig.hasEvm) {
-      if (isHaveEvmWallet) {
-        tempWalletList.push({
-          type: "EVM" /* EVM */,
-          address: walletEVM.accounts[0].address
-        });
+      if (allWalletsEVM.length > 0) {
+        for (const w of allWalletsEVM) {
+          tempWalletList.push({
+            type: "EVM" /* EVM */,
+            address: w.accounts[0].address
+          });
+        }
       } else {
         tempAddWallet.push(/* @__PURE__ */ React19__default.default.createElement(CreateEVMWallet, null));
       }
     }
     if (!connectorWalletType.disableSolana && walletChainTypeConfig.hasSol) {
-      if (isHaveSolWallet) {
-        tempWalletList.push({
-          type: "SOL" /* SOL */,
-          address: walletSOL.accounts[0].address
-        });
+      if (allWalletsSOL.length > 0) {
+        for (const w of allWalletsSOL) {
+          tempWalletList.push({
+            type: "SOL" /* SOL */,
+            address: w.accounts[0].address
+          });
+        }
       } else {
         tempAddWallet.push(/* @__PURE__ */ React19__default.default.createElement(CreateSOLWallet, null));
       }
@@ -2625,10 +2721,8 @@ function RenderPrivyWallet() {
   }, [
     connectorWalletType,
     walletChainTypeConfig,
-    walletEVM,
-    walletSOL,
-    isHaveEvmWallet,
-    isHaveSolWallet
+    allWalletsEVM,
+    allWalletsSOL
   ]);
   React19.useEffect(() => {
     if (targetWalletType === "Abstract" /* ABSTRACT */) {
@@ -2639,7 +2733,7 @@ function RenderPrivyWallet() {
       });
     }
   }, [targetWalletType, setTargetWalletType]);
-  return /* @__PURE__ */ React19__default.default.createElement("div", null, /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-flex oui-items-center oui-justify-between" }, linkedAccount && /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-flex oui-items-center oui-justify-start oui-gap-2 oui-text-base-contrast" }, /* @__PURE__ */ React19__default.default.createElement("div", null, /* @__PURE__ */ React19__default.default.createElement(RenderPrivyTypeIcon, { type: linkedAccount.type, size: 24 })), /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-xs" }, linkedAccount.address)), /* @__PURE__ */ React19__default.default.createElement(
+  return /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-flex oui-max-h-[70vh] oui-flex-col oui-overflow-y-auto oui-custom-scrollbar" }, /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-flex oui-items-center oui-justify-between" }, linkedAccount && /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-flex oui-items-center oui-justify-start oui-gap-2 oui-text-base-contrast" }, /* @__PURE__ */ React19__default.default.createElement("div", null, /* @__PURE__ */ React19__default.default.createElement(RenderPrivyTypeIcon, { type: linkedAccount.type, size: 24 })), /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-xs" }, linkedAccount.address)), /* @__PURE__ */ React19__default.default.createElement(
     "div",
     {
       className: "oui-cursor-pointer oui-text-2xs oui-font-semibold oui-text-primary",