@orbs-network/spot-react 2.1.13 → 2.1.15

package/dist/spot-react.js

@@ -1,32 +1,32 @@
 "use client";
-var Fe = Object.defineProperty;
-var xe = (e, t, n) => t in e ? Fe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var oe = (e, t, n) => xe(e, typeof t != "symbol" ? t + "" : t, n);
-import { OrderStatus as J, Module as b, createClient as Ue, analytics as U, getTwapConfig as ve, calculateOrderForm as De, getPartnerChains as Ge, isNativeAddress as $, eqIgnoreCase as fe, toAmountRaw as ee, toAmountUI as ie, isTxRejected as Ce, getOrderLimitPriceRate as Me, getTriggerPriceRate as _e, getOrderExecutionRate as Re, getOrderFillDelayMillis as Be, invertPriceInput as he, setUIVersion as qe } from "@orbs-network/spot-ui";
-import { DISCLAIMER_URL as ar, InputErrors as cr, Module as dr, ORBS_LOGO as ur, ORBS_SLTP_FAQ_URL as lr, ORBS_TWAP_FAQ_URL as mr, ORBS_WEBSITE_URL as gr, OrderFilter as Pr, OrderStatus as fr, OrderType as hr, Partners as Sr, SPOT_VERSION as Er, TimeUnit as Ir, calculateOrderForm as Or, createClient as pr, eqIgnoreCase as Ar, getOrderExecutionRate as wr, getOrderFillDelayMillis as vr, getOrderLimitPriceRate as Cr, getPartnerChains as Rr, getPartners as yr, getTriggerPriceRate as Tr, getTwapConfig as Nr, invertPriceInput as Lr, isNativeAddress as Fr, isTxRejected as xr, toAmountRaw as Ur, toAmountUI as Dr } from "@orbs-network/spot-ui";
-import { jsx as D, jsxs as ue, Fragment as We } from "react/jsx-runtime";
-import { createContext as le, useContext as me, useState as Ke, useCallback as v, useEffect as X, useMemo as C, Component as Ve, useRef as He } from "react";
-import { useStore as je } from "zustand";
+var xe = Object.defineProperty;
+var Fe = (e, t, n) => t in e ? xe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var oe = (e, t, n) => Fe(e, typeof t != "symbol" ? t + "" : t, n);
+import { OrderStatus as J, Module as X, createClient as Ue, analytics as De, calculateOrderForm as Ge, isNativeAddress as Q, eqIgnoreCase as Pe, toAmountRaw as k, toAmountUI as ne, isTxRejected as ve, getOrderLimitPriceRate as Me, getTriggerPriceRate as Be, getOrderExecutionRate as we, getOrderFillDelayMillis as _e, getTwapConfig as qe, invertPriceInput as fe, setUIVersion as We } from "@orbs-network/spot-ui";
+import { DISCLAIMER_URL as ur, InputErrors as lr, Module as mr, ORBS_LOGO as gr, ORBS_SLTP_FAQ_URL as Pr, ORBS_TWAP_FAQ_URL as fr, ORBS_WEBSITE_URL as hr, OrderFilter as Er, OrderStatus as Ir, OrderType as Sr, Partners as Or, TimeUnit as pr, calculateOrderForm as Ar, createClient as vr, eqIgnoreCase as wr, getOrderExecutionRate as Cr, getOrderFillDelayMillis as yr, getOrderLimitPriceRate as Rr, getTriggerPriceRate as Tr, getTwapConfig as Nr, invertPriceInput as Lr, isNativeAddress as xr, isTxRejected as Fr, toAmountRaw as Ur, toAmountUI as Dr } from "@orbs-network/spot-ui";
+import { jsx as U, jsxs as ue, Fragment as Ke } from "react/jsx-runtime";
+import { createContext as le, useContext as me, useState as Ve, useCallback as v, useMemo as R, useEffect as ie, Component as He, useRef as je } from "react";
+import { useStore as Je } from "zustand";
 import { createStore as ze } from "zustand/vanilla";
