@use-glyph/sdk-react 1.0.5 → 1.0.8

package/dist/EIP1193Strategy.js

@@ -1,56 +1,56 @@
-import { c as B, W as C, d as J, a as q, j as z, b as H } from "./index.js";
-import { useState as f, useEffect as p, useCallback as d } from "react";
-import { useAccount as Q, useDisconnect as V, useSignMessage as X, useSendTransaction as Z, useAccountEffect as L } from "wagmi";
-const T = "__glyph-widget-token__", k = "__glyph-widget-nonce__", r = B("EIP1193Strategy"), U = ({
+import { c as J, W as C, b as q, d as z, j as H, a as Q } from "./index.js";
+import { useState as g, useEffect as p, useCallback as u } from "react";
+import { useAccount as V, useDisconnect as X, useSignMessage as Z, useSendTransaction as L, useAccountEffect as U } from "wagmi";
+const T = "__glyph-widget-token__", k = "__glyph-widget-nonce__", r = J("EIP1193Strategy"), ee = ({
   children: O,
   glyphUrl: o,
   onLogin: E,
   onLogout: S,
   askForSignature: A = !0
 }) => {
-  const [D, c] = f(!1), [F, h] = f(null), { address: t, isConnected: s, chainId: b } = Q(), { disconnectAsync: x } = V(), { signMessageAsync: m } = X(), { sendTransactionAsync: N } = Z();
-  r.log({ address: t, isConnected: s });
-  const [i, I] = f(() => {
+  const [$, c] = g(!1), [D, h] = g(null), { address: e, isConnected: s, chainId: b } = V(), { disconnectAsync: x } = X(), { signMessageAsync: m } = Z(), { sendTransactionAsync: N } = L();
+  r.log({ address: e, isConnected: s });
+  const [i, I] = g(() => {
     if (typeof window > "u")
       return null;
     try {
       return localStorage.getItem(T);
-    } catch (e) {
-      return r.warn("Error reading session token", e), null;
+    } catch (t) {
+      return r.warn("Error reading session token", t), null;
     }
-  }), [g, K] = f(null), [n, _] = f(() => {
+  }), [d, F] = g(null), [n, _] = g(() => {
     if (typeof window > "u")
       return null;
     try {
       return localStorage.getItem(k);
-    } catch (e) {
-      return r.warn("Error reading session nonce", e), null;
+    } catch (t) {
+      return r.warn("Error reading session nonce", t), null;
     }
   });
   p(() => {
     try {
       !i || !n ? (localStorage.removeItem(T), localStorage.removeItem(k)) : (localStorage.setItem(T, i), localStorage.setItem(k, n));
-    } catch (e) {
-      r.error("Error saving session token", e);
+    } catch (t) {
+      r.error("Error saving session token", t);
     }
   }, [n, i]);
-  const P = d(
-    async (e) => {
+  const P = u(
+    async (t) => {
       try {
         return await fetch(
-          `${o || C}/api/widget/auth/message/${e}`
-        ).then((l) => l.json());
+          `${o || C}/api/widget/auth/message/${t}`
+        ).then((f) => f.json());
       } catch (a) {
         throw r.error("Can't fetch message to sign", a), new Error("Failed to fetch the message to sign.");
       }
     },
     [o]
-  ), j = d(
-    async (e, a, l) => {
+  ), j = u(
+    async (t, a, f) => {
       try {
-        return await fetch(`${o || C}/api/widget/auth/verify/${e}`, {
+        return await fetch(`${o || C}/api/widget/auth/verify/${t}`, {
           method: "POST",
-          body: JSON.stringify({ signature: a, nonce: l })
+          body: JSON.stringify({ signature: a, nonce: f })
         }).then((w) => w.json());
       } catch (y) {
         throw r.error("Can't verify signature", y), new Error("Signature verification failed.");
@@ -59,89 +59,91 @@ const T = "__glyph-widget-token__", k = "__glyph-widget-nonce__", r = B("EIP1193
     [o]
   );
   p(() => {
-    !t || !s || n || (c(!0), P(t).then(({ message: e, nonce: a }) => {
-      K(e), _(a), c(!1);
+    !e || !s || n || (c(!0), P(e).then(({ message: t, nonce: a }) => {
+      F(t), _(a), c(!1);
     }).finally(() => {
       c(!1);
     }));
-  }, [t, s, P, n]), p(() => {
+  }, [e, s, P, n]), p(() => {
     if (!i || !n) return;
-    const e = J(o || C, async () => i, {
-      "x-evm-address": t,
+    const t = q(o || C, async () => i, {
+      "x-evm-address": e,
       "x-glyph-nonce": n
     });
-    h(() => e);
-  }, [i, t, o, n]);
-  const v = d(async () => {
-    var e, a, l, y, w;
-    if (r.log("authenticate"), !t) {
+    h(() => t);
+  }, [i, e, o, n]);
+  const K = u(async () => {
+    await x();
+  }, [x]), v = u(async () => {
+    var t, a, f, y, w;
+    if (r.log("authenticate"), !e) {
       r.error("no wallet connected.");
       return;
     }
     try {
-      if (!t || !s || !g || !n) {
+      if (!e || !s || !d || !n) {
         h(null), c(!1);
         return;
       }
       c(!0);
-      const u = await m({ account: t, message: g }), Y = (e = await j(t, u, n)) == null ? void 0 : e.token;
-      I(Y);
-    } catch (u) {
-      r.error("Authentication failed", u), (w = (l = (a = u == null ? void 0 : u.message) == null ? void 0 : a.toLowerCase) == null ? void 0 : (y = l.call(a)).includes) != null && w.call(y, "user rejected") || await alert(
+      const l = await m({ account: e, message: d });
+      console.log(n, d, l);
+      const B = (t = await j(e, l, n)) == null ? void 0 : t.token;
+      I(B);
+    } catch (l) {
+      r.error("Authentication failed", l), (w = (f = (a = l == null ? void 0 : l.message) == null ? void 0 : a.toLowerCase) == null ? void 0 : (y = f.call(a)).includes) != null && w.call(y, "user rejected") || await alert(
         "Authentication failed - your browser could be blocking the popups. Allow popups or try to manually click sign in."
       ), h(null), I(null), _(null);
     } finally {
       c(!1), E == null || E();
     }
-  }, [t, s, g, n, m, j]), M = d(
-    async (e = !1) => {
-      r.log(`logout: disconnect=${e}`), _(null), I(null), c(!1), h(null), e && await x(), S == null || S();
-    },
-    [x]
-  ), G = d(
-    async ({ message: e }) => {
-      if (!t || !s)
+  }, [e, s, d, n, m, j]), G = u(async () => {
+    _(null), I(null), c(!1), h(null), S == null || S();
+  }, []), R = u(
+    async ({ message: t }) => {
+      if (!e || !s)
         throw new Error("Wallet not connected");
-      return m({ account: t, message: e });
+      return m({ account: e, message: t });
     },
-    [t, s, m]
-  ), R = d(
-    async ({ transaction: e }) => {
-      if (!t || !s) throw new Error("Wallet not connected");
-      return N({ ...e, chainId: b || q.id });
+    [e, s, m]
+  ), Y = u(
+    async ({ transaction: t }) => {
+      if (!e || !s) throw new Error("Wallet not connected");
+      return N({ ...t, chainId: b || z.id });
     },
-    [t, s, N, b]
-  ), [W, $] = f(!1);
-  return L({
+    [e, s, N, b]
+  ), [M, W] = g(!1);
+  return U({
     onConnect: () => {
-      A && $(!0);
+      A && W(!0);
     },
     onDisconnect: () => {
-      M();
+      G();
     }
   }), p(() => {
-    A && s && t && W && n && g && (v(), $(!1));
-  }, [s, t, v, W, n, g, A]), /* @__PURE__ */ z.jsx(
-    H.Provider,
+    A && s && e && M && n && d && (v(), W(!1));
+  }, [s, e, v, M, n, d, A]), /* @__PURE__ */ H.jsx(
+    Q.Provider,
     {
       value: {
-        ready: !D && !!n,
-        authenticated: s && !!t && i !== null,
+        ready: !$ && !!n,
+        authenticated: s && !!e && i !== null,
         symbol: "APE",
         glyphUrl: o,
         // Pass as string to avoid type error (we are passing fallback value in useGlyph hook at a common place)
-        hideWidget: !s || !t,
+        hideWidget: !s || !e,
         login: v,
-        logout: M,
-        signMessage: G,
-        sendTransaction: R,
-        apiFetch: F
+        logout: K,
+        // on disconnect, logoutSideEffect is called and clears states
+        signMessage: R,
+        sendTransaction: Y,
+        apiFetch: D
       },
       children: O
     }
   );
 };
-U.displayName = "EIP1193Strategy";
+ee.displayName = "EIP1193Strategy";
 export {
-  U as default
+  ee as default
 };

package/dist/PrivyStrategy.js

@@ -1,114 +1,115 @@
-import { c as J, i as K, S as D, G as R, a as O, j as Q, b as X, d as Z, W as L } from "./index.js";
+import { c as K, i as O, S as R, G as F, j as Q, a as X, b as Z, W as L } from "./index.js";
 import { usePrivy as ss, useCrossAppAccounts as es, useWallets as ts } from "@privy-io/react-auth";
-import { memo as as, useState as p, useEffect as rs, useCallback as u } from "react";
-const t = J("PrivyStrategy"), F = ({ children: N, glyphUrl: y, onLogin: g, onLogout: h, useStagingTenant: f }) => {
-  const [V, A] = p(!0), [Y, m] = p(null), [a, j] = p(null), [n, U] = p(!1), {
+import { memo as as, useState as y, useEffect as rs, useCallback as g } from "react";
+import { useChainId as ns } from "wagmi";
+const t = K("PrivyStrategy"), N = ({ children: V, glyphUrl: f, onLogin: i, onLogout: l, useStagingTenant: h }) => {
+  const [Y, A] = y(!0), [j, m] = y(null), [a, U] = y(null), [n, H] = y(!1), w = ns(), {
     ready: c,
-    authenticated: i,
+    authenticated: p,
     user: o,
-    getAccessToken: w,
-    login: b,
+    getAccessToken: b,
+    login: E,
     logout: v,
-    signMessage: E,
-    sendTransaction: G
-  } = ss(), { signMessage: S, sendTransaction: T } = es();
-  t.debug(c, i, !!o);
-  const { wallets: H } = ts();
+    signMessage: G,
+    sendTransaction: S
+  } = ss(), { signMessage: I, sendTransaction: T } = es();
+  t.debug(c, p, !!o);
+  const { wallets: B } = ts();
   rs(() => {
-    var C, l, M;
+    var M, u, D;
     if (!c) {
       m(null), A(!0);
       return;
     }
-    if (!i || !o) {
+    if (!p || !o) {
       m(null), A(!1);
       return;
     }
     let e;
-    const r = (C = o.linkedAccounts) == null ? void 0 : C.find(
+    const r = (M = o.linkedAccounts) == null ? void 0 : M.find(
       (s) => s.type === "wallet" && s.chainType === "ethereum" && s.walletClientType === "privy"
-    ), I = r && K(r.address);
-    I && t.debug("Privy (main) EVM embedded wallet", r.address), t.debug("finding cross-app accounts...");
-    const W = ((M = (l = o.linkedAccounts) == null ? void 0 : l.filter) == null ? void 0 : M.call(l, (s) => s.type === "cross_app")) || [], k = W.filter(
+    ), W = r && O(r.address);
+    W && t.debug("Privy (main) EVM embedded wallet", r.address), t.debug("finding cross-app accounts...");
+    const k = ((D = (u = o.linkedAccounts) == null ? void 0 : u.filter) == null ? void 0 : D.call(u, (s) => s.type === "cross_app")) || [], x = k.filter(
       (s) => {
         var d;
-        return ((d = s.providerApp) == null ? void 0 : d.id) !== (f ? D : R);
+        return ((d = s.providerApp) == null ? void 0 : d.id) !== (h ? R : F);
       }
     );
-    t.debug("linked accounts - non-Glyph", { accounts: k });
-    const P = k.map((s) => s.embeddedWallets[0].address);
+    t.debug("linked accounts - non-Glyph", { accounts: x });
+    const P = x.map((s) => s.embeddedWallets[0].address);
     P.length > 0 && (e = P[0], t.log("using cross_app (non-Glyph) account"), P.length > 1 && t.warn("too many cross_app accounts"));
-    const x = W.filter(
+    const C = k.filter(
       (s) => {
         var d;
-        return ((d = s.providerApp) == null ? void 0 : d.id) === (f ? D : R);
+        return ((d = s.providerApp) == null ? void 0 : d.id) === (h ? R : F);
       }
     );
-    t.debug("linked accounts - Glyph", { accounts: x });
-    const _ = x.map((s) => s.embeddedWallets[0].address);
-    _.length > 0 && (e = _[0], t.log("using cross_app (Glyph) account"), _.length > 1 && t.warn("too many cross_app accounts")), e ? (U(!0), t.log("using cross_app account", e)) : I && (e = r.address, t.log("using Privy (main) EVM embedded wallet", e)), j(e ?? null), (async () => {
+    t.debug("linked accounts - Glyph", { accounts: C });
+    const _ = C.map((s) => s.embeddedWallets[0].address);
+    _.length > 0 && (e = _[0], t.log("using cross_app (Glyph) account"), _.length > 1 && t.warn("too many cross_app accounts")), e ? (H(!0), t.log("using cross_app account", e)) : W && (e = r.address, t.log("using Privy (main) EVM embedded wallet", e)), U(e ?? null), (async () => {
       if (!e) {
         t.error("user has no wallet");
         return;
       }
       const s = Z(
-        y || L,
-        async () => await w(),
+        f || L,
+        async () => await b(),
         { "x-evm-address": e }
       );
       m(() => s), A(!1);
     })();
   }, [
-    y,
-    i,
+    f,
+    p,
     c,
     o,
-    f,
+    h,
     n,
-    H,
+    B,
     a,
-    w,
+    b,
     v
   ]);
-  const B = u(async () => {
-    await b(), g == null || g();
-  }, [b]), $ = u(async () => {
-    v(), h == null || h();
-  }, [v]), q = u(
+  const $ = g(async () => {
+    await E(), i == null || i();
+  }, [i, E]), q = g(async () => {
+    v(), l == null || l();
+  }, [l, v]), z = g(
     async ({ message: e }) => {
       if (!a) throw new Error("No wallet address found");
-      return n ? S(e, { address: a }) : E({ message: e });
+      return n ? I(e, { address: a }) : G({ message: e });
     },
-    [a, n, S, E]
-  ), z = u(
+    [a, n, I, G]
+  ), J = g(
     async ({ transaction: e }) => {
       if (!a) throw new Error("No wallet address found");
-      const r = { ...e, chainId: O.id };
-      return n ? T(r, { address: a }) : G(r, { address: a });
+      const r = { ...e, chainId: w };
+      return n ? T(r, { address: a }) : S(r, { address: a });
     },
-    [a, n, T, G]
+    [w, n, a, T, S]
   );
   return /* @__PURE__ */ Q.jsx(
     X.Provider,
     {
       value: {
-        ready: c && !V,
-        authenticated: c && i,
+        ready: c && !Y,
+        authenticated: c && p,
         symbol: "APE",
-        glyphUrl: y,
+        glyphUrl: f,
         // Pass as string to avoid type error (we are passing fallback value in useGlyph hook at a common place)
-        login: B,
-        logout: $,
-        signMessage: q,
-        sendTransaction: z,
-        apiFetch: Y
+        login: $,
+        logout: q,
+        signMessage: z,
+        sendTransaction: J,
+        apiFetch: j
       },
-      children: N
+      children: V
     }
   );
 };
-F.displayName = "PrivyStrategy";
-const is = as(F);
+N.displayName = "PrivyStrategy";
+const ps = as(N);
 export {
-  is as default
+  ps as default
 };