@orbs-network/spot-react 2.1.22 → 2.1.24

package/dist/spot-react.js

@@ -1,16 +1,16 @@
 "use client";
-var qe = Object.defineProperty;
-var be = (e, t, n) => t in e ? qe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var He = Object.defineProperty;
+var be = (e, t, n) => t in e ? He(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var oe = (e, t, n) => be(e, typeof t != "symbol" ? t + "" : t, n);
-import { OrderSettlementError as we, SpotError as ve, OrderStatus as M, Module as Q, createClient as We, analytics as je, calculateOrder as Ve, isNativeAddress as $, eqIgnoreCase as he, toAmountRaw as k, toAmountUI as ne, isTxRejected as Ce, getOrderLimitPriceRate as Qe, getTriggerPriceRate as Je, getOrderExecutionRate as Ae, getOrderFillDelayMillis as ze, getTwapConfig as $e, invertPriceInput as Ee, watchOrder as Ye, executeOrder as Xe, getOrders as Ze, setUIVersion as ke } from "@orbs-network/spot-ui";
-import { DISCLAIMER_URL as wr, InputErrors as vr, Module as Cr, ORBS_LOGO as Ar, ORBS_SLTP_FAQ_URL as Tr, ORBS_TWAP_FAQ_URL as Rr, ORBS_WEBSITE_URL as Nr, OrderFilter as Lr, OrderSettlementError as xr, OrderStatus as Fr, OrderType as Ur, Partners as Dr, QuoteError as Mr, SWAP_CAPABILITIES as Gr, SpotError as Br, TimeUnit as Kr, analytics as _r, calculateOrder as Hr, calculateOrderForm as qr, createClient as br, eqIgnoreCase as Wr, executeOrder as jr, getOrderExecutionRate as Vr, getOrderFillDelayMillis as Qr, getOrderLimitPriceRate as Jr, getOrders as zr, getQuote as $r, getTriggerPriceRate as Yr, getTwapConfig as Xr, invertPriceInput as Zr, isNativeAddress as kr, isQuoteFresh as en, isSwapSupported as tn, isTxRejected as rn, setUIVersion as nn, submitSwap as on, toAmountRaw as sn, toAmountUI as cn, waitForOrder as an, watchOrder as dn } from "@orbs-network/spot-ui";
-import { jsx as D, jsxs as ae, Fragment as et } from "react/jsx-runtime";
-import { createContext as de, useContext as ue, useState as tt, useCallback as v, useMemo as R, useEffect as Y, Component as rt, useRef as le } from "react";
+import { OrderSettlementError as we, SpotError as ve, OrderStatus as M, Module as V, createClient as We, analytics as je, calculateOrder as Qe, isNativeAddress as $, eqIgnoreCase as he, toAmountRaw as k, toAmountUI as ne, isTxRejected as Ae, getOrderLimitPriceRate as Ve, getTriggerPriceRate as Je, getOrderExecutionRate as Ce, getOrderFillDelayMillis as ze, getTwapConfig as $e, invertPriceInput as Ee, watchOrder as Ye, executeOrder as Xe, getOrders as Ze, setUIVersion as ke } from "@orbs-network/spot-ui";
+import { DISCLAIMER_URL as wr, InputErrors as vr, Module as Ar, ORBS_LOGO as Cr, ORBS_SLTP_FAQ_URL as Tr, ORBS_TWAP_FAQ_URL as Rr, ORBS_WEBSITE_URL as Lr, OrderFilter as Nr, OrderSettlementError as xr, OrderStatus as Fr, OrderType as Ur, Partners as Dr, QuoteError as Mr, SWAP_CAPABILITIES as Gr, SpotError as Br, TimeUnit as Kr, analytics as _r, calculateOrder as qr, calculateOrderForm as Hr, createClient as br, eqIgnoreCase as Wr, executeOrder as jr, getOrderExecutionRate as Qr, getOrderFillDelayMillis as Vr, getOrderLimitPriceRate as Jr, getOrders as zr, getQuote as $r, getTriggerPriceRate as Yr, getTwapConfig as Xr, invertPriceInput as Zr, isNativeAddress as kr, isQuoteFresh as en, isSwapSupported as tn, isTxRejected as rn, setUIVersion as nn, submitSwap as on, toAmountRaw as sn, toAmountUI as an, waitForOrder as cn, watchOrder as dn } from "@orbs-network/spot-ui";
+import { jsx as D, jsxs as ce, Fragment as et } from "react/jsx-runtime";
+import { createContext as de, useContext as ue, useState as tt, useCallback as A, useMemo as R, useEffect as Y, Component as rt, useRef as le } from "react";
 import { useStore as nt } from "zustand";
 import { createStore as it } from "zustand/vanilla";
-const ot = "2.1.22", st = {
+const ot = "2.1.24", st = {
   version: ot
-}, Te = de(null), ct = ({
+}, Te = de(null), at = ({
   children: e,
   value: t
 }) => /* @__PURE__ */ D(Te.Provider, { value: t, children: e }), x = () => {
@@ -19,7 +19,7 @@ const ot = "2.1.22", st = {
     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.SETTLING = "settling", e.UNCONFIRMED = "unconfirmed", 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 || {});
+var H = /* @__PURE__ */ ((e) => (e[e.LOADING = 1] = "LOADING", e[e.SUCCESS = 2] = "SUCCESS", e[e.FAILED = 3] = "FAILED", e))(H || {}), d = /* @__PURE__ */ ((e) => (e.IDLE = "idle", e.PREPARING = "preparing", e.WRAPPING = "wrapping", e.APPROVING = "approving", e.SIGNING = "signing", e.SUBMITTING = "submitting", e.SETTLING = "settling", e.UNCONFIRMED = "unconfirmed", 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 me = (e) => {
   if (e instanceof Error) return e.message;
   if (typeof e == "string") return e;
@@ -40,7 +40,7 @@ const me = (e) => {
     return t;
   }
   return 0;
-}, Ne = (e) => {
+}, Le = (e) => {
   if (typeof e != "object" || e === null) return {};
   const t = { code: Re(e) }, n = Reflect.get(e, "reason");
   (n === "cancelled" || n === "expired" || n === "unconfirmed" || n === "aborted") && (t.reason = n);
@@ -50,14 +50,14 @@ const me = (e) => {
   typeof i == "number" && Number.isFinite(i) && (t.status = i);
   const o = Reflect.get(e, "serviceCode");
   return (typeof o == "string" || typeof o == "number" && Number.isFinite(o)) && (t.serviceCode = o), t;
-}, X = (e) => e instanceof Error ? e : Object.assign(new Error(me(e)), Ne(e), { cause: e }), te = (e) => {
+}, X = (e) => e instanceof Error ? e : Object.assign(new Error(me(e)), Le(e), { cause: e }), te = (e) => {
   const t = me(e), n = t.match(/,\s*code\s*:\s*(-?\d+)/i), r = n ? Number(n[1]) : 0, i = t.replace(/^error\s*:/i, "").replace(/,\s*code\s*:\s*-?\d+/i, "").trim();
   return {
-    ...Ne(e),
+    ...Le(e),
     message: i || "Unknown error",
     code: Re(e) || (Number.isFinite(r) ? r : 0)
   };
-}, at = /* @__PURE__ */ new Set([
+}, ct = /* @__PURE__ */ new Set([
   d.PREPARING,
   d.WRAPPING,
   d.APPROVING,
@@ -117,11 +117,11 @@ const me = (e) => {
 }, re = (e) => ({
   phase: d.IDLE,
   completedWrap: e
-}), ie = (e) => at.has(e), Z = (e) => ie(e) || e === d.UNCONFIRMED, Le = (e) => e === d.IDLE || e === d.FAILED || e === d.REJECTED, xe = (e, t) => t === d.SETTLING ? !(e instanceof we && (e.reason === "cancelled" || e.reason === "expired")) : !(t !== d.SUBMITTING || e instanceof ve && e.code === "SUBMISSION_FAILED" && e.status !== void 0 && e.status < 500 && e.status !== 408 && !e.cause), ut = (e, t) => dt[e].has(t), lt = (e) => {
-  if (ie(e)) return q.LOADING;
-  if (e === d.SUCCESS) return q.SUCCESS;
+}), ie = (e) => ct.has(e), Z = (e) => ie(e) || e === d.UNCONFIRMED, Ne = (e) => e === d.IDLE || e === d.FAILED || e === d.REJECTED, xe = (e, t) => t === d.SETTLING ? !(e instanceof we && (e.reason === "cancelled" || e.reason === "expired")) : !(t !== d.SUBMITTING || e instanceof ve && e.code === "SUBMISSION_FAILED" && e.status !== void 0 && e.status < 500 && e.status !== 408 && !e.cause), ut = (e, t) => dt[e].has(t), lt = (e) => {
+  if (ie(e)) return H.LOADING;
+  if (e === d.SUCCESS) return H.SUCCESS;
   if (e === d.FAILED || e === d.REJECTED || e === d.UNCONFIRMED)
-    return q.FAILED;
+    return H.FAILED;
 }, mt = (e) => {
   if (e === d.WRAPPING) return z.WRAP;
   if (e === d.APPROVING) return z.APPROVE;
@@ -190,23 +190,23 @@ const me = (e) => {
     return s && (s.status === M.Completed && o.status !== M.Completed || s.status !== M.Open && o.status === M.Open) ? s : o;
   }), ...e.filter((o) => !r.has(o.historyKey))];
 }, St = (e, t, n, r, i) => {
-  const o = r ?? /* @__PURE__ */ new Set(), s = (m) => o.has(m.historyKey) ? !1 : (o.add(m.historyKey), w(() => {
+  const o = r ?? /* @__PURE__ */ new Set(), s = (l) => o.has(l.historyKey) ? !1 : (o.add(l.historyKey), w(() => {
     var E;
-    return (E = n == null ? void 0 : n.onOrderFilled) == null ? void 0 : E.call(n, m);
-  }), !0), a = new Map(
-    t.map((m) => [m.historyKey, m])
-  ), c = [];
-  for (const m of e ?? []) {
-    if (m.version !== 2) continue;
-    const E = a.get(m.historyKey);
-    !E || E.progress === m.progress && E.status === m.status || (c.push(E), E.status === M.Completed && m.status !== M.Completed && s(E));
+    return (E = n == null ? void 0 : n.onOrderFilled) == null ? void 0 : E.call(n, l);
+  }), !0), c = new Map(
+    t.map((l) => [l.historyKey, l])
+  ), a = [];
+  for (const l of e ?? []) {
+    if (l.version !== 2) continue;
+    const E = c.get(l.historyKey);
+    !E || E.progress === l.progress && E.status === l.status || (a.push(E), E.status === M.Completed && l.status !== M.Completed && s(E));
   }
-  (i == null ? void 0 : i.status) === M.Completed && s(i) && !c.some((m) => m.historyKey === i.historyKey) && c.push(i);
-  for (const m of t)
-    m.status === M.Completed && o.add(m.historyKey);
-  c.length > 0 && w(() => {
-    var m;
-    return (m = n == null ? void 0 : n.onOrdersProgressUpdate) == null ? void 0 : m.call(n, c);
+  (i == null ? void 0 : i.status) === M.Completed && s(i) && !a.some((l) => l.historyKey === i.historyKey) && a.push(i);
+  for (const l of t)
+    l.status === M.Completed && o.add(l.historyKey);
+  a.length > 0 && w(() => {
+    var l;
+    return (l = n == null ? void 0 : n.onOrdersProgressUpdate) == null ? void 0 : l.call(n, a);
   });
 }, Oe = (e) => {
   if (e === null || typeof e != "object") return !1;
@@ -225,8 +225,8 @@ const me = (e) => {
     let o = n.length === r.length;
     for (const s of r) {
       Object.prototype.hasOwnProperty.call(e, s) || (o = !1);
-      const a = se(e[s], t[s]);
-      i[s] = a, a !== e[s] && (o = !1);
+      const c = se(e[s], t[s]);
+      i[s] = c, c !== e[s] && (o = !1);
     }
     return o ? e : i;
   }
@@ -249,7 +249,7 @@ const me = (e) => {
     orders: r && !s.legacyLoaded ? Et(s.orders, i) : s.orders,
     legacyLoaded: o || s.legacyLoaded
   };
-}, ce = (e) => ({
+}, ae = (e) => ({
   tradeCount: e.tradeCount,
   tradeInterval: e.tradeInterval,
   orderDuration: e.orderDuration,
@@ -260,79 +260,79 @@ const me = (e) => {
   isMarketOrder: e.isMarketOrder,
   isPriceInverted: void 0
 }), pt = (e) => ({
-  ...ce(e),
+  ...ae(e),
   cancelOrders: {},
   currentExecution: re()
 }), Pe = { isFetching: !1 }, pe = { isFetching: !1 }, yt = (e) => new Promise((t) => setTimeout(t, e)), wt = (e) => {
-  let t = 0, n, r, i = 0, o, s, a, c;
-  const m = /* @__PURE__ */ new Set();
-  let E = !1, u = 0, I = 0, g, P, p;
-  return it((O, T) => {
-    const j = (h, l = c, S = T().orders.isFetching, N) => {
-      const y = s, C = T().orders.data, f = Ot(C, It(C, h));
-      return O((L) => ({ orders: { ...L.orders, data: f, isFetching: S } })), s === y && St(C, f, l, m, N), f;
-    }, V = async () => {
+  let t = 0, n, r, i = 0, o, s, c, a;
+  const l = /* @__PURE__ */ new Set();
+  let E = !1, u = 0, S = 0, g, p, y;
+  return it((P, T) => {
+    const j = (h, I = a, O = T().orders.isFetching, L) => {
+      const f = s, v = T().orders.data, m = Ot(v, It(v, h));
+      return P((N) => ({ orders: { ...N.orders, data: m, isFetching: O } })), s === f && St(v, m, I, l, L), m;
+    }, Q = async () => {
       if (!n || !r) return;
       if (o) return o;
-      const h = ++i, l = r;
-      O((N) => ({
+      const h = ++i, I = r;
+      P((L) => ({
         client: {
           key: n,
-          data: N.client.data,
+          data: L.client.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const S = (async () => {
-        let N;
-        for (let y = 0; y < 3; y++) {
+      const O = (async () => {
+        let L;
+        for (let f = 0; f < 3; f++) {
           if (h !== i) return;
           try {
-            const C = await l();
-            return h !== i ? void 0 : (O({
-              client: { key: n, data: C, isFetching: !1 }
-            }), C);
-          } catch (C) {
-            if (N = C instanceof Error ? C : new Error(String(C)), h !== i) return;
-            y < 2 && await yt(2 ** y * 1e3);
+            const v = await I();
+            return h !== i ? void 0 : (P({
+              client: { key: n, data: v, isFetching: !1 }
+            }), v);
+          } catch (v) {
+            if (L = v instanceof Error ? v : new Error(String(v)), h !== i) return;
+            f < 2 && await yt(2 ** f * 1e3);
           }
         }
-        h === i && O({
-          client: { key: n, error: N, isFetching: !1 }
+        h === i && P({
+          client: { key: n, error: L, isFetching: !1 }
         });
       })();
-      return o = S, S.finally(() => {
-        o === S && (o = void 0);
-      }), S;
-    }, F = async (h = !1, l = !1) => {
-      if (!h && u === 0 || !s || !a)
+      return o = O, O.finally(() => {
+        o === O && (o = void 0);
+      }), O;
+    }, F = async (h = !1, I = !1) => {
+      if (!h && u === 0 || !s || !c)
         return T().orders.data;
       if (g) {
-        if (!l) return g;
-        const L = s;
-        return await g, s !== L ? void 0 : F(h, l);
+        if (!I) return g;
+        const N = s;
+        return await g, s !== N ? void 0 : F(h, I);
       }
-      const S = ++I, N = a, y = T().orders.data, C = new AbortController();
-      P = C, O((L) => ({
+      const O = ++S, L = c, f = T().orders.data, v = new AbortController();
+      p = v, P((N) => ({
         orders: {
           key: s,
-          data: L.orders.data,
+          data: N.orders.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const f = N(
-        y,
-        l ? !1 : E,
-        C.signal
-      ).then(({ orders: L, legacyLoaded: _ }) => {
-        if (S === I)
-          return E = _, j(L, c, !1);
-      }).catch((L) => {
-        if (S !== I || C.signal.aborted)
+      const m = L(
+        f,
+        I ? !1 : E,
+        v.signal
+      ).then(({ orders: N, legacyLoaded: _ }) => {
+        if (O === S)
+          return E = _, j(N, a, !1);
+      }).catch((N) => {
+        if (O !== S || v.signal.aborted)
           return;
-        const _ = L instanceof Error ? L : new Error(String(L));
-        O((U) => ({
+        const _ = N instanceof Error ? N : new Error(String(N));
+        P((U) => ({
           orders: {
             key: s,
             data: U.orders.data,
@@ -341,125 +341,125 @@ const me = (e) => {
           }
         }));
       });
-      return g = f, f.finally(() => {
-        g === f && (g = void 0), P === C && (P = void 0);
-      }), f;
-    }, B = () => {
-      F();
+      return g = m, m.finally(() => {
+        g === m && (g = void 0), p === v && (p = void 0);
+      }), m;
     }, G = () => {
-      p && (clearInterval(p), p = void 0), typeof window < "u" && window.removeEventListener("focus", B), P == null || P.abort(), P = void 0, g = void 0, I++, O((h) => ({
+      F();
+    }, B = () => {
+      y && (clearInterval(y), y = void 0), typeof window < "u" && window.removeEventListener("focus", G), p == null || p.abort(), p = void 0, g = void 0, S++, P((h) => ({
         orders: { ...h.orders, isFetching: !1 }
       }));
     }, K = () => {
-      !s || !a || p || (F(!0), p = setInterval(() => {
+      !s || !c || y || (F(!0), y = setInterval(() => {
         F();
-      }, ht), typeof window < "u" && window.addEventListener("focus", B));
+      }, ht), typeof window < "u" && window.addEventListener("focus", G));
     };
     return {
       client: Pe,
       orders: pe,
       state: pt(e),
-      configureClient: (h, l) => {
+      configureClient: (h, I) => {
         if (n === h) {
-          r = l;
+          r = I;
           return;
         }
-        n = h, r = l, i++, o = void 0, O({
+        n = h, r = I, i++, o = void 0, P({
           client: h ? { key: h, isFetching: !1 } : Pe
-        }), h && l && V();
+        }), h && I && Q();
       },
-      refetchClient: V,
-      configureOrders: (h, l, S) => {
-        if (c = S, s === h) {
-          a = l;
+      refetchClient: Q,
+      configureOrders: (h, I, O) => {
+        if (a = O, s === h) {
+          c = I;
           return;
         }
-        G(), s = h, a = l, E = !1, m.clear(), O({
+        B(), s = h, c = I, E = !1, l.clear(), P({
           orders: h ? { key: h, isFetching: !1 } : pe
         }), u > 0 && K();
       },
       registerOrdersConsumer: () => (u++, u === 1 && K(), () => {
-        u = Math.max(0, u - 1), u === 0 && G();
+        u = Math.max(0, u - 1), u === 0 && B();
       }),
       refetchOrders: F,
       addOrder: (h) => {
-        O((l) => {
-          const S = l.orders.data;
-          return S != null && S.some(
-            (N) => N.historyKey === h.historyKey
-          ) ? l : {
+        P((I) => {
+          const O = I.orders.data;
+          return O != null && O.some(
+            (L) => L.historyKey === h.historyKey
+          ) ? I : {
             orders: {
-              ...l.orders,
-              data: [h, ...S ?? []]
+              ...I.orders,
+              data: [h, ...O ?? []]
             }
           };
         });
       },
-      updateOrder: (h, l) => {
-        const S = T().orders.data ?? [], N = S.some((y) => y.historyKey === h.historyKey);
-        j(N ? S.map((y) => y.historyKey === h.historyKey ? h : y) : [h, ...S], c ?? l, T().orders.isFetching, h);
+      updateOrder: (h, I) => {
+        const O = T().orders.data ?? [], L = O.some((f) => f.historyKey === h.historyKey);
+        j(L ? O.map((f) => f.historyKey === h.historyKey ? h : f) : [h, ...O], a ?? I, T().orders.isFetching, h);
       },
-      setCancelOrder: (h, l) => {
-        O((S) => ({
+      setCancelOrder: (h, I) => {
+        P((O) => ({
           state: {
-            ...S.state,
-            cancelOrders: { ...S.state.cancelOrders, [h]: l }
+            ...O.state,
+            cancelOrders: { ...O.state.cancelOrders, [h]: I }
           }
         }));
       },
       clearCancelOrder: (h) => {
-        O((l) => {
-          if (!(h in l.state.cancelOrders)) return l;
-          const S = { ...l.state.cancelOrders };
-          return delete S[h], { state: { ...l.state, cancelOrders: S } };
+        P((I) => {
+          if (!(h in I.state.cancelOrders)) return I;
+          const O = { ...I.state.cancelOrders };
+          return delete O[h], { state: { ...I.state, cancelOrders: O } };
         });
       },
-      updateState: (h) => O((l) => ({ state: { ...l.state, ...h } })),
+      updateState: (h) => P((I) => ({ state: { ...I.state, ...h } })),
       beginExecution: (h) => {
-        let l;
-        return O((S) => Le(S.state.currentExecution.phase) ? (l = {
+        let I;
+        return P((O) => Ne(O.state.currentExecution.phase) ? (I = {
           ...h,
           executionId: ++t,
           phase: d.PREPARING
         }, {
           state: {
-            ...S.state,
-            currentExecution: l
+            ...O.state,
+            currentExecution: I
           }
-        }) : S), l;
+        }) : O), I;
       },
-      replaceExecution: (h, l) => {
-        let S = !1;
-        return O((N) => {
-          const y = N.state.currentExecution;
-          return y.executionId !== h || l.executionId !== h || !ut(y.phase, l.phase) ? N : (S = !0, {
-            state: { ...N.state, currentExecution: l }
+      replaceExecution: (h, I) => {
+        let O = !1;
+        return P((L) => {
+          const f = L.state.currentExecution;
+          return f.executionId !== h || I.executionId !== h || !ut(f.phase, I.phase) ? L : (O = !0, {
+            state: { ...L.state, currentExecution: I }
           });
-        }), S;
+        }), O;
       },
       returnToOrderForm: (h) => {
-        const l = T().state.currentExecution;
-        return l.executionId !== h || Z(l.phase) || l.phase === d.SUCCESS ? !1 : (O((S) => ({
+        const I = T().state.currentExecution;
+        return I.executionId !== h || Z(I.phase) || I.phase === d.SUCCESS ? !1 : (P((O) => ({
           state: {
-            ...S.state,
-            currentExecution: re(l.completedWrap)
+            ...O.state,
+            currentExecution: re(I.completedWrap)
           }
         })), !0);
       },
-      syncFormDefaults: (h) => Z(T().state.currentExecution.phase) ? !1 : (O((l) => ({
+      syncFormDefaults: (h) => Z(T().state.currentExecution.phase) ? !1 : (P((I) => ({
         state: {
-          ...l.state,
-          ...ce(h),
+          ...I.state,
+          ...ae(h),
           currentExecution: re()
         }
       })), !0),
-      startNewOrder: (h, l) => {
-        const { state: S } = T();
-        return S.currentExecution.executionId !== l || Z(S.currentExecution.phase) ? !1 : (O((N) => ({
+      startNewOrder: (h, I) => {
+        const { state: O } = T();
+        return O.currentExecution.executionId !== I || Z(O.currentExecution.phase) ? !1 : (P((L) => ({
           state: {
-            ...N.state,
-            ...ce(h),
-            isMarketOrder: S.isMarketOrder,
+            ...L.state,
+            ...ae(h),
+            isMarketOrder: O.isMarketOrder,
             currentExecution: re()
           }
         })), !0);
@@ -470,7 +470,7 @@ const me = (e) => {
   var n;
   const t = (n = e.overrides) == null ? void 0 : n.state;
   return {
-    isMarketOrder: e.module === Q.LIMIT || e.module === Q.SWAP ? !1 : t == null ? void 0 : t.isMarketOrder,
+    isMarketOrder: e.module === V.LIMIT || e.module === V.SWAP ? !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,
@@ -490,31 +490,31 @@ const me = (e) => {
   if (e === null)
     throw new Error("useSpotStore must be used within SpotProvider");
   return e;
-}, A = (e) => {
+}, C = (e) => {
   const t = b();
   return nt(t, e);
-}, Ct = { isFetching: !1 }, At = () => {
-  const { partner: e, chainId: t, hasChainId: n } = x(), r = b(), i = !!(t && n), o = i ? `${e}:${t}` : void 0, s = v(() => t ? We(e, t) : Promise.reject(
+}, At = { isFetching: !1 }, Ct = () => {
+  const { partner: e, chainId: t, hasChainId: n } = x(), r = b(), i = !!(t && n), o = i ? `${e}:${t}` : void 0, s = A(() => t ? We(e, t) : Promise.reject(
     new Error("Spot is unavailable on the connected chain")
   ), [t, e]);
   Y(() => {
     r.getState().configureClient(o, i ? s : void 0);
   }, [i, o, s, r]);
 }, J = () => {
-  const { partner: e, chainId: t, hasChainId: n } = x(), r = b(), i = A((m) => m.client), o = !!(t && n), s = o ? `${e}:${t}` : void 0, a = i.key === s ? i : Ct, c = v(() => {
+  const { partner: e, chainId: t, hasChainId: n } = x(), r = b(), i = C((l) => l.client), o = !!(t && n), s = o ? `${e}:${t}` : void 0, c = i.key === s ? i : At, a = A(() => {
     if (!o || !s) return Promise.resolve(void 0);
-    const m = r.getState();
-    return m.client.key !== s ? Promise.resolve(void 0) : m.refetchClient();
+    const l = r.getState();
+    return l.client.key !== s ? Promise.resolve(void 0) : l.refetchClient();
   }, [o, s, r]);
   return R(
     () => ({
-      data: a.data,
-      error: a.error,
-      isLoading: o && !a.data && a.error === void 0,
-      isFetching: a.isFetching,
-      refetch: c
+      data: c.data,
+      error: c.error,
+      isLoading: o && !c.data && c.error === void 0,
+      isFetching: c.isFetching,
+      refetch: a
     }),
-    [a, o, c]
+    [c, o, a]
   );
 }, Tt = { isFetching: !1 }, fe = (e, t, n) => e && t ? JSON.stringify([
   e,
@@ -523,48 +523,48 @@ const me = (e) => {
   t.chainId,
   n
 ]) : void 0, Rt = () => {
-  const { account: e, supportLegacyOrders: t, callbacks: n } = x(), { data: r } = J(), i = b(), o = fe(e, r, t), s = !!o, a = v(
-    async (c, m, E) => !e || !r ? { orders: [], legacyLoaded: !1 } : Pt({
+  const { account: e, supportLegacyOrders: t, callbacks: n } = x(), { data: r } = J(), i = b(), o = fe(e, r, t), s = !!o, c = A(
+    async (a, l, E) => !e || !r ? { orders: [], legacyLoaded: !1 } : Pt({
       client: r,
       account: e,
       signal: E,
       supportLegacyOrders: t,
-      previousOrders: c,
-      legacyLoaded: m
+      previousOrders: a,
+      legacyLoaded: l
     }),
     [e, r, t]
   );
   Y(() => {
-    i.getState().configureOrders(o, s ? a : void 0, n);
-  }, [n, s, o, a, i]);
+    i.getState().configureOrders(o, s ? c : void 0, n);
+  }, [n, s, o, c, i]);
 }, De = () => {
-  const { account: e, supportLegacyOrders: t } = x(), { data: n } = J(), r = b(), i = fe(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]);
+  const { account: e, supportLegacyOrders: t } = x(), { data: n } = J(), r = b(), i = fe(e, n, t), o = !!i, s = A((c = !1) => !o || !i || r.getState().orders.key !== i ? Promise.resolve(void 0) : r.getState().refetchOrders(!0, c), [o, i, r]);
   return { enabled: o, key: i, refetch: s };
-}, Nt = () => {
+}, Lt = () => {
   const e = b(), { account: t, supportLegacyOrders: n } = x(), { data: r } = J(), i = fe(t, r, n);
-  return v(
+  return A(
     (o) => {
       !i || e.getState().orders.key !== i || e.getState().addOrder(o);
     },
     [i, e]
   );
-}, Lt = () => {
+}, Nt = () => {
   const e = b();
-  return v(
+  return A(
     () => e.getState().refetchOrders(),
     [e]
   );
 }, or = () => {
-  const e = A((c) => c.orders), t = A(
-    (c) => c.registerOrdersConsumer
+  const e = C((a) => a.orders), t = C(
+    (a) => a.registerOrdersConsumer
   ), { enabled: n, key: r, refetch: i } = De(), o = e.key === r ? e : Tt;
   Y(() => t(), [t]);
   const s = R(
     () => o.data === void 0 ? void 0 : Se(o.data),
     [o.data]
-  ), a = v(async () => {
-    const c = await i();
-    return c === void 0 ? void 0 : Se(c);
+  ), c = A(async () => {
+    const a = await i();
+    return a === void 0 ? void 0 : Se(a);
   }, [i]);
   return R(
     () => ({
@@ -573,15 +573,15 @@ const me = (e) => {
       isLoading: n && s === void 0 && o.error === void 0,
       isFetching: o.isFetching,
       isRefetching: o.isFetching && s !== void 0,
-      refetch: a
+      refetch: c
     }),
-    [o, s, n, a]
+    [o, s, n, c]
   );
-}, xt = ({ children: e }) => (At(), Rt(), e), Ft = ({
+}, xt = ({ children: e }) => (Ct(), Rt(), e), Ft = ({
   error: e,
   retry: t,
   isRetrying: n
-}) => /* @__PURE__ */ ae("div", { className: "spot-client-error-fallback", role: "alert", children: [
+}) => /* @__PURE__ */ ce("div", { className: "spot-client-error-fallback", role: "alert", children: [
   /* @__PURE__ */ D("p", { children: e.message || "Unable to load Spot configuration." }),
   /* @__PURE__ */ D(
     "button",
@@ -597,30 +597,30 @@ const me = (e) => {
   children: e,
   fallback: t = Ft
 }) => {
-  const { hasChainId: n } = x(), { data: r, error: i, isFetching: o, refetch: s } = J(), a = v(async () => {
+  const { hasChainId: n } = x(), { data: r, error: i, isFetching: o, refetch: s } = J(), c = A(async () => {
     await s();
   }, [s]);
-  return /* @__PURE__ */ ae(et, { children: [
+  return /* @__PURE__ */ ce(et, { children: [
     e,
     !r && i && n ? /* @__PURE__ */ D(
       t,
       {
         error: i,
-        retry: a,
+        retry: c,
         isRetrying: o
       }
     ) : null
   ] });
 }, Dt = ({
   resetErrorBoundary: e
-}) => /* @__PURE__ */ ae("div", { className: "twap-error-fallback", role: "alert", children: [
+}) => /* @__PURE__ */ ce("div", { className: "twap-error-fallback", role: "alert", children: [
   /* @__PURE__ */ D("p", { children: "Something went wrong" }),
   /* @__PURE__ */ D("button", { type: "button", onClick: e, children: "Retry" })
 ] }), Mt = ({
   children: e,
   fallback: t = Dt
 }) => {
-  const n = b(), r = v((i) => {
+  const n = b(), r = A((i) => {
     var s;
     (((s = n.getState().client.data) == null ? void 0 : s.analytics) ?? je).onCrash(i);
   }, [n]);
@@ -660,7 +660,7 @@ const Bt = ({
   defaults: t,
   scopeKey: n
 }) => {
-  const r = b(), i = A(
+  const r = b(), i = C(
     (s) => s.state.currentExecution.phase
   ), o = le(n);
   return Y(() => {
@@ -673,110 +673,119 @@ const Bt = ({
     inputAmountUi: r,
     quotedOutputAmountRaw: i,
     minimumOutputAmountRaw: o,
-    inputTokenUsdPrice: s,
-    outputTokenUsdPrice: a,
-    minTradeSizeUsd: c,
-    inputBalanceRaw: m,
-    displayFeePercent: E,
-    priceProtectionPercent: u,
-    module: I
-  } = x(), g = A((l) => l.state.tradeCount), P = A((l) => l.state.tradeInterval), p = A((l) => l.state.orderDuration), O = A(
-    (l) => l.state.limitPriceUi
-  ), T = A(
-    (l) => l.state.triggerPriceUi
-  ), j = A(
-    (l) => l.state.limitPricePercent
-  ), V = A(
-    (l) => l.state.triggerPricePercent
-  ), F = A(
-    (l) => l.state.isPriceInverted
-  ), B = A((l) => l.state.isMarketOrder), G = A((l) => {
-    const S = l.state.currentExecution;
-    return S.phase !== d.IDLE ? S.form : void 0;
-  }), K = R(
+    inputAmountUsd: s,
+    quotedOutputAmountUsd: c,
+    minimumOutputAmountUsd: a,
+    inputTokenUsdPrice: l,
+    outputTokenUsdPrice: E,
+    minTradeSizeUsd: u,
+    inputBalanceRaw: S,
+    displayFeePercent: g,
+    priceProtectionPercent: p,
+    module: y
+  } = x(), P = C((f) => f.state.tradeCount), T = C((f) => f.state.tradeInterval), j = C((f) => f.state.orderDuration), Q = C(
+    (f) => f.state.limitPriceUi
+  ), F = C(
+    (f) => f.state.triggerPriceUi
+  ), G = C(
+    (f) => f.state.limitPricePercent
+  ), B = C(
+    (f) => f.state.triggerPricePercent
+  ), K = C(
+    (f) => f.state.isPriceInverted
+  ), h = C((f) => f.state.isMarketOrder), I = C((f) => {
+    const v = f.state.currentExecution;
+    return v.phase !== d.IDLE ? v.form : void 0;
+  }), O = R(
     () => ({
-      module: I,
+      module: y,
       inputTokenDecimals: (t == null ? void 0 : t.decimals) ?? 0,
       outputTokenDecimals: (n == null ? void 0 : n.decimals) ?? 0,
       quotedOutputAmountRaw: i,
       minimumOutputAmountRaw: o,
-      inputTokenUsdPrice: s,
-      outputTokenUsdPrice: a,
-      minTradeSizeUsd: c,
-      priceProtectionPercent: u,
-      displayFeePercent: E,
-      inputBalanceRaw: m,
+      inputAmountUsd: s,
+      quotedOutputAmountUsd: c,
+      minimumOutputAmountUsd: a,
+      inputTokenUsdPrice: l,
+      outputTokenUsdPrice: E,
+      minTradeSizeUsd: u,
+      priceProtectionPercent: p,
+      displayFeePercent: g,
+      inputBalanceRaw: S,
       userInput: {
         inputAmountUi: r,
-        isMarketOrder: !!B,
-        tradeCount: g,
-        tradeInterval: P,
-        orderDuration: p,
-        limitPriceUi: O,
-        limitPricePercent: j,
-        triggerPriceUi: T,
-        triggerPricePercent: V,
-        isPriceInverted: F
+        isMarketOrder: !!h,
+        tradeCount: P,
+        tradeInterval: T,
+        orderDuration: j,
+        limitPriceUi: Q,
+        limitPricePercent: G,
+        triggerPriceUi: F,
+        triggerPricePercent: B,
+        isPriceInverted: K
       }
     }),
     [
       o,
-      n == null ? void 0 : n.decimals,
+      s,
+      c,
       a,
+      n == null ? void 0 : n.decimals,
       E,
+      g,
       i,
-      c,
-      I,
       u,
-      m,
+      y,
+      p,
+      S,
       t == null ? void 0 : t.decimals,
-      s,
-      F,
+      l,
+      K,
+      h,
+      G,
       B,
-      j,
-      V,
-      g,
-      p,
       P,
-      O,
+      j,
+      T,
+      Q,
       r,
-      T
+      F
     ]
-  ), h = R(() => {
-    if (G) return G;
-    const l = Ve(K);
-    return t && n ? l : {
-      ...l,
+  ), L = R(() => {
+    if (I) return I;
+    const f = Qe(O);
+    return t && n ? f : {
+      ...f,
       isReady: !1,
       canSubmit: !1
     };
-  }, [G, t, n, K]);
-  return /* @__PURE__ */ D(Me.Provider, { value: h, children: e });
+  }, [I, t, n, O]);
+  return /* @__PURE__ */ D(Me.Provider, { value: L, children: e });
 }, W = () => {
   const e = ue(Me);
   if (!e)
     throw new Error("useOrderForm must be used within OrderFormProvider");
   return e;
 }, _t = (e) => {
-  var E, u, I, g, P, p, O, T, j, V, F, B;
-  const t = Number.isSafeInteger(e.chainId) && Number(e.chainId) > 0, n = (E = e.wrappedNativeToken) == null ? void 0 : E.address, r = !!(n && ($((u = e.inputToken) == null ? void 0 : u.address) && he(((I = e.outputToken) == null ? void 0 : I.address) || "", n) || he(((g = e.inputToken) == null ? void 0 : g.address) || "", n) && $((P = e.outputToken) == null ? void 0 : P.address))), i = r ? k(e.inputAmountUi, (p = e.outputToken) == null ? void 0 : p.decimals) : e.marketQuote.isLoading ? void 0 : e.marketQuote.quotedOutputAmountRaw, o = r ? !1 : e.marketQuote.isLoading, s = r ? !1 : e.marketQuote.noLiquidity, a = R(
+  var E, u, S, g, p, y, P, T, j, Q, F, G;
+  const t = Number.isSafeInteger(e.chainId) && Number(e.chainId) > 0, n = (E = e.wrappedNativeToken) == null ? void 0 : E.address, r = !!(n && ($((u = e.inputToken) == null ? void 0 : u.address) && he(((S = e.outputToken) == null ? void 0 : S.address) || "", n) || he(((g = e.inputToken) == null ? void 0 : g.address) || "", n) && $((p = e.outputToken) == null ? void 0 : p.address))), i = r ? k(e.inputAmountUi, (y = e.outputToken) == null ? void 0 : y.decimals) : e.marketQuote.isLoading ? void 0 : e.marketQuote.quotedOutputAmountRaw, o = r ? !1 : e.marketQuote.isLoading, s = r ? !1 : e.marketQuote.noLiquidity, c = R(
     () => Fe({
       module: e.module,
       overrides: e.overrides
     }),
     [e.module, e.overrides]
-  ), c = JSON.stringify([
+  ), a = JSON.stringify([
     e.partner,
     e.chainId,
     e.module,
-    (O = e.inputToken) == null ? void 0 : O.address,
+    (P = e.inputToken) == null ? void 0 : P.address,
     (T = e.inputToken) == null ? void 0 : T.decimals,
     (j = e.outputToken) == null ? void 0 : j.address,
-    (V = e.outputToken) == null ? void 0 : V.decimals,
+    (Q = e.outputToken) == null ? void 0 : Q.decimals,
     (F = e.wrappedNativeToken) == null ? void 0 : F.address,
-    (B = e.wrappedNativeToken) == null ? void 0 : B.decimals,
-    a
-  ]), m = R(
+    (G = e.wrappedNativeToken) == null ? void 0 : G.decimals,
+    c
+  ]), l = R(
     () => ({
       inputAmountUi: e.inputAmountUi,
       minTradeSizeUsd: e.minTradeSizeUsd,
@@ -784,6 +793,9 @@ const Bt = ({
       walletInteractions: e.walletInteractions,
       quotedOutputAmountRaw: i,
       minimumOutputAmountRaw: e.marketQuote.isLoading ? void 0 : e.marketQuote.minimumOutputAmountRaw,
+      inputAmountUsd: e.marketQuote.isLoading ? void 0 : e.marketQuote.inputAmountUsd,
+      quotedOutputAmountUsd: e.marketQuote.isLoading ? void 0 : e.marketQuote.quotedOutputAmountUsd,
+      minimumOutputAmountUsd: e.marketQuote.isLoading ? void 0 : e.marketQuote.minimumOutputAmountUsd,
       marketPriceLoading: o,
       noLiquidity: s,
       priceProtectionPercent: e.priceProtectionPercent,
@@ -805,6 +817,9 @@ const Bt = ({
     [
       e.marketQuote.isLoading,
       e.marketQuote.minimumOutputAmountRaw,
+      e.marketQuote.inputAmountUsd,
+      e.marketQuote.quotedOutputAmountUsd,
+      e.marketQuote.minimumOutputAmountUsd,
       e.account,
       e.callbacks,
       e.chainId,
@@ -829,10 +844,10 @@ const Bt = ({
       i
     ]
   );
-  return { initialState: a, formScopeKey: c, trading: m };
+  return { initialState: c, formScopeKey: a, trading: l };
 }, sr = (e) => {
   const { initialState: t, formScopeKey: n, trading: r } = _t(e);
-  return /* @__PURE__ */ D(ct, { value: r, children: /* @__PURE__ */ D(vt, { initialState: t, children: /* @__PURE__ */ D(Mt, { fallback: e.errorFallback, children: /* @__PURE__ */ D(xt, { children: /* @__PURE__ */ D(
+  return /* @__PURE__ */ D(at, { value: r, children: /* @__PURE__ */ D(vt, { initialState: t, children: /* @__PURE__ */ D(Mt, { fallback: e.errorFallback, children: /* @__PURE__ */ D(xt, { children: /* @__PURE__ */ D(
     Bt,
     {
       defaults: t,
@@ -840,11 +855,11 @@ const Bt = ({
       children: /* @__PURE__ */ D(Ut, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ D(Kt, { children: e.children }) })
     }
   ) }) }) }) });
-}, cr = (e, t) => R(() => ne(t, e), [e, t]), Ht = 60, qt = () => {
+}, ar = (e, t) => R(() => ne(t, e), [e, t]), qt = 60, Ht = () => {
   const { refetch: e } = De();
-  return v(
+  return A(
     async (t, n = !1) => {
-      for (let r = 0; r < Ht; r++) {
+      for (let r = 0; r < qt; r++) {
         const i = await e(n);
         if (!i)
           throw new Error("orders not found");
@@ -864,96 +879,96 @@ const Bt = ({
 }, bt = (e) => ({
   ...e,
   status: M.Cancelled
-}), ar = (e) => {
-  const { account: t, walletInteractions: n, callbacks: r } = x(), { data: i } = J(), o = qt(), s = A((u) => u.state.cancelOrders[(e == null ? void 0 : e.historyKey) ?? ""]), a = A((u) => u.setCancelOrder), c = A((u) => u.clearCancelOrder), m = v(async () => {
+}), cr = (e) => {
+  const { account: t, walletInteractions: n, callbacks: r } = x(), { data: i } = J(), o = Ht(), s = C((u) => u.state.cancelOrders[(e == null ? void 0 : e.historyKey) ?? ""]), c = C((u) => u.setCancelOrder), a = C((u) => u.clearCancelOrder), l = A(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 (!i) throw new Error("Spot client is unavailable");
-      const I = e.historyKey;
-      a(I, { status: q.LOADING }), w(() => {
-        var O;
-        return (O = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : O.call(r, e);
+      const S = e.historyKey;
+      c(S, { status: H.LOADING }), w(() => {
+        var P;
+        return (P = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : P.call(r, e);
       }), w(
         () => i.analytics.onCancelOrderRequest(
           [e.version === 1 ? e.id.toString() : e.hash],
           e.version
         )
       );
-      const g = i.getCancelOrderRequest(e), P = await n.cancelOrder(g);
-      if (!P) throw new Error("failed to cancel order");
-      w(() => i.analytics.onCancelOrderSuccess(P)), a(I, {
-        status: q.LOADING,
-        txHash: P
-      }), await o(I, e.version === 1);
-      const p = bt(e);
-      return a(I, {
-        status: q.SUCCESS,
-        txHash: P
+      const g = i.getCancelOrderRequest(e), p = await n.cancelOrder(g);
+      if (!p) throw new Error("failed to cancel order");
+      w(() => i.analytics.onCancelOrderSuccess(p)), c(S, {
+        status: H.LOADING,
+        txHash: p
+      }), await o(S, e.version === 1);
+      const y = bt(e);
+      return c(S, {
+        status: H.SUCCESS,
+        txHash: p
       }), w(
         () => {
-          var O;
-          return (O = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : O.call(r, {
-            order: p,
-            txHash: P
+          var P;
+          return (P = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : P.call(r, {
+            order: y,
+            txHash: p
           });
         }
-      ), P;
-    } catch (I) {
-      Ce(I) ? u && c(u) : (u && a(u, {
-        status: q.FAILED,
-        error: me(I)
-      }), w(() => i == null ? void 0 : i.analytics.onCancelOrderError(I))), w(() => {
+      ), p;
+    } catch (S) {
+      Ae(S) ? u && a(u) : (u && c(u, {
+        status: H.FAILED,
+        error: me(S)
+      }), w(() => i == null ? void 0 : i.analytics.onCancelOrderError(S))), w(() => {
         var g;
-        return (g = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : g.call(r, X(I));
+        return (g = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : g.call(r, X(S));
       });
     }
   }, [
     t,
     r,
-    c,
+    a,
     i,
     e,
     o,
-    a,
+    c,
     n
   ]), E = R(() => {
     const u = s;
     return {
-      isLoading: (u == null ? void 0 : u.status) === q.LOADING,
+      isLoading: (u == null ? void 0 : u.status) === H.LOADING,
       disabled: !!(e && !i),
-      isSuccess: (u == null ? void 0 : u.status) === q.SUCCESS,
-      isError: (u == null ? void 0 : u.status) === q.FAILED,
+      isSuccess: (u == null ? void 0 : u.status) === H.SUCCESS,
+      isError: (u == null ? void 0 : u.status) === H.FAILED,
       error: u == null ? void 0 : u.error,
       txHash: u == null ? void 0 : u.txHash
     };
   }, [s, e, i]);
-  return R(() => ({ cancelOrder: m, ...E }), [m, E]);
+  return R(() => ({ cancelOrder: l, ...E }), [l, E]);
 }, dr = () => {
   const { module: e, values: t } = W();
-  if (t.isMarketOrder && e === Q.STOP_LOSS)
+  if (t.isMarketOrder && e === V.STOP_LOSS)
     return ee.TRIGGER_MARKET_PRICE;
-  if (e === Q.LIMIT || e === Q.TWAP)
+  if (e === V.LIMIT || e === V.TWAP)
     return t.isMarketOrder ? ee.MARKET_PRICE : ee.LIMIT_PRICE;
 }, ur = () => {
-  const { callbacks: e } = x(), t = A((a) => a.updateState), { schedule: n } = W(), { duration: r } = n, i = v(
-    (a) => {
-      t({ orderDuration: a }), w(() => {
-        var c;
-        return (c = e == null ? void 0 : e.onOrderDurationChange) == null ? void 0 : c.call(e, a);
+  const { callbacks: e } = x(), t = C((c) => c.updateState), { schedule: n } = W(), { duration: r } = n, i = A(
+    (c) => {
+      t({ orderDuration: c }), w(() => {
+        var a;
+        return (a = e == null ? void 0 : e.onOrderDurationChange) == null ? void 0 : a.call(e, c);
       });
     },
     [e, t]
-  ), o = v(
-    (a) => {
-      const c = Number(a);
-      Number.isFinite(c) && i({ unit: r.unit, value: c });
+  ), o = A(
+    (c) => {
+      const a = Number(c);
+      Number.isFinite(a) && i({ unit: r.unit, value: a });
     },
     [r.unit, i]
-  ), s = v(
-    (a) => {
-      i({ unit: a, value: r.value });
+  ), s = A(
+    (c) => {
+      i({ unit: c, value: r.value });
     },
     [r.value, i]
   );
@@ -969,22 +984,22 @@ const Bt = ({
     [r, i, o, s, n]
   );
 }, lr = () => {
-  const { callbacks: e } = x(), t = A((a) => a.updateState), { schedule: n } = W(), { fillDelay: r } = n, i = v(
-    (a) => {
-      t({ tradeInterval: a }), w(() => {
-        var c;
-        return (c = e == null ? void 0 : e.onTradeIntervalChange) == null ? void 0 : c.call(e, a);
+  const { callbacks: e } = x(), t = C((c) => c.updateState), { schedule: n } = W(), { fillDelay: r } = n, i = A(
+    (c) => {
+      t({ tradeInterval: c }), w(() => {
+        var a;
+        return (a = e == null ? void 0 : e.onTradeIntervalChange) == null ? void 0 : a.call(e, c);
       });
     },
     [e, t]
-  ), o = v(
-    (a) => {
-      const c = Number(a);
-      Number.isFinite(c) && i({ unit: r.unit, value: c });
+  ), o = A(
+    (c) => {
+      const a = Number(c);
+      Number.isFinite(a) && i({ unit: r.unit, value: a });
     },
     [r.unit, i]
-  ), s = v(
-    (a) => i({ unit: a, value: r.value }),
+  ), s = A(
+    (c) => i({ unit: c, value: r.value }),
     [r.value, i]
   );
   return R(
@@ -998,18 +1013,18 @@ const Bt = ({
     }),
     [r, i, o, s, n]
   );
-}, H = (e, t) => ({
+}, q = (e, t) => ({
   raw: e || "",
   ui: ne(e, t)
 }), Wt = (e, t, n) => R(() => !e || !t || !n ? [] : e.map((r) => ({
   rawFill: r,
   inputToken: t,
   outputToken: n,
-  inputAmount: H(r.inAmount, t.decimals),
-  outputAmount: H(r.outAmount, n.decimals),
+  inputAmount: q(r.inAmount, t.decimals),
+  outputAmount: q(r.outAmount, n.decimals),
   timestamp: r.timestamp,
   txHash: r.txHash,
-  executionRate: Ae(
+  executionRate: Ce(
     r.inAmount,
     r.outAmount,
     t.decimals,
@@ -1018,7 +1033,7 @@ const Bt = ({
 })), [e, t, n]), mr = (e, t, n) => {
   const { chainId: r, partner: i } = x(), o = R(() => {
     if (!(!t || !n || !e || e.isMarketPrice))
-      return Qe(
+      return Ve(
         e,
         t.decimals,
         n.decimals
@@ -1030,144 +1045,144 @@ const Bt = ({
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), a = R(() => {
+  }, [t, e, n]), c = R(() => {
     if (!(!t || !n || !e))
-      return Ae(
+      return Ce(
         e.srcAmountFilled,
         e.dstAmountFilled,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), c = R(() => e ? ze(
+  }, [t, e, n]), a = R(() => e ? ze(
     e,
     r ? $e(i, r) : void 0
-  ) : 0, [e, i, r]), m = Wt(e == null ? void 0 : e.fills, t, n);
+  ) : 0, [e, i, r]), l = Wt(e == null ? void 0 : e.fills, t, n);
   return R(() => {
     if (e != null && e.id)
       return {
         original: e,
-        fills: m,
+        fills: l,
         inputToken: t,
         outputToken: n,
         orderType: e.type,
         createdAt: e.createdAt,
         deadline: e.deadline || 0,
         totalTrades: e.totalTradesAmount || 0,
-        tradeInterval: c,
+        tradeInterval: a,
         recipient: e.maker || "",
-        inputAmount: H(e.srcAmount, t == null ? void 0 : t.decimals),
-        limitPrice: H(
+        inputAmount: q(e.srcAmount, t == null ? void 0 : t.decimals),
+        limitPrice: q(
           k(o, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
-        inputAmountPerTrade: H(
+        inputAmountPerTrade: q(
           e.srcAmountPerTrade,
           t == null ? void 0 : t.decimals
         ),
-        minOutputAmountPerTrade: H(
+        minOutputAmountPerTrade: q(
           e.dstMinAmountPerTrade,
           n == null ? void 0 : n.decimals
         ),
-        minOutputAmount: H(
+        minOutputAmount: q(
           e.dstMinAmountTotal,
           n == null ? void 0 : n.decimals
         ),
-        triggerPrice: H(
+        triggerPrice: q(
           k(s, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         id: e.id,
-        inputAmountFilled: H(
+        inputAmountFilled: q(
           e.srcAmountFilled,
           t == null ? void 0 : t.decimals
         ),
-        outputAmountFilled: H(
+        outputAmountFilled: q(
           e.dstAmountFilled,
           n == null ? void 0 : n.decimals
         ),
         progress: e.progress,
-        executionPrice: H(
-          k(a, n == null ? void 0 : n.decimals),
+        executionPrice: q(
+          k(c, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         version: e.version
       };
   }, [
     e,
-    m,
+    l,
     t,
     n,
-    c,
+    a,
     o,
     s,
-    a
+    c
   ]);
 }, fr = () => {
   const { marketPriceLoading: e } = x(), t = W().errors.primary;
   return e ? void 0 : t;
 }, gr = () => {
-  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { limitPrice: i, values: o, module: s, isInverted: a } = W(), c = A((P) => P.updateState), m = v(
-    (P) => {
-      c({ limitPriceUi: P, limitPricePercent: null }), w(() => {
-        var p;
-        return (p = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : p.call(r, P || "");
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { limitPrice: i, values: o, module: s, isInverted: c } = W(), a = C((p) => p.updateState), l = A(
+    (p) => {
+      a({ limitPriceUi: p, limitPricePercent: null }), w(() => {
+        var y;
+        return (y = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : y.call(r, p || "");
       }), w(() => {
-        var p;
-        return (p = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : p.call(r, "");
+        var y;
+        return (y = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : y.call(r, "");
       });
     },
-    [r, c]
-  ), E = v(
-    (P) => {
-      c({
+    [r, a]
+  ), E = A(
+    (p) => {
+      a({
         limitPriceUi: void 0,
-        limitPricePercent: P
+        limitPricePercent: p
       }), w(() => {
-        var p;
-        return (p = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : p.call(r, "");
+        var y;
+        return (y = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : y.call(r, "");
       }), w(() => {
-        var p;
-        return (p = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : p.call(r, P || "");
+        var y;
+        return (y = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : y.call(r, p || "");
       });
     },
-    [r, c]
-  ), u = v(() => {
-    c({
+    [r, a]
+  ), u = A(() => {
+    a({
       limitPriceUi: void 0,
       limitPricePercent: void 0
     });
-  }, [c]), I = !o.isMarketOrder, g = v(() => {
-    c({
+  }, [a]), S = !o.isMarketOrder, g = A(() => {
+    a({
       isMarketOrder: !o.isMarketOrder,
       ...o.isMarketOrder ? {} : { isPriceInverted: !1 },
-      ...!o.isMarketOrder && s === Q.STOP_LOSS ? { limitPricePercent: void 0 } : {}
+      ...!o.isMarketOrder && s === V.STOP_LOSS ? { limitPricePercent: void 0 } : {}
     });
-  }, [s, c, o.isMarketOrder]);
+  }, [s, a, o.isMarketOrder]);
   return R(
     () => ({
       price: i.display,
       canonicalPriceRaw: i.raw,
       error: i.error,
-      onInputChange: m,
+      onInputChange: l,
       onPercentageChange: E,
       onReset: u,
       inputToken: t,
       outputToken: n,
-      displayInputToken: a ? n : t,
-      displayOutputToken: a ? t : n,
+      displayInputToken: c ? n : t,
+      displayOutputToken: c ? t : n,
       percentage: i.percentage,
       isLoading: !!e,
-      isEnabled: I,
+      isEnabled: S,
       toggle: g,
       isTypedValue: i.isTypedValue
     }),
     [
       t,
-      a,
-      I,
+      c,
+      S,
       i,
       e,
-      m,
+      l,
       E,
       u,
       n,
@@ -1184,7 +1199,7 @@ const Bt = ({
     [e, t]
   );
 }, Er = () => {
-  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(() => {
+  const { inputToken: e, outputToken: t } = x(), n = C((a) => a.updateState), { isInverted: r, values: i } = W(), o = C((a) => a.state.triggerPriceUi), s = C((a) => a.state.limitPriceUi), c = A(() => {
     n({
       isPriceInverted: !r,
       ...o !== void 0 ? { triggerPriceUi: Ee(o) } : {},
@@ -1193,7 +1208,7 @@ const Bt = ({
   }, [n, r, o, s]);
   return R(
     () => ({
-      onInvert: a,
+      onInvert: c,
       isInverted: r,
       inputToken: e,
       outputToken: t,
@@ -1201,7 +1216,7 @@ const Bt = ({
       displayOutputToken: r ? e : t,
       isMarketOrder: i.isMarketOrder
     }),
-    [e, r, a, t, i.isMarketOrder]
+    [e, r, c, t, i.isMarketOrder]
   );
 }, Ge = (e, t, n) => {
   if (!e || typeof t.maker != "string" || !n || !t.rawOrder || !("order" in t.rawOrder)) return !1;
@@ -1221,19 +1236,19 @@ const Bt = ({
     (i.aborted || e.getState().state.currentExecution.executionId !== r) && o.abort();
   };
   i.addEventListener("abort", s, { once: !0 });
-  const a = e.subscribe(s);
+  const c = e.subscribe(s);
   s();
   try {
-    let c = n;
+    let a = n;
     o.signal.aborted || w(() => Be(e, n));
-    for await (const m of Ye({ order: n, signal: o.signal }))
+    for await (const l of Ye({ order: n, signal: o.signal }))
       o.signal.aborted || (w(() => {
         const E = e.getState();
-        Ge(E.orders.key, n, E.state.currentExecution.partner) && E.updateOrder(m, t);
-      }), c = m);
-    return c;
+        Ge(E.orders.key, n, E.state.currentExecution.partner) && E.updateOrder(l, t);
+      }), a = l);
+    return a;
   } finally {
-    a(), i.removeEventListener("abort", s), o.abort();
+    c(), i.removeEventListener("abort", s), o.abort();
   }
 }, jt = (e) => new Promise((t) => setTimeout(t, e)), _e = (e, t) => {
   if (!/^\d+$/.test(e))
@@ -1241,7 +1256,7 @@ const Bt = ({
       `${t} must be a non-negative integer base-unit amount`
     );
   return BigInt(e);
-}, Vt = (e) => {
+}, Qt = (e) => {
   if (!e.client) throw new Error("Spot client is unavailable");
   if (!e.chainId || !Number.isSafeInteger(e.chainId) || e.chainId <= 0)
     throw new Error("Spot is unavailable on the connected chain");
@@ -1253,7 +1268,7 @@ const Bt = ({
     throw new Error("missing wrappedNativeToken for native input");
   if (!e.form.canSubmit)
     throw new Error("Order form is not submittable");
-  if (e.form.module === Q.SWAP && !e.waitForOrderFill)
+  if (e.form.module === V.SWAP && !e.waitForOrderFill)
     throw new Error("Swap settlement tracking is unavailable");
   const n = e.form.inputAmount.raw;
   return _e(n, "Input amount"), {
@@ -1265,7 +1280,7 @@ const Bt = ({
     client: e.client,
     inputAmountRaw: n
   };
-}, Qt = ({
+}, Vt = ({
   analytics: e,
   account: t,
   chainId: n,
@@ -1273,7 +1288,7 @@ const Bt = ({
   outputToken: i,
   preparedOrder: o
 }) => {
-  const { form: s, values: a } = o;
+  const { form: s, values: c } = o;
   w(
     () => e.onRequestOrder({
       account: t,
@@ -1281,19 +1296,19 @@ const Bt = ({
       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,
+      fromTokenAmount: c.inputAmount,
+      srcChunkAmount: c.inputAmountPerTrade,
+      triggerPricePerTrade: c.triggerOutputAmountPerTrade,
+      deadline: c.deadlineMillis,
+      fillDelay: c.fillDelayMillis,
+      minDstAmountOutPerTrade: c.minOutputAmountPerTrade,
       slippage: s.values.slippageBps / 100,
-      isMarketOrder: a.isMarketOrder,
-      chunksAmount: a.totalTrades
+      isMarketOrder: c.isMarketOrder,
+      chunksAmount: c.totalTrades
     })
   );
 }, Jt = async (e) => {
-  var S, N;
+  var O, L;
   const {
     form: t,
     walletInteractions: n,
@@ -1301,167 +1316,167 @@ const Bt = ({
     addNewOrder: i,
     refetchActiveOrders: o,
     getCurrentExecution: s,
-    beginExecution: a,
-    replaceExecution: c,
-    wait: m = jt
+    beginExecution: c,
+    replaceExecution: a,
+    wait: l = jt
   } = e;
   let E;
   try {
-    E = Vt(e);
-  } catch (y) {
-    const C = X(y), f = te(y), L = a({
+    E = Qt(e);
+  } catch (f) {
+    const v = X(f), m = te(f), N = c({
       account: e.account,
-      partner: (S = e.client) == null ? void 0 : S.partner,
+      partner: (O = e.client) == null ? void 0 : O.partner,
       form: t,
       inputToken: e.inputToken,
       outputToken: e.outputToken,
       chainId: e.chainId
     });
-    throw L && c(L.executionId, {
-      ...L,
+    throw N && a(N.executionId, {
+      ...N,
       phase: d.FAILED,
-      error: C,
-      parsedError: f
+      error: v,
+      parsedError: m
     }), w(
       () => {
         var _;
-        return (_ = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : _.call(r, f);
+        return (_ = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : _.call(r, m);
       }
-    ), C;
+    ), v;
   }
   const {
     account: u,
-    chainId: I,
+    chainId: S,
     inputToken: g,
-    orderInputToken: P,
-    outputToken: p,
-    client: O,
+    orderInputToken: p,
+    outputToken: y,
+    client: P,
     inputAmountRaw: T
-  } = E, { analytics: j } = O, V = s(), F = ft({
-    execution: V,
+  } = E, { analytics: j } = P, Q = s(), F = ft({
+    execution: Q,
     account: u,
-    chainId: I,
+    chainId: S,
     inputTokenAddress: g.address,
     inputAmountRaw: T
-  }), B = a({
+  }), G = c({
     account: u,
-    partner: O.partner,
+    partner: P.partner,
     form: t,
     inputToken: g,
-    outputToken: p,
-    chainId: I,
+    outputToken: y,
+    chainId: S,
     completedWrap: F,
     wrapTxHash: F == null ? void 0 : F.txHash
   });
-  if (!B) return;
-  const G = B.executionId;
-  let K = B;
-  const h = (y, C = {}) => {
-    const f = {
+  if (!G) return;
+  const B = G.executionId;
+  let K = G;
+  const h = (f, v = {}) => {
+    const m = {
       ...K,
-      ...C,
-      executionId: G,
-      phase: y
+      ...v,
+      executionId: B,
+      phase: f
     };
-    if (!c(G, f))
+    if (!a(B, m))
       throw new Error("Execution is no longer current");
-    K = f;
-  }, l = (y, C = {}) => {
-    const f = {
+    K = m;
+  }, I = (f, v = {}) => {
+    const m = {
       ...K,
-      ...C,
-      executionId: G,
-      phase: y
+      ...v,
+      executionId: B,
+      phase: f
     };
-    return c(G, f) ? (K = f, !0) : !1;
+    return a(B, m) ? (K = m, !0) : !1;
   };
   try {
-    const { order: y } = await Xe({
-      client: O,
+    const { order: f } = await Xe({
+      client: P,
       account: u,
-      inputTokenAddress: P.address,
+      inputTokenAddress: p.address,
       inputAmountRaw: T,
       nativeInput: $(g.address),
       completedWrapTxHash: F == null ? void 0 : F.txHash,
       walletInteractions: n,
-      wait: m,
+      wait: l,
       signal: e.signal,
       prepareOrder: async () => {
-        var f;
-        if (t.module === Q.SWAP) {
-          const L = await O.getQuote({
-            inToken: P.address,
-            outToken: p.address,
+        var m;
+        if (t.module === V.SWAP) {
+          const N = await P.getQuote({
+            inToken: p.address,
+            outToken: y.address,
             inAmount: T,
             user: u,
             slippage: 0,
             dexMinAmountOut: "-1",
             signal: e.signal
           });
-          if ((f = e.signal) == null || f.throwIfAborted(), BigInt(L.netAmountOut) < _e(t.values.minOutputAmountPerTrade, "Minimum output"))
+          if ((m = e.signal) == null || m.throwIfAborted(), BigInt(N.netAmountOut) < _e(t.values.minOutputAmountPerTrade, "Minimum output"))
             throw new ve("INVALID_QUOTE", "Swap price changed. Review a fresh quote before signing.");
         }
-        return O.prepareOrder({
+        return P.prepareOrder({
           form: t,
-          inputTokenAddress: P.address,
-          outputTokenAddress: p.address,
+          inputTokenAddress: p.address,
+          outputTokenAddress: y.address,
           swapperAddress: u
         });
       },
       validateContext: () => {
-        if (s().executionId !== G) throw new Error("Execution is no longer current");
+        if (s().executionId !== B) throw new Error("Execution is no longer current");
       },
-      onUpdate: (f) => {
-        const L = f.steps.map((U) => ({ wrap: z.WRAP, approve: z.APPROVE, create: z.CREATE })[U]), _ = f.phase;
+      onUpdate: (m) => {
+        const N = m.steps.map((U) => ({ wrap: z.WRAP, approve: z.APPROVE, create: z.CREATE })[U]), _ = m.phase;
         h(_, {
-          pendingSteps: L,
-          totalSteps: L.length,
-          stepIndex: f.stepIndex,
-          hasApproval: f.hasApproval,
-          wrapTxHash: f.wrapTxHash,
-          approveTxHash: f.approvalTxHash,
-          ...f.preparedOrder ? { preparedOrder: f.preparedOrder } : {},
-          ...f.phase === "wrapping" && f.event === "success" && f.wrapTxHash ? {
-            completedWrap: { account: u, chainId: I, inputTokenAddress: g.address, inputAmountRaw: T, txHash: f.wrapTxHash }
+          pendingSteps: N,
+          totalSteps: N.length,
+          stepIndex: m.stepIndex,
+          hasApproval: m.hasApproval,
+          wrapTxHash: m.wrapTxHash,
+          approveTxHash: m.approvalTxHash,
+          ...m.preparedOrder ? { preparedOrder: m.preparedOrder } : {},
+          ...m.phase === "wrapping" && m.event === "success" && m.wrapTxHash ? {
+            completedWrap: { account: u, chainId: S, inputTokenAddress: g.address, inputAmountRaw: T, txHash: m.wrapTxHash }
           } : {}
-        }), f.phase === "wrapping" && (f.event === "request" && w(r == null ? void 0 : r.onWrapRequest), f.event === "success" && f.wrapTxHash && w(() => {
+        }), m.phase === "wrapping" && (m.event === "request" && w(r == null ? void 0 : r.onWrapRequest), m.event === "success" && m.wrapTxHash && w(() => {
           var U;
-          return (U = r == null ? void 0 : r.onWrapSuccess) == null ? void 0 : U.call(r, { txHash: f.wrapTxHash, amount: ne(f.wrapAmountRaw ?? T, P.decimals) });
-        })), f.phase === "approving" && (f.event === "request" && w(r == null ? void 0 : r.onApproveRequest), f.event === "success" && f.approvalTxHash && w(() => {
+          return (U = r == null ? void 0 : r.onWrapSuccess) == null ? void 0 : U.call(r, { txHash: m.wrapTxHash, amount: ne(m.wrapAmountRaw ?? T, p.decimals) });
+        })), m.phase === "approving" && (m.event === "request" && w(r == null ? void 0 : r.onApproveRequest), m.event === "success" && m.approvalTxHash && w(() => {
           var U;
-          return (U = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : U.call(r, { txHash: f.approvalTxHash, token: P, amount: ne(T, P.decimals) });
-        })), f.phase === "signing" && (f.event === "prepared" && f.preparedOrder && (Qt({ analytics: j, account: u, chainId: I, inputToken: g, outputToken: p, preparedOrder: f.preparedOrder }), w(r == null ? void 0 : r.onSignOrderRequest)), f.event === "success" && f.signature && w(() => {
+          return (U = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : U.call(r, { txHash: m.approvalTxHash, token: p, amount: ne(T, p.decimals) });
+        })), m.phase === "signing" && (m.event === "prepared" && m.preparedOrder && (Vt({ analytics: j, account: u, chainId: S, inputToken: g, outputToken: y, preparedOrder: m.preparedOrder }), w(r == null ? void 0 : r.onSignOrderRequest)), m.event === "success" && m.signature && w(() => {
           var U;
-          return (U = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : U.call(r, f.signature);
-        }), f.event === "error" && w(() => {
+          return (U = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : U.call(r, m.signature);
+        }), m.event === "error" && w(() => {
           var U;
-          return (U = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : U.call(r, X(f.error));
+          return (U = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : U.call(r, X(m.error));
         }));
       }
-    }), C = t.module === Q.SWAP;
-    if (h(C ? d.SETTLING : d.SUCCESS, {
-      orderId: y.id.toString(),
-      order: y
-    }), w(() => i(y)), C || w(() => o()), w(() => {
-      var f;
-      return (f = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : f.call(r, y);
-    }), C) {
-      const f = await e.waitForOrderFill(y, G);
-      return h(d.SUCCESS, { order: f }), f;
+    }), v = t.module === V.SWAP;
+    if (h(v ? d.SETTLING : d.SUCCESS, {
+      orderId: f.id.toString(),
+      order: f
+    }), w(() => i(f)), v || w(() => o()), w(() => {
+      var m;
+      return (m = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : m.call(r, f);
+    }), v) {
+      const m = await e.waitForOrderFill(f, B);
+      return h(d.SUCCESS, { order: m }), m;
     }
-    return y;
-  } catch (y) {
-    const C = K.phase, f = X(y), _ = !(C === d.SUBMITTING && ((N = e.signal) == null ? void 0 : N.aborted) && y === e.signal.reason) && xe(y, C), U = !_ && Ce(y);
-    throw l(
+    return f;
+  } catch (f) {
+    const v = K.phase, m = X(f), _ = !(v === d.SUBMITTING && ((L = e.signal) == null ? void 0 : L.aborted) && f === e.signal.reason) && xe(f, v), U = !_ && Ae(f);
+    throw I(
       _ ? d.UNCONFIRMED : U ? d.REJECTED : d.FAILED,
       {
-        error: f,
-        parsedError: te(y)
+        error: m,
+        parsedError: te(f)
       }
-    ), U ? w(r == null ? void 0 : r.onSubmitOrderRejected) : C !== d.SETTLING && w(() => {
+    ), U ? w(r == null ? void 0 : r.onSubmitOrderRejected) : v !== d.SETTLING && w(() => {
       var ge;
-      return (ge = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : ge.call(r, te(y));
-    }), f;
+      return (ge = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : ge.call(r, te(f));
+    }), m;
   }
 }, zt = () => {
   const { data: e } = J(), {
@@ -1471,15 +1486,15 @@ const Bt = ({
     chainId: i,
     callbacks: o,
     account: s,
-    walletInteractions: a
-  } = x(), c = Nt(), m = Lt(), E = W(), u = b(), I = le(void 0);
+    walletInteractions: c
+  } = x(), a = Lt(), l = Nt(), E = W(), u = b(), S = le(void 0);
   return Y(() => () => {
     var g;
-    return (g = I.current) == null ? void 0 : g.abort();
-  }, [s, i, e]), v(() => {
-    if (!Le(u.getState().state.currentExecution.phase)) return;
+    return (g = S.current) == null ? void 0 : g.abort();
+  }, [s, i, e]), A(() => {
+    if (!Ne(u.getState().state.currentExecution.phase)) return;
     const g = new AbortController();
-    I.current = g, Jt({
+    S.current = g, Jt({
       signal: g.signal,
       account: s,
       chainId: i,
@@ -1488,21 +1503,21 @@ const Bt = ({
       wrappedNativeToken: r,
       form: E,
       client: e,
-      walletInteractions: a,
+      walletInteractions: c,
       callbacks: o,
-      addNewOrder: c,
-      refetchActiveOrders: m,
-      waitForOrderFill: (P, p) => Ke({ store: u, callbacks: o, order: P, executionId: p, signal: g.signal }),
+      addNewOrder: a,
+      refetchActiveOrders: l,
+      waitForOrderFill: (p, y) => Ke({ store: u, callbacks: o, order: p, executionId: y, signal: g.signal }),
       getCurrentExecution: () => u.getState().state.currentExecution,
       beginExecution: u.getState().beginExecution,
       replaceExecution: u.getState().replaceExecution
     }).catch(() => {
     }).finally(() => {
-      I.current === g && (I.current = void 0);
+      S.current === g && (S.current = void 0);
     });
   }, [
     s,
-    c,
+    a,
     o,
     i,
     e,
@@ -1510,14 +1525,14 @@ const Bt = ({
     t,
     n,
     r,
-    m,
+    l,
     u,
-    a
+    c
   ]);
 }, $t = () => {
-  const e = A((r) => r.state.currentExecution), t = A(
+  const e = C((r) => r.state.currentExecution), t = C(
     (r) => r.returnToOrderForm
-  ), n = v(
+  ), n = A(
     () => t(e.executionId),
     [e.executionId, t]
   );
@@ -1527,18 +1542,18 @@ const Bt = ({
   );
 }, ye = (e) => {
   if (typeof e == "number" && Number.isSafeInteger(e) && e >= 0 || typeof e == "string" && /^\d+$/.test(e)) return BigInt(e);
-}, He = (e, t) => {
+}, qe = (e, t) => {
   if (e !== null && typeof e == "object")
     return t === null || typeof t != "object" ? !1 : Object.entries(e).every(
-      ([i, o]) => He(o, Reflect.get(t, i))
+      ([i, o]) => qe(o, Reflect.get(t, i))
     );
   const n = ye(e), r = ye(t);
   return n !== void 0 || r !== void 0 ? n !== void 0 && n === r : typeof e == "number" || typeof t == "number" ? !1 : typeof e == "string" && typeof t == "string" && /^0x/i.test(e) ? e.toLowerCase() === t.toLowerCase() : e === t;
 }, Yt = (e, t) => e.find(
-  (n) => n.version === 2 && "order" in n.rawOrder && He(t, n.rawOrder.order)
+  (n) => n.version === 2 && "order" in n.rawOrder && qe(t, n.rawOrder.order)
 );
 async function Xt({ store: e, callbacks: t, signal: n }) {
-  var a;
+  var c;
   const r = e.getState().state.currentExecution;
   if (r.phase !== d.UNCONFIRMED || r.executionId === void 0) return;
   const i = r.executionId;
@@ -1549,42 +1564,42 @@ async function Xt({ store: e, callbacks: t, signal: n }) {
     parsedError: void 0
   };
   if (!e.getState().replaceExecution(i, o)) return;
-  const s = (c, m = {}) => {
-    const E = { ...o, ...m, phase: c };
+  const s = (a, l = {}) => {
+    const E = { ...o, ...l, phase: a };
     return e.getState().replaceExecution(i, E) ? (o = E, !0) : !1;
   };
   try {
     n.throwIfAborted();
-    let c = o.order;
-    const m = !c;
-    if (!c || c.status === M.Open && c.deadline + 6e4 <= Date.now()) {
-      if (!o.account || !o.chainId || !c && !o.preparedOrder)
+    let a = o.order;
+    const l = !a;
+    if (!a || a.status === M.Open && a.deadline + 6e4 <= Date.now()) {
+      if (!o.account || !o.chainId || !a && !o.preparedOrder)
         throw new Error("The original swap status is still unknown. Check its account history before starting another swap.");
       const u = await Ze({
         swapper: o.account,
         chainId: o.chainId,
         getv1orders: !1,
         signal: n
-      }), I = c;
-      if (c = I ? u.find((g) => g.id.toLowerCase() === I.id.toLowerCase() && g.chainId === I.chainId && g.historyKey === I.historyKey) : o.preparedOrder && Yt(u, o.preparedOrder.order), !c)
+      }), S = a;
+      if (a = S ? u.find((g) => g.id.toLowerCase() === S.id.toLowerCase() && g.chainId === S.chainId && g.historyKey === S.historyKey) : o.preparedOrder && Yt(u, o.preparedOrder.order), !a)
         throw new we(
           "The original order has not appeared in history yet. Check its status again before starting another swap.",
           "unconfirmed",
           o.orderId ?? ""
         );
     }
-    if (n.throwIfAborted(), !s(d.SETTLING, { order: c, orderId: c.id })) return;
-    w(() => Be(e, c)), m && w(() => {
+    if (n.throwIfAborted(), !s(d.SETTLING, { order: a, orderId: a.id })) return;
+    w(() => Be(e, a)), l && w(() => {
       var u;
-      return (u = t == null ? void 0 : t.onOrderCreated) == null ? void 0 : u.call(t, c);
+      return (u = t == null ? void 0 : t.onOrderCreated) == null ? void 0 : u.call(t, a);
     });
-    const E = ((a = o.form) == null ? void 0 : a.module) === Q.SWAP ? await Ke({ store: e, callbacks: t, order: c, executionId: i, signal: n }) : c;
+    const E = ((c = o.form) == null ? void 0 : c.module) === V.SWAP ? await Ke({ store: e, callbacks: t, order: a, executionId: i, signal: n }) : a;
     return s(d.SUCCESS, { order: E, orderId: E.id }), E;
-  } catch (c) {
-    throw s(xe(c, d.SETTLING) ? d.UNCONFIRMED : d.FAILED, {
-      error: X(c),
-      parsedError: te(c)
-    }), c;
+  } catch (a) {
+    throw s(xe(a, d.SETTLING) ? d.UNCONFIRMED : d.FAILED, {
+      error: X(a),
+      parsedError: te(a)
+    }), a;
   }
 }
 const Zt = () => {
@@ -1592,7 +1607,7 @@ const Zt = () => {
   return Y(() => () => {
     var r;
     return (r = n.current) == null ? void 0 : r.abort();
-  }, []), v(() => {
+  }, []), A(() => {
     if (n.current) return;
     const r = new AbortController();
     n.current = r, Xt({ store: e, callbacks: t, signal: r.signal }).catch(() => {
@@ -1608,15 +1623,15 @@ const Zt = () => {
     hasChainId: i,
     module: o,
     overrides: s
-  } = x(), { data: a, isLoading: c } = J(), m = zt(), E = Zt(), u = A((T) => T.startNewOrder), I = v(() => m(), [m]), g = v(
+  } = x(), { data: c, isLoading: a } = J(), l = zt(), E = Zt(), u = C((T) => T.startNewOrder), S = A(() => l(), [l]), g = A(
     () => u(Fe({ module: o, overrides: s }), e.executionId),
     [o, s, u, e.executionId]
-  ), P = lt(e.phase), p = mt(e.phase), O = ie(e.phase);
+  ), p = lt(e.phase), y = mt(e.phase), P = ie(e.phase);
   return R(() => ({
     phase: e.phase,
-    status: P,
+    status: p,
     error: e.parsedError,
-    currentStep: p,
+    currentStep: y,
     currentStepIndex: e.stepIndex,
     approvalTxHash: e.approveTxHash,
     wrapTxHash: e.wrapTxHash,
@@ -1628,30 +1643,30 @@ const Zt = () => {
     account: e.account,
     orderId: e.orderId,
     order: e.order,
-    submitOrder: I,
+    submitOrder: S,
     resumeTracking: E,
     startNewOrder: g,
     returnToOrderForm: e.returnToOrderForm,
-    isExecuting: O,
+    isExecuting: P,
     isSuccess: e.phase === d.SUCCESS,
     isFailed: e.phase === d.FAILED,
     isRejected: e.phase === d.REJECTED,
     isUnconfirmed: e.phase === d.UNCONFIRMED,
-    isPreparingOrder: e.phase === d.PREPARING || i && c && !a,
-    canDismiss: !O
+    isPreparingOrder: e.phase === d.PREPARING || i && a && !c,
+    canDismiss: !P
   }), [
-    a,
-    p,
+    c,
+    y,
     t,
     n,
     r,
-    c,
-    O,
+    a,
+    P,
     i,
     g,
-    I,
+    S,
     E,
-    P,
+    p,
     e
   ]);
 }, Sr = () => {
@@ -1663,20 +1678,20 @@ const Zt = () => {
     noLiquidity: i,
     inputAmountUi: o,
     marketPriceLoading: s,
-    hasChainId: a
-  } = x(), c = W(), { data: m, isLoading: E } = J(), u = A(
+    hasChainId: c
+  } = x(), a = W(), { data: l, isLoading: E } = J(), u = C(
     (T) => T.state.currentExecution.phase
-  ), I = ie(u), g = !!(e && $(e.address) && (!n || $(n.address))), P = s || !c.isReady && !c.errors.primary || r === void 0, p = I || a && E && !m || !!(e && t && o && P), O = !!(!c.canSubmit || Z(u) || !a || !m || i || p || !e || !t || g);
+  ), S = ie(u), g = !!(e && $(e.address) && (!n || $(n.address))), p = s || !a.isReady && !a.errors.primary || r === void 0, y = S || c && E && !l || !!(e && t && o && p), P = !!(!a.canSubmit || Z(u) || !c || !l || i || y || !e || !t || g);
   return R(() => ({
-    disabled: O,
-    loading: p
-  }), [O, p]);
+    disabled: P,
+    loading: y
+  }), [P, y]);
 }, Or = () => {
-  const { inputToken: e, outputToken: t, callbacks: n } = x(), r = A((s) => s.updateState), { trades: i } = W(), o = v(
+  const { inputToken: e, outputToken: t, callbacks: n } = x(), r = C((s) => s.updateState), { trades: i } = W(), o = A(
     (s) => {
       r({ tradeCount: s }), w(() => {
-        var a;
-        return (a = n == null ? void 0 : n.onTradeCountChange) == null ? void 0 : a.call(n, s);
+        var c;
+        return (c = n == null ? void 0 : n.onTradeCountChange) == null ? void 0 : c.call(n, s);
       });
     },
     [n, r]
@@ -1696,60 +1711,60 @@ const Zt = () => {
     [e, o, t, i]
   );
 }, Pr = () => {
-  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { marketPrice: i, trades: o, triggerPrice: s, isInverted: a } = W(), c = A((I) => I.updateState), m = v(
-    (I) => {
-      c({ triggerPriceUi: I, triggerPricePercent: null }), w(() => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = x(), { marketPrice: i, trades: o, triggerPrice: s, isInverted: c } = W(), a = C((S) => S.updateState), l = A(
+    (S) => {
+      a({ triggerPriceUi: S, triggerPricePercent: null }), w(() => {
         var g;
-        return (g = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : g.call(r, I || "");
+        return (g = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : g.call(r, S || "");
       }), w(() => {
         var g;
         return (g = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : g.call(r, "");
       });
     },
-    [r, c]
-  ), E = v(
-    (I) => {
-      c({
+    [r, a]
+  ), E = A(
+    (S) => {
+      a({
         triggerPriceUi: void 0,
-        triggerPricePercent: I
+        triggerPricePercent: S
       }), w(() => {
         var g;
         return (g = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : g.call(r, "");
       }), w(() => {
         var g;
-        return (g = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : g.call(r, I || "");
+        return (g = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : g.call(r, S || "");
       });
     },
-    [r, c]
-  ), u = v(() => {
-    c({
+    [r, a]
+  ), u = A(() => {
+    a({
       triggerPricePercent: void 0,
       triggerPriceUi: void 0
     });
-  }, [c]);
+  }, [a]);
   return R(
     () => ({
       price: s.display,
       canonicalPriceRaw: s.raw,
       outputAmountPerTrade: o.triggerOutputAmountPerTrade,
       error: s.error,
-      onInputChange: m,
+      onInputChange: l,
       onPercentageChange: E,
       percentage: s.percentage,
       onReset: u,
       inputToken: t,
       outputToken: n,
-      displayInputToken: a ? n : t,
-      displayOutputToken: a ? t : n,
+      displayInputToken: c ? n : t,
+      displayOutputToken: c ? t : n,
       isLoading: !!(e || !i.raw),
       isTypedValue: s.isTypedValue
     }),
     [
       t,
-      a,
+      c,
       i.raw,
       e,
-      m,
+      l,
       E,
       u,
       n,
@@ -1763,14 +1778,14 @@ export {
   wr as DISCLAIMER_URL,
   ee as Disclaimer,
   d as ExecutionPhase,
-  q as ExecutionStatus,
+  H as ExecutionStatus,
   vr as InputErrors,
-  Cr as Module,
-  Ar as ORBS_LOGO,
+  Ar as Module,
+  Cr as ORBS_LOGO,
   Tr as ORBS_SLTP_FAQ_URL,
   Rr as ORBS_TWAP_FAQ_URL,
-  Nr as ORBS_WEBSITE_URL,
-  Lr as OrderFilter,
+  Lr as ORBS_WEBSITE_URL,
+  Nr as OrderFilter,
   xr as OrderSettlementError,
   Fr as OrderStatus,
   Ur as OrderType,
@@ -1782,13 +1797,13 @@ export {
   z as Steps,
   Kr as TimeUnit,
   _r as analytics,
-  Hr as calculateOrder,
-  qr as calculateOrderForm,
+  qr as calculateOrder,
+  Hr as calculateOrderForm,
   br as createClient,
   Wr as eqIgnoreCase,
   jr as executeOrder,
-  Vr as getOrderExecutionRate,
-  Qr as getOrderFillDelayMillis,
+  Qr as getOrderExecutionRate,
+  Vr as getOrderFillDelayMillis,
   Jr as getOrderLimitPriceRate,
   zr as getOrders,
   $r as getQuote,
@@ -1802,9 +1817,9 @@ export {
   nn as setUIVersion,
   on as submitSwap,
   sn as toAmountRaw,
-  cn as toAmountUI,
-  cr as useAmountUi,
-  ar as useCancelOrder,
+  an as toAmountUI,
+  ar as useAmountUi,
+  cr as useCancelOrder,
   J as useClient,
   dr as useDisclaimer,
   ur as useDuration,
@@ -1820,6 +1835,6 @@ export {
   Sr as useSubmitButton,
   Or as useTrades,
   Pr as useTriggerPrice,
-  an as waitForOrder,
+  cn as waitForOrder,
   dn as watchOrder
 };