-const Je = "2.1.13", Qe = {
-  version: Je
-}, ye = le(null), Ye = ({
+const $e = "2.1.15", Qe = {
+  version: $e
+}, Ce = le(null), Ye = ({
   children: e,
   value: t
-}) => /* @__PURE__ */ D(ye.Provider, { value: t, children: e }), x = () => {
-  const e = me(ye);
+}) => /* @__PURE__ */ U(Ce.Provider, { value: t, children: e }), x = () => {
+  const e = me(Ce);
   if (e === null)
-    throw new Error("useSpotRuntime must be used within SpotProvider");
+    throw new Error("useSpotTrading must be used within SpotProvider");
   return e;
 };
-var q = /* @__PURE__ */ ((e) => (e[e.LOADING = 1] = "LOADING", e[e.SUCCESS = 2] = "SUCCESS", e[e.FAILED = 3] = "FAILED", e))(q || {}), d = /* @__PURE__ */ ((e) => (e.IDLE = "idle", e.PREPARING = "preparing", e.WRAPPING = "wrapping", e.APPROVING = "approving", e.SIGNING = "signing", e.SUBMITTING = "submitting", e.SUCCESS = "success", e.FAILED = "failed", e.REJECTED = "rejected", e))(d || {}), te = /* @__PURE__ */ ((e) => (e.TRIGGER_MARKET_PRICE = "triggerMarketPriceDisclaimer", e.MARKET_PRICE = "marketOrderDisclaimer", e.LIMIT_PRICE = "limitOrderDisclaimer", e))(te || {}), Q = /* @__PURE__ */ ((e) => (e.WRAP = "wrap", e.APPROVE = "approve", e.CREATE = "create", e))(Q || {});
-const $e = /* @__PURE__ */ new Set([
+var q = /* @__PURE__ */ ((e) => (e[e.LOADING = 1] = "LOADING", e[e.SUCCESS = 2] = "SUCCESS", e[e.FAILED = 3] = "FAILED", e))(q || {}), d = /* @__PURE__ */ ((e) => (e.IDLE = "idle", e.PREPARING = "preparing", e.WRAPPING = "wrapping", e.APPROVING = "approving", e.SIGNING = "signing", e.SUBMITTING = "submitting", e.SUCCESS = "success", e.FAILED = "failed", e.REJECTED = "rejected", e))(d || {}), ee = /* @__PURE__ */ ((e) => (e.TRIGGER_MARKET_PRICE = "triggerMarketPriceDisclaimer", e.MARKET_PRICE = "marketOrderDisclaimer", e.LIMIT_PRICE = "limitOrderDisclaimer", e))(ee || {}), z = /* @__PURE__ */ ((e) => (e.WRAP = "wrap", e.APPROVE = "approve", e.CREATE = "create", e))(z || {});
+const Xe = /* @__PURE__ */ new Set([
   d.PREPARING,
   d.WRAPPING,
   d.APPROVING,
   d.SIGNING,
   d.SUBMITTING
-]), Xe = {
+]), Ze = {
   [d.IDLE]: /* @__PURE__ */ new Set(),
   [d.PREPARING]: /* @__PURE__ */ new Set([
     d.PREPARING,
@@ -63,19 +63,19 @@ const $e = /* @__PURE__ */ new Set([
   [d.SUCCESS]: /* @__PURE__ */ new Set(),
   [d.FAILED]: /* @__PURE__ */ new Set(),
   [d.REJECTED]: /* @__PURE__ */ new Set()
-}, re = (e) => ({
+}, te = (e) => ({
   phase: d.IDLE,
   completedWrap: e
-}), Y = (e) => $e.has(e), Ze = (e) => e === d.IDLE || e === d.FAILED || e === d.REJECTED, be = (e, t) => Xe[e].has(t), ke = (e) => {
-  if (Y(e)) return q.LOADING;
+}), $ = (e) => Xe.has(e), be = (e) => e === d.IDLE || e === d.FAILED || e === d.REJECTED, ke = (e, t) => Ze[e].has(t), et = (e) => {
+  if ($(e)) return q.LOADING;
   if (e === d.SUCCESS) return q.SUCCESS;
   if (e === d.FAILED || e === d.REJECTED)
     return q.FAILED;
-}, et = (e) => {
-  if (e === d.WRAPPING) return Q.WRAP;
-  if (e === d.APPROVING) return Q.APPROVE;
+}, tt = (e) => {
+  if (e === d.WRAPPING) return z.WRAP;
+  if (e === d.APPROVING) return z.APPROVE;
   if (e === d.SIGNING || e === d.SUBMITTING)
-    return Q.CREATE;
+    return z.CREATE;
 }, ge = (e) => {
   if (e instanceof Error) return e.message;
   if (typeof e == "string") return e;
@@ -84,17 +84,17 @@ const $e = /* @__PURE__ */ new Set([
     if (typeof t == "string") return t;
   }
   return "Unknown error";
-}, tt = (e) => {
+}, rt = (e) => {
   if (typeof e != "object" || e === null) return 0;
   const t = Reflect.get(e, "code");
   return typeof t == "number" && Number.isFinite(t) ? t : typeof t == "string" && /^-?\d+$/.test(t) ? Number(t) : 0;
-}, ne = (e) => e instanceof Error ? e : new Error(ge(e)), se = (e) => {
+}, re = (e) => e instanceof Error ? e : new Error(ge(e)), se = (e) => {
   const t = ge(e), n = t.match(/,\s*code\s*:\s*(-?\d+)/i);
   return {
     message: t.replace(/^error\s*:/i, "").replace(/,\s*code\s*:\s*-?\d+/i, "").trim() || "Unknown error",
-    code: tt(e) || (n ? Number(n[1]) : 0)
+    code: rt(e) || (n ? Number(n[1]) : 0)
   };
-}, E = (e) => {
+}, I = (e) => {
   if (e)
     try {
       const t = e();
@@ -102,27 +102,27 @@ const $e = /* @__PURE__ */ new Set([
       });
     } catch {
     }
-}, rt = ({
+}, nt = ({
   execution: e,
   account: t,
   chainId: n,
   inputTokenAddress: r,
-  inputAmountRaw: o
+  inputAmountRaw: i
 }) => {
-  const i = e.completedWrap;
-  if ((i == null ? void 0 : i.account.toLowerCase()) === t.toLowerCase() && i.chainId === n && i.inputTokenAddress.toLowerCase() === r.toLowerCase() && nt(i.inputAmountRaw, o))
-    return i;
-}, nt = (e, t) => {
+  const o = e.completedWrap;
+  if ((o == null ? void 0 : o.account.toLowerCase()) === t.toLowerCase() && o.chainId === n && o.inputTokenAddress.toLowerCase() === r.toLowerCase() && it(o.inputAmountRaw, i))
+    return o;
+}, it = (e, t) => {
   try {
     return BigInt(e) >= BigInt(t);
   } catch {
     return !1;
   }
-}, it = 2e4, Se = /* @__PURE__ */ new WeakMap(), Ee = (e) => {
-  const t = Se.get(e);
+}, ot = 2e4, he = /* @__PURE__ */ new WeakMap(), Ee = (e) => {
+  const t = he.get(e);
   if (t) return t;
   const n = {
-    all: [...e].sort((r, o) => o.createdAt - r.createdAt),
+    all: [...e].sort((r, i) => i.createdAt - r.createdAt),
     open: [],
     completed: [],
     cancelled: [],
@@ -143,28 +143,28 @@ const $e = /* @__PURE__ */ new Set([
         n.expired.push(r);
         break;
     }
-  return Se.set(e, n), n;
-}, ot = (e, t) => {
-  const n = new Set(e.map((o) => o.historyKey)), r = (t == null ? void 0 : t.filter(
-    (o) => o.version === 1 && !n.has(o.historyKey)
+  return he.set(e, n), n;
+}, st = (e, t) => {
+  const n = new Set(e.map((i) => i.historyKey)), r = (t == null ? void 0 : t.filter(
+    (i) => i.version === 1 && !n.has(i.historyKey)
   )) ?? [];
   return [...e, ...r];
-}, st = (e, t, n) => {
+}, at = (e, t, n) => {
   if (!e) return;
   const r = new Map(
-    t.map((i) => [i.historyKey, i])
-  ), o = [];
-  for (const i of e) {
-    if (i.version !== 2) continue;
-    const s = r.get(i.historyKey);
-    !s || s.progress === i.progress || (o.push(s), s.status === J.Completed && E(() => {
+    t.map((o) => [o.historyKey, o])
+  ), i = [];
+  for (const o of e) {
+    if (o.version !== 2) continue;
+    const s = r.get(o.historyKey);
+    !s || s.progress === o.progress || (i.push(s), s.status === J.Completed && I(() => {
       var a;
       return (a = n == null ? void 0 : n.onOrderFilled) == null ? void 0 : a.call(n, s);
     }));
   }
-  o.length > 0 && E(() => {
-    var i;
-    return (i = n == null ? void 0 : n.onOrdersProgressUpdate) == null ? void 0 : i.call(n, o);
+  i.length > 0 && I(() => {
+    var o;
+    return (o = n == null ? void 0 : n.onOrdersProgressUpdate) == null ? void 0 : o.call(n, i);
   });
 }, Ie = (e) => {
   if (e === null || typeof e != "object") return !1;
@@ -174,22 +174,41 @@ const $e = /* @__PURE__ */ new Set([
   if (Object.is(e, t)) return e;
   if (Array.isArray(e) && Array.isArray(t)) {
     const n = t.map(
-      (o, i) => ae(e[i], o)
+      (i, o) => ae(e[o], i)
     );
-    return e.length === n.length && n.every((o, i) => o === e[i]) ? e : n;
+    return e.length === n.length && n.every((i, o) => i === e[o]) ? e : n;
   }
   if (Ie(e) && Ie(t)) {
-    const n = Object.keys(e), r = Object.keys(t), o = {};
-    let i = n.length === r.length;
+    const n = Object.keys(e), r = Object.keys(t), i = {};
+    let o = n.length === r.length;
     for (const s of r) {
-      Object.prototype.hasOwnProperty.call(e, s) || (i = !1);
+      Object.prototype.hasOwnProperty.call(e, s) || (o = !1);
       const a = ae(e[s], t[s]);
-      o[s] = a, a !== e[s] && (i = !1);
+      i[s] = a, a !== e[s] && (o = !1);
     }
-    return i ? e : o;
+    return o ? e : i;
   }
   return t;
-}, at = (e, t) => e ? ae(e, t) : t, ce = (e) => ({
+}, ct = (e, t) => e ? ae(e, t) : t, dt = async ({
+  client: e,
+  account: t,
+  signal: n,
+  supportLegacyOrders: r,
+  previousOrders: i,
+  legacyLoaded: o,
+  callbacks: s
+}) => {
+  const a = await e.getAccountOrdersResult({
+    signal: n,
+    account: t,
+    legacyOrders: r && !o
+  });
+  if (n.aborted) throw n.reason;
+  return at(i, a.orders, s), {
+    orders: r && !a.legacyLoaded ? st(a.orders, i) : a.orders,
+    legacyLoaded: o || a.legacyLoaded
+  };
+}, ce = (e) => ({
   tradeCount: e.tradeCount,
   tradeInterval: e.tradeInterval,
   orderDuration: e.orderDuration,
@@ -199,218 +218,220 @@ const $e = /* @__PURE__ */ new Set([
   limitPricePercent: e.limitPricePercent,
   isMarketOrder: e.isMarketOrder,
   isPriceInverted: void 0
-}), ct = (e) => ({
+}), ut = (e) => ({
   ...ce(e),
   cancelOrders: {},
-  currentExecution: re()
-}), Oe = { isFetching: !1 }, pe = { isFetching: !1 }, dt = (e) => new Promise((t) => setTimeout(t, e)), ut = (e) => {
-  let t = 0, n, r, o = 0, i, s, a, c = !1, f = 0, O = 0, u, l, h;
+  currentExecution: te()
+}), Se = { isFetching: !1 }, Oe = { isFetching: !1 }, lt = (e) => new Promise((t) => setTimeout(t, e)), mt = (e) => {
+  let t = 0, n, r, i = 0, o, s, a, c = !1, h = 0, p = 0, u, g, E;
   return ze((m, S) => {
-    const R = async () => {
+    const y = async () => {
       if (!n || !r) return;
-      if (i) return i;
-      const g = ++o, P = r;
-      m((I) => ({
+      if (o) return o;
+      const l = ++i, P = r;
+      m((f) => ({
         client: {
           key: n,
-          data: I.client.data,
+          data: f.client.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const p = (async () => {
-        let I;
-        for (let A = 0; A < 3; A++) {
-          if (g !== o) return;
+      const O = (async () => {
+        let f;
+        for (let B = 0; B < 3; B++) {
+          if (l !== i) return;
           try {
-            const y = await P();
-            return g !== o ? void 0 : (m({
-              client: { key: n, data: y, isFetching: !1 }
-            }), y);
-          } catch (y) {
-            if (I = y instanceof Error ? y : new Error(String(y)), g !== o) return;
-            A < 2 && await dt(2 ** A * 1e3);
+            const w = await P();
+            return l !== i ? void 0 : (m({
+              client: { key: n, data: w, isFetching: !1 }
+            }), w);
+          } catch (w) {
+            if (f = w instanceof Error ? w : new Error(String(w)), l !== i) return;
+            B < 2 && await lt(2 ** B * 1e3);
           }
         }
-        g === o && m({
-          client: { key: n, error: I, isFetching: !1 }
+        l === i && m({
+          client: { key: n, error: f, isFetching: !1 }
         });
       })();
-      return i = p, p.finally(() => {
-        i === p && (i = void 0);
-      }), p;
-    }, T = async (g = !1, P = !1) => {
-      if (!g && f === 0 || !s || !a)
+      return o = O, O.finally(() => {
+        o === O && (o = void 0);
+      }), O;
+    }, T = async (l = !1, P = !1) => {
+      if (!l && h === 0 || !s || !a)
         return S().orders.data;
       if (u) {
         if (!P) return u;
-        const L = s;
-        return await u, s !== L ? void 0 : T(g, P);
+        const C = s;
+        return await u, s !== C ? void 0 : T(l, P);
       }
-      const p = ++O, I = a, A = S().orders.data, y = new AbortController();
-      l = y, m((L) => ({
+      const O = ++p, f = a, B = S().orders.data, w = new AbortController();
+      g = w, m((C) => ({
         orders: {
           key: s,
-          data: L.orders.data,
+          data: C.orders.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const N = I(
-        A,
+      const F = f(
+        B,
         P ? !1 : c,
-        y.signal
-      ).then(({ orders: L, legacyLoaded: G }) => {
-        if (p !== O) return;
-        c = G;
-        const V = at(
+        w.signal
+      ).then(({ orders: C, legacyLoaded: D }) => {
+        if (O !== p) return;
+        c = D;
+        const G = ct(
           S().orders.data,
-          L
+          C
         );
         return m({
           orders: {
             key: s,
-            data: V,
+            data: G,
             isFetching: !1
           }
-        }), V;
-      }).catch((L) => {
-        if (p !== O || y.signal.aborted)
+        }), G;
+      }).catch((C) => {
+        if (O !== p || w.signal.aborted)
           return;
-        const G = L instanceof Error ? L : new Error(String(L));
-        m((V) => ({
+        const D = C instanceof Error ? C : new Error(String(C));
+        m((G) => ({
           orders: {
             key: s,
-            data: V.orders.data,
-            error: G,
+            data: G.orders.data,
+            error: D,
             isFetching: !1
           }
         }));
       });
-      return u = N, N.finally(() => {
-        u === N && (u = void 0), l === y && (l = void 0);
-      }), N;
-    }, K = () => {
+      return u = F, F.finally(() => {
+        u === F && (u = void 0), g === w && (g = void 0);
+      }), F;
+    }, L = () => {
       T();
-    }, M = () => {
-      h && (clearInterval(h), h = void 0), typeof window < "u" && window.removeEventListener("focus", K), l == null || l.abort(), l = void 0, u = void 0, O++, m((g) => ({
-        orders: { ...g.orders, isFetching: !1 }
+    }, K = () => {
+      E && (clearInterval(E), E = void 0), typeof window < "u" && window.removeEventListener("focus", L), g == null || g.abort(), g = void 0, u = void 0, p++, m((l) => ({
+        orders: { ...l.orders, isFetching: !1 }
       }));
-    }, _ = () => {
-      !s || !a || h || (T(!0), h = setInterval(() => {
+    }, M = () => {
+      !s || !a || E || (T(!0), E = setInterval(() => {
         T();
-      }, it), typeof window < "u" && window.addEventListener("focus", K));
+      }, ot), typeof window < "u" && window.addEventListener("focus", L));
     };
     return {
-      client: Oe,
-      orders: pe,
-      state: ct(e),
-      configureClient: (g, P) => {
-        if (n === g) {
+      client: Se,
+      orders: Oe,
+      state: ut(e),
+      configureClient: (l, P) => {
+        if (n === l) {
           r = P;
           return;
         }
-        n = g, r = P, o++, i = void 0, m({
-          client: g ? { key: g, isFetching: !1 } : Oe
-        }), g && P && R();
+        n = l, r = P, i++, o = void 0, m({
+          client: l ? { key: l, isFetching: !1 } : Se
+        }), l && P && y();
       },
-      refetchClient: R,
-      configureOrders: (g, P) => {
-        if (s === g) {
+      refetchClient: y,
+      configureOrders: (l, P) => {
+        if (s === l) {
           a = P;
           return;
         }
-        M(), s = g, a = P, c = !1, m({
-          orders: g ? { key: g, isFetching: !1 } : pe
-        }), f > 0 && _();
+        K(), s = l, a = P, c = !1, m({
+          orders: l ? { key: l, isFetching: !1 } : Oe
+        }), h > 0 && M();
       },
-      registerOrdersConsumer: () => (f++, f === 1 && _(), () => {
-        f = Math.max(0, f - 1), f === 0 && M();
+      registerOrdersConsumer: () => (h++, h === 1 && M(), () => {
+        h = Math.max(0, h - 1), h === 0 && K();
       }),
       refetchOrders: T,
-      addOrder: (g) => {
+      addOrder: (l) => {
         m((P) => {
-          const p = P.orders.data;
-          return p != null && p.some(
-            (I) => I.historyKey === g.historyKey
+          const O = P.orders.data;
+          return O != null && O.some(
+            (f) => f.historyKey === l.historyKey
           ) ? P : {
             orders: {
               ...P.orders,
-              data: [g, ...p ?? []]
+              data: [l, ...O ?? []]
             }
           };
         });
       },
-      updateOrderStatus: (g, P) => {
-        m((p) => {
-          var I;
-          return {
-            orders: {
-              ...p.orders,
-              data: (I = p.orders.data) == null ? void 0 : I.map(
-                (A) => A.historyKey === g ? { ...A, status: P } : A
-              )
-            }
-          };
+      setCancelOrder: (l, P) => {
+        m((O) => ({
+          state: {
+            ...O.state,
+            cancelOrders: { ...O.state.cancelOrders, [l]: P }
+          }
+        }));
+      },
+      clearCancelOrder: (l) => {
+        m((P) => {
+          if (!(l in P.state.cancelOrders)) return P;
+          const O = { ...P.state.cancelOrders };
+          return delete O[l], { state: { ...P.state, cancelOrders: O } };
         });
       },
-      updateState: (g) => m((P) => ({ state: { ...P.state, ...g } })),
-      beginExecution: (g) => {
+      updateState: (l) => m((P) => ({ state: { ...P.state, ...l } })),
+      beginExecution: (l) => {
         let P;
-        return m((p) => Ze(p.state.currentExecution.phase) ? (P = {
-          ...g,
+        return m((O) => be(O.state.currentExecution.phase) ? (P = {
+          ...l,
           executionId: ++t,
           phase: d.PREPARING
         }, {
           state: {
-            ...p.state,
+            ...O.state,
             currentExecution: P
           }
-        }) : p), P;
+        }) : O), P;
       },
-      replaceExecution: (g, P) => {
-        let p = !1;
-        return m((I) => {
-          const A = I.state.currentExecution;
-          return A.executionId !== g || P.executionId !== g || !be(A.phase, P.phase) ? I : (p = !0, {
-            state: { ...I.state, currentExecution: P }
+      replaceExecution: (l, P) => {
+        let O = !1;
+        return m((f) => {
+          const B = f.state.currentExecution;
+          return B.executionId !== l || P.executionId !== l || !ke(B.phase, P.phase) ? f : (O = !0, {
+            state: { ...f.state, currentExecution: P }
           });
-        }), p;
+        }), O;
       },
       returnToOrderForm: () => {
-        const g = S().state.currentExecution;
-        return Y(g.phase) || g.phase === d.SUCCESS ? !1 : (m((P) => ({
+        const l = S().state.currentExecution;
+        return $(l.phase) || l.phase === d.SUCCESS ? !1 : (m((P) => ({
           state: {
             ...P.state,
-            currentExecution: re(g.completedWrap)
+            currentExecution: te(l.completedWrap)
           }
         })), !0);
       },
-      syncFormDefaults: (g) => Y(S().state.currentExecution.phase) ? !1 : (m((P) => ({
+      syncFormDefaults: (l) => $(S().state.currentExecution.phase) ? !1 : (m((P) => ({
         state: {
           ...P.state,
-          ...ce(g),
-          currentExecution: re()
+          ...ce(l),
+          currentExecution: te()
         }
       })), !0),
-      startNewOrder: (g) => {
+      startNewOrder: (l) => {
         const { state: P } = S();
-        return Y(P.currentExecution.phase) ? !1 : (m((p) => ({
+        return $(P.currentExecution.phase) ? !1 : (m((O) => ({
           state: {
-            ...p.state,
-            ...ce(g),
+            ...O.state,
+            ...ce(l),
             isMarketOrder: P.isMarketOrder,
-            currentExecution: re()
+            currentExecution: te()
           }
         })), !0);
       }
     };
   });
-}, Te = (e) => {
+}, ye = (e) => {
   var n;
   const t = (n = e.overrides) == null ? void 0 : n.state;
   return {
-    isMarketOrder: e.module === b.LIMIT ? !1 : t == null ? void 0 : t.isMarketOrder,
+    isMarketOrder: e.module === X.LIMIT ? !1 : t == null ? void 0 : t.isMarketOrder,
     tradeCount: t == null ? void 0 : t.tradeCount,
     tradeInterval: t == null ? void 0 : t.tradeInterval,
     orderDuration: t == null ? void 0 : t.orderDuration,
@@ -419,49 +440,110 @@ const $e = /* @__PURE__ */ new Set([
     triggerPricePercent: t == null ? void 0 : t.triggerPricePercent,
     limitPricePercent: t == null ? void 0 : t.limitPricePercent
   };
-}, Ne = le(null), lt = ({
+}, Re = le(null), gt = ({
   children: e,
   initialState: t
 }) => {
-  const [n] = Ke(() => ut(t));
-  return /* @__PURE__ */ D(Ne.Provider, { value: n, children: e });
-}, z = () => {
-  const e = me(Ne);
+  const [n] = Ve(() => mt(t));
+  return /* @__PURE__ */ U(Re.Provider, { value: n, children: e });
+}, V = () => {
+  const e = me(Re);
   if (e === null)
     throw new Error("useSpotStore must be used within SpotProvider");
   return e;
-}, w = (e) => {
-  const t = z();
-  return je(t, e);
-}, mt = { isFetching: !1 }, Z = () => {
-  const { partner: e, chainId: t, isSupportedChain: n } = x(), r = z(), o = w((O) => O.client), i = !!(t && n), s = i ? `${e}:${t}` : void 0, a = o.key === s ? o : mt, c = v(() => t ? Ue(e, t) : Promise.reject(
+}, A = (e) => {
+  const t = V();
+  return Je(t, e);
+}, Pt = { isFetching: !1 }, ft = () => {
+  const { partner: e, chainId: t, hasChainId: n } = x(), r = V(), i = !!(t && n), o = i ? `${e}:${t}` : void 0, s = v(() => t ? Ue(e, t) : Promise.reject(
     new Error("Spot is unavailable on the connected chain")
   ), [t, e]);
-  X(() => {
-    r.getState().configureClient(s, i ? c : void 0);
-  }, [i, s, c, r]);
-  const f = v(() => {
-    if (!i || !s) return Promise.resolve(void 0);
-    const O = r.getState();
-    return O.configureClient(s, c), O.refetchClient();
-  }, [i, s, c, r]);
-  return C(
+  ie(() => {
+    r.getState().configureClient(o, i ? s : void 0);
+  }, [i, o, s, r]);
+}, Y = () => {
+  const { partner: e, chainId: t, hasChainId: n } = x(), r = V(), i = A((h) => h.client), o = !!(t && n), s = o ? `${e}:${t}` : void 0, a = i.key === s ? i : Pt, c = v(() => {
+    if (!o || !s) return Promise.resolve(void 0);
+    const h = r.getState();
+    return h.client.key !== s ? Promise.resolve(void 0) : h.refetchClient();
+  }, [o, s, r]);
+  return R(
     () => ({
       data: a.data,
       error: a.error,
-      isLoading: i && !a.data && a.error === void 0,
+      isLoading: o && !a.data && a.error === void 0,
       isFetching: a.isFetching,
-      refetch: f
+      refetch: c
+    }),
+    [a, o, c]
+  );
+}, ht = { isFetching: !1 }, Te = (e, t, n) => e && t ? JSON.stringify([
+  e,
+  t.exchangeAddress,
+  t.partner,
+  t.chainId,
+  n
+]) : void 0, Et = () => {
+  const { account: e, supportLegacyOrders: t, callbacks: n } = x(), { data: r } = Y(), i = V(), o = Te(e, r, t), s = !!o, a = v(
+    async (c, h, p) => !e || !r ? { orders: [], legacyLoaded: !1 } : dt({
+      client: r,
+      account: e,
+      signal: p,
+      supportLegacyOrders: t,
+      previousOrders: c,
+      legacyLoaded: h,
+      callbacks: n
+    }),
+    [e, n, r, t]
+  );
+  ie(() => {
+    i.getState().configureOrders(o, s ? a : void 0);
+  }, [s, o, a, i]);
+}, Ne = () => {
+  const { account: e, supportLegacyOrders: t } = x(), { data: n } = Y(), r = V(), i = Te(e, n, t), o = !!i, s = v((a = !1) => !o || !i || r.getState().orders.key !== i ? Promise.resolve(void 0) : r.getState().refetchOrders(!0, a), [o, i, r]);
+  return { enabled: o, key: i, refetch: s };
+}, It = () => {
+  const e = V();
+  return v(
+    (t) => e.getState().addOrder(t),
+    [e]
+  );
+}, St = () => {
+  const e = V();
+  return v(
+    () => e.getState().refetchOrders(),
+    [e]
+  );
+}, zt = () => {
+  const e = A((c) => c.orders), t = A(
+    (c) => c.registerOrdersConsumer
+  ), { enabled: n, key: r, refetch: i } = Ne(), o = e.key === r ? e : ht;
+  ie(() => t(), [t]);
+  const s = R(
+    () => o.data === void 0 ? void 0 : Ee(o.data),
+    [o.data]
+  ), a = v(async () => {
+    const c = await i();
+    return c === void 0 ? void 0 : Ee(c);
+  }, [i]);
+  return R(
+    () => ({
+      data: s,
+      error: o.error,
+      isLoading: n && s === void 0 && o.error === void 0,
+      isFetching: o.isFetching,
+      isRefetching: o.isFetching && s !== void 0,
+      refetch: a
     }),
-    [a, i, f]
+    [o, s, n, a]
   );
-}, gt = ({
+}, Ot = ({ children: e }) => (ft(), Et(), e), pt = ({
   error: e,
   retry: t,
   isRetrying: n
 }) => /* @__PURE__ */ ue("div", { className: "spot-client-error-fallback", role: "alert", children: [
-  /* @__PURE__ */ D("p", { children: e.message || "Unable to load Spot configuration." }),
-  /* @__PURE__ */ D(
+  /* @__PURE__ */ U("p", { children: e.message || "Unable to load Spot configuration." }),
+  /* @__PURE__ */ U(
     "button",
     {
       type: "button",
@@ -471,41 +553,40 @@ const $e = /* @__PURE__ */ new Set([
       children: n ? "Retrying…" : "Retry"
     }
   )
-] }), Pt = ({
+] }), At = ({
   children: e,
-  fallback: t = gt
+  fallback: t = pt
 }) => {
-  const { partner: n, chainId: r, isSupportedChain: o, minTradeSizeUsd: i } = x(), { data: s, error: a, isFetching: c, refetch: f } = Z(), O = v(async () => {
-    await f();
-  }, [f]);
-  return X(() => {
-    !s || !r || !o || U.onFetchedConfig(
-      s.rePermitData,
-      n,
-      ve(n, r),
-      i
-    );
-  }, [r, s, o, i, n]), /* @__PURE__ */ ue(We, { children: [
+  const { hasChainId: n } = x(), { data: r, error: i, isFetching: o, refetch: s } = Y(), a = v(async () => {
+    await s();
+  }, [s]);
+  return /* @__PURE__ */ ue(Ke, { children: [
     e,
-    !s && a && o ? /* @__PURE__ */ D(
+    !r && i && n ? /* @__PURE__ */ U(
       t,
       {
-        error: a,
-        retry: O,
-        isRetrying: c
+        error: i,
+        retry: a,
+        isRetrying: o
       }
     ) : null
   ] });
-}, ft = ({
+}, vt = ({
   resetErrorBoundary: e
 }) => /* @__PURE__ */ ue("div", { className: "twap-error-fallback", role: "alert", children: [
-  /* @__PURE__ */ D("p", { children: "Something went wrong" }),
-  /* @__PURE__ */ D("button", { type: "button", onClick: e, children: "Retry" })
-] }), ht = ({
+  /* @__PURE__ */ U("p", { children: "Something went wrong" }),
+  /* @__PURE__ */ U("button", { type: "button", onClick: e, children: "Retry" })
+] }), wt = ({
   children: e,
-  fallback: t = ft
-}) => /* @__PURE__ */ D(St, { fallback: t, children: e });
-class St extends Ve {
+  fallback: t = vt
+}) => {
+  const n = V(), r = v((i) => {
+    var s;
+    (((s = n.getState().client.data) == null ? void 0 : s.analytics) ?? De).onCrash(i);
+  }, [n]);
+  return /* @__PURE__ */ U(Ct, { fallback: t, reportCrash: r, children: e });
+};
+class Ct extends He {
   constructor() {
     super(...arguments);
     oe(this, "state", {});
@@ -517,13 +598,13 @@ class St extends Ve {
     return { error: n };
   }
   componentDidCatch(n) {
-    U.onCrash(n);
+    this.props.reportCrash(n);
   }
   render() {
     const { error: n } = this.state;
     if (n) {
       const r = this.props.fallback;
-      return /* @__PURE__ */ D(
+      return /* @__PURE__ */ U(
         r,
         {
           error: n,
@@ -534,153 +615,136 @@ class St extends Ve {
     return this.props.children;
   }
 }
-const Et = ({
+const yt = ({
   children: e,
   defaults: t,
   scopeKey: n
 }) => {
-  const r = z(), o = w(
+  const r = V(), i = A(
     (s) => s.state.currentExecution.phase
-  ), i = He(n);
-  return X(() => {
-    i.current === n || Y(o) || r.getState().syncFormDefaults(t) && (i.current = n);
-  }, [t, o, n, r]), e;
-}, Le = le(null), It = ({ children: e }) => {
+  ), o = je(n);
+  return ie(() => {
+    o.current === n || $(i) || r.getState().syncFormDefaults(t) && (o.current = n);
+  }, [t, i, n, r]), e;
+}, Le = le(null), Rt = ({ children: e }) => {
   const {
     inputToken: t,
     outputToken: n,
     inputAmountUi: r,
-    quotedOutputAmountRaw: o,
-    inputTokenUsdPrice: i,
+    quotedOutputAmountRaw: i,
+    inputTokenUsdPrice: o,
     outputTokenUsdPrice: s,
     minTradeSizeUsd: a,
     inputBalanceRaw: c,
-    displayFeePercent: f,
-    priceProtectionPercent: O,
+    displayFeePercent: h,
+    priceProtectionPercent: p,
     module: u
-  } = x(), l = w((I) => I.state.tradeCount), h = w((I) => I.state.tradeInterval), m = w((I) => I.state.orderDuration), S = w(
-    (I) => I.state.limitPriceUi
-  ), R = w(
-    (I) => I.state.triggerPriceUi
-  ), T = w(
-    (I) => I.state.limitPricePercent
-  ), K = w(
-    (I) => I.state.triggerPricePercent
-  ), M = w(
-    (I) => I.state.isPriceInverted
-  ), _ = w((I) => I.state.isMarketOrder), g = w((I) => {
-    const A = I.state.currentExecution;
-    return A.phase !== d.IDLE ? A.form : void 0;
-  }), P = C(
+  } = x(), g = A((f) => f.state.tradeCount), E = A((f) => f.state.tradeInterval), m = A((f) => f.state.orderDuration), S = A(
+    (f) => f.state.limitPriceUi
+  ), y = A(
+    (f) => f.state.triggerPriceUi
+  ), T = A(
+    (f) => f.state.limitPricePercent
+  ), L = A(
+    (f) => f.state.triggerPricePercent
+  ), K = A(
+    (f) => f.state.isPriceInverted
+  ), M = A((f) => f.state.isMarketOrder), l = A((f) => {
+    const B = f.state.currentExecution;
+    return B.phase !== d.IDLE ? B.form : void 0;
+  }), P = R(
     () => ({
       module: u,
       inputTokenDecimals: (t == null ? void 0 : t.decimals) ?? 0,
       outputTokenDecimals: (n == null ? void 0 : n.decimals) ?? 0,
-      quotedOutputAmountRaw: o,
-      inputTokenUsdPrice: i,
+      quotedOutputAmountRaw: i,
+      inputTokenUsdPrice: o,
       outputTokenUsdPrice: s,
       minTradeSizeUsd: a,
-      priceProtectionPercent: O,
-      displayFeePercent: f,
+      priceProtectionPercent: p,
+      displayFeePercent: h,
       inputBalanceRaw: c,
       userInput: {
         inputAmountUi: r,
-        isMarketOrder: !!_,
-        tradeCount: l,
-        tradeInterval: h,
+        isMarketOrder: !!M,
+        tradeCount: g,
+        tradeInterval: E,
         orderDuration: m,
         limitPriceUi: S,
         limitPricePercent: T,
-        triggerPriceUi: R,
-        triggerPricePercent: K,
-        isPriceInverted: M
+        triggerPriceUi: y,
+        triggerPricePercent: L,
+        isPriceInverted: K
       }
     }),
     [
       n == null ? void 0 : n.decimals,
       s,
-      f,
-      o,
+      h,
+      i,
       a,
       u,
-      O,
+      p,
       c,
       t == null ? void 0 : t.decimals,
-      i,
+      o,
+      K,
       M,
-      _,
       T,
-      K,
-      l,
+      L,
+      g,
       m,
-      h,
+      E,
       S,
       r,
-      R
+      y
     ]
-  ), p = C(() => {
-    const I = De(P);
-    return t && n ? I : {
-      ...I,
+  ), O = R(() => {
+    if (l) return l;
+    const f = Ge(P);
+    return t && n ? f : {
+      ...f,
       isReady: !1,
       canSubmit: !1
     };
-  }, [t, n, P]);
-  return /* @__PURE__ */ D(Le.Provider, { value: g ?? p, children: e });
+  }, [l, t, n, P]);
+  return /* @__PURE__ */ U(Le.Provider, { value: O, children: e });
 }, W = () => {
   const e = me(Le);
   if (!e)
     throw new Error("useOrderForm must be used within OrderFormProvider");
   return e;
-}, Ot = (e, t) => {
-  X(() => {
-    !e.chainId || !t || U.init(
-      e.partner,
-      e.minTradeSizeUsd,
-      e.chainId,
-      e.appId
-    );
-  }, [
-    e.appId,
-    e.chainId,
-    e.minTradeSizeUsd,
-    e.partner,
-    t
-  ]);
-}, pt = (e) => {
-  var u, l, h, m, S, R, T, K, M, _, g, P;
-  const t = C(
-    () => Ge(e.partner),
-    [e.partner]
-  ), n = !!(e.chainId && t.includes(e.chainId)), r = (u = e.wrappedNativeToken) == null ? void 0 : u.address, o = !!(r && ($((l = e.inputToken) == null ? void 0 : l.address) && fe(((h = e.outputToken) == null ? void 0 : h.address) || "", r) || fe(((m = e.inputToken) == null ? void 0 : m.address) || "", r) && $((S = e.outputToken) == null ? void 0 : S.address))), i = o ? ee(e.inputAmountUi, (R = e.outputToken) == null ? void 0 : R.decimals) : e.marketQuote.isLoading ? void 0 : e.marketQuote.quotedOutputAmountRaw, s = o ? !1 : e.marketQuote.isLoading, a = o ? !1 : e.marketQuote.noLiquidity, c = C(
-    () => Te({
+}, Tt = (e) => {
+  var p, u, g, E, m, S, y, T, L, K, M, l;
+  const t = Number.isSafeInteger(e.chainId) && Number(e.chainId) > 0, n = (p = e.wrappedNativeToken) == null ? void 0 : p.address, r = !!(n && (Q((u = e.inputToken) == null ? void 0 : u.address) && Pe(((g = e.outputToken) == null ? void 0 : g.address) || "", n) || Pe(((E = e.inputToken) == null ? void 0 : E.address) || "", n) && Q((m = e.outputToken) == null ? void 0 : m.address))), i = r ? k(e.inputAmountUi, (S = e.outputToken) == null ? void 0 : S.decimals) : e.marketQuote.isLoading ? void 0 : e.marketQuote.quotedOutputAmountRaw, o = r ? !1 : e.marketQuote.isLoading, s = r ? !1 : e.marketQuote.noLiquidity, a = R(
+    () => ye({
       module: e.module,
       overrides: e.overrides
     }),
     [e.module, e.overrides]
-  ), f = JSON.stringify([
+  ), c = JSON.stringify([
     e.partner,
     e.chainId,
     e.module,
-    (T = e.inputToken) == null ? void 0 : T.address,
-    (K = e.inputToken) == null ? void 0 : K.decimals,
-    (M = e.outputToken) == null ? void 0 : M.address,
-    (_ = e.outputToken) == null ? void 0 : _.decimals,
-    (g = e.wrappedNativeToken) == null ? void 0 : g.address,
-    (P = e.wrappedNativeToken) == null ? void 0 : P.decimals,
-    c
-  ]), O = C(
+    (y = e.inputToken) == null ? void 0 : y.address,
+    (T = e.inputToken) == null ? void 0 : T.decimals,
+    (L = e.outputToken) == null ? void 0 : L.address,
+    (K = e.outputToken) == null ? void 0 : K.decimals,
+    (M = e.wrappedNativeToken) == null ? void 0 : M.address,
+    (l = e.wrappedNativeToken) == null ? void 0 : l.decimals,
+    a
+  ]), h = R(
     () => ({
       inputAmountUi: e.inputAmountUi,
       minTradeSizeUsd: e.minTradeSizeUsd,
       account: e.account,
       walletInteractions: e.walletInteractions,
       quotedOutputAmountRaw: i,
-      marketPriceLoading: s,
-      noLiquidity: a,
+      marketPriceLoading: o,
+      noLiquidity: s,
       priceProtectionPercent: e.priceProtectionPercent,
       chainId: e.chainId,
-      isSupportedChain: n,
+      hasChainId: t,
       partner: e.partner,
       module: e.module,
       displayFeePercent: e.displayFeePercent ?? 0,
@@ -713,103 +777,35 @@ const Et = ({
       e.supportLegacyOrders,
       e.inputAmountUi,
       e.walletInteractions,
-      n,
+      t,
+      o,
       s,
-      a,
       i
     ]
   );
-  return { initialState: c, formScopeKey: f, runtime: O };
-}, Ht = (e) => {
-  const { initialState: t, formScopeKey: n, runtime: r } = pt(e);
-  return Ot(e, r.isSupportedChain), /* @__PURE__ */ D(Ye, { value: r, children: /* @__PURE__ */ D(lt, { initialState: t, children: /* @__PURE__ */ D(ht, { fallback: e.errorFallback, children: /* @__PURE__ */ D(
-    Et,
+  return { initialState: a, formScopeKey: c, trading: h };
+}, $t = (e) => {
+  const { initialState: t, formScopeKey: n, trading: r } = Tt(e);
+  return /* @__PURE__ */ U(Ye, { value: r, children: /* @__PURE__ */ U(gt, { initialState: t, children: /* @__PURE__ */ U(wt, { fallback: e.errorFallback, children: /* @__PURE__ */ U(Ot, { children: /* @__PURE__ */ U(
+    yt,
     {
       defaults: t,
       scopeKey: n,
-      children: /* @__PURE__ */ D(Pt, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ D(It, { children: e.children }) })
+      children: /* @__PURE__ */ U(At, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ U(Rt, { children: e.children }) })
     }
-  ) }) }) });
-}, jt = (e, t) => C(() => ie(t, e), [e, t]), At = { isFetching: !1 }, Pe = () => {
-  const { account: e, partner: t, chainId: n, supportLegacyOrders: r, callbacks: o } = x(), { data: i } = Z(), s = z(), a = !!(e && i), c = a ? JSON.stringify([
-    e,
-    i == null ? void 0 : i.exchangeAddress,
-    t,
-    n,
-    r
-  ]) : void 0, f = v(
-    async (u, l, h) => {
-      if (!e || !i)
-        return { orders: [], legacyLoaded: !1 };
-      const m = r && !l, S = await i.getAccountOrders({
-        signal: h,
-        account: e,
-        legacyOrders: m
-      });
-      return st(u, S, o), {
-        orders: r && !m ? ot(S, u) : S,
-        legacyLoaded: l || m
-      };
-    },
-    [e, o, i, r]
-  );
-  X(() => {
-    s.getState().configureOrders(c, a ? f : void 0);
-  }, [a, c, f, s]);
-  const O = v((u = !1) => {
-    if (!a || !c) return Promise.resolve(void 0);
-    const l = s.getState();
-    return l.configureOrders(c, f), l.refetchOrders(!0, u);
-  }, [a, c, f, s]);
-  return { enabled: a, key: c, refetch: O };
-}, wt = () => {
-  Pe();
-  const e = z();
-  return v(
-    (t) => e.getState().addOrder(t),
-    [e]
-  );
-}, vt = () => {
-  const e = z();
-  return v(
-    () => e.getState().refetchOrders(),
-    [e]
-  );
-}, zt = () => {
-  const e = w((c) => c.orders), t = w(
-    (c) => c.registerOrdersConsumer
-  ), { enabled: n, key: r, refetch: o } = Pe(), i = e.key === r ? e : At;
-  X(() => t(), [t]);
-  const s = C(
-    () => i.data === void 0 ? void 0 : Ee(i.data),
-    [i.data]
-  ), a = v(async () => {
-    const c = await o();
-    return c === void 0 ? void 0 : Ee(c);
-  }, [o]);
-  return C(
-    () => ({
-      data: s,
-      error: i.error,
-      isLoading: n && s === void 0 && i.error === void 0,
-      isFetching: i.isFetching,
-      isRefetching: i.isFetching && s !== void 0,
-      refetch: a
-    }),
-    [i, s, n, a]
-  );
-}, Ct = 60, Rt = () => {
-  const { refetch: e } = Pe();
+  ) }) }) }) });
+}, Qt = (e, t) => R(() => ne(t, e), [e, t]), Nt = 60, Lt = () => {
+  const { refetch: e } = Ne();
   return v(
     async (t, n = !1) => {
-      for (let r = 0; r < Ct; r++) {
-        const o = await e(n);
-        if (!o)
+      for (let r = 0; r < Nt; r++) {
+        const i = await e(n);
+        if (!i)
           throw new Error("orders not found");
-        const i = o.find(
+        const o = i.find(
           (s) => s.historyKey === t
         );
-        if ((i == null ? void 0 : i.status) === J.Cancelled)
+        if ((o == null ? void 0 : o.status) === J.Cancelled)
           return;
         await new Promise((s) => setTimeout(s, 1e3));
       }
@@ -819,211 +815,192 @@ const Et = ({
     },
     [e]
   );
-}, yt = () => {
-  const e = z(), t = w((r) => r.updateState);
-  return {
-    cancelOrders: w((r) => r.state.cancelOrders),
-    setCancelOrder: (r, o) => {
-      const i = e.getState().state.cancelOrders;
-      t({
-        cancelOrders: { ...i, [r]: o }
-      });
-    },
-    clearCancelOrder: (r) => {
-      const o = e.getState().state.cancelOrders, { [r]: i, ...s } = o;
-      t({ cancelOrders: s });
-    }
-  };
-}, Tt = (e) => ({
+}, xt = (e) => ({
   ...e,
   status: J.Cancelled
-}), Jt = (e) => {
-  const { account: t, walletInteractions: n, callbacks: r } = x(), { data: o } = Z(), i = Rt(), {
-    cancelOrders: s,
-    setCancelOrder: a,
-    clearCancelOrder: c
-  } = yt(), f = v(async () => {
+}), Yt = (e) => {
+  const { account: t, walletInteractions: n, callbacks: r } = x(), { data: i } = Y(), o = Lt(), s = A((u) => u.state.cancelOrders[(e == null ? void 0 : e.historyKey) ?? ""]), a = A((u) => u.setCancelOrder), c = A((u) => u.clearCancelOrder), h = v(async () => {
     const u = e == null ? void 0 : e.historyKey;
     try {
       if (!t) throw new Error("missing account");
       if (!e) throw new Error("order is required");
-      if (!o) throw new Error("Spot client is unavailable");
-      const l = e.historyKey;
-      a(l, { status: q.LOADING }), E(() => {
-        var R;
-        return (R = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : R.call(r, e);
-      }), E(
-        () => U.onCancelOrderRequest(
+      if (!i) throw new Error("Spot client is unavailable");
+      const g = e.historyKey;
+      a(g, { status: q.LOADING }), I(() => {
+        var y;
+        return (y = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : y.call(r, e);
+      }), I(
+        () => i.analytics.onCancelOrderRequest(
           [e.version === 1 ? e.id.toString() : e.hash],
           e.version
         )
       );
-      const h = o.getCancelOrderRequest(e), m = await n.cancelOrder(h);
+      const E = i.getCancelOrderRequest(e), m = await n.cancelOrder(E);
       if (!m) throw new Error("failed to cancel order");
-      E(() => U.onCancelOrderSuccess(m)), a(l, {
+      I(() => i.analytics.onCancelOrderSuccess(m)), a(g, {
         status: q.LOADING,
         txHash: m
-      }), await i(l, e.version === 1);
-      const S = Tt(e);
-      return a(l, {
+      }), await o(g, e.version === 1);
+      const S = xt(e);
+      return a(g, {
         status: q.SUCCESS,
         txHash: m
-      }), E(
+      }), I(
         () => {
-          var R;
-          return (R = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : R.call(r, {
+          var y;
+          return (y = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : y.call(r, {
             order: S,
             txHash: m
           });
         }
       ), m;
-    } catch (l) {
-      Ce(l) ? u && c(u) : (u && a(u, {
+    } catch (g) {
+      ve(g) ? u && c(u) : (u && a(u, {
         status: q.FAILED,
-        error: ge(l)
-      }), E(() => U.onCancelOrderError(l))), E(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : h.call(r, ne(l));
+        error: ge(g)
+      }), I(() => i == null ? void 0 : i.analytics.onCancelOrderError(g))), I(() => {
+        var E;
+        return (E = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : E.call(r, re(g));
       });
     }
   }, [
     t,
     r,
     c,
-    o,
-    e,
     i,
+    e,
+    o,
     a,
     n
-  ]), O = C(() => {
-    const u = s[(e == null ? void 0 : e.historyKey) || ""];
+  ]), p = R(() => {
+    const u = s;
     return {
       isLoading: (u == null ? void 0 : u.status) === q.LOADING,
-      disabled: !!(e && !o),
+      disabled: !!(e && !i),
       isSuccess: (u == null ? void 0 : u.status) === q.SUCCESS,
       isError: (u == null ? void 0 : u.status) === q.FAILED,
       error: u == null ? void 0 : u.error,
       txHash: u == null ? void 0 : u.txHash
     };
-  }, [s, e, o]);
-  return C(() => ({ cancelOrder: f, ...O }), [f, O]);
-}, Qt = () => {
+  }, [s, e, i]);
+  return R(() => ({ cancelOrder: h, ...p }), [h, p]);
+}, Xt = () => {
   const { module: e, values: t } = W();
-  if (t.isMarketOrder && e === b.STOP_LOSS)
-    return te.TRIGGER_MARKET_PRICE;
-  if (e === b.LIMIT || e === b.TWAP)
-    return t.isMarketOrder ? te.MARKET_PRICE : te.LIMIT_PRICE;
-}, Yt = () => {
-  const { callbacks: e } = x(), t = w((a) => a.updateState), { schedule: n } = W(), { duration: r } = n, o = v(
+  if (t.isMarketOrder && e === X.STOP_LOSS)
+    return ee.TRIGGER_MARKET_PRICE;
+  if (e === X.LIMIT || e === X.TWAP)
+    return t.isMarketOrder ? ee.MARKET_PRICE : ee.LIMIT_PRICE;
+}, Zt = () => {
+  const { callbacks: e } = x(), t = A((a) => a.updateState), { schedule: n } = W(), { duration: r } = n, i = v(
     (a) => {
-      t({ orderDuration: a }), E(() => {
+      t({ orderDuration: a }), I(() => {
         var c;
         return (c = e == null ? void 0 : e.onOrderDurationChange) == null ? void 0 : c.call(e, a);
       });
     },
     [e, t]
-  ), i = v(
+  ), o = v(
     (a) => {
       const c = Number(a);
-      Number.isFinite(c) && o({ unit: r.unit, value: c });
+      Number.isFinite(c) && i({ unit: r.unit, value: c });
     },
-    [r.unit, o]
+    [r.unit, i]
   ), s = v(
     (a) => {
-      o({ unit: a, value: r.value });
+      i({ unit: a, value: r.value });
     },
-    [r.value, o]
+    [r.value, i]
   );
-  return C(
+  return R(
     () => ({
       duration: r,
-      onChange: o,
+      onChange: i,
       milliseconds: n.durationMillis,
-      onInputChange: i,
+      onInputChange: o,
       onUnitSelect: s,
       error: n.durationError
     }),
-    [r, o, i, s, n]
+    [r, i, o, s, n]
   );
-}, $t = () => {
-  const { callbacks: e } = x(), t = w((a) => a.updateState), { schedule: n } = W(), { fillDelay: r } = n, o = v(
+}, bt = () => {
+  const { callbacks: e } = x(), t = A((a) => a.updateState), { schedule: n } = W(), { fillDelay: r } = n, i = v(
     (a) => {
-      t({ tradeInterval: a }), E(() => {
+      t({ tradeInterval: a }), I(() => {
         var c;
         return (c = e == null ? void 0 : e.onTradeIntervalChange) == null ? void 0 : c.call(e, a);
       });
     },
     [e, t]
-  ), i = v(
+  ), o = v(
     (a) => {
       const c = Number(a);
-      Number.isFinite(c) && o({ unit: r.unit, value: c });
+      Number.isFinite(c) && i({ unit: r.unit, value: c });
     },
-    [r.unit, o]
+    [r.unit, i]
   ), s = v(
-    (a) => o({ unit: a, value: r.value }),
-    [r.value, o]
+    (a) => i({ unit: a, value: r.value }),
+    [r.value, i]
   );
-  return C(
+  return R(
     () => ({
-      onInputChange: i,
+      onInputChange: o,
       onUnitSelect: s,
-      onChange: o,
+      onChange: i,
       milliseconds: n.fillDelayMillis,
       fillDelay: r,
       error: n.fillDelayError
     }),
-    [r, o, i, s, n]
+    [r, i, o, s, n]
   );
-}, B = (e, t) => ({
+}, _ = (e, t) => ({
   raw: e || "",
-  ui: ie(e, t)
-}), Nt = (e, t, n) => C(() => !e || !t || !n ? [] : e.map((r) => ({
+  ui: ne(e, t)
+}), Ft = (e, t, n) => R(() => !e || !t || !n ? [] : e.map((r) => ({
   rawFill: r,
   inputToken: t,
   outputToken: n,
-  inputAmount: B(r.inAmount, t.decimals),
-  outputAmount: B(r.outAmount, n.decimals),
+  inputAmount: _(r.inAmount, t.decimals),
+  outputAmount: _(r.outAmount, n.decimals),
   timestamp: r.timestamp,
   txHash: r.txHash,
-  executionRate: Re(
+  executionRate: we(
     r.inAmount,
     r.outAmount,
     t.decimals,
     n.decimals
   )
-})), [e, t, n]), Xt = (e, t, n) => {
-  const { chainId: r, partner: o } = x(), i = C(() => {
+})), [e, t, n]), kt = (e, t, n) => {
+  const { chainId: r, partner: i } = x(), o = R(() => {
     if (!(!t || !n || !e || e.isMarketPrice))
       return Me(
         e,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), s = C(() => {
+  }, [t, e, n]), s = R(() => {
     if (!(!t || !n || !e))
-      return _e(
+      return Be(
         e,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), a = C(() => {
+  }, [t, e, n]), a = R(() => {
     if (!(!t || !n || !e))
-      return Re(
+      return we(
         e.srcAmountFilled,
         e.dstAmountFilled,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), c = C(() => e ? Be(
+  }, [t, e, n]), c = R(() => e ? _e(
     e,
-    r ? ve(o, r) : void 0
-  ) : 0, [e, o, r]), f = Nt(e == null ? void 0 : e.fills, t, n);
-  return C(() => {
+    r ? qe(i, r) : void 0
+  ) : 0, [e, i, r]), h = Ft(e == null ? void 0 : e.fills, t, n);
+  return R(() => {
     if (e != null && e.id)
       return {
         original: e,
-        fills: f,
+        fills: h,
         inputToken: t,
         outputToken: n,
         orderType: e.type,
@@ -1032,77 +1009,77 @@ const Et = ({
         totalTrades: e.totalTradesAmount || 0,
         tradeInterval: c,
         recipient: e.maker || "",
-        inputAmount: B(e.srcAmount, t == null ? void 0 : t.decimals),
-        limitPrice: B(
-          ee(i, n == null ? void 0 : n.decimals),
+        inputAmount: _(e.srcAmount, t == null ? void 0 : t.decimals),
+        limitPrice: _(
+          k(o, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
-        inputAmountPerTrade: B(
+        inputAmountPerTrade: _(
           e.srcAmountPerTrade,
           t == null ? void 0 : t.decimals
         ),
-        minOutputAmountPerTrade: B(
+        minOutputAmountPerTrade: _(
           e.dstMinAmountPerTrade,
           n == null ? void 0 : n.decimals
         ),
-        minOutputAmount: B(
+        minOutputAmount: _(
           e.dstMinAmountTotal,
           n == null ? void 0 : n.decimals
         ),
-        triggerPrice: B(
-          ee(s, n == null ? void 0 : n.decimals),
+        triggerPrice: _(
+          k(s, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         id: e.id,
-        inputAmountFilled: B(
+        inputAmountFilled: _(
           e.srcAmountFilled,
           t == null ? void 0 : t.decimals
         ),
-        outputAmountFilled: B(
+        outputAmountFilled: _(
           e.dstAmountFilled,
           n == null ? void 0 : n.decimals
         ),
         progress: e.progress,
-        executionPrice: B(
-          ee(a, n == null ? void 0 : n.decimals),
+        executionPrice: _(
+          k(a, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         version: e.version
       };
   }, [
     e,
-    f,
+    h,
     t,
     n,
     c,
-    i,
+    o,
     s,
     a
   ]);
-}, Zt = () => {
+}, er = () => {
   const { marketPriceLoading: e } = x(), t = W().errors.primary;
   return e ? void 0 : t;
-}, bt = () => {
-  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { limitPrice: o, values: i, module: s, isInverted: a } = W(), c = w((m) => m.updateState), f = v(
+}, tr = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { limitPrice: i, values: o, module: s, isInverted: a } = W(), c = A((m) => m.updateState), h = v(
     (m) => {
-      c({ limitPriceUi: m, limitPricePercent: null }), E(() => {
+      c({ limitPriceUi: m, limitPricePercent: null }), I(() => {
         var S;
         return (S = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : S.call(r, m || "");
-      }), E(() => {
+      }), I(() => {
         var S;
         return (S = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : S.call(r, "");
       });
     },
     [r, c]
-  ), O = v(
+  ), p = v(
     (m) => {
       c({
         limitPriceUi: void 0,
         limitPricePercent: m
-      }), E(() => {
+      }), I(() => {
         var S;
         return (S = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : S.call(r, "");
-      }), E(() => {
+      }), I(() => {
         var S;
         return (S = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : S.call(r, m || "");
       });
@@ -1113,62 +1090,62 @@ const Et = ({
       limitPriceUi: void 0,
       limitPricePercent: void 0
     });
-  }, [c]), l = !i.isMarketOrder, h = v(() => {
+  }, [c]), g = !o.isMarketOrder, E = v(() => {
     c({
-      isMarketOrder: !i.isMarketOrder,
-      ...i.isMarketOrder ? {} : { isPriceInverted: !1 },
-      ...!i.isMarketOrder && s === b.STOP_LOSS ? { limitPricePercent: void 0 } : {}
+      isMarketOrder: !o.isMarketOrder,
+      ...o.isMarketOrder ? {} : { isPriceInverted: !1 },
+      ...!o.isMarketOrder && s === X.STOP_LOSS ? { limitPricePercent: void 0 } : {}
     });
-  }, [s, c, i.isMarketOrder]);
-  return C(
+  }, [s, c, o.isMarketOrder]);
+  return R(
     () => ({
-      price: o.display,
-      canonicalPriceRaw: o.raw,
-      error: o.error,
-      onInputChange: f,
-      onPercentageChange: O,
+      price: i.display,
+      canonicalPriceRaw: i.raw,
+      error: i.error,
+      onInputChange: h,
+      onPercentageChange: p,
       onReset: u,
       inputToken: t,
       outputToken: n,
       displayInputToken: a ? n : t,
       displayOutputToken: a ? t : n,
-      percentage: o.percentage,
+      percentage: i.percentage,
       isLoading: !!e,
-      isEnabled: l,
-      toggle: h,
-      isTypedValue: o.isTypedValue
+      isEnabled: g,
+      toggle: E,
+      isTypedValue: i.isTypedValue
     }),
     [
       t,
       a,
-      l,
-      o,
+      g,
+      i,
       e,
-      f,
-      O,
+      h,
+      p,
       u,
       n,
-      h
+      E
     ]
   );
-}, kt = () => {
+}, rr = () => {
   const { marketPriceLoading: e } = x(), { outputAmount: t } = W();
-  return C(
+  return R(
     () => ({
       amount: t,
       isLoading: !!e
     }),
     [e, t]
   );
-}, er = () => {
-  const { inputToken: e, outputToken: t } = x(), n = w((c) => c.updateState), { isInverted: r, values: o } = W(), i = w((c) => c.state.triggerPriceUi), s = w((c) => c.state.limitPriceUi), a = v(() => {
+}, nr = () => {
+  const { inputToken: e, outputToken: t } = x(), n = A((c) => c.updateState), { isInverted: r, values: i } = W(), o = A((c) => c.state.triggerPriceUi), s = A((c) => c.state.limitPriceUi), a = v(() => {
     n({
       isPriceInverted: !r,
-      ...i !== void 0 ? { triggerPriceUi: he(i) } : {},
-      ...s !== void 0 ? { limitPriceUi: he(s) } : {}
+      ...o !== void 0 ? { triggerPriceUi: fe(o) } : {},
+      ...s !== void 0 ? { limitPriceUi: fe(s) } : {}
     });
-  }, [n, r, i, s]);
-  return C(
+  }, [n, r, o, s]);
+  return R(
     () => ({
       onInvert: a,
       isInverted: r,
@@ -1176,36 +1153,36 @@ const Et = ({
       outputToken: t,
       displayInputToken: r ? t : e,
       displayOutputToken: r ? e : t,
-      isMarketOrder: o.isMarketOrder
+      isMarketOrder: i.isMarketOrder
     }),
-    [e, r, a, t, o.isMarketOrder]
+    [e, r, a, t, i.isMarketOrder]
   );
-}, Ae = 3, Lt = 3e3, Ft = (e) => new Promise((t) => setTimeout(t, e)), de = (e, t) => {
+}, pe = 3, Ut = 3e3, Dt = (e) => new Promise((t) => setTimeout(t, e)), de = (e, t) => {
   if (!/^\d+$/.test(e))
     throw new Error(
       `${t} must be a non-negative integer base-unit amount`
     );
   return BigInt(e);
-}, we = async ({
+}, Ae = async ({
   client: e,
   walletInteractions: t,
   tokenAddress: n,
   inputAmountRaw: r
 }) => {
-  const o = await t.getAllowance({
+  const i = await t.getAllowance({
     tokenAddress: n,
     spenderAddress: e.spenderAddress
   });
-  return de(o || "0", "Allowance") >= de(r, "Input amount");
-}, xt = (e) => {
+  return de(i || "0", "Allowance") >= de(r, "Input amount");
+}, Gt = (e) => {
   if (!e.client) throw new Error("Spot client is unavailable");
-  if (!e.isSupportedChain || !e.chainId)
+  if (!e.hasChainId || !e.chainId)
     throw new Error("Spot is unavailable on the connected chain");
   if (!e.account) throw new Error("missing account");
   if (!e.inputToken) throw new Error("missing inputToken");
   if (!e.outputToken) throw new Error("missing outputToken");
-  const t = $(e.inputToken.address) ? e.wrappedNativeToken : e.inputToken;
-  if (!t || $(t.address))
+  const t = Q(e.inputToken.address) ? e.wrappedNativeToken : e.inputToken;
+  if (!t || Q(t.address))
     throw new Error("missing wrappedNativeToken for native input");
   if (!e.form.canSubmit)
     throw new Error("Order form is not submittable");
@@ -1219,303 +1196,305 @@ const Et = ({
     client: e.client,
     inputAmountRaw: n
   };
-}, Ut = ({
-  account: e,
-  chainId: t,
-  inputToken: n,
-  outputToken: r,
+}, Mt = ({
+  analytics: e,
+  account: t,
+  chainId: n,
+  inputToken: r,
+  outputToken: i,
   preparedOrder: o
 }) => {
-  const { form: i, values: s } = o;
-  E(
-    () => U.onRequestOrder({
-      account: e,
-      chainId: t,
-      module: i.module,
-      srcToken: n,
-      dstToken: r,
-      fromTokenAmount: s.inputAmount,
-      srcChunkAmount: s.inputAmountPerTrade,
-      triggerPricePerTrade: s.triggerOutputAmountPerTrade,
-      deadline: s.deadlineMillis,
-      fillDelay: s.fillDelayMillis,
-      minDstAmountOutPerTrade: s.minOutputAmountPerTrade,
-      slippage: i.values.slippageBps / 100,
-      isMarketOrder: s.isMarketOrder,
-      chunksAmount: s.totalTrades
+  const { form: s, values: a } = o;
+  I(
+    () => e.onRequestOrder({
+      account: t,
+      chainId: n,
+      module: s.module,
+      srcToken: r,
+      dstToken: i,
+      fromTokenAmount: a.inputAmount,
+      srcChunkAmount: a.inputAmountPerTrade,
+      triggerPricePerTrade: a.triggerOutputAmountPerTrade,
+      deadline: a.deadlineMillis,
+      fillDelay: a.fillDelayMillis,
+      minDstAmountOutPerTrade: a.minOutputAmountPerTrade,
+      slippage: s.values.slippageBps / 100,
+      isMarketOrder: a.isMarketOrder,
+      chunksAmount: a.totalTrades
     })
   );
-}, Dt = async (e) => {
+}, Bt = async (e) => {
   const {
     form: t,
     walletInteractions: n,
     callbacks: r,
-    addNewOrder: o,
-    refetchActiveOrders: i,
+    addNewOrder: i,
+    refetchActiveOrders: o,
     getCurrentExecution: s,
     beginExecution: a,
     replaceExecution: c,
-    wait: f = Ft
+    wait: h = Dt
   } = e;
-  let O;
+  let p;
   try {
-    O = xt(e);
-  } catch (A) {
-    const y = ne(A), N = se(A), L = a({
+    p = Gt(e);
+  } catch (w) {
+    const F = re(w), C = se(w), D = a({
       form: t,
       inputToken: e.inputToken,
       outputToken: e.outputToken,
       chainId: e.chainId
     });
-    throw L && c(L.executionId, {
-      ...L,
+    throw D && c(D.executionId, {
+      ...D,
       phase: d.FAILED,
-      error: y,
-      parsedError: N
-    }), E(
+      error: F,
+      parsedError: C
+    }), I(
       () => {
         var G;
-        return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, N);
+        return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, C);
       }
-    ), y;
+    ), F;
   }
   const {
     account: u,
-    chainId: l,
-    inputToken: h,
+    chainId: g,
+    inputToken: E,
     orderInputToken: m,
     outputToken: S,
-    client: R,
+    client: y,
     inputAmountRaw: T
-  } = O, K = s(), M = rt({
+  } = p, { analytics: L } = y, K = s(), M = nt({
     execution: K,
     account: u,
-    chainId: l,
-    inputTokenAddress: h.address,
+    chainId: g,
+    inputTokenAddress: E.address,
     inputAmountRaw: T
-  }), _ = a({
+  }), l = a({
     form: t,
-    inputToken: h,
+    inputToken: E,
     outputToken: S,
-    chainId: l,
+    chainId: g,
     completedWrap: M,
     wrapTxHash: M == null ? void 0 : M.txHash
   });
-  if (!_) return;
-  const g = _.executionId;
-  let P = _;
-  const p = (A, y = {}) => {
-    const N = {
-      ...P,
-      ...y,
-      executionId: g,
-      phase: A
+  if (!l) return;
+  const P = l.executionId;
+  let O = l;
+  const f = (w, F = {}) => {
+    const C = {
+      ...O,
+      ...F,
+      executionId: P,
+      phase: w
     };
-    if (!c(g, N))
+    if (!c(P, C))
       throw new Error("Execution is no longer current");
-    P = N;
-  }, I = (A, y = {}) => {
-    const N = {
-      ...P,
-      ...y,
-      executionId: g,
-      phase: A
+    O = C;
+  }, B = (w, F = {}) => {
+    const C = {
+      ...O,
+      ...F,
+      executionId: P,
+      phase: w
     };
-    return c(g, N) ? (P = N, !0) : !1;
+    return c(P, C) ? (O = C, !0) : !1;
   };
   try {
-    const A = $(h.address) && !M, y = !await we({
-      client: R,
+    const w = Q(E.address) && !M, F = !await Ae({
+      client: y,
       walletInteractions: n,
       tokenAddress: m.address,
       inputAmountRaw: T
-    }), N = [];
-    A && N.push(Q.WRAP), y && N.push(Q.APPROVE), N.push(Q.CREATE);
-    let L = 0;
-    if (p(d.PREPARING, {
-      pendingSteps: N,
-      totalSteps: N.length,
-      stepIndex: L,
-      hasApproval: !y
-    }), A) {
-      p(d.WRAPPING), E(() => U.onWrapRequest()), E(r == null ? void 0 : r.onWrapRequest);
-      const F = await n.wrapNativeToken(
+    }), C = [];
+    w && C.push(z.WRAP), F && C.push(z.APPROVE), C.push(z.CREATE);
+    let D = 0;
+    if (f(d.PREPARING, {
+      pendingSteps: C,
+      totalSteps: C.length,
+      stepIndex: D,
+      hasApproval: !F
+    }), w) {
+      f(d.WRAPPING), I(() => L.onWrapRequest()), I(r == null ? void 0 : r.onWrapRequest);
+      const N = await n.wrapNativeToken(
         T
       );
-      if (!F) throw new Error("failed to wrap input token");
+      if (!N) throw new Error("failed to wrap input token");
       const j = {
         account: u,
-        chainId: l,
-        inputTokenAddress: h.address,
+        chainId: g,
+        inputTokenAddress: E.address,
         inputAmountRaw: T,
-        txHash: F
+        txHash: N
       };
-      L++, p(d.WRAPPING, {
-        wrapTxHash: F,
+      D++, f(d.WRAPPING, {
+        wrapTxHash: N,
         completedWrap: j,
-        stepIndex: L
-      }), E(() => U.onWrapSuccess(F)), E(
+        stepIndex: D
+      }), I(() => L.onWrapSuccess(N)), I(
         () => {
           var H;
           return (H = r == null ? void 0 : r.onWrapSuccess) == null ? void 0 : H.call(r, {
-            txHash: F,
-            amount: ie(T, m.decimals)
+            txHash: N,
+            amount: ne(T, m.decimals)
           });
         }
       );
     }
-    if (y) {
-      p(d.APPROVING), E(() => U.onApproveRequest()), E(r == null ? void 0 : r.onApproveRequest);
-      const F = await n.approveToken({
+    if (F) {
+      f(d.APPROVING), I(() => L.onApproveRequest()), I(r == null ? void 0 : r.onApproveRequest);
+      const N = await n.approveToken({
         tokenAddress: m.address,
         amount: T,
-        spenderAddress: R.spenderAddress
+        spenderAddress: y.spenderAddress
       });
-      if (!F) throw new Error("failed to approve token");
-      p(d.APPROVING, { approveTxHash: F });
+      if (!N) throw new Error("failed to approve token");
+      f(d.APPROVING, { approveTxHash: N });
       let j = !1;
-      for (let H = 0; H < Ae && (j = await we({
-        client: R,
+      for (let H = 0; H < pe && (j = await Ae({
+        client: y,
         walletInteractions: n,
         tokenAddress: m.address,
         inputAmountRaw: T
       }), !j); H++)
-        H < Ae - 1 && await f(Lt);
+        H < pe - 1 && await h(Ut);
       if (!j)
         throw new Error(
           `Insufficient ${m.symbol} allowance to perform the swap. Please approve the token first.`
         );
-      L++, p(d.APPROVING, {
+      D++, f(d.APPROVING, {
         hasApproval: !0,
-        stepIndex: L
-      }), E(() => U.onApproveSuccess(F)), E(
+        stepIndex: D
+      }), I(() => L.onApproveSuccess(N)), I(
         () => {
           var H;
           return (H = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : H.call(r, {
-            txHash: F,
+            txHash: N,
             token: m,
-            amount: ie(T, m.decimals)
+            amount: ne(T, m.decimals)
           });
         }
       );
     }
-    p(d.SIGNING);
-    const G = R.prepareOrder({
+    f(d.SIGNING);
+    const G = y.prepareOrder({
       form: t,
       inputTokenAddress: m.address,
       outputTokenAddress: S.address,
       swapperAddress: u
     });
-    p(d.SIGNING, { preparedOrder: G }), Ut({
+    f(d.SIGNING, { preparedOrder: G }), Mt({
+      analytics: L,
       account: u,
-      chainId: l,
-      inputToken: h,
+      chainId: g,
+      inputToken: E,
       outputToken: S,
       preparedOrder: G
-    }), E(() => U.onSignOrderRequest(G.order)), E(r == null ? void 0 : r.onSignOrderRequest);
-    let V;
+    }), I(() => L.onSignOrderRequest(G.order)), I(r == null ? void 0 : r.onSignOrderRequest);
+    let Z;
     try {
-      V = await n.signOrder(
+      Z = await n.signOrder(
         G.signingRequest
-      ), E(() => U.onSignOrderSuccess(V)), E(() => {
-        var F;
-        return (F = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : F.call(r, V);
+      ), I(() => L.onSignOrderSuccess(Z)), I(() => {
+        var N;
+        return (N = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : N.call(r, Z);
       });
-    } catch (F) {
-      throw E(() => U.onSignOrderError(F)), E(() => {
+    } catch (N) {
+      throw I(() => L.onSignOrderError(N)), I(() => {
         var j;
-        return (j = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : j.call(r, ne(F));
-      }), F;
+        return (j = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : j.call(r, re(N));
+      }), N;
     }
-    p(d.SUBMITTING);
-    const k = await R.submitOrder(G.order, V);
-    return p(d.SUCCESS, {
-      orderId: k.id.toString()
-    }), E(() => o(k)), E(() => i()), E(() => {
-      var F;
-      return (F = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : F.call(r, k);
-    }), k;
-  } catch (A) {
-    const y = P.phase, N = ne(A), L = Ce(A);
-    throw I(
-      L ? d.REJECTED : d.FAILED,
+    f(d.SUBMITTING);
+    const b = await y.submitOrder(G.order, Z);
+    return f(d.SUCCESS, {
+      orderId: b.id.toString()
+    }), I(() => i(b)), I(() => o()), I(() => {
+      var N;
+      return (N = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : N.call(r, b);
+    }), b;
+  } catch (w) {
+    const F = O.phase, C = re(w), D = ve(w);
+    throw B(
+      D ? d.REJECTED : d.FAILED,
       {
-        error: N,
-        parsedError: se(A)
+        error: C,
+        parsedError: se(w)
       }
-    ), y === d.WRAPPING ? E(() => U.onWrapError(A)) : y === d.APPROVING && E(() => U.onApproveError(A)), E(L ? r == null ? void 0 : r.onSubmitOrderRejected : () => {
+    ), F === d.WRAPPING ? I(() => L.onWrapError(w)) : F === d.APPROVING && I(() => L.onApproveError(w)), I(D ? r == null ? void 0 : r.onSubmitOrderRejected : () => {
       var G;
-      return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, se(A));
-    }), N;
+      return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, se(w));
+    }), C;
   }
-}, Gt = () => {
-  const {
-    inputToken: e,
-    outputToken: t,
-    wrappedNativeToken: n,
-    chainId: r,
-    isSupportedChain: o,
-    callbacks: i,
-    account: s,
-    walletInteractions: a
-  } = x(), { data: c } = Z(), f = wt(), O = vt(), u = W(), l = z();
+}, _t = () => {
+  const { data: e } = Y(), {
+    inputToken: t,
+    outputToken: n,
+    wrappedNativeToken: r,
+    chainId: i,
+    hasChainId: o,
+    callbacks: s,
+    account: a,
+    walletInteractions: c
+  } = x(), h = It(), p = St(), u = W(), g = V();
   return v(() => {
-    Dt({
-      account: s,
-      chainId: r,
-      isSupportedChain: o,
-      inputToken: e,
-      outputToken: t,
-      wrappedNativeToken: n,
+    Bt({
+      account: a,
+      chainId: i,
+      hasChainId: o,
+      inputToken: t,
+      outputToken: n,
+      wrappedNativeToken: r,
       form: u,
-      client: c,
-      walletInteractions: a,
-      callbacks: i,
-      addNewOrder: f,
-      refetchActiveOrders: O,
-      getCurrentExecution: () => l.getState().state.currentExecution,
-      beginExecution: l.getState().beginExecution,
-      replaceExecution: l.getState().replaceExecution
+      client: e,
+      walletInteractions: c,
+      callbacks: s,
+      addNewOrder: h,
+      refetchActiveOrders: p,
+      getCurrentExecution: () => g.getState().state.currentExecution,
+      beginExecution: g.getState().beginExecution,
+      replaceExecution: g.getState().replaceExecution
     }).catch(() => {
     });
   }, [
+    a,
+    h,
     s,
-    f,
     i,
-    r,
-    c,
-    u,
     e,
-    o,
+    u,
     t,
+    o,
     n,
-    O,
-    l,
-    a
+    r,
+    p,
+    g,
+    c
   ]);
-}, Mt = () => {
-  const e = w((n) => n.state.currentExecution), t = w(
+}, qt = () => {
+  const e = A((n) => n.state.currentExecution), t = A(
     (n) => n.returnToOrderForm
   );
-  return C(
+  return R(
     () => ({ ...e, returnToOrderForm: t }),
     [e, t]
   );
-}, tr = () => {
-  const e = Mt(), {
+}, ir = () => {
+  const e = qt(), {
     inputToken: t,
     outputToken: n,
     chainId: r,
-    isSupportedChain: o,
-    module: i,
+    hasChainId: i,
+    module: o,
     overrides: s
-  } = x(), { data: a, isLoading: c } = Z(), f = Gt(), O = w((R) => R.startNewOrder), u = v(() => f(), [f]), l = v(
-    () => O(Te({ module: i, overrides: s })),
-    [i, s, O]
-  ), h = ke(e.phase), m = et(e.phase), S = Y(e.phase);
-  return C(() => ({
+  } = x(), { data: a, isLoading: c } = Y(), h = _t(), p = A((y) => y.startNewOrder), u = v(() => h(), [h]), g = v(
+    () => p(ye({ module: o, overrides: s })),
+    [o, s, p]
+  ), E = et(e.phase), m = tt(e.phase), S = $(e.phase);
+  return R(() => ({
     phase: e.phase,
-    status: h,
+    status: E,
     error: e.parsedError,
     currentStep: m,
     currentStepIndex: e.stepIndex,
@@ -1527,13 +1506,13 @@ const Et = ({
     outputToken: e.outputToken ?? n,
     chainId: e.chainId ?? r,
     submitOrder: u,
-    startNewOrder: l,
+    startNewOrder: g,
     returnToOrderForm: e.returnToOrderForm,
     isExecuting: S,
     isSuccess: e.phase === d.SUCCESS,
     isFailed: e.phase === d.FAILED,
     isRejected: e.phase === d.REJECTED,
-    isPreparingOrder: e.phase === d.PREPARING || o && c && !a,
+    isPreparingOrder: e.phase === d.PREPARING || i && c && !a,
     canDismiss: !S
   }), [
     a,
@@ -1543,76 +1522,76 @@ const Et = ({
     r,
     c,
     S,
-    o,
-    l,
+    i,
+    g,
     u,
-    h,
+    E,
     e
   ]);
-}, rr = () => {
+}, or = () => {
   const {
     inputToken: e,
     outputToken: t,
     wrappedNativeToken: n,
     inputBalanceRaw: r,
-    noLiquidity: o,
-    inputAmountUi: i,
+    noLiquidity: i,
+    inputAmountUi: o,
     marketPriceLoading: s,
-    isSupportedChain: a
-  } = x(), c = W(), { data: f, isLoading: O } = Z(), u = w(
+    hasChainId: a
+  } = x(), c = W(), { data: h, isLoading: p } = Y(), u = A(
     (T) => T.state.currentExecution.phase
-  ), l = Y(u), h = !!(e && $(e.address) && (!n || $(n.address))), m = s || !c.isReady || r === void 0, S = l || a && O && !f || !!(e && t && i && m), R = !!(!c.canSubmit || l || !a || !f || o || S || !e || !t || h);
-  return C(() => ({
-    disabled: R,
+  ), g = $(u), E = !!(e && Q(e.address) && (!n || Q(n.address))), m = s || !c.isReady || r === void 0, S = g || a && p && !h || !!(e && t && o && m), y = !!(!c.canSubmit || g || !a || !h || i || S || !e || !t || E);
+  return R(() => ({
+    disabled: y,
     loading: S
-  }), [R, S]);
-}, nr = () => {
-  const { inputToken: e, outputToken: t, callbacks: n } = x(), r = w((s) => s.updateState), { trades: o } = W(), i = v(
+  }), [y, S]);
+}, sr = () => {
+  const { inputToken: e, outputToken: t, callbacks: n } = x(), r = A((s) => s.updateState), { trades: i } = W(), o = v(
     (s) => {
-      r({ tradeCount: s }), E(() => {
+      r({ tradeCount: s }), I(() => {
         var a;
         return (a = n == null ? void 0 : n.onTradeCountChange) == null ? void 0 : a.call(n, s);
       });
     },
     [n, r]
   );
-  return C(
+  return R(
     () => ({
-      totalTrades: o.totalTrades,
-      maxTrades: o.maxTrades,
-      inputAmountPerTrade: o.inputAmountPerTrade,
-      minOutputAmountPerTrade: o.minOutputAmountPerTrade,
-      triggerOutputAmountPerTrade: o.triggerOutputAmountPerTrade,
-      onChange: i,
-      error: o.error,
+      totalTrades: i.totalTrades,
+      maxTrades: i.maxTrades,
+      inputAmountPerTrade: i.inputAmountPerTrade,
+      minOutputAmountPerTrade: i.minOutputAmountPerTrade,
+      triggerOutputAmountPerTrade: i.triggerOutputAmountPerTrade,
+      onChange: o,
+      error: i.error,
       inputToken: e,
       outputToken: t
     }),
-    [e, i, t, o]
+    [e, o, t, i]
   );
-}, ir = () => {
-  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { marketPrice: o, trades: i, triggerPrice: s, isInverted: a } = W(), c = w((l) => l.updateState), f = v(
-    (l) => {
-      c({ triggerPriceUi: l, triggerPricePercent: null }), E(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : h.call(r, l || "");
-      }), E(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : h.call(r, "");
+}, ar = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { marketPrice: i, trades: o, triggerPrice: s, isInverted: a } = W(), c = A((g) => g.updateState), h = v(
+    (g) => {
+      c({ triggerPriceUi: g, triggerPricePercent: null }), I(() => {
+        var E;
+        return (E = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : E.call(r, g || "");
+      }), I(() => {
+        var E;
+        return (E = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : E.call(r, "");
       });
     },
     [r, c]
-  ), O = v(
-    (l) => {
+  ), p = v(
+    (g) => {
       c({
         triggerPriceUi: void 0,
-        triggerPricePercent: l
-      }), E(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : h.call(r, "");
-      }), E(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : h.call(r, l || "");
+        triggerPricePercent: g
+      }), I(() => {
+        var E;
+        return (E = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : E.call(r, "");
+      }), I(() => {
+        var E;
+        return (E = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : E.call(r, g || "");
       });
     },
     [r, c]
@@ -1622,87 +1601,84 @@ const Et = ({
       triggerPriceUi: void 0
     });
   }, [c]);
-  return C(
+  return R(
     () => ({
       price: s.display,
       canonicalPriceRaw: s.raw,
-      outputAmountPerTrade: i.triggerOutputAmountPerTrade,
+      outputAmountPerTrade: o.triggerOutputAmountPerTrade,
       error: s.error,
-      onInputChange: f,
-      onPercentageChange: O,
+      onInputChange: h,
+      onPercentageChange: p,
       percentage: s.percentage,
       onReset: u,
       inputToken: t,
       outputToken: n,
       displayInputToken: a ? n : t,
       displayOutputToken: a ? t : n,
-      isLoading: !!(e || !o.raw),
+      isLoading: !!(e || !i.raw),
       isTypedValue: s.isTypedValue
     }),
     [
       t,
       a,
-      o.raw,
+      i.raw,
       e,
-      f,
-      O,
+      h,
+      p,
       u,
       n,
-      i.triggerOutputAmountPerTrade,
+      o.triggerOutputAmountPerTrade,
       s
     ]
   );
 };
-qe(Qe.version);
+We(Qe.version);
 export {
-  ar as DISCLAIMER_URL,
-  te as Disclaimer,
+  ur as DISCLAIMER_URL,
+  ee as Disclaimer,
   d as ExecutionPhase,
   q as ExecutionStatus,
-  cr as InputErrors,
-  dr as Module,
-  ur as ORBS_LOGO,
-  lr as ORBS_SLTP_FAQ_URL,
-  mr as ORBS_TWAP_FAQ_URL,
-  gr as ORBS_WEBSITE_URL,
-  Pr as OrderFilter,
-  fr as OrderStatus,
-  hr as OrderType,
-  Sr as Partners,
-  Er as SPOT_VERSION,
-  Ht as SpotProvider,
-  Q as Steps,
-  Ir as TimeUnit,
-  Or as calculateOrderForm,
-  pr as createClient,
-  Ar as eqIgnoreCase,
-  wr as getOrderExecutionRate,
-  vr as getOrderFillDelayMillis,
-  Cr as getOrderLimitPriceRate,
-  Rr as getPartnerChains,
-  yr as getPartners,
+  lr as InputErrors,
+  mr as Module,
+  gr as ORBS_LOGO,
+  Pr as ORBS_SLTP_FAQ_URL,
+  fr as ORBS_TWAP_FAQ_URL,
+  hr as ORBS_WEBSITE_URL,
+  Er as OrderFilter,
+  Ir as OrderStatus,
+  Sr as OrderType,
+  Or as Partners,
+  $t as SpotProvider,
+  z as Steps,
+  pr as TimeUnit,
+  Ar as calculateOrderForm,
+  vr as createClient,
+  wr as eqIgnoreCase,
+  Cr as getOrderExecutionRate,
+  yr as getOrderFillDelayMillis,
+  Rr as getOrderLimitPriceRate,
   Tr as getTriggerPriceRate,
   Nr as getTwapConfig,
   Lr as invertPriceInput,
-  Fr as isNativeAddress,
-  xr as isTxRejected,
+  xr as isNativeAddress,
+  Fr as isTxRejected,
   Ur as toAmountRaw,
   Dr as toAmountUI,
-  jt as useAmountUi,
-  Jt as useCancelOrder,
-  Z as useClient,
-  Qt as useDisclaimer,
-  Yt as useDuration,
-  tr as useExecution,
-  $t as useFillDelay,
-  Xt as useHistoryOrder,
-  Zt as useInputErrors,
-  bt as useLimitPrice,
+  Qt as useAmountUi,
+  Yt as useCancelOrder,
+  Y as useClient,
+  Xt as useDisclaimer,
+  Zt as useDuration,
+  ir as useExecution,
+  bt as useFillDelay,
+  kt as useHistoryOrder,
+  er as useInputErrors,
+  tr as useLimitPrice,
   W as useOrderForm,
   zt as useOrders,
-  kt as useOutputAmount,
-  er as usePriceDisplay,
-  rr as useSubmitButton,
-  nr as useTrades,
-  ir as useTriggerPrice
+  rr as useOutputAmount,
+  nr as usePriceDisplay,
+  or as useSubmitButton,
+  sr as useTrades,
+  ar as useTriggerPrice
 };