@arcblock/did-connect-react 3.4.0 → 3.4.1

package/lib/Connect/connect.js

@@ -1,44 +1,44 @@
-import { jsx as t, jsxs as b, Fragment as qe } from "react/jsx-runtime";
-import { use as He, useRef as le, useState as Ve, useEffect as ue } from "react";
+import { jsx as t, jsxs as b, Fragment as He } from "react/jsx-runtime";
+import { use as Ve, useRef as le, useState as Ye, useEffect as ue } from "react";
 import e from "prop-types";
-import { Box as i, Skeleton as Ye, Divider as Ge } from "@mui/material";
-import { useUpdate as Ke, useSize as Qe, useCreation as u, useMount as de, useMemoizedFn as F, useDebounceFn as Xe, usePrevious as Je, useUpdateEffect as Ze } from "ahooks";
+import { Box as i, Skeleton as Ge, Divider as Ke } from "@mui/material";
+import { useUpdate as Qe, useSize as Xe, useCreation as u, useMount as de, useMemoizedFn as F, useDebounceFn as Je, usePrevious as Ze, useUpdateEffect as $e } from "ahooks";
 import C from "lodash/noop";
-import $e from "lodash/isUndefined";
-import et from "@arcblock/ux/lib/CloseButton";
-import { DID_CONNECT_MEDIUM_WIDTH as N, LOGIN_PROVIDER_NAME as tt, DID_CONNECT_SMALL_WIDTH as ot, OAUTH_PROVIDER as j, LOGIN_PROVIDER as rt } from "@arcblock/ux/lib/Util/constant";
-import nt from "@arcblock/ux/lib/QRCode";
-import { DIDConnectFooter as it } from "@arcblock/ux/lib/DIDConnect";
-import { useTheme as st } from "@arcblock/ux/lib/Theme";
-import at from "@arcblock/ux/lib/DIDConnect/provider-icon";
+import et from "lodash/isUndefined";
+import tt from "@arcblock/ux/lib/CloseButton";
+import { DID_CONNECT_MEDIUM_WIDTH as N, LOGIN_PROVIDER_NAME as ot, DID_CONNECT_SMALL_WIDTH as rt, OAUTH_PROVIDER as j, LOGIN_PROVIDER as nt } from "@arcblock/ux/lib/Util/constant";
+import it from "@arcblock/ux/lib/QRCode";
+import { DIDConnectFooter as st } from "@arcblock/ux/lib/DIDConnect";
+import { useTheme as at } from "@arcblock/ux/lib/Theme";
+import ct from "@arcblock/ux/lib/DIDConnect/provider-icon";
 import "@fontsource/lexend/400.css";
 import "@fontsource/lexend/600.css";
-import { SessionContext as ct } from "../Session/context.js";
-import { StateProvider as lt, useStateContext as ut } from "./contexts/state.js";
-import dt from "./components/login-item/connect-provider-list.js";
-import ft from "./components/auto-height.js";
-import mt from "./hooks/token.js";
-import { useOAuth as pt } from "../OAuth/context.js";
-import ht from "./components/connect-status.js";
-import { usePasskey as bt } from "../Passkey/context.js";
-import { CHECK_STATUS_INTERVAL as gt, API_DID_PREFIX as xt, BUSY_STATUS as w, DEFAULT_TIMEOUT as Ct } from "../constant.js";
+import { SessionContext as lt } from "../Session/context.js";
+import { StateProvider as ut, useStateContext as dt } from "./contexts/state.js";
+import ft from "./components/login-item/connect-provider-list.js";
+import mt from "./components/auto-height.js";
+import pt from "./hooks/token.js";
+import { useOAuth as ht } from "../OAuth/context.js";
+import bt from "./components/connect-status.js";
+import { usePasskey as gt } from "../Passkey/context.js";
+import { CHECK_STATUS_INTERVAL as xt, API_DID_PREFIX as Ct, BUSY_STATUS as w, DEFAULT_TIMEOUT as yt } from "../constant.js";
 import "../utils.js";
