@orbs-network/spot-react 2.1.17 → 2.1.19

package/dist/spot-react.js

@@ -1,32 +1,70 @@
 "use client";
-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 $e = "2.1.17", Qe = {
-  version: $e
-}, Ce = le(null), Ye = ({
+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 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 Fr, OrderStatus as xr, 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 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 C, 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.19", st = {
+  version: ot
+}, Te = de(null), at = ({
   children: e,
   value: t
-}) => /* @__PURE__ */ U(Ce.Provider, { value: t, children: e }), x = () => {
-  const e = me(Ce);
+}) => /* @__PURE__ */ D(Te.Provider, { value: t, children: e }), L = () => {
+  const e = ue(Te);
   if (e === null)
     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 || {}), 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([
+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 || {});
+const me = (e) => {
+  if (e instanceof Error) return e.message;
+  if (typeof e == "string") return e;
+  if (typeof e == "object" && e !== null) {
+    const t = Reflect.get(e, "message");
+    if (typeof t == "string") return t;
+  }
+  return "Unknown error";
+}, Re = (e) => {
+  if (typeof e != "object" || e === null) return 0;
+  const t = Reflect.get(e, "code");
+  if (typeof t == "number" && Number.isFinite(t)) return t;
+  if (typeof t == "string" && t.trim()) {
+    if (/^-?\d+$/.test(t)) {
+      const n = Number(t);
+      return Number.isFinite(n) ? n : 0;
+    }
+    return t;
+  }
+  return 0;
+}, Ne = (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);
+  const r = Reflect.get(e, "orderId");
+  typeof r == "string" && (t.orderId = r);
+  const i = Reflect.get(e, "status");
+  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) => {
+  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),
+    message: i || "Unknown error",
+    code: Re(e) || (Number.isFinite(r) ? r : 0)
+  };
+}, ct = /* @__PURE__ */ new Set([
   d.PREPARING,
   d.WRAPPING,
   d.APPROVING,
   d.SIGNING,
-  d.SUBMITTING
-]), Ze = {
+  d.SUBMITTING,
+  d.SETTLING
+]), dt = {
   [d.IDLE]: /* @__PURE__ */ new Set(),
   [d.PREPARING]: /* @__PURE__ */ new Set([
     d.PREPARING,
@@ -56,45 +94,40 @@ const Xe = /* @__PURE__ */ new Set([
     d.REJECTED
   ]),
   [d.SUBMITTING]: /* @__PURE__ */ new Set([
+    d.SETTLING,
     d.SUCCESS,
     d.FAILED,
-    d.REJECTED
+    d.REJECTED,
+    d.UNCONFIRMED
+  ]),
+  [d.SETTLING]: /* @__PURE__ */ new Set([
+    d.SETTLING,
+    d.SUCCESS,
+    d.FAILED,
+    d.UNCONFIRMED
+  ]),
+  [d.UNCONFIRMED]: /* @__PURE__ */ new Set([
+    d.SETTLING,
+    d.SUCCESS,
+    d.FAILED
   ]),
   [d.SUCCESS]: /* @__PURE__ */ new Set(),
   [d.FAILED]: /* @__PURE__ */ new Set(),
   [d.REJECTED]: /* @__PURE__ */ new Set()
-}, te = (e) => ({
+}, re = (e) => ({
   phase: d.IDLE,
   completedWrap: e
-}), $ = (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;
+}), ie = (e) => ct.has(e), Z = (e) => ie(e) || e === d.UNCONFIRMED, Le = (e) => e === d.IDLE || e === d.FAILED || e === d.REJECTED, Fe = (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;
-  if (e === d.FAILED || e === d.REJECTED)
+  if (e === d.FAILED || e === d.REJECTED || e === d.UNCONFIRMED)
     return q.FAILED;
-}, tt = (e) => {
+}, mt = (e) => {
   if (e === d.WRAPPING) return z.WRAP;
   if (e === d.APPROVING) return z.APPROVE;
   if (e === d.SIGNING || e === d.SUBMITTING)
     return z.CREATE;
-}, ge = (e) => {
-  if (e instanceof Error) return e.message;
-  if (typeof e == "string") return e;
-  if (typeof e == "object" && e !== null) {
-    const t = Reflect.get(e, "message");
-    if (typeof t == "string") return t;
-  }
-  return "Unknown error";
-}, 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;
-}, 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: rt(e) || (n ? Number(n[1]) : 0)
-  };
-}, I = (e) => {
+}, w = (e) => {
   if (e)
     try {
       const t = e();
@@ -102,7 +135,7 @@ const Xe = /* @__PURE__ */ new Set([
       });
     } catch {
     }
-}, nt = ({
+}, ft = ({
   execution: e,
   account: t,
   chainId: n,
@@ -110,16 +143,16 @@ const Xe = /* @__PURE__ */ new Set([
   inputAmountRaw: i
 }) => {
   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))
+  if ((o == null ? void 0 : o.account.toLowerCase()) === t.toLowerCase() && o.chainId === n && o.inputTokenAddress.toLowerCase() === r.toLowerCase() && gt(o.inputAmountRaw, i))
     return o;
-}, it = (e, t) => {
+}, gt = (e, t) => {
   try {
     return BigInt(e) >= BigInt(t);
   } catch {
     return !1;
   }
-}, ot = 2e4, he = /* @__PURE__ */ new WeakMap(), Ee = (e) => {
-  const t = he.get(e);
+}, ht = 2e4, Se = /* @__PURE__ */ new WeakMap(), Ie = (e) => {
+  const t = Se.get(e);
   if (t) return t;
   const n = {
     all: [...e].sort((r, i) => i.createdAt - r.createdAt),
@@ -130,85 +163,93 @@ const Xe = /* @__PURE__ */ new Set([
   };
   for (const r of n.all)
     switch (r.status) {
-      case J.Open:
+      case M.Open:
         n.open.push(r);
         break;
-      case J.Completed:
+      case M.Completed:
         n.completed.push(r);
         break;
-      case J.Cancelled:
+      case M.Cancelled:
         n.cancelled.push(r);
         break;
-      case J.Expired:
+      case M.Expired:
         n.expired.push(r);
         break;
     }
-  return he.set(e, n), n;
-}, st = (e, t) => {
+  return Se.set(e, n), n;
+}, Et = (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];
-}, at = (e, t, n) => {
-  if (!e) return;
-  const r = new Map(
-    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);
-    }));
+}, St = (e, t) => {
+  if (!e) return t;
+  const n = new Map(e.map((o) => [o.historyKey, o])), r = new Set(t.map((o) => o.historyKey));
+  return [...t.map((o) => {
+    const s = n.get(o.historyKey);
+    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))];
+}, It = (e, t, n, r, i) => {
+  const o = r ?? /* @__PURE__ */ new Set(), s = (m) => o.has(m.historyKey) ? !1 : (o.add(m.historyKey), w(() => {
+    var E;
+    return (E = n == null ? void 0 : n.onOrderFilled) == null ? void 0 : E.call(n, m);
+  }), !0), c = new Map(
+    t.map((m) => [m.historyKey, m])
+  ), a = [];
+  for (const m of e ?? []) {
+    if (m.version !== 2) continue;
+    const E = c.get(m.historyKey);
+    !E || E.progress === m.progress && E.status === m.status || (a.push(E), E.status === M.Completed && m.status !== M.Completed && s(E));
   }
-  i.length > 0 && I(() => {
-    var o;
-    return (o = n == null ? void 0 : n.onOrdersProgressUpdate) == null ? void 0 : o.call(n, i);
+  (i == null ? void 0 : i.status) === M.Completed && s(i) && !a.some((m) => m.historyKey === i.historyKey) && a.push(i);
+  for (const m of t)
+    m.status === M.Completed && o.add(m.historyKey);
+  a.length > 0 && w(() => {
+    var m;
+    return (m = n == null ? void 0 : n.onOrdersProgressUpdate) == null ? void 0 : m.call(n, a);
   });
-}, Ie = (e) => {
+}, Oe = (e) => {
   if (e === null || typeof e != "object") return !1;
   const t = Object.getPrototypeOf(e);
   return t === Object.prototype || t === null;
-}, ae = (e, t) => {
+}, se = (e, t) => {
   if (Object.is(e, t)) return e;
   if (Array.isArray(e) && Array.isArray(t)) {
     const n = t.map(
-      (i, o) => ae(e[o], i)
+      (i, o) => se(e[o], i)
     );
     return e.length === n.length && n.every((i, o) => i === e[o]) ? e : n;
   }
-  if (Ie(e) && Ie(t)) {
+  if (Oe(e) && Oe(t)) {
     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) || (o = !1);
-      const a = ae(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;
   }
   return t;
-}, ct = (e, t) => e ? ae(e, t) : t, dt = async ({
+}, Ot = (e, t) => e ? se(e, t) : t, Pt = async ({
   client: e,
   account: t,
   signal: n,
   supportLegacyOrders: r,
   previousOrders: i,
-  legacyLoaded: o,
-  callbacks: s
+  legacyLoaded: o
 }) => {
-  const a = await e.getAccountOrdersResult({
+  const s = 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
+  return {
+    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,
@@ -218,220 +259,218 @@ const Xe = /* @__PURE__ */ new Set([
   limitPricePercent: e.limitPricePercent,
   isMarketOrder: e.isMarketOrder,
   isPriceInverted: void 0
-}), ut = (e) => ({
-  ...ce(e),
+}), pt = (e) => ({
+  ...ae(e),
   cancelOrders: {},
-  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 y = async () => {
+  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, c, a;
+  const m = /* @__PURE__ */ new Set();
+  let E = !1, u = 0, S = 0, h, O, p;
+  return it((I, T) => {
+    const j = (g, l = a, P = T().orders.isFetching, x) => {
+      const y = s, v = T().orders.data, f = Ot(v, St(v, g));
+      return I((N) => ({ orders: { ...N.orders, data: f, isFetching: P } })), s === y && It(v, f, l, m, x), f;
+    }, V = async () => {
       if (!n || !r) return;
       if (o) return o;
-      const l = ++i, P = r;
-      m((f) => ({
+      const g = ++i, l = r;
+      I((x) => ({
         client: {
           key: n,
-          data: f.client.data,
+          data: x.client.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const O = (async () => {
-        let f;
-        for (let B = 0; B < 3; B++) {
-          if (l !== i) return;
+      const P = (async () => {
+        let x;
+        for (let y = 0; y < 3; y++) {
+          if (g !== i) return;
           try {
-            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);
+            const v = await l();
+            return g !== i ? void 0 : (I({
+              client: { key: n, data: v, isFetching: !1 }
+            }), v);
+          } catch (v) {
+            if (x = v instanceof Error ? v : new Error(String(v)), g !== i) return;
+            y < 2 && await yt(2 ** y * 1e3);
           }
         }
-        l === i && m({
-          client: { key: n, error: f, isFetching: !1 }
+        g === i && I({
+          client: { key: n, error: x, isFetching: !1 }
         });
       })();
-      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 C = s;
-        return await u, s !== C ? void 0 : T(l, P);
+      return o = P, P.finally(() => {
+        o === P && (o = void 0);
+      }), P;
+    }, F = async (g = !1, l = !1) => {
+      if (!g && u === 0 || !s || !c)
+        return T().orders.data;
+      if (h) {
+        if (!l) return h;
+        const N = s;
+        return await h, s !== N ? void 0 : F(g, l);
       }
-      const O = ++p, f = a, B = S().orders.data, w = new AbortController();
-      g = w, m((C) => ({
+      const P = ++S, x = c, y = T().orders.data, v = new AbortController();
+      O = v, I((N) => ({
         orders: {
           key: s,
-          data: C.orders.data,
+          data: N.orders.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const F = f(
-        B,
-        P ? !1 : c,
-        w.signal
-      ).then(({ orders: C, legacyLoaded: D }) => {
-        if (O !== p) return;
-        c = D;
-        const G = ct(
-          S().orders.data,
-          C
-        );
-        return m({
-          orders: {
-            key: s,
-            data: G,
-            isFetching: !1
-          }
-        }), G;
-      }).catch((C) => {
-        if (O !== p || w.signal.aborted)
+      const f = x(
+        y,
+        l ? !1 : E,
+        v.signal
+      ).then(({ orders: N, legacyLoaded: _ }) => {
+        if (P === S)
+          return E = _, j(N, a, !1);
+      }).catch((N) => {
+        if (P !== S || v.signal.aborted)
           return;
-        const D = C instanceof Error ? C : new Error(String(C));
-        m((G) => ({
+        const _ = N instanceof Error ? N : new Error(String(N));
+        I((U) => ({
           orders: {
             key: s,
-            data: G.orders.data,
-            error: D,
+            data: U.orders.data,
+            error: _,
             isFetching: !1
           }
         }));
       });
-      return u = F, F.finally(() => {
-        u === F && (u = void 0), g === w && (g = void 0);
-      }), F;
-    }, L = () => {
-      T();
-    }, 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 }
+      return h = f, f.finally(() => {
+        h === f && (h = void 0), O === v && (O = void 0);
+      }), f;
+    }, B = () => {
+      F();
+    }, G = () => {
+      p && (clearInterval(p), p = void 0), typeof window < "u" && window.removeEventListener("focus", B), O == null || O.abort(), O = void 0, h = void 0, S++, I((g) => ({
+        orders: { ...g.orders, isFetching: !1 }
       }));
-    }, M = () => {
-      !s || !a || E || (T(!0), E = setInterval(() => {
-        T();
-      }, ot), typeof window < "u" && window.addEventListener("focus", L));
+    }, K = () => {
+      !s || !c || p || (F(!0), p = setInterval(() => {
+        F();
+      }, ht), typeof window < "u" && window.addEventListener("focus", B));
     };
     return {
-      client: Se,
-      orders: Oe,
-      state: ut(e),
-      configureClient: (l, P) => {
-        if (n === l) {
-          r = P;
+      client: Pe,
+      orders: pe,
+      state: pt(e),
+      configureClient: (g, l) => {
+        if (n === g) {
+          r = l;
           return;
         }
-        n = l, r = P, i++, o = void 0, m({
-          client: l ? { key: l, isFetching: !1 } : Se
-        }), l && P && y();
+        n = g, r = l, i++, o = void 0, I({
+          client: g ? { key: g, isFetching: !1 } : Pe
+        }), g && l && V();
       },
-      refetchClient: y,
-      configureOrders: (l, P) => {
-        if (s === l) {
-          a = P;
+      refetchClient: V,
+      configureOrders: (g, l, P) => {
+        if (a = P, s === g) {
+          c = l;
           return;
         }
-        K(), s = l, a = P, c = !1, m({
-          orders: l ? { key: l, isFetching: !1 } : Oe
-        }), h > 0 && M();
+        G(), s = g, c = l, E = !1, m.clear(), I({
+          orders: g ? { key: g, isFetching: !1 } : pe
+        }), u > 0 && K();
       },
-      registerOrdersConsumer: () => (h++, h === 1 && M(), () => {
-        h = Math.max(0, h - 1), h === 0 && K();
+      registerOrdersConsumer: () => (u++, u === 1 && K(), () => {
+        u = Math.max(0, u - 1), u === 0 && G();
       }),
-      refetchOrders: T,
-      addOrder: (l) => {
-        m((P) => {
-          const O = P.orders.data;
-          return O != null && O.some(
-            (f) => f.historyKey === l.historyKey
-          ) ? P : {
+      refetchOrders: F,
+      addOrder: (g) => {
+        I((l) => {
+          const P = l.orders.data;
+          return P != null && P.some(
+            (x) => x.historyKey === g.historyKey
+          ) ? l : {
             orders: {
-              ...P.orders,
-              data: [l, ...O ?? []]
+              ...l.orders,
+              data: [g, ...P ?? []]
             }
           };
         });
       },
-      setCancelOrder: (l, P) => {
-        m((O) => ({
+      updateOrder: (g, l) => {
+        const P = T().orders.data ?? [], x = P.some((y) => y.historyKey === g.historyKey);
+        j(x ? P.map((y) => y.historyKey === g.historyKey ? g : y) : [g, ...P], a ?? l, T().orders.isFetching, g);
+      },
+      setCancelOrder: (g, l) => {
+        I((P) => ({
           state: {
-            ...O.state,
-            cancelOrders: { ...O.state.cancelOrders, [l]: P }
+            ...P.state,
+            cancelOrders: { ...P.state.cancelOrders, [g]: l }
           }
         }));
       },
-      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 } };
+      clearCancelOrder: (g) => {
+        I((l) => {
+          if (!(g in l.state.cancelOrders)) return l;
+          const P = { ...l.state.cancelOrders };
+          return delete P[g], { state: { ...l.state, cancelOrders: P } };
         });
       },
-      updateState: (l) => m((P) => ({ state: { ...P.state, ...l } })),
-      beginExecution: (l) => {
-        let P;
-        return m((O) => be(O.state.currentExecution.phase) ? (P = {
-          ...l,
+      updateState: (g) => I((l) => ({ state: { ...l.state, ...g } })),
+      beginExecution: (g) => {
+        let l;
+        return I((P) => Le(P.state.currentExecution.phase) ? (l = {
+          ...g,
           executionId: ++t,
           phase: d.PREPARING
         }, {
           state: {
-            ...O.state,
-            currentExecution: P
+            ...P.state,
+            currentExecution: l
           }
-        }) : O), P;
+        }) : P), l;
       },
-      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 }
+      replaceExecution: (g, l) => {
+        let P = !1;
+        return I((x) => {
+          const y = x.state.currentExecution;
+          return y.executionId !== g || l.executionId !== g || !ut(y.phase, l.phase) ? x : (P = !0, {
+            state: { ...x.state, currentExecution: l }
           });
-        }), O;
+        }), P;
       },
       returnToOrderForm: () => {
-        const l = S().state.currentExecution;
-        return $(l.phase) || l.phase === d.SUCCESS ? !1 : (m((P) => ({
+        const g = T().state.currentExecution;
+        return Z(g.phase) || g.phase === d.SUCCESS ? !1 : (I((l) => ({
           state: {
-            ...P.state,
-            currentExecution: te(l.completedWrap)
+            ...l.state,
+            currentExecution: re(g.completedWrap)
           }
         })), !0);
       },
-      syncFormDefaults: (l) => $(S().state.currentExecution.phase) ? !1 : (m((P) => ({
+      syncFormDefaults: (g) => Z(T().state.currentExecution.phase) ? !1 : (I((l) => ({
         state: {
-          ...P.state,
-          ...ce(l),
-          currentExecution: te()
+          ...l.state,
+          ...ae(g),
+          currentExecution: re()
         }
       })), !0),
-      startNewOrder: (l) => {
-        const { state: P } = S();
-        return $(P.currentExecution.phase) ? !1 : (m((O) => ({
+      startNewOrder: (g) => {
+        const { state: l } = T();
+        return Z(l.currentExecution.phase) ? !1 : (I((P) => ({
           state: {
-            ...O.state,
-            ...ce(l),
-            isMarketOrder: P.isMarketOrder,
-            currentExecution: te()
+            ...P.state,
+            ...ae(g),
+            isMarketOrder: l.isMarketOrder,
+            currentExecution: re()
           }
         })), !0);
       }
     };
   });
-}, ye = (e) => {
+}, xe = (e) => {
   var n;
   const t = (n = e.overrides) == null ? void 0 : n.state;
   return {
-    isMarketOrder: e.module === X.LIMIT ? !1 : t == null ? void 0 : t.isMarketOrder,
+    isMarketOrder: e.module === Q.LIMIT || e.module === Q.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,
@@ -440,91 +479,92 @@ const Xe = /* @__PURE__ */ new Set([
     triggerPricePercent: t == null ? void 0 : t.triggerPricePercent,
     limitPricePercent: t == null ? void 0 : t.limitPricePercent
   };
-}, Re = le(null), gt = ({
+}, Ue = de(null), vt = ({
   children: e,
   initialState: t
 }) => {
-  const [n] = Ve(() => mt(t));
-  return /* @__PURE__ */ U(Re.Provider, { value: n, children: e });
-}, V = () => {
-  const e = me(Re);
+  const [n] = tt(() => wt(t));
+  return /* @__PURE__ */ D(Ue.Provider, { value: n, children: e });
+}, b = () => {
+  const e = ue(Ue);
   if (e === null)
     throw new Error("useSpotStore must be used within SpotProvider");
   return e;
 }, 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(
+  const t = b();
+  return nt(t, e);
+}, Ct = { isFetching: !1 }, At = () => {
+  const { partner: e, chainId: t, hasChainId: n } = L(), r = b(), i = !!(t && n), o = i ? `${e}:${t}` : void 0, s = C(() => t ? We(e, t) : Promise.reject(
     new Error("Spot is unavailable on the connected chain")
   ), [t, e]);
-  ie(() => {
+  Y(() => {
     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(() => {
+}, J = () => {
+  const { partner: e, chainId: t, hasChainId: n } = L(), r = b(), i = A((m) => m.client), o = !!(t && n), s = o ? `${e}:${t}` : void 0, c = i.key === s ? i : Ct, a = C(() => {
     if (!o || !s) return Promise.resolve(void 0);
-    const h = r.getState();
-    return h.client.key !== s ? Promise.resolve(void 0) : h.refetchClient();
+    const m = r.getState();
+    return m.client.key !== s ? Promise.resolve(void 0) : m.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]
   );
-}, ht = { isFetching: !1 }, Te = (e, t, n) => e && t ? JSON.stringify([
+}, Tt = { isFetching: !1 }, fe = (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({
+]) : void 0, Rt = () => {
+  const { account: e, supportLegacyOrders: t, callbacks: n } = L(), { data: r } = J(), i = b(), o = fe(e, r, t), s = !!o, c = C(
+    async (a, m, E) => !e || !r ? { orders: [], legacyLoaded: !1 } : Pt({
       client: r,
       account: e,
-      signal: p,
+      signal: E,
       supportLegacyOrders: t,
-      previousOrders: c,
-      legacyLoaded: h,
-      callbacks: n
+      previousOrders: a,
+      legacyLoaded: m
     }),
-    [e, n, r, t]
+    [e, 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]);
+  Y(() => {
+    i.getState().configureOrders(o, s ? c : void 0, n);
+  }, [n, s, o, c, i]);
+}, De = () => {
+  const { account: e, supportLegacyOrders: t } = L(), { data: n } = J(), r = b(), i = fe(e, n, t), o = !!i, s = C((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 };
-}, It = () => {
-  const e = V();
-  return v(
-    (t) => e.getState().addOrder(t),
-    [e]
+}, Nt = () => {
+  const e = b(), { account: t, supportLegacyOrders: n } = L(), { data: r } = J(), i = fe(t, r, n);
+  return C(
+    (o) => {
+      !i || e.getState().orders.key !== i || e.getState().addOrder(o);
+    },
+    [i, e]
   );
-}, St = () => {
-  const e = V();
-  return v(
+}, Lt = () => {
+  const e = b();
+  return C(
     () => 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]);
+}, or = () => {
+  const e = A((a) => a.orders), t = A(
+    (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 : Ee(o.data),
+    () => o.data === void 0 ? void 0 : Ie(o.data),
     [o.data]
-  ), a = v(async () => {
-    const c = await i();
-    return c === void 0 ? void 0 : Ee(c);
+  ), c = C(async () => {
+    const a = await i();
+    return a === void 0 ? void 0 : Ie(a);
   }, [i]);
   return R(
     () => ({
@@ -533,17 +573,17 @@ const Xe = /* @__PURE__ */ new Set([
       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]
   );
-}, Ot = ({ children: e }) => (ft(), Et(), e), pt = ({
+}, Ft = ({ children: e }) => (At(), Rt(), e), xt = ({
   error: e,
   retry: t,
   isRetrying: n
-}) => /* @__PURE__ */ ue("div", { className: "spot-client-error-fallback", role: "alert", children: [
-  /* @__PURE__ */ U("p", { children: e.message || "Unable to load Spot configuration." }),
-  /* @__PURE__ */ U(
+}) => /* @__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",
     {
       type: "button",
@@ -553,40 +593,40 @@ const Xe = /* @__PURE__ */ new Set([
       children: n ? "Retrying…" : "Retry"
     }
   )
-] }), At = ({
+] }), Ut = ({
   children: e,
-  fallback: t = pt
+  fallback: t = xt
 }) => {
-  const { hasChainId: n } = x(), { data: r, error: i, isFetching: o, refetch: s } = Y(), a = v(async () => {
+  const { hasChainId: n } = L(), { data: r, error: i, isFetching: o, refetch: s } = J(), c = C(async () => {
     await s();
   }, [s]);
-  return /* @__PURE__ */ ue(Ke, { children: [
+  return /* @__PURE__ */ ce(et, { children: [
     e,
-    !r && i && n ? /* @__PURE__ */ U(
+    !r && i && n ? /* @__PURE__ */ D(
       t,
       {
         error: i,
-        retry: a,
+        retry: c,
         isRetrying: o
       }
     ) : null
   ] });
-}, vt = ({
+}, Dt = ({
   resetErrorBoundary: e
-}) => /* @__PURE__ */ ue("div", { className: "twap-error-fallback", role: "alert", children: [
-  /* @__PURE__ */ U("p", { children: "Something went wrong" }),
-  /* @__PURE__ */ U("button", { type: "button", onClick: e, children: "Retry" })
-] }), wt = ({
+}) => /* @__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 = vt
+  fallback: t = Dt
 }) => {
-  const n = V(), r = v((i) => {
+  const n = b(), r = C((i) => {
     var s;
-    (((s = n.getState().client.data) == null ? void 0 : s.analytics) ?? De).onCrash(i);
+    (((s = n.getState().client.data) == null ? void 0 : s.analytics) ?? je).onCrash(i);
   }, [n]);
-  return /* @__PURE__ */ U(Ct, { fallback: t, reportCrash: r, children: e });
+  return /* @__PURE__ */ D(Gt, { fallback: t, reportCrash: r, children: e });
 };
-class Ct extends He {
+class Gt extends rt {
   constructor() {
     super(...arguments);
     oe(this, "state", {});
@@ -604,7 +644,7 @@ class Ct extends He {
     const { error: n } = this.state;
     if (n) {
       const r = this.props.fallback;
-      return /* @__PURE__ */ U(
+      return /* @__PURE__ */ D(
         r,
         {
           error: n,
@@ -615,131 +655,135 @@ class Ct extends He {
     return this.props.children;
   }
 }
-const yt = ({
+const Bt = ({
   children: e,
   defaults: t,
   scopeKey: n
 }) => {
-  const r = V(), i = A(
+  const r = b(), i = A(
     (s) => s.state.currentExecution.phase
-  ), o = je(n);
-  return ie(() => {
-    o.current === n || $(i) || r.getState().syncFormDefaults(t) && (o.current = n);
+  ), o = le(n);
+  return Y(() => {
+    o.current === n || Z(i) || r.getState().syncFormDefaults(t) && (o.current = n);
   }, [t, i, n, r]), e;
-}, Le = le(null), Rt = ({ children: e }) => {
+}, Me = de(null), Kt = ({ children: e }) => {
   const {
     inputToken: t,
     outputToken: n,
     inputAmountUi: r,
     quotedOutputAmountRaw: i,
-    inputTokenUsdPrice: o,
-    outputTokenUsdPrice: s,
+    minimumOutputAmountRaw: o,
+    inputTokenUsdPrice: s,
+    outputTokenUsdPrice: c,
     minTradeSizeUsd: a,
-    inputBalanceRaw: c,
-    displayFeePercent: h,
-    priceProtectionPercent: p,
-    module: u
-  } = 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
+    inputBalanceRaw: m,
+    displayFeePercent: E,
+    priceProtectionPercent: u,
+    module: S
+  } = L(), h = A((l) => l.state.tradeCount), O = A((l) => l.state.tradeInterval), p = A((l) => l.state.orderDuration), I = A(
+    (l) => l.state.limitPriceUi
   ), 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(
+    (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 P = l.state.currentExecution;
+    return P.phase !== d.IDLE ? P.form : void 0;
+  }), K = R(
     () => ({
-      module: u,
+      module: S,
       inputTokenDecimals: (t == null ? void 0 : t.decimals) ?? 0,
       outputTokenDecimals: (n == null ? void 0 : n.decimals) ?? 0,
       quotedOutputAmountRaw: i,
-      inputTokenUsdPrice: o,
-      outputTokenUsdPrice: s,
+      minimumOutputAmountRaw: o,
+      inputTokenUsdPrice: s,
+      outputTokenUsdPrice: c,
       minTradeSizeUsd: a,
-      priceProtectionPercent: p,
-      displayFeePercent: h,
-      inputBalanceRaw: c,
+      priceProtectionPercent: u,
+      displayFeePercent: E,
+      inputBalanceRaw: m,
       userInput: {
         inputAmountUi: r,
-        isMarketOrder: !!M,
-        tradeCount: g,
-        tradeInterval: E,
-        orderDuration: m,
-        limitPriceUi: S,
-        limitPricePercent: T,
-        triggerPriceUi: y,
-        triggerPricePercent: L,
-        isPriceInverted: K
+        isMarketOrder: !!B,
+        tradeCount: h,
+        tradeInterval: O,
+        orderDuration: p,
+        limitPriceUi: I,
+        limitPricePercent: j,
+        triggerPriceUi: T,
+        triggerPricePercent: V,
+        isPriceInverted: F
       }
     }),
     [
+      o,
       n == null ? void 0 : n.decimals,
-      s,
-      h,
+      c,
+      E,
       i,
       a,
+      S,
       u,
-      p,
-      c,
-      t == null ? void 0 : t.decimals,
-      o,
-      K,
-      M,
-      T,
-      L,
-      g,
       m,
-      E,
-      S,
+      t == null ? void 0 : t.decimals,
+      s,
+      F,
+      B,
+      j,
+      V,
+      h,
+      p,
+      O,
+      I,
       r,
-      y
+      T
     ]
-  ), O = R(() => {
-    if (l) return l;
-    const f = Ge(P);
-    return t && n ? f : {
-      ...f,
+  ), g = R(() => {
+    if (G) return G;
+    const l = Ve(K);
+    return t && n ? l : {
+      ...l,
       isReady: !1,
       canSubmit: !1
     };
-  }, [l, t, n, P]);
-  return /* @__PURE__ */ U(Le.Provider, { value: O, children: e });
+  }, [G, t, n, K]);
+  return /* @__PURE__ */ D(Me.Provider, { value: g, children: e });
 }, W = () => {
-  const e = me(Le);
+  const e = ue(Me);
   if (!e)
     throw new Error("useOrderForm must be used within OrderFormProvider");
   return e;
-}, 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({
+}, _t = (e) => {
+  var E, u, S, h, O, p, I, 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(((S = e.outputToken) == null ? void 0 : S.address) || "", n) || he(((h = e.inputToken) == null ? void 0 : h.address) || "", n) && $((O = e.outputToken) == null ? void 0 : O.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, c = R(
+    () => xe({
       module: e.module,
       overrides: e.overrides
     }),
     [e.module, e.overrides]
-  ), c = JSON.stringify([
+  ), a = JSON.stringify([
     e.partner,
     e.chainId,
     e.module,
-    (y = e.inputToken) == null ? void 0 : y.address,
+    (I = e.inputToken) == null ? void 0 : I.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(
+    (j = e.outputToken) == null ? void 0 : j.address,
+    (V = e.outputToken) == null ? void 0 : V.decimals,
+    (F = e.wrappedNativeToken) == null ? void 0 : F.address,
+    (B = e.wrappedNativeToken) == null ? void 0 : B.decimals,
+    c
+  ]), m = R(
     () => ({
       inputAmountUi: e.inputAmountUi,
       minTradeSizeUsd: e.minTradeSizeUsd,
       account: e.account,
       walletInteractions: e.walletInteractions,
       quotedOutputAmountRaw: i,
+      minimumOutputAmountRaw: e.marketQuote.isLoading ? void 0 : e.marketQuote.minimumOutputAmountRaw,
       marketPriceLoading: o,
       noLiquidity: s,
       priceProtectionPercent: e.priceProtectionPercent,
@@ -759,6 +803,8 @@ const yt = ({
       overrides: e.overrides
     }),
     [
+      e.marketQuote.isLoading,
+      e.marketQuote.minimumOutputAmountRaw,
       e.account,
       e.callbacks,
       e.chainId,
@@ -783,29 +829,29 @@ const yt = ({
       i
     ]
   );
-  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,
+  return { initialState: c, formScopeKey: a, trading: m };
+}, sr = (e) => {
+  const { initialState: t, formScopeKey: n, trading: r } = _t(e);
+  return /* @__PURE__ */ D(at, { value: r, children: /* @__PURE__ */ D(vt, { initialState: t, children: /* @__PURE__ */ D(Mt, { fallback: e.errorFallback, children: /* @__PURE__ */ D(Ft, { children: /* @__PURE__ */ D(
+    Bt,
     {
       defaults: t,
       scopeKey: n,
-      children: /* @__PURE__ */ U(At, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ U(Rt, { children: e.children }) })
+      children: /* @__PURE__ */ D(Ut, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ D(Kt, { children: e.children }) })
     }
   ) }) }) }) });
-}, Qt = (e, t) => R(() => ne(t, e), [e, t]), Nt = 60, Lt = () => {
-  const { refetch: e } = Ne();
-  return v(
+}, ar = (e, t) => R(() => ne(t, e), [e, t]), Ht = 60, qt = () => {
+  const { refetch: e } = De();
+  return C(
     async (t, n = !1) => {
-      for (let r = 0; r < Nt; r++) {
+      for (let r = 0; r < Ht; r++) {
         const i = await e(n);
         if (!i)
           throw new Error("orders not found");
         const o = i.find(
           (s) => s.historyKey === t
         );
-        if ((o == null ? void 0 : o.status) === J.Cancelled)
+        if ((o == null ? void 0 : o.status) === M.Cancelled)
           return;
         await new Promise((s) => setTimeout(s, 1e3));
       }
@@ -815,64 +861,64 @@ const yt = ({
     },
     [e]
   );
-}, xt = (e) => ({
+}, bt = (e) => ({
   ...e,
-  status: J.Cancelled
-}), 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 () => {
+  status: M.Cancelled
+}), cr = (e) => {
+  const { account: t, walletInteractions: n, callbacks: r } = L(), { data: i } = J(), o = qt(), s = A((u) => u.state.cancelOrders[(e == null ? void 0 : e.historyKey) ?? ""]), c = A((u) => u.setCancelOrder), a = A((u) => u.clearCancelOrder), m = C(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 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(
+      const S = e.historyKey;
+      c(S, { status: q.LOADING }), w(() => {
+        var I;
+        return (I = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : I.call(r, e);
+      }), w(
         () => i.analytics.onCancelOrderRequest(
           [e.version === 1 ? e.id.toString() : e.hash],
           e.version
         )
       );
-      const E = i.getCancelOrderRequest(e), m = await n.cancelOrder(E);
-      if (!m) throw new Error("failed to cancel order");
-      I(() => i.analytics.onCancelOrderSuccess(m)), a(g, {
+      const h = i.getCancelOrderRequest(e), O = await n.cancelOrder(h);
+      if (!O) throw new Error("failed to cancel order");
+      w(() => i.analytics.onCancelOrderSuccess(O)), c(S, {
         status: q.LOADING,
-        txHash: m
-      }), await o(g, e.version === 1);
-      const S = xt(e);
-      return a(g, {
+        txHash: O
+      }), await o(S, e.version === 1);
+      const p = bt(e);
+      return c(S, {
         status: q.SUCCESS,
-        txHash: m
-      }), I(
+        txHash: O
+      }), w(
         () => {
-          var y;
-          return (y = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : y.call(r, {
-            order: S,
-            txHash: m
+          var I;
+          return (I = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : I.call(r, {
+            order: p,
+            txHash: O
           });
         }
-      ), m;
-    } catch (g) {
-      ve(g) ? u && c(u) : (u && a(u, {
+      ), O;
+    } catch (S) {
+      Ce(S) ? u && a(u) : (u && c(u, {
         status: q.FAILED,
-        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));
+        error: me(S)
+      }), w(() => i == null ? void 0 : i.analytics.onCancelOrderError(S))), w(() => {
+        var h;
+        return (h = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : h.call(r, X(S));
       });
     }
   }, [
     t,
     r,
-    c,
+    a,
     i,
     e,
     o,
-    a,
+    c,
     n
-  ]), p = R(() => {
+  ]), E = R(() => {
     const u = s;
     return {
       isLoading: (u == null ? void 0 : u.status) === q.LOADING,
@@ -883,31 +929,31 @@ const yt = ({
       txHash: u == null ? void 0 : u.txHash
     };
   }, [s, e, i]);
-  return R(() => ({ cancelOrder: h, ...p }), [h, p]);
-}, Xt = () => {
+  return R(() => ({ cancelOrder: m, ...E }), [m, E]);
+}, dr = () => {
   const { module: e, values: t } = W();
-  if (t.isMarketOrder && e === X.STOP_LOSS)
+  if (t.isMarketOrder && e === Q.STOP_LOSS)
     return ee.TRIGGER_MARKET_PRICE;
-  if (e === X.LIMIT || e === X.TWAP)
+  if (e === Q.LIMIT || e === Q.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 }), I(() => {
-        var c;
-        return (c = e == null ? void 0 : e.onOrderDurationChange) == null ? void 0 : c.call(e, a);
+}, ur = () => {
+  const { callbacks: e } = L(), t = A((c) => c.updateState), { schedule: n } = W(), { duration: r } = n, i = C(
+    (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 = C(
+    (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 = C(
+    (c) => {
+      i({ unit: c, value: r.value });
     },
     [r.value, i]
   );
@@ -922,23 +968,23 @@ const yt = ({
     }),
     [r, i, o, s, n]
   );
-}, bt = () => {
-  const { callbacks: e } = x(), t = A((a) => a.updateState), { schedule: n } = W(), { fillDelay: r } = n, i = v(
-    (a) => {
-      t({ tradeInterval: a }), I(() => {
-        var c;
-        return (c = e == null ? void 0 : e.onTradeIntervalChange) == null ? void 0 : c.call(e, a);
+}, lr = () => {
+  const { callbacks: e } = L(), t = A((c) => c.updateState), { schedule: n } = W(), { fillDelay: r } = n, i = C(
+    (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 = C(
+    (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 = C(
+    (c) => i({ unit: c, value: r.value }),
     [r.value, i]
   );
   return R(
@@ -952,184 +998,184 @@ const yt = ({
     }),
     [r, i, o, s, n]
   );
-}, _ = (e, t) => ({
+}, H = (e, t) => ({
   raw: e || "",
   ui: ne(e, t)
-}), Ft = (e, t, n) => R(() => !e || !t || !n ? [] : e.map((r) => ({
+}), Wt = (e, t, n) => R(() => !e || !t || !n ? [] : e.map((r) => ({
   rawFill: r,
   inputToken: t,
   outputToken: n,
-  inputAmount: _(r.inAmount, t.decimals),
-  outputAmount: _(r.outAmount, n.decimals),
+  inputAmount: H(r.inAmount, t.decimals),
+  outputAmount: H(r.outAmount, n.decimals),
   timestamp: r.timestamp,
   txHash: r.txHash,
-  executionRate: we(
+  executionRate: Ae(
     r.inAmount,
     r.outAmount,
     t.decimals,
     n.decimals
   )
-})), [e, t, n]), kt = (e, t, n) => {
-  const { chainId: r, partner: i } = x(), o = R(() => {
+})), [e, t, n]), mr = (e, t, n) => {
+  const { chainId: r, partner: i } = L(), o = R(() => {
     if (!(!t || !n || !e || e.isMarketPrice))
-      return Me(
+      return Qe(
         e,
         t.decimals,
         n.decimals
       );
   }, [t, e, n]), s = R(() => {
     if (!(!t || !n || !e))
-      return Be(
+      return Je(
         e,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), a = R(() => {
+  }, [t, e, n]), c = R(() => {
     if (!(!t || !n || !e))
-      return we(
+      return Ae(
         e.srcAmountFilled,
         e.dstAmountFilled,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), c = R(() => e ? _e(
+  }, [t, e, n]), a = R(() => e ? ze(
     e,
-    r ? qe(i, r) : void 0
-  ) : 0, [e, i, r]), h = Ft(e == null ? void 0 : e.fills, t, n);
+    r ? $e(i, r) : void 0
+  ) : 0, [e, i, r]), m = Wt(e == null ? void 0 : e.fills, t, n);
   return R(() => {
     if (e != null && e.id)
       return {
         original: e,
-        fills: h,
+        fills: m,
         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: _(e.srcAmount, t == null ? void 0 : t.decimals),
-        limitPrice: _(
+        inputAmount: H(e.srcAmount, t == null ? void 0 : t.decimals),
+        limitPrice: H(
           k(o, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
-        inputAmountPerTrade: _(
+        inputAmountPerTrade: H(
           e.srcAmountPerTrade,
           t == null ? void 0 : t.decimals
         ),
-        minOutputAmountPerTrade: _(
+        minOutputAmountPerTrade: H(
           e.dstMinAmountPerTrade,
           n == null ? void 0 : n.decimals
         ),
-        minOutputAmount: _(
+        minOutputAmount: H(
           e.dstMinAmountTotal,
           n == null ? void 0 : n.decimals
         ),
-        triggerPrice: _(
+        triggerPrice: H(
           k(s, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         id: e.id,
-        inputAmountFilled: _(
+        inputAmountFilled: H(
           e.srcAmountFilled,
           t == null ? void 0 : t.decimals
         ),
-        outputAmountFilled: _(
+        outputAmountFilled: H(
           e.dstAmountFilled,
           n == null ? void 0 : n.decimals
         ),
         progress: e.progress,
-        executionPrice: _(
-          k(a, n == null ? void 0 : n.decimals),
+        executionPrice: H(
+          k(c, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         version: e.version
       };
   }, [
     e,
-    h,
+    m,
     t,
     n,
-    c,
+    a,
     o,
     s,
-    a
+    c
   ]);
-}, er = () => {
-  const { marketPriceLoading: e } = x(), t = W().errors.primary;
+}, fr = () => {
+  const { marketPriceLoading: e } = L(), t = W().errors.primary;
   return e ? void 0 : t;
-}, 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 }), I(() => {
-        var S;
-        return (S = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : S.call(r, m || "");
-      }), I(() => {
-        var S;
-        return (S = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : S.call(r, "");
+}, gr = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = L(), { limitPrice: i, values: o, module: s, isInverted: c } = W(), a = A((O) => O.updateState), m = C(
+    (O) => {
+      a({ limitPriceUi: O, limitPricePercent: null }), w(() => {
+        var p;
+        return (p = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : p.call(r, O || "");
+      }), w(() => {
+        var p;
+        return (p = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : p.call(r, "");
       });
     },
-    [r, c]
-  ), p = v(
-    (m) => {
-      c({
+    [r, a]
+  ), E = C(
+    (O) => {
+      a({
         limitPriceUi: void 0,
-        limitPricePercent: m
-      }), I(() => {
-        var S;
-        return (S = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : S.call(r, "");
-      }), I(() => {
-        var S;
-        return (S = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : S.call(r, m || "");
+        limitPricePercent: O
+      }), w(() => {
+        var p;
+        return (p = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : p.call(r, "");
+      }), w(() => {
+        var p;
+        return (p = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : p.call(r, O || "");
       });
     },
-    [r, c]
-  ), u = v(() => {
-    c({
+    [r, a]
+  ), u = C(() => {
+    a({
       limitPriceUi: void 0,
       limitPricePercent: void 0
     });
-  }, [c]), g = !o.isMarketOrder, E = v(() => {
-    c({
+  }, [a]), S = !o.isMarketOrder, h = C(() => {
+    a({
       isMarketOrder: !o.isMarketOrder,
       ...o.isMarketOrder ? {} : { isPriceInverted: !1 },
-      ...!o.isMarketOrder && s === X.STOP_LOSS ? { limitPricePercent: void 0 } : {}
+      ...!o.isMarketOrder && s === Q.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: h,
-      onPercentageChange: p,
+      onInputChange: m,
+      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: g,
-      toggle: E,
+      isEnabled: S,
+      toggle: h,
       isTypedValue: i.isTypedValue
     }),
     [
       t,
-      a,
-      g,
+      c,
+      S,
       i,
       e,
-      h,
-      p,
+      m,
+      E,
       u,
       n,
-      E
+      h
     ]
   );
-}, rr = () => {
-  const { marketPriceLoading: e } = x(), { outputAmount: t } = W();
+}, hr = () => {
+  const { marketPriceLoading: e } = L(), { outputAmount: t } = W();
   return R(
     () => ({
       amount: t,
@@ -1137,17 +1183,17 @@ const yt = ({
     }),
     [e, t]
   );
-}, 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(() => {
+}, Er = () => {
+  const { inputToken: e, outputToken: t } = L(), n = A((a) => a.updateState), { isInverted: r, values: i } = W(), o = A((a) => a.state.triggerPriceUi), s = A((a) => a.state.limitPriceUi), c = C(() => {
     n({
       isPriceInverted: !r,
-      ...o !== void 0 ? { triggerPriceUi: fe(o) } : {},
-      ...s !== void 0 ? { limitPriceUi: fe(s) } : {}
+      ...o !== void 0 ? { triggerPriceUi: Ee(o) } : {},
+      ...s !== void 0 ? { limitPriceUi: Ee(s) } : {}
     });
   }, [n, r, o, s]);
   return R(
     () => ({
-      onInvert: a,
+      onInvert: c,
       isInverted: r,
       inputToken: e,
       outputToken: t,
@@ -1155,39 +1201,62 @@ const yt = ({
       displayOutputToken: r ? e : t,
       isMarketOrder: i.isMarketOrder
     }),
-    [e, r, a, t, i.isMarketOrder]
+    [e, r, c, t, i.isMarketOrder]
   );
-}, pe = 3, Ut = 3e3, Dt = (e) => new Promise((t) => setTimeout(t, e)), de = (e, t) => {
+}, Ge = (e, t, n) => {
+  if (!e || typeof t.maker != "string" || !n || !t.rawOrder || !("order" in t.rawOrder)) return !1;
+  const r = t.rawOrder.order.witness.exchange.adapter;
+  let i;
+  try {
+    i = JSON.parse(e);
+  } catch {
+    return !1;
+  }
+  return Array.isArray(i) && typeof i[0] == "string" && typeof i[1] == "string" && i[0].toLowerCase() === t.maker.toLowerCase() && i[1].toLowerCase() === r.toLowerCase() && i[2] === n && i[3] === t.chainId;
+}, Be = (e, t) => {
+  const n = e.getState(), r = n.orders.key;
+  return Ge(r, t, n.state.currentExecution.partner) ? (n.addOrder(t), e.getState().orders.key === r) : !1;
+}, Ke = async ({ store: e, callbacks: t, order: n, executionId: r, signal: i }) => {
+  const o = new AbortController(), s = () => {
+    (i.aborted || e.getState().state.currentExecution.executionId !== r) && o.abort();
+  };
+  i.addEventListener("abort", s, { once: !0 });
+  const c = e.subscribe(s);
+  s();
+  try {
+    let a = n;
+    o.signal.aborted || w(() => Be(e, n));
+    for await (const m 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);
+      }), a = m);
+    return a;
+  } finally {
+    c(), i.removeEventListener("abort", s), o.abort();
+  }
+}, jt = (e) => new Promise((t) => setTimeout(t, e)), _e = (e, t) => {
   if (!/^\d+$/.test(e))
     throw new Error(
       `${t} must be a non-negative integer base-unit amount`
     );
   return BigInt(e);
-}, Ae = async ({
-  client: e,
-  walletInteractions: t,
-  tokenAddress: n,
-  inputAmountRaw: r
-}) => {
-  const i = await t.getAllowance({
-    tokenAddress: n,
-    spenderAddress: e.spenderAddress
-  });
-  return de(i || "0", "Allowance") >= de(r, "Input amount");
-}, Gt = (e) => {
+}, Vt = (e) => {
   if (!e.client) throw new Error("Spot client is unavailable");
-  if (!e.hasChainId || !e.chainId)
+  if (!e.chainId || !Number.isSafeInteger(e.chainId) || e.chainId <= 0)
     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 = Q(e.inputToken.address) ? e.wrappedNativeToken : e.inputToken;
-  if (!t || Q(t.address))
+  const t = $(e.inputToken.address) ? e.wrappedNativeToken : e.inputToken;
+  if (!t || $(t.address))
     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)
+    throw new Error("Swap settlement tracking is unavailable");
   const n = e.form.inputAmount.raw;
-  return de(n, "Input amount"), {
+  return _e(n, "Input amount"), {
     account: e.account,
     chainId: e.chainId,
     inputToken: e.inputToken,
@@ -1196,7 +1265,7 @@ const yt = ({
     client: e.client,
     inputAmountRaw: n
   };
-}, Mt = ({
+}, Qt = ({
   analytics: e,
   account: t,
   chainId: n,
@@ -1204,26 +1273,27 @@ const yt = ({
   outputToken: i,
   preparedOrder: o
 }) => {
-  const { form: s, values: a } = o;
-  I(
+  const { form: s, values: c } = o;
+  w(
     () => 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,
+      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
     })
   );
-}, Bt = async (e) => {
+}, Jt = async (e) => {
+  var P, x;
   const {
     form: t,
     walletInteractions: n,
@@ -1231,248 +1301,220 @@ const yt = ({
     addNewOrder: i,
     refetchActiveOrders: o,
     getCurrentExecution: s,
-    beginExecution: a,
-    replaceExecution: c,
-    wait: h = Dt
+    beginExecution: c,
+    replaceExecution: a,
+    wait: m = jt
   } = e;
-  let p;
+  let E;
   try {
-    p = Gt(e);
-  } catch (w) {
-    const F = re(w), C = se(w), D = a({
+    E = Vt(e);
+  } catch (y) {
+    const v = X(y), f = te(y), N = c({
+      account: e.account,
+      partner: (P = e.client) == null ? void 0 : P.partner,
       form: t,
       inputToken: e.inputToken,
       outputToken: e.outputToken,
       chainId: e.chainId
     });
-    throw D && c(D.executionId, {
-      ...D,
+    throw N && a(N.executionId, {
+      ...N,
       phase: d.FAILED,
-      error: F,
-      parsedError: C
-    }), I(
+      error: v,
+      parsedError: f
+    }), w(
       () => {
-        var G;
-        return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, C);
+        var _;
+        return (_ = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : _.call(r, f);
       }
-    ), F;
+    ), v;
   }
   const {
     account: u,
-    chainId: g,
-    inputToken: E,
-    orderInputToken: m,
-    outputToken: S,
-    client: y,
+    chainId: S,
+    inputToken: h,
+    orderInputToken: O,
+    outputToken: p,
+    client: I,
     inputAmountRaw: T
-  } = p, { analytics: L } = y, K = s(), M = nt({
-    execution: K,
+  } = E, { analytics: j } = I, V = s(), F = ft({
+    execution: V,
     account: u,
-    chainId: g,
-    inputTokenAddress: E.address,
+    chainId: S,
+    inputTokenAddress: h.address,
     inputAmountRaw: T
-  }), l = a({
+  }), B = c({
+    account: u,
+    partner: I.partner,
     form: t,
-    inputToken: E,
-    outputToken: S,
-    chainId: g,
-    completedWrap: M,
-    wrapTxHash: M == null ? void 0 : M.txHash
+    inputToken: h,
+    outputToken: p,
+    chainId: S,
+    completedWrap: F,
+    wrapTxHash: F == null ? void 0 : F.txHash
   });
-  if (!l) return;
-  const P = l.executionId;
-  let O = l;
-  const f = (w, F = {}) => {
-    const C = {
-      ...O,
-      ...F,
-      executionId: P,
-      phase: w
+  if (!B) return;
+  const G = B.executionId;
+  let K = B;
+  const g = (y, v = {}) => {
+    const f = {
+      ...K,
+      ...v,
+      executionId: G,
+      phase: y
     };
-    if (!c(P, C))
+    if (!a(G, f))
       throw new Error("Execution is no longer current");
-    O = C;
-  }, B = (w, F = {}) => {
-    const C = {
-      ...O,
-      ...F,
-      executionId: P,
-      phase: w
+    K = f;
+  }, l = (y, v = {}) => {
+    const f = {
+      ...K,
+      ...v,
+      executionId: G,
+      phase: y
     };
-    return c(P, C) ? (O = C, !0) : !1;
+    return a(G, f) ? (K = f, !0) : !1;
   };
   try {
-    const w = Q(E.address) && !M, F = !await Ae({
-      client: y,
+    const { order: y } = await Xe({
+      client: I,
+      account: u,
+      inputTokenAddress: O.address,
+      inputAmountRaw: T,
+      nativeInput: $(h.address),
+      completedWrapTxHash: F == null ? void 0 : F.txHash,
       walletInteractions: n,
-      tokenAddress: m.address,
-      inputAmountRaw: T
-    }), 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 (!N) throw new Error("failed to wrap input token");
-      const j = {
-        account: u,
-        chainId: g,
-        inputTokenAddress: E.address,
-        inputAmountRaw: T,
-        txHash: N
-      };
-      D++, f(d.WRAPPING, {
-        wrapTxHash: N,
-        completedWrap: j,
-        stepIndex: D
-      }), I(() => L.onWrapSuccess(N)), I(
-        () => {
-          var H;
-          return (H = r == null ? void 0 : r.onWrapSuccess) == null ? void 0 : H.call(r, {
-            txHash: N,
-            amount: ne(T, m.decimals)
+      wait: m,
+      signal: e.signal,
+      prepareOrder: async () => {
+        var f;
+        if (t.module === Q.SWAP) {
+          const N = await I.getQuote({
+            inToken: O.address,
+            outToken: p.address,
+            inAmount: T,
+            user: u,
+            slippage: 0,
+            dexMinAmountOut: "-1",
+            signal: e.signal
           });
+          if ((f = e.signal) == null || f.throwIfAborted(), BigInt(N.netAmountOut) < _e(t.values.minOutputAmountPerTrade, "Minimum output"))
+            throw new ve("INVALID_QUOTE", "Swap price changed. Review a fresh quote before signing.");
         }
-      );
-    }
-    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: y.spenderAddress
-      });
-      if (!N) throw new Error("failed to approve token");
-      f(d.APPROVING, { approveTxHash: N });
-      let j = !1;
-      for (let H = 0; H < pe && (j = await Ae({
-        client: y,
-        walletInteractions: n,
-        tokenAddress: m.address,
-        inputAmountRaw: T
-      }), !j); H++)
-        H < pe - 1 && await h(Ut);
-      if (!j)
-        throw new Error(
-          `Insufficient ${m.symbol} allowance to perform the swap. Please approve the token first.`
-        );
-      D++, f(d.APPROVING, {
-        hasApproval: !0,
-        stepIndex: D
-      }), I(() => L.onApproveSuccess(N)), I(
-        () => {
-          var H;
-          return (H = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : H.call(r, {
-            txHash: N,
-            token: m,
-            amount: ne(T, m.decimals)
-          });
-        }
-      );
-    }
-    f(d.SIGNING);
-    const G = y.prepareOrder({
-      form: t,
-      inputTokenAddress: m.address,
-      outputTokenAddress: S.address,
-      swapperAddress: u
-    });
-    f(d.SIGNING, { preparedOrder: G }), Mt({
-      analytics: L,
-      account: u,
-      chainId: g,
-      inputToken: E,
-      outputToken: S,
-      preparedOrder: G
-    }), I(() => L.onSignOrderRequest(G.order)), I(r == null ? void 0 : r.onSignOrderRequest);
-    let Z;
-    try {
-      Z = await n.signOrder(
-        G.signingRequest
-      ), I(() => L.onSignOrderSuccess(Z)), I(() => {
-        var N;
-        return (N = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : N.call(r, Z);
-      });
-    } catch (N) {
-      throw I(() => L.onSignOrderError(N)), I(() => {
-        var j;
-        return (j = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : j.call(r, re(N));
-      }), N;
+        return I.prepareOrder({
+          form: t,
+          inputTokenAddress: O.address,
+          outputTokenAddress: p.address,
+          swapperAddress: u
+        });
+      },
+      validateContext: () => {
+        if (s().executionId !== G) throw new Error("Execution is no longer current");
+      },
+      onUpdate: (f) => {
+        const N = f.steps.map((U) => ({ wrap: z.WRAP, approve: z.APPROVE, create: z.CREATE })[U]), _ = f.phase;
+        g(_, {
+          pendingSteps: N,
+          totalSteps: N.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: S, inputTokenAddress: h.address, inputAmountRaw: T, txHash: f.wrapTxHash }
+          } : {}
+        }), f.phase === "wrapping" && (f.event === "request" && w(r == null ? void 0 : r.onWrapRequest), f.event === "success" && f.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, O.decimals) });
+        })), f.phase === "approving" && (f.event === "request" && w(r == null ? void 0 : r.onApproveRequest), f.event === "success" && f.approvalTxHash && w(() => {
+          var U;
+          return (U = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : U.call(r, { txHash: f.approvalTxHash, token: O, amount: ne(T, O.decimals) });
+        })), f.phase === "signing" && (f.event === "prepared" && f.preparedOrder && (Qt({ analytics: j, account: u, chainId: S, inputToken: h, outputToken: p, preparedOrder: f.preparedOrder }), w(r == null ? void 0 : r.onSignOrderRequest)), f.event === "success" && f.signature && w(() => {
+          var U;
+          return (U = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : U.call(r, f.signature);
+        }), f.event === "error" && w(() => {
+          var U;
+          return (U = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : U.call(r, X(f.error));
+        }));
+      }
+    }), v = t.module === Q.SWAP;
+    if (g(v ? d.SETTLING : d.SUCCESS, {
+      orderId: y.id.toString(),
+      order: y
+    }), w(() => i(y)), v || w(() => o()), w(() => {
+      var f;
+      return (f = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : f.call(r, y);
+    }), v) {
+      const f = await e.waitForOrderFill(y, G);
+      return g(d.SUCCESS, { order: f }), f;
     }
-    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,
+    return y;
+  } catch (y) {
+    const v = K.phase, f = X(y), _ = !(v === d.SUBMITTING && ((x = e.signal) == null ? void 0 : x.aborted) && y === e.signal.reason) && Fe(y, v), U = !_ && Ce(y);
+    throw l(
+      _ ? d.UNCONFIRMED : U ? d.REJECTED : d.FAILED,
       {
-        error: C,
-        parsedError: se(w)
+        error: f,
+        parsedError: te(y)
       }
-    ), 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(w));
-    }), C;
+    ), 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;
   }
-}, _t = () => {
-  const { data: e } = Y(), {
+}, zt = () => {
+  const { data: e } = J(), {
     inputToken: t,
     outputToken: n,
     wrappedNativeToken: r,
     chainId: i,
-    hasChainId: o,
-    callbacks: s,
-    account: a,
+    callbacks: o,
+    account: s,
     walletInteractions: c
-  } = x(), h = It(), p = St(), u = W(), g = V();
-  return v(() => {
-    Bt({
-      account: a,
+  } = L(), a = Nt(), m = Lt(), E = W(), u = b(), S = le(void 0);
+  return Y(() => () => {
+    var h;
+    return (h = S.current) == null ? void 0 : h.abort();
+  }, [s, i, e]), C(() => {
+    if (!Le(u.getState().state.currentExecution.phase)) return;
+    const h = new AbortController();
+    S.current = h, Jt({
+      signal: h.signal,
+      account: s,
       chainId: i,
-      hasChainId: o,
       inputToken: t,
       outputToken: n,
       wrappedNativeToken: r,
-      form: u,
+      form: E,
       client: e,
       walletInteractions: c,
-      callbacks: s,
-      addNewOrder: h,
-      refetchActiveOrders: p,
-      getCurrentExecution: () => g.getState().state.currentExecution,
-      beginExecution: g.getState().beginExecution,
-      replaceExecution: g.getState().replaceExecution
+      callbacks: o,
+      addNewOrder: a,
+      refetchActiveOrders: m,
+      waitForOrderFill: (O, p) => Ke({ store: u, callbacks: o, order: O, executionId: p, signal: h.signal }),
+      getCurrentExecution: () => u.getState().state.currentExecution,
+      beginExecution: u.getState().beginExecution,
+      replaceExecution: u.getState().replaceExecution
     }).catch(() => {
+    }).finally(() => {
+      S.current === h && (S.current = void 0);
     });
   }, [
-    a,
-    h,
     s,
+    a,
+    o,
     i,
     e,
-    u,
+    E,
     t,
-    o,
     n,
     r,
-    p,
-    g,
+    m,
+    u,
     c
   ]);
-}, qt = () => {
+}, $t = () => {
   const e = A((n) => n.state.currentExecution), t = A(
     (n) => n.returnToOrderForm
   );
@@ -1480,23 +1522,98 @@ const yt = ({
     () => ({ ...e, returnToOrderForm: t }),
     [e, t]
   );
-}, ir = () => {
-  const e = qt(), {
+}, ye = (e) => {
+  if (typeof e == "number" && Number.isSafeInteger(e) && e >= 0 || typeof e == "string" && /^\d+$/.test(e)) return BigInt(e);
+}, He = (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))
+    );
+  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)
+);
+async function Xt({ store: e, callbacks: t, signal: n }) {
+  var c;
+  const r = e.getState().state.currentExecution;
+  if (r.phase !== d.UNCONFIRMED || r.executionId === void 0) return;
+  const i = r.executionId;
+  let o = {
+    ...r,
+    phase: d.SETTLING,
+    error: void 0,
+    parsedError: void 0
+  };
+  if (!e.getState().replaceExecution(i, o)) return;
+  const s = (a, m = {}) => {
+    const E = { ...o, ...m, phase: a };
+    return e.getState().replaceExecution(i, E) ? (o = E, !0) : !1;
+  };
+  try {
+    n.throwIfAborted();
+    let a = o.order;
+    const m = !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
+      }), S = a;
+      if (a = S ? u.find((h) => h.id.toLowerCase() === S.id.toLowerCase() && h.chainId === S.chainId && h.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: a, orderId: a.id })) return;
+    w(() => Be(e, a)), m && w(() => {
+      var u;
+      return (u = t == null ? void 0 : t.onOrderCreated) == null ? void 0 : u.call(t, a);
+    });
+    const E = ((c = o.form) == null ? void 0 : c.module) === Q.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 (a) {
+    throw s(Fe(a, d.SETTLING) ? d.UNCONFIRMED : d.FAILED, {
+      error: X(a),
+      parsedError: te(a)
+    }), a;
+  }
+}
+const Zt = () => {
+  const e = b(), { callbacks: t } = L(), n = le(void 0);
+  return Y(() => () => {
+    var r;
+    return (r = n.current) == null ? void 0 : r.abort();
+  }, []), C(() => {
+    if (n.current) return;
+    const r = new AbortController();
+    n.current = r, Xt({ store: e, callbacks: t, signal: r.signal }).catch(() => {
+    }).finally(() => {
+      n.current === r && (n.current = void 0);
+    });
+  }, [t, e]);
+}, Sr = () => {
+  const e = $t(), {
     inputToken: t,
     outputToken: n,
     chainId: r,
     hasChainId: i,
     module: o,
     overrides: s
-  } = 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);
+  } = L(), { data: c, isLoading: a } = J(), m = zt(), E = Zt(), u = A((T) => T.startNewOrder), S = C(() => m(), [m]), h = C(
+    () => u(xe({ module: o, overrides: s })),
+    [o, s, u]
+  ), O = lt(e.phase), p = mt(e.phase), I = ie(e.phase);
   return R(() => ({
     phase: e.phase,
-    status: E,
+    status: O,
     error: e.parsedError,
-    currentStep: m,
+    currentStep: p,
     currentStepIndex: e.stepIndex,
     approvalTxHash: e.approveTxHash,
     wrapTxHash: e.wrapTxHash,
@@ -1505,30 +1622,36 @@ const yt = ({
     inputToken: e.inputToken ?? t,
     outputToken: e.outputToken ?? n,
     chainId: e.chainId ?? r,
-    submitOrder: u,
-    startNewOrder: g,
+    account: e.account,
+    orderId: e.orderId,
+    order: e.order,
+    submitOrder: S,
+    resumeTracking: E,
+    startNewOrder: h,
     returnToOrderForm: e.returnToOrderForm,
-    isExecuting: S,
+    isExecuting: I,
     isSuccess: e.phase === d.SUCCESS,
     isFailed: e.phase === d.FAILED,
     isRejected: e.phase === d.REJECTED,
-    isPreparingOrder: e.phase === d.PREPARING || i && c && !a,
-    canDismiss: !S
+    isUnconfirmed: e.phase === d.UNCONFIRMED,
+    isPreparingOrder: e.phase === d.PREPARING || i && a && !c,
+    canDismiss: !I
   }), [
-    a,
-    m,
+    c,
+    p,
     t,
     n,
     r,
-    c,
-    S,
+    a,
+    I,
     i,
-    g,
-    u,
+    h,
+    S,
     E,
+    O,
     e
   ]);
-}, or = () => {
+}, Ir = () => {
   const {
     inputToken: e,
     outputToken: t,
@@ -1537,20 +1660,20 @@ const yt = ({
     noLiquidity: i,
     inputAmountUi: o,
     marketPriceLoading: s,
-    hasChainId: a
-  } = x(), c = W(), { data: h, isLoading: p } = Y(), u = A(
+    hasChainId: c
+  } = L(), a = W(), { data: m, isLoading: E } = J(), u = A(
     (T) => T.state.currentExecution.phase
-  ), 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);
+  ), S = ie(u), h = !!(e && $(e.address) && (!n || $(n.address))), O = s || !a.isReady && !a.errors.primary || r === void 0, p = S || c && E && !m || !!(e && t && o && O), I = !!(!a.canSubmit || Z(u) || !c || !m || i || p || !e || !t || h);
   return R(() => ({
-    disabled: y,
-    loading: S
-  }), [y, S]);
-}, sr = () => {
-  const { inputToken: e, outputToken: t, callbacks: n } = x(), r = A((s) => s.updateState), { trades: i } = W(), o = v(
+    disabled: I,
+    loading: p
+  }), [I, p]);
+}, Or = () => {
+  const { inputToken: e, outputToken: t, callbacks: n } = L(), r = A((s) => s.updateState), { trades: i } = W(), o = C(
     (s) => {
-      r({ tradeCount: s }), I(() => {
-        var a;
-        return (a = n == null ? void 0 : n.onTradeCountChange) == null ? void 0 : a.call(n, s);
+      r({ tradeCount: s }), w(() => {
+        var c;
+        return (c = n == null ? void 0 : n.onTradeCountChange) == null ? void 0 : c.call(n, s);
       });
     },
     [n, r]
@@ -1569,62 +1692,62 @@ const yt = ({
     }),
     [e, o, t, i]
   );
-}, 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, "");
+}, Pr = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = L(), { marketPrice: i, trades: o, triggerPrice: s, isInverted: c } = W(), a = A((S) => S.updateState), m = C(
+    (S) => {
+      a({ triggerPriceUi: S, triggerPricePercent: null }), w(() => {
+        var h;
+        return (h = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : h.call(r, S || "");
+      }), w(() => {
+        var h;
+        return (h = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : h.call(r, "");
       });
     },
-    [r, c]
-  ), p = v(
-    (g) => {
-      c({
+    [r, a]
+  ), E = C(
+    (S) => {
+      a({
         triggerPriceUi: void 0,
-        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 || "");
+        triggerPricePercent: S
+      }), w(() => {
+        var h;
+        return (h = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : h.call(r, "");
+      }), w(() => {
+        var h;
+        return (h = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : h.call(r, S || "");
       });
     },
-    [r, c]
-  ), u = v(() => {
-    c({
+    [r, a]
+  ), u = C(() => {
+    a({
       triggerPricePercent: void 0,
       triggerPriceUi: void 0
     });
-  }, [c]);
+  }, [a]);
   return R(
     () => ({
       price: s.display,
       canonicalPriceRaw: s.raw,
       outputAmountPerTrade: o.triggerOutputAmountPerTrade,
       error: s.error,
-      onInputChange: h,
-      onPercentageChange: p,
+      onInputChange: m,
+      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,
-      h,
-      p,
+      m,
+      E,
       u,
       n,
       o.triggerOutputAmountPerTrade,
@@ -1632,53 +1755,68 @@ const yt = ({
     ]
   );
 };
-We(Qe.version);
+ke(st.version);
 export {
-  ur as DISCLAIMER_URL,
+  wr as DISCLAIMER_URL,
   ee as Disclaimer,
   d as ExecutionPhase,
   q as ExecutionStatus,
-  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,
+  vr as InputErrors,
+  Cr as Module,
+  Ar as ORBS_LOGO,
+  Tr as ORBS_SLTP_FAQ_URL,
+  Rr as ORBS_TWAP_FAQ_URL,
+  Nr as ORBS_WEBSITE_URL,
+  Lr as OrderFilter,
+  Fr as OrderSettlementError,
+  xr as OrderStatus,
+  Ur as OrderType,
+  Dr as Partners,
+  Mr as QuoteError,
+  Gr as SWAP_CAPABILITIES,
+  Br as SpotError,
+  sr 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,
-  xr as isNativeAddress,
-  Fr as isTxRejected,
-  Ur as toAmountRaw,
-  Dr as toAmountUI,
-  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,
+  Kr as TimeUnit,
+  _r as analytics,
+  Hr as calculateOrder,
+  qr as calculateOrderForm,
+  br as createClient,
+  Wr as eqIgnoreCase,
+  jr as executeOrder,
+  Vr as getOrderExecutionRate,
+  Qr as getOrderFillDelayMillis,
+  Jr as getOrderLimitPriceRate,
+  zr as getOrders,
+  $r as getQuote,
+  Yr as getTriggerPriceRate,
+  Xr as getTwapConfig,
+  Zr as invertPriceInput,
+  kr as isNativeAddress,
+  en as isQuoteFresh,
+  tn as isSwapSupported,
+  rn as isTxRejected,
+  nn as setUIVersion,
+  on as submitSwap,
+  sn as toAmountRaw,
+  an as toAmountUI,
+  ar as useAmountUi,
+  cr as useCancelOrder,
+  J as useClient,
+  dr as useDisclaimer,
+  ur as useDuration,
+  Sr as useExecution,
+  lr as useFillDelay,
+  mr as useHistoryOrder,
+  fr as useInputErrors,
+  gr as useLimitPrice,
   W as useOrderForm,
-  zt as useOrders,
-  rr as useOutputAmount,
-  nr as usePriceDisplay,
-  or as useSubmitButton,
-  sr as useTrades,
-  ar as useTriggerPrice
+  or as useOrders,
+  hr as useOutputAmount,
+  Er as usePriceDisplay,
+  Ir as useSubmitButton,
+  Or as useTrades,
+  Pr as useTriggerPrice,
+  cn as waitForOrder,
+  dn as watchOrder
 };