@orbs-network/spot-react 2.1.0 → 2.1.1

package/dist/spot-react.js

@@ -1,24 +1,32 @@
 "use client";
-var Ne = Object.defineProperty;
-var De = (e, t, n) => t in e ? Ne(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var ie = (e, t, n) => De(e, typeof t != "symbol" ? t + "" : t, n);
-import { OrderStatus as z, Module as X, createClient as Ue, analytics as G, getTwapConfig as Ae, toAmountWei as Z, calculateOrderForm as Ge, getPartnerChains as Me, shouldWrapOnly as _e, shouldUnwrapOnly as Be, toAmountUI as ne, getExplorerUrl as b, getNetwork as We, isTxRejected as we, getOrderLimitPriceRate as qe, getTriggerPriceRate as Ke, getOrderExecutionRate as ve, getOrderFillDelayMillis as Ve, invertPriceInput as fe, ensureWrappedToken as He, isNativeAddress as Pe, setUIVersion as je } from "@orbs-network/spot-ui";
-import { DISCLAIMER_URL as mr, InputErrors as gr, Module as fr, ORBS_LOGO as Pr, ORBS_SLTP_FAQ_URL as hr, ORBS_TWAP_FAQ_URL as pr, ORBS_WEBSITE_URL as Er, OrderFilter as Sr, OrderStatus as Ir, OrderType as Or, Partners as yr, SPOT_VERSION as Ar, TimeUnit as wr, calculateOrderForm as vr, createClient as Cr, ensureWrappedToken as Rr, eqIgnoreCase as Tr, getExplorerUrl as Lr, getNetwork as xr, getOrderExecutionRate as Fr, getOrderFillDelayMillis as Nr, getOrderLimitPriceRate as Dr, getPartnerChains as Ur, getPartners as Gr, getTriggerPriceRate as Mr, getTwapConfig as _r, invertPriceInput as Br, isNativeAddress as Wr, isTxRejected as qr, networks as Kr, shouldUnwrapOnly as Vr, shouldWrapOnly as Hr, toAmountUI as jr, toAmountWei as zr } from "@orbs-network/spot-ui";
-import { jsx as U, jsxs as de, Fragment as ze } from "react/jsx-runtime";
-import { createContext as ue, useState as Je, useContext as le, useCallback as w, useEffect as $, useMemo as A, Component as Ye, useRef as $e } from "react";
-import { useStore as Qe } from "zustand";
-import { createStore as Xe } from "zustand/vanilla";
-const Ze = "2.1.0", be = {
-  version: Ze
+var Fe = Object.defineProperty;
+var xe = (e, t, n) => t in e ? Fe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var ie = (e, t, n) => xe(e, typeof t != "symbol" ? t + "" : t, n);
+import { OrderStatus as z, Module as Z, createClient as Ue, analytics as _, getTwapConfig as we, calculateOrderForm as De, getPartnerChains as Me, isNativeAddress as Y, eqIgnoreCase as Pe, toAmountRaw as k, toAmountUI as ne, isTxRejected as ve, getOrderLimitPriceRate as Ge, getTriggerPriceRate as _e, getOrderExecutionRate as Ce, getOrderFillDelayMillis as Be, invertPriceInput as fe, setUIVersion as qe } from "@orbs-network/spot-ui";
+import { DISCLAIMER_URL as cr, InputErrors as dr, Module as ur, ORBS_LOGO as lr, ORBS_SLTP_FAQ_URL as mr, ORBS_TWAP_FAQ_URL as gr, ORBS_WEBSITE_URL as Pr, OrderFilter as fr, OrderStatus as hr, OrderType as Sr, Partners as Er, SPOT_VERSION as Ir, TimeUnit as Or, calculateOrderForm as pr, createClient as Ar, eqIgnoreCase as wr, getOrderExecutionRate as vr, getOrderFillDelayMillis as Cr, getOrderLimitPriceRate as yr, getPartnerChains as Rr, getPartners as Tr, getTriggerPriceRate as Lr, getTwapConfig as Nr, invertPriceInput as Fr, isNativeAddress as xr, isTxRejected as Ur, toAmountRaw as Dr, toAmountUI as Mr } from "@orbs-network/spot-ui";
+import { jsx as x, jsxs as de, Fragment as We } from "react/jsx-runtime";
+import { createContext as ue, useContext as le, useState as Ke, useCallback as v, useEffect as $, useMemo as y, Component as Ve, useRef as He } from "react";
+import { useStore as je } from "zustand";
+import { createStore as ze } from "zustand/vanilla";
+const Je = "2.1.1", Qe = {
+  version: Je
+}, ye = ue(null), Ye = ({
+  children: e,
+  value: t
+}) => /* @__PURE__ */ x(ye.Provider, { value: t, children: e }), N = () => {
+  const e = le(ye);
+  if (e === null)
+    throw new Error("useSpotRuntime must be used within SpotProvider");
+  return e;
 };
-var K = /* @__PURE__ */ ((e) => (e[e.LOADING = 1] = "LOADING", e[e.SUCCESS = 2] = "SUCCESS", e[e.FAILED = 3] = "FAILED", e))(K || {}), 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 || {}), J = /* @__PURE__ */ ((e) => (e.WRAP = "wrap", e.APPROVE = "approve", e.CREATE = "create", e))(J || {});
-const ke = /* @__PURE__ */ new Set([
+var H = /* @__PURE__ */ ((e) => (e[e.LOADING = 1] = "LOADING", e[e.SUCCESS = 2] = "SUCCESS", e[e.FAILED = 3] = "FAILED", e))(H || {}), d = /* @__PURE__ */ ((e) => (e.IDLE = "idle", e.PREPARING = "preparing", e.WRAPPING = "wrapping", e.APPROVING = "approving", e.SIGNING = "signing", e.SUBMITTING = "submitting", e.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 || {}), J = /* @__PURE__ */ ((e) => (e.WRAP = "wrap", e.APPROVE = "approve", e.CREATE = "create", e))(J || {});
+const $e = /* @__PURE__ */ new Set([
   d.PREPARING,
   d.WRAPPING,
   d.APPROVING,
   d.SIGNING,
   d.SUBMITTING
-]), et = {
+]), Xe = {
   [d.IDLE]: /* @__PURE__ */ new Set(),
   [d.PREPARING]: /* @__PURE__ */ new Set([
     d.PREPARING,
@@ -58,12 +66,12 @@ const ke = /* @__PURE__ */ new Set([
 }, te = (e) => ({
   phase: d.IDLE,
   completedWrap: e
-}), Y = (e) => ke.has(e), tt = (e) => e === d.IDLE || e === d.FAILED || e === d.REJECTED, rt = (e, t) => et[e].has(t), nt = (e) => {
-  if (Y(e)) return K.LOADING;
-  if (e === d.SUCCESS) return K.SUCCESS;
+}), Q = (e) => $e.has(e), Ze = (e) => e === d.IDLE || e === d.FAILED || e === d.REJECTED, be = (e, t) => Xe[e].has(t), ke = (e) => {
+  if (Q(e)) return H.LOADING;
+  if (e === d.SUCCESS) return H.SUCCESS;
   if (e === d.FAILED || e === d.REJECTED)
-    return K.FAILED;
-}, it = (e) => {
+    return H.FAILED;
+}, et = (e) => {
   if (e === d.WRAPPING) return J.WRAP;
   if (e === d.APPROVING) return J.APPROVE;
   if (e === d.SIGNING || e === d.SUBMITTING)
@@ -76,7 +84,7 @@ const ke = /* @__PURE__ */ new Set([
     if (typeof t == "string") return t;
   }
   return "Unknown error";
-}, ot = (e) => {
+}, tt = (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;
@@ -84,7 +92,7 @@ const ke = /* @__PURE__ */ new Set([
   const t = me(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: ot(e) || (n ? Number(n[1]) : 0)
+    code: tt(e) || (n ? Number(n[1]) : 0)
   };
 }, I = (e) => {
   if (e)
@@ -94,23 +102,23 @@ const ke = /* @__PURE__ */ new Set([
       });
     } catch {
     }
-}, st = ({
+}, rt = ({
   execution: e,
   account: t,
   chainId: n,
   inputTokenAddress: r,
-  inputAmountWei: o
+  inputAmountRaw: o
 }) => {
   const i = e.completedWrap;
-  if ((i == null ? void 0 : i.account.toLowerCase()) === t.toLowerCase() && i.chainId === n && i.inputTokenAddress.toLowerCase() === r.toLowerCase() && ct(i.inputAmountWei, o))
+  if ((i == null ? void 0 : i.account.toLowerCase()) === t.toLowerCase() && i.chainId === n && i.inputTokenAddress.toLowerCase() === r.toLowerCase() && nt(i.inputAmountRaw, o))
     return i;
-}, ct = (e, t) => {
+}, nt = (e, t) => {
   try {
     return BigInt(e) >= BigInt(t);
   } catch {
     return !1;
   }
-}, at = 2e4, he = /* @__PURE__ */ new WeakMap(), pe = (e) => {
+}, it = 2e4, he = /* @__PURE__ */ new WeakMap(), Se = (e) => {
   const t = he.get(e);
   if (t) return t;
   const n = {
@@ -136,12 +144,12 @@ const ke = /* @__PURE__ */ new Set([
         break;
     }
   return he.set(e, n), n;
-}, dt = (e, t) => {
+}, ot = (e, t) => {
   const n = new Set(e.map((o) => o.historyKey)), r = (t == null ? void 0 : t.filter(
     (o) => o.version === 1 && !n.has(o.historyKey)
   )) ?? [];
   return [...e, ...r];
-}, ut = (e, t, n) => {
+}, st = (e, t, n) => {
   if (!e) return;
   const r = new Map(
     t.map((i) => [i.historyKey, i])
@@ -150,8 +158,8 @@ const ke = /* @__PURE__ */ new Set([
     if (i.version !== 2) continue;
     const s = r.get(i.historyKey);
     !s || s.progress === i.progress || (o.push(s), s.status === z.Completed && I(() => {
-      var c;
-      return (c = n == null ? void 0 : n.onOrderFilled) == null ? void 0 : c.call(n, s);
+      var a;
+      return (a = n == null ? void 0 : n.onOrderFilled) == null ? void 0 : a.call(n, s);
     }));
   }
   o.length > 0 && I(() => {
@@ -175,68 +183,68 @@ const ke = /* @__PURE__ */ new Set([
     let i = n.length === r.length;
     for (const s of r) {
       Object.prototype.hasOwnProperty.call(e, s) || (i = !1);
-      const c = se(e[s], t[s]);
-      o[s] = c, c !== e[s] && (i = !1);
+      const a = se(e[s], t[s]);
+      o[s] = a, a !== e[s] && (i = !1);
     }
     return i ? e : o;
   }
   return t;
-}, lt = (e, t) => e ? se(e, t) : t, ce = (e) => ({
-  typedTrades: e.typedTrades,
-  typedFillDelay: e.typedFillDelay,
-  typedDuration: e.typedDuration,
-  typedLimitPrice: e.typedLimitPrice,
-  typedTriggerPrice: e.typedTriggerPrice,
+}, at = (e, t) => e ? se(e, t) : t, ae = (e) => ({
+  tradeCount: e.tradeCount,
+  tradeInterval: e.tradeInterval,
+  orderDuration: e.orderDuration,
+  limitPriceUi: e.limitPriceUi,
+  triggerPriceUi: e.triggerPriceUi,
   triggerPricePercent: e.triggerPricePercent,
   limitPricePercent: e.limitPricePercent,
   isMarketOrder: e.isMarketOrder,
-  isInvertedTrade: void 0
-}), mt = (e) => ({
-  ...ce(e),
+  isPriceInverted: void 0
+}), ct = (e) => ({
+  ...ae(e),
   cancelOrders: {},
   currentExecution: te()
-}), Se = { isFetching: !1 }, Ie = { isFetching: !1 }, gt = (e) => new Promise((t) => setTimeout(t, e)), ft = (e) => {
-  let t = 0, n, r, o = 0, i, s, c, a = !1, f = 0, O = 0, p, E, u;
-  return Xe((l, h) => {
-    const R = async () => {
+}), Ie = { isFetching: !1 }, Oe = { isFetching: !1 }, dt = (e) => new Promise((t) => setTimeout(t, e)), ut = (e) => {
+  let t = 0, n, r, o = 0, i, s, a, c = !1, P = 0, O = 0, S, u, m;
+  return ze((l, f) => {
+    const L = async () => {
       if (!n || !r) return;
       if (i) return i;
-      const g = ++o, P = r;
-      l((S) => ({
+      const g = ++o, h = r;
+      l((E) => ({
         client: {
           key: n,
-          data: S.client.data,
+          data: E.client.data,
           error: void 0,
           isFetching: !0
         }
       }));
-      const v = (async () => {
-        let S;
-        for (let y = 0; y < 3; y++) {
+      const p = (async () => {
+        let E;
+        for (let A = 0; A < 3; A++) {
           if (g !== o) return;
           try {
-            const m = await P();
+            const R = await h();
             return g !== o ? void 0 : (l({
-              client: { key: n, data: m, isFetching: !1 }
-            }), m);
-          } catch (m) {
-            if (S = m instanceof Error ? m : new Error(String(m)), g !== o) return;
-            y < 2 && await gt(2 ** y * 1e3);
+              client: { key: n, data: R, isFetching: !1 }
+            }), R);
+          } catch (R) {
+            if (E = R instanceof Error ? R : new Error(String(R)), g !== o) return;
+            A < 2 && await dt(2 ** A * 1e3);
           }
         }
         g === o && l({
-          client: { key: n, error: S, isFetching: !1 }
+          client: { key: n, error: E, isFetching: !1 }
         });
       })();
-      return i = v, v.finally(() => {
-        i === v && (i = void 0);
-      }), v;
-    }, x = async (g = !1) => {
-      if (!g && f === 0 || !s || !c)
-        return h().orders.data;
-      if (p) return p;
-      const P = ++O, v = c, S = h().orders.data, y = new AbortController();
-      E = y, l((T) => ({
+      return i = p, p.finally(() => {
+        i === p && (i = void 0);
+      }), p;
+    }, w = async (g = !1) => {
+      if (!g && P === 0 || !s || !a)
+        return f().orders.data;
+      if (S) return S;
+      const h = ++O, p = a, E = f().orders.data, A = new AbortController();
+      u = A, l((T) => ({
         orders: {
           key: s,
           data: T.orders.data,
@@ -244,218 +252,212 @@ const ke = /* @__PURE__ */ new Set([
           isFetching: !0
         }
       }));
-      const m = v(
-        S,
-        a,
-        y.signal
-      ).then(({ orders: T, legacyLoaded: N }) => {
-        if (P !== O) return;
-        a = N;
-        const H = lt(
-          h().orders.data,
+      const R = p(
+        E,
+        c,
+        A.signal
+      ).then(({ orders: T, legacyLoaded: F }) => {
+        if (h !== O) return;
+        c = F;
+        const U = at(
+          f().orders.data,
           T
         );
         return l({
           orders: {
             key: s,
-            data: H,
+            data: U,
             isFetching: !1
           }
-        }), H;
+        }), U;
       }).catch((T) => {
-        if (P !== O || y.signal.aborted)
+        if (h !== O || A.signal.aborted)
           return;
-        const N = T instanceof Error ? T : new Error(String(T));
-        l((H) => ({
+        const F = T instanceof Error ? T : new Error(String(T));
+        l((U) => ({
           orders: {
             key: s,
-            data: H.orders.data,
-            error: N,
+            data: U.orders.data,
+            error: F,
             isFetching: !1
           }
         }));
       });
-      return p = m, m.finally(() => {
-        p === m && (p = void 0), E === y && (E = void 0);
-      }), m;
-    }, M = () => {
-      x();
+      return S = R, R.finally(() => {
+        S === R && (S = void 0), u === A && (u = void 0);
+      }), R;
     }, V = () => {
-      u && (clearInterval(u), u = void 0), typeof window < "u" && window.removeEventListener("focus", M), E == null || E.abort(), E = void 0, p = void 0, O++, l((g) => ({
+      w();
+    }, G = () => {
+      m && (clearInterval(m), m = void 0), typeof window < "u" && window.removeEventListener("focus", V), u == null || u.abort(), u = void 0, S = void 0, O++, l((g) => ({
         orders: { ...g.orders, isFetching: !1 }
       }));
-    }, q = () => {
-      !s || !c || u || (x(!0), u = setInterval(() => {
-        x();
-      }, at), typeof window < "u" && window.addEventListener("focus", M));
+    }, B = () => {
+      !s || !a || m || (w(!0), m = setInterval(() => {
+        w();
+      }, it), typeof window < "u" && window.addEventListener("focus", V));
     };
     return {
-      client: Se,
-      orders: Ie,
-      state: mt(e),
-      configureClient: (g, P) => {
+      client: Ie,
+      orders: Oe,
+      state: ct(e),
+      configureClient: (g, h) => {
         if (n === g) {
-          r = P;
+          r = h;
           return;
         }
-        n = g, r = P, o++, i = void 0, l({
-          client: g ? { key: g, isFetching: !1 } : Se
-        }), g && P && R();
+        n = g, r = h, o++, i = void 0, l({
+          client: g ? { key: g, isFetching: !1 } : Ie
+        }), g && h && L();
       },
-      refetchClient: R,
-      configureOrders: (g, P) => {
+      refetchClient: L,
+      configureOrders: (g, h) => {
         if (s === g) {
-          c = P;
+          a = h;
           return;
         }
-        V(), s = g, c = P, a = !1, l({
-          orders: g ? { key: g, isFetching: !1 } : Ie
-        }), f > 0 && q();
+        G(), s = g, a = h, c = !1, l({
+          orders: g ? { key: g, isFetching: !1 } : Oe
+        }), P > 0 && B();
       },
-      registerOrdersConsumer: () => (f++, f === 1 && q(), () => {
-        f = Math.max(0, f - 1), f === 0 && V();
+      registerOrdersConsumer: () => (P++, P === 1 && B(), () => {
+        P = Math.max(0, P - 1), P === 0 && G();
       }),
-      refetchOrders: x,
+      refetchOrders: w,
       addOrder: (g) => {
-        l((P) => {
-          const v = P.orders.data;
-          return v != null && v.some(
-            (S) => S.historyKey === g.historyKey
-          ) ? P : {
+        l((h) => {
+          const p = h.orders.data;
+          return p != null && p.some(
+            (E) => E.historyKey === g.historyKey
+          ) ? h : {
             orders: {
-              ...P.orders,
-              data: [g, ...v ?? []]
+              ...h.orders,
+              data: [g, ...p ?? []]
             }
           };
         });
       },
-      updateOrderStatus: (g, P) => {
-        l((v) => {
-          var S;
+      updateOrderStatus: (g, h) => {
+        l((p) => {
+          var E;
           return {
             orders: {
-              ...v.orders,
-              data: (S = v.orders.data) == null ? void 0 : S.map(
-                (y) => y.historyKey === g ? { ...y, status: P } : y
+              ...p.orders,
+              data: (E = p.orders.data) == null ? void 0 : E.map(
+                (A) => A.historyKey === g ? { ...A, status: h } : A
               )
             }
           };
         });
       },
-      updateState: (g) => l((P) => ({ state: { ...P.state, ...g } })),
+      updateState: (g) => l((h) => ({ state: { ...h.state, ...g } })),
       beginExecution: (g) => {
-        let P;
-        return l((v) => tt(v.state.currentExecution.phase) ? (P = {
+        let h;
+        return l((p) => Ze(p.state.currentExecution.phase) ? (h = {
           ...g,
           executionId: ++t,
           phase: d.PREPARING
         }, {
           state: {
-            ...v.state,
-            currentExecution: P
+            ...p.state,
+            currentExecution: h
           }
-        }) : v), P;
+        }) : p), h;
       },
-      replaceExecution: (g, P) => {
-        let v = !1;
-        return l((S) => {
-          const y = S.state.currentExecution;
-          return y.executionId !== g || P.executionId !== g || !rt(y.phase, P.phase) ? S : (v = !0, {
-            state: { ...S.state, currentExecution: P }
+      replaceExecution: (g, h) => {
+        let p = !1;
+        return l((E) => {
+          const A = E.state.currentExecution;
+          return A.executionId !== g || h.executionId !== g || !be(A.phase, h.phase) ? E : (p = !0, {
+            state: { ...E.state, currentExecution: h }
           });
-        }), v;
+        }), p;
       },
       returnToOrderForm: () => {
-        const g = h().state.currentExecution;
-        return Y(g.phase) || g.phase === d.SUCCESS ? !1 : (l((P) => ({
+        const g = f().state.currentExecution;
+        return Q(g.phase) || g.phase === d.SUCCESS ? !1 : (l((h) => ({
           state: {
-            ...P.state,
+            ...h.state,
             currentExecution: te(g.completedWrap)
           }
         })), !0);
       },
-      syncFormDefaults: (g) => Y(h().state.currentExecution.phase) ? !1 : (l((P) => ({
+      syncFormDefaults: (g) => Q(f().state.currentExecution.phase) ? !1 : (l((h) => ({
         state: {
-          ...P.state,
-          ...ce(g),
+          ...h.state,
+          ...ae(g),
           currentExecution: te()
         }
       })), !0),
       startNewOrder: (g) => {
-        const { state: P } = h();
-        return Y(P.currentExecution.phase) ? !1 : (l((v) => ({
+        const { state: h } = f();
+        return Q(h.currentExecution.phase) ? !1 : (l((p) => ({
           state: {
-            ...v.state,
-            ...ce(g),
-            isMarketOrder: P.isMarketOrder,
+            ...p.state,
+            ...ae(g),
+            isMarketOrder: h.isMarketOrder,
             currentExecution: te()
           }
         })), !0);
       }
     };
   });
-}, Ce = ue(null), Re = ue(null), Pt = ({
+}, Re = (e) => {
+  var n;
+  const t = (n = e.overrides) == null ? void 0 : n.state;
+  return {
+    isMarketOrder: e.module === Z.LIMIT ? !1 : t == null ? void 0 : t.isMarketOrder,
+    tradeCount: t == null ? void 0 : t.tradeCount,
+    tradeInterval: t == null ? void 0 : t.tradeInterval,
+    orderDuration: t == null ? void 0 : t.orderDuration,
+    limitPriceUi: t == null ? void 0 : t.limitPriceUi,
+    triggerPriceUi: t == null ? void 0 : t.triggerPriceUi,
+    triggerPricePercent: t == null ? void 0 : t.triggerPricePercent,
+    limitPricePercent: t == null ? void 0 : t.limitPricePercent
+  };
+}, Te = ue(null), lt = ({
   children: e,
-  runtime: t,
-  initialState: n
+  initialState: t
 }) => {
-  const [r] = Je(() => ft(n));
-  return /* @__PURE__ */ U(Re.Provider, { value: t, children: /* @__PURE__ */ U(Ce.Provider, { value: r, children: e }) });
-}, L = () => {
-  const e = le(Re);
-  if (e === null)
-    throw new Error("useSpotRuntime must be used within SpotProvider");
-  return e;
+  const [n] = Ke(() => ut(t));
+  return /* @__PURE__ */ x(Te.Provider, { value: n, children: e });
 }, j = () => {
-  const e = le(Ce);
+  const e = le(Te);
   if (e === null)
     throw new Error("useSpotStore must be used within SpotProvider");
   return e;
 }, C = (e) => {
   const t = j();
-  return Qe(t, e);
-}, Te = (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,
-    typedTrades: t == null ? void 0 : t.trades,
-    typedFillDelay: t == null ? void 0 : t.fillDelay,
-    typedDuration: t == null ? void 0 : t.duration,
-    typedLimitPrice: t == null ? void 0 : t.limitPrice,
-    typedTriggerPrice: t == null ? void 0 : t.triggerPrice,
-    triggerPricePercent: t == null ? void 0 : t.triggerPricePercent,
-    limitPricePercent: t == null ? void 0 : t.limitPricePercent
-  };
-}, ht = { isFetching: !1 }, Q = () => {
-  const { partner: e, chainId: t, isSupportedChain: n } = L(), r = j(), o = C((O) => O.client), i = !!(t && n), s = i ? `${e}:${t}` : void 0, c = o.key === s ? o : ht, a = w(() => t ? Ue(e, t) : Promise.reject(
+  return je(t, e);
+}, mt = { isFetching: !1 }, X = () => {
+  const { partner: e, chainId: t, isSupportedChain: n } = N(), r = j(), o = C((O) => O.client), i = !!(t && n), s = i ? `${e}:${t}` : void 0, a = o.key === s ? o : mt, c = v(() => t ? Ue(e, t) : Promise.reject(
     new Error("Spot is unavailable on the connected chain")
   ), [t, e]);
   $(() => {
-    r.getState().configureClient(s, i ? a : void 0);
-  }, [i, s, a, r]);
-  const f = w(() => {
+    r.getState().configureClient(s, i ? c : void 0);
+  }, [i, s, c, r]);
+  const P = v(() => {
     if (!i || !s) return Promise.resolve(void 0);
     const O = r.getState();
-    return O.configureClient(s, a), O.refetchClient();
-  }, [i, s, a, r]);
-  return A(
+    return O.configureClient(s, c), O.refetchClient();
+  }, [i, s, c, r]);
+  return y(
     () => ({
-      data: c.data,
-      error: c.error,
-      isLoading: i && !c.data && c.error === void 0,
-      isFetching: c.isFetching,
-      refetch: f
+      data: a.data,
+      error: a.error,
+      isLoading: i && !a.data && a.error === void 0,
+      isFetching: a.isFetching,
+      refetch: P
     }),
-    [c, i, f]
+    [a, i, P]
   );
-}, pt = ({
+}, gt = ({
   error: e,
   retry: t,
   isRetrying: n
 }) => /* @__PURE__ */ de("div", { className: "spot-client-error-fallback", role: "alert", children: [
-  /* @__PURE__ */ U("p", { children: e.message || "Unable to load Spot configuration." }),
-  /* @__PURE__ */ U(
+  /* @__PURE__ */ x("p", { children: e.message || "Unable to load Spot configuration." }),
+  /* @__PURE__ */ x(
     "button",
     {
       type: "button",
@@ -465,41 +467,41 @@ const ke = /* @__PURE__ */ new Set([
       children: n ? "Retrying…" : "Retry"
     }
   )
-] }), Et = ({
+] }), Pt = ({
   children: e,
-  fallback: t = pt
+  fallback: t = gt
 }) => {
-  const { partner: n, chainId: r, isSupportedChain: o, minTradeSizeUsd: i } = L(), { data: s, error: c, isFetching: a, refetch: f } = Q(), O = w(async () => {
-    await f();
-  }, [f]);
+  const { partner: n, chainId: r, isSupportedChain: o, minTradeSizeUsd: i } = N(), { data: s, error: a, isFetching: c, refetch: P } = X(), O = v(async () => {
+    await P();
+  }, [P]);
   return $(() => {
-    !s || !r || !o || G.onFetchedConfig(
+    !s || !r || !o || _.onFetchedConfig(
       s.rePermitData,
       n,
-      Ae(n, r),
+      we(n, r),
       i
     );
-  }, [r, s, o, i, n]), /* @__PURE__ */ de(ze, { children: [
+  }, [r, s, o, i, n]), /* @__PURE__ */ de(We, { children: [
     e,
-    !s && c && o ? /* @__PURE__ */ U(
+    !s && a && o ? /* @__PURE__ */ x(
       t,
       {
-        error: c,
+        error: a,
         retry: O,
-        isRetrying: a
+        isRetrying: c
       }
     ) : null
   ] });
-}, St = ({
+}, ft = ({
   resetErrorBoundary: e
 }) => /* @__PURE__ */ de("div", { className: "twap-error-fallback", role: "alert", children: [
-  /* @__PURE__ */ U("p", { children: "Something went wrong" }),
-  /* @__PURE__ */ U("button", { type: "button", onClick: e, children: "Retry" })
-] }), It = ({
+  /* @__PURE__ */ x("p", { children: "Something went wrong" }),
+  /* @__PURE__ */ x("button", { type: "button", onClick: e, children: "Retry" })
+] }), ht = ({
   children: e,
-  fallback: t = St
-}) => /* @__PURE__ */ U(Ot, { fallback: t, children: e });
-class Ot extends Ye {
+  fallback: t = ft
+}) => /* @__PURE__ */ x(St, { fallback: t, children: e });
+class St extends Ve {
   constructor() {
     super(...arguments);
     ie(this, "state", {});
@@ -511,13 +513,13 @@ class Ot extends Ye {
     return { error: n };
   }
   componentDidCatch(n) {
-    G.onCrash(n);
+    _.onCrash(n);
   }
   render() {
     const { error: n } = this.state;
     if (n) {
       const r = this.props.fallback;
-      return /* @__PURE__ */ U(
+      return /* @__PURE__ */ x(
         r,
         {
           error: n,
@@ -528,111 +530,107 @@ class Ot extends Ye {
     return this.props.children;
   }
 }
-const yt = ({
+const Et = ({
   children: e,
   defaults: t,
   scopeKey: n
 }) => {
   const r = j(), o = C(
     (s) => s.state.currentExecution.phase
-  ), i = $e(n);
+  ), i = He(n);
   return $(() => {
-    i.current === n || Y(o) || r.getState().syncFormDefaults(t) && (i.current = n);
+    i.current === n || Q(o) || r.getState().syncFormDefaults(t) && (i.current = n);
   }, [t, o, n, r]), e;
-}, Le = ue(null), At = ({ children: e }) => {
+}, Le = ue(null), It = ({ children: e }) => {
   const {
     inputToken: t,
     outputToken: n,
-    typedInputAmount: r,
-    marketPrice: o,
-    quotedOutputAmount: i,
-    inputUsd1Token: s,
-    outputUsd1Token: c,
+    inputAmountUi: r,
+    quotedOutputAmountRaw: o,
+    inputTokenUsdPrice: i,
+    outputTokenUsdPrice: s,
     minTradeSizeUsd: a,
-    inputBalance: f,
-    displayFeePercent: O,
-    priceProtection: p,
-    module: E
-  } = L(), u = C((m) => m.state.typedTrades), l = C((m) => m.state.typedFillDelay), h = C((m) => m.state.typedDuration), R = C(
-    (m) => m.state.typedLimitPrice
-  ), x = C(
-    (m) => m.state.typedTriggerPrice
-  ), M = C(
-    (m) => m.state.limitPricePercent
+    inputBalanceRaw: c,
+    displayFeePercent: P,
+    priceProtectionPercent: O,
+    module: S
+  } = N(), u = C((E) => E.state.tradeCount), m = C((E) => E.state.tradeInterval), l = C((E) => E.state.orderDuration), f = C(
+    (E) => E.state.limitPriceUi
+  ), L = C(
+    (E) => E.state.triggerPriceUi
+  ), w = C(
+    (E) => E.state.limitPricePercent
   ), V = C(
-    (m) => m.state.triggerPricePercent
-  ), q = C(
-    (m) => m.state.isInvertedTrade
-  ), g = C((m) => m.state.isMarketOrder), P = C((m) => {
-    const T = m.state.currentExecution;
-    return T.phase !== d.IDLE ? T.form : void 0;
-  }), v = A(
-    () => Z(r, t == null ? void 0 : t.decimals),
-    [t == null ? void 0 : t.decimals, r]
-  ), S = A(
+    (E) => E.state.triggerPricePercent
+  ), G = C(
+    (E) => E.state.isPriceInverted
+  ), B = C((E) => E.state.isMarketOrder), g = C((E) => {
+    const A = E.state.currentExecution;
+    return A.phase !== d.IDLE ? A.form : void 0;
+  }), h = y(
     () => ({
-      module: E,
-      isMarketOrder: !!g,
-      inputAmountWei: v,
+      module: S,
       inputTokenDecimals: (t == null ? void 0 : t.decimals) ?? 0,
       outputTokenDecimals: (n == null ? void 0 : n.decimals) ?? 0,
-      marketPrice: o,
-      quotedOutputAmount: i,
-      inputUsdPrice: s,
-      outputUsdPrice: c,
+      quotedOutputAmountRaw: o,
+      inputTokenUsdPrice: i,
+      outputTokenUsdPrice: s,
       minTradeSizeUsd: a,
-      trades: u,
-      fillDelay: l,
-      duration: h,
-      limitPrice: R,
-      limitPricePercent: M,
-      triggerPrice: x,
-      triggerPricePercent: V,
-      isInverted: q,
-      priceProtection: p,
-      displayFeePercent: O,
-      inputBalance: f
+      priceProtectionPercent: O,
+      displayFeePercent: P,
+      inputBalanceRaw: c,
+      userInput: {
+        inputAmountUi: r,
+        isMarketOrder: !!B,
+        tradeCount: u,
+        tradeInterval: m,
+        orderDuration: l,
+        limitPriceUi: f,
+        limitPricePercent: w,
+        triggerPriceUi: L,
+        triggerPricePercent: V,
+        isPriceInverted: G
+      }
     }),
     [
       n == null ? void 0 : n.decimals,
-      c,
-      O,
-      v,
+      s,
+      P,
       o,
-      i,
       a,
-      E,
-      p,
-      f,
+      S,
+      O,
+      c,
       t == null ? void 0 : t.decimals,
-      s,
-      q,
-      g,
-      M,
+      i,
+      G,
+      B,
+      w,
       V,
       u,
-      h,
       l,
-      R,
-      x
+      m,
+      f,
+      r,
+      L
     ]
-  ), y = A(() => {
-    const m = Ge(S);
-    return t && n ? m : {
-      ...m,
+  ), p = y(() => {
+    const E = De(h);
+    return t && n ? E : {
+      ...E,
       isReady: !1,
       canSubmit: !1
     };
-  }, [t, n, S]);
-  return /* @__PURE__ */ U(Le.Provider, { value: P ?? y, children: e });
-}, W = () => {
+  }, [t, n, h]);
+  return /* @__PURE__ */ x(Le.Provider, { value: g ?? p, children: e });
+}, K = () => {
   const e = le(Le);
   if (!e)
     throw new Error("useOrderForm must be used within OrderFormProvider");
   return e;
-}, wt = (e, t) => {
+}, Ot = (e, t) => {
   $(() => {
-    !e.chainId || !t || G.init(
+    !e.chainId || !t || _.init(
       e.partner,
       e.minTradeSizeUsd,
       e.chainId,
@@ -645,48 +643,50 @@ const yt = ({
     e.partner,
     t
   ]);
-}, vt = (e) => {
-  var p, E, u, l, h;
-  const t = A(
+}, pt = (e) => {
+  var S, u, m, l, f, L, w, V, G, B, g, h;
+  const t = y(
     () => Me(e.partner),
     [e.partner]
-  ), n = !!(e.chainId && t.includes(e.chainId)), r = _e(e.inputToken, e.outputToken, e.chainId) || Be(e.inputToken, e.outputToken, e.chainId), o = r ? Z("1", (p = e.outputToken) == null ? void 0 : p.decimals) : void 0, i = r ? void 0 : e.marketReferencePrice.value, s = r ? !1 : e.marketReferencePrice.isLoading, c = r ? !1 : e.marketReferencePrice.noLiquidity, a = A(
-    () => Te({
+  ), n = !!(e.chainId && t.includes(e.chainId)), r = (S = e.wrappedNativeToken) == null ? void 0 : S.address, o = !!(r && (Y((u = e.inputToken) == null ? void 0 : u.address) && Pe(((m = e.outputToken) == null ? void 0 : m.address) || "", r) || Pe(((l = e.inputToken) == null ? void 0 : l.address) || "", r) && Y((f = e.outputToken) == null ? void 0 : f.address))), i = o ? k(e.inputAmountUi, (L = e.outputToken) == null ? void 0 : L.decimals) : e.marketQuote.isLoading ? void 0 : e.marketQuote.quotedOutputAmountRaw, s = o ? !1 : e.marketQuote.isLoading, a = o ? !1 : e.marketQuote.noLiquidity, c = y(
+    () => Re({
       module: e.module,
       overrides: e.overrides
     }),
     [e.module, e.overrides]
-  ), f = JSON.stringify([
+  ), P = JSON.stringify([
     e.partner,
     e.chainId,
     e.module,
-    (E = e.inputToken) == null ? void 0 : E.address,
-    (u = e.inputToken) == null ? void 0 : u.decimals,
-    (l = e.outputToken) == null ? void 0 : l.address,
-    (h = e.outputToken) == null ? void 0 : h.decimals,
-    a
-  ]), O = A(
+    (w = e.inputToken) == null ? void 0 : w.address,
+    (V = e.inputToken) == null ? void 0 : V.decimals,
+    (G = e.outputToken) == null ? void 0 : G.address,
+    (B = e.outputToken) == null ? void 0 : B.decimals,
+    (g = e.wrappedNativeToken) == null ? void 0 : g.address,
+    (h = e.wrappedNativeToken) == null ? void 0 : h.decimals,
+    c
+  ]), O = y(
     () => ({
-      typedInputAmount: e.typedInputAmount,
+      inputAmountUi: e.inputAmountUi,
       minTradeSizeUsd: e.minTradeSizeUsd,
       account: e.account,
       walletInteractions: e.walletInteractions,
-      marketPrice: o,
-      quotedOutputAmount: i,
+      quotedOutputAmountRaw: i,
       marketPriceLoading: s,
-      noLiquidity: c,
-      priceProtection: e.priceProtection,
+      noLiquidity: a,
+      priceProtectionPercent: e.priceProtectionPercent,
       chainId: e.chainId,
       isSupportedChain: n,
       partner: e.partner,
       module: e.module,
       displayFeePercent: e.displayFeePercent ?? 0,
       callbacks: e.callbacks,
-      inputUsd1Token: e.inputUsd1Token,
-      outputUsd1Token: e.outputUsd1Token,
-      inputBalance: e.inputBalance,
+      inputTokenUsdPrice: e.inputTokenUsdPrice,
+      outputTokenUsdPrice: e.outputTokenUsdPrice,
+      inputBalanceRaw: e.inputBalanceRaw,
       inputToken: e.inputToken,
       outputToken: e.outputToken,
+      wrappedNativeToken: e.wrappedNativeToken,
       supportLegacyOrders: e.supportLegacyOrders ?? !1,
       overrides: e.overrides
     }),
@@ -695,125 +695,116 @@ const yt = ({
       e.callbacks,
       e.chainId,
       e.displayFeePercent,
-      e.inputBalance,
+      e.inputBalanceRaw,
       e.inputToken,
-      e.inputUsd1Token,
+      e.inputTokenUsdPrice,
       e.minTradeSizeUsd,
       e.module,
       e.outputToken,
-      e.outputUsd1Token,
+      e.outputTokenUsdPrice,
+      e.wrappedNativeToken,
       e.overrides,
       e.partner,
-      e.priceProtection,
+      e.priceProtectionPercent,
       e.supportLegacyOrders,
-      e.typedInputAmount,
+      e.inputAmountUi,
       e.walletInteractions,
       n,
-      o,
       s,
-      c,
+      a,
       i
     ]
   );
-  return { initialState: a, formScopeKey: f, runtime: O };
-}, Yt = (e) => {
-  const { initialState: t, formScopeKey: n, runtime: r } = vt(e);
-  return wt(e, r.isSupportedChain), /* @__PURE__ */ U(Pt, { runtime: r, initialState: t, children: /* @__PURE__ */ U(It, { fallback: e.errorFallback, children: /* @__PURE__ */ U(
-    yt,
+  return { initialState: c, formScopeKey: P, runtime: O };
+}, jt = (e) => {
+  const { initialState: t, formScopeKey: n, runtime: r } = pt(e);
+  return Ot(e, r.isSupportedChain), /* @__PURE__ */ x(Ye, { value: r, children: /* @__PURE__ */ x(lt, { initialState: t, children: /* @__PURE__ */ x(ht, { fallback: e.errorFallback, children: /* @__PURE__ */ x(
+    Et,
     {
       defaults: t,
       scopeKey: n,
-      children: /* @__PURE__ */ U(Et, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ U(At, { children: e.children }) })
+      children: /* @__PURE__ */ x(Pt, { fallback: e.clientErrorFallback, children: /* @__PURE__ */ x(It, { children: e.children }) })
     }
-  ) }) });
-}, $t = (e, t) => A(() => ne(t, e), [e, t]), xe = (e) => {
-  const { chainId: t } = L(), n = e ?? t;
-  return A(() => We(n), [n]);
-}, Qt = (e, t) => {
-  const n = xe(t);
-  return A(() => {
-    if (!(!e || !n))
-      return b(e, n.id);
-  }, [e, n]);
-}, Ct = { isFetching: !1 }, ge = () => {
-  const { account: e, partner: t, chainId: n, supportLegacyOrders: r, callbacks: o } = L(), { data: i } = Q(), s = j(), c = !!(e && i), a = c ? JSON.stringify([
+  ) }) }) });
+}, zt = (e, t) => y(() => ne(t, e), [e, t]), At = { isFetching: !1 }, ge = () => {
+  const { account: e, partner: t, chainId: n, supportLegacyOrders: r, callbacks: o } = N(), { data: i } = X(), s = j(), a = !!(e && i), c = a ? JSON.stringify([
     e,
     i == null ? void 0 : i.exchangeAddress,
     t,
     n,
     r
-  ]) : void 0, f = w(
-    async (p, E, u) => {
+  ]) : void 0, P = v(
+    async (S, u, m) => {
       if (!e || !i)
         return { orders: [], legacyLoaded: !1 };
-      const l = r && !E, h = await i.getAccountOrders({
-        signal: u,
+      const l = r && !u, f = await i.getAccountOrders({
+        signal: m,
         account: e,
         legacyOrders: l
       });
-      return ut(p, h, o), {
-        orders: r && !l ? dt(h, p) : h,
-        legacyLoaded: E || l
+      return st(S, f, o), {
+        orders: r && !l ? ot(f, S) : f,
+        legacyLoaded: u || l
       };
     },
     [e, o, i, r]
   );
   $(() => {
-    s.getState().configureOrders(a, c ? f : void 0);
-  }, [c, a, f, s]);
-  const O = w(() => {
-    if (!c || !a) return Promise.resolve(void 0);
-    const p = s.getState();
-    return p.configureOrders(a, f), p.refetchOrders(!0);
-  }, [c, a, f, s]);
-  return { enabled: c, key: a, refetch: O };
-}, Rt = () => {
+    s.getState().configureOrders(c, a ? P : void 0);
+  }, [a, c, P, s]);
+  const O = v(() => {
+    if (!a || !c) return Promise.resolve(void 0);
+    const S = s.getState();
+    return S.configureOrders(c, P), S.refetchOrders(!0);
+  }, [a, c, P, s]);
+  return { enabled: a, key: c, refetch: O };
+}, wt = () => {
   ge();
   const e = j();
-  return w(
+  return v(
     (t) => e.getState().addOrder(t),
     [e]
   );
-}, Tt = () => {
+}, vt = () => {
   const e = j();
-  return w(
+  return v(
     (t, n) => e.getState().updateOrderStatus(t, n),
     [e]
   );
-}, Lt = () => {
+}, Ct = () => {
   const e = j();
-  return w(
+  return v(
     () => e.getState().refetchOrders(),
     [e]
   );
-}, Xt = () => {
-  const e = C((a) => a.orders), t = C(
-    (a) => a.registerOrdersConsumer
-  ), { enabled: n, key: r, refetch: o } = ge(), i = e.key === r ? e : Ct;
+}, Jt = () => {
+  const e = C((c) => c.orders), t = C(
+    (c) => c.registerOrdersConsumer
+  ), { enabled: n, key: r, refetch: o } = ge(), i = e.key === r ? e : At;
   $(() => t(), [t]);
-  const s = A(
-    () => i.data === void 0 ? void 0 : pe(i.data),
+  const s = y(
+    () => i.data === void 0 ? void 0 : Se(i.data),
     [i.data]
-  ), c = w(async () => {
-    const a = await o();
-    return a === void 0 ? void 0 : pe(a);
+  ), a = v(async () => {
+    const c = await o();
+    return c === void 0 ? void 0 : Se(c);
   }, [o]);
-  return A(
+  return y(
     () => ({
       data: s,
       error: i.error,
       isLoading: n && s === void 0 && i.error === void 0,
       isFetching: i.isFetching,
       isRefetching: i.isFetching && s !== void 0,
-      refetch: c
+      refetch: a
     }),
-    [i, s, n, c]
+    [i, s, n, a]
   );
-}, xt = 60, Ft = () => {
+}, yt = 60, Rt = () => {
   const { refetch: e } = ge();
-  return w(
+  return v(
     async (t) => {
-      for (let n = 0; n < xt; n++) {
+      for (let n = 0; n < yt; n++) {
         const r = await e();
         if (!r)
           throw new Error("orders not found");
@@ -830,7 +821,7 @@ const yt = ({
     },
     [e]
   );
-}, Nt = () => {
+}, Tt = () => {
   const e = j(), t = C((r) => r.updateState);
   return {
     cancelOrders: C((r) => r.state.cancelOrders),
@@ -845,104 +836,107 @@ const yt = ({
       t({ cancelOrders: s });
     }
   };
-}, Zt = (e) => {
-  const { account: t, walletInteractions: n, callbacks: r, chainId: o } = L(), { data: i } = Q(), s = Ft(), c = Tt(), {
+}, Lt = (e) => ({
+  ...e,
+  status: z.Cancelled
+}), Qt = (e) => {
+  const { account: t, walletInteractions: n, callbacks: r } = N(), { data: o } = X(), i = Rt(), s = vt(), {
     cancelOrders: a,
-    setCancelOrder: f,
-    clearCancelOrder: O
-  } = Nt(), p = w(async () => {
+    setCancelOrder: c,
+    clearCancelOrder: P
+  } = Tt(), O = v(async () => {
     const u = e == null ? void 0 : e.historyKey;
     try {
       if (!t) throw new Error("missing account");
       if (!e) throw new Error("order is required");
-      if (!i) throw new Error("Spot client is unavailable");
-      const l = e.historyKey;
-      f(l, { status: K.LOADING }), I(() => {
-        var x;
-        return (x = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : x.call(r, e);
+      if (!o) throw new Error("Spot client is unavailable");
+      const m = e.historyKey;
+      c(m, { status: H.LOADING }), I(() => {
+        var w;
+        return (w = r == null ? void 0 : r.onCancelOrderRequest) == null ? void 0 : w.call(r, e);
       }), I(
-        () => G.onCancelOrderRequest(
+        () => _.onCancelOrderRequest(
           [e.version === 1 ? e.id.toString() : e.hash],
           e.version
         )
       );
-      const h = i.getCancelOrderRequest(e), R = await n.cancelOrder(h);
-      if (!R) throw new Error("failed to cancel order");
-      return I(() => G.onCancelOrderSuccess(R)), c(l, z.Cancelled), f(l, {
-        status: K.SUCCESS,
-        txHash: R
+      const l = o.getCancelOrderRequest(e), f = await n.cancelOrder(l);
+      if (!f) throw new Error("failed to cancel order");
+      I(() => _.onCancelOrderSuccess(f));
+      const L = Lt(e);
+      return s(m, z.Cancelled), c(m, {
+        status: H.SUCCESS,
+        txHash: f
       }), I(
         () => {
-          var x;
-          return (x = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : x.call(r, {
-            order: e.version === 1 ? { ...e, status: z.Cancelled } : e,
-            txHash: R,
-            explorerUrl: b(R, o)
+          var w;
+          return (w = r == null ? void 0 : r.onCancelOrderSuccess) == null ? void 0 : w.call(r, {
+            order: L,
+            txHash: f
           });
         }
-      ), e.version !== 1 && s(l).catch((x) => {
-        console.warn("cancel status sync lagging", x);
-      }), R;
-    } catch (l) {
-      we(l) ? u && O(u) : (u && f(u, {
-        status: K.FAILED,
-        error: me(l)
-      }), I(() => G.onCancelOrderError(l))), I(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : h.call(r, re(l));
+      ), e.version !== 1 && i(m).catch((w) => {
+        console.warn("cancel status sync lagging", w);
+      }), f;
+    } catch (m) {
+      ve(m) ? u && P(u) : (u && c(u, {
+        status: H.FAILED,
+        error: me(m)
+      }), I(() => _.onCancelOrderError(m))), I(() => {
+        var l;
+        return (l = r == null ? void 0 : r.onCancelOrderFailed) == null ? void 0 : l.call(r, re(m));
       });
     }
   }, [
     t,
     r,
+    P,
     o,
-    O,
-    i,
     e,
-    s,
-    f,
+    i,
     c,
+    s,
     n
-  ]), E = A(() => {
+  ]), S = y(() => {
     const u = a[(e == null ? void 0 : e.historyKey) || ""];
     return {
-      isLoading: (u == null ? void 0 : u.status) === K.LOADING,
-      disabled: !!(e && !i),
-      isSuccess: (u == null ? void 0 : u.status) === K.SUCCESS,
-      isError: (u == null ? void 0 : u.status) === K.FAILED,
+      isLoading: (u == null ? void 0 : u.status) === H.LOADING,
+      disabled: !!(e && !o),
+      isSuccess: (u == null ? void 0 : u.status) === H.SUCCESS,
+      isError: (u == null ? void 0 : u.status) === H.FAILED,
       error: u == null ? void 0 : u.error,
       txHash: u == null ? void 0 : u.txHash
     };
-  }, [a, e, i]);
-  return A(() => ({ cancelOrder: p, ...E }), [p, E]);
-}, bt = () => {
-  const { module: e, values: t } = W();
-  if (t.isMarketOrder && e === X.STOP_LOSS)
+  }, [a, e, o]);
+  return y(() => ({ cancelOrder: O, ...S }), [O, S]);
+}, Yt = () => {
+  const { module: e, values: t } = K();
+  if (t.isMarketOrder && e === Z.STOP_LOSS)
     return ee.TRIGGER_MARKET_PRICE;
-  if (e === X.LIMIT || e === X.TWAP)
+  if (e === Z.LIMIT || e === Z.TWAP)
     return t.isMarketOrder ? ee.MARKET_PRICE : ee.LIMIT_PRICE;
-}, kt = () => {
-  const { callbacks: e } = L(), t = C((c) => c.updateState), { schedule: n } = W(), { duration: r } = n, o = w(
-    (c) => {
-      t({ typedDuration: c }), I(() => {
-        var a;
-        return (a = e == null ? void 0 : e.onDurationChange) == null ? void 0 : a.call(e, c);
+}, $t = () => {
+  const { callbacks: e } = N(), t = C((a) => a.updateState), { schedule: n } = K(), { duration: r } = n, o = v(
+    (a) => {
+      t({ orderDuration: a }), I(() => {
+        var c;
+        return (c = e == null ? void 0 : e.onOrderDurationChange) == null ? void 0 : c.call(e, a);
       });
     },
     [e, t]
-  ), i = w(
-    (c) => {
-      const a = Number(c);
-      Number.isFinite(a) && o({ unit: r.unit, value: a });
+  ), i = v(
+    (a) => {
+      const c = Number(a);
+      Number.isFinite(c) && o({ unit: r.unit, value: c });
     },
     [r.unit, o]
-  ), s = w(
-    (c) => {
-      o({ unit: c, value: r.value });
+  ), s = v(
+    (a) => {
+      o({ unit: a, value: r.value });
     },
     [r.value, o]
   );
-  return A(
+  return y(
     () => ({
       duration: r,
       onChange: o,
@@ -953,26 +947,26 @@ const yt = ({
     }),
     [r, o, i, s, n]
   );
-}, er = () => {
-  const { callbacks: e } = L(), t = C((c) => c.updateState), { schedule: n } = W(), { fillDelay: r } = n, o = w(
-    (c) => {
-      t({ typedFillDelay: c }), I(() => {
-        var a;
-        return (a = e == null ? void 0 : e.onFillDelayChange) == null ? void 0 : a.call(e, c);
+}, Xt = () => {
+  const { callbacks: e } = N(), t = C((a) => a.updateState), { schedule: n } = K(), { fillDelay: r } = n, o = v(
+    (a) => {
+      t({ tradeInterval: a }), I(() => {
+        var c;
+        return (c = e == null ? void 0 : e.onTradeIntervalChange) == null ? void 0 : c.call(e, a);
       });
     },
     [e, t]
-  ), i = w(
-    (c) => {
-      const a = Number(c);
-      Number.isFinite(a) && o({ unit: r.unit, value: a });
+  ), i = v(
+    (a) => {
+      const c = Number(a);
+      Number.isFinite(c) && o({ unit: r.unit, value: c });
     },
     [r.unit, o]
-  ), s = w(
-    (c) => o({ unit: c, value: r.value }),
+  ), s = v(
+    (a) => o({ unit: a, value: r.value }),
     [r.value, o]
   );
-  return A(
+  return y(
     () => ({
       onInputChange: i,
       onUnitSelect: s,
@@ -983,207 +977,202 @@ const yt = ({
     }),
     [r, o, i, s, n]
   );
-}, B = (e, t) => ({
+}, W = (e, t) => ({
   raw: e || "",
   ui: ne(e, t)
-}), Dt = (e, t, n) => {
-  var o;
-  const r = (o = xe()) == null ? void 0 : o.id;
-  return A(() => !e || !t || !n ? [] : e.map((i) => ({
-    rawFill: i,
-    inputToken: t,
-    outputToken: n,
-    inputAmount: B(i.inAmount, t.decimals),
-    outputAmount: B(i.outAmount, n.decimals),
-    timestamp: i.timestamp,
-    txHash: i.txHash,
-    explorerUrl: b(i.txHash, r),
-    executionRate: ve(
-      i.inAmount,
-      i.outAmount,
-      t.decimals,
-      n.decimals
-    )
-  })), [e, t, r, n]);
-}, tr = (e, t, n) => {
-  const { chainId: r, partner: o } = L(), i = A(() => {
+}), Nt = (e, t, n) => y(() => !e || !t || !n ? [] : e.map((r) => ({
+  rawFill: r,
+  inputToken: t,
+  outputToken: n,
+  inputAmount: W(r.inAmount, t.decimals),
+  outputAmount: W(r.outAmount, n.decimals),
+  timestamp: r.timestamp,
+  txHash: r.txHash,
+  executionRate: Ce(
+    r.inAmount,
+    r.outAmount,
+    t.decimals,
+    n.decimals
+  )
+})), [e, t, n]), Zt = (e, t, n) => {
+  const { chainId: r, partner: o } = N(), i = y(() => {
     if (!(!t || !n || !e || e.isMarketPrice))
-      return qe(
+      return Ge(
         e,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), s = A(() => {
+  }, [t, e, n]), s = y(() => {
     if (!(!t || !n || !e))
-      return Ke(
+      return _e(
         e,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), c = A(() => {
+  }, [t, e, n]), a = y(() => {
     if (!(!t || !n || !e))
-      return ve(
+      return Ce(
         e.srcAmountFilled,
         e.dstAmountFilled,
         t.decimals,
         n.decimals
       );
-  }, [t, e, n]), a = A(() => e ? Ve(
+  }, [t, e, n]), c = y(() => e ? Be(
     e,
-    r ? Ae(o, r) : void 0
-  ) : 0, [e, o, r]), f = Dt(e == null ? void 0 : e.fills, t, n);
-  return A(() => {
+    r ? we(o, r) : void 0
+  ) : 0, [e, o, r]), P = Nt(e == null ? void 0 : e.fills, t, n);
+  return y(() => {
     if (e != null && e.id)
       return {
         original: e,
-        fills: f,
+        fills: P,
         inputToken: t,
         outputToken: n,
         orderType: e.type,
         createdAt: e.createdAt,
         deadline: e.deadline || 0,
         totalTrades: e.totalTradesAmount || 0,
-        tradeInterval: a,
+        tradeInterval: c,
         recipient: e.maker || "",
-        inputAmount: B(e.srcAmount, t == null ? void 0 : t.decimals),
-        limitPrice: B(
-          Z(i, n == null ? void 0 : n.decimals),
+        inputAmount: W(e.srcAmount, t == null ? void 0 : t.decimals),
+        limitPrice: W(
+          k(i, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
-        inputAmountPerTrade: B(
+        inputAmountPerTrade: W(
           e.srcAmountPerTrade,
           t == null ? void 0 : t.decimals
         ),
-        minOutputAmountPerTrade: B(
+        minOutputAmountPerTrade: W(
           e.dstMinAmountPerTrade,
           n == null ? void 0 : n.decimals
         ),
-        minOutputAmount: B(
+        minOutputAmount: W(
           e.dstMinAmountTotal,
           n == null ? void 0 : n.decimals
         ),
-        triggerPrice: B(
-          Z(s, n == null ? void 0 : n.decimals),
+        triggerPrice: W(
+          k(s, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         id: e.id,
-        inputAmountFilled: B(
+        inputAmountFilled: W(
           e.srcAmountFilled,
           t == null ? void 0 : t.decimals
         ),
-        outputAmountFilled: B(
+        outputAmountFilled: W(
           e.dstAmountFilled,
           n == null ? void 0 : n.decimals
         ),
         progress: e.progress,
-        executionPrice: B(
-          Z(c, n == null ? void 0 : n.decimals),
+        executionPrice: W(
+          k(a, n == null ? void 0 : n.decimals),
           n == null ? void 0 : n.decimals
         ),
         version: e.version
       };
   }, [
     e,
-    f,
+    P,
     t,
     n,
-    a,
+    c,
     i,
     s,
-    c
+    a
   ]);
-}, rr = () => {
-  const { marketPriceLoading: e } = L(), t = W().errors.primary;
+}, bt = () => {
+  const { marketPriceLoading: e } = N(), t = K().errors.primary;
   return e ? void 0 : t;
-}, nr = () => {
-  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = L(), { limitPrice: o, values: i, module: s, isInverted: c } = W(), a = C((l) => l.updateState), f = w(
+}, kt = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = N(), { limitPrice: o, values: i, module: s, isInverted: a } = K(), c = C((l) => l.updateState), P = v(
     (l) => {
-      a({ typedLimitPrice: l, limitPricePercent: null }), I(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : h.call(r, l || "");
+      c({ limitPriceUi: l, limitPricePercent: null }), I(() => {
+        var f;
+        return (f = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : f.call(r, l || "");
       }), I(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : h.call(r, "");
+        var f;
+        return (f = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : f.call(r, "");
       });
     },
-    [r, a]
-  ), O = w(
+    [r, c]
+  ), O = v(
     (l) => {
-      a({
-        typedLimitPrice: void 0,
+      c({
+        limitPriceUi: void 0,
         limitPricePercent: l
       }), I(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : h.call(r, "");
+        var f;
+        return (f = r == null ? void 0 : r.onLimitPriceChange) == null ? void 0 : f.call(r, "");
       }), I(() => {
-        var h;
-        return (h = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : h.call(r, l || "");
+        var f;
+        return (f = r == null ? void 0 : r.onLimitPricePercentChange) == null ? void 0 : f.call(r, l || "");
       });
     },
-    [r, a]
-  ), p = w(() => {
-    a({
-      typedLimitPrice: void 0,
+    [r, c]
+  ), S = v(() => {
+    c({
+      limitPriceUi: void 0,
       limitPricePercent: void 0
     });
-  }, [a]), E = !i.isMarketOrder, u = w(() => {
-    a({
+  }, [c]), u = !i.isMarketOrder, m = v(() => {
+    c({
       isMarketOrder: !i.isMarketOrder,
-      ...i.isMarketOrder ? {} : { isInvertedTrade: !1 },
-      ...!i.isMarketOrder && s === X.STOP_LOSS ? { limitPricePercent: void 0 } : {}
+      ...i.isMarketOrder ? {} : { isPriceInverted: !1 },
+      ...!i.isMarketOrder && s === Z.STOP_LOSS ? { limitPricePercent: void 0 } : {}
     });
-  }, [s, a, i.isMarketOrder]);
-  return A(
+  }, [s, c, i.isMarketOrder]);
+  return y(
     () => ({
       price: o.display,
       canonicalPriceRaw: o.raw,
       error: o.error,
-      onInputChange: f,
+      onInputChange: P,
       onPercentageChange: O,
-      onReset: p,
+      onReset: S,
       inputToken: t,
       outputToken: n,
-      displayInputToken: c ? n : t,
-      displayOutputToken: c ? t : n,
+      displayInputToken: a ? n : t,
+      displayOutputToken: a ? t : n,
       percentage: o.percentage,
       isLoading: !!e,
-      isEnabled: E,
-      toggle: u,
+      isEnabled: u,
+      toggle: m,
       isTypedValue: o.isTypedValue
     }),
     [
       t,
-      c,
-      E,
+      a,
+      u,
       o,
       e,
-      f,
+      P,
       O,
-      p,
+      S,
       n,
-      u
+      m
     ]
   );
-}, ir = () => {
-  const { marketPriceLoading: e } = L(), { outputAmount: t } = W();
-  return A(
+}, er = () => {
+  const { marketPriceLoading: e } = N(), { outputAmount: t } = K();
+  return y(
     () => ({
       amount: t,
       isLoading: !!e
     }),
     [e, t]
   );
-}, or = () => {
-  const { inputToken: e, outputToken: t } = L(), n = C((a) => a.updateState), { isInverted: r, values: o } = W(), i = C((a) => a.state.typedTriggerPrice), s = C((a) => a.state.typedLimitPrice), c = w(() => {
+}, tr = () => {
+  const { inputToken: e, outputToken: t } = N(), n = C((c) => c.updateState), { isInverted: r, values: o } = K(), i = C((c) => c.state.triggerPriceUi), s = C((c) => c.state.limitPriceUi), a = v(() => {
     n({
-      isInvertedTrade: !r,
-      ...i !== void 0 ? { typedTriggerPrice: fe(i) } : {},
-      ...s !== void 0 ? { typedLimitPrice: fe(s) } : {}
+      isPriceInverted: !r,
+      ...i !== void 0 ? { triggerPriceUi: fe(i) } : {},
+      ...s !== void 0 ? { limitPriceUi: fe(s) } : {}
     });
   }, [n, r, i, s]);
-  return A(
+  return y(
     () => ({
-      onInvert: c,
+      onInvert: a,
       isInverted: r,
       inputToken: e,
       outputToken: t,
@@ -1191,44 +1180,48 @@ const yt = ({
       displayOutputToken: r ? e : t,
       isMarketOrder: o.isMarketOrder
     }),
-    [e, r, c, t, o.isMarketOrder]
+    [e, r, a, t, o.isMarketOrder]
   );
-}, Oe = 3, Ut = 3e3, Gt = (e) => new Promise((t) => setTimeout(t, e)), ae = (e, t) => {
+}, pe = 3, Ft = 3e3, xt = (e) => new Promise((t) => setTimeout(t, e)), ce = (e, t) => {
   if (!/^\d+$/.test(e))
     throw new Error(
       `${t} must be a non-negative integer base-unit amount`
     );
   return BigInt(e);
-}, ye = async ({
+}, Ae = async ({
   client: e,
   walletInteractions: t,
   tokenAddress: n,
-  inputAmountWei: r
+  inputAmountRaw: r
 }) => {
   const o = await t.getAllowance({
     tokenAddress: n,
     spenderAddress: e.spenderAddress
   });
-  return ae(o || "0", "Allowance") >= ae(r, "Input amount");
-}, Mt = (e) => {
+  return ce(o || "0", "Allowance") >= ce(r, "Input amount");
+}, Ut = (e) => {
   if (!e.client) throw new Error("Spot client is unavailable");
   if (!e.isSupportedChain || !e.chainId)
     throw new Error("Spot is unavailable on the connected chain");
   if (!e.account) throw new Error("missing account");
   if (!e.inputToken) throw new Error("missing inputToken");
   if (!e.outputToken) throw new Error("missing outputToken");
+  const t = Y(e.inputToken.address) ? e.wrappedNativeToken : e.inputToken;
+  if (!t || Y(t.address))
+    throw new Error("missing wrappedNativeToken for native input");
   if (!e.form.canSubmit)
     throw new Error("Order form is not submittable");
-  const t = e.form.inputAmount.raw;
-  return ae(t, "Input amount"), {
+  const n = e.form.inputAmount.raw;
+  return ce(n, "Input amount"), {
     account: e.account,
     chainId: e.chainId,
     inputToken: e.inputToken,
+    orderInputToken: t,
     outputToken: e.outputToken,
     client: e.client,
-    inputAmountWei: t
+    inputAmountRaw: n
   };
-}, _t = ({
+}, Dt = ({
   account: e,
   chainId: t,
   inputToken: n,
@@ -1237,7 +1230,7 @@ const yt = ({
 }) => {
   const { form: i, values: s } = o;
   I(
-    () => G.onRequestOrder({
+    () => _.onRequestOrder({
       account: e,
       chainId: t,
       module: i.module,
@@ -1254,7 +1247,7 @@ const yt = ({
       chunksAmount: s.totalTrades
     })
   );
-}, Bt = async (e) => {
+}, Mt = async (e) => {
   const {
     form: t,
     walletInteractions: n,
@@ -1262,274 +1255,273 @@ const yt = ({
     addNewOrder: o,
     refetchActiveOrders: i,
     getCurrentExecution: s,
-    beginExecution: c,
-    replaceExecution: a,
-    wait: f = Gt
+    beginExecution: a,
+    replaceExecution: c,
+    wait: P = xt
   } = e;
   let O;
   try {
-    O = Mt(e);
-  } catch (S) {
-    const y = re(S), m = oe(S), T = c({
+    O = Ut(e);
+  } catch (A) {
+    const R = re(A), T = oe(A), F = a({
       form: t,
       inputToken: e.inputToken,
       outputToken: e.outputToken,
       chainId: e.chainId
     });
-    throw T && a(T.executionId, {
-      ...T,
+    throw F && c(F.executionId, {
+      ...F,
       phase: d.FAILED,
-      error: y,
-      parsedError: m
+      error: R,
+      parsedError: T
     }), I(
       () => {
-        var N;
-        return (N = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : N.call(r, m);
+        var U;
+        return (U = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : U.call(r, T);
       }
-    ), y;
+    ), R;
   }
   const {
-    account: p,
-    chainId: E,
-    inputToken: u,
-    outputToken: l,
-    client: h,
-    inputAmountWei: R
-  } = O, x = s(), M = st({
-    execution: x,
-    account: p,
-    chainId: E,
-    inputTokenAddress: u.address,
-    inputAmountWei: R
-  }), V = c({
+    account: S,
+    chainId: u,
+    inputToken: m,
+    orderInputToken: l,
+    outputToken: f,
+    client: L,
+    inputAmountRaw: w
+  } = O, V = s(), G = rt({
+    execution: V,
+    account: S,
+    chainId: u,
+    inputTokenAddress: m.address,
+    inputAmountRaw: w
+  }), B = a({
     form: t,
-    inputToken: u,
-    outputToken: l,
-    chainId: E,
-    completedWrap: M,
-    wrapTxHash: M == null ? void 0 : M.txHash
+    inputToken: m,
+    outputToken: f,
+    chainId: u,
+    completedWrap: G,
+    wrapTxHash: G == null ? void 0 : G.txHash
   });
-  if (!V) return;
-  const q = V.executionId;
-  let g = V;
-  const P = (S, y = {}) => {
-    const m = {
-      ...g,
-      ...y,
-      executionId: q,
-      phase: S
+  if (!B) return;
+  const g = B.executionId;
+  let h = B;
+  const p = (A, R = {}) => {
+    const T = {
+      ...h,
+      ...R,
+      executionId: g,
+      phase: A
     };
-    if (!a(q, m))
+    if (!c(g, T))
       throw new Error("Execution is no longer current");
-    g = m;
-  }, v = (S, y = {}) => {
-    const m = {
-      ...g,
-      ...y,
-      executionId: q,
-      phase: S
+    h = T;
+  }, E = (A, R = {}) => {
+    const T = {
+      ...h,
+      ...R,
+      executionId: g,
+      phase: A
     };
-    return a(q, m) ? (g = m, !0) : !1;
+    return c(g, T) ? (h = T, !0) : !1;
   };
   try {
-    const S = He(u, E), y = Pe(u.address) && !M;
-    if (y && Pe(S.address))
-      throw new Error("Wrapped input token is unavailable");
-    const m = !await ye({
-      client: h,
+    const A = Y(m.address) && !G, R = !await Ae({
+      client: L,
       walletInteractions: n,
-      tokenAddress: S.address,
-      inputAmountWei: R
+      tokenAddress: l.address,
+      inputAmountRaw: w
     }), T = [];
-    y && T.push(J.WRAP), m && T.push(J.APPROVE), T.push(J.CREATE);
-    let N = 0;
-    if (P(d.PREPARING, {
+    A && T.push(J.WRAP), R && T.push(J.APPROVE), T.push(J.CREATE);
+    let F = 0;
+    if (p(d.PREPARING, {
       pendingSteps: T,
       totalSteps: T.length,
-      stepIndex: N,
-      hasApproval: !m
-    }), y) {
-      P(d.WRAPPING), I(() => G.onWrapRequest()), I(r == null ? void 0 : r.onWrapRequest);
-      const F = await n.wrapNativeToken(
-        R
+      stepIndex: F,
+      hasApproval: !R
+    }), A) {
+      p(d.WRAPPING), I(() => _.onWrapRequest()), I(r == null ? void 0 : r.onWrapRequest);
+      const D = await n.wrapNativeToken(
+        w
       );
-      if (!F) throw new Error("failed to wrap input token");
-      const _ = {
-        account: p,
-        chainId: E,
-        inputTokenAddress: u.address,
-        inputAmountWei: R,
-        txHash: F
+      if (!D) throw new Error("failed to wrap input token");
+      const q = {
+        account: S,
+        chainId: u,
+        inputTokenAddress: m.address,
+        inputAmountRaw: w,
+        txHash: D
       };
-      N++, P(d.WRAPPING, {
-        wrapTxHash: F,
-        completedWrap: _,
-        stepIndex: N
-      }), I(() => G.onWrapSuccess(F)), I(
+      F++, p(d.WRAPPING, {
+        wrapTxHash: D,
+        completedWrap: q,
+        stepIndex: F
+      }), I(() => _.onWrapSuccess(D)), I(
         () => {
-          var D;
-          return (D = r == null ? void 0 : r.onWrapSuccess) == null ? void 0 : D.call(r, {
-            txHash: F,
-            explorerUrl: b(F, E),
-            amount: ne(R, S.decimals)
+          var M;
+          return (M = r == null ? void 0 : r.onWrapSuccess) == null ? void 0 : M.call(r, {
+            txHash: D,
+            amount: ne(w, l.decimals)
           });
         }
       );
     }
-    if (m) {
-      P(d.APPROVING), I(() => G.onApproveRequest()), I(r == null ? void 0 : r.onApproveRequest);
-      const F = await n.approveToken({
-        tokenAddress: S.address,
-        amount: R,
-        spenderAddress: h.spenderAddress
+    if (R) {
+      p(d.APPROVING), I(() => _.onApproveRequest()), I(r == null ? void 0 : r.onApproveRequest);
+      const D = await n.approveToken({
+        tokenAddress: l.address,
+        amount: w,
+        spenderAddress: L.spenderAddress
       });
-      if (!F) throw new Error("failed to approve token");
-      P(d.APPROVING, { approveTxHash: F });
-      let _ = !1;
-      for (let D = 0; D < Oe && (_ = await ye({
-        client: h,
+      if (!D) throw new Error("failed to approve token");
+      p(d.APPROVING, { approveTxHash: D });
+      let q = !1;
+      for (let M = 0; M < pe && (q = await Ae({
+        client: L,
         walletInteractions: n,
-        tokenAddress: S.address,
-        inputAmountWei: R
-      }), !_); D++)
-        D < Oe - 1 && await f(Ut);
-      if (!_)
+        tokenAddress: l.address,
+        inputAmountRaw: w
+      }), !q); M++)
+        M < pe - 1 && await P(Ft);
+      if (!q)
         throw new Error(
-          `Insufficient ${S.symbol} allowance to perform the swap. Please approve the token first.`
+          `Insufficient ${l.symbol} allowance to perform the swap. Please approve the token first.`
         );
-      N++, P(d.APPROVING, {
+      F++, p(d.APPROVING, {
         hasApproval: !0,
-        stepIndex: N
-      }), I(() => G.onApproveSuccess(F)), I(
+        stepIndex: F
+      }), I(() => _.onApproveSuccess(D)), I(
         () => {
-          var D;
-          return (D = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : D.call(r, {
-            txHash: F,
-            explorerUrl: b(F, E),
-            token: S,
-            amount: ne(R, S.decimals)
+          var M;
+          return (M = r == null ? void 0 : r.onApproveSuccess) == null ? void 0 : M.call(r, {
+            txHash: D,
+            token: l,
+            amount: ne(w, l.decimals)
           });
         }
       );
     }
-    P(d.SIGNING);
-    const H = h.prepareOrder({
+    p(d.SIGNING);
+    const U = L.prepareOrder({
       form: t,
-      inputTokenAddress: u.address,
-      outputTokenAddress: l.address,
-      swapperAddress: p
+      inputTokenAddress: l.address,
+      outputTokenAddress: f.address,
+      swapperAddress: S
     });
-    P(d.SIGNING, { preparedOrder: H }), _t({
-      account: p,
-      chainId: E,
-      inputToken: u,
-      outputToken: l,
-      preparedOrder: H
+    p(d.SIGNING, { preparedOrder: U }), Dt({
+      account: S,
+      chainId: u,
+      inputToken: m,
+      outputToken: f,
+      preparedOrder: U
     });
-    const Fe = await h.signOrder(
-      H,
-      async (F) => {
+    const Ne = await L.signOrder(
+      U,
+      async (D) => {
         I(r == null ? void 0 : r.onSignOrderRequest);
         try {
-          const _ = await n.signOrder(F);
+          const q = await n.signOrder(D);
           return I(() => {
-            var D;
-            return (D = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : D.call(r, _);
-          }), _;
-        } catch (_) {
+            var M;
+            return (M = r == null ? void 0 : r.onSignOrderSuccess) == null ? void 0 : M.call(r, q);
+          }), q;
+        } catch (q) {
           throw I(() => {
-            var D;
-            return (D = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : D.call(r, re(_));
-          }), _;
+            var M;
+            return (M = r == null ? void 0 : r.onSignOrderError) == null ? void 0 : M.call(r, re(q));
+          }), q;
         }
       }
     );
-    P(d.SUBMITTING);
-    const k = await h.submitOrder(H, Fe);
-    return P(d.SUCCESS, {
-      orderId: k.id.toString()
-    }), I(() => o(k)), I(() => i()), I(() => {
-      var F;
-      return (F = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : F.call(r, k);
-    }), k;
-  } catch (S) {
-    const y = g.phase, m = re(S), T = we(S);
-    throw v(
-      T ? d.REJECTED : d.FAILED,
+    p(d.SUBMITTING);
+    const b = await L.submitOrder(U, Ne);
+    return p(d.SUCCESS, {
+      orderId: b.id.toString()
+    }), I(() => o(b)), I(() => i()), I(() => {
+      var D;
+      return (D = r == null ? void 0 : r.onOrderCreated) == null ? void 0 : D.call(r, b);
+    }), b;
+  } catch (A) {
+    const R = h.phase, T = re(A), F = ve(A);
+    throw E(
+      F ? d.REJECTED : d.FAILED,
       {
-        error: m,
-        parsedError: oe(S)
+        error: T,
+        parsedError: oe(A)
       }
-    ), y === d.WRAPPING ? I(() => G.onWrapError(S)) : y === d.APPROVING && I(() => G.onApproveError(S)), I(T ? r == null ? void 0 : r.onSubmitOrderRejected : () => {
-      var N;
-      return (N = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : N.call(r, oe(S));
-    }), m;
+    ), R === d.WRAPPING ? I(() => _.onWrapError(A)) : R === d.APPROVING && I(() => _.onApproveError(A)), I(F ? r == null ? void 0 : r.onSubmitOrderRejected : () => {
+      var U;
+      return (U = r == null ? void 0 : r.onSubmitOrderFailed) == null ? void 0 : U.call(r, oe(A));
+    }), T;
   }
-}, Wt = () => {
+}, Gt = () => {
   const {
     inputToken: e,
     outputToken: t,
-    chainId: n,
-    isSupportedChain: r,
-    callbacks: o,
-    account: i,
-    walletInteractions: s
-  } = L(), { data: c } = Q(), a = Rt(), f = Lt(), O = W(), p = j();
-  return w(() => {
-    Bt({
-      account: i,
-      chainId: n,
-      isSupportedChain: r,
+    wrappedNativeToken: n,
+    chainId: r,
+    isSupportedChain: o,
+    callbacks: i,
+    account: s,
+    walletInteractions: a
+  } = N(), { data: c } = X(), P = wt(), O = Ct(), S = K(), u = j();
+  return v(() => {
+    Mt({
+      account: s,
+      chainId: r,
+      isSupportedChain: o,
       inputToken: e,
       outputToken: t,
-      form: O,
+      wrappedNativeToken: n,
+      form: S,
       client: c,
-      walletInteractions: s,
-      callbacks: o,
-      addNewOrder: a,
-      refetchActiveOrders: f,
-      getCurrentExecution: () => p.getState().state.currentExecution,
-      beginExecution: p.getState().beginExecution,
-      replaceExecution: p.getState().replaceExecution
+      walletInteractions: a,
+      callbacks: i,
+      addNewOrder: P,
+      refetchActiveOrders: O,
+      getCurrentExecution: () => u.getState().state.currentExecution,
+      beginExecution: u.getState().beginExecution,
+      replaceExecution: u.getState().replaceExecution
     }).catch(() => {
     });
   }, [
+    s,
+    P,
     i,
-    a,
-    o,
-    n,
+    r,
     c,
-    O,
+    S,
     e,
-    r,
+    o,
     t,
-    f,
-    p,
-    s
+    n,
+    O,
+    u,
+    a
   ]);
-}, qt = () => {
+}, _t = () => {
   const e = C((n) => n.state.currentExecution), t = C(
     (n) => n.returnToOrderForm
   );
-  return A(
+  return y(
     () => ({ ...e, returnToOrderForm: t }),
     [e, t]
   );
-}, sr = () => {
-  const e = qt(), {
+}, rr = () => {
+  const e = _t(), {
     inputToken: t,
     outputToken: n,
     chainId: r,
     isSupportedChain: o,
     module: i,
     overrides: s
-  } = L(), { data: c, isLoading: a } = Q(), f = Wt(), O = C((R) => R.startNewOrder), p = w(() => f(), [f]), E = w(
-    () => O(Te({ module: i, overrides: s })),
+  } = N(), { data: a, isLoading: c } = X(), P = Gt(), O = C((L) => L.startNewOrder), S = v(() => P(), [P]), u = v(
+    () => O(Re({ module: i, overrides: s })),
     [i, s, O]
-  ), u = nt(e.phase), l = it(e.phase), h = Y(e.phase);
-  return A(() => ({
+  ), m = ke(e.phase), l = et(e.phase), f = Q(e.phase);
+  return y(() => ({
     phase: e.phase,
-    status: u,
+    status: m,
     error: e.parsedError,
     currentStep: l,
     currentStepIndex: e.stepIndex,
@@ -1540,56 +1532,57 @@ const yt = ({
     inputToken: e.inputToken ?? t,
     outputToken: e.outputToken ?? n,
     chainId: e.chainId ?? r,
-    submitOrder: p,
-    startNewOrder: E,
+    submitOrder: S,
+    startNewOrder: u,
     returnToOrderForm: e.returnToOrderForm,
-    isExecuting: h,
+    isExecuting: f,
     isSuccess: e.phase === d.SUCCESS,
     isFailed: e.phase === d.FAILED,
     isRejected: e.phase === d.REJECTED,
-    isPreparingOrder: e.phase === d.PREPARING || o && a && !c,
-    canDismiss: !h
+    isPreparingOrder: e.phase === d.PREPARING || o && c && !a,
+    canDismiss: !f
   }), [
-    c,
+    a,
     l,
     t,
     n,
     r,
-    a,
-    h,
+    c,
+    f,
     o,
-    E,
-    p,
     u,
+    S,
+    m,
     e
   ]);
-}, cr = () => {
+}, nr = () => {
   const {
     inputToken: e,
     outputToken: t,
-    inputBalance: n,
-    noLiquidity: r,
-    typedInputAmount: o,
-    marketPriceLoading: i,
-    isSupportedChain: s
-  } = L(), c = W(), { data: a, isLoading: f } = Q(), O = C(
-    (h) => h.state.currentExecution.phase
-  ), p = Y(O), E = i || !c.isReady || n === void 0, u = p || s && f && !a || !!(e && t && o && E), l = !!(!c.canSubmit || p || !s || !a || r || u || !e || !t);
-  return A(() => ({
-    disabled: l,
-    loading: u
-  }), [l, u]);
-}, ar = () => {
-  const { inputToken: e, outputToken: t, callbacks: n } = L(), r = C((s) => s.updateState), { trades: o } = W(), i = w(
+    wrappedNativeToken: n,
+    inputBalanceRaw: r,
+    noLiquidity: o,
+    inputAmountUi: i,
+    marketPriceLoading: s,
+    isSupportedChain: a
+  } = N(), c = K(), { data: P, isLoading: O } = X(), S = C(
+    (w) => w.state.currentExecution.phase
+  ), u = Q(S), m = !!(e && Y(e.address) && (!n || Y(n.address))), l = s || !c.isReady || r === void 0, f = u || a && O && !P || !!(e && t && i && l), L = !!(!c.canSubmit || u || !a || !P || o || f || !e || !t || m);
+  return y(() => ({
+    disabled: L,
+    loading: f
+  }), [L, f]);
+}, ir = () => {
+  const { inputToken: e, outputToken: t, callbacks: n } = N(), r = C((s) => s.updateState), { trades: o } = K(), i = v(
     (s) => {
-      r({ typedTrades: s }), I(() => {
-        var c;
-        return (c = n == null ? void 0 : n.onTradesChange) == null ? void 0 : c.call(n, s);
+      r({ tradeCount: s }), I(() => {
+        var a;
+        return (a = n == null ? void 0 : n.onTradeCountChange) == null ? void 0 : a.call(n, s);
       });
     },
     [n, r]
   );
-  return A(
+  return y(
     () => ({
       totalTrades: o.totalTrades,
       maxTrades: o.maxTrades,
@@ -1603,127 +1596,119 @@ const yt = ({
     }),
     [e, i, t, o]
   );
-}, dr = () => {
-  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = L(), { marketPrice: o, trades: i, triggerPrice: s, isInverted: c } = W(), a = C((E) => E.updateState), f = w(
-    (E) => {
-      a({ typedTriggerPrice: E, triggerPricePercent: null }), I(() => {
-        var u;
-        return (u = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : u.call(r, E || "");
+}, or = () => {
+  const { marketPriceLoading: e, inputToken: t, outputToken: n, callbacks: r } = N(), { marketPrice: o, trades: i, triggerPrice: s, isInverted: a } = K(), c = C((u) => u.updateState), P = v(
+    (u) => {
+      c({ triggerPriceUi: u, triggerPricePercent: null }), I(() => {
+        var m;
+        return (m = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : m.call(r, u || "");
       }), I(() => {
-        var u;
-        return (u = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : u.call(r, "");
+        var m;
+        return (m = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : m.call(r, "");
       });
     },
-    [r, a]
-  ), O = w(
-    (E) => {
-      a({
-        typedTriggerPrice: void 0,
-        triggerPricePercent: E
+    [r, c]
+  ), O = v(
+    (u) => {
+      c({
+        triggerPriceUi: void 0,
+        triggerPricePercent: u
       }), I(() => {
-        var u;
-        return (u = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : u.call(r, "");
+        var m;
+        return (m = r == null ? void 0 : r.onTriggerPriceChange) == null ? void 0 : m.call(r, "");
       }), I(() => {
-        var u;
-        return (u = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : u.call(r, E || "");
+        var m;
+        return (m = r == null ? void 0 : r.onTriggerPricePercentChange) == null ? void 0 : m.call(r, u || "");
       });
     },
-    [r, a]
-  ), p = w(() => {
-    a({
+    [r, c]
+  ), S = v(() => {
+    c({
       triggerPricePercent: void 0,
-      typedTriggerPrice: void 0
+      triggerPriceUi: void 0
     });
-  }, [a]);
-  return A(
+  }, [c]);
+  return y(
     () => ({
       price: s.display,
       canonicalPriceRaw: s.raw,
       outputAmountPerTrade: i.triggerOutputAmountPerTrade,
       error: s.error,
-      onInputChange: f,
+      onInputChange: P,
       onPercentageChange: O,
       percentage: s.percentage,
-      onReset: p,
+      onReset: S,
       inputToken: t,
       outputToken: n,
-      displayInputToken: c ? n : t,
-      displayOutputToken: c ? t : n,
+      displayInputToken: a ? n : t,
+      displayOutputToken: a ? t : n,
       isLoading: !!(e || !o.raw),
       isTypedValue: s.isTypedValue
     }),
     [
       t,
-      c,
+      a,
       o.raw,
       e,
-      f,
+      P,
       O,
-      p,
+      S,
       n,
       i.triggerOutputAmountPerTrade,
       s
     ]
   );
 };
-je(be.version);
+qe(Qe.version);
 export {
-  mr as DISCLAIMER_URL,
+  cr as DISCLAIMER_URL,
   ee as Disclaimer,
   d as ExecutionPhase,
-  K as ExecutionStatus,
-  gr as InputErrors,
-  fr as Module,
-  Pr as ORBS_LOGO,
-  hr as ORBS_SLTP_FAQ_URL,
-  pr as ORBS_TWAP_FAQ_URL,
-  Er as ORBS_WEBSITE_URL,
-  Sr as OrderFilter,
-  Ir as OrderStatus,
-  Or as OrderType,
-  yr as Partners,
-  Ar as SPOT_VERSION,
-  Yt as SpotProvider,
+  H as ExecutionStatus,
+  dr as InputErrors,
+  ur as Module,
+  lr as ORBS_LOGO,
+  mr as ORBS_SLTP_FAQ_URL,
+  gr as ORBS_TWAP_FAQ_URL,
+  Pr as ORBS_WEBSITE_URL,
+  fr as OrderFilter,
+  hr as OrderStatus,
+  Sr as OrderType,
+  Er as Partners,
+  Ir as SPOT_VERSION,
+  jt as SpotProvider,
   J as Steps,
-  wr as TimeUnit,
-  vr as calculateOrderForm,
-  Cr as createClient,
-  Rr as ensureWrappedToken,
-  Tr as eqIgnoreCase,
-  Lr as getExplorerUrl,
-  xr as getNetwork,
-  Fr as getOrderExecutionRate,
-  Nr as getOrderFillDelayMillis,
-  Dr as getOrderLimitPriceRate,
-  Ur as getPartnerChains,
-  Gr as getPartners,
-  Mr as getTriggerPriceRate,
-  _r as getTwapConfig,
-  Br as invertPriceInput,
-  Wr as isNativeAddress,
-  qr as isTxRejected,
-  Kr as networks,
-  Vr as shouldUnwrapOnly,
-  Hr as shouldWrapOnly,
-  jr as toAmountUI,
-  zr as toAmountWei,
-  $t as useAmountUi,
-  Zt as useCancelOrder,
-  Q as useClient,
-  bt as useDisclaimer,
-  kt as useDuration,
-  sr as useExecution,
-  Qt as useExplorerLink,
-  er as useFillDelay,
-  tr as useHistoryOrder,
-  rr as useInputErrors,
-  nr as useLimitPrice,
-  xe as useNetwork,
-  W as useOrderForm,
-  Xt as useOrders,
-  ir as useOutputAmount,
-  or as usePriceDisplay,
-  cr as useSubmitButton,
-  ar as useTrades,
-  dr as useTriggerPrice
+  Or as TimeUnit,
+  pr as calculateOrderForm,
+  Ar as createClient,
+  wr as eqIgnoreCase,
+  vr as getOrderExecutionRate,
+  Cr as getOrderFillDelayMillis,
+  yr as getOrderLimitPriceRate,
+  Rr as getPartnerChains,
+  Tr as getPartners,
+  Lr as getTriggerPriceRate,
+  Nr as getTwapConfig,
+  Fr as invertPriceInput,
+  xr as isNativeAddress,
+  Ur as isTxRejected,
+  Dr as toAmountRaw,
+  Mr as toAmountUI,
+  zt as useAmountUi,
+  Qt as useCancelOrder,
+  X as useClient,
+  Yt as useDisclaimer,
+  $t as useDuration,
+  rr as useExecution,
+  Xt as useFillDelay,
+  Zt as useHistoryOrder,
+  bt as useInputErrors,
+  kt as useLimitPrice,
+  K as useOrderForm,
+  Jt as useOrders,
+  er as useOutputAmount,
+  tr as usePriceDisplay,
+  nr as useSubmitButton,
+  ir as useTrades,
+  or as useTriggerPrice
 };