@orbs-network/spot-react 2.1.16 → 2.1.18

package/dist/spot-react.js

@@ -1,82 +1,88 @@
 "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.16", Qe = {
-  version: $e
-}, Ce = le(null), Ye = ({
+var Re = Object.defineProperty;
+var Le = (e, t, n) => t in e ? Re(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var te = (e, t, n) => Le(e, typeof t != "symbol" ? t + "" : t, n);
+import { OrderStatus as V, Module as j, createClient as xe, analytics as Fe, calculateOrder as Ne, isNativeAddress as $, eqIgnoreCase as ue, toAmountRaw as Y, toAmountUI as ee, isTxRejected as Ee, getOrderLimitPriceRate as Ue, getTriggerPriceRate as De, getOrderExecutionRate as Se, getOrderFillDelayMillis as Me, getTwapConfig as Ge, invertPriceInput as le, watchOrder as Be, executeOrder as _e, setUIVersion as He } from "@orbs-network/spot-ui";
+import { DISCLAIMER_URL as sr, InputErrors as ar, Module as cr, ORBS_LOGO as dr, ORBS_SLTP_FAQ_URL as ur, ORBS_TWAP_FAQ_URL as lr, ORBS_WEBSITE_URL as mr, OrderFilter as gr, OrderSettlementError as fr, OrderStatus as hr, OrderType as Pr, Partners as Er, QuoteError as Sr, SWAP_CAPABILITIES as Or, SpotError as Ir, TimeUnit as vr, analytics as wr, calculateOrder as pr, calculateOrderForm as Ar, createClient as yr, eqIgnoreCase as Cr, executeOrder as Tr, getMinimumOutputAmount as Rr, getOrderExecutionRate as Lr, getOrderFillDelayMillis as xr, getOrderLimitPriceRate as Fr, getOrders as Nr, getQuote as Ur, getTriggerPriceRate as Dr, getTwapConfig as Mr, invertPriceInput as Gr, isNativeAddress as Br, isQuoteFresh as _r, isSwapSupported as Hr, isTxRejected as qr, setUIVersion as Kr, submitSwap as Wr, toAmountRaw as Vr, toAmountUI as jr, waitForOrder as Jr, watchOrder as Qr } from "@orbs-network/spot-ui";
+import { jsx as N, jsxs as oe, Fragment as qe } from "react/jsx-runtime";
+import { createContext as se, useContext as ae, useState as Ke, useCallback as y, useMemo as C, useEffect as b, Component as We, useRef as Oe } from "react";
+import { useStore as Ve } from "zustand";
+import { createStore as je } from "zustand/vanilla";
+const Je = "2.1.18", Qe = {
+  version: Je
+}, Ie = se(null), ze = ({
   children: e,
   value: t
-}) => /* @__PURE__ */ U(Ce.Provider, { value: t, children: e }), x = () => {
-  const e = me(Ce);
+}) => /* @__PURE__ */ N(Ie.Provider, { value: t, children: e }), R = () => {
+  const e = ae(Ie);
   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([
-  d.PREPARING,
-  d.WRAPPING,
-  d.APPROVING,
-  d.SIGNING,
-  d.SUBMITTING
-]), Ze = {
-  [d.IDLE]: /* @__PURE__ */ new Set(),
-  [d.PREPARING]: /* @__PURE__ */ new Set([
-    d.PREPARING,
-    d.WRAPPING,
-    d.APPROVING,
-    d.SIGNING,
-    d.FAILED,
-    d.REJECTED
+var _ = /* @__PURE__ */ ((e) => (e[e.LOADING = 1] = "LOADING", e[e.SUCCESS = 2] = "SUCCESS", e[e.FAILED = 3] = "FAILED", e))(_ || {}), u = /* @__PURE__ */ ((e) => (e.IDLE = "idle", e.PREPARING = "preparing", e.WRAPPING = "wrapping", e.APPROVING = "approving", e.SIGNING = "signing", e.SUBMITTING = "submitting", e.SETTLING = "settling", e.SUCCESS = "success", e.FAILED = "failed", e.REJECTED = "rejected", e))(u || {}), X = /* @__PURE__ */ ((e) => (e.TRIGGER_MARKET_PRICE = "triggerMarketPriceDisclaimer", e.MARKET_PRICE = "marketOrderDisclaimer", e.LIMIT_PRICE = "limitOrderDisclaimer", e))(X || {}), Q = /* @__PURE__ */ ((e) => (e.WRAP = "wrap", e.APPROVE = "approve", e.CREATE = "create", e))(Q || {});
+const $e = /* @__PURE__ */ new Set([
+  u.PREPARING,
+  u.WRAPPING,
+  u.APPROVING,
+  u.SIGNING,
+  u.SUBMITTING,
+  u.SETTLING
+]), be = {
+  [u.IDLE]: /* @__PURE__ */ new Set(),
+  [u.PREPARING]: /* @__PURE__ */ new Set([
+    u.PREPARING,
+    u.WRAPPING,
+    u.APPROVING,
+    u.SIGNING,
+    u.FAILED,
+    u.REJECTED
   ]),
-  [d.WRAPPING]: /* @__PURE__ */ new Set([
-    d.WRAPPING,
-    d.APPROVING,
-    d.SIGNING,
-    d.FAILED,
-    d.REJECTED
+  [u.WRAPPING]: /* @__PURE__ */ new Set([
+    u.WRAPPING,
+    u.APPROVING,
+    u.SIGNING,
+    u.FAILED,
+    u.REJECTED
   ]),
-  [d.APPROVING]: /* @__PURE__ */ new Set([
-    d.APPROVING,
-    d.SIGNING,
-    d.FAILED,
-    d.REJECTED
+  [u.APPROVING]: /* @__PURE__ */ new Set([
+    u.APPROVING,
+    u.SIGNING,
+    u.FAILED,
+    u.REJECTED
   ]),
-  [d.SIGNING]: /* @__PURE__ */ new Set([
-    d.SIGNING,
-    d.SUBMITTING,
-    d.FAILED,
-    d.REJECTED
+  [u.SIGNING]: /* @__PURE__ */ new Set([
+    u.SIGNING,
+    u.SUBMITTING,
+    u.FAILED,
+    u.REJECTED
   ]),
-  [d.SUBMITTING]: /* @__PURE__ */ new Set([
-    d.SUCCESS,
-    d.FAILED,
-    d.REJECTED
+  [u.SUBMITTING]: /* @__PURE__ */ new Set([
+    u.SETTLING,
+    u.SUCCESS,
+    u.FAILED,
+    u.REJECTED
   ]),
-  [d.SUCCESS]: /* @__PURE__ */ new Set(),
-  [d.FAILED]: /* @__PURE__ */ new Set(),
-  [d.REJECTED]: /* @__PURE__ */ new Set()
-}, te = (e) => ({
-  phase: d.IDLE,
+  [u.SETTLING]: /* @__PURE__ */ new Set([
+    u.SUCCESS,
+    u.FAILED
+  ]),
+  [u.SUCCESS]: /* @__PURE__ */ new Set(),
+  [u.FAILED]: /* @__PURE__ */ new Set(),
+  [u.REJECTED]: /* @__PURE__ */ new Set()
+}, Z = (e) => ({
+  phase: u.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;
-  if (e === d.SUCCESS) return q.SUCCESS;
-  if (e === d.FAILED || e === d.REJECTED)
-    return q.FAILED;
-}, tt = (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) => {
+}), z = (e) => $e.has(e), ve = (e) => e === u.IDLE || e === u.FAILED || e === u.REJECTED, Ye = (e, t) => be[e].has(t), Xe = (e) => {
+  if (z(e)) return _.LOADING;
+  if (e === u.SUCCESS) return _.SUCCESS;
+  if (e === u.FAILED || e === u.REJECTED)
+    return _.FAILED;
+}, Ze = (e) => {
+  if (e === u.WRAPPING) return Q.WRAP;
+  if (e === u.APPROVING) return Q.APPROVE;
+  if (e === u.SIGNING || e === u.SUBMITTING)
+    return Q.CREATE;
+}, ce = (e) => {
   if (e instanceof Error) return e.message;
   if (typeof e == "string") return e;
   if (typeof e == "object" && e !== null) {
@@ -84,17 +90,17 @@ const Xe = /* @__PURE__ */ new Set([
     if (typeof t == "string") return t;
   }
   return "Unknown error";
-}, rt = (e) => {
+}, ke = (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);
+}, k = (e) => e instanceof Error ? e : new Error(ce(e)), re = (e) => {
+  const t = ce(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)
+    code: ke(e) || (n ? Number(n[1]) : 0)
   };
-}, I = (e) => {
+}, w = (e) => {
   if (e)
     try {
       const t = e();
@@ -102,7 +108,7 @@ const Xe = /* @__PURE__ */ new Set([
       });
     } catch {
     }
-}, nt = ({
+}, et = ({
   execution: e,
   account: t,
   chainId: n,
@@ -110,16 +116,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() && tt(o.inputAmountRaw, i))
     return o;
-}, it = (e, t) => {
+}, tt = (e, t) => {
   try {
     return BigInt(e) >= BigInt(t);
   } catch {
     return !1;
   }
-}, ot = 2e4, he = /* @__PURE__ */ new WeakMap(), Ee = (e) => {
-  const t = he.get(e);
+}, rt = 2e4, me = /* @__PURE__ */ new WeakMap(), ge = (e) => {
+  const t = me.get(e);
   if (t) return t;
   const n = {
     all: [...e].sort((r, i) => i.createdAt - r.createdAt),
@@ -130,26 +136,26 @@ const Xe = /* @__PURE__ */ new Set([
   };
   for (const r of n.all)
     switch (r.status) {
-      case J.Open:
+      case V.Open:
         n.open.push(r);
         break;
-      case J.Completed:
+      case V.Completed:
         n.completed.push(r);
         break;
-      case J.Cancelled:
+      case V.Cancelled:
         n.cancelled.push(r);
         break;
-      case J.Expired:
+      case V.Expired:
         n.expired.push(r);
         break;
     }
-  return he.set(e, n), n;
-}, st = (e, t) => {
+  return me.set(e, n), n;
+}, nt = (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) => {
+}, we = (e, t, n) => {
   if (!e) return;
   const r = new Map(
     t.map((o) => [o.historyKey, o])
@@ -157,39 +163,39 @@ const Xe = /* @__PURE__ */ new Set([
   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(() => {
+    !s || s.progress === o.progress && s.status === o.status || (i.push(s), s.status === V.Completed && o.status !== V.Completed && w(() => {
       var a;
       return (a = n == null ? void 0 : n.onOrderFilled) == null ? void 0 : a.call(n, s);
     }));
   }
-  i.length > 0 && I(() => {
+  i.length > 0 && w(() => {
     var o;
     return (o = n == null ? void 0 : n.onOrdersProgressUpdate) == null ? void 0 : o.call(n, i);
   });
-}, Ie = (e) => {
+}, fe = (e) => {
   if (e === null || typeof e != "object") return !1;
   const t = Object.getPrototypeOf(e);
   return t === Object.prototype || t === null;
-}, ae = (e, t) => {
+}, ne = (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) => ne(e[o], i)
     );
     return e.length === n.length && n.every((i, o) => i === e[o]) ? e : n;
   }
-  if (Ie(e) && Ie(t)) {
+  if (fe(e) && fe(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]);
+      const a = ne(e[s], t[s]);
       i[s] = a, a !== e[s] && (o = !1);
     }
     return o ? e : i;
   }
   return t;
-}, ct = (e, t) => e ? ae(e, t) : t, dt = async ({
+}, pe = (e, t) => e ? ne(e, t) : t, it = async ({
   client: e,
   account: t,
   signal: n,
@@ -204,11 +210,11 @@ const Xe = /* @__PURE__ */ new Set([
     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,
+  return we(i, a.orders, s), {
+    orders: r && !a.legacyLoaded ? nt(a.orders, i) : a.orders,
     legacyLoaded: o || a.legacyLoaded
   };
-}, ce = (e) => ({
+}, ie = (e) => ({
   tradeCount: e.tradeCount,
   tradeInterval: e.tradeInterval,
   orderDuration: e.orderDuration,
@@ -218,86 +224,86 @@ const Xe = /* @__PURE__ */ new Set([
   limitPricePercent: e.limitPricePercent,
   isMarketOrder: e.isMarketOrder,
   isPriceInverted: void 0
-}), ut = (e) => ({
-  ...ce(e),
+}), ot = (e) => ({
+  ...ie(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: Z()
+}), he = { isFetching: !1 }, Pe = { isFetching: !1 }, st = (e) => new Promise((t) => setTimeout(t, e)), at = (e) => {
+  let t = 0, n, r, i = 0, o, s, a, c = !1, E = 0, O = 0, d, m, g;
+  return je((h, S) => {
+    const T = async () => {
       if (!n || !r) return;
       if (o) return o;
-      const l = ++i, P = r;
-      m((f) => ({
+      const f = ++i, P = r;
+      h((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 I = (async () => {
+        let x;
+        for (let v = 0; v < 3; v++) {
+          if (f !== 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 p = await P();
+            return f !== i ? void 0 : (h({
+              client: { key: n, data: p, isFetching: !1 }
+            }), p);
+          } catch (p) {
+            if (x = p instanceof Error ? p : new Error(String(p)), f !== i) return;
+            v < 2 && await st(2 ** v * 1e3);
           }
         }
-        l === i && m({
-          client: { key: n, error: f, isFetching: !1 }
+        f === i && h({
+          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 o = I, I.finally(() => {
+        o === I && (o = void 0);
+      }), I;
+    }, L = async (f = !1, P = !1) => {
+      if (!f && E === 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);
+      if (d) {
+        if (!P) return d;
+        const l = s;
+        return await d, s !== l ? void 0 : L(f, P);
       }
-      const O = ++p, f = a, B = S().orders.data, w = new AbortController();
-      g = w, m((C) => ({
+      const I = ++O, x = a, v = S().orders.data, p = new AbortController();
+      m = p, h((l) => ({
         orders: {
           key: s,
-          data: C.orders.data,
+          data: l.orders.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const F = f(
-        B,
+      const F = x(
+        v,
         P ? !1 : c,
-        w.signal
-      ).then(({ orders: C, legacyLoaded: D }) => {
-        if (O !== p) return;
+        p.signal
+      ).then(({ orders: l, legacyLoaded: D }) => {
+        if (I !== O) return;
         c = D;
-        const G = ct(
+        const G = pe(
           S().orders.data,
-          C
+          l
         );
-        return m({
+        return h({
           orders: {
             key: s,
             data: G,
             isFetching: !1
           }
         }), G;
-      }).catch((C) => {
-        if (O !== p || w.signal.aborted)
+      }).catch((l) => {
+        if (I !== O || p.signal.aborted)
           return;
-        const D = C instanceof Error ? C : new Error(String(C));
-        m((G) => ({
+        const D = l instanceof Error ? l : new Error(String(l));
+        h((G) => ({
           orders: {
             key: s,
             data: G.orders.data,
@@ -306,132 +312,132 @@ const Xe = /* @__PURE__ */ new Set([
           }
         }));
       });
-      return u = F, F.finally(() => {
-        u === F && (u = void 0), g === w && (g = void 0);
+      return d = F, F.finally(() => {
+        d === F && (d = void 0), m === p && (m = void 0);
       }), F;
-    }, L = () => {
-      T();
+    }, q = () => {
+      L();
     }, 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 }
+      g && (clearInterval(g), g = void 0), typeof window < "u" && window.removeEventListener("focus", q), m == null || m.abort(), m = void 0, d = void 0, O++, h((f) => ({
+        orders: { ...f.orders, isFetching: !1 }
       }));
-    }, M = () => {
-      !s || !a || E || (T(!0), E = setInterval(() => {
-        T();
-      }, ot), typeof window < "u" && window.addEventListener("focus", L));
+    }, U = () => {
+      !s || !a || g || (L(!0), g = setInterval(() => {
+        L();
+      }, rt), typeof window < "u" && window.addEventListener("focus", q));
     };
     return {
-      client: Se,
-      orders: Oe,
-      state: ut(e),
-      configureClient: (l, P) => {
-        if (n === l) {
+      client: he,
+      orders: Pe,
+      state: ot(e),
+      configureClient: (f, P) => {
+        if (n === f) {
           r = P;
           return;
         }
-        n = l, r = P, i++, o = void 0, m({
-          client: l ? { key: l, isFetching: !1 } : Se
-        }), l && P && y();
+        n = f, r = P, i++, o = void 0, h({
+          client: f ? { key: f, isFetching: !1 } : he
+        }), f && P && T();
       },
-      refetchClient: y,
-      configureOrders: (l, P) => {
-        if (s === l) {
+      refetchClient: T,
+      configureOrders: (f, P) => {
+        if (s === f) {
           a = P;
           return;
         }
-        K(), s = l, a = P, c = !1, m({
-          orders: l ? { key: l, isFetching: !1 } : Oe
-        }), h > 0 && M();
+        K(), s = f, a = P, c = !1, h({
+          orders: f ? { key: f, isFetching: !1 } : Pe
+        }), E > 0 && U();
       },
-      registerOrdersConsumer: () => (h++, h === 1 && M(), () => {
-        h = Math.max(0, h - 1), h === 0 && K();
+      registerOrdersConsumer: () => (E++, E === 1 && U(), () => {
+        E = Math.max(0, E - 1), E === 0 && K();
       }),
-      refetchOrders: T,
-      addOrder: (l) => {
-        m((P) => {
-          const O = P.orders.data;
-          return O != null && O.some(
-            (f) => f.historyKey === l.historyKey
+      refetchOrders: L,
+      addOrder: (f) => {
+        h((P) => {
+          const I = P.orders.data;
+          return I != null && I.some(
+            (x) => x.historyKey === f.historyKey
           ) ? P : {
             orders: {
               ...P.orders,
-              data: [l, ...O ?? []]
+              data: [f, ...I ?? []]
             }
           };
         });
       },
-      setCancelOrder: (l, P) => {
-        m((O) => ({
+      setCancelOrder: (f, P) => {
+        h((I) => ({
           state: {
-            ...O.state,
-            cancelOrders: { ...O.state.cancelOrders, [l]: P }
+            ...I.state,
+            cancelOrders: { ...I.state.cancelOrders, [f]: P }
           }
         }));
       },
-      clearCancelOrder: (l) => {
-        m((P) => {
-          if (!(l in P.state.cancelOrders)) return P;
-          const O = { ...P.state.cancelOrders };
-          return delete O[l], { state: { ...P.state, cancelOrders: O } };
+      clearCancelOrder: (f) => {
+        h((P) => {
+          if (!(f in P.state.cancelOrders)) return P;
+          const I = { ...P.state.cancelOrders };
+          return delete I[f], { state: { ...P.state, cancelOrders: I } };
         });
       },
-      updateState: (l) => m((P) => ({ state: { ...P.state, ...l } })),
-      beginExecution: (l) => {
+      updateState: (f) => h((P) => ({ state: { ...P.state, ...f } })),
+      beginExecution: (f) => {
         let P;
-        return m((O) => be(O.state.currentExecution.phase) ? (P = {
-          ...l,
+        return h((I) => ve(I.state.currentExecution.phase) ? (P = {
+          ...f,
           executionId: ++t,
-          phase: d.PREPARING
+          phase: u.PREPARING
         }, {
           state: {
-            ...O.state,
+            ...I.state,
             currentExecution: P
           }
-        }) : O), P;
+        }) : I), P;
       },
-      replaceExecution: (l, P) => {
-        let O = !1;
-        return m((f) => {
-          const B = f.state.currentExecution;
-          return B.executionId !== l || P.executionId !== l || !ke(B.phase, P.phase) ? f : (O = !0, {
-            state: { ...f.state, currentExecution: P }
+      replaceExecution: (f, P) => {
+        let I = !1;
+        return h((x) => {
+          const v = x.state.currentExecution;
+          return v.executionId !== f || P.executionId !== f || !Ye(v.phase, P.phase) ? x : (I = !0, {
+            state: { ...x.state, currentExecution: P }
           });
-        }), O;
+        }), I;
       },
       returnToOrderForm: () => {
-        const l = S().state.currentExecution;
-        return $(l.phase) || l.phase === d.SUCCESS ? !1 : (m((P) => ({
+        const f = S().state.currentExecution;
+        return z(f.phase) || f.phase === u.SUCCESS ? !1 : (h((P) => ({
           state: {
             ...P.state,
-            currentExecution: te(l.completedWrap)
+            currentExecution: Z(f.completedWrap)
           }
         })), !0);
       },
-      syncFormDefaults: (l) => $(S().state.currentExecution.phase) ? !1 : (m((P) => ({
+      syncFormDefaults: (f) => z(S().state.currentExecution.phase) ? !1 : (h((P) => ({
         state: {
           ...P.state,
-          ...ce(l),
-          currentExecution: te()
+          ...ie(f),
+          currentExecution: Z()
         }
       })), !0),
-      startNewOrder: (l) => {
+      startNewOrder: (f) => {
         const { state: P } = S();
-        return $(P.currentExecution.phase) ? !1 : (m((O) => ({
+        return z(P.currentExecution.phase) ? !1 : (h((I) => ({
           state: {
-            ...O.state,
-            ...ce(l),
+            ...I.state,
+            ...ie(f),
             isMarketOrder: P.isMarketOrder,
-            currentExecution: te()
+            currentExecution: Z()
           }
         })), !0);
       }
     };
   });
-}, ye = (e) => {
+}, Ae = (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 === j.LIMIT || e.module === j.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,34 +446,34 @@ const Xe = /* @__PURE__ */ new Set([
     triggerPricePercent: t == null ? void 0 : t.triggerPricePercent,
     limitPricePercent: t == null ? void 0 : t.limitPricePercent
   };
-}, Re = le(null), gt = ({
+}, ye = se(null), ct = ({
   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] = Ke(() => at(t));
+  return /* @__PURE__ */ N(ye.Provider, { value: n, children: e });
+}, W = () => {
+  const e = ae(ye);
   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 = W();
+  return Ve(t, e);
+}, dt = { isFetching: !1 }, ut = () => {
+  const { partner: e, chainId: t, hasChainId: n } = R(), r = W(), i = !!(t && n), o = i ? `${e}:${t}` : void 0, s = y(() => t ? xe(e, t) : Promise.reject(
     new Error("Spot is unavailable on the connected chain")
   ), [t, e]);
-  ie(() => {
+  b(() => {
     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 } = R(), r = W(), i = A((E) => E.client), o = !!(t && n), s = o ? `${e}:${t}` : void 0, a = i.key === s ? i : dt, c = y(() => {
     if (!o || !s) return Promise.resolve(void 0);
-    const h = r.getState();
-    return h.client.key !== s ? Promise.resolve(void 0) : h.refetchClient();
+    const E = r.getState();
+    return E.client.key !== s ? Promise.resolve(void 0) : E.refetchClient();
   }, [o, s, r]);
-  return R(
+  return C(
     () => ({
       data: a.data,
       error: a.error,
@@ -477,56 +483,58 @@ const Xe = /* @__PURE__ */ new Set([
     }),
     [a, o, c]
   );
-}, ht = { isFetching: !1 }, Te = (e, t, n) => e && t ? JSON.stringify([
+}, lt = { isFetching: !1 }, de = (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, mt = () => {
+  const { account: e, supportLegacyOrders: t, callbacks: n } = R(), { data: r } = J(), i = W(), o = de(e, r, t), s = !!o, a = y(
+    async (c, E, O) => !e || !r ? { orders: [], legacyLoaded: !1 } : it({
       client: r,
       account: e,
-      signal: p,
+      signal: O,
       supportLegacyOrders: t,
       previousOrders: c,
-      legacyLoaded: h,
+      legacyLoaded: E,
       callbacks: n
     }),
     [e, n, r, t]
   );
-  ie(() => {
+  b(() => {
     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]);
+}, Ce = () => {
+  const { account: e, supportLegacyOrders: t } = R(), { data: n } = J(), r = W(), i = de(e, n, t), o = !!i, s = y((a = !1) => !o || !i || r.getState().orders.key !== i ? Promise.resolve(void 0) : r.getState().refetchOrders(!0, a), [o, i, r]);
   return { enabled: o, key: i, refetch: s };
-}, It = () => {
-  const e = V();
-  return v(
-    (t) => e.getState().addOrder(t),
-    [e]
+}, gt = () => {
+  const e = W(), { account: t, supportLegacyOrders: n } = R(), { data: r } = J(), i = de(t, r, n);
+  return y(
+    (o) => {
+      !i || e.getState().orders.key !== i || e.getState().addOrder(o);
+    },
+    [i, e]
   );
-}, St = () => {
-  const e = V();
-  return v(
+}, ft = () => {
+  const e = W();
+  return y(
     () => e.getState().refetchOrders(),
     [e]
   );
-}, zt = () => {
+}, Wt = () => {
   const e = A((c) => c.orders), t = A(
     (c) => c.registerOrdersConsumer
-  ), { enabled: n, key: r, refetch: i } = Ne(), o = e.key === r ? e : ht;
-  ie(() => t(), [t]);
-  const s = R(
-    () => o.data === void 0 ? void 0 : Ee(o.data),
+  ), { enabled: n, key: r, refetch: i } = Ce(), o = e.key === r ? e : lt;
+  b(() => t(), [t]);
+  const s = C(
+    () => o.data === void 0 ? void 0 : ge(o.data),
     [o.data]
-  ), a = v(async () => {
+  ), a = y(async () => {
     const c = await i();
-    return c === void 0 ? void 0 : Ee(c);
+    return c === void 0 ? void 0 : ge(c);
   }, [i]);
-  return R(
+  return C(
     () => ({
       data: s,
       error: o.error,
@@ -537,13 +545,13 @@ const Xe = /* @__PURE__ */ new Set([
     }),
     [o, s, n, a]
   );
-}, Ot = ({ children: e }) => (ft(), Et(), e), pt = ({
+}, ht = ({ children: e }) => (ut(), mt(), e), Pt = ({
   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__ */ oe("div", { className: "spot-client-error-fallback", role: "alert", children: [
+  /* @__PURE__ */ N("p", { children: e.message || "Unable to load Spot configuration." }),
+  /* @__PURE__ */ N(
     "button",
     {
       type: "button",
@@ -553,16 +561,16 @@ const Xe = /* @__PURE__ */ new Set([
       children: n ? "Retrying…" : "Retry"
     }
   )
-] }), At = ({
+] }), Et = ({
   children: e,
-  fallback: t = pt
+  fallback: t = Pt
 }) => {
-  const { hasChainId: n } = x(), { data: r, error: i, isFetching: o, refetch: s } = Y(), a = v(async () => {
+  const { hasChainId: n } = R(), { data: r, error: i, isFetching: o, refetch: s } = J(), a = y(async () => {
     await s();
   }, [s]);
-  return /* @__PURE__ */ ue(Ke, { children: [
+  return /* @__PURE__ */ oe(qe, { children: [
     e,
-    !r && i && n ? /* @__PURE__ */ U(
+    !r && i && n ? /* @__PURE__ */ N(
       t,
       {
         error: i,
@@ -571,26 +579,26 @@ const Xe = /* @__PURE__ */ new Set([
       }
     ) : null
   ] });
-}, vt = ({
+}, St = ({
   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__ */ oe("div", { className: "twap-error-fallback", role: "alert", children: [
+  /* @__PURE__ */ N("p", { children: "Something went wrong" }),
+  /* @__PURE__ */ N("button", { type: "button", onClick: e, children: "Retry" })
+] }), Ot = ({
   children: e,
-  fallback: t = vt
+  fallback: t = St
 }) => {
-  const n = V(), r = v((i) => {
+  const n = W(), r = y((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) ?? Fe).onCrash(i);
   }, [n]);
-  return /* @__PURE__ */ U(Ct, { fallback: t, reportCrash: r, children: e });
+  return /* @__PURE__ */ N(It, { fallback: t, reportCrash: r, children: e });
 };
-class Ct extends He {
+class It extends We {
   constructor() {
     super(...arguments);
-    oe(this, "state", {});
-    oe(this, "resetErrorBoundary", () => {
+    te(this, "state", {});
+    te(this, "resetErrorBoundary", () => {
       this.setState({ error: void 0 });
     });
   }
@@ -604,7 +612,7 @@ class Ct extends He {
     const { error: n } = this.state;
     if (n) {
       const r = this.props.fallback;
-      return /* @__PURE__ */ U(
+      return /* @__PURE__ */ N(
         r,
         {
           error: n,
@@ -615,109 +623,112 @@ class Ct extends He {
     return this.props.children;
   }
 }
-const yt = ({
+const vt = ({
   children: e,
   defaults: t,
   scopeKey: n
 }) => {
-  const r = V(), i = A(
+  const r = W(), i = A(
     (s) => s.state.currentExecution.phase
-  ), o = je(n);
-  return ie(() => {
-    o.current === n || $(i) || r.getState().syncFormDefaults(t) && (o.current = n);
+  ), o = Oe(n);
+  return b(() => {
+    o.current === n || z(i) || r.getState().syncFormDefaults(t) && (o.current = n);
   }, [t, i, n, r]), e;
-}, Le = le(null), Rt = ({ children: e }) => {
+}, Te = se(null), wt = ({ children: e }) => {
   const {
     inputToken: t,
     outputToken: n,
     inputAmountUi: r,
     quotedOutputAmountRaw: i,
-    inputTokenUsdPrice: o,
-    outputTokenUsdPrice: s,
-    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
-  ), T = A(
-    (f) => f.state.limitPricePercent
+    minimumOutputAmountRaw: o,
+    inputTokenUsdPrice: s,
+    outputTokenUsdPrice: a,
+    minTradeSizeUsd: c,
+    inputBalanceRaw: E,
+    displayFeePercent: O,
+    priceProtectionPercent: d,
+    module: m
+  } = R(), g = A((v) => v.state.tradeCount), h = A((v) => v.state.tradeInterval), S = A((v) => v.state.orderDuration), T = A(
+    (v) => v.state.limitPriceUi
   ), L = A(
-    (f) => f.state.triggerPricePercent
+    (v) => v.state.triggerPriceUi
+  ), q = A(
+    (v) => v.state.limitPricePercent
   ), 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(
+    (v) => v.state.triggerPricePercent
+  ), U = A(
+    (v) => v.state.isPriceInverted
+  ), f = A((v) => v.state.isMarketOrder), P = A((v) => {
+    const p = v.state.currentExecution;
+    return p.phase !== u.IDLE ? p.form : void 0;
+  }), I = C(
     () => ({
-      module: u,
+      module: m,
       inputTokenDecimals: (t == null ? void 0 : t.decimals) ?? 0,
       outputTokenDecimals: (n == null ? void 0 : n.decimals) ?? 0,
       quotedOutputAmountRaw: i,
-      inputTokenUsdPrice: o,
-      outputTokenUsdPrice: s,
-      minTradeSizeUsd: a,
-      priceProtectionPercent: p,
-      displayFeePercent: h,
-      inputBalanceRaw: c,
+      minimumOutputAmountRaw: o,
+      inputTokenUsdPrice: s,
+      outputTokenUsdPrice: a,
+      minTradeSizeUsd: c,
+      priceProtectionPercent: d,
+      displayFeePercent: O,
+      inputBalanceRaw: E,
       userInput: {
         inputAmountUi: r,
-        isMarketOrder: !!M,
+        isMarketOrder: !!f,
         tradeCount: g,
-        tradeInterval: E,
-        orderDuration: m,
-        limitPriceUi: S,
-        limitPricePercent: T,
-        triggerPriceUi: y,
-        triggerPricePercent: L,
-        isPriceInverted: K
+        tradeInterval: h,
+        orderDuration: S,
+        limitPriceUi: T,
+        limitPricePercent: q,
+        triggerPriceUi: L,
+        triggerPricePercent: K,
+        isPriceInverted: U
       }
     }),
     [
+      o,
       n == null ? void 0 : n.decimals,
-      s,
-      h,
-      i,
       a,
-      u,
-      p,
+      O,
+      i,
       c,
+      m,
+      d,
+      E,
       t == null ? void 0 : t.decimals,
-      o,
+      s,
+      U,
+      f,
+      q,
       K,
-      M,
-      T,
-      L,
       g,
-      m,
-      E,
       S,
+      h,
+      T,
       r,
-      y
+      L
     ]
-  ), O = R(() => {
-    if (l) return l;
-    const f = Ge(P);
-    return t && n ? f : {
-      ...f,
+  ), x = C(() => {
+    if (P) return P;
+    const v = Ne(I);
+    return t && n ? v : {
+      ...v,
       isReady: !1,
       canSubmit: !1
     };
-  }, [l, t, n, P]);
-  return /* @__PURE__ */ U(Le.Provider, { value: O, children: e });
-}, W = () => {
-  const e = me(Le);
+  }, [P, t, n, I]);
+  return /* @__PURE__ */ N(Te.Provider, { value: x, children: e });
+}, H = () => {
+  const e = ae(Te);
   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({
+}, pt = (e) => {
+  var O, d, m, g, h, S, T, L, q, K, U, f;
+  const t = Number.isSafeInteger(e.chainId) && Number(e.chainId) > 0, n = (O = e.wrappedNativeToken) == null ? void 0 : O.address, r = !!(n && ($((d = e.inputToken) == null ? void 0 : d.address) && ue(((m = e.outputToken) == null ? void 0 : m.address) || "", n) || ue(((g = e.inputToken) == null ? void 0 : g.address) || "", n) && $((h = e.outputToken) == null ? void 0 : h.address))), i = r ? Y(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 = C(
+    () => Ae({
       module: e.module,
       overrides: e.overrides
     }),
@@ -726,20 +737,21 @@ const yt = ({
     e.partner,
     e.chainId,
     e.module,
-    (y = e.inputToken) == null ? void 0 : y.address,
-    (T = e.inputToken) == null ? void 0 : T.decimals,
-    (L = e.outputToken) == null ? void 0 : L.address,
+    (T = e.inputToken) == null ? void 0 : T.address,
+    (L = e.inputToken) == null ? void 0 : L.decimals,
+    (q = e.outputToken) == null ? void 0 : q.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,
+    (U = e.wrappedNativeToken) == null ? void 0 : U.address,
+    (f = e.wrappedNativeToken) == null ? void 0 : f.decimals,
     a
-  ]), h = R(
+  ]), E = C(
     () => ({
       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 +771,8 @@ const yt = ({
       overrides: e.overrides
     }),
     [
+      e.marketQuote.isLoading,
+      e.marketQuote.minimumOutputAmountRaw,
       e.account,
       e.callbacks,
       e.chainId,
@@ -783,29 +797,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: a, formScopeKey: c, trading: E };
+}, Vt = (e) => {
+  const { initialState: t, formScopeKey: n, trading: r } = pt(e);
+  return /* @__PURE__ */ N(ze, { value: r, children: /* @__PURE__ */ N(ct, { initialState: t, children: /* @__PURE__ */ N(Ot, { fallback: e.errorFallback, children: /* @__PURE__ */ N(ht, { children: /* @__PURE__ */ N(
+    vt,
     {
       defaults: t,
       scopeKey: n,
-      children: /* @__PURE__ */ U(At, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ U(Rt, { children: e.children }) })
+      children: /* @__PURE__ */ N(Et, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ N(wt, { children: e.children }) })
     }
   ) }) }) }) });
-}, Qt = (e, t) => R(() => ne(t, e), [e, t]), Nt = 60, Lt = () => {
-  const { refetch: e } = Ne();
-  return v(
+}, jt = (e, t) => C(() => ee(t, e), [e, t]), At = 60, yt = () => {
+  const { refetch: e } = Ce();
+  return y(
     async (t, n = !1) => {
-      for (let r = 0; r < Nt; r++) {
+      for (let r = 0; r < At; 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) === V.Cancelled)
           return;
         await new Promise((s) => setTimeout(s, 1e3));
       }
@@ -815,52 +829,52 @@ const yt = ({
     },
     [e]
   );
-}, xt = (e) => ({
+}, Ct = (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 () => {
-    const u = e == null ? void 0 : e.historyKey;
+  status: V.Cancelled
+}), Jt = (e) => {
+  const { account: t, walletInteractions: n, callbacks: r } = R(), { data: i } = J(), o = yt(), s = A((d) => d.state.cancelOrders[(e == null ? void 0 : e.historyKey) ?? ""]), a = A((d) => d.setCancelOrder), c = A((d) => d.clearCancelOrder), E = y(async () => {
+    const d = 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 m = e.historyKey;
+      a(m, { status: _.LOADING }), w(() => {
+        var T;
+        return (T = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : T.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, {
-        status: q.LOADING,
-        txHash: m
-      }), await o(g, e.version === 1);
-      const S = xt(e);
-      return a(g, {
-        status: q.SUCCESS,
-        txHash: m
-      }), I(
+      const g = i.getCancelOrderRequest(e), h = await n.cancelOrder(g);
+      if (!h) throw new Error("failed to cancel order");
+      w(() => i.analytics.onCancelOrderSuccess(h)), a(m, {
+        status: _.LOADING,
+        txHash: h
+      }), await o(m, e.version === 1);
+      const S = Ct(e);
+      return a(m, {
+        status: _.SUCCESS,
+        txHash: h
+      }), w(
         () => {
-          var y;
-          return (y = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : y.call(r, {
+          var T;
+          return (T = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : T.call(r, {
             order: S,
-            txHash: m
+            txHash: h
           });
         }
-      ), m;
-    } catch (g) {
-      ve(g) ? u && c(u) : (u && a(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));
+      ), h;
+    } catch (m) {
+      Ee(m) ? d && c(d) : (d && a(d, {
+        status: _.FAILED,
+        error: ce(m)
+      }), w(() => i == null ? void 0 : i.analytics.onCancelOrderError(m))), w(() => {
+        var g;
+        return (g = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : g.call(r, k(m));
       });
     }
   }, [
@@ -872,46 +886,46 @@ const yt = ({
     o,
     a,
     n
-  ]), p = R(() => {
-    const u = s;
+  ]), O = C(() => {
+    const d = s;
     return {
-      isLoading: (u == null ? void 0 : u.status) === q.LOADING,
+      isLoading: (d == null ? void 0 : d.status) === _.LOADING,
       disabled: !!(e && !i),
-      isSuccess: (u == null ? void 0 : u.status) === q.SUCCESS,
-      isError: (u == null ? void 0 : u.status) === q.FAILED,
-      error: u == null ? void 0 : u.error,
-      txHash: u == null ? void 0 : u.txHash
+      isSuccess: (d == null ? void 0 : d.status) === _.SUCCESS,
+      isError: (d == null ? void 0 : d.status) === _.FAILED,
+      error: d == null ? void 0 : d.error,
+      txHash: d == null ? void 0 : d.txHash
     };
   }, [s, e, i]);
-  return R(() => ({ cancelOrder: h, ...p }), [h, p]);
-}, Xt = () => {
-  const { module: e, values: t } = W();
-  if (t.isMarketOrder && e === X.STOP_LOSS)
-    return ee.TRIGGER_MARKET_PRICE;
-  if (e === X.LIMIT || e === X.TWAP)
-    return t.isMarketOrder ? ee.MARKET_PRICE : ee.LIMIT_PRICE;
-}, Zt = () => {
-  const { callbacks: e } = x(), t = A((a) => a.updateState), { schedule: n } = W(), { duration: r } = n, i = v(
+  return C(() => ({ cancelOrder: E, ...O }), [E, O]);
+}, Qt = () => {
+  const { module: e, values: t } = H();
+  if (t.isMarketOrder && e === j.STOP_LOSS)
+    return X.TRIGGER_MARKET_PRICE;
+  if (e === j.LIMIT || e === j.TWAP)
+    return t.isMarketOrder ? X.MARKET_PRICE : X.LIMIT_PRICE;
+}, zt = () => {
+  const { callbacks: e } = R(), t = A((a) => a.updateState), { schedule: n } = H(), { duration: r } = n, i = y(
     (a) => {
-      t({ orderDuration: a }), I(() => {
+      t({ orderDuration: a }), w(() => {
         var c;
         return (c = e == null ? void 0 : e.onOrderDurationChange) == null ? void 0 : c.call(e, a);
       });
     },
     [e, t]
-  ), o = v(
+  ), o = y(
     (a) => {
       const c = Number(a);
       Number.isFinite(c) && i({ unit: r.unit, value: c });
     },
     [r.unit, i]
-  ), s = v(
+  ), s = y(
     (a) => {
       i({ unit: a, value: r.value });
     },
     [r.value, i]
   );
-  return R(
+  return C(
     () => ({
       duration: r,
       onChange: i,
@@ -922,26 +936,26 @@ 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(
+}, $t = () => {
+  const { callbacks: e } = R(), t = A((a) => a.updateState), { schedule: n } = H(), { fillDelay: r } = n, i = y(
     (a) => {
-      t({ tradeInterval: a }), I(() => {
+      t({ tradeInterval: a }), w(() => {
         var c;
         return (c = e == null ? void 0 : e.onTradeIntervalChange) == null ? void 0 : c.call(e, a);
       });
     },
     [e, t]
-  ), o = v(
+  ), o = y(
     (a) => {
       const c = Number(a);
       Number.isFinite(c) && i({ unit: r.unit, value: c });
     },
     [r.unit, i]
-  ), s = v(
+  ), s = y(
     (a) => i({ unit: a, value: r.value }),
     [r.value, i]
   );
-  return R(
+  return C(
     () => ({
       onInputChange: o,
       onUnitSelect: s,
@@ -952,55 +966,55 @@ const yt = ({
     }),
     [r, i, o, s, n]
   );
-}, _ = (e, t) => ({
+}, B = (e, t) => ({
   raw: e || "",
-  ui: ne(e, t)
-}), Ft = (e, t, n) => R(() => !e || !t || !n ? [] : e.map((r) => ({
+  ui: ee(e, t)
+}), Tt = (e, t, n) => C(() => !e || !t || !n ? [] : e.map((r) => ({
   rawFill: r,
   inputToken: t,
   outputToken: n,
-  inputAmount: _(r.inAmount, t.decimals),
-  outputAmount: _(r.outAmount, n.decimals),
+  inputAmount: B(r.inAmount, t.decimals),
+  outputAmount: B(r.outAmount, n.decimals),
   timestamp: r.timestamp,
   txHash: r.txHash,
-  executionRate: we(
+  executionRate: Se(
     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]), bt = (e, t, n) => {
+  const { chainId: r, partner: i } = R(), o = C(() => {
     if (!(!t || !n || !e || e.isMarketPrice))
-      return Me(
+      return Ue(
         e,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), s = R(() => {
+  }, [t, e, n]), s = C(() => {
     if (!(!t || !n || !e))
-      return Be(
+      return De(
         e,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), a = R(() => {
+  }, [t, e, n]), a = C(() => {
     if (!(!t || !n || !e))
-      return we(
+      return Se(
         e.srcAmountFilled,
         e.dstAmountFilled,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), c = R(() => e ? _e(
+  }, [t, e, n]), c = C(() => e ? Me(
     e,
-    r ? qe(i, r) : void 0
-  ) : 0, [e, i, r]), h = Ft(e == null ? void 0 : e.fills, t, n);
-  return R(() => {
+    r ? Ge(i, r) : void 0
+  ) : 0, [e, i, r]), E = Tt(e == null ? void 0 : e.fills, t, n);
+  return C(() => {
     if (e != null && e.id)
       return {
         original: e,
-        fills: h,
+        fills: E,
         inputToken: t,
         outputToken: n,
         orderType: e.type,
@@ -1009,46 +1023,46 @@ const yt = ({
         totalTrades: e.totalTradesAmount || 0,
         tradeInterval: c,
         recipient: e.maker || "",
-        inputAmount: _(e.srcAmount, t == null ? void 0 : t.decimals),
-        limitPrice: _(
-          k(o, n == null ? void 0 : n.decimals),
+        inputAmount: B(e.srcAmount, t == null ? void 0 : t.decimals),
+        limitPrice: B(
+          Y(o, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
-        inputAmountPerTrade: _(
+        inputAmountPerTrade: B(
           e.srcAmountPerTrade,
           t == null ? void 0 : t.decimals
         ),
-        minOutputAmountPerTrade: _(
+        minOutputAmountPerTrade: B(
           e.dstMinAmountPerTrade,
           n == null ? void 0 : n.decimals
         ),
-        minOutputAmount: _(
+        minOutputAmount: B(
           e.dstMinAmountTotal,
           n == null ? void 0 : n.decimals
         ),
-        triggerPrice: _(
-          k(s, n == null ? void 0 : n.decimals),
+        triggerPrice: B(
+          Y(s, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         id: e.id,
-        inputAmountFilled: _(
+        inputAmountFilled: B(
           e.srcAmountFilled,
           t == null ? void 0 : t.decimals
         ),
-        outputAmountFilled: _(
+        outputAmountFilled: B(
           e.dstAmountFilled,
           n == null ? void 0 : n.decimals
         ),
         progress: e.progress,
-        executionPrice: _(
-          k(a, n == null ? void 0 : n.decimals),
+        executionPrice: B(
+          Y(a, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         version: e.version
       };
   }, [
     e,
-    h,
+    E,
     t,
     n,
     c,
@@ -1056,96 +1070,96 @@ const yt = ({
     s,
     a
   ]);
-}, er = () => {
-  const { marketPriceLoading: e } = x(), t = W().errors.primary;
+}, Yt = () => {
+  const { marketPriceLoading: e } = R(), t = H().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(() => {
+}, Xt = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = R(), { limitPrice: i, values: o, module: s, isInverted: a } = H(), c = A((h) => h.updateState), E = y(
+    (h) => {
+      c({ limitPriceUi: h, limitPricePercent: null }), w(() => {
         var S;
-        return (S = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : S.call(r, m || "");
-      }), I(() => {
+        return (S = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : S.call(r, h || "");
+      }), w(() => {
         var S;
         return (S = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : S.call(r, "");
       });
     },
     [r, c]
-  ), p = v(
-    (m) => {
+  ), O = y(
+    (h) => {
       c({
         limitPriceUi: void 0,
-        limitPricePercent: m
-      }), I(() => {
+        limitPricePercent: h
+      }), w(() => {
         var S;
         return (S = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : S.call(r, "");
-      }), I(() => {
+      }), w(() => {
         var S;
-        return (S = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : S.call(r, m || "");
+        return (S = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : S.call(r, h || "");
       });
     },
     [r, c]
-  ), u = v(() => {
+  ), d = y(() => {
     c({
       limitPriceUi: void 0,
       limitPricePercent: void 0
     });
-  }, [c]), g = !o.isMarketOrder, E = v(() => {
+  }, [c]), m = !o.isMarketOrder, g = y(() => {
     c({
       isMarketOrder: !o.isMarketOrder,
       ...o.isMarketOrder ? {} : { isPriceInverted: !1 },
-      ...!o.isMarketOrder && s === X.STOP_LOSS ? { limitPricePercent: void 0 } : {}
+      ...!o.isMarketOrder && s === j.STOP_LOSS ? { limitPricePercent: void 0 } : {}
     });
   }, [s, c, o.isMarketOrder]);
-  return R(
+  return C(
     () => ({
       price: i.display,
       canonicalPriceRaw: i.raw,
       error: i.error,
-      onInputChange: h,
-      onPercentageChange: p,
-      onReset: u,
+      onInputChange: E,
+      onPercentageChange: O,
+      onReset: d,
       inputToken: t,
       outputToken: n,
       displayInputToken: a ? n : t,
       displayOutputToken: a ? t : n,
       percentage: i.percentage,
       isLoading: !!e,
-      isEnabled: g,
-      toggle: E,
+      isEnabled: m,
+      toggle: g,
       isTypedValue: i.isTypedValue
     }),
     [
       t,
       a,
-      g,
+      m,
       i,
       e,
-      h,
-      p,
-      u,
+      E,
+      O,
+      d,
       n,
-      E
+      g
     ]
   );
-}, rr = () => {
-  const { marketPriceLoading: e } = x(), { outputAmount: t } = W();
-  return R(
+}, Zt = () => {
+  const { marketPriceLoading: e } = R(), { outputAmount: t } = H();
+  return C(
     () => ({
       amount: t,
       isLoading: !!e
     }),
     [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(() => {
+}, kt = () => {
+  const { inputToken: e, outputToken: t } = R(), n = A((c) => c.updateState), { isInverted: r, values: i } = H(), o = A((c) => c.state.triggerPriceUi), s = A((c) => c.state.limitPriceUi), a = y(() => {
     n({
       isPriceInverted: !r,
-      ...o !== void 0 ? { triggerPriceUi: fe(o) } : {},
-      ...s !== void 0 ? { limitPriceUi: fe(s) } : {}
+      ...o !== void 0 ? { triggerPriceUi: le(o) } : {},
+      ...s !== void 0 ? { limitPriceUi: le(s) } : {}
     });
   }, [n, r, o, s]);
-  return R(
+  return C(
     () => ({
       onInvert: a,
       isInverted: r,
@@ -1157,37 +1171,49 @@ const yt = ({
     }),
     [e, r, a, t, i.isMarketOrder]
   );
-}, pe = 3, Ut = 3e3, Dt = (e) => new Promise((t) => setTimeout(t, e)), de = (e, t) => {
+}, Rt = 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 a = e.subscribe(s);
+  s();
+  try {
+    let c = n;
+    for await (const E of Be({ order: n, signal: o.signal }))
+      o.signal.aborted || (w(() => {
+        const O = e.getState().orders.data ?? [n], d = O.find((m) => m.historyKey === n.historyKey);
+        e.setState((m) => ({ orders: {
+          ...m.orders,
+          data: pe(m.orders.data, d ? O.map((g) => g.historyKey === n.historyKey ? E : g) : [E, ...O])
+        } })), we([d ?? n], [E], t);
+      }), c = E);
+    return c;
+  } finally {
+    a(), i.removeEventListener("abort", s), o.abort();
+  }
+}, Lt = (e) => new Promise((t) => setTimeout(t, e)), xt = (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) => {
+}, Ft = (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 === j.SWAP && !e.waitForOrderFill)
+    throw new Error("Swap settlement tracking is unavailable");
   const n = e.form.inputAmount.raw;
-  return de(n, "Input amount"), {
+  return xt(n, "Input amount"), {
     account: e.account,
     chainId: e.chainId,
     inputToken: e.inputToken,
@@ -1196,7 +1222,7 @@ const yt = ({
     client: e.client,
     inputAmountRaw: n
   };
-}, Mt = ({
+}, Nt = ({
   analytics: e,
   account: t,
   chainId: n,
@@ -1205,7 +1231,7 @@ const yt = ({
   preparedOrder: o
 }) => {
   const { form: s, values: a } = o;
-  I(
+  w(
     () => e.onRequestOrder({
       account: t,
       chainId: n,
@@ -1223,7 +1249,7 @@ const yt = ({
       chunksAmount: a.totalTrades
     })
   );
-}, Bt = async (e) => {
+}, Ut = async (e) => {
   const {
     form: t,
     walletInteractions: n,
@@ -1233,13 +1259,13 @@ const yt = ({
     getCurrentExecution: s,
     beginExecution: a,
     replaceExecution: c,
-    wait: h = Dt
+    wait: E = Lt
   } = e;
-  let p;
+  let O;
   try {
-    p = Gt(e);
-  } catch (w) {
-    const F = re(w), C = se(w), D = a({
+    O = Ft(e);
+  } catch (p) {
+    const F = k(p), l = re(p), D = a({
       form: t,
       inputToken: e.inputToken,
       outputToken: e.outputToken,
@@ -1247,256 +1273,207 @@ const yt = ({
     });
     throw D && c(D.executionId, {
       ...D,
-      phase: d.FAILED,
+      phase: u.FAILED,
       error: F,
-      parsedError: C
-    }), I(
+      parsedError: l
+    }), w(
       () => {
         var G;
-        return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, C);
+        return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, l);
       }
     ), F;
   }
   const {
-    account: u,
-    chainId: g,
-    inputToken: E,
-    orderInputToken: m,
+    account: d,
+    chainId: m,
+    inputToken: g,
+    orderInputToken: h,
     outputToken: S,
-    client: y,
-    inputAmountRaw: T
-  } = p, { analytics: L } = y, K = s(), M = nt({
+    client: T,
+    inputAmountRaw: L
+  } = O, { analytics: q } = T, K = s(), U = et({
     execution: K,
-    account: u,
-    chainId: g,
-    inputTokenAddress: E.address,
-    inputAmountRaw: T
-  }), l = a({
+    account: d,
+    chainId: m,
+    inputTokenAddress: g.address,
+    inputAmountRaw: L
+  }), f = a({
     form: t,
-    inputToken: E,
+    inputToken: g,
     outputToken: S,
-    chainId: g,
-    completedWrap: M,
-    wrapTxHash: M == null ? void 0 : M.txHash
+    chainId: m,
+    completedWrap: U,
+    wrapTxHash: U == null ? void 0 : U.txHash
   });
-  if (!l) return;
-  const P = l.executionId;
-  let O = l;
-  const f = (w, F = {}) => {
-    const C = {
-      ...O,
+  if (!f) return;
+  const P = f.executionId;
+  let I = f;
+  const x = (p, F = {}) => {
+    const l = {
+      ...I,
       ...F,
       executionId: P,
-      phase: w
+      phase: p
     };
-    if (!c(P, C))
+    if (!c(P, l))
       throw new Error("Execution is no longer current");
-    O = C;
-  }, B = (w, F = {}) => {
-    const C = {
-      ...O,
+    I = l;
+  }, v = (p, F = {}) => {
+    const l = {
+      ...I,
       ...F,
       executionId: P,
-      phase: w
+      phase: p
     };
-    return c(P, C) ? (O = C, !0) : !1;
+    return c(P, l) ? (I = l, !0) : !1;
   };
   try {
-    const w = Q(E.address) && !M, F = !await Ae({
-      client: y,
+    const { order: p } = await _e({
+      client: T,
+      account: d,
+      inputTokenAddress: h.address,
+      inputAmountRaw: L,
+      nativeInput: $(g.address),
+      completedWrapTxHash: U == null ? void 0 : U.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)
-          });
-        }
-      );
-    }
-    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;
+      wait: E,
+      signal: e.signal,
+      prepareOrder: () => T.prepareOrder({
+        form: t,
+        inputTokenAddress: h.address,
+        outputTokenAddress: S.address,
+        swapperAddress: d
+      }),
+      validateContext: () => {
+        if (s().executionId !== P) throw new Error("Execution is no longer current");
+      },
+      onUpdate: (l) => {
+        const D = l.steps.map((M) => ({ wrap: Q.WRAP, approve: Q.APPROVE, create: Q.CREATE })[M]), G = l.phase;
+        x(G, {
+          pendingSteps: D,
+          totalSteps: D.length,
+          stepIndex: l.stepIndex,
+          hasApproval: l.hasApproval,
+          wrapTxHash: l.wrapTxHash,
+          approveTxHash: l.approvalTxHash,
+          ...l.preparedOrder ? { preparedOrder: l.preparedOrder } : {},
+          ...l.phase === "wrapping" && l.event === "success" && l.wrapTxHash ? {
+            completedWrap: { account: d, chainId: m, inputTokenAddress: g.address, inputAmountRaw: L, txHash: l.wrapTxHash }
+          } : {}
+        }), l.phase === "wrapping" && (l.event === "request" && w(r == null ? void 0 : r.onWrapRequest), l.event === "success" && l.wrapTxHash && w(() => {
+          var M;
+          return (M = r == null ? void 0 : r.onWrapSuccess) == null ? void 0 : M.call(r, { txHash: l.wrapTxHash, amount: ee(L, h.decimals) });
+        })), l.phase === "approving" && (l.event === "request" && w(r == null ? void 0 : r.onApproveRequest), l.event === "success" && l.approvalTxHash && w(() => {
+          var M;
+          return (M = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : M.call(r, { txHash: l.approvalTxHash, token: h, amount: ee(L, h.decimals) });
+        })), l.phase === "signing" && (l.event === "prepared" && l.preparedOrder && (Nt({ analytics: q, account: d, chainId: m, inputToken: g, outputToken: S, preparedOrder: l.preparedOrder }), w(r == null ? void 0 : r.onSignOrderRequest)), l.event === "success" && l.signature && w(() => {
+          var M;
+          return (M = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : M.call(r, l.signature);
+        }), l.event === "error" && w(() => {
+          var M;
+          return (M = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : M.call(r, k(l.error));
+        }));
+      }
+    }), F = t.module === j.SWAP;
+    if (x(F ? u.SETTLING : u.SUCCESS, {
+      orderId: p.id.toString()
+    }), w(() => i(p)), F || w(() => o()), w(() => {
+      var l;
+      return (l = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : l.call(r, p);
+    }), F) {
+      const l = await e.waitForOrderFill(p, P);
+      return x(u.SUCCESS), l;
     }
-    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 p;
+  } catch (p) {
+    const F = I.phase, l = k(p), D = Ee(p);
+    throw v(
+      D ? u.REJECTED : u.FAILED,
       {
-        error: C,
-        parsedError: se(w)
+        error: l,
+        parsedError: re(p)
       }
-    ), F === d.WRAPPING ? I(() => L.onWrapError(w)) : F === d.APPROVING && I(() => L.onApproveError(w)), I(D ? r == null ? void 0 : r.onSubmitOrderRejected : () => {
+    ), D ? w(r == null ? void 0 : r.onSubmitOrderRejected) : F !== u.SETTLING && w(() => {
       var G;
-      return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, se(w));
-    }), C;
+      return (G = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : G.call(r, re(p));
+    }), l;
   }
-}, _t = () => {
-  const { data: e } = Y(), {
+}, Dt = () => {
+  const { data: e } = J(), {
     inputToken: t,
     outputToken: n,
     wrappedNativeToken: r,
     chainId: i,
-    hasChainId: o,
-    callbacks: s,
-    account: a,
-    walletInteractions: c
-  } = x(), h = It(), p = St(), u = W(), g = V();
-  return v(() => {
-    Bt({
-      account: a,
+    callbacks: o,
+    account: s,
+    walletInteractions: a
+  } = R(), c = gt(), E = ft(), O = H(), d = W(), m = Oe(void 0);
+  return b(() => () => {
+    var g;
+    return (g = m.current) == null ? void 0 : g.abort();
+  }, [s, i, e]), y(() => {
+    if (!ve(d.getState().state.currentExecution.phase)) return;
+    const g = new AbortController();
+    m.current = g, Ut({
+      signal: g.signal,
+      account: s,
       chainId: i,
-      hasChainId: o,
       inputToken: t,
       outputToken: n,
       wrappedNativeToken: r,
-      form: u,
+      form: O,
       client: e,
-      walletInteractions: c,
-      callbacks: s,
-      addNewOrder: h,
-      refetchActiveOrders: p,
-      getCurrentExecution: () => g.getState().state.currentExecution,
-      beginExecution: g.getState().beginExecution,
-      replaceExecution: g.getState().replaceExecution
+      walletInteractions: a,
+      callbacks: o,
+      addNewOrder: c,
+      refetchActiveOrders: E,
+      waitForOrderFill: (h, S) => Rt({ store: d, callbacks: o, order: h, executionId: S, signal: g.signal }),
+      getCurrentExecution: () => d.getState().state.currentExecution,
+      beginExecution: d.getState().beginExecution,
+      replaceExecution: d.getState().replaceExecution
     }).catch(() => {
+    }).finally(() => {
+      m.current === g && (m.current = void 0);
     });
   }, [
-    a,
-    h,
     s,
+    c,
+    o,
     i,
     e,
-    u,
+    O,
     t,
-    o,
     n,
     r,
-    p,
-    g,
-    c
+    E,
+    d,
+    a
   ]);
-}, qt = () => {
+}, Mt = () => {
   const e = A((n) => n.state.currentExecution), t = A(
     (n) => n.returnToOrderForm
   );
-  return R(
+  return C(
     () => ({ ...e, returnToOrderForm: t }),
     [e, t]
   );
-}, ir = () => {
-  const e = qt(), {
+}, er = () => {
+  const e = Mt(), {
     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);
-  return R(() => ({
+  } = R(), { data: a, isLoading: c } = J(), E = Dt(), O = A((T) => T.startNewOrder), d = y(() => E(), [E]), m = y(
+    () => O(Ae({ module: o, overrides: s })),
+    [o, s, O]
+  ), g = Xe(e.phase), h = Ze(e.phase), S = z(e.phase);
+  return C(() => ({
     phase: e.phase,
-    status: E,
+    status: g,
     error: e.parsedError,
-    currentStep: m,
+    currentStep: h,
     currentStepIndex: e.stepIndex,
     approvalTxHash: e.approveTxHash,
     wrapTxHash: e.wrapTxHash,
@@ -1505,30 +1482,30 @@ const yt = ({
     inputToken: e.inputToken ?? t,
     outputToken: e.outputToken ?? n,
     chainId: e.chainId ?? r,
-    submitOrder: u,
-    startNewOrder: g,
+    submitOrder: d,
+    startNewOrder: m,
     returnToOrderForm: e.returnToOrderForm,
     isExecuting: S,
-    isSuccess: e.phase === d.SUCCESS,
-    isFailed: e.phase === d.FAILED,
-    isRejected: e.phase === d.REJECTED,
-    isPreparingOrder: e.phase === d.PREPARING || i && c && !a,
+    isSuccess: e.phase === u.SUCCESS,
+    isFailed: e.phase === u.FAILED,
+    isRejected: e.phase === u.REJECTED,
+    isPreparingOrder: e.phase === u.PREPARING || i && c && !a,
     canDismiss: !S
   }), [
     a,
-    m,
+    h,
     t,
     n,
     r,
     c,
     S,
     i,
+    m,
+    d,
     g,
-    u,
-    E,
     e
   ]);
-}, or = () => {
+}, tr = () => {
   const {
     inputToken: e,
     outputToken: t,
@@ -1538,24 +1515,24 @@ const yt = ({
     inputAmountUi: o,
     marketPriceLoading: s,
     hasChainId: a
-  } = x(), c = W(), { data: h, isLoading: p } = Y(), 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);
-  return R(() => ({
-    disabled: y,
+  } = R(), c = H(), { data: E, isLoading: O } = J(), d = A(
+    (L) => L.state.currentExecution.phase
+  ), m = z(d), g = !!(e && $(e.address) && (!n || $(n.address))), h = s || !c.isReady && !c.errors.primary || r === void 0, S = m || a && O && !E || !!(e && t && o && h), T = !!(!c.canSubmit || m || !a || !E || i || S || !e || !t || g);
+  return C(() => ({
+    disabled: T,
     loading: S
-  }), [y, S]);
-}, sr = () => {
-  const { inputToken: e, outputToken: t, callbacks: n } = x(), r = A((s) => s.updateState), { trades: i } = W(), o = v(
+  }), [T, S]);
+}, rr = () => {
+  const { inputToken: e, outputToken: t, callbacks: n } = R(), r = A((s) => s.updateState), { trades: i } = H(), o = y(
     (s) => {
-      r({ tradeCount: s }), I(() => {
+      r({ tradeCount: s }), w(() => {
         var a;
         return (a = n == null ? void 0 : n.onTradeCountChange) == null ? void 0 : a.call(n, s);
       });
     },
     [n, r]
   );
-  return R(
+  return C(
     () => ({
       totalTrades: i.totalTrades,
       maxTrades: i.maxTrades,
@@ -1569,48 +1546,48 @@ 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, "");
+}, nr = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = R(), { marketPrice: i, trades: o, triggerPrice: s, isInverted: a } = H(), c = A((m) => m.updateState), E = y(
+    (m) => {
+      c({ triggerPriceUi: m, triggerPricePercent: null }), w(() => {
+        var g;
+        return (g = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : g.call(r, m || "");
+      }), w(() => {
+        var g;
+        return (g = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : g.call(r, "");
       });
     },
     [r, c]
-  ), p = v(
-    (g) => {
+  ), O = y(
+    (m) => {
       c({
         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: m
+      }), 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, m || "");
       });
     },
     [r, c]
-  ), u = v(() => {
+  ), d = y(() => {
     c({
       triggerPricePercent: void 0,
       triggerPriceUi: void 0
     });
   }, [c]);
-  return R(
+  return C(
     () => ({
       price: s.display,
       canonicalPriceRaw: s.raw,
       outputAmountPerTrade: o.triggerOutputAmountPerTrade,
       error: s.error,
-      onInputChange: h,
-      onPercentageChange: p,
+      onInputChange: E,
+      onPercentageChange: O,
       percentage: s.percentage,
-      onReset: u,
+      onReset: d,
       inputToken: t,
       outputToken: n,
       displayInputToken: a ? n : t,
@@ -1623,62 +1600,78 @@ const yt = ({
       a,
       i.raw,
       e,
-      h,
-      p,
-      u,
+      E,
+      O,
+      d,
       n,
       o.triggerOutputAmountPerTrade,
       s
     ]
   );
 };
-We(Qe.version);
+He(Qe.version);
 export {
-  ur 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,
-  z as Steps,
-  pr as TimeUnit,
+  sr as DISCLAIMER_URL,
+  X as Disclaimer,
+  u as ExecutionPhase,
+  _ as ExecutionStatus,
+  ar as InputErrors,
+  cr as Module,
+  dr as ORBS_LOGO,
+  ur as ORBS_SLTP_FAQ_URL,
+  lr as ORBS_TWAP_FAQ_URL,
+  mr as ORBS_WEBSITE_URL,
+  gr as OrderFilter,
+  fr as OrderSettlementError,
+  hr as OrderStatus,
+  Pr as OrderType,
+  Er as Partners,
+  Sr as QuoteError,
+  Or as SWAP_CAPABILITIES,
+  Ir as SpotError,
+  Vt as SpotProvider,
+  Q as Steps,
+  vr as TimeUnit,
+  wr as analytics,
+  pr as calculateOrder,
   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,
-  W as useOrderForm,
-  zt as useOrders,
-  rr as useOutputAmount,
-  nr as usePriceDisplay,
-  or as useSubmitButton,
-  sr as useTrades,
-  ar as useTriggerPrice
+  yr as createClient,
+  Cr as eqIgnoreCase,
+  Tr as executeOrder,
+  Rr as getMinimumOutputAmount,
+  Lr as getOrderExecutionRate,
+  xr as getOrderFillDelayMillis,
+  Fr as getOrderLimitPriceRate,
+  Nr as getOrders,
+  Ur as getQuote,
+  Dr as getTriggerPriceRate,
+  Mr as getTwapConfig,
+  Gr as invertPriceInput,
+  Br as isNativeAddress,
+  _r as isQuoteFresh,
+  Hr as isSwapSupported,
+  qr as isTxRejected,
+  Kr as setUIVersion,
+  Wr as submitSwap,
+  Vr as toAmountRaw,
+  jr as toAmountUI,
+  jt as useAmountUi,
+  Jt as useCancelOrder,
+  J as useClient,
+  Qt as useDisclaimer,
+  zt as useDuration,
+  er as useExecution,
+  $t as useFillDelay,
+  bt as useHistoryOrder,
+  Yt as useInputErrors,
+  Xt as useLimitPrice,
+  H as useOrderForm,
+  Wt as useOrders,
+  Zt as useOutputAmount,
+  kt as usePriceDisplay,
+  tr as useSubmitButton,
+  rr as useTrades,
+  nr as useTriggerPrice,
+  Jr as waitForOrder,
+  Qr as watchOrder
 };