-import yt from "./components/did-connect-title.js";
-import St from "./components/download-tips.js";
-import kt from "./hooks/provider-list.js";
-import wt from "./hooks/auth-url.js";
-import { getWalletDid as It } from "../User/use-did.js";
-import vt from "./fallback-connect.js";
-import { getWebWalletUrl as Pt } from "@arcblock/ux/lib/Util/wallet";
+import St from "./components/did-connect-title.js";
+import kt from "./components/download-tips.js";
+import wt from "./hooks/provider-list.js";
+import It from "./hooks/auth-url.js";
+import { getWalletDid as vt } from "../User/use-did.js";
+import Pt from "./fallback-connect.js";
+import { getWebWalletUrl as _t } from "@arcblock/ux/lib/Util/wallet";
 function fe({
   hideCloseButton: y = !1,
   mode: p = "dialog",
   action: I,
   baseUrl: g = "",
   checkFn: v,
-  checkInterval: P = gt,
-  checkTimeout: _ = Ct * 1e3,
-  prefix: D = xt,
+  checkInterval: P = xt,
+  checkTimeout: _ = yt * 1e3,
+  prefix: D = Ct,
   tokenKey: B = "_t_",
   locale: q = "en",
   encKey: me = "_ek_",
@@ -50,7 +50,7 @@ function fe({
   provider: ge = "",
   messages: d = {},
   passkeyBehavior: Y = "none",
-  webWalletUrl: xe = Pt(),
+  webWalletUrl: xe = _t(),
   enabledConnectTypes: Ce = ["web", "mobile", ...Object.keys(j)],
   extraContent: G = null,
   disableSwitchApp: T = !1,
@@ -62,7 +62,7 @@ function fe({
   onRecreateSession: X = C,
   setColor: Se = C
 }) {
-  const A = st(), J = Ke(), ke = He(ct), we = It(ke?.session?.user), {
+  const A = at(), J = Qe(), ke = Ve(lt), we = vt(ke?.session?.user), {
     t: Z,
     staticState: Ie,
     connectState: s,
@@ -74,8 +74,9 @@ function fe({
     blocklet: $,
     masterBlocklet: _e,
     showWalletOptions: f,
-    setShowWalletOptions: De
-  } = ut(), { state: o, generate: ee, cancelWhenScanned: Te } = mt({
+    setShowWalletOptions: De,
+    lastLoginMethod: Te
+  } = dt(), { state: o, generate: ee, cancelWhenScanned: Oe } = pt({
     action: I,
     baseUrl: g,
     checkFn: v,
@@ -93,17 +94,17 @@ function fe({
     saveConnect: he,
     useSocket: be,
     provider: ge
-  }), z = le(!1), te = le(null), x = Qe(te), oe = u(() => x ? x.width < N - 50 : !0, [x, x?.width]), [re, Oe] = Ve(!1);
+  }), z = le(!1), te = le(null), x = Xe(te), oe = u(() => x ? x.width < N - 50 : !0, [x, x?.width]), [re, Re] = Ye(!1);
   de(() => {
-    Oe(x?.width < N - 50);
+    Re(x?.width < N - 50);
   });
-  const { oauthState: c, setBaseUrl: Re } = pt(), { passkeyState: l, setTargetAppPid: Ae } = bt();
+  const { oauthState: c, setBaseUrl: Ae } = ht(), { passkeyState: l, setTargetAppPid: We } = gt();
   de(() => {
-    Re(g), Ae($?.appPid), o.reset(), c.reset(), l.reset();
+    Ae(g), We($?.appPid), o.reset(), c.reset(), l.reset();
   }), ue(() => {
     Se(W);
   }, [W]);
-  const We = u(() => ({
+  const ze = u(() => ({
     confirm: d.confirm,
     success: d.success,
     error: a?.state?.error || o.error || l.error || c.error || ""
@@ -116,34 +117,35 @@ function fe({
     a?.state?.error
   ]), S = u(() => w.includes(l.status) || w.includes(c.status) || w.includes(o.status) || w.includes(a?.state?.computedStatus), [o.status, c.status, l.status, a?.state?.computedStatus]), ne = F(async () => {
     X(), c.reset(), l.reset(), await ee(!1);
-  }), ze = F(() => {
-    s?.retryConnect();
   }), Ee = F(() => {
-    X(), c.reset(), l.reset(), a?.state?.reset(), Ie.current.cancelCount++, Te();
-  }), { run: Ue } = Xe(
+    s?.retryConnect();
+  }), Le = F(() => {
+    X(), c.reset(), l.reset(), a?.state?.reset(), Ie.current.cancelCount++, Oe();
+  }), { run: Me } = Je(
     () => {
       z.current || o.status === "timeout" && (z.current = !0, o.reset(), ne(), z.current = !1);
     },
     { leading: !0, trailing: !1 }
   );
-  ue(Ue, [o.status]);
-  const Le = u(() => tt[s.chooseMethod] || "DID Wallet", [s.chooseMethod]), { providerList: Me, hideQRCode: m, hideChooseList: r, loadingProviderList: Fe } = kt({
+  ue(Me, [o.status]);
+  const Ue = u(() => ot[s.chooseMethod] || "DID Wallet", [s.chooseMethod]), { providerList: Fe, hideQRCode: m, hideChooseList: r, loadingProviderList: Ne } = wt({
     action: o.action,
     sourceAppPid: s?.sourceAppPid,
     allowWallet: V,
     passkeyBehavior: Y,
     mode: p,
     blocklet: s?.sourceAppPid ? _e : $,
-    isSmallView: oe
-  }), Ne = Je(s?.sourceAppPid);
-  Ze(() => {
-    $e(Ne) || ee();
+    isSmallView: oe,
+    lastLoginMethod: Te
+  }), je = Ze(s?.sourceAppPid);
+  $e(() => {
+    et(je) || ee();
   }, [s?.sourceAppPid]);
   const n = (k) => {
     const h = A.spacing(k);
     return parseInt(h, 10);
-  }, je = u(() => y ? null : /* @__PURE__ */ t(
-    et,
+  }, Be = u(() => y ? null : /* @__PURE__ */ t(
+    tt,
     {
       onClose: O,
       sx: {
@@ -164,39 +166,39 @@ function fe({
         justifyContent: "center"
       },
       children: /* @__PURE__ */ t(i, { children: /* @__PURE__ */ t(
-        ht,
+        bt,
         {
           status: a?.state?.computedStatus || c.status || l.status || o.status,
           nextWorkflow: o.nextWorkflow,
           mfaCode: o.mfaCode,
-          onCancel: Ee,
-          onRetry: ze,
+          onCancel: Le,
+          onRetry: Ee,
           onClose: O,
-          messages: We,
+          messages: ze,
           locale: q,
           className: "did-connect__auth-status auth-status",
-          loadingIcon: s.chooseMethod ? /* @__PURE__ */ t(at, { provider: s.chooseMethod, sx: { color: "text.primary" } }) : null,
-          chooseMethod: Le,
+          loadingIcon: s.chooseMethod ? /* @__PURE__ */ t(ct, { provider: s.chooseMethod, sx: { color: "text.primary" } }) : null,
+          chooseMethod: Ue,
           hideRetry: s.chooseMethod === "email",
           hideBack: !!K
         }
       ) })
     }
   ));
-  const se = wt({ disableSwitchApp: T, tokenState: o }), E = u(() => {
+  const se = It({ disableSwitchApp: T, tokenState: o }), E = u(() => {
     const k = A.mode === "dark" ? A.palette.grey[600] : "white";
-    let h = r ? 240 - n(3) * 2 : 196 - n(2) * 2, M = r ? 3 : 2;
-    return f && (M = 1, h += n(M) * 2), /* @__PURE__ */ t(
+    let h = r ? 240 - n(3) * 2 : 196 - n(2) * 2, U = r ? 3 : 2;
+    return f && (U = 1, h += n(U) * 2), /* @__PURE__ */ t(
       i,
       {
         className: "did-connect__qrcode",
         sx: {
-          p: M,
+          p: U,
           width: (r ? 240 : 196) + n(1) * 2,
           height: (r ? 240 : 196) + n(1) * 2
         },
         children: o.url ? /* @__PURE__ */ t(
-          nt,
+          it,
           {
             data: se,
             size: h,
@@ -220,7 +222,7 @@ function fe({
             }
           }
         ) : /* @__PURE__ */ t(
-          Ye,
+          Ge,
           {
             animation: "wave",
             variant: "rectangular",
@@ -239,7 +241,7 @@ function fe({
         )
       }
     );
-  }, [se, r, f]), Be = u(() => r ? "column-reverse" : !m && re ? "column" : "row", [r, re, m]), ae = u(() => E ? /* @__PURE__ */ t(
+  }, [se, r, f]), qe = u(() => r ? "column-reverse" : !m && re ? "column" : "row", [r, re, m]), ae = u(() => E ? /* @__PURE__ */ t(
     i,
     {
       sx: {
@@ -289,7 +291,7 @@ function fe({
                 children: [
                   Z("scanWithWallet1"),
                   " ",
-                  /* @__PURE__ */ t(St, {}),
+                  /* @__PURE__ */ t(kt, {}),
                   " ",
                   Z("scanWithWallet2")
                 ]
@@ -299,13 +301,13 @@ function fe({
         }
       )
     }
-  ) : null, [E, r, f]), U = /* @__PURE__ */ b(
+  ) : null, [E, r, f]), L = /* @__PURE__ */ b(
     i,
     {
       className: "did-connect__body",
       sx: {
         display: "flex",
-        flexDirection: Be,
+        flexDirection: qe,
         justifyContent: "center",
         alignItems: "stretch",
         flex: 1,
@@ -314,10 +316,10 @@ function fe({
         px: r ? 2 : 0
       },
       children: [
-        !S && !m ? /* @__PURE__ */ b(qe, { children: [
+        !S && !m ? /* @__PURE__ */ b(He, { children: [
           ae,
           r ? null : /* @__PURE__ */ t(i, { children: /* @__PURE__ */ t(
-            Ge,
+            Ke,
             {
               orientation: "vertical",
               sx: {
@@ -341,7 +343,7 @@ function fe({
             children: [
               ie,
               /* @__PURE__ */ t(
-                dt,
+                ft,
                 {
                   slotProps: {
                     root: {
@@ -365,7 +367,7 @@ function fe({
                   magicToken: K,
                   baseUrl: g,
                   customItems: ye,
-                  providerList: Me,
+                  providerList: Fe,
                   qrcode: ae
                 }
               )
@@ -375,15 +377,15 @@ function fe({
       ]
     }
   );
-  let L = U;
-  a ? L = a.renderPlaceholder({
-    fallback: U,
+  let M = L;
+  a ? M = a.renderPlaceholder({
+    fallback: L,
     forceUpdate: J,
     onSuccess: R,
     onError: Q
-  }) : L = U;
-  const ce = m || S ? ot : N;
-  return Fe ? /* @__PURE__ */ t(vt, {}) : /* @__PURE__ */ b(
+  }) : M = L;
+  const ce = m || S ? rt : N;
+  return Ne ? /* @__PURE__ */ t(Pt, {}) : /* @__PURE__ */ b(
     i,
     {
       ref: te,
@@ -408,7 +410,7 @@ function fe({
       children: [
         /* @__PURE__ */ t(i, { "data-did-auth-url": o.url, sx: { display: "none" } }),
         /* @__PURE__ */ t(
-          yt,
+          St,
           {
             title: d.title,
             description: d.scan,
@@ -418,9 +420,9 @@ function fe({
             onBack: () => De(!1)
           }
         ),
-        /* @__PURE__ */ t(ft, { initHeight: 72, children: L }),
-        /* @__PURE__ */ t(it, { currentAppInfo: Pe, currentAppColor: W }),
-        je
+        /* @__PURE__ */ t(mt, { initHeight: 72, children: M }),
+        /* @__PURE__ */ t(st, { currentAppInfo: Pe, currentAppColor: W }),
+        Be
       ]
     }
   );
@@ -447,7 +449,7 @@ fe.propTypes = {
   enabledConnectTypes: e.arrayOf(e.oneOf(["web", "mobile", ...Object.keys(j)])),
   webWalletUrl: e.string,
   allowWallet: e.bool,
-  provider: e.oneOf([rt.WALLET, ...Object.keys(j), ""]),
+  provider: e.oneOf([nt.WALLET, ...Object.keys(j), ""]),
   hideCloseButton: e.bool,
   disableSwitchApp: e.bool,
   onClose: e.func,
@@ -458,12 +460,12 @@ fe.propTypes = {
   magicToken: e.string,
   customItems: e.arrayOf(e.node)
 };
-function _t({ testOnlyBorderColor: y = void 0, ...p }) {
+function Dt({ testOnlyBorderColor: y = void 0, ...p }) {
   const { checkFn: I, extraParams: g = {}, blocklet: v, masterBlocklet: P, action: _, locale: D = "en" } = p;
   if (typeof I != "function")
     throw new Error("Cannot initialize did connect component without a fetchFn");
   return /* @__PURE__ */ t(
-    lt,
+    ut,
     {
       blocklet: v,
       masterBlocklet: P,
@@ -487,7 +489,7 @@ function _t({ testOnlyBorderColor: y = void 0, ...p }) {
     }
   );
 }
-_t.propTypes = {
+Dt.propTypes = {
   checkFn: e.func.isRequired,
   extraParams: e.object,
   blocklet: e.object.isRequired,
@@ -497,5 +499,5 @@ _t.propTypes = {
   testOnlyBorderColor: e.string
 };
 export {
-  _t as default
+  Dt as default
 };

package/lib/Connect/contexts/state.js

@@ -1,57 +1,64 @@
 import { jsx as O } from "react/jsx-runtime";
 import r from "prop-types";
-import { useState as S, use as E, useRef as W, useEffect as V, createContext as X } from "react";
+import { useState as S, use as W, useRef as D, useEffect as V, createContext as X } from "react";
 import Y from "@arcblock/react-hooks/lib/useBrowser";
-import { useUpdate as Z, useCreation as i, useMemoizedFn as h, useLatest as _, useReactive as $, useSize as ee } from "ahooks";
-import x from "lodash/isUndefined";
-import te from "lodash/noop";
-import { Box as oe } from "@mui/material";
-import { translate as re } from "@arcblock/ux/lib/Locale/util";
-import { getMaster as D, getCurrentApp as ne } from "@arcblock/ux/lib/Util/federated";
-import { getDIDMotifInfo as se } from "@arcblock/did-motif";
-import { isEthereumDid as ie, getDIDColor as pe } from "@arcblock/ux/lib/Util";
-import ce from "../hooks/use-apps.js";
-import { SessionContext as ue } from "../../Session/context.js";
-import de from "../assets/locale.js";
-const R = X({
+import { useUpdate as Z, useCreation as n, useMemoizedFn as h, useLatest as $, useReactive as ee, useSize as te } from "ahooks";
+import E from "lodash/isUndefined";
+import oe from "lodash/noop";
+import { Box as re } from "@mui/material";
+import { translate as ne } from "@arcblock/ux/lib/Locale/util";
+import { getMaster as T, getCurrentApp as se } from "@arcblock/ux/lib/Util/federated";
+import { getDIDMotifInfo as ie } from "@arcblock/did-motif";
+import { isEthereumDid as ce, getDIDColor as pe } from "@arcblock/ux/lib/Util";
+import { GA_LAST_LOGIN_METHOD as ue } from "@arcblock/ux/lib/withTracker/constant";
+import ae from "../hooks/use-apps.js";
+import { SessionContext as de } from "../../Session/context.js";
+import le from "../assets/locale.js";
+const x = X({
   isWalletWebview: !1,
   isMobile: !1,
   matchSmallScreen: !1,
   blocklet: null
-}), { Provider: ae, Consumer: We } = R;
-function le({
-  children: T,
-  blocklet: p,
+}), { Provider: fe, Consumer: We } = x;
+function me({
+  children: R,
+  blocklet: c,
   masterBlocklet: P = void 0,
-  action: d,
+  action: a,
   extraParams: t = {},
-  locale: a = "en",
+  locale: d = "en",
   testOnlyBorderColor: l = void 0,
-  ...j
+  ...L
 }) {
-  const w = Z(), [f, q] = S([]), [z, J] = S(!1), [m, N] = S(""), U = i(() => new Map(f.map((e) => [e.name, e])), [f]), k = h((e) => U.get(e)), B = _(m), L = h((e, s = {}) => re(de, e, a, "en", s)), g = E(ue), o = $({
+  const w = Z(), [f, j] = S([]), [N, q] = S(!1), [m, z] = S(""), G = n(() => new Map(f.map((e) => [e.name, e])), [f]), J = h((e) => G.get(e)), U = $(m), _ = h((e, i = {}) => ne(le, e, d, "en", i)), g = W(de), o = ee({
     sourceAppPid: void 0,
     status: "created",
     autoActiveWebview: !0,
     deeplink: void 0,
     chooseMethod: "",
-    retryConnect: te
-  }), F = W({
+    retryConnect: oe
+  }), k = D({
     cancelCount: 0
-  }), n = Y(), { appInfoList: b, autoGenerateSourceAppPid: A, canSwitchApp: v } = ce({
-    blocklet: p,
+  }), s = Y(), { appInfoList: b, autoGenerateSourceAppPid: A, canSwitchApp: v } = ae({
+    blocklet: c,
     connectState: o,
-    action: d,
+    action: a,
     sourceAppPid: t?.sourceAppPid,
     enableSwitchApp: t?.forceSwitch || t?.enableSwitchApp
-  }), C = W(null), M = ee(C), y = i(() => (M?.width || 0) < 500, [M?.width]), c = i(() => {
+  }), B = n(() => {
+    try {
+      return localStorage.getItem(ue);
+    } catch {
+      return "";
+    }
+  }, []), C = D(null), M = te(C), y = n(() => (M?.width || 0) < 500, [M?.width]), p = n(() => {
     if (v)
       return {
         ...t,
-        sourceAppPid: x(o.sourceAppPid) ? A : o.sourceAppPid
+        sourceAppPid: E(o.sourceAppPid) ? A : o.sourceAppPid
       };
-    const e = D(p)?.appPid, s = D(globalThis.blocklet)?.appPid;
-    return g?.session?.user && (e === s || !e) ? x(t?.sourceAppPid) ? {
+    const e = T(c)?.appPid, i = T(globalThis.blocklet)?.appPid;
+    return g?.session?.user && (e === i || !e) ? E(t?.sourceAppPid) ? {
       ...t,
       sourceAppPid: g.session.user?.sourceAppPid
     } : t : {
@@ -62,70 +69,72 @@ function le({
     v,
     t,
     o.sourceAppPid,
-    d,
+    a,
     A,
     g?.session?.user
-  ]), G = i(() => {
+  ]), F = n(() => {
     const e = window?.navigator?.userAgent;
     return e.indexOf("Edge") > -1 || e.indexOf("Edg") > -1 ? "edge" : e.indexOf("Chrome") > -1 ? "chrome" : "unknown";
   }, []);
   V(() => {
-    o.sourceAppPid = c.sourceAppPid;
-  }, [c.sourceAppPid]);
+    o.sourceAppPid = p.sourceAppPid;
+  }, [p.sourceAppPid]);
   const H = h((e) => {
     o.status = e || "created";
-  }), u = globalThis.blocklet ? ne(p) : globalThis.env, I = i(() => {
+  }), u = globalThis.blocklet ? se(c) : globalThis.env, I = n(() => {
     if (l)
       return l;
-    const e = u.appPid, s = ie(e), Q = s ? void 0 : se(e);
-    return s ? pe(e) : Q.color;
-  }, [u.appId, l]), K = i(() => ({
-    isWalletWebview: n.wallet || n.arcSphere,
-    isMobile: n.mobile.any,
+    const e = u.appPid, i = ce(e), Q = i ? void 0 : ie(e);
+    return i ? pe(e) : Q.color;
+  }, [u.appId, l]), K = n(() => ({
+    isWalletWebview: s.wallet || s.arcSphere,
+    isMobile: s.mobile.any,
     matchSmallScreen: y,
     connectState: o,
-    staticState: F,
+    staticState: k,
     reactiveState: o,
     appInfoList: b,
-    extraParams: c,
-    blocklet: p,
+    extraParams: p,
+    blocklet: c,
     masterBlocklet: P,
-    browserBrand: G,
+    browserBrand: F,
     currentAppInfo: u,
     currentAppColor: I,
-    t: L,
-    locale: a,
-    action: d,
+    t: _,
+    locale: d,
+    action: a,
     changeStatus: H,
-    getPlugin: k,
-    latestActivePlugin: B,
+    getPlugin: J,
+    latestActivePlugin: U,
     plugins: f,
-    setPlugins: q,
+    setPlugins: j,
     selectedPlugin: m,
-    setSelectedPlugin: N,
+    setSelectedPlugin: z,
     forceUpdate: w,
     // 控制钱包登录的显示
-    showWalletOptions: z,
-    setShowWalletOptions: J
+    showWalletOptions: N,
+    setShowWalletOptions: q,
+    // 用于记录上一次登录方式
+    lastLoginMethod: B
   }), [
-    n.wallet,
-    n.arcSphere,
-    n.mobile.any,
+    s.wallet,
+    s.arcSphere,
+    s.mobile.any,
     y,
     JSON.stringify(o),
     JSON.stringify(b),
-    JSON.stringify(c),
-    p,
+    JSON.stringify(p),
+    c,
     P,
-    a,
+    d,
     m,
     w,
     u,
     I
   ]);
-  return /* @__PURE__ */ O(ae, { value: K, children: /* @__PURE__ */ O(oe, { ...j, ref: C, children: T }) });
+  return /* @__PURE__ */ O(fe, { value: K, children: /* @__PURE__ */ O(re, { ...L, ref: C, children: R }) });
 }
-le.propTypes = {
+me.propTypes = {
   children: r.any.isRequired,
   blocklet: r.object.isRequired,
   masterBlocklet: r.object,
@@ -135,11 +144,11 @@ le.propTypes = {
   testOnlyBorderColor: r.string
 };
 function xe() {
-  return E(R);
+  return W(x);
 }
 export {
   We as StateConsumer,
-  R as StateContext,
-  le as StateProvider,
+  x as StateContext,
+  me as StateProvider,
   xe as useStateContext
 };