@orbs-network/spot-react 2.1.21 → 2.1.23

package/dist/spot-react.js

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