@arcblock/did-connect-react 3.4.0 → 3.4.2

package/lib/Connect/hooks/token.js

@@ -1,74 +1,74 @@
-import { useRef as I, useEffect as C } from "react";
-import T from "lodash/get";
-import ue from "js-cookie";
-import B from "lodash/omitBy";
-import M from "lodash/isNil";
-import fe from "lodash/omit";
-import de from "lodash/cloneDeep";
-import { useReactive as H, useCreation as pe, useMemoizedFn as E } from "ahooks";
+import { useRef as S, useEffect as C } from "react";
+import W from "lodash/get";
+import fe from "js-cookie";
+import M from "lodash/omitBy";
+import H from "lodash/isNil";
+import de from "lodash/omit";
+import pe from "lodash/cloneDeep";
+import { useReactive as Q, useCreation as me, useMemoizedFn as T } from "ahooks";
 import ke from "@arcblock/react-hooks/lib/useInterval";
-import me from "@arcblock/react-hooks/lib/useBrowser";
-import { getVisitorId as he, stringifyQuery as $, isUrl as ge } from "@arcblock/ux/lib/Util";
-import { WsClient as be } from "@arcblock/ws";
-import { sleep as q, getExtraHeaders as x, getConnectedInfo as we, updateConnectedInfo as Ce, parseNextWorkflow as Q, createAxios as z, decodeConnectUrl as Se, parseTokenFromConnectUrl as Ie } from "../../utils.js";
-import V from "../assets/locale.js";
-import $e from "./security.js";
-import xe from "./page-show.js";
-import { RELAY_SOCKET_PREFIX as G } from "../../constant.js";
-function ve(o) {
+import ge from "@arcblock/react-hooks/lib/useBrowser";
+import { getVisitorId as he, stringifyQuery as x, isUrl as be } from "@arcblock/ux/lib/Util";
+import { WsClient as we } from "@arcblock/ws";
+import { sleep as G, getExtraHeaders as v, getConnectedInfo as Se, updateConnectedInfo as Ce, parseNextWorkflow as z, createAxios as V, decodeConnectUrl as Ie, parseTokenFromConnectUrl as $e } from "../../utils.js";
+import X from "../assets/locale.js";
+import xe from "./security.js";
+import ve from "./page-show.js";
+import { RELAY_SOCKET_PREFIX as J } from "../../constant.js";
+function Ue(o) {
   const l = o || window.location.href;
   return new URL(l).host;
 }
 const P = {};
-function Ue({ action: o, prefix: l, checkFn: k, extraParams: v, baseUrl: m }) {
-  const d = `${l}/token?${$(v)}`;
+function Ae({ action: o, prefix: l, checkFn: m, extraParams: U, baseUrl: k }) {
+  const d = `${l}/token?${x(U)}`;
   return P[d] || (P[d] = async function() {
-    const f = +/* @__PURE__ */ new Date(), h = await k(d, { headers: x(m) }), g = +/* @__PURE__ */ new Date();
-    if (g - f < 500 && await q(500 - (g - f)), h?.data?.token)
-      return h.data;
-    if (h?.data?.error)
-      throw new Error(h.data.error);
-    const U = ge(l) ? l : `${m}${l}`;
-    throw new Error(`Error generating ${o} QR Code from: ${U}`);
+    const f = +/* @__PURE__ */ new Date(), g = await m(d, { headers: v(k) }), h = +/* @__PURE__ */ new Date();
+    if (h - f < 500 && await G(500 - (h - f)), g?.data?.token)
+      return g.data;
+    if (g?.data?.error)
+      throw new Error(g.data.error);
+    const A = be(l) ? l : `${k}${l}`;
+    throw new Error(`Error generating ${o} QR Code from: ${A}`);
   }), P[d];
 }
-const Ae = () => {
+const ye = () => {
   try {
     const l = new URL(window.location.href).searchParams.get("__connect_url__");
     if (!l)
       return null;
-    const k = Se(l);
+    const m = Ie(l);
     return {
-      token: Ie(k),
-      url: k
+      token: $e(m),
+      url: m
     };
   } catch (o) {
     return {
       error: o
     };
   }
-}, J = () => T(globalThis, "blocklet.appPid") || T(globalThis, "blocklet.appId") || T(globalThis, "env.appId") || "", ye = () => (T(globalThis, "env.apiPrefix") || "/").replace(/\/$/, "").replace(G, ""), R = (o) => `relay:${J()}:${o}`, Ee = () => window.location.protocol === "https:" ? "wss:" : "ws:", X = (o) => !o || new URL(o).origin === window.location.origin, Y = (o) => ["succeed", "error", "timeout", "busy"].includes(o);
-function Xe({
+}, Z = () => W(globalThis, "blocklet.appPid") || W(globalThis, "blocklet.appId") || W(globalThis, "env.appId") || "", Ee = () => (W(globalThis, "env.apiPrefix") || "/").replace(/\/$/, "").replace(J, ""), _ = (o) => `relay:${Z()}:${o}`, Te = () => window.location.protocol === "https:" ? "wss:" : "ws:", Y = (o) => !o || new URL(o).origin === window.location.origin, q = (o) => ["succeed", "error", "timeout", "busy"].includes(o);
+function Ye({
   action: o,
   checkFn: l,
-  checkInterval: k,
-  checkTimeout: v,
-  extraParams: m,
+  checkInterval: m,
+  checkTimeout: U,
+  extraParams: k,
   locale: d,
-  prefix: _,
+  prefix: F,
   tokenKey: f,
-  encKey: h,
-  onError: g,
-  onSuccess: U,
-  baseUrl: Z,
-  autoConnect: K = !0,
-  forceConnected: ee = !0,
-  saveConnect: re = !0,
+  encKey: g,
+  onError: h,
+  onSuccess: A,
+  baseUrl: K,
+  autoConnect: ee = !0,
+  forceConnected: re = !0,
+  saveConnect: te = !0,
   // FIXME: @zhanghan 将来需要设置为默认 false，仅在需要的时候进行保存 login, switch/role/profile
-  useSocket: te = !0,
-  provider: ne = "wallet"
+  useSocket: ne = !0,
+  provider: oe = "wallet"
 }) {
-  const e = H({
+  const e = Q({
     checking: !1,
     loading: !1,
     token: "",
@@ -76,7 +76,6 @@ function Xe({
     store: null,
     status: "created",
     error: "",
-    checkCount: 0,
     mfaCode: 0,
     appInfo: null,
     memberAppInfo: null,
@@ -84,80 +83,80 @@ function Xe({
     saveConnect: !1,
     inExistingSession: !1,
     nextWorkflow: "",
-    baseUrl: Z,
-    prefix: `${_}/${o}`,
-    extraParams: B(m, M),
+    baseUrl: K,
+    prefix: `${F}/${o}`,
+    extraParams: M(k, H),
     checkFn: l,
     results: {},
     action: o,
-    provider: ne,
+    provider: oe,
     reset() {
       this.error = "", this.status = "created";
     }
-  }), F = I(null), S = V[d] || V.en, u = pe(() => Ae(), []), oe = Math.ceil(v / k), c = H({
+  }), I = S(0), D = S(null), $ = X[d] || X.en, u = me(() => ye(), []), se = Math.ceil(U / m), c = Q({
     onSuccessCalled: !1,
     cancelWhenScannedCounter: 0,
     isSocketAvailable: !1
-  }), { encryptKey: se, decrypt: A } = $e(), D = me(), O = he(), a = I(null), p = I(null), b = {
+  }), { encryptKey: ae, decrypt: y } = xe(), O = ge(), L = he(), a = S(null), p = S(null), b = {
     ...e.extraParams,
     locale: d,
     [f]: e.token || u?.token,
     provider: e.provider
-  }, L = async () => {
+  }, j = async () => {
     if (!(u?.token && u?.token === e.token)) {
       try {
-        b[f] && e.status === "created" && await e.checkFn(`${e.prefix}/timeout?${$(b)}`, {
-          headers: x(e.baseUrl)
+        b[f] && e.status === "created" && await e.checkFn(`${e.prefix}/timeout?${x(b)}`, {
+          headers: v(e.baseUrl)
         });
       } catch {
       }
       try {
-        e.token && p.current && (await a.current.unsubscribe(R(e.token)), p.current = null);
+        e.token && p.current && (await a.current.unsubscribe(_(e.token)), p.current = null);
       } catch {
       }
     }
-  }, ae = E((...t) => {
+  }, ce = T((...t) => {
     const r = {
-      [h]: se,
+      [g]: ae,
       ...e.extraParams,
       locale: d,
-      forceConnected: ee,
+      forceConnected: re,
       // - autoConnect 请求参数用于控制服务端是否给钱包应用发送自动连接通知
       // - 使用 connect 组件时明确传入了 autoConnect = false, 则 autoConnect 请求参数 为 false
       // - 如果 cancelWhenScannedCounter > 0, 说明用户进行过 cancel 操作, 则临时禁用自动连接, autoConnect 请求参数 为 false
       //   (避免 "无限自动连接问题")
       // - 如果上次连接设备 (connected_wallet_os) 不是 ios/android, 则禁用自动连接
-      autoConnect: K && // 如果是 wallet webview 环境, 不发送通知, 避免 wallet 连续弹出 auth 窗口 2 次 (#341)
-      !(D.wallet || D.arcSphere) && !c.cancelWhenScannedCounter && ["ios", "android"].includes(ue.get("connected_wallet_os")),
+      autoConnect: ee && // 如果是 wallet webview 环境, 不发送通知, 避免 wallet 连续弹出 auth 窗口 2 次 (#341)
+      !(O.wallet || O.arcSphere) && !c.cancelWhenScannedCounter && ["ios", "android"].includes(fe.get("connected_wallet_os")),
       provider: e.provider
     };
-    O && (r.visitorId = O);
-    const n = fe(F.current || {}, ["sourceAppPid", "verbose"]);
+    L && (r.visitorId = L);
+    const n = de(D.current || {}, ["sourceAppPid", "verbose"]);
     return Object.keys(n).forEach((s) => {
-      (!r[s] || s === h && n[s]) && (r[s] = n[s]);
-    }), u?.token && !r.sourceToken && (r.sourceToken = u?.token), Ue({
+      (!r[s] || s === g && n[s]) && (r[s] = n[s]);
+    }), u?.token && !r.sourceToken && (r.sourceToken = u?.token), Ae({
       action: o,
       prefix: e.prefix,
       baseUrl: e.baseUrl,
       checkFn: e.checkFn,
       extraParams: r
     })(...t);
-  }), y = E(async (t = !0) => {
-    t && L();
+  }), E = T(async (t = !0) => {
+    t && j();
     try {
-      e.loading = !0, e.token = "", e.url = "", e.store = null, e.extraParams = B(m, M), await q();
-      const r = await ae(), n = r.extra || {};
-      e.loading = !1, e.token = r.token, e.url = r.url, e.status = "created", e.error = "", e.checkCount = 0, e.appInfo = r.appInfo, e.memberAppInfo = r.memberAppInfo, e.connectedDid = n.connectedDid, e.saveConnect = n.saveConnect;
+      e.loading = !0, e.token = "", e.url = "", e.store = null, e.extraParams = M(k, H), await G();
+      const r = await ce(), n = r.extra || {};
+      e.loading = !1, e.token = r.token, e.url = r.url, e.status = "created", e.error = "", I.current = 0, e.appInfo = r.appInfo, e.memberAppInfo = r.memberAppInfo, e.connectedDid = n.connectedDid, e.saveConnect = n.saveConnect;
     } catch (r) {
-      e.loading = !1, e.status = "error", e.error = `${S.generateError}: ${r.message}`;
+      e.loading = !1, e.status = "error", e.error = `${$.generateError}: ${r.message}`;
     }
-  }), ce = E(() => {
+  }), ie = T(() => {
     c.cancelWhenScannedCounter++;
   });
   C(() => {
-    c.cancelWhenScannedCounter > 0 && (m.nw ? g(new Error(S.retryForbidden)) : y());
-  }, [c.cancelWhenScannedCounter]), C(() => (!(/^((?!chrome|android).)*safari/i.test(globalThis.navigator.userAgent) || Object.hasOwn(globalThis?.blocklet || {}, "DID_CONNECT_DISABLE_SOCKET")) && te && X(e.baseUrl) && J() ? (!a.current || a.current.isConnected() === !1 || a.current.baseUrl !== e.baseUrl) && (a.current = new be(
-    `${Ee()}//${ve(e.baseUrl)}${ye()}${G}/relay`,
+    c.cancelWhenScannedCounter > 0 && (k.nw ? h(new Error($.retryForbidden)) : E());
+  }, [c.cancelWhenScannedCounter]), C(() => (!(/^((?!chrome|android).)*safari/i.test(globalThis.navigator.userAgent) || Object.hasOwn(globalThis?.blocklet || {}, "DID_CONNECT_DISABLE_SOCKET")) && ne && Y(e.baseUrl) && Z() ? (!a.current || a.current.isConnected() === !1 || a.current.baseUrl !== e.baseUrl) && (a.current = new we(
+    `${Te()}//${Ue(e.baseUrl)}${Ee()}${J}/relay`,
     {
       longpollerTimeout: 5e3,
       // connection timeout
@@ -168,50 +167,54 @@ function Xe({
   }), a.current.connect()) : c.isSocketAvailable && (c.isSocketAvailable = !1), () => {
     a.current && (a.current.disconnect(), a.current = null);
   }), [e.baseUrl]);
-  const ie = () => !e.token || e.loading || Y(e.status) ? null : k, j = I(null);
+  const le = () => !e.token || e.loading || q(e.status) ? null : m, N = S(null);
   C(() => {
-    j.current = { state: e, params: b };
+    N.current = { state: e, params: b };
   }), C(() => () => {
-    const { state: t, params: r } = j.current;
-    t.status === "created" && r[f] && t.checkFn(`${t.prefix}/timeout?${$(r)}`, {
-      headers: x(t.baseUrl)
+    const { state: t, params: r } = N.current;
+    t.status === "created" && r[f] && t.checkFn(`${t.prefix}/timeout?${x(r)}`, {
+      headers: v(t.baseUrl)
     });
   }, []);
-  const w = E(async (t = !1) => {
-    if ((e.checking || document.hidden) && !t || (e.status === "created" && e.checkCount++, c.isSocketAvailable && !t))
+  const w = T(async (t = !1) => {
+    if ((e.checking || document.hidden) && !t)
+      return null;
+    if (e.status === "created" && (I.current++, e.status !== "timeout" && I.current > se))
+      return e.status = "timeout", j(), null;
+    if (c.isSocketAvailable && !t)
       return null;
     try {
       e.checking = !0;
-      const r = await e.checkFn(`${e.prefix}/status?${$(b)}`, {
-        headers: x(e.baseUrl)
+      const r = await e.checkFn(`${e.prefix}/status?${x(b)}`, {
+        headers: v(e.baseUrl)
       }), { status: n, error: i, mfaCode: s = 0 } = r.data;
       if (e.store = r.data, e.mfaCode = s, e.checking = !1, e.status === "scanned" && n === "created" || (e.status = n), n === "error" && i) {
-        const N = new Error(i);
-        throw N.response = r, N;
+        const B = new Error(i);
+        throw B.response = r, B;
       }
       return r.data;
     } catch (r) {
       const { response: n } = r;
       if (n?.status) {
-        b[f] && e.checkFn(`${e.prefix}/timeout?${$(b)}`, {
-          headers: x(e.baseUrl)
+        b[f] && e.checkFn(`${e.prefix}/timeout?${x(b)}`, {
+          headers: v(e.baseUrl)
         });
         const i = n?.data?.error ? n.data.error : r.message, s = new Error(i);
-        s.code = n.status, e.status = "error", e.checking = !1, e.error = i, g(s, e?.store, A);
+        s.code = n.status, e.status = "error", e.checking = !1, e.error = i, h(s, e?.store, y);
       } else
-        e.status = "error", e.checking = !1, e.error = S.generateError;
+        e.status = "error", e.checking = !1, e.error = $.generateError;
     }
     return null;
-  }), le = async () => {
+  }), ue = async () => {
     try {
       if (u.error)
         throw u.error;
       e.loading = !0, e.token = u.token, e.url = u.url, e.inExistingSession = !0;
       let t = await w();
-      if ((["scanned"].includes(t?.status) || t?.sourceToken === u?.token) && (await y(!1), t = await w()), F.current = t?.extraParams || null, t?.status && !["created"].includes(t?.status))
-        throw new Error(`${S.invalidSessionStatus} [${t.status}]`);
+      if ((["scanned"].includes(t?.status) || t?.sourceToken === u?.token) && (await E(!1), t = await w()), D.current = t?.extraParams || null, t?.status && !["created"].includes(t?.status))
+        throw new Error(`${$.invalidSessionStatus} [${t.status}]`);
     } catch (t) {
-      e.status = "error", e.error = t.message, g(t, e?.store, A);
+      e.status = "error", e.error = t.message, h(t, e?.store, y);
     } finally {
       e.loading = !1;
     }
@@ -219,39 +222,35 @@ function Xe({
   C(() => {
     if (!e.token && !e.store && !e.loading && !e.error)
       if (u)
-        le();
+        ue();
       else {
-        y(!1);
+        E(!1);
         return;
       }
-    if (e.status !== "timeout" && e.checkCount > oe) {
-      e.status = "timeout", L();
-      return;
-    }
     if (e.status === "succeed" && !c.onSuccessCalled) {
-      const t = we({
+      const t = Se({
         ...e.store,
         appInfo: e.appInfo,
         memberAppInfo: e.memberAppInfo
       });
-      if (X(e.baseUrl) && re && e.saveConnect && e.store.did && Ce(t, !0), e.store) {
+      if (Y(e.baseUrl) && te && e.saveConnect && e.store.did && Ce(t, !0), e.store) {
         const { nextWorkflow: r } = e.store;
         if (r)
           try {
-            const n = Q(r, f);
-            e.nextWorkflow = n?.nextWorkflow || r, Object.assign(e, n), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, e.checkCount = 0, e.status = "scanned", e.results = {
+            const n = z(r, f);
+            e.nextWorkflow = n?.nextWorkflow || r, Object.assign(e, n), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, I.current = 0, e.status = "scanned", e.results = {
               ...e.results,
               [e.token]: e.store
-            }, e.checkFn = z({ baseURL: n.baseUrl, timeout: 8e3 }).get, w();
+            }, e.checkFn = V({ baseURL: n.baseUrl, timeout: 8e3 }).get, w();
           } catch (n) {
             console.error(`Invalid nextWorkflow: ${r}`, n), e.status = "error", e.error = `Invalid nextWorkflow: ${r}: ${n.message}`;
           }
-        else if (e.nextWorkflow && (e.nextWorkflow = "", e.url = ""), typeof U == "function") {
+        else if (e.nextWorkflow && (e.nextWorkflow = "", e.url = ""), typeof A == "function") {
           const n = Object.values({ ...e.results, [e.token]: e.store });
           c.onSuccessCalled = !0;
-          const i = n.length > 1 ? n : n[0], s = de(i);
-          U(s, A, {
-            sourceAppPid: m?.sourceAppPid,
+          const i = n.length > 1 ? n : n[0], s = pe(i);
+          A(s, y, {
+            sourceAppPid: k?.sourceAppPid,
             ...t
           });
         }
@@ -261,37 +260,37 @@ function Xe({
     if (e.store?.nextWorkflow) {
       const { nextWorkflow: t } = e.store;
       try {
-        const r = Q(t, f);
-        e.nextWorkflow = r?.nextWorkflow || t, Object.assign(e, r), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, e.checkCount = 0, e.status = "scanned", e.results = {
+        const r = z(t, f);
+        e.nextWorkflow = r?.nextWorkflow || t, Object.assign(e, r), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, I.current = 0, e.status = "scanned", e.results = {
           ...e.results,
           [e.token]: e.store
-        }, e.checkFn = z({ baseURL: r.baseUrl, timeout: 8e3 }).get, w();
+        }, e.checkFn = V({ baseURL: r.baseUrl, timeout: 8e3 }).get, w();
       } catch (r) {
         console.error(`Invalid nextWorkflow: ${t}`, r), e.status = "error", e.error = `Invalid nextWorkflow: ${t}: ${r.message}`;
       }
     }
   });
-  const W = I(0);
+  const R = S(0);
   return C(() => {
     if (e.token && c.isSocketAvailable && a.current) {
       let t = !1;
-      p.current ? p.current.token !== e.token && (a.current.unsubscribe(R(p.current.token)), t = !0) : t = !0, t && (p.current = a.current.subscribe(R(e.token)), W.current = 0, p.current.token = e.token, p.current.on("updated", ({ response: r }) => {
+      p.current ? p.current.token !== e.token && (a.current.unsubscribe(_(p.current.token)), t = !0) : t = !0, t && (p.current = a.current.subscribe(_(e.token)), R.current = 0, p.current.token = e.token, p.current.on("updated", ({ response: r }) => {
         const n = +new Date(r.updatedAt);
-        if (n <= W.current) {
+        if (n <= R.current) {
           console.warn("Ignore outdated message", r);
           return;
         }
-        W.current = n;
+        R.current = n;
         let { status: i, error: s } = r;
-        i === "forbidden" && (s = S.forbidden, i = "error"), e.status = i, e.mfaCode = r.mfaCode || 0, e.store = r, e.error = s, s && g(new Error(s), e?.store, A);
+        i === "forbidden" && (s = $.forbidden, i = "error"), e.status = i, e.mfaCode = r.mfaCode || 0, e.store = r, e.error = s, s && h(new Error(s), e?.store, y);
       }));
     }
-  }, [e.token, c.isSocketAvailable, a.current]), ke(w, ie()), xe(() => {
-    e.token && Y(e.status) === !1 && (e.checking = !1, setTimeout(() => {
+  }, [e.token, c.isSocketAvailable, a.current]), ke(w, le()), ve(() => {
+    e.token && q(e.status) === !1 && (e.checking = !1, setTimeout(() => {
       w(!0);
     }, 100));
-  }), { state: e, generate: y, cancelWhenScanned: ce };
+  }), { state: e, generate: E, cancelWhenScanned: ie };
 }
 export {
-  Xe as default
+  Ye as default
 };

package/lib/Connect/plugins/email/index.js

@@ -1,13 +1,14 @@
 import { jsx as a } from "react/jsx-runtime";
-import { useReactive as c, useMemoizedFn as u } from "ahooks";
-import f from "@iconify-icons/material-symbols/mail-outline-rounded";
-import { LOGIN_PROVIDER as h } from "@arcblock/ux/lib/Util/constant";
-import { translate as E } from "@arcblock/ux/lib/Locale/util";
-import P from "./list-item.js";
+import { useReactive as u, useMemoizedFn as f } from "ahooks";
+import h from "@iconify-icons/material-symbols/mail-outline-rounded";
+import { LOGIN_PROVIDER as E } from "@arcblock/ux/lib/Util/constant";
+import { translate as P } from "@arcblock/ux/lib/Locale/util";
+import p from "./list-item.js";
 import g from "./placeholder.js";
-function k({ baseUrl: s }) {
-  const i = c({
-    baseUrl: s,
+import s from "../../assets/locale.js";
+function q({ baseUrl: l }) {
+  const i = u({
+    baseUrl: l,
     status: "idle",
     get computedStatus() {
       return this.status === "idle" ? "creating" : this.status === "creating" || this.status === "sending" || this.status === "verifying" ? "scanned" : this.status;
@@ -17,8 +18,9 @@ function k({ baseUrl: s }) {
     reset() {
       this.status = "idle", this.error = "", this.magicToken = "";
     }
-  }), r = h.EMAIL, t = "Email", o = f, l = {
+  }), r = E.EMAIL, t = "Email", o = h, m = {
     zh: {
+      ...s.zh,
       email: "邮箱地址",
       emailPlaceholder: "请输入邮箱地址",
       sendCode: "发送验证邮件",
@@ -31,6 +33,7 @@ function k({ baseUrl: s }) {
       emailRequired: "邮箱地址不能为空"
     },
     en: {
+      ...s.en,
       email: "Email",
       emailPlaceholder: "Enter your email address",
       sendCode: "Send Verification Email",
@@ -42,13 +45,13 @@ function k({ baseUrl: s }) {
       emailInvalid: "Email format is incorrect",
       emailRequired: "Email is required"
     }
-  }, n = u((e, m = {}, d = "en") => E(l, e, d, "en", m));
+  }, n = f((e, d = {}, c = "en") => P(m, e, c, "en", d));
   return {
     name: r,
     title: t,
     icon: o,
     renderListItem(e) {
-      return /* @__PURE__ */ a(P, { ...e, state: i, name: r, title: t, icon: o, t: n });
+      return /* @__PURE__ */ a(p, { ...e, state: i, name: r, title: t, icon: o, t: n });
     },
     renderPlaceholder(e) {
       return /* @__PURE__ */ a(g, { ...e, state: i, name: r, title: t, icon: o, t: n });
@@ -58,5 +61,5 @@ function k({ baseUrl: s }) {
   };
 }
 export {
-  k as default
+  q as default
 };

package/lib/Connect/plugins/email/list-item.js

@@ -1,30 +1,31 @@
-import { jsx as s } from "react/jsx-runtime";
-import c from "prop-types";
-import { useMemoizedFn as l } from "ahooks";
+import { jsx as c } from "react/jsx-runtime";
+import l from "prop-types";
+import { useMemoizedFn as a } from "ahooks";
 import p from "@iconify-icons/tabler/mail-filled";
-import { LOGIN_PROVIDER as o, LOGIN_PROVIDER_NAME as a } from "@arcblock/ux/lib/Util/constant";
-import { GA_LAST_LOGIN_METHOD as I } from "@arcblock/ux/lib/withTracker/constant";
+import { LOGIN_PROVIDER as t, LOGIN_PROVIDER_NAME as I } from "@arcblock/ux/lib/Util/constant";
+import { GA_LAST_LOGIN_METHOD as L } from "@arcblock/ux/lib/withTracker/constant";
 import f from "../../components/login-item/login-method-item.js";
-import { useStateContext as u } from "../../contexts/state.js";
-function L({ ...e }) {
-  const { setSelectedPlugin: i, getPlugin: r, connectState: m } = u(), n = l(() => {
-    localStorage.setItem(I, "email");
-    const t = r(o.EMAIL);
-    t.state.reset(), t.state.status = "creating", m.chooseMethod = o.EMAIL, i(t);
+import { useStateContext as M } from "../../contexts/state.js";
+function u({ ...i }) {
+  const { setSelectedPlugin: n, getPlugin: r, connectState: m, lastLoginMethod: e } = M(), s = a(() => {
+    localStorage.setItem(L, t.EMAIL);
+    const o = r(t.EMAIL);
+    o.state.reset(), o.state.status = "creating", m.chooseMethod = t.EMAIL, n(o);
   });
-  return /* @__PURE__ */ s(
+  return /* @__PURE__ */ c(
     f,
     {
-      ...e,
-      title: a[o.EMAIL],
+      ...i,
+      isLatest: e && e === t.EMAIL,
+      title: I[t.EMAIL],
       icon: p,
-      onClick: n
+      onClick: s
     }
   );
 }
-L.propTypes = {
-  onClick: c.func
+u.propTypes = {
+  onClick: l.func
 };
 export {
-  L as default
+  u as default
 };