@arcblock/did-connect-react 3.3.1 → 3.3.2

package/lib/Connect/components/did-connect-title.js

@@ -6,7 +6,7 @@ import y from "@iconify-icons/material-symbols/info-outline-rounded";
 import u from "@iconify-icons/material-symbols/swap-horiz-rounded";
 import t from "prop-types";
 import h from "./switch-app.js";
-function g({ title: p, description: s, extraContent: e = null, disableSwitchApp: a = !1 }) {
+function S({ title: p, description: s, extraContent: e = null, disableSwitchApp: a = !1 }) {
   const [c, f] = d(!1);
   return /* @__PURE__ */ i(
     n,
@@ -62,7 +62,8 @@ function g({ title: p, description: s, extraContent: e = null, disableSwitchApp:
             variant: "body2",
             sx: {
               color: "text.secondary",
-              fontFamily: "Lexend"
+              fontFamily: "Lexend",
+              fontSize: 13
             },
             children: [
               s,
@@ -115,12 +116,12 @@ function g({ title: p, description: s, extraContent: e = null, disableSwitchApp:
     }
   );
 }
-g.propTypes = {
+S.propTypes = {
   title: t.string.isRequired,
   description: t.string.isRequired,
   extraContent: t.any,
   disableSwitchApp: t.bool
 };
 export {
-  g as default
+  S as default
 };

package/lib/Connect/components/login-item/connect-choose-list.js

@@ -1,93 +1,93 @@
 import { jsx as n, jsxs as F } from "react/jsx-runtime";
 import o from "prop-types";
 import { Box as u } from "@mui/material";
-import { LOGIN_PROVIDER as f, LOGIN_PROVIDER_NAME as ee } from "@arcblock/ux/lib/Util/constant";
-import { getWebWalletUrl as oe } from "@arcblock/ux/lib/Util/wallet";
-import d from "lodash/noop";
-import { useMemoizedFn as h } from "ahooks";
-import y from "js-cookie";
-import { getCookieOptions as te } from "@arcblock/ux/lib/Util";
-import { useRef as x, useEffect as re } from "react";
-import { mergeSx as se } from "@arcblock/ux/lib/Util/style";
-import ne from "@arcblock/ux/lib/DIDConnect/provider-icon";
+import { LOGIN_PROVIDER as f, LOGIN_PROVIDER_NAME as oe, LOGIN_PROVIDER_ICON_SIZE as d } from "@arcblock/ux/lib/Util/constant";
+import { getWebWalletUrl as te } from "@arcblock/ux/lib/Util/wallet";
+import g from "lodash/noop";
+import { useMemoizedFn as y } from "ahooks";
+import x from "js-cookie";
+import { getCookieOptions as re } from "@arcblock/ux/lib/Util";
+import { useRef as I, useEffect as se } from "react";
+import { mergeSx as ne } from "@arcblock/ux/lib/Util/style";
+import le from "@arcblock/ux/lib/DIDConnect/provider-icon";
 import { GA_LAST_LOGIN_METHOD as p } from "@arcblock/ux/lib/withTracker/constant";
-import le from "./mobile-login-item.js";
-import ie from "./web-login-item.js";
-import ae from "./login-method-item.js";
-import { useOAuth as ce } from "../../../OAuth/context.js";
-import { useStateContext as pe } from "../../contexts/state.js";
-import { getAppId as me, logger as ue, getApiErrorMessage as fe } from "../../../utils.js";
-import de from "./passkey-login-item.js";
-import { usePasskey as ge } from "../../../Passkey/context.js";
+import ie from "./mobile-login-item.js";
+import ae from "./web-login-item.js";
+import ce from "./login-method-item.js";
+import { useOAuth as pe } from "../../../OAuth/context.js";
+import { useStateContext as me } from "../../contexts/state.js";
+import { getAppId as ue, logger as fe, getApiErrorMessage as de } from "../../../utils.js";
+import ge from "./passkey-login-item.js";
+import { usePasskey as he } from "../../../Passkey/context.js";
 import "../../../Passkey/actions.js";
-import he from "../../plugins/email/index.js";
-function ye({
-  onSuccess: I = d,
-  onError: b = d,
+import ye from "../../plugins/email/index.js";
+function xe({
+  onSuccess: b = g,
+  onError: L = g,
   size: i = "small",
   tokenState: t,
-  webWalletUrl: U = oe(),
-  tokenKey: N,
+  webWalletUrl: U = te(),
+  tokenKey: G,
   passkeyBehavior: W = "none",
-  onReset: g = d,
+  onReset: h = g,
   showMobileLogin: j = !0,
   showOAuthLogin: v = !0,
   showPasskeyLogin: w = !0,
-  showWebLogin: G = !0,
+  showWebLogin: S = !0,
   showEmailLogin: m = !0,
-  oauthProviderList: q = [],
-  slotProps: B = {},
-  disableSwitchApp: L = !1,
-  forceUpdate: S = d,
-  magicToken: M = void 0,
-  baseUrl: V = "/",
-  customItems: H = []
+  oauthProviderList: V = [],
+  slotProps: q = {},
+  disableSwitchApp: M = !1,
+  forceUpdate: B = g,
+  magicToken: O = void 0,
+  baseUrl: H = "/",
+  customItems: K = []
 }) {
-  const A = x(null), P = x(null), O = x(null), { loginOAuth: K, logoutOAuth: $, t: z, oauthState: s } = ce(), { passkeyState: C } = ge(), { extraParams: _, locale: J, connectState: r, plugins: E, setPlugins: Q, setSelectedPlugin: X, getPlugin: R } = pe(), k = h(async (e) => {
+  const P = I(null), A = I(null), C = I(null), { loginOAuth: Z, logoutOAuth: $, t: z, oauthState: s } = pe(), { passkeyState: _ } = he(), { extraParams: E, locale: J, connectState: r, plugins: R, setPlugins: Q, setSelectedPlugin: X, getPlugin: k } = me(), D = y(async (e) => {
     localStorage.setItem(p, e.provider), t.reset(), s.reset({
       status: "scanned"
-    }), C.reset(), r.chooseMethod = e.provider;
-    const a = _?.sourceAppPid;
+    }), _.reset(), r.chooseMethod = e.provider;
+    const a = E?.sourceAppPid;
     try {
       s.loading = !0, s.status = "scanned";
-      const c = await K(e, {
+      const c = await Z(e, {
         action: t.action,
-        ..._
-      }), l = te({ returnDomain: !1 });
-      y.remove("connected_did", l), y.remove("connected_pk", l), y.remove("connected_wallet_os", l), c?.sessionToken && (await I(
+        ...E
+      }), l = re({ returnDomain: !1 });
+      x.remove("connected_did", l), x.remove("connected_pk", l), x.remove("connected_wallet_os", l), c?.sessionToken && (await b(
         {
           ...c,
           encrypted: !1
         },
-        (Z) => Z,
+        (ee) => ee,
         {
           sourceAppPid: a,
-          connected_app: me(t.appInfo, t.memberAppInfo)
+          connected_app: ue(t.appInfo, t.memberAppInfo)
         }
       ), s.loading = !1, s.status = "succeed");
     } catch (c) {
-      ue.error(`Failed login OAuth: ${e.provider}`, c);
-      const l = fe(c, z("loginOAuthFailed"));
-      s.loading = !1, s.error = l, s.status = "error", await $({ provider: e.provider }), b(new Error(l));
+      fe.error(`Failed login OAuth: ${e.provider}`, c);
+      const l = de(c, z("loginOAuthFailed"));
+      s.loading = !1, s.error = l, s.status = "error", await $({ provider: e.provider }), L(new Error(l));
     }
-  }), T = h(async () => {
-    t.reset(), await g(), t.status = "created", r.chooseMethod = "wallet";
-  }), D = he({ baseUrl: V }), Y = h(() => {
-    if (M && m && E.some((e) => e.name === f.EMAIL)) {
-      const e = R(f.EMAIL);
-      e.state.status === "idle" && (localStorage.setItem(p, "email"), e.state.reset(), e.state.magicToken = M, r.chooseMethod = f.EMAIL, X(e), S());
+  }), T = y(async () => {
+    t.reset(), await h(), t.status = "created", r.chooseMethod = "wallet";
+  }), N = ye({ baseUrl: H }), Y = y(() => {
+    if (O && m && R.some((e) => e.name === f.EMAIL)) {
+      const e = k(f.EMAIL);
+      e.state.status === "idle" && (localStorage.setItem(p, "email"), e.state.reset(), e.state.magicToken = O, r.chooseMethod = f.EMAIL, X(e), B());
     }
   });
-  return re(() => {
+  return se(() => {
     const e = [];
     if (m) {
-      const a = R(f.EMAIL);
-      a && a.baseUrl === D.baseUrl ? e.push(a) : e.push(D);
+      const a = k(f.EMAIL);
+      a && a.baseUrl === N.baseUrl ? e.push(a) : e.push(N);
     }
     Q(e), r.retryConnect = T, setTimeout(() => {
       Y();
     }, 100);
-  }, [m]), /* @__PURE__ */ n(u, { className: "did-connect__choose", sx: se({ flex: 1 }, B?.root?.sx), children: /* @__PURE__ */ n(
+  }, [m]), /* @__PURE__ */ n(u, { className: "did-connect__choose", sx: ne({ flex: 1 }, q?.root?.sx), children: /* @__PURE__ */ n(
     u,
     {
       sx: {
@@ -107,36 +107,36 @@ function ye({
           ],
           children: [
             j && /* @__PURE__ */ n(
-              le,
+              ie,
               {
-                ref: A,
+                ref: P,
                 tokenState: t,
                 sx: [i === "small" ? { p: 1 } : { p: 2 }],
                 locale: J,
-                tokenKey: N,
-                disableSwitchApp: L,
+                tokenKey: G,
+                disableSwitchApp: M,
                 onClick: async () => {
-                  localStorage.setItem(p, "wallet"), t.reset(), await g(), t.status = "created", r.chooseMethod = "wallet";
-                  const e = A.current?.connect;
+                  localStorage.setItem(p, "wallet"), t.reset(), await h(), t.status = "created", r.chooseMethod = "wallet";
+                  const e = P.current?.connect;
                   r.retryConnect = () => {
                     e(T);
                   };
                 }
               }
             ),
-            G && /* @__PURE__ */ n(
-              ie,
+            S && /* @__PURE__ */ n(
+              ae,
               {
-                ref: P,
+                ref: A,
                 tokenState: t,
                 webWalletUrl: U,
                 sx: [i === "small" ? { p: 1 } : { p: 2 }],
-                disableSwitchApp: L,
+                disableSwitchApp: M,
                 onClick: () => {
                   localStorage.setItem(p, "wallet"), t.status = "scanned", r.chooseMethod = "wallet-web";
-                  const e = P.current.connect;
+                  const e = A.current.connect;
                   r.retryConnect = async () => {
-                    await g(), t.error = "", t.status = "scanned", e();
+                    await h(), t.error = "", t.status = "scanned", e();
                   };
                 }
               }
@@ -152,32 +152,32 @@ function ye({
                   }
                 ],
                 children: [
-                  E.map(
+                  R.map(
                     (e) => e.renderListItem({
                       key: e.name,
                       sx: [i === "small" ? { p: 1 } : { p: 2 }]
                       // forceUpdate,
                     })
                   ),
-                  v ? q.map((e) => /* @__PURE__ */ n(
-                    ae,
+                  v ? V.map((e) => /* @__PURE__ */ n(
+                    ce,
                     {
-                      title: ee[e.provider],
+                      title: oe[e.provider],
                       icon: /* @__PURE__ */ n(
-                        ne,
+                        le,
                         {
                           provider: e.provider,
                           sx: {
                             transform: "scale(0.95)",
-                            width: 24,
-                            height: 24,
+                            width: d,
+                            height: d,
                             color: "text.primary"
                           }
                         }
                       ),
                       onClick: () => {
-                        k(e), r.retryConnect = () => {
-                          k(e);
+                        D(e), r.retryConnect = () => {
+                          D(e);
                         };
                       },
                       sx: [i === "small" ? { p: 1 } : { p: 2 }]
@@ -185,27 +185,27 @@ function ye({
                     e.provider
                   )) : null,
                   w ? /* @__PURE__ */ n(
-                    de,
+                    ge,
                     {
-                      ref: O,
-                      onSuccess: I,
-                      onError: b,
+                      ref: C,
+                      onSuccess: b,
+                      onError: L,
                       tokenState: t,
                       behavior: W,
                       sx: [i === "small" ? { p: 1 } : { p: 2 }],
                       onClick: () => {
                         localStorage.setItem(p, "passkey");
-                        const e = O.current.connect;
+                        const e = C.current.connect;
                         r.chooseMethod = "passkey", r.retryConnect = () => {
-                          C.verifying = !0, r.chooseMethod = "passkey", e();
+                          _.verifying = !0, r.chooseMethod = "passkey", e();
                         };
                       },
                       slotProps: {
                         icon: {
                           sx: {
-                            fontSize: 24,
+                            fontSize: d,
                             "& svg": {
-                              fontSize: 24,
+                              fontSize: d,
                               width: "1em",
                               height: "1em"
                             }
@@ -217,14 +217,14 @@ function ye({
                 ]
               }
             ) : null,
-            H.map((e) => e || null)
+            K.map((e) => e || null)
           ]
         }
       )
     }
   ) });
 }
-ye.propTypes = {
+xe.propTypes = {
   onSuccess: o.func,
   onError: o.func,
   size: o.oneOf(["small", "normal", "large"]),
@@ -247,5 +247,5 @@ ye.propTypes = {
   customItems: o.arrayOf(o.node)
 };
 export {
-  ye as default
+  xe as default
 };