@orderly.network/wallet-connector-privy 2.3.2 → 2.4.0

package/dist/index.js

@@ -432,20 +432,18 @@ var useSolanaWalletStore = zustand.create((set, get) => ({
     try {
       set({ isConnecting: true, error: null });
       const { walletSolana, select } = walletMethods;
-      if (!walletSolana) {
-        select(walletName);
-        await new Promise((resolve) => {
-          const checkWallet = () => {
-            const currentWallet = get().walletMethods?.walletSolana;
-            if (currentWallet) {
-              resolve();
-            } else {
-              setTimeout(checkWallet, 500);
-            }
-          };
-          checkWallet();
-        });
-      }
+      select(walletName);
+      await new Promise((resolve) => {
+        const checkWallet = () => {
+          const currentWallet = get().walletMethods?.walletSolana;
+          if (currentWallet) {
+            resolve();
+          } else {
+            setTimeout(checkWallet, 500);
+          }
+        };
+        checkWallet();
+      });
       const updatedWalletMethods = get().walletMethods;
       if (!updatedWalletMethods) {
         throw new Error("Wallet methods not initialized");
@@ -457,6 +455,9 @@ var useSolanaWalletStore = zustand.create((set, get) => ({
       if (!lastestWalletMethods) {
         throw new Error("Wallet methods not initialized");
       }
+      if (!lastestWalletMethods.publicKey) {
+        throw new Error("Wallet not connected");
+      }
       const wallet = {
         label: updatedWalletMethods.walletSolana.adapter.name,
         icon: "",
@@ -469,7 +470,7 @@ var useSolanaWalletStore = zustand.create((set, get) => ({
         },
         accounts: [
           {
-            address: updatedWalletMethods.publicKey.toBase58()
+            address: lastestWalletMethods.publicKey.toBase58()
           }
         ],
         chains: [
@@ -563,7 +564,6 @@ var SolanaWalletProvider = ({
     if (!walletSolana || isManual)
       return;
     if (!publicKey) {
-      connectSolana();
       return;
     }
     const newWallet = {
@@ -1137,7 +1137,71 @@ function PrivyConnectArea({
 }) {
   const { t } = i18n.useTranslation();
   const { isMobile, isDesktop } = ui.useScreen();
-  const { connectorWalletType } = useWalletConnectorPrivy();
+  const { connectorWalletType, privyConfig } = useWalletConnectorPrivy();
+  const loginMethods = privyConfig.loginMethods;
+  const renderLoginMethodsDom = () => {
+    const arr = [];
+    if (loginMethods?.includes("email")) {
+      arr.push(
+        /* @__PURE__ */ React19__default.default.createElement(
+          "div",
+          {
+            className: "oui-flex oui-cursor-pointer oui-items-center oui-justify-center oui-gap-1 oui-rounded-[6px] oui-bg-[#333948] oui-px-2 oui-py-[11px]",
+            onClick: () => connect({ walletType: "privy", extraType: "email" })
+          },
+          /* @__PURE__ */ React19__default.default.createElement(
+            "img",
+            {
+              src: "https://oss.orderly.network/static/sdk/privy/email.svg",
+              className: "oui-size-[18px]"
+            }
+          ),
+          /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-2xs oui-text-base-contrast" }, t("connector.privy.email"))
+        )
+      );
+    }
+    if (loginMethods?.includes("google")) {
+      arr.push(
+        /* @__PURE__ */ React19__default.default.createElement(
+          "div",
+          {
+            className: "oui-flex oui-cursor-pointer oui-items-center oui-justify-center oui-gap-1 oui-rounded-[6px] oui-bg-[#335FFC] oui-px-2 oui-py-[11px]",
+            onClick: () => connect({ walletType: "privy", extraType: "google" })
+          },
+          /* @__PURE__ */ React19__default.default.createElement(
+            "img",
+            {
+              src: "https://oss.orderly.network/static/sdk/privy/google.svg",
+              className: "oui-size-[18px]"
+            }
+          ),
+          /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-2xs oui-text-base-contrast" }, t("connector.privy.google"))
+        )
+      );
+    }
+    if (loginMethods?.includes("twitter")) {
+      arr.push(
+        /* @__PURE__ */ React19__default.default.createElement(
+          "div",
+          {
+            className: "oui-flex oui-cursor-pointer oui-items-center oui-justify-center oui-gap-1 oui-rounded-[6px] oui-bg-[#07080A] oui-px-2 oui-py-[11px]",
+            onClick: () => connect({ walletType: "privy", extraType: "twitter" })
+          },
+          /* @__PURE__ */ React19__default.default.createElement(
+            "img",
+            {
+              src: "https://oss.orderly.network/static/sdk/privy/twitter.svg",
+              className: "oui-size-[18px]"
+            }
+          ),
+          /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-2xs oui-text-base-contrast" }, t("connector.privy.twitter"))
+        )
+      );
+    }
+    return arr.map((item, index) => {
+      return /* @__PURE__ */ React19__default.default.createElement("div", { key: index }, item);
+    });
+  };
   return /* @__PURE__ */ React19__default.default.createElement("div", { className: "" }, /* @__PURE__ */ React19__default.default.createElement(
     "div",
     {
@@ -1163,51 +1227,7 @@ function PrivyConnectArea({
         "md:oui-flex md:oui-flex-col md:oui-gap-2"
       )
     },
-    /* @__PURE__ */ React19__default.default.createElement(
-      "div",
-      {
-        className: "oui-flex oui-cursor-pointer oui-items-center oui-justify-center oui-gap-1 oui-rounded-[6px] oui-bg-[#333948] oui-px-2 oui-py-[11px]",
-        onClick: () => connect({ walletType: "privy", extraType: "email" })
-      },
-      /* @__PURE__ */ React19__default.default.createElement(
-        "img",
-        {
-          src: "https://oss.orderly.network/static/sdk/privy/email.svg",
-          className: "oui-size-[18px]"
-        }
-      ),
-      /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-2xs oui-text-base-contrast" }, t("connector.privy.email"))
-    ),
-    /* @__PURE__ */ React19__default.default.createElement(
-      "div",
-      {
-        className: "oui-flex oui-cursor-pointer oui-items-center oui-justify-center oui-gap-1 oui-rounded-[6px] oui-bg-[#335FFC] oui-px-2 oui-py-[11px]",
-        onClick: () => connect({ walletType: "privy", extraType: "google" })
-      },
-      /* @__PURE__ */ React19__default.default.createElement(
-        "img",
-        {
-          src: "https://oss.orderly.network/static/sdk/privy/google.svg",
-          className: "oui-size-[18px]"
-        }
-      ),
-      /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-2xs oui-text-base-contrast" }, t("connector.privy.google"))
-    ),
-    /* @__PURE__ */ React19__default.default.createElement(
-      "div",
-      {
-        className: "oui-flex oui-cursor-pointer oui-items-center oui-justify-center oui-gap-1 oui-rounded-[6px] oui-bg-[#07080A] oui-px-2 oui-py-[11px]",
-        onClick: () => connect({ walletType: "privy", extraType: "twitter" })
-      },
-      /* @__PURE__ */ React19__default.default.createElement(
-        "img",
-        {
-          src: "https://oss.orderly.network/static/sdk/privy/twitter.svg",
-          className: "oui-size-[18px]"
-        }
-      ),
-      /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-text-2xs oui-text-base-contrast" }, t("connector.privy.twitter"))
-    )
+    renderLoginMethodsDom()
   ), isDesktop && /* @__PURE__ */ React19__default.default.createElement("div", { className: "oui-mt-4 oui-flex oui-h-3 oui-justify-center" }, /* @__PURE__ */ React19__default.default.createElement(
     "img",
     {
@@ -2674,7 +2694,7 @@ 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 }, children);
+  return /* @__PURE__ */ React19__default.default.createElement(walletAdapterReact.WalletProvider, { wallets, onError, autoConnect: true }, children);
 }
 
 // src/providers/solana/index.tsx
@@ -2784,9 +2804,17 @@ var WalletConnectorPrivyContext = React19.createContext({
     disablePrivy: false,
     disableSolana: false,
     disableAGW: false
+  },
+  privyConfig: {
+    loginMethods: []
   }
 });
 var useWalletConnectorPrivy = () => React19.useContext(WalletConnectorPrivyContext);
+var defaultPrivyLoginMethod = [
+  "email",
+  "google",
+  "twitter"
+];
 function WalletConnectorPrivyProvider(props) {
   const [walletChainType, setWalletChainType] = React19.useState(
     "EVM_SOL" /* EVM_SOL */
@@ -2799,6 +2827,9 @@ function WalletConnectorPrivyProvider(props) {
   const initRef = React19.useRef(false);
   const [openConnectDrawer, setOpenConnectDrawer] = React19.useState(false);
   const [targetWalletType, setTargetWalletType] = React19.useState();
+  const [privyConfig, setPrivyConfig] = React19.useState({
+    loginMethods: props.privyConfig ? props.privyConfig?.config?.loginMethods ?? defaultPrivyLoginMethod : defaultPrivyLoginMethod
+  });
   const [solanaInfo, setSolanaInfo] = React19.useState(null);
   const connectorWalletType = React19.useMemo(() => {
     const type = {
@@ -2923,7 +2954,8 @@ function WalletConnectorPrivyProvider(props) {
       termsOfUse,
       walletChainType,
       connectorWalletType,
-      walletChainTypeConfig
+      walletChainTypeConfig,
+      privyConfig
     }),
     [
       initChains,
@@ -2941,7 +2973,8 @@ function WalletConnectorPrivyProvider(props) {
       termsOfUse,
       walletChainType,
       connectorWalletType,
-      walletChainTypeConfig
+      walletChainTypeConfig,
+      privyConfig
     ]
   );
   React19.useEffect(() => {