@kosdev-code/kos-ddk-model-components 0.1.0-dev.5878 → 0.1.0-dev.5880

package/index.js

@@ -1,18 +1,18 @@
 var Qs = Object.defineProperty;
 var eo = (t, e, n) => e in t ? Qs(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
 var j = (t, e, n) => (eo(t, typeof e != "symbol" ? e + "" : e, n), n);
-import { FutureManager as Or, kosComponent as D, useKosTranslation as I, useKosModel as Z, kosAutoEffect as je, FutureEndState as Fn, KosLog as W, useConfigProperty as le, useKosRegions as be, useRegionTimeProps as Rr, useDateProps as $r, getKosCompanionModel as ce, registerExtensionPoint as to, ExtensionManager as $e, CoreExtensionManager as no, Device as ro, KosFeatureFlags as so, TroubleContainer as oo, registerLegacyModel as io, initKosProvider as ao, troubleDataFactory as co, isTroubleAware as lo, useTroubleContainerModel as uo, withDevice as mo, useFormattedDate as po, useKosTranslationContext as ho, useSoftwareInfo as fo, useKosTime as _n } from "@kosdev-code/kos-ui-sdk";
+import { FutureManager as Or, kosComponent as D, useKosTranslation as I, useKosModel as Z, kosAutoEffect as je, FutureEndState as Fn, KosLog as W, useConfigProperty as le, useKosRegions as be, useRegionTimeProps as Rr, useDateProps as $r, getKosCompanionModel as ce, registerExtensionPoint as to, ExtensionManager as $e, CoreExtensionManager as no, Device as ro, KosFeatureFlags as so, TroubleContainer as oo, registerLegacyModel as io, initKosProvider as ao, troubleDataFactory as co, isTroubleAware as lo, useTroubleContainerModel as uo, withDevice as po, useFormattedDate as mo, useKosTranslationContext as ho, useSoftwareInfo as fo, useKosTime as _n } from "@kosdev-code/kos-ui-sdk";
 import { jsx as i, jsxs as f, Fragment as N } from "@emotion/react/jsx-runtime";
 import S from "@emotion/styled";
-import { useComponentConfigurationContext as J, Modal as Ze, Header as Ue, BackButton as nt, Content as se, InfoCard as Le, Footer as Q, Button as w, CloseButton as go, ProgressBar as Lr, LabelInformation as z, BodyMediumInformation as Se, InputCard as wt, WorkflowModal as Nt, StatusIndicator as Ke, InputRangeCard as yo, ToggleCard as vo, PickerCard as cn, Card as bo, SwitchCard as xt, MultiPickerCard as kn, LabelDate as Cn, Table as Vr, LabelInformationExtraSmall as wo, getItemData as xo, TapAndHoldButton as _o, ComponentConfigurationProvider as ko, useAbbreviation as Fr, getFillColor as Co, HolderDashboardCard as Mr, FuelGauge as Br, UtilityModalHeading as zr, FrameContainer as jr, FrameBody as dn, TabContainer as rt, SettingsSubheading as st, StatusCard as So, NotificationCard as To, TabViewLayout as Io, TabRouter as Eo, Tabs as Po, CompactCloseButton as Do, QuestionIconStyle as No, CancelProceedFooter as Ao, ErrorInputCard as ln, StatusBar as Zr, InfoContainer as Oo, FailureCard as Ro, useNavigate as $o, Sidebar as Lo, InputStep as Mn, InfoMessage as tn, InstructionCard as nn, SwitchPickerCard as Vo } from "@kosdev-code/kos-ddk-components";
-import Bn, { useState as T, useEffect as H, useCallback as V, useMemo as F, createContext as Y, useContext as G, useRef as zn, useLayoutEffect as Fo, Suspense as ot } from "react";
-import { AgitationControl as _t, toTimeComponents as Mo, toSeconds as Bo, Animation as jn, Application as un, CarbWater as Zn, CopyLogs as mn, DashboardOperations as Un, DispenserInfo as Kn, Door as Ur, IngredientSummary as Hn, MacroAssignment as Wn, NetworkTest as zo, NetworkTestContainer as Xn, NutritiveSweetener as qn, PlainWater as Yn, Lockout as jo, TroubleActionManager as pn, DDKModels as Gn, Reboot as Jn, Settings as Qn, SetupStep as Zo, SetupStepContainer as er, Start as tr, Utilities as Uo, UtilitiesContainer as nr, troubleVisibilityFilter as Ko } from "@kosdev-code/kos-ddk-models";
-import { SuccessIcon as Ho, MessageErrorIcon as Wo, TimeIcon as Kr, CalendarIcon as Xo, MessageInformationIconWithBackground as qo } from "@kosdev-code/kos-ddk-styles";
-import { DispenseExtensionManager as Yo, Assembly as Go, Pump as Jo, useBoardContainer as Qo, withAssembly as ei } from "@kosdev-code/kos-dispense-sdk";
-import { FcmPump as hn, SpmPump as Hr, CgpPump as Wr, LfcvPump as ti, KosModelRegistry as rr, CarbAgitator as ni, KosExtensionManager as ri, FreestyleAssembly as si, FreestyleHolder as Xr, useFreestyleAssemblyContext as oi, FreestylePump as qr } from "@kosdev-code/kos-freestyle-sdk";
-import { useKosPluginsContext as Yr, useReactiveExtensionRegistry as ii, useExtensionComponent as Sn, DynamicComponent as Gr } from "@kosdev-code/kos-ui-plugin";
-import { createExtensionSchema as ue, extensionPointId as me, defineExtensionPoint as pe, createViewAwareTransform as he, validateWithSchema as fe, validateRankIfPresent as Pe, validateDescriptorFormat as Tn } from "@kosdev-code/kos-ui-plugin/utilities";
-import { useLocation as ai, useSearchParams as ci } from "react-router-dom";
+import { useComponentConfigurationContext as J, Modal as Ze, Header as Ue, BackButton as nt, Content as se, InfoCard as Le, Footer as Q, Button as w, CloseButton as go, ProgressBar as Lr, LabelInformation as z, BodyMediumInformation as Se, InputCard as wt, WorkflowModal as Nt, StatusIndicator as Ke, InputRangeCard as yo, ToggleCard as vo, PickerCard as cn, Card as bo, SwitchCard as xt, MultiPickerCard as kn, LabelDate as Cn, Table as Vr, LabelInformationExtraSmall as wo, getItemData as xo, TapAndHoldButton as _o, ComponentConfigurationProvider as ko, useAbbreviation as Fr, getFillColor as Co, HolderDashboardCard as Mr, FuelGauge as Br, UtilityModalHeading as zr, FrameContainer as jr, FrameBody as dn, TabContainer as rt, SettingsSubheading as st, StatusCard as So, NotificationCard as To, TabViewLayout as Io, TabRouter as Eo, Tabs as Po, CompactCloseButton as Do, QuestionIconStyle as No, CancelProceedFooter as Ao, ErrorInputCard as ln, StatusBar as Zr, ModalContainer as Oo, InfoContainer as Ro, FailureCard as $o, useNavigate as Lo, Sidebar as Vo, InputStep as Mn, InfoMessage as tn, InstructionCard as nn, SwitchPickerCard as Fo } from "@kosdev-code/kos-ddk-components";
+import Bn, { useState as T, useEffect as H, useCallback as V, useMemo as F, createContext as Y, useContext as G, useRef as zn, useLayoutEffect as Mo, Suspense as ot } from "react";
+import { AgitationControl as _t, toTimeComponents as Bo, toSeconds as zo, Animation as jn, Application as un, CarbWater as Zn, CopyLogs as pn, DashboardOperations as Un, DispenserInfo as Kn, Door as Ur, IngredientSummary as Hn, MacroAssignment as Wn, NetworkTest as jo, NetworkTestContainer as Xn, NutritiveSweetener as qn, PlainWater as Yn, Lockout as Zo, TroubleActionManager as mn, DDKModels as Gn, Reboot as Jn, Settings as Qn, SetupStep as Uo, SetupStepContainer as er, Start as tr, Utilities as Ko, UtilitiesContainer as nr, troubleVisibilityFilter as Ho } from "@kosdev-code/kos-ddk-models";
+import { SuccessIcon as Wo, MessageErrorIcon as Xo, TimeIcon as Kr, CalendarIcon as qo, MessageInformationIconWithBackground as Yo } from "@kosdev-code/kos-ddk-styles";
+import { DispenseExtensionManager as Go, Assembly as Jo, Pump as Qo, useBoardContainer as ei, withAssembly as ti } from "@kosdev-code/kos-dispense-sdk";
+import { FcmPump as hn, SpmPump as Hr, CgpPump as Wr, LfcvPump as ni, KosModelRegistry as rr, CarbAgitator as ri, KosExtensionManager as si, FreestyleAssembly as oi, FreestyleHolder as Xr, useFreestyleAssemblyContext as ii, FreestylePump as qr } from "@kosdev-code/kos-freestyle-sdk";
+import { useKosPluginsContext as Yr, useReactiveExtensionRegistry as ai, useExtensionComponent as Sn, DynamicComponent as Gr } from "@kosdev-code/kos-ui-plugin";
+import { createExtensionSchema as ue, extensionPointId as pe, defineExtensionPoint as me, createViewAwareTransform as he, validateWithSchema as fe, validateRankIfPresent as Pe, validateDescriptorFormat as Tn } from "@kosdev-code/kos-ui-plugin/utilities";
+import { useLocation as ci, useSearchParams as di } from "react-router-dom";
 class ae {
   constructor(e, n) {
     j(this, "future");
@@ -33,7 +33,7 @@ class ae {
     e != null && e.tracker && (this.future = Or.getFuture(e.tracker));
   }
 }
-class di extends ae {
+class li extends ae {
   constructor(e) {
     super(e, {
       title: "Calibrate",
@@ -46,7 +46,7 @@ class di extends ae {
     return !0;
   }
 }
-class li extends ae {
+class ui extends ae {
   constructor(e) {
     super(e, {
       title: "45ml Flow Test",
@@ -59,7 +59,7 @@ class li extends ae {
     return !0;
   }
 }
-class ui extends ae {
+class pi extends ae {
   constructor(e) {
     super(e, {
       title: "Flush",
@@ -85,7 +85,7 @@ class mi extends ae {
     return !0;
   }
 }
-class pi extends ae {
+class hi extends ae {
   constructor(e) {
     super(e, {
       title: "Hold to Pour",
@@ -98,7 +98,7 @@ class pi extends ae {
     return !0;
   }
 }
-class hi extends ae {
+class fi extends ae {
   constructor(e) {
     super(e, {
       title: "Low Flow Test",
@@ -111,7 +111,7 @@ class hi extends ae {
     return !0;
   }
 }
-class fi extends ae {
+class gi extends ae {
   constructor(e) {
     super(e, {
       title: "Manual Override",
@@ -124,7 +124,7 @@ class fi extends ae {
     return !0;
   }
 }
-class gi extends ae {
+class yi extends ae {
   constructor(e) {
     super(e, {
       title: "Reset",
@@ -137,7 +137,7 @@ class gi extends ae {
     return !0;
   }
 }
-class yi extends ae {
+class vi extends ae {
   constructor(e) {
     super(e, {
       title: "Prime",
@@ -150,7 +150,7 @@ class yi extends ae {
     return !0;
   }
 }
-class vi extends ae {
+class bi extends ae {
   constructor(e) {
     super(e, {
       title: "Purge",
@@ -163,7 +163,7 @@ class vi extends ae {
     return !0;
   }
 }
-class bi {
+class wi {
   constructor(e, n) {
     j(this, "future");
     j(this, "troubleAware");
@@ -186,7 +186,7 @@ class bi {
     r != null && r.tracker && (this.future = Or.getFuture(r.tracker));
   }
 }
-class wi extends bi {
+class xi extends wi {
   constructor(e, n) {
     super(e, {
       trouble: n
@@ -196,14 +196,14 @@ class wi extends bi {
     return !0;
   }
 }
-const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
+const vd = "PrimeTrouble", bd = "PurgeTrouble", _i = S.div`
   display: flex;
   flex-direction: column;
   overflow-y: auto;
   overflow-x: hidden;
   gap: 32px;
   height: 100%;
-`, _i = D(
+`, ki = D(
   ({ holder: t, onComplete: e }) => {
     const [n, r] = T(!1), { t: s } = I("common"), { componentModeOverride: o } = J(), c = t.data.agitated;
     return /* @__PURE__ */ i(
@@ -212,7 +212,7 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
         contain: o !== "compact",
         onClosed: e,
         show: !n,
-        children: /* @__PURE__ */ f(xi, { children: [
+        children: /* @__PURE__ */ f(_i, { children: [
           /* @__PURE__ */ i(
             Ue,
             {
@@ -275,7 +275,7 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
     success: r === Fn.Success,
     failure: r && r !== Fn.Success
   };
-}, ki = W.createLogger({ name: "future-progress-bar" }), Qr = S(go)`
+}, Ci = W.createLogger({ name: "future-progress-bar" }), Qr = S(go)`
   --ddk-component-icon-button-icon-color-active: var(
     --ddk-component-progress-bar-close-button-color-active
   );
@@ -288,7 +288,7 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
   --ddk-component-icon-button-icon-color-hover: var(
     --ddk-component-progress-bar-close-button-color-hover
   );
-`, Ci = S.div`
+`, Si = S.div`
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -305,14 +305,14 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
   display: flex;
   gap: var(--ddk-component-status-bar-gap);
   align-items: center;
-`, Si = S.div`
+`, Ti = S.div`
   border-top: solid 1px #888888;
   padding-top: 8px;
   width: calc(100% - 10px);
 `, kt = ({ children: t, onPointerDown: e, title: n, subtitle: r }) => {
   const { componentModeOverride: s } = J(), { t: o } = I("common");
   return /* @__PURE__ */ f(es, { children: [
-    /* @__PURE__ */ f(Ci, { children: [
+    /* @__PURE__ */ f(Si, { children: [
       /* @__PURE__ */ f(
         ts,
         {
@@ -321,7 +321,7 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
           },
           children: [
             /* @__PURE__ */ i(
-              Wo,
+              Xo,
               {
                 style: {
                   color: "var(--ddk-component-progress-bar-icon-color-failure)",
@@ -333,7 +333,7 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
           ]
         }
       ),
-      r && /* @__PURE__ */ i(Si, { children: r })
+      r && /* @__PURE__ */ i(Ti, { children: r })
     ] }),
     s === "compact" ? /* @__PURE__ */ i(w, { mode: "primary", onPointerDown: e, children: o("close", "Close") }) : /* @__PURE__ */ i(
       Qr,
@@ -349,7 +349,7 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
   return /* @__PURE__ */ f(es, { children: [
     /* @__PURE__ */ f(ts, { children: [
       /* @__PURE__ */ i(
-        Ho,
+        Wo,
         {
           style: {
             color: "var(--ddk-semantic-color-system-green)",
@@ -379,16 +379,16 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
     onSuccess: c,
     onClose: a
   }) => {
-    const { t: d } = I("common"), [l, u] = Bn.useState(!0), [m, p] = Bn.useState(), v = `${e == null ? void 0 : e.timeRemaining} ${d(
+    const { t: d } = I("common"), [l, u] = Bn.useState(!0), [p, m] = Bn.useState(), v = `${e == null ? void 0 : e.timeRemaining} ${d(
       "remaining",
       "remaining"
     )}`, y = V(() => {
-      m !== "in-progress" && (a == null || a(), u(!1));
-    }, [a, m]), h = V(() => {
+      p !== "in-progress" && (a == null || a(), u(!1));
+    }, [a, p]), h = V(() => {
       y(), c == null || c();
     }, [y, c]);
     H(() => {
-      (e == null ? void 0 : e.status) === "IN_PROGRESS" || (e == null ? void 0 : e.status) === "NOT_ACTIVE" ? (p("in-progress"), u(!0)) : (e == null ? void 0 : e.status) === "SUCCESS" ? (p("success"), u(!!r), r || (y(), c == null || c())) : (e == null ? void 0 : e.status) === "FAIL" || (e == null ? void 0 : e.status) === "ABORT" ? (p("failure"), u(!!n)) : (e == null ? void 0 : e.status) === "CANCEL" ? (p("cancelled"), u(!!s)) : e && ki.error("unknown status", e == null ? void 0 : e.status);
+      (e == null ? void 0 : e.status) === "IN_PROGRESS" || (e == null ? void 0 : e.status) === "NOT_ACTIVE" ? (m("in-progress"), u(!0)) : (e == null ? void 0 : e.status) === "SUCCESS" ? (m("success"), u(!!r), r || (y(), c == null || c())) : (e == null ? void 0 : e.status) === "FAIL" || (e == null ? void 0 : e.status) === "ABORT" ? (m("failure"), u(!!n)) : (e == null ? void 0 : e.status) === "CANCEL" ? (m("cancelled"), u(!!s)) : e && Ci.error("unknown status", e == null ? void 0 : e.status);
     }, [
       n,
       e,
@@ -406,26 +406,26 @@ const vd = "PrimeTrouble", bd = "PurgeTrouble", xi = S.div`
         onCancel: () => {
           e.cancelFuture();
         },
-        blocked: m === "in-progress",
+        blocked: p === "in-progress",
         onClose: y,
         renderFailure: n && /* @__PURE__ */ i(kt, { subtitle: _, onPointerDown: y, children: L }),
         renderCancel: s && /* @__PURE__ */ i(kt, { onPointerDown: y, children: s }),
         renderSuccess: r && /* @__PURE__ */ i(In, { onPointerDown: h, children: r }),
         show: l,
-        status: m,
+        status: p,
         subtitle: v,
         title: t,
         value: e.progress
       }
     );
   }
-), Ti = W.createLogger({ name: "agitation-control-view" });
-Ti.debug("agitation-control-view component loaded");
-const Ii = S.div``, wd = D(() => {
+), Ii = W.createLogger({ name: "agitation-control-view" });
+Ii.debug("agitation-control-view component loaded");
+const Ei = S.div``, wd = D(() => {
   const { model: t } = Jr(), { t: e, i18n: n } = I("troubles"), { future: r, failure: s } = _e(t), o = V(() => {
     t && t.clearAll();
   }, [t]), c = r == null ? void 0 : r.reason, a = c ? `__troubles.errors.${c}__` : void 0, d = "troubles.agitation.error", l = n.exists(`troubles.errors.${c}`);
-  return /* @__PURE__ */ i(Ii, { children: /* @__PURE__ */ i(
+  return /* @__PURE__ */ i(Ei, { children: /* @__PURE__ */ i(
     q,
     {
       title: e("troubles.agitation.title"),
@@ -440,11 +440,11 @@ const Ii = S.div``, wd = D(() => {
       })
     }
   ) });
-}), Ei = D(
+}), Pi = D(
   ({ pump: t, onComplete: e }) => {
-    const { t: n } = I("common", { keyPrefix: "fcm-calibration" }), [r, s] = T("high-flow-test-idle"), [o, c] = T(), [a, d] = T(), [l, u] = T(), { future: m } = _e(t);
+    const { t: n } = I("common", { keyPrefix: "fcm-calibration" }), [r, s] = T("high-flow-test-idle"), [o, c] = T(), [a, d] = T(), [l, u] = T(), { future: p } = _e(t);
     H(() => {
-      switch (m == null ? void 0 : m.endState) {
+      switch (p == null ? void 0 : p.endState) {
         case "CANCEL":
           switch (r) {
             case "high-flow-test-in-progress":
@@ -468,11 +468,11 @@ const Ii = S.div``, wd = D(() => {
           }
           break;
         case "FAIL":
-          c(m == null ? void 0 : m.reason), s("failure");
+          c(p == null ? void 0 : p.reason), s("failure");
           break;
       }
-    }, [m == null ? void 0 : m.endState, m == null ? void 0 : m.reason, r]);
-    const p = F(() => ({
+    }, [p, p == null ? void 0 : p.endState, p == null ? void 0 : p.reason, r]);
+    const m = F(() => ({
       "high-flow-test-idle": {
         information: /* @__PURE__ */ i(z, { children: n("high-flow-test-idle-information") }),
         footer: /* @__PURE__ */ i(
@@ -606,7 +606,7 @@ const Ii = S.div``, wd = D(() => {
       failure: {
         information: /* @__PURE__ */ f(N, { children: [
           /* @__PURE__ */ i(z, { children: n("calibration-failed") }),
-          /* @__PURE__ */ i(Se, { children: n(`error.${o || "unknownError"}`) })
+          /* @__PURE__ */ i(Se, { children: n(`error.${o}`) })
         ] }),
         footer: /* @__PURE__ */ i(w, { onPointerDown: e, children: n("exit-calibration") }),
         status: "error"
@@ -617,11 +617,11 @@ const Ii = S.div``, wd = D(() => {
         Nt,
         {
           title: n(t.name),
-          ...p[r],
+          ...m[r],
           onClose: () => e()
         }
       ),
-      m && /* @__PURE__ */ i(q, { title: n("initiating"), future: m })
+      p && /* @__PURE__ */ i(q, { title: n("initiating"), future: p })
     ] });
   }
 ), ns = D(
@@ -629,7 +629,7 @@ const Ii = S.div``, wd = D(() => {
     if (!t)
       return null;
     const e = t.highProbeWet.value, n = t.lowProbeWet.value, r = t.filling.value;
-    return /* @__PURE__ */ f(Pi, { children: [
+    return /* @__PURE__ */ f(Di, { children: [
       /* @__PURE__ */ f(rn, { children: [
         /* @__PURE__ */ i(sn, { children: "High Probe" }),
         /* @__PURE__ */ i(on, { children: e ? "Wet" : "Dry" })
@@ -644,7 +644,7 @@ const Ii = S.div``, wd = D(() => {
       ] })
     ] });
   }
-), Pi = S.div`
+), Di = S.div`
   display: grid;
   grid-template-columns: repeat(3, 1fr);
   gap: 16px;
@@ -699,7 +699,7 @@ const Ii = S.div``, wd = D(() => {
       }
     )
   ] });
-}), Di = S.div`
+}), Ni = S.div`
   font-size: var(--ddk-component-holder-card-footer-font-size);
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
 `, _d = D((t) => {
@@ -713,7 +713,7 @@ const Ii = S.div``, wd = D(() => {
         status: t.cardModel.isCarbInitialized ? "completed" : "incomplete"
       }
     ),
-    t.cardModel.isFilling && /* @__PURE__ */ i(Di, { children: e("agitating") })
+    t.cardModel.isFilling && /* @__PURE__ */ i(Ni, { children: e("agitating") })
   ] });
 }), kd = D(({ cardModel: t }) => {
   W.debug("Agitator", t.path);
@@ -740,7 +740,7 @@ const Ii = S.div``, wd = D(() => {
       }
     )
   ] });
-}), Ni = S.div`
+}), Ai = S.div`
   font-size: var(--ddk-component-holder-card-footer-font-size);
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
 `, Cd = D((t) => {
@@ -748,14 +748,14 @@ const Ii = S.div``, wd = D(() => {
   const { t: e } = I("common");
   return /* @__PURE__ */ f(N, { children: [
     /* @__PURE__ */ i(Ke, { size: "small", status: "completed" }),
-    t.cardModel.isAgitating && /* @__PURE__ */ i(Ni, { children: e("agitating") })
+    t.cardModel.isAgitating && /* @__PURE__ */ i(Ai, { children: e("agitating") })
   ] });
-}), Ai = {
+}), Oi = {
   getStagedChange: void 0,
   updateStagedChange: void 0,
   saveChanges: void 0,
   clearStagedChanges: void 0
-}, rs = Y(Ai), Oi = ({
+}, rs = Y(Oi), Ri = ({
   children: t
 }) => {
   const [e, n] = T({}), r = (a) => e[a], s = (a, d) => {
@@ -779,19 +779,19 @@ const Ii = S.div``, wd = D(() => {
       children: t
     }
   );
-}, ss = () => G(rs), Sd = (t) => (e) => /* @__PURE__ */ i(Oi, { children: /* @__PURE__ */ i(t, { ...e }) }), Ri = ({ label: t, configProperty: e }) => {
+}, ss = () => G(rs), Sd = (t) => (e) => /* @__PURE__ */ i(Ri, { children: /* @__PURE__ */ i(t, { ...e }) }), $i = ({ label: t, configProperty: e }) => {
   const { value: n } = le({ configProperty: e });
   return /* @__PURE__ */ i(Le, { label: t, value: n });
 }, En = ({ configProperty: t, hideUnits: e, isValid: n, ...r }) => {
-  var u, m;
+  var u, p;
   const { t: s } = I("common", { keyPrefix: "validation" }), { significantValue: o } = le({
     configProperty: t
-  }), c = (p) => {
-    p || (p = ""), t.updateProperty(p);
-  }, a = (u = t.displayOptions) == null ? void 0 : u.max, d = (m = t.displayOptions) == null ? void 0 : m.min, l = V(
-    (p) => {
-      const v = n == null ? void 0 : n(p);
-      return v || (Number(p) < d ? s("minValue", { data: { minValue: d } }) : Number(p) > a ? s("maxValue", { data: { maxValue: a } }) : void 0);
+  }), c = (m) => {
+    m || (m = ""), t.updateProperty(m);
+  }, a = (u = t.displayOptions) == null ? void 0 : u.max, d = (p = t.displayOptions) == null ? void 0 : p.min, l = V(
+    (m) => {
+      const v = n == null ? void 0 : n(m);
+      return v || (Number(m) < d ? s("minValue", { data: { minValue: d } }) : Number(m) > a ? s("maxValue", { data: { maxValue: a } }) : void 0);
     },
     [n, a, d, s]
   );
@@ -838,7 +838,7 @@ const Ii = S.div``, wd = D(() => {
       checked: e !== void 0 ? e : c === "true"
     }
   );
-}, $i = (t) => (t == null ? void 0 : t.map((e) => ({ id: e.value, label: e.label }))) || [], Pn = ({
+}, Li = (t) => (t == null ? void 0 : t.map((e) => ({ id: e.value, label: e.label }))) || [], Pn = ({
   collapse: t,
   cancelButtonLabel: e,
   configProperty: n,
@@ -850,13 +850,13 @@ const Ii = S.div``, wd = D(() => {
   onChange: d,
   onSave: l,
   proceedButtonLabel: u,
-  selectedItemId: m,
-  unitValue: p,
+  selectedItemId: p,
+  unitValue: m,
   ...v
 }) => {
   const { t: y } = I(["config-properties", "common"]), h = le({
     configProperty: n,
-    optionsTransformer: $i
+    optionsTransformer: Li
   });
   return /* @__PURE__ */ i(
     cn,
@@ -873,11 +873,11 @@ const Ii = S.div``, wd = D(() => {
       label: a ?? y(n.id),
       onSave: (_) => l ? l(_) : n.updateProperty(_),
       proceedButtonLabel: u ?? (y("save", { defaultValue: "Save", ns: "common" }) || void 0),
-      selectedItemId: m ?? h.value,
-      unitValue: p ?? h.unit
+      selectedItemId: p ?? h.value,
+      unitValue: m ?? h.unit
     }
   );
-}, Li = S(En)`
+}, Vi = S(En)`
   border-top: var(--ddk-component-input-enable-card-input-container-border);
   border-radius: 0;
   cursor: pointer;
@@ -913,7 +913,7 @@ const Ii = S.div``, wd = D(() => {
       --ddk-component-input-enable-card-input-font-weight
     );
   }
-`, Vi = S(Pn)`
+`, Fi = S(Pn)`
   border-top: var(--ddk-component-input-enable-card-input-container-border);
   border-radius: 0;
   cursor: pointer;
@@ -950,9 +950,9 @@ const Ii = S.div``, wd = D(() => {
       --ddk-component-input-enable-card-input-font-weight
     );
   }
-`, Fi = (t, e, n, r, s) => {
+`, Mi = (t, e, n, r, s) => {
   let o;
-  const c = s === "compact" ? Li : En, a = s === "compact" ? Vi : Pn, d = r.label ?? n(t.id);
+  const c = s === "compact" ? Vi : En, a = s === "compact" ? Fi : Pn, d = r.label ?? n(t.id);
   switch (t.schemaType) {
     case "boolean":
       o = /* @__PURE__ */ i(
@@ -1006,7 +1006,7 @@ const Ii = S.div``, wd = D(() => {
       break;
   }
   return o;
-}, Mi = (t) => (t == null ? void 0 : t.map((e) => ({ id: e.value, label: e.label }))) || [], os = ({
+}, Bi = (t) => (t == null ? void 0 : t.map((e) => ({ id: e.value, label: e.label }))) || [], os = ({
   configProperty: t,
   factory: e,
   mappedOptions: n,
@@ -1015,9 +1015,9 @@ const Ii = S.div``, wd = D(() => {
 }) => {
   const { t: o } = I(["config-properties", "common"]), { componentModeOverride: c } = J(), a = le({
     configProperty: t,
-    optionsTransformer: Mi
+    optionsTransformer: Bi
   });
-  return e = e ?? Fi, e(
+  return e = e ?? Mi, e(
     t,
     {
       ...a,
@@ -1027,14 +1027,14 @@ const Ii = S.div``, wd = D(() => {
     s,
     c
   );
-}, Bi = S(bo)`
+}, zi = S(bo)`
   align-items: ${(t) => t.mode === "compact" ? "flex-start" : void 0};
   flex-direction: var(
     --ddk-component-input-enable-card-container-flex-direction
   );
   padding: var(--ddk-component-input-enable-card-container-padding);
   gap: var(--ddk-component-input-enable-card-container-gap);
-`, zi = S.div`
+`, ji = S.div`
   box-sizing: border-box;
   display: flex;
   flex-direction: var(
@@ -1042,27 +1042,27 @@ const Ii = S.div``, wd = D(() => {
   );
   gap: var(--ddk-component-input-enable-card-input-container-gap);
   width: 100%;
-`, ji = S(os)`
+`, Zi = S(os)`
   width: 100%;
-`, Zi = S.div`
+`, Ui = S.div`
   box-sizing: border-box;
   padding: ${(t) => t.compact ? "var(--ddk-component-input-enable-card-toggle-container-padding)" : "0"};
   width: var(--ddk-component-input-enable-card-toggle-container-width);
-`, Ui = ({
+`, Ki = ({
   configProperties: t,
   disabled: e,
   enabledConfigProperty: n
 }) => {
   const { value: r } = le({
     configProperty: n
-  }), s = r === "true", { componentModeOverride: o } = J(), c = t.length === 1, a = c ? ji : os;
+  }), s = r === "true", { componentModeOverride: o } = J(), c = t.length === 1, a = c ? Zi : os;
   return /* @__PURE__ */ f(
-    Bi,
+    zi,
     {
       disabled: !s || e,
       mode: o,
       children: [
-        /* @__PURE__ */ i(zi, { children: t.map((d) => /* @__PURE__ */ i(
+        /* @__PURE__ */ i(ji, { children: t.map((d) => /* @__PURE__ */ i(
           a,
           {
             disabled: !s || e,
@@ -1076,7 +1076,7 @@ const Ii = S.div``, wd = D(() => {
           d.configProperty.id
         )) }),
         /* @__PURE__ */ i(
-          Zi,
+          Ui,
           {
             compact: !c || o === "compact",
             children: /* @__PURE__ */ i(
@@ -1105,14 +1105,14 @@ const Ii = S.div``, wd = D(() => {
     [t, r]
   );
   return /* @__PURE__ */ i(
-    Ui,
+    Ki,
     {
       configProperties: s,
       disabled: e,
       enabledConfigProperty: n
     }
   );
-}, Ki = ({
+}, Hi = ({
   configProperty: t,
   ...e
 }) => {
@@ -1120,7 +1120,7 @@ const Ii = S.div``, wd = D(() => {
   return /* @__PURE__ */ i(xt, { ...e, onChange: (s) => {
     s !== void 0 && (t == null || t.updateProperty(String(s)));
   }, value: n });
-}, Hi = ({
+}, Wi = ({
   description: t,
   float: e,
   label: n,
@@ -1132,21 +1132,21 @@ const Ii = S.div``, wd = D(() => {
   const { regionModel: a } = be(), { t: d } = I("common", { keyPrefix: "schedule" }), {
     amPmOptions: l,
     formattedTime: u,
-    hourOptions: m,
-    minuteOptions: p,
+    hourOptions: p,
+    minuteOptions: m,
     setTime: v,
     time: y
   } = Rr({ initialDate: o }), h = y.getHours(), _ = F(
     () => [
       {
         id: "hr",
-        items: m,
+        items: p,
         selectedItemId: h < 12 ? h : h - 12,
         loop: !0
       },
       {
         id: "min",
-        items: p,
+        items: m,
         selectedItemId: y.getMinutes(),
         loop: !0
       },
@@ -1156,23 +1156,23 @@ const Ii = S.div``, wd = D(() => {
         selectedItemId: h < 12 ? "AM" : "PM"
       }
     ],
-    [l, m, p, y, h]
+    [l, p, m, y, h]
   ), L = F(
     () => [
       {
         id: "hr",
-        items: m,
+        items: p,
         selectedItemId: h,
         loop: !0
       },
       {
         id: "min",
-        items: p,
+        items: m,
         selectedItemId: y.getMinutes(),
         loop: !0
       }
     ],
-    [m, p, y, h]
+    [p, m, y, h]
   );
   return /* @__PURE__ */ i(
     kn,
@@ -1194,17 +1194,17 @@ const Ii = S.div``, wd = D(() => {
       }
     }
   );
-}, Wi = ({ configProperty: t, ...e }) => {
+}, Xi = ({ configProperty: t, ...e }) => {
   var u;
-  const { getStagedChange: n, updateStagedChange: r } = ss(), { value: s } = le({ configProperty: t }), o = ((u = n == null ? void 0 : n(t.id)) == null ? void 0 : u.value) ?? s, { hours: c, minutes: a } = Mo(Number(o)), d = /* @__PURE__ */ new Date();
-  return d.setHours(c), d.setMinutes(a), /* @__PURE__ */ i(Hi, { ...e, onSave: (m) => {
-    const p = Bo(m.hours, m.minutes);
+  const { getStagedChange: n, updateStagedChange: r } = ss(), { value: s } = le({ configProperty: t }), o = ((u = n == null ? void 0 : n(t.id)) == null ? void 0 : u.value) ?? s, { hours: c, minutes: a } = Bo(Number(o)), d = /* @__PURE__ */ new Date();
+  return d.setHours(c), d.setMinutes(a), /* @__PURE__ */ i(Wi, { ...e, onSave: (p) => {
+    const m = zo(p.hours, p.minutes);
     r ? r(t.id, {
       configProperty: t,
-      value: p
-    }) : t.updateProperty(p);
+      value: m
+    }) : t.updateProperty(m);
   }, time: d });
-}, Xi = [0, 6], qi = ({
+}, qi = [0, 6], Yi = ({
   day: t = (/* @__PURE__ */ new Date()).getDate(),
   month: e = (/* @__PURE__ */ new Date()).getMonth(),
   onSave: n,
@@ -1221,7 +1221,7 @@ const Ii = S.div``, wd = D(() => {
       formatString: (c == null ? void 0 : c.selectedDateFormat) || "yyyy/MM/dd"
     },
     filterOptions: {
-      daysOfWeekFilter: Xi,
+      daysOfWeekFilter: qi,
       yearsRange: [r - 10, r + 10]
     }
   }), d = F(
@@ -1251,7 +1251,7 @@ const Ii = S.div``, wd = D(() => {
       }));
     },
     [(h = a == null ? void 0 : a.dateState) == null ? void 0 : h.monthsOptionsArray]
-  ), m = F(() => {
+  ), p = F(() => {
     const P = [];
     return c == null || c.selectedDateOrder.split("").forEach((E) => {
       var x, X, oe;
@@ -1279,7 +1279,7 @@ const Ii = S.div``, wd = D(() => {
     u,
     c == null ? void 0 : c.selectedDateOrder,
     d
-  ]), p = V(
+  ]), m = V(
     async (P) => {
       const x = new Date(P.year, P.month + 1, 0).getDate(), X = P.day > x ? 1 : P.day;
       n({
@@ -1295,16 +1295,16 @@ const Ii = S.div``, wd = D(() => {
     {
       cancelButtonLabel: o("discard-changes", "Discard Changes") || void 0,
       closeButtonLabel: o("close", "Close") || void 0,
-      data: m,
+      data: p,
       displayValue: a.dateState.formattedDate,
-      icon: Xo,
+      icon: qo,
       label: o("todays-date", "Today's Date"),
-      onSave: p,
+      onSave: m,
       proceedButtonLabel: o("save", "Save") || void 0,
       ...s
     }
   );
-}, Yi = D(
+}, Gi = D(
   ({ pump: t, onComplete: e }) => {
     const { t: n } = I("common", {
       keyPrefix: "fcm-diagnostics"
@@ -1363,60 +1363,60 @@ const Ii = S.div``, wd = D(() => {
     });
     c ? (n(c[0]), s(c[2])) : (n(null), s(fn));
   }, [...o, t]), [e, r];
-}, Gi = (t) => {
+}, Ji = (t) => {
   switch (t) {
     case "calibrate":
-      return di;
-    case "fixed-45":
       return li;
-    case "flush":
+    case "fixed-45":
       return ui;
+    case "flush":
+      return pi;
     case "high-flow-test":
       return mi;
     case "hold-to-pour":
-      return pi;
-    case "low-flow-test":
       return hi;
-    case "manual-override":
+    case "low-flow-test":
       return fi;
-    case "msv-reset":
+    case "manual-override":
       return gi;
-    case "prime":
+    case "msv-reset":
       return yi;
-    case "purge":
+    case "prime":
       return vi;
+    case "purge":
+      return bi;
     default:
       return;
   }
-}, Ji = (t) => (e, n = "intents") => ({
+}, Qi = (t) => (e, n = "intents") => ({
   title: t(`${n}:troubles.${e}.progress`),
   summary: t(`${n}:troubles.${e}.summary`),
   successMessage: t(`${n}:troubles.${e}.success`),
   failureMessage: t(`${n}:troubles.${e}.error`),
   actionLabel: t(`${n}:troubles.${e}.action`)
-}), He = (t, e = Gi) => {
+}), He = (t, e = Ji) => {
   const { t: n } = I("troubles"), [r, s] = T(null), [o, c] = T(fn), a = V(
     async (d) => {
       const l = e(d);
       if (l) {
-        const u = Ji(n)(d);
+        const u = Qi(n)(d);
         if (c(u), t) {
-          const m = new l(t);
-          await m.performAction(), s(m);
+          const p = new l(t);
+          await p.performAction(), s(p);
         }
       }
     },
     [e, t, n]
   );
   return t ? [r, a, o] : [null, a, o];
-}, Qi = (t) => (W.debug(`pumpActionFactory: actionId=${t}`), wi), ea = (t) => (e, n = "troubles") => ({
+}, ea = (t) => (W.debug(`pumpActionFactory: actionId=${t}`), xi), ta = (t) => (e, n = "troubles") => ({
   title: t(`${n}:troubles.${e}.progress`),
   summary: t(`${n}:troubles.${e}.summary`),
   successMessage: t(`${n}:troubles.${e}.success`),
   failureMessage: t(`${n}:troubles.${e}.error`),
   actionLabel: t(`${n}:troubles.${e}.action`)
-}), Ed = (t, e, n = Qi) => {
-  const { t: r } = I("troubles"), [s, o] = T(null), [c] = T(ea(r)(e)), a = V(async () => {
+}), Ed = (t, e, n = ea) => {
+  const { t: r } = I("troubles"), [s, o] = T(null), [c] = T(ta(r)(e)), a = V(async () => {
     const d = n(e);
     if (d) {
       const l = new d(t, e);
@@ -1439,7 +1439,7 @@ const is = () => {
     options: {}
   });
 };
-function ta(t) {
+function na(t) {
   return (e) => {
     const { model: n, status: r, KosModelLoader: s } = is();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, animation: n }) });
@@ -1459,7 +1459,7 @@ function Dd(t) {
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, application: n }) });
   };
 }
-const na = () => {
+const ra = () => {
   const t = Zn.type;
   return Z({
     modelId: t,
@@ -1469,15 +1469,15 @@ const na = () => {
 };
 function Nd(t) {
   return (e) => {
-    const { model: n, status: r, KosModelLoader: s } = na();
+    const { model: n, status: r, KosModelLoader: s } = ra();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, carbWater: n }) });
   };
 }
-const ra = () => {
-  const t = mn.type;
+const sa = () => {
+  const t = pn.type;
   return Z({
     modelId: t,
-    modelType: mn.type,
+    modelType: pn.type,
     options: {},
     activate: !0,
     destroyOnUnmount: !0
@@ -1485,7 +1485,7 @@ const ra = () => {
 };
 function Ad(t) {
   return (e) => {
-    const { model: n, status: r, KosModelLoader: s } = ra();
+    const { model: n, status: r, KosModelLoader: s } = sa();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, copyLogs: n }) });
   };
 }
@@ -1511,20 +1511,20 @@ const cs = () => {
     options: {}
   });
 };
-function sa(t) {
+function oa(t) {
   return (e) => {
     const { model: n, status: r, KosModelLoader: s } = cs();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, dispenserInfo: n }) });
   };
 }
-const oa = (t) => Z({
+const ia = (t) => Z({
   modelId: t,
   modelType: Ur.type,
   options: {}
 });
 function Rd(t) {
   return (e) => {
-    const { model: n, status: r, KosModelLoader: s } = oa(e.id);
+    const { model: n, status: r, KosModelLoader: s } = ia(e.id);
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, door: n }) });
   };
 }
@@ -1753,11 +1753,11 @@ const gn = (t, e) => {
   }
   return { message: n };
 };
-let ia = gn;
-function aa() {
-  return ia;
+let aa = gn;
+function ca() {
+  return aa;
 }
-const ca = (t) => {
+const da = (t) => {
   const { data: e, path: n, errorMaps: r, issueData: s } = t, o = [...n, ...s.path || []], c = {
     ...s,
     path: o
@@ -1779,7 +1779,7 @@ const ca = (t) => {
   };
 };
 function b(t, e) {
-  const n = aa(), r = ca({
+  const n = ca(), r = da({
     issueData: e,
     data: t.data,
     path: t.path,
@@ -2062,7 +2062,7 @@ class M {
     });
   }
   brand() {
-    return new Na({
+    return new Aa({
       typeName: O.ZodBranded,
       type: this,
       ...$(this._def)
@@ -2097,28 +2097,28 @@ class M {
     return this.safeParse(null).success;
   }
 }
-const da = /^c[^\s-]{8,}$/i, la = /^[0-9a-z]+$/, ua = /^[0-9A-HJKMNP-TV-Z]{26}$/i, ma = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/i, pa = /^[a-z0-9_-]{21}$/i, ha = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/, fa = /^[-+]?P(?!$)(?:(?:[-+]?\d+Y)|(?:[-+]?\d+[.,]\d+Y$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:(?:[-+]?\d+W)|(?:[-+]?\d+[.,]\d+W$))?(?:(?:[-+]?\d+D)|(?:[-+]?\d+[.,]\d+D$))?(?:T(?=[\d+-])(?:(?:[-+]?\d+H)|(?:[-+]?\d+[.,]\d+H$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:[-+]?\d+(?:[.,]\d+)?S)?)??$/, ga = /^(?!\.)(?!.*\.\.)([A-Z0-9_'+\-\.]*)[A-Z0-9_+-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i, ya = "^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$";
+const la = /^c[^\s-]{8,}$/i, ua = /^[0-9a-z]+$/, pa = /^[0-9A-HJKMNP-TV-Z]{26}$/i, ma = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/i, ha = /^[a-z0-9_-]{21}$/i, fa = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/, ga = /^[-+]?P(?!$)(?:(?:[-+]?\d+Y)|(?:[-+]?\d+[.,]\d+Y$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:(?:[-+]?\d+W)|(?:[-+]?\d+[.,]\d+W$))?(?:(?:[-+]?\d+D)|(?:[-+]?\d+[.,]\d+D$))?(?:T(?=[\d+-])(?:(?:[-+]?\d+H)|(?:[-+]?\d+[.,]\d+H$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:[-+]?\d+(?:[.,]\d+)?S)?)??$/, ya = /^(?!\.)(?!.*\.\.)([A-Z0-9_'+\-\.]*)[A-Z0-9_+-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i, va = "^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$";
 let an;
-const va = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/, ba = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/(3[0-2]|[12]?[0-9])$/, wa = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/, xa = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])$/, _a = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/, ka = /^([0-9a-zA-Z-_]{4})*(([0-9a-zA-Z-_]{2}(==)?)|([0-9a-zA-Z-_]{3}(=)?))?$/, ds = "((\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-((0[13578]|1[02])-(0[1-9]|[12]\\d|3[01])|(0[469]|11)-(0[1-9]|[12]\\d|30)|(02)-(0[1-9]|1\\d|2[0-8])))", Ca = new RegExp(`^${ds}$`);
+const ba = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/, wa = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/(3[0-2]|[12]?[0-9])$/, xa = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/, _a = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])$/, ka = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/, Ca = /^([0-9a-zA-Z-_]{4})*(([0-9a-zA-Z-_]{2}(==)?)|([0-9a-zA-Z-_]{3}(=)?))?$/, ds = "((\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-((0[13578]|1[02])-(0[1-9]|[12]\\d|3[01])|(0[469]|11)-(0[1-9]|[12]\\d|30)|(02)-(0[1-9]|1\\d|2[0-8])))", Sa = new RegExp(`^${ds}$`);
 function ls(t) {
   let e = "[0-5]\\d";
   t.precision ? e = `${e}\\.\\d{${t.precision}}` : t.precision == null && (e = `${e}(\\.\\d+)?`);
   const n = t.precision ? "+" : "?";
   return `([01]\\d|2[0-3]):[0-5]\\d(:${e})${n}`;
 }
-function Sa(t) {
+function Ta(t) {
   return new RegExp(`^${ls(t)}$`);
 }
-function Ta(t) {
+function Ia(t) {
   let e = `${ds}T${ls(t)}`;
   const n = [];
   return n.push(t.local ? "Z?" : "Z"), t.offset && n.push("([+-]\\d{2}:?\\d{2})"), e = `${e}(${n.join("|")})`, new RegExp(`^${e}$`);
 }
-function Ia(t, e) {
-  return !!((e === "v4" || !e) && va.test(t) || (e === "v6" || !e) && wa.test(t));
-}
 function Ea(t, e) {
-  if (!ha.test(t))
+  return !!((e === "v4" || !e) && ba.test(t) || (e === "v6" || !e) && xa.test(t));
+}
+function Pa(t, e) {
+  if (!fa.test(t))
     return !1;
   try {
     const [n] = t.split(".");
@@ -2130,8 +2130,8 @@ function Ea(t, e) {
     return !1;
   }
 }
-function Pa(t, e) {
-  return !!((e === "v4" || !e) && ba.test(t) || (e === "v6" || !e) && xa.test(t));
+function Da(t, e) {
+  return !!((e === "v4" || !e) && wa.test(t) || (e === "v6" || !e) && _a.test(t));
 }
 class ye extends M {
   _parse(e) {
@@ -2182,13 +2182,13 @@ class ye extends M {
           message: o.message
         }), r.dirty());
       } else if (o.kind === "email")
-        ga.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        ya.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "email",
           code: g.invalid_string,
           message: o.message
         }), r.dirty());
       else if (o.kind === "emoji")
-        an || (an = new RegExp(ya, "u")), an.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        an || (an = new RegExp(va, "u")), an.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "emoji",
           code: g.invalid_string,
           message: o.message
@@ -2200,25 +2200,25 @@ class ye extends M {
           message: o.message
         }), r.dirty());
       else if (o.kind === "nanoid")
-        pa.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        ha.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "nanoid",
           code: g.invalid_string,
           message: o.message
         }), r.dirty());
       else if (o.kind === "cuid")
-        da.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        la.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "cuid",
           code: g.invalid_string,
           message: o.message
         }), r.dirty());
       else if (o.kind === "cuid2")
-        la.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        ua.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "cuid2",
           code: g.invalid_string,
           message: o.message
         }), r.dirty());
       else if (o.kind === "ulid")
-        ua.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        pa.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "ulid",
           code: g.invalid_string,
           message: o.message
@@ -2250,39 +2250,39 @@ class ye extends M {
           code: g.invalid_string,
           validation: { endsWith: o.value },
           message: o.message
-        }), r.dirty()) : o.kind === "datetime" ? Ta(o).test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "datetime" ? Ia(o).test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           code: g.invalid_string,
           validation: "datetime",
           message: o.message
-        }), r.dirty()) : o.kind === "date" ? Ca.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "date" ? Sa.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           code: g.invalid_string,
           validation: "date",
           message: o.message
-        }), r.dirty()) : o.kind === "time" ? Sa(o).test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "time" ? Ta(o).test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           code: g.invalid_string,
           validation: "time",
           message: o.message
-        }), r.dirty()) : o.kind === "duration" ? fa.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "duration" ? ga.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "duration",
           code: g.invalid_string,
           message: o.message
-        }), r.dirty()) : o.kind === "ip" ? Ia(e.data, o.version) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "ip" ? Ea(e.data, o.version) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "ip",
           code: g.invalid_string,
           message: o.message
-        }), r.dirty()) : o.kind === "jwt" ? Ea(e.data, o.alg) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "jwt" ? Pa(e.data, o.alg) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "jwt",
           code: g.invalid_string,
           message: o.message
-        }), r.dirty()) : o.kind === "cidr" ? Pa(e.data, o.version) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "cidr" ? Da(e.data, o.version) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "cidr",
           code: g.invalid_string,
           message: o.message
-        }), r.dirty()) : o.kind === "base64" ? _a.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "base64" ? ka.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "base64",
           code: g.invalid_string,
           message: o.message
-        }), r.dirty()) : o.kind === "base64url" ? ka.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
+        }), r.dirty()) : o.kind === "base64url" ? Ca.test(e.data) || (s = this._getOrReturnCtx(e, s), b(s, {
           validation: "base64url",
           code: g.invalid_string,
           message: o.message
@@ -2517,7 +2517,7 @@ ye.create = (t) => new ye({
   coerce: (t == null ? void 0 : t.coerce) ?? !1,
   ...$(t)
 });
-function Da(t, e) {
+function Na(t, e) {
   const n = (t.toString().split(".")[1] || "").length, r = (e.toString().split(".")[1] || "").length, s = n > r ? n : r, o = Number.parseInt(t.toFixed(s).replace(".", "")), c = Number.parseInt(e.toFixed(s).replace(".", ""));
   return o % c / 10 ** s;
 }
@@ -2556,7 +2556,7 @@ class Je extends M {
         inclusive: o.inclusive,
         exact: !1,
         message: o.message
-      }), s.dirty()) : o.kind === "multipleOf" ? Da(e.data, o.value) !== 0 && (r = this._getOrReturnCtx(e, r), b(r, {
+      }), s.dirty()) : o.kind === "multipleOf" ? Na(e.data, o.value) !== 0 && (r = this._getOrReturnCtx(e, r), b(r, {
         code: g.not_multiple_of,
         multipleOf: o.value,
         message: o.message
@@ -2956,7 +2956,7 @@ ur.create = (t) => new ur({
   typeName: O.ZodUndefined,
   ...$(t)
 });
-class mr extends M {
+class pr extends M {
   _parse(e) {
     if (this._getType(e) !== k.null) {
       const r = this._getOrReturnCtx(e);
@@ -2969,11 +2969,11 @@ class mr extends M {
     return ne(e.data);
   }
 }
-mr.create = (t) => new mr({
+pr.create = (t) => new pr({
   typeName: O.ZodNull,
   ...$(t)
 });
-class pr extends M {
+class mr extends M {
   constructor() {
     super(...arguments), this._any = !0;
   }
@@ -2981,7 +2981,7 @@ class pr extends M {
     return ne(e.data);
   }
 }
-pr.create = (t) => new pr({
+mr.create = (t) => new mr({
   typeName: O.ZodAny,
   ...$(t)
 });
@@ -3143,10 +3143,10 @@ class K extends M {
         c.includes(l) || a.push(l);
     const d = [];
     for (const l of c) {
-      const u = o[l], m = s.data[l];
+      const u = o[l], p = s.data[l];
       d.push({
         key: { status: "valid", value: l },
-        value: u._parse(new we(s, m, s.path, l)),
+        value: u._parse(new we(s, p, s.path, l)),
         alwaysSet: l in s.data
       });
     }
@@ -3168,11 +3168,11 @@ class K extends M {
     } else {
       const l = this._def.catchall;
       for (const u of a) {
-        const m = s.data[u];
+        const p = s.data[u];
         d.push({
           key: { status: "valid", value: u },
           value: l._parse(
-            new we(s, m, s.path, u)
+            new we(s, p, s.path, u)
             //, ctx.child(key), value, getParsedType(value)
           ),
           alwaysSet: u in s.data
@@ -3182,10 +3182,10 @@ class K extends M {
     return s.common.async ? Promise.resolve().then(async () => {
       const l = [];
       for (const u of d) {
-        const m = await u.key, p = await u.value;
+        const p = await u.key, m = await u.value;
         l.push({
-          key: m,
-          value: p,
+          key: p,
+          value: m,
           alwaysSet: u.alwaysSet
         });
       }
@@ -4056,7 +4056,7 @@ br.create = (t) => new br({
   typeName: O.ZodNaN,
   ...$(t)
 });
-class Na extends M {
+class Aa extends M {
   _parse(e) {
     const { ctx: n } = this._processInputParams(e), r = n.data;
     return this._def.type._parse({
@@ -4133,7 +4133,7 @@ ie.create;
 It.create;
 Et.create;
 Ie.create;
-const it = vn.create, Aa = Fe.create;
+const it = vn.create, Oa = Fe.create;
 Pt.create;
 ve.create;
 Be.create;
@@ -4143,7 +4143,7 @@ const wr = ue(
     dashboardKey: re().min(1, "Dashboard key is required").describe("Key used to identify which dashboard this summary belongs to")
   },
   { rankable: !0 }
-), Ot = me("ddk", "dashboard", "summary"), ms = pe({
+), Ot = pe("ddk", "dashboard", "summary"), ps = me({
   id: Ot,
   contributionKey: "dashboardSummary",
   displayName: "Dashboard Summary",
@@ -4166,7 +4166,7 @@ const wr = ue(
     dashboardKey: re().min(1, "Dashboard key is required").describe("Key used to identify which dashboard this detail belongs to")
   },
   { rankable: !0 }
-), Rt = me("ddk", "dashboard", "detail"), ps = pe({
+), Rt = pe("ddk", "dashboard", "detail"), ms = me({
   id: Rt,
   contributionKey: "dashboardDetail",
   displayName: "Dashboard Detail",
@@ -4191,7 +4191,7 @@ const wr = ue(
     )
   },
   { rankable: !0 }
-), $t = me("ddk", "dashboard", "pump-detail"), ze = pe({
+), $t = pe("ddk", "dashboard", "pump-detail"), ze = me({
   id: $t,
   contributionKey: "dashboardPumpDetail",
   displayName: "Dashboard Pump Detail",
@@ -4214,7 +4214,7 @@ const wr = ue(
     )
   },
   { rankable: !0 }
-), Lt = me("ddk", "dashboard", "macro-summary"), Dt = pe({
+), Lt = pe("ddk", "dashboard", "macro-summary"), Dt = me({
   id: Lt,
   contributionKey: "dashboardMacroSummary",
   displayName: "Dashboard Macro Summary",
@@ -4235,8 +4235,8 @@ const wr = ue(
   cuiDescriptor: re().min(1, "CUI descriptor is required").describe(
     "Descriptor used to identify and categorize the CUI functionality"
   ),
-  modalMode: Aa(["fullscreen", "maximized"]).optional().describe("Modal display mode for the CUI interface")
-}), Vt = me("ddk", "cui"), Nn = pe({
+  modalMode: Oa(["fullscreen", "maximized"]).optional().describe("Modal display mode for the CUI interface")
+}), Vt = pe("ddk", "cui"), Nn = me({
   id: Vt,
   contributionKey: "cui",
   displayName: "CUI (Consumer User Interface)",
@@ -4257,7 +4257,7 @@ const wr = ue(
   navDescriptor: re().min(1, "Navigation descriptor is required").describe(
     "Descriptor used to identify and map the navigation functionality"
   )
-}), Ft = me("ddk", "nav", "view"), hs = pe({
+}), Ft = pe("ddk", "nav", "view"), hs = me({
   id: Ft,
   contributionKey: "navViews",
   displayName: "Navigation Views",
@@ -4283,7 +4283,7 @@ const wr = ue(
     setupDescriptor: re().min(1, "Setup descriptor is required").describe("Descriptor used to identify and categorize the setup step")
   },
   { rankable: !0 }
-), Mt = me("ddk", "setup"), Bt = pe({
+), Mt = pe("ddk", "setup"), Bt = me({
   id: Mt,
   contributionKey: "setupStep",
   displayName: "Setup Steps",
@@ -4314,7 +4314,7 @@ const wr = ue(
     )
   },
   { rankable: !0 }
-), zt = me("ddk", "trouble", "action"), tt = pe({
+), zt = pe("ddk", "trouble", "action"), tt = me({
   id: zt,
   contributionKey: "troubleActions",
   displayName: "Trouble Actions",
@@ -4338,7 +4338,7 @@ const wr = ue(
     )
   },
   { rankable: !0 }
-), jt = me("ddk", "view"), fs = pe({
+), jt = pe("ddk", "view"), fs = me({
   id: jt,
   contributionKey: "views",
   displayName: "Views",
@@ -4359,39 +4359,39 @@ const wr = ue(
     )), Pe(t, e));
   },
   transform: he()
-}), ol = jt, il = `${jt}.def`, al = `${jt}.view`, Oa = "ddk.ncui.utilities", Pr = {
+}), ol = jt, il = `${jt}.def`, al = `${jt}.view`, Ra = "ddk.ncui.utilities", Pr = {
   [Bt.id]: "setupDescriptor",
   [Nn.id]: "cuiDescriptor",
-  [Oa]: "utilDescriptor"
-}, Ra = ({
+  [Ra]: "utilDescriptor"
+}, $a = ({
   defaultNamespace: t,
   extensionPoint: e
 }) => {
   const { getExtensions: n } = Yr(), r = n(e), s = r.map((d) => d.data.namespace) || [], { t: o } = I([t, ...new Set(s)]), c = r.reduce(
     (d, l) => {
-      const u = l, m = u.data;
-      return d[m[Pr[e]]] = {
+      const u = l, p = u.data;
+      return d[p[Pr[e]]] = {
         extension: e,
         module: u.id,
-        namespace: m.namespace,
-        title: m.title
+        namespace: p.namespace,
+        title: p.title
       }, d;
     },
     {}
   ), a = r.reduce((d, l) => {
-    const m = l.data;
-    return d[m[Pr[e]]] = `${m.namespace}:${m.title}`, d;
+    const p = l.data;
+    return d[p[Pr[e]]] = `${p.namespace}:${p.title}`, d;
   }, {});
   return { namespaces: s, t: o, labelMap: a, contributionMap: c };
 }, at = (t, e) => {
   const n = F(() => ({
-    agitate: _i,
+    agitate: ki,
     calibrate: ({ holder: c, pump: a, onComplete: d }) => {
       const l = ce(
         a ?? c.pumps.data[0],
         hn.type
       );
-      return /* @__PURE__ */ i(Ei, { pump: l, onComplete: d });
+      return /* @__PURE__ */ i(Pi, { pump: l, onComplete: d });
     },
     calibrateSPM: ({ holder: c, pump: a, onComplete: d }) => {
       const l = ce(
@@ -4411,7 +4411,7 @@ const wr = ue(
         a ?? c.pumps.data[0],
         hn.type
       );
-      return /* @__PURE__ */ i(Yi, { pump: l, onComplete: d });
+      return /* @__PURE__ */ i(Gi, { pump: l, onComplete: d });
     },
     "replace-pump": ({ holder: c, pump: a, onComplete: d }) => /* @__PURE__ */ i(
       Kc,
@@ -4421,7 +4421,7 @@ const wr = ue(
       }
     ),
     "rfid-override": Xc,
-    "replace-line": ({ holder: c, onComplete: a }) => /* @__PURE__ */ i(Zc, { holder: c, onComplete: a })
+    "replace-line": ({ holder: c, onComplete: a }) => /* @__PURE__ */ i(Uc, { holder: c, onComplete: a })
   }), []), [r, s] = T(void 0), o = r ? n[r] : void 0;
   return {
     holderExperience: o ? /* @__PURE__ */ i(
@@ -4437,7 +4437,7 @@ const wr = ue(
     setHolderExperience: s,
     currentExperienceId: r
   };
-}, gs = Y(void 0), cl = ({ children: t, value: e }) => /* @__PURE__ */ i(gs.Provider, { value: e, children: t }), $a = (t) => ({ HolderContent: void 0 }), ys = (t, e = $a) => {
+}, gs = Y(void 0), cl = ({ children: t, value: e }) => /* @__PURE__ */ i(gs.Provider, { value: e, children: t }), La = (t) => ({ HolderContent: void 0 }), ys = (t, e = La) => {
   const n = G(gs);
   return e = (n == null ? void 0 : n.actionFactory) || e, e(t);
 }, vs = () => {
@@ -4462,7 +4462,7 @@ const bs = () => {
     options: {}
   });
 };
-function La(t) {
+function Va(t) {
   return (e) => {
     const { model: n, status: r, KosModelLoader: s } = bs();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, macroAssignment: n }) });
@@ -4470,7 +4470,7 @@ function La(t) {
 }
 const ws = (t) => Z({
   modelId: t,
-  modelType: zo.type,
+  modelType: jo.type,
   options: {}
 });
 function ll(t) {
@@ -4487,13 +4487,13 @@ const xs = () => {
     options: {}
   });
 };
-function Va(t) {
+function Fa(t) {
   return (e) => {
     const { model: n, status: r, KosModelLoader: s } = xs();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, networkTestContainer: n }) });
   };
 }
-const Fa = () => {
+const Ma = () => {
   const t = qn.type;
   return Z({
     modelId: t,
@@ -4503,11 +4503,11 @@ const Fa = () => {
 };
 function ul(t) {
   return (e) => {
-    const { model: n, status: r, KosModelLoader: s } = Fa();
+    const { model: n, status: r, KosModelLoader: s } = Ma();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, nutritiveSweetener: n }) });
   };
 }
-const Ma = () => {
+const Ba = () => {
   const t = Yn.type;
   return Z({
     modelId: t,
@@ -4516,18 +4516,18 @@ const Ma = () => {
     destroyOnUnmount: !0
   });
 };
-function ml(t) {
+function pl(t) {
   return (e) => {
-    const { model: n, status: r, KosModelLoader: s } = Ma();
+    const { model: n, status: r, KosModelLoader: s } = Ba();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, plainWater: n }) });
   };
 }
-const Ba = (t) => {
+const za = (t) => {
   switch (t.type) {
     case "fcm":
       return hn.type;
     case "lfcv":
-      return ti.type;
+      return ni.type;
     case "micro":
       return Hr.type;
     case "cgp":
@@ -4549,7 +4549,7 @@ to(Te, {
     return s.length === 0 ? !0 : !s.includes(!1);
   }
 });
-class za {
+class ja {
   constructor(e, n) {
     j(this, "core");
     j(this, "dispense");
@@ -4571,20 +4571,20 @@ class za {
     ), this;
   }
 }
-class ja {
+class Za {
   constructor() {
     j(this, "dispense");
     j(this, "core");
     j(this, "plugin");
-    this.dispense = new Yo(), this.core = new no(), this.plugin = new za(this.core, this.dispense);
+    this.dispense = new Go(), this.core = new no(), this.plugin = new ja(this.core, this.dispense);
   }
 }
-const Za = {
+const Ua = {
   /** Utilities extension point for DDK applications */
   UTILITIES: "ddk.ncui.utilities"
-}, Ua = Za.UTILITIES;
-ms.register();
+}, Ka = Ua.UTILITIES;
 ps.register();
+ms.register();
 ze.register();
 Dt.register();
 Nn.register();
@@ -4592,14 +4592,14 @@ hs.register();
 Bt.register();
 tt.register();
 fs.register();
-console.log("JSON-defined UtilitiesExtension ID:", Ua);
+console.log("JSON-defined UtilitiesExtension ID:", Ka);
 console.log(
   "Registered DashboardSummaryExtension:",
-  ms.id
+  ps.id
 );
 console.log(
   "Registered DashboardDetailExtension:",
-  ps.id
+  ms.id
 );
 console.log(
   "Registered DashboardPumpDetailExtension:",
@@ -4614,14 +4614,14 @@ console.log("Registered NavViewExtension:", hs.id);
 console.log("Registered SetupExtension:", Bt.id);
 console.log("Registered TroubleActionExtension:", tt.id);
 console.log("Registered ViewExtension:", fs.id);
-const pl = () => {
-  rr.freestyle.models().model(jo).model(ro).model(pn).model(mn).model(Ur).model(_t).companion(Go.type, () => {
+const ml = () => {
+  rr.freestyle.models().model(Zo).model(ro).model(mn).model(pn).model(Ur).model(_t).companion(Jo.type, () => {
     if (so.isFeatureEnabled("carbTank"))
-      return ni.type;
-  }).companion(Jo.type, Ba).companion(oo.type, _t.type).preload(un.type), Object.keys(Gn).forEach((c) => {
+      return ri.type;
+  }).companion(Qo.type, za).companion(oo.type, _t.type).preload(un.type), Object.keys(Gn).forEach((c) => {
     const a = Gn[c];
     io(rr)(c, a);
-  }), new ri().freestyle.initializeFreestyleExtension();
+  }), new si().freestyle.initializeFreestyleExtension();
   const { KosCoreContextProvider: e } = ao(), n = {
     rank: 999,
     factory: (c) => {
@@ -4643,17 +4643,17 @@ const pl = () => {
       return !0;
     const l = ce(
       d,
-      si.type
+      oi.type
     );
     return !!(l != null && l.supportsRemoteTrays);
   };
-  return new ja().plugin.registerNavVisibilityFilter(r).registerNavVisibilityFilter(s), { KosCoreContextProvider: e };
-}, Zt = (t) => t ? Ka(t.type) : {
+  return new Za().plugin.registerNavVisibilityFilter(r).registerNavVisibilityFilter(s), { KosCoreContextProvider: e };
+}, Zt = (t) => t ? Ha(t.type) : {
   action: "",
   label: "",
   progress: "",
   summary: ""
-}, Ka = (t) => {
+}, Ha = (t) => {
   const e = `troubles:troubles.${t}`;
   return {
     action: `${e}.action`,
@@ -4662,7 +4662,7 @@ const pl = () => {
     summary: `${e}.summary`
   };
 }, ct = (t) => {
-  const e = ii(), [, n] = T({}), [r] = T(/* @__PURE__ */ new Set());
+  const e = ai(), [, n] = T({}), [r] = T(/* @__PURE__ */ new Set());
   return H(() => {
     const o = [];
     return r.forEach((c) => {
@@ -4718,7 +4718,7 @@ function _s(t) {
 }
 const ks = (t) => Z({
   modelId: t,
-  modelType: Zo.type,
+  modelType: Uo.type,
   options: {}
 });
 function fl(t) {
@@ -4735,13 +4735,13 @@ const Cs = () => {
     options: {}
   });
 };
-function Ha(t) {
+function Wa(t) {
   return (e) => {
     const { model: n, status: r, KosModelLoader: s } = Cs();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, setupStepContainer: n }) });
   };
 }
-const Wa = (t) => {
+const Xa = (t) => {
   const [e, n] = T(), [r, s] = He(t), o = e && e > 0;
   return H(() => {
     async function c() {
@@ -4754,7 +4754,7 @@ const Wa = (t) => {
     }
     c();
   }, [t, t == null ? void 0 : t.ingredientId]), { calibrateVolume: e, canCalibrate: o, action: r, handleAction: s };
-}, Xa = () => {
+}, qa = () => {
   const t = tr.type;
   return Z({
     modelId: t,
@@ -4764,17 +4764,17 @@ const Wa = (t) => {
 };
 function gl(t) {
   return (e) => {
-    const { model: n, status: r, KosModelLoader: s } = Xa();
+    const { model: n, status: r, KosModelLoader: s } = qa();
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, start: n }) });
   };
 }
 const Ss = () => {
-  const t = pn.type, { getExtensions: e } = ct(), n = e(tt.id).map(
+  const t = mn.type, { getExtensions: e } = ct(), n = e(tt.id).map(
     (s) => s.data
   );
   return Z({
     modelId: t,
-    modelType: pn.type,
+    modelType: mn.type,
     options: {
       definitions: n
     }
@@ -4797,10 +4797,10 @@ const Ut = (t) => {
     }
     r();
   }, [t]), e;
-}, qa = (t) => !t || t === "white", Ya = (t) => t ? void 0 : "white", Ga = (t) => {
+}, Ya = (t) => !t || t === "white", Ga = (t) => t ? void 0 : "white", Ja = (t) => {
   if (!lo(t))
     return {};
-  const e = t, { visibleTroubles: n, initialized: r } = dt(e), s = (n == null ? void 0 : n.length) ?? 0, o = n == null ? void 0 : n[0], c = s > 0, a = c ? `${o == null ? void 0 : o.color}` : void 0, d = qa(a), l = c ? Ya(d) : void 0;
+  const e = t, { visibleTroubles: n, initialized: r } = dt(e), s = (n == null ? void 0 : n.length) ?? 0, o = n == null ? void 0 : n[0], c = s > 0, a = c ? `${o == null ? void 0 : o.color}` : void 0, d = Ya(a), l = c ? Ga(d) : void 0;
   return {
     backgroundColor: a,
     fontColor: l,
@@ -4820,7 +4820,7 @@ const Ut = (t) => {
   }), [e, n, t]), [r, o.length > 0 ? o[0] : void 0, o];
 }, Ts = (t) => Z({
   modelId: t,
-  modelType: Uo.type,
+  modelType: Ko.type,
   options: {}
 });
 function bl(t) {
@@ -4843,23 +4843,23 @@ function wl(t) {
     return /* @__PURE__ */ i(s, { ...r, children: /* @__PURE__ */ i(t, { ...e, utilitiesContainer: n }) });
   };
 }
-const Ja = mo(
+const Qa = po(
   D(({ device: t }) => {
     const { t: e } = I("dispenser-profile"), r = t.serialNumber === "unassigned" ? void 0 : t.serialNumber;
     return /* @__PURE__ */ i(Le, { label: e("dispenser-serial"), value: r });
   })
-), xl = sa(
+), xl = oa(
   D(({ dispenserInfo: t }) => {
     const { t: e } = I("dispenser-profile");
     return /* @__PURE__ */ f(N, { children: [
       /* @__PURE__ */ i(
-        Ri,
+        $i,
         {
           label: e("dispenser-name", "Dispenser Name"),
           configProperty: t.name
         }
       ),
-      /* @__PURE__ */ i(Ja, {})
+      /* @__PURE__ */ i(Qa, {})
     ] });
   })
 ), _l = _s(
@@ -4881,7 +4881,7 @@ const Ja = mo(
         }
       ),
       /* @__PURE__ */ i(
-        Wi,
+        Xi,
         {
           label: e("activate-and-reboot-time"),
           configProperty: t.activateAndRebootTime
@@ -4893,32 +4893,32 @@ const Ja = mo(
   color: var(--ddk-generic-color-grey-60);
   font-size: var(--ddk-component-enjoy-by-font-size-small);
   font-weight: var(--ddk-component-enjoy-by-font-weight-small);
-`, Qa = S(Cn)`
+`, ec = S(Cn)`
   color: var(--ddk-component-dashboard-enjoy-by-trouble-warning-color);
-`, ec = S(Es)`
+`, tc = S(Es)`
   color: var(--ddk-component-dashboard-enjoy-by-trouble-warning-color);
 `, Ps = ({ holder: t, size: e }) => {
-  const { t: n } = I("common"), { regionModel: r } = be(), s = !!t.enjoyByDate, o = t.enjoyByDate ?? /* @__PURE__ */ new Date(), { formattedDate: c } = po({
+  const { t: n } = I("common"), { regionModel: r } = be(), s = !!t.enjoyByDate, o = t.enjoyByDate ?? /* @__PURE__ */ new Date(), { formattedDate: c } = mo({
     year: o.getFullYear(),
     month: o.getMonth(),
     day: o.getDate(),
     formatString: (r == null ? void 0 : r.selectedDateFormat) || ""
-  }), a = t.hasEnjoyByWarning ? e === "small" ? ec : Qa : e === "small" ? Es : Cn;
+  }), a = t.hasEnjoyByWarning ? e === "small" ? tc : ec : e === "small" ? Es : Cn;
   return s && /* @__PURE__ */ i(a, { children: n("enjoy-by", { data: { date: c } }) });
-}, tc = ({ item: t, valueKey: e }) => {
+}, nc = ({ item: t, valueKey: e }) => {
   const { t: n } = I("hardware-info"), { linked: r } = t;
   if (e === "link.serialNum" && !r)
     return /* @__PURE__ */ i(wo, { children: n("not-connected") });
   const s = xo(t, e);
   return s || "—";
-}, nc = S(Vr)`
+}, rc = S(Vr)`
   & ul {
     list-style-type: none;
     margin: 0;
     padding: 0;
   }
 `, kl = D(() => {
-  const { model: t } = Qo(), { t: e } = I("hardware-info"), n = (t == null ? void 0 : t.boardList.map((r) => {
+  const { model: t } = ei(), { t: e } = I("hardware-info"), n = (t == null ? void 0 : t.boardList.map((r) => {
     var s, o, c;
     return {
       ...r,
@@ -4929,9 +4929,9 @@ const Ja = mo(
     };
   })) || [];
   return t && t.boardList && /* @__PURE__ */ i(
-    nc,
+    rc,
     {
-      CellRenderer: tc,
+      CellRenderer: nc,
       data: n,
       dataKeys: [
         "name",
@@ -4972,24 +4972,24 @@ const Ja = mo(
     ),
     [e]
   );
-  const m = V(() => {
+  const p = V(() => {
     e && (t || e.isPouring || (e.performIntent("HOLD_TO_POUR"), d.current = setTimeout(() => {
       l.current = !0, d.current = void 0, a("run");
     }, u)));
-  }, [t, e]), p = V(() => {
+  }, [t, e]), m = V(() => {
     e && (l.current ? (e.cancelPour(), l.current = !1, a("idle")) : d.current ? (clearTimeout(d.current), d.current = void 0, a("halt")) : e.isPouring && (e.cancelPour(), a("idle")));
   }, [e]), v = V(() => {
-    c !== "halt" && p();
-  }, [p, c]);
+    c !== "halt" && m();
+  }, [m, c]);
   return /* @__PURE__ */ i(
     _o,
     {
       disabled: t,
       mode: "primary",
-      onPointerCancel: p,
-      onPointerDown: m,
+      onPointerCancel: m,
+      onPointerDown: p,
       onPointerOut: v,
-      onPointerUp: p,
+      onPointerUp: m,
       ...s,
       state: c,
       children: o(
@@ -5009,7 +5009,7 @@ const Ja = mo(
       "useAnimationContext must be used within a AnimationProvider"
     );
   return t;
-}, Tl = ta(
+}, Tl = na(
   ({
     animation: t,
     animationOverrides: e,
@@ -5019,12 +5019,12 @@ const Ja = mo(
   }) => {
     const [o, c] = T(!0), [a, d] = T(!0), [l, u] = T(!0);
     return H(() => {
-      const m = je(() => {
-        const p = !!(!(e != null && e.disableAll) && (e != null && e.enableDial)) && !!(!t.disableAll.value && t.enableDial.value), v = !!(!(e != null && e.disableAll) && (e != null && e.enableModal)) && !!(!t.disableAll.value && t.enableModal.value), y = !!(!(e != null && e.disableAll) && (e != null && e.enableSideBar)) && !!(!t.disableAll.value && t.enableSideBar.value);
-        c(p), d(v), u(y);
+      const p = je(() => {
+        const m = !!(!(e != null && e.disableAll) && (e != null && e.enableDial)) && !!(!t.disableAll.value && t.enableDial.value), v = !!(!(e != null && e.disableAll) && (e != null && e.enableModal)) && !!(!t.disableAll.value && t.enableModal.value), y = !!(!(e != null && e.disableAll) && (e != null && e.enableSideBar)) && !!(!t.disableAll.value && t.enableSideBar.value);
+        c(m), d(v), u(y);
       });
       return () => {
-        m();
+        p();
       };
     }, [
       t,
@@ -5186,9 +5186,9 @@ const Ja = mo(
   return t;
 }, dt = (t) => {
   const { model: e } = Rn(), [n, r] = T(), s = e == null ? void 0 : e.currentRole, o = !!n;
-  return Fo(() => {
+  return Mo(() => {
     const c = je(() => {
-      const a = t.troubles.filter(Ko(s));
+      const a = t.troubles.filter(Ho(s));
       r((d) => {
         const l = d ?? [];
         return a.length !== l.length || a.some((u) => !l.includes(u)) ? a : l;
@@ -5210,17 +5210,17 @@ const Dr = S.div`
   text-overflow: ellipsis;
   width: 100%;
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
-`, rc = S.div`
+`, sc = S.div`
   display: flex;
   align-items: center;
   justify-content: center;
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
   flex-wrap: nowrap;
   white-space: nowrap;
-`, sc = S.div`
+`, oc = S.div`
   font-size: var(--ddk-component-holder-card-footer-font-size);
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
-`, oc = (t) => !t || t === "white", ic = (t) => t ? void 0 : "white", ac = (t, e) => e && e.hasEnjoyByWarning ? "var(--ddk-component-dashboard-enjoy-by-trouble-warning-color)" : t ? void 0 : "white", cc = D(
+`, ic = (t) => !t || t === "white", ac = (t) => t ? void 0 : "white", cc = (t, e) => e && e.hasEnjoyByWarning ? "var(--ddk-component-dashboard-enjoy-by-trouble-warning-color)" : t ? void 0 : "white", dc = D(
   ({
     holder: t,
     onHolderSelect: e,
@@ -5228,7 +5228,7 @@ const Dr = S.div`
     summaryBody: r,
     altNamePolicy: s = "disable"
   }) => {
-    const { model: o } = At(), { visibleTroubles: c, initialized: a } = dt(t), d = o == null ? void 0 : o.currentRole, { t: l } = I("troubles"), { t: u } = I("common"), { componentModeOverride: m } = J(), p = m === "compact", { getExtensions: v } = ct();
+    const { model: o } = At(), { visibleTroubles: c, initialized: a } = dt(t), d = o == null ? void 0 : o.currentRole, { t: l } = I("troubles"), { t: u } = I("common"), { componentModeOverride: p } = J(), m = p === "compact", { getExtensions: v } = ct();
     let y = !1;
     const h = ce(
       t,
@@ -5237,10 +5237,10 @@ const Dr = S.div`
     h != null && h.isRemote && s === "disable" && (Us.warn("Holder is remote, skipping rendering"), y = !0);
     const [P, E] = T(!1), x = !!t.ingredientId, X = V(() => {
       E(!1);
-    }, []), oe = (c == null ? void 0 : c.length) ?? 0, U = c == null ? void 0 : c[0], te = oe > 0, Ht = Ut(U), Xe = t.hasFuelGuage, De = t.fillPercent, Wt = t.removed ? "var(--ddk-component-dashboard-card-background-color-removed)" : y ? "var(--ddk-component-dashboard-card-background-color-disabled)" : te ? `${U == null ? void 0 : U.color}` : t.unassigned ? "var(--ddk-component-dashboard-card-background-color-unassigned)" : void 0, lt = t.removed ? "var(--ddk-component-dashboard-card-header-background-color-removed)" : void 0, ut = oc(Wt), Ne = y ? "white" : t.unassigned ? "var(--ddk-generic-color-grey-30)" : te ? ic(ut) : x ? void 0 : "var(--ddk-component-dashboard-card-color-unassigned)", Xt = y ? "white" : te ? ac(ut, t) : x ? void 0 : "var(--ddk-component-dashboard-card-color-unassigned)", mt = R ? u(_, { defaultValue: "Remote NNS Tray" }) : Fr(t.name, p), pt = y ? u("disabled") : R ? "" : t.removed ? u(t.previousIngredientName) : t.unassigned ? u("unassigned") : u(t.ingredientName), ht = /* @__PURE__ */ i(Dr, { color: Ne, children: pt }), qt = /* @__PURE__ */ i(rc, { color: Ne, children: mt }), Yt = R ? u(_, { defaultValue: "Remote NNS Tray" }) : t.name, Gt = /* @__PURE__ */ f(Dr, { children: [
+    }, []), oe = (c == null ? void 0 : c.length) ?? 0, U = c == null ? void 0 : c[0], te = oe > 0, Ht = Ut(U), Xe = t.hasFuelGuage, De = t.fillPercent, Wt = t.removed ? "var(--ddk-component-dashboard-card-background-color-removed)" : y ? "var(--ddk-component-dashboard-card-background-color-disabled)" : te ? `${U == null ? void 0 : U.color}` : t.unassigned ? "var(--ddk-component-dashboard-card-background-color-unassigned)" : void 0, lt = t.removed ? "var(--ddk-component-dashboard-card-header-background-color-removed)" : void 0, ut = ic(Wt), Ne = y ? "white" : t.unassigned ? "var(--ddk-generic-color-grey-30)" : te ? ac(ut) : x ? void 0 : "var(--ddk-component-dashboard-card-color-unassigned)", Xt = y ? "white" : te ? cc(ut, t) : x ? void 0 : "var(--ddk-component-dashboard-card-color-unassigned)", pt = R ? u(_, { defaultValue: "Remote NNS Tray" }) : Fr(t.name, m), mt = y ? u("disabled") : R ? "" : t.removed ? u(t.previousIngredientName) : t.unassigned ? u("unassigned") : u(t.ingredientName), ht = /* @__PURE__ */ i(Dr, { color: Ne, children: mt }), qt = /* @__PURE__ */ i(sc, { color: Ne, children: pt }), Yt = R ? u(_, { defaultValue: "Remote NNS Tray" }) : t.name, Gt = /* @__PURE__ */ f(Dr, { children: [
       Yt,
       " ",
-      pt
+      mt
     ] }), Jt = x && Xe && !te && a ? r ?? /* @__PURE__ */ i(
       Br,
       {
@@ -5279,10 +5279,10 @@ const Dr = S.div`
         Ae,
         en
       ]
-    ), Xs = Zt(U), qs = /* @__PURE__ */ i(sc, { color: te ? Ne : Xt, children: L && !R ? u("remote-nns-active") : te ? l(Xs.summary, {
+    ), Xs = Zt(U), qs = /* @__PURE__ */ i(oc, { color: te ? Ne : Xt, children: L && !R ? u("remote-nns-active") : te ? l(Xs.summary, {
       context: U != null && U.deferred ? "queued" : void 0,
       data: Ht
-    }) : !p && /* @__PURE__ */ i(Ps, { size: "small", holder: t }) }), { holderExperience: Ys, setHolderExperience: Ln } = at(t), { future: yt } = _e(U), Gs = V(() => {
+    }) : !m && /* @__PURE__ */ i(Ps, { size: "small", holder: t }) }), { holderExperience: Ys, setHolderExperience: Ln } = at(t), { future: yt } = _e(U), Gs = V(() => {
       y || t.sortedPumps.length <= 0 || (d === "technician" ? E(!0) : t.unassigned || t.removed ? Ln("rfid-override") : te && (e == null || e(t)));
     }, [
       y,
@@ -5296,7 +5296,7 @@ const Dr = S.div`
       /* @__PURE__ */ f(
         Ze,
         {
-          contain: !p,
+          contain: !m,
           ...Hs,
           show: P,
           onClose: X,
@@ -5304,11 +5304,11 @@ const Dr = S.div`
             /* @__PURE__ */ i(
               Ue,
               {
-                contain: p,
+                contain: m,
                 showCloseButton: !0,
                 title: Gt,
                 onClose: X,
-                CloseButton: p ? nt : void 0
+                CloseButton: m ? nt : void 0
               }
             ),
             Ws
@@ -5355,10 +5355,10 @@ const Dr = S.div`
   height: 100%;
   user-select: none;
   overflow: visible;
-`, dc = D(({ holder: t, showNavIcons: e }) => {
+`, lc = D(({ holder: t, showNavIcons: e }) => {
   const n = t.troubles[0];
   return /* @__PURE__ */ i(
-    cc,
+    dc,
     {
       holder: t,
       showNavIcon: e,
@@ -5372,7 +5372,7 @@ const Dr = S.div`
   ({ holders: t, showNavIcons: e, ...n }) => {
     const r = F(
       () => t.map((s) => /* @__PURE__ */ i(
-        dc,
+        lc,
         {
           holder: s,
           showNavIcons: !!e
@@ -5383,9 +5383,9 @@ const Dr = S.div`
     );
     return /* @__PURE__ */ i(Ks, { ...n, children: r });
   }
-), lc = W.createLogger({ name: "holder-group-view" });
-lc.debug("holder-group-view component loaded");
-const uc = ["water", "carb", "ns", "nns"], mc = S.div`
+), uc = W.createLogger({ name: "holder-group-view" });
+uc.debug("holder-group-view component loaded");
+const pc = ["water", "carb", "ns", "nns"], mc = S.div`
   display: flex;
   flex-direction: column;
   overflow-y: auto;
@@ -5402,18 +5402,18 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
   text-overflow: ellipsis;
   width: 100%;
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
-`, pc = S.div`
+`, hc = S.div`
   display: flex;
   align-items: center;
   justify-content: center;
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
-`, hc = S.div`
+`, fc = S.div`
   font-size: var(--ddk-component-holder-card-footer-font-size);
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
-`, fc = (t, e, n, r) => {
-  const s = r(`common:macros.${t.name}`), o = uc.includes(t.name), c = e ? o ? "" : ` ${r(`common:${t.ingredientName}`)}` : ` ${r("common:macros.unassigned")}`, a = `${s}${c}`, d = n ? o ? s : c : `${s} ${c}`;
+`, gc = (t, e, n, r) => {
+  const s = r(`common:macros.${t.name}`), o = pc.includes(t.name), c = e ? o ? "" : ` ${r(`common:${t.ingredientName}`)}` : ` ${r("common:macros.unassigned")}`, a = `${s}${c}`, d = n ? o ? s : c : `${s} ${c}`;
   return { titleText: a, cardTitleText: d };
-}, gc = D(
+}, yc = D(
   ({ holder: t, dashboardKey: e, fallbackStatus: n }) => {
     const { getExtensions: r } = ct(), s = r(Dt.id), o = (d) => s.find((l) => {
       const u = l.data;
@@ -5421,7 +5421,7 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
     }), c = o(t.name) ?? o(e), a = Sn(Dt);
     return c && a ? /* @__PURE__ */ i(a, { module: c.id, holder: t }) : /* @__PURE__ */ i(Ke, { size: "small", status: n });
   }
-), yc = (t) => !t || t === "white", vc = (t) => t ? void 0 : "white", bc = D(
+), vc = (t) => !t || t === "white", bc = (t) => t ? void 0 : "white", wc = D(
   ({
     holder: t,
     onHolderSelect: e,
@@ -5429,32 +5429,32 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
     summaryBody: r
   }) => {
     var ft, Ae;
-    const { model: s } = At(), { visibleTroubles: o, initialized: c } = dt(t), { t: a } = I(["troubles", "common"]), { componentModeOverride: d } = J(), l = d === "compact", { getExtensions: u } = ct(), m = (ft = s == null ? void 0 : s.currentRole) == null ? void 0 : ft.toLowerCase(), [p, v] = T(!1), y = !!t.ingredientId, h = (o == null ? void 0 : o.length) ?? 0, _ = o == null ? void 0 : o[0], L = o ? o.length > 0 : !1, R = t.removed ? "var(--ddk-component-dashboard-card-background-color-removed)" : L ? `${_ == null ? void 0 : _.color}` : t.unassigned ? "var(--ddk-component-dashboard-card-background-color-unassigned)" : void 0, P = t.removed ? "var(--ddk-component-dashboard-card-header-background-color-removed)" : void 0, E = yc(R), x = t.unassigned ? "var(--ddk-generic-color-grey-30)" : L ? vc(E) : y ? void 0 : "var(--ddk-component-dashboard-card-color-unassigned)", X = Fr(
+    const { model: s } = At(), { visibleTroubles: o, initialized: c } = dt(t), { t: a } = I(["troubles", "common"]), { componentModeOverride: d } = J(), l = d === "compact", { getExtensions: u } = ct(), p = (ft = s == null ? void 0 : s.currentRole) == null ? void 0 : ft.toLowerCase(), [m, v] = T(!1), y = !!t.ingredientId, h = (o == null ? void 0 : o.length) ?? 0, _ = o == null ? void 0 : o[0], L = o ? o.length > 0 : !1, R = t.removed ? "var(--ddk-component-dashboard-card-background-color-removed)" : L ? `${_ == null ? void 0 : _.color}` : t.unassigned ? "var(--ddk-component-dashboard-card-background-color-unassigned)" : void 0, P = t.removed ? "var(--ddk-component-dashboard-card-header-background-color-removed)" : void 0, E = vc(R), x = t.unassigned ? "var(--ddk-generic-color-grey-30)" : L ? bc(E) : y ? void 0 : "var(--ddk-component-dashboard-card-color-unassigned)", X = Fr(
       t.name,
       d === "compact"
-    ), { titleText: oe, cardTitleText: U } = fc(
+    ), { titleText: oe, cardTitleText: U } = gc(
       t,
       y,
       l,
       a
-    ), te = d === "compact" && /* @__PURE__ */ i(pc, { color: x, children: X }), Ht = /* @__PURE__ */ i(Nr, { color: x, children: U }), Xe = /* @__PURE__ */ i(Nr, { children: oe }), De = $e.executeDashboardKeyFactory(t) || "", lt = u(ze.id).filter((ke) => !!ke.data).reduce((ke, Oe) => {
+    ), te = d === "compact" && /* @__PURE__ */ i(hc, { color: x, children: X }), Ht = /* @__PURE__ */ i(Nr, { color: x, children: U }), Xe = /* @__PURE__ */ i(Nr, { children: oe }), De = $e.executeDashboardKeyFactory(t) || "", lt = u(ze.id).filter((ke) => !!ke.data).reduce((ke, Oe) => {
       const gt = Oe.data;
       return ke[gt.dashboardKey] = Oe.data, ke;
-    }, {}), ut = !!lt[De], { HolderContent: Ne, modalOptions: Xt } = ys(t), mt = Sn(
+    }, {}), ut = !!lt[De], { HolderContent: Ne, modalOptions: Xt } = ys(t), pt = Sn(
       ze
-    ), pt = r ?? /* @__PURE__ */ i(
-      gc,
+    ), mt = r ?? /* @__PURE__ */ i(
+      yc,
       {
         holder: t,
         dashboardKey: De,
         fallbackStatus: L ? "pending" : "completed"
       }
-    ), ht = Ne ? /* @__PURE__ */ i(Ne, { holder: t, onComplete: () => v(!1) }) : ut && mt ? /* @__PURE__ */ i(mt, { module: (Ae = lt[De]) == null ? void 0 : Ae.id, holder: t }) : null, qt = Zt(_), Yt = Ut(_), Gt = L ? /* @__PURE__ */ i(hc, { color: x, children: a(qt.summary, {
+    ), ht = Ne ? /* @__PURE__ */ i(Ne, { holder: t, onComplete: () => v(!1) }) : ut && pt ? /* @__PURE__ */ i(pt, { module: (Ae = lt[De]) == null ? void 0 : Ae.id, holder: t }) : null, qt = Zt(_), Yt = Ut(_), Gt = L ? /* @__PURE__ */ i(fc, { color: x, children: a(qt.summary, {
       context: _ != null && _.deferred ? "queued" : void 0,
       data: Yt
     }) }) : null, Jt = V(() => {
-      t.sortedPumps.length > 0 && (m === "technician" ? v(!0) : L && (e == null || e(t)));
-    }, [L, t, e, m]);
+      t.sortedPumps.length > 0 && (p === "technician" ? v(!0) : L && (e == null || e(t)));
+    }, [L, t, e, p]);
     return /* @__PURE__ */ f(N, { children: [
       /* @__PURE__ */ i(
         Mr,
@@ -5462,7 +5462,7 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
           avatar: te,
           headerBackgroundColor: P,
           backgroundColor: R,
-          body: L ? null : pt,
+          body: L ? null : mt,
           footer: Gt,
           cardId: t.path,
           errors: h,
@@ -5477,7 +5477,7 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
         {
           contain: d !== "compact",
           ...Xt,
-          show: p,
+          show: m,
           onClose: () => v(!1),
           children: /* @__PURE__ */ f(mc, { children: [
             /* @__PURE__ */ i(
@@ -5501,7 +5501,7 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
   ({ holders: t, showNavIcons: e, ...n }) => /* @__PURE__ */ i(Ks, { ...n, children: t.map((r) => {
     const s = r.troubles[0];
     return /* @__PURE__ */ i(
-      bc,
+      wc,
       {
         holder: r,
         showNavIcon: e,
@@ -5512,17 +5512,17 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
       r.id
     );
   }) })
-), wc = S(qo)`
+), xc = S(Yo)`
   width: var(--ddk-component-macro-card-unavailable-icon-size);
   height: var(--ddk-component-macro-card-unavailable-icon-size);
-`, xc = S(zr)`
+`, _c = S(zr)`
   text-align: center;
   font-size: var(--ddk-component-sub-modal-heading-font-size-medium);
-`, _c = S.div`
+`, kc = S.div`
   height: 100%;
   overflow-y: auto;
   width: 100%;
-`, kc = S.div`
+`, Cc = S.div`
   display: grid;
   gap: var(--ddk-component-macro-setup-card-gap);
 
@@ -5532,16 +5532,16 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
   justify-content: center;
   width: 100%;
   user-select: none;
-`, Cc = (t) => {
+`, Sc = (t) => {
   const { componentModeOverride: e } = J();
   return /* @__PURE__ */ i(
-    kc,
+    Cc,
     {
       compact: e === "compact",
       ...t
     }
   );
-}, Sc = S.div`
+}, Tc = S.div`
   align-items: center;
 
   background: ${(t) => t.selected ? "var(--ddk-generic-color-grey-5)" : "var(--ddk-generic-color-white)"};
@@ -5564,18 +5564,18 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
   overflow-wrap: anywhere;
   padding: var(--ddk-component-macro-setup-card-header-padding-md);
   text-align: center;
-`, Tc = S.div`
+`, Ic = S.div`
   align-items: center;
   display: flex;
   flex-direction: column;
   gap: 32px;
   height: 100%;
   justify-content: center;
-`, Ic = S.div`
+`, Ec = S.div`
   color: var(--ddk-component-macro-card-unavailable-font-color);
   font-size: var(--ddk-component-macro-card-unavailable-font-size);
   font-weight: var(--ddk-component-macro-card-unavailable-font-weight);
-`, $n = La(({ holder: t, onComplete: e, macroAssignment: n, showCloseButton: r = !0 }) => {
+`, $n = Va(({ holder: t, onComplete: e, macroAssignment: n, showCloseButton: r = !0 }) => {
   const { t: s } = I("setup"), { t: o } = I("common"), { componentModeOverride: c } = J(), [a, d] = T(t.ingredient), l = S.div`
     display: flex;
     flex-direction: column;
@@ -5584,11 +5584,11 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
   `;
   return /* @__PURE__ */ f(l, { children: [
     /* @__PURE__ */ i(se, { children: n.hasMacroIngredients ? /* @__PURE__ */ f(N, { children: [
-      c === "standard" && /* @__PURE__ */ i(xc, { children: s("select-and-assign-ingredients-for", {
+      c === "standard" && /* @__PURE__ */ i(_c, { children: s("select-and-assign-ingredients-for", {
         data: { name: o(`macros.${t.name}`) }
       }) }),
-      /* @__PURE__ */ i(_c, { children: /* @__PURE__ */ i(Cc, { children: n.macroIngredients.map((u) => /* @__PURE__ */ i(
-        Sc,
+      /* @__PURE__ */ i(kc, { children: /* @__PURE__ */ i(Sc, { children: n.macroIngredients.map((u) => /* @__PURE__ */ i(
+        Tc,
         {
           selected: (a == null ? void 0 : a.id) === u.id,
           onPointerDown: () => {
@@ -5598,9 +5598,9 @@ const uc = ["water", "carb", "ns", "nns"], mc = S.div`
         },
         u.id
       )) }) })
-    ] }) : /* @__PURE__ */ f(Tc, { children: [
-      /* @__PURE__ */ i(wc, {}),
-      /* @__PURE__ */ i(Ic, { children: s("no-ingredients-available-for-assignment") })
+    ] }) : /* @__PURE__ */ f(Ic, { children: [
+      /* @__PURE__ */ i(xc, {}),
+      /* @__PURE__ */ i(Ec, { children: s("no-ingredients-available-for-assignment") })
     ] }) }),
     /* @__PURE__ */ i(Q, { children: n.hasMacroIngredients ? /* @__PURE__ */ f(N, { children: [
       c === "standard" && r && /* @__PURE__ */ i(
@@ -5721,7 +5721,7 @@ ${e("agitator:agitate-after-without", {
       }
     )
   ] });
-}), Ec = S.div`
+}), Pc = S.div`
   font-size: var(--ddk-component-holder-card-footer-font-size);
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
 `, tu = D((t) => {
@@ -5730,7 +5730,7 @@ ${e("agitator:agitate-after-without", {
   return /* @__PURE__ */ f(N, { children: [
     /* @__PURE__ */ i(Ke, { size: "small", status: "completed" }),
     /* @__PURE__ */ i(
-      Ec,
+      Pc,
       {
         style: {
           visibility: t.cardModel.isAgitating ? "visible" : "hidden"
@@ -5744,23 +5744,23 @@ ${e("agitator:agitate-after-without", {
   flex-direction: column;
   gap: 24px;
   padding: 24px;
-`, ru = ei(
+`, ru = ti(
   ({ assembly: t, showHeading: e }) => /* @__PURE__ */ i(
-    Pc,
+    Dc,
     {
       iceAgitator: t.iceAgitator,
       showHeading: e
     }
   )
-), Pc = D(
+), Dc = D(
   ({ iceAgitator: t, showHeading: e }) => {
-    const { t: n } = I("about"), r = ai(), { componentModeOverride: s } = J(), o = (t == null ? void 0 : t.iceTypes.map((a) => ({ id: a, label: a }))) || [], c = V(async () => {
+    const { t: n } = I("about"), r = ci(), { componentModeOverride: s } = J(), o = (t == null ? void 0 : t.iceTypes.map((a) => ({ id: a, label: a }))) || [], c = V(async () => {
       (t == null ? void 0 : t.type.value) !== void 0 && (t == null || t.updateIceType(t.type.value));
     }, [t]);
     return t ? /* @__PURE__ */ f(rt, { children: [
       e && /* @__PURE__ */ i(st, { children: n("ice-settings", "Ice Settings") }),
       s === "compact" ? /* @__PURE__ */ i(
-        Ki,
+        Hi,
         {
           configProperty: t.type,
           onChange: (a) => t.updateIceType(a),
@@ -5801,7 +5801,7 @@ ${e("agitator:agitate-after-without", {
     ] }) : "Ice model not loaded...";
   }
 ), su = D(({ showHeading: t }) => {
-  var u, m, p, v, y;
+  var u, p, m, v, y;
   const { t: e } = I("region"), { allLocales: n } = ho(), { model: r } = On(), { regionModel: s } = be(), o = V(
     (h) => ({
       id: h,
@@ -5832,7 +5832,7 @@ ${e("agitator:agitate-after-without", {
       xt,
       {
         label: e("units-of-measurement", "Units of Measurement"),
-        options: (m = s == null ? void 0 : s.unitSystemOptions) == null ? void 0 : m.map((h) => ({
+        options: (p = s == null ? void 0 : s.unitSystemOptions) == null ? void 0 : p.map((h) => ({
           id: h.id,
           label: `${e(`locale.unit.${h.id}`)}/${e(
             `locale.units.${h.id}`
@@ -5847,7 +5847,7 @@ ${e("agitator:agitate-after-without", {
       {
         cancelButtonLabel: e("discard-changes", "Discard Changes") || void 0,
         closeButtonLabel: e("close", "Close") || void 0,
-        displayValue: c[((p = r == null ? void 0 : r.ncuiLanguage) == null ? void 0 : p.displayValue) ?? ""] ?? ((v = r == null ? void 0 : r.ncuiLanguage) == null ? void 0 : v.displayValue),
+        displayValue: c[((m = r == null ? void 0 : r.ncuiLanguage) == null ? void 0 : m.displayValue) ?? ""] ?? ((v = r == null ? void 0 : r.ncuiLanguage) == null ? void 0 : v.displayValue),
         items: n == null ? void 0 : n.map(({ locale: h, label: _ }) => ({
           id: h,
           label: _
@@ -5899,17 +5899,17 @@ S.div`
     justify-content: flex-end;
   }
 `;
-const Dc = S.div`
+const Nc = S.div`
   display: flex;
   align-items: center;
   justify-content: flex-end;
-`, Nc = ({ item: t, valueKey: e }) => {
+`, Ac = ({ item: t, valueKey: e }) => {
   const { label: n, value: r } = t;
   if (e === "label")
     return /* @__PURE__ */ i("div", { children: /* @__PURE__ */ i("b", { children: n }) });
   if (e === "value")
-    return /* @__PURE__ */ i(Dc, { children: r });
-}, Ac = ({
+    return /* @__PURE__ */ i(Nc, { children: r });
+}, Oc = ({
   groupName: t,
   networkTestContainer: e
 }) => {
@@ -5923,7 +5923,7 @@ const Dc = S.div`
     return o ? /* @__PURE__ */ i(
       Vr,
       {
-        CellRenderer: Nc,
+        CellRenderer: Ac,
         data: c,
         dataKeys: ["label", "value"],
         heading: s.name
@@ -5941,9 +5941,9 @@ const Dc = S.div`
       s.id
     );
   })) || [];
-}, ou = Va(
-  Ac
-), Oc = S.div`
+}, ou = Fa(
+  Oc
+), Rc = S.div`
   background-color: var(--ddk-generic-color-grey-80);
   color: var(--ddk-generic-color-grey-5);
   border-radius: 5px;
@@ -5952,9 +5952,9 @@ const Dc = S.div`
   align-items: center;
   justify-content: center;
   font-size: var(--ddk-generic-font-size-xx-small);
-`, Rc = D(({ showAction: t = !0, trouble: e, showHolder: n }) => {
+`, $c = D(({ showAction: t = !0, trouble: e, showHolder: n }) => {
   var _;
-  const { t: r } = I(["troubles"]), { model: s } = Rn(), o = s == null ? void 0 : s.currentRole, c = Ut(e), { action: a, label: d, progress: l } = Zt(e), u = e.resolvable ?? !1, { future: m } = _e(e), p = (_ = e == null ? void 0 : e.data) != null && _.holderNames && e.data.holderNames.length > 0 ? /* @__PURE__ */ i(Oc, { children: e.data.holderNames[0] }) : null, v = (e == null ? void 0 : e.color) ?? "orange", y = (e == null ? void 0 : e.shouldDefer) ?? !1, h = (e == null ? void 0 : e.deferred) ?? !1;
+  const { t: r } = I(["troubles"]), { model: s } = Rn(), o = s == null ? void 0 : s.currentRole, c = Ut(e), { action: a, label: d, progress: l } = Zt(e), u = e.resolvable ?? !1, { future: p } = _e(e), m = (_ = e == null ? void 0 : e.data) != null && _.holderNames && e.data.holderNames.length > 0 ? /* @__PURE__ */ i(Rc, { children: e.data.holderNames[0] }) : null, v = (e == null ? void 0 : e.color) ?? "orange", y = (e == null ? void 0 : e.shouldDefer) ?? !1, h = (e == null ? void 0 : e.deferred) ?? !1;
   return /* @__PURE__ */ f(N, { children: [
     /* @__PURE__ */ i(
       To,
@@ -5963,21 +5963,21 @@ const Dc = S.div`
         indicatorColor: v,
         buttonLabel: t ? h ? "Queued" : y ? "Queue" : r(a, { context: o, defaultValue: "" }) : void 0,
         date: e.createTime,
-        prefix: n ? p : void 0,
+        prefix: n ? m : void 0,
         onAction: t && u && !h ? () => {
           e.resolve();
         } : void 0
       }
     ),
-    m && /* @__PURE__ */ i(
+    p && /* @__PURE__ */ i(
       q,
       {
         title: r(l, { context: o }),
-        future: h ? void 0 : m,
+        future: h ? void 0 : p,
         failureMessage: r(`troubles.${e.type}.error`, {
-          context: m != null && m.reason ? "reason" : void 0,
+          context: p != null && p.reason ? "reason" : void 0,
           data: {
-            reason: m != null && m.reason ? `__troubles.errors.${m == null ? void 0 : m.reason}__` : void 0
+            reason: p != null && p.reason ? `__troubles.errors.${p == null ? void 0 : p.reason}__` : void 0
           }
         })
       }
@@ -5989,8 +5989,8 @@ const Dc = S.div`
   tabs: n,
   ...r
 }) => {
-  const { getExtensions: s } = Yr(), o = s(t), c = s(e).reduce((m, p) => (m[p.id] = p, m), {}), a = o.map((m) => m.data.namespace), { t: d } = I(["", ...new Set(a)]), l = o.map((m) => {
-    const p = m.data, v = [...p.settings].map((y) => {
+  const { getExtensions: s } = Yr(), o = s(t), c = s(e).reduce((p, m) => (p[m.id] = m, p), {}), a = o.map((p) => p.data.namespace), { t: d } = I(["", ...new Set(a)]), l = o.map((p) => {
+    const m = p.data, v = [...m.settings].map((y) => {
       const h = c[y], _ = h.data;
       return /* @__PURE__ */ f(rt, { children: [
         /* @__PURE__ */ i(st, { children: d(`${_.namespace}:${_.title}`) }),
@@ -6004,19 +6004,19 @@ const Dc = S.div`
       ] }, h.id);
     });
     return {
-      id: m.id,
-      label: d(`${p.namespace}:${p.title}`),
+      id: p.id,
+      label: d(`${m.namespace}:${m.title}`),
       content: /* @__PURE__ */ i(Io, { children: v })
     };
   }), u = [...n, ...l];
   return /* @__PURE__ */ i(Eo, { ...r, tabs: u });
 }, Kt = D(
   ({ holder: t }) => {
-    const { t: e } = I("common"), { componentModeOverride: n } = J(), r = n === "compact", { visibleTroubles: s, initialized: o } = dt(t), a = ((s == null ? void 0 : s.length) ?? 0) > 0, d = !!t.troublesByType.FlushTrouble, l = !!t.troublesByType.PrimeTrouble, u = !!t.troublesByType.PurgeTrouble, m = d ? t.troublesByType.FlushTrouble[0] : l ? t.troublesByType.PrimeTrouble[0] : u ? t.troublesByType.PurgeTrouble[0] : null, p = (m == null ? void 0 : m.shouldDefer) ?? !1, v = (m == null ? void 0 : m.deferred) ?? !1, [y, h] = He(t), _ = V(
+    const { t: e } = I("common"), { componentModeOverride: n } = J(), r = n === "compact", { visibleTroubles: s, initialized: o } = dt(t), a = ((s == null ? void 0 : s.length) ?? 0) > 0, d = !!t.troublesByType.FlushTrouble, l = !!t.troublesByType.PrimeTrouble, u = !!t.troublesByType.PurgeTrouble, p = d ? t.troublesByType.FlushTrouble[0] : l ? t.troublesByType.PrimeTrouble[0] : u ? t.troublesByType.PurgeTrouble[0] : null, m = (p == null ? void 0 : p.shouldDefer) ?? !1, v = (p == null ? void 0 : p.deferred) ?? !1, [y, h] = He(t), _ = V(
       (L) => {
-        p ? m == null || m.resolve() : h(L);
+        m ? p == null || p.resolve() : h(L);
       },
-      [h, p, m]
+      [h, m, p]
     );
     return a && o && r ? /* @__PURE__ */ f(N, { children: [
       d ? /* @__PURE__ */ i(
@@ -6053,7 +6053,7 @@ const Dc = S.div`
 }) => {
   const { componentModeOverride: n } = J(), r = n === "standard", { visibleTroubles: s, initialized: o } = dt(t), c = e ? s == null ? void 0 : s.filter(e) : s;
   return ((c == null ? void 0 : c.length) ?? 0) > 0 && o && (s == null ? void 0 : s.map((l) => /* @__PURE__ */ i(
-    Rc,
+    $c,
     {
       showAction: r,
       trouble: l
@@ -6072,11 +6072,11 @@ const Dc = S.div`
       }
       y();
     }, [t, t.ingredientId]);
-    const c = t.ingredientId !== void 0, a = s && s > 0, { holderExperience: d, setHolderExperience: l, currentExperienceId: u } = at(t), m = c || u === "replace-line", p = t.pumps.data[0], v = ce(p, Wr.type);
-    return m ? /* @__PURE__ */ f(N, { children: [
+    const c = t.ingredientId !== void 0, a = s && s > 0, { holderExperience: d, setHolderExperience: l, currentExperienceId: u } = at(t), p = c || u === "replace-line", m = t.pumps.data[0], v = ce(m, Wr.type);
+    return p ? /* @__PURE__ */ f(N, { children: [
       /* @__PURE__ */ f(se, { contain: !0, children: [
         /* @__PURE__ */ i(Ee, { holder: t }),
-        /* @__PURE__ */ i($c, { children: /* @__PURE__ */ i(ns, { probeAware: v }) })
+        /* @__PURE__ */ i(Lc, { children: /* @__PURE__ */ i(ns, { probeAware: v }) })
       ] }),
       /* @__PURE__ */ f(Q, { children: [
         /* @__PURE__ */ i(
@@ -6099,7 +6099,7 @@ const Dc = S.div`
       n && /* @__PURE__ */ i(q, { ...n })
     ] }) : /* @__PURE__ */ i($n, { showCloseButton: !1, holder: t });
   }
-), $c = S.div`
+), Lc = S.div`
   width: 100%;
   height: 100%;
   display: flex;
@@ -6110,13 +6110,13 @@ const Dc = S.div`
   ({ holder: t }) => {
     const { t: e } = I("common"), [n, r] = He(t), [s, o] = T();
     H(() => {
-      async function p() {
+      async function m() {
         if (t.ingredientId !== void 0) {
           const v = await t.resolveIntentVolume("CALIBRATE");
           o(Math.round(v.volume));
         }
       }
-      p();
+      m();
     }, [t, t.ingredientId]);
     const c = t.ingredientId !== void 0, a = s && s > 0, { holderExperience: d, setHolderExperience: l, currentExperienceId: u } = at(t);
     return c || u === "replace-line" ? /* @__PURE__ */ f(N, { children: [
@@ -6176,31 +6176,31 @@ const Dc = S.div`
       n && /* @__PURE__ */ i(q, { ...n })
     ] }) : /* @__PURE__ */ i($n, { showCloseButton: !1, holder: t });
   }
-), Lc = S.div`
+), Vc = S.div`
   display: flex;
   flex-direction: column;
   gap: var(--ddk-component-super-pump-container-gap);
-`, Vc = S.div`
+`, Fc = S.div`
   display: flex;
   flex-direction: column;
   gap: var(--ddk-component-cartridge-container-gap);
-`, Fc = D(({ holder: t }) => {
-  const e = oi(), { t: n } = I("common"), [r, s] = T("all"), o = e == null ? void 0 : e.cartridgeAgitatorModels[0], c = !!t.ingredientId, a = t.pumps.getModel(r), d = ce(
+`, Mc = D(({ holder: t }) => {
+  const e = ii(), { t: n } = I("common"), [r, s] = T("all"), o = e == null ? void 0 : e.cartridgeAgitatorModels[0], c = !!t.ingredientId, a = t.pumps.getModel(r), d = ce(
     t,
     Xr.type
-  ), l = !!(d != null && d.agitated), { holderExperience: u, setHolderExperience: m } = at(
+  ), l = !!(d != null && d.agitated), { holderExperience: u, setHolderExperience: p } = at(
     t,
     a
-  ), { calibrateVolume: p, canCalibrate: v, action: y, handleAction: h } = Wa(a), _ = V((x) => {
+  ), { calibrateVolume: m, canCalibrate: v, action: y, handleAction: h } = Xa(a), _ = V((x) => {
     s(x.id);
   }, []), L = t.hasFuelGuage, R = t.fillPercent, { future: P } = _e(o), E = V(
     (x) => x.data.pumpPath === (a == null ? void 0 : a.path),
     [a == null ? void 0 : a.path]
   );
   return /* @__PURE__ */ f(N, { children: [
-    /* @__PURE__ */ f(Lc, { children: [
+    /* @__PURE__ */ f(Vc, { children: [
       /* @__PURE__ */ f(se, { contain: !0, children: [
-        c && L && /* @__PURE__ */ f(Vc, { children: [
+        c && L && /* @__PURE__ */ f(Fc, { children: [
           /* @__PURE__ */ i(
             Br,
             {
@@ -6244,14 +6244,14 @@ const Dc = S.div`
           /* @__PURE__ */ i(
             w,
             {
-              onPointerDown: () => m("replace-pump"),
+              onPointerDown: () => p("replace-pump"),
               children: n("replace-pump")
             }
           ),
           /* @__PURE__ */ i(
             w,
             {
-              onPointerDown: () => m("calibrateSPM"),
+              onPointerDown: () => p("calibrateSPM"),
               children: n("calibrate")
             }
           ),
@@ -6262,7 +6262,7 @@ const Dc = S.div`
               onPointerDown: () => h("calibrate"),
               children: n("intentPour", {
                 data: {
-                  volume: p
+                  volume: m
                 }
               })
             }
@@ -6271,14 +6271,14 @@ const Dc = S.div`
           !c && /* @__PURE__ */ i(
             w,
             {
-              onPointerDown: () => m("rfid-override"),
+              onPointerDown: () => p("rfid-override"),
               children: n("rfid-override")
             }
           ),
           /* @__PURE__ */ i(
             w,
             {
-              onPointerDown: () => m("replace-line"),
+              onPointerDown: () => p("replace-line"),
               children: n("replace-line")
             }
           ),
@@ -6327,25 +6327,25 @@ const Dc = S.div`
       n && /* @__PURE__ */ i(q, { ...n })
     ] });
   }
-), Mc = S.section`
+), Bc = S.section`
   align-items: center;
   display: flex;
   flex-direction: column;
   gap: 32px;
   height: 100%;
   justify-content: space-between;
-`, Bc = S.div`
+`, zc = S.div`
   display: flex;
   gap: 32px;
   flex-direction: column;
   align-items: center;
   padding: 32px;
-`, zc = S.div`
+`, jc = S.div`
   display: flex;
   flex-direction: column;
   gap: 12px;
   text-align: center;
-`, mu = ({ onComplete: t }) => {
+`, pu = ({ onComplete: t }) => {
   const { t: e } = I("reboot"), [n, r] = T(!1), { model: s } = An(), { componentModeOverride: o } = J();
   return /* @__PURE__ */ f(
     Ze,
@@ -6364,10 +6364,10 @@ const Dc = S.div`
             CloseButton: Do
           }
         ),
-        /* @__PURE__ */ f(Mc, { children: [
-          /* @__PURE__ */ f(Bc, { children: [
+        /* @__PURE__ */ f(Bc, { children: [
+          /* @__PURE__ */ f(zc, { children: [
             /* @__PURE__ */ i(No, {}),
-            /* @__PURE__ */ i(zc, { children: /* @__PURE__ */ i(zr, { children: e("modal-heading", "Are you sure you want to reboot dispenser?") }) })
+            /* @__PURE__ */ i(jc, { children: /* @__PURE__ */ i(zr, { children: e("modal-heading", "Are you sure you want to reboot dispenser?") }) })
           ] }),
           /* @__PURE__ */ i(
             Ao,
@@ -6384,9 +6384,9 @@ const Dc = S.div`
   );
 }, qe = S(z)`
   text-align: center;
-`, pu = D(
+`, mu = D(
   ({ remoteTray: t, onComplete: e }) => {
-    const { t: n } = I("common", { keyPrefix: "remote-nns" }), [r, s] = T("idle"), [o, c] = T({}), [a, d] = T({}), u = t.holder.pumps.data.filter((R) => R.childPump), m = t.remoteTrayEnabled.value === !0, p = () => u.every((R) => {
+    const { t: n } = I("common", { keyPrefix: "remote-nns" }), [r, s] = T("idle"), [o, c] = T({}), [a, d] = T({}), u = t.holder.pumps.data.filter((R) => R.childPump), p = t.remoteTrayEnabled.value === !0, m = () => u.every((R) => {
       const P = o[R.name];
       return P != null && P !== "";
     }), v = V((R, P) => {
@@ -6397,8 +6397,8 @@ const Dc = S.div`
       },
       [v]
     ), h = V(async () => {
-      t.remoteTrayEnabled.updateProperty(!m), s(m ? "disableSuccess" : "success");
-    }, [m, t.remoteTrayEnabled]), _ = V(async () => {
+      t.remoteTrayEnabled.updateProperty(!p), s(p ? "disableSuccess" : "success");
+    }, [p, t.remoteTrayEnabled]), _ = V(async () => {
       s("progress"), d({});
       let R = !1;
       await Promise.all(
@@ -6417,22 +6417,22 @@ const Dc = S.div`
         })
       ), R ? s("pump") : h();
     }, [
-      m,
+      p,
       o,
       u,
       t.remoteTrayEnabled,
       h
     ]), L = F(() => ({
       idle: {
-        title: n(m ? "disable-title" : "idle-title"),
-        information: /* @__PURE__ */ i(qe, { children: n(m ? "disable-info" : "idle-info") }),
+        title: n(p ? "disable-title" : "idle-title"),
+        information: /* @__PURE__ */ i(qe, { children: n(p ? "disable-info" : "idle-info") }),
         footer: /* @__PURE__ */ i(
           w,
           {
             onPointerDown: () => {
-              m ? h() : s("pump");
+              p ? h() : s("pump");
             },
-            children: n(m ? "disable" : "enable")
+            children: n(p ? "disable" : "enable")
           }
         ),
         status: "information"
@@ -6454,7 +6454,7 @@ const Dc = S.div`
           ))
         ] }),
         footer: /* @__PURE__ */ f(N, { children: [
-          /* @__PURE__ */ i(w, { disabled: !p(), onPointerDown: _, children: n("enter") }),
+          /* @__PURE__ */ i(w, { disabled: !m(), onPointerDown: _, children: n("enter") }),
           /* @__PURE__ */ i(w, { onPointerDown: e, children: n("cancel") })
         ] })
       },
@@ -6475,7 +6475,7 @@ const Dc = S.div`
       }
     }), [
       v,
-      m,
+      p,
       e,
       o,
       a,
@@ -6485,19 +6485,19 @@ const Dc = S.div`
     ]);
     return /* @__PURE__ */ i(Nt, { ...L[r], onClose: () => e() });
   }
-), hu = D(({ cardModel: t }) => (W.debug("RemoteTray", t.name), /* @__PURE__ */ i(Fc, { holder: t.holder }))), jc = S.div`
+), hu = D(({ cardModel: t }) => (W.debug("RemoteTray", t.name), /* @__PURE__ */ i(Mc, { holder: t.holder }))), Zc = S.div`
   font-size: var(--ddk-component-holder-card-footer-font-size);
   color: ${(t) => t.color ?? "var(--ddk-generic-color-black)"};
   position: absolute;
   bottom: 6px;
 `, fu = D((t) => {
   W.debug(`summary component loaded for holder ${t}`), W.info(`render agitator summary for holder ${t.cardModel.name}`);
-  const { t: e } = I("troubles"), n = t.cardModel, { hasTroubles: r, highestTrouble: s } = Ga(n), o = Zt(s), c = Ut(s);
-  return r ? /* @__PURE__ */ i(jc, { children: e(o.summary, {
+  const { t: e } = I("troubles"), n = t.cardModel, { hasTroubles: r, highestTrouble: s } = Ja(n), o = Zt(s), c = Ut(s);
+  return r ? /* @__PURE__ */ i(Zc, { children: e(o.summary, {
     context: s != null && s.deferred ? "queued" : void 0,
     data: c
   }) }) : /* @__PURE__ */ i(Ke, { size: "small", status: "completed" });
-}), Zc = D(
+}), Uc = D(
   ({ holder: t, onComplete: e }) => {
     const { t: n } = I("replace-line"), [r, s] = T(), [o, c] = T();
     return H(() => {
@@ -6512,16 +6512,9 @@ const Dc = S.div`
       e();
     }, children: r === "failure" ? /* @__PURE__ */ i(kt, { children: n(o || "unknownError") }) : r === "success" ? /* @__PURE__ */ i(In, { children: n("success") }) : null });
   }
-), Uc = S.div`
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-  overflow-x: hidden;
-  gap: 32px;
-  height: 100%;
-`, Kc = D(
+), Kc = D(
   ({ pump: t, onComplete: e }) => {
-    const [n, r] = T(!1), { t: s } = I("replace-pump"), { componentModeOverride: o } = J(), [c, a] = T(), [d, l] = T(), [u, m] = T(), p = ce(
+    const [n, r] = T(!1), { t: s } = I("replace-pump"), { componentModeOverride: o } = J(), [c, a] = T(), [d, l] = T(), [u, p] = T(), m = ce(
       t,
       qr.type
     ), v = t.name, y = V(
@@ -6533,9 +6526,9 @@ const Dc = S.div`
     ), h = V(async () => {
       if (c === void 0)
         return;
-      const [L] = await p.replacePump(c);
-      L ? (l("failure"), m(L)) : l("success");
-    }, [p, c]), _ = () => {
+      const [L] = await m.replacePump(c);
+      L ? (l("failure"), p(L)) : l("success");
+    }, [m, c]), _ = () => {
       if (u) {
         l(void 0);
         return;
@@ -6549,7 +6542,7 @@ const Dc = S.div`
           contain: o !== "compact",
           onClosed: e,
           show: !n,
-          children: /* @__PURE__ */ f(Uc, { children: [
+          children: /* @__PURE__ */ f(Oo, { children: [
             /* @__PURE__ */ i(
               Ue,
               {
@@ -6571,7 +6564,7 @@ const Dc = S.div`
                 layout: "hex",
                 value: c,
                 onChange: (L) => {
-                  m(void 0), a(L);
+                  p(void 0), a(L);
                 }
               }
             ) }),
@@ -6598,7 +6591,7 @@ const Dc = S.div`
   height: 100%;
 `, Xc = D(
   ({ holder: t, onComplete: e }) => {
-    const n = t.name, [r, s] = T(!1), { t: o } = I("rfid-override"), { componentModeOverride: c } = J(), [a, d] = T(), [l, u] = T(), [m, p] = T(), [v, y] = T(), [h, _] = T(), L = (E) => {
+    const n = t.name, [r, s] = T(!1), { t: o } = I("rfid-override"), { componentModeOverride: c } = J(), [a, d] = T(), [l, u] = T(), [p, m] = T(), [v, y] = T(), [h, _] = T(), L = (E) => {
       if (E !== void 0 && E.length !== 12)
         return o("errIdLen");
       if (!Ar(E))
@@ -6626,7 +6619,7 @@ const Dc = S.div`
             break;
           case "errVerify":
           case "errBadJson":
-            p(E.type);
+            m(E.type);
             break;
         }
       }
@@ -6654,7 +6647,7 @@ const Dc = S.div`
           ),
           /* @__PURE__ */ f(Wc, { children: [
             /* @__PURE__ */ f(se, { align: "top", children: [
-              /* @__PURE__ */ i(Oo, { children: o("info") }),
+              /* @__PURE__ */ i(Ro, { children: o("info") }),
               /* @__PURE__ */ i(
                 ln,
                 {
@@ -6691,15 +6684,15 @@ const Dc = S.div`
                 children: o("override")
               }
             ) }),
-            m && /* @__PURE__ */ i(
+            p && /* @__PURE__ */ i(
               Lr,
               {
-                onClose: () => p(void 0),
+                onClose: () => m(void 0),
                 renderFailure: /* @__PURE__ */ i(
-                  Ro,
+                  $o,
                   {
                     heading: o("rfid-override"),
-                    message: o(m, { holder: t.name })
+                    message: o(p, { holder: t.name })
                   }
                 ),
                 show: !0,
@@ -6715,7 +6708,7 @@ const Dc = S.div`
   }
 ), gu = D(
   ({ setupPath: t }) => {
-    const { model: e } = Rn(), [n, r] = T(!1), [s] = ci(), o = !!s.get("skipSetup"), c = $o();
+    const { model: e } = Rn(), [n, r] = T(!1), [s] = di(), o = !!s.get("skipSetup"), c = Lo();
     return H(() => {
       !n && (e != null && e.setupRequired) && (r(!0), o || c(t));
     }, [e == null ? void 0 : e.setupRequired, n, c, t, o]), null;
@@ -6725,17 +6718,18 @@ const Dc = S.div`
   display: flex;
   gap: 8px;
   align-items: center;
+  padding: var(--ddk-component-setup-sidebar-step-item-padding);
 `, Yc = S.div`
-  color: var(--ddk-generic-color-grey-100, #171717);
-  font-size: var(--ddk-component-sidebar-font-size-medium);
-  font-style: normal;
-  font-weight: 600;
-  line-height: 135%;
-  letter-spacing: 0.44px;
-  white-space: nowrap;
+  color: var(--ddk-component-step-title-color);
+  font-size: var(--ddk-component-step-title-font-weight);
+  font-style: var(--ddk-component-step-title-font-weight);
+  font-weight: var(--ddk-component-step-title-font-weight);
+  line-height: var(--ddk-component-step-title-line-height);
+  letter-spacing: var(--ddk-component-step-title-letter-spacing);
+  white-space: var(--ddk-component-step-title-white-space);
   overflow: hidden;
 `, Gc = D(({ setupStepContainer: t, onStepSelected: e, ...n }) => {
-  const { t: r, labelMap: s } = Ra({
+  const { t: r, labelMap: s } = $a({
     defaultNamespace: "setup",
     extensionPoint: Bt.id
   }), o = t == null ? void 0 : t.currentStep, c = (t == null ? void 0 : t.data.map((a) => /* @__PURE__ */ f(
@@ -6757,8 +6751,8 @@ const Dc = S.div`
     },
     a.id
   ))) || [];
-  return /* @__PURE__ */ i(Lo, { ...n, children: c });
-}), yu = Ha(Gc), vu = D(() => {
+  return /* @__PURE__ */ i(Vo, { ...n, children: c });
+}), yu = Wa(Gc), vu = D(() => {
   const { model: t } = fo();
   return (t == null ? void 0 : t.nodes) && t.nodes.map((e, n) => /* @__PURE__ */ f(jr, { name: e.nodeName, children: [
     /* @__PURE__ */ i("div", { children: /* @__PURE__ */ i(
@@ -6788,9 +6782,9 @@ const Dc = S.div`
       bt.toString()
     ), [l, u] = T(
       bt.toString()
-    ), { clearFuture: m, future: p } = _e(t);
+    ), { clearFuture: p, future: m } = _e(t);
     H(() => {
-      switch (p == null ? void 0 : p.endState) {
+      switch (m == null ? void 0 : m.endState) {
         case "CANCEL":
           switch (r) {
             case "preparation-in-progress":
@@ -6818,7 +6812,7 @@ const Dc = S.div`
           c(""), s("failure");
           break;
       }
-    }, [p == null ? void 0 : p.endState, p == null ? void 0 : p.reason, r]);
+    }, [m == null ? void 0 : m.endState, m == null ? void 0 : m.reason, r]);
     const v = F(() => ({
       "preparation-idle": {
         information: /* @__PURE__ */ f(N, { children: [
@@ -6835,7 +6829,7 @@ const Dc = S.div`
             w,
             {
               onPointerDown: () => {
-                m(), t.performPreCalibrate(), s("preparation-in-progress");
+                p(), t.performPreCalibrate(), s("preparation-in-progress");
               },
               children: n("preparation-action")
             }
@@ -6865,7 +6859,7 @@ const Dc = S.div`
             w,
             {
               onPointerDown: () => {
-                m(), t.performCalibrate(), s("calibration-in-progress");
+                p(), t.performCalibrate(), s("calibration-in-progress");
               },
               children: n("calibrate")
             }
@@ -6928,7 +6922,7 @@ const Dc = S.div`
             w,
             {
               onPointerDown: async () => {
-                a !== void 0 && (m(), t.performVerify(a, p == null ? void 0 : p.clientData), s("verification-in-progress"));
+                a !== void 0 && (p(), t.performVerify(a, m == null ? void 0 : m.clientData), s("verification-in-progress"));
               },
               children: n("initiate-verification-pour")
             }
@@ -6979,11 +6973,11 @@ const Dc = S.div`
               onPointerDown: async () => {
                 if (a === void 0 || l === void 0)
                   return;
-                m();
+                p();
                 const [h, _] = await t.performComplete(
                   a,
                   l,
-                  p == null ? void 0 : p.clientData
+                  m == null ? void 0 : m.clientData
                 );
                 h ? (c(h), s("failure")) : s("verification-success");
               },
@@ -7014,9 +7008,9 @@ const Dc = S.div`
         status: "error"
       }
     }), [
-      m,
+      p,
       o,
-      p == null ? void 0 : p.clientData,
+      m == null ? void 0 : m.clientData,
       e,
       t,
       n,
@@ -7046,11 +7040,11 @@ const Dc = S.div`
           onClose: () => e()
         }
       ),
-      p && /* @__PURE__ */ i(
+      m && /* @__PURE__ */ i(
         q,
         {
           title: n(y),
-          future: p
+          future: m
         }
       )
     ] });
@@ -7078,14 +7072,14 @@ const ed = S.div``, bu = D(
           }, v;
         },
         {}
-      ), d = e == null ? void 0 : e.activeTroubleType, l = e == null ? void 0 : e.activeTrouble, u = d ? c(d) : void 0, m = u ? a[u] : void 0, p = m ? /* @__PURE__ */ i(
+      ), d = e == null ? void 0 : e.activeTroubleType, l = e == null ? void 0 : e.activeTrouble, u = d ? c(d) : void 0, p = u ? a[u] : void 0, m = p ? /* @__PURE__ */ i(
         Gr,
         {
-          ...m,
+          ...p,
           props: { trouble: l }
         }
       ) : null;
-      r(p);
+      r(m);
     }), [t, e]), /* @__PURE__ */ i(ed, { children: n });
   }
 ), td = [0, 6], nd = () => {
@@ -7118,17 +7112,17 @@ const ed = S.div``, bu = D(
   ), a = V(() => {
     o.dateActions.setYear(n.getFullYear()), o.dateActions.setMonth(n.getMonth()), o.dateActions.setDay(n.getDate());
   }, [n, o.dateActions]), d = V(
-    async ({ day: l, month: u, year: m }) => {
-      o.dateActions.setYear(m), o.dateActions.setMonth(u), o.dateActions.setDay(l), await (e == null ? void 0 : e.updateSystemDate({
+    async ({ day: l, month: u, year: p }) => {
+      o.dateActions.setYear(p), o.dateActions.setMonth(u), o.dateActions.setDay(l), await (e == null ? void 0 : e.updateSystemDate({
         day: l,
         month: u,
-        year: m
+        year: p
       })), r(/* @__PURE__ */ new Date());
     },
     [o.dateActions, e]
   );
   return /* @__PURE__ */ i(
-    qi,
+    Yi,
     {
       onDiscard: a,
       onChange: c,
@@ -7151,7 +7145,7 @@ const ed = S.div``, bu = D(
       }
     ];
     return /* @__PURE__ */ i(
-      Vo,
+      Fo,
       {
         ...t,
         label: r("time-zone"),
@@ -7175,7 +7169,7 @@ const ed = S.div``, bu = D(
     minuteOptions: a,
     setTime: d,
     time: l
-  } = Rr(), u = l.getHours(), m = F(
+  } = Rr(), u = l.getHours(), p = F(
     () => [
       {
         id: "hr",
@@ -7196,7 +7190,7 @@ const ed = S.div``, bu = D(
       }
     ],
     [s, c, a, l, u]
-  ), p = F(
+  ), m = F(
     () => [
       {
         id: "hr",
@@ -7249,7 +7243,7 @@ const ed = S.div``, bu = D(
     /* @__PURE__ */ i(
       kn,
       {
-        data: n != null && n.is12HourTimeFormat ? m : p,
+        data: n != null && n.is12HourTimeFormat ? p : m,
         icon: Kr,
         displayValue: o,
         label: e("current-time", "Current Time"),
@@ -7307,7 +7301,7 @@ export {
   ku as ActionRow,
   wd as AgitationControlView,
   kd as AgitatorDetail,
-  _i as AgitatorModal,
+  ki as AgitatorModal,
   Cd as AgitatorSummary,
   Ds as AnimationContext,
   Cl as AnimationProvider,
@@ -7315,32 +7309,32 @@ export {
   Ns as ApplicationContext,
   Il as ApplicationProvider,
   au as CGPPumpCard,
-  di as CalibrateAction,
-  Ei as CalibrateModal,
+  li as CalibrateAction,
+  Pi as CalibrateModal,
   xd as CarbTankDetail,
   _d as CarbTankSummary,
-  Ri as ConfigPropInfoCard,
+  $i as ConfigPropInfoCard,
   En as ConfigPropInputCard,
   Ge as ConfigPropInputRangeCard,
-  Ui as ConfigPropMultiInputEnableCard,
+  Ki as ConfigPropMultiInputEnableCard,
   Pn as ConfigPropPickerCard,
   Td as ConfigPropSingleInputEnableCard,
-  Ki as ConfigPropSwitchCard,
-  Wi as ConfigPropTimePickerCard,
+  Hi as ConfigPropSwitchCard,
+  Xi as ConfigPropTimePickerCard,
   Ct as ConfigPropToggleCard,
   Nn as CuiExtension,
-  ps as DashboardDetailExtension,
+  ms as DashboardDetailExtension,
   Dt as DashboardMacroSummaryExtension,
   As as DashboardOperationsContext,
   El as DashboardOperationsProvider,
   ze as DashboardPumpDetailExtension,
-  ms as DashboardSummaryExtension,
-  qi as DatePickerCard,
-  Yi as DiagnosticsModal,
+  ps as DashboardSummaryExtension,
+  Yi as DatePickerCard,
+  Gi as DiagnosticsModal,
   Os as DispenserInfoContext,
   Dl as DispenserInfoProvider,
   xl as DispenserInfoSettings,
-  Ja as DispenserSerialNumber,
+  Qa as DispenserSerialNumber,
   _l as DispenserSettings,
   Te as EXTENSION_PLUGIN_VISIBILITY,
   Wd as EXTENSION_POINT_CUI,
@@ -7372,61 +7366,61 @@ export {
   al as EXTENSION_POINT_VIEW_VIEW,
   Ps as EnjoyByDate,
   kt as FailureMessage,
-  li as Fixed45FlowTestAction,
-  ui as FlushAction,
+  ui as Fixed45FlowTestAction,
+  pi as FlushAction,
   q as FutureProgressBar,
-  wi as GenericTroubleAction,
+  xi as GenericTroubleAction,
   kl as HardwareInfo,
   mi as HighFlowTestAction,
-  pi as HoldToPourAction,
+  hi as HoldToPourAction,
   We as HoldToPourButton,
   Kt as HolderActions,
-  cc as HolderCard,
+  dc as HolderCard,
   gs as HolderContentContext,
   cl as HolderContentProvider,
   Ks as HolderGroup,
   Jl as HolderGroupView,
   Ee as HolderNotifications,
   eu as IceAgitatorDetail,
-  Pc as IceAgitatorSettings,
+  Dc as IceAgitatorSettings,
   nu as IceAgitatorSettingsContainer,
   ru as IceAgitatorSettingsView,
   tu as IceAgitatorSummary,
   Rs as IngredientSummaryContext,
   Al as IngredientSummaryProvider,
   ae as IntentAction,
-  ja as KosPluginExtensionManager,
+  Za as KosPluginExtensionManager,
   cu as LFCVPumpCard,
   su as LocalizationSettings,
-  hi as LowFlowTestAction,
+  fi as LowFlowTestAction,
   du as MSVPumpCard,
-  gi as MSVResetAction,
+  yi as MSVResetAction,
   $s as MacroAssignmentContext,
   Rl as MacroAssignmentProvider,
-  bc as MacroHolderCard,
+  wc as MacroHolderCard,
   Ql as MacroHolderGroupView,
   $n as MacroSetupStepCard,
-  fi as ManualOverrideAction,
+  gi as ManualOverrideAction,
   hs as NavViewExtension,
   Vs as NetworkTestContainerContext,
   Fl as NetworkTestContainerProvider,
   Ls as NetworkTestContext,
   Ll as NetworkTestProvider,
   ou as NetworkTestResults,
-  Rc as NotificationCardView,
-  za as PluginExtensionManager,
+  $c as NotificationCardView,
+  ja as PluginExtensionManager,
   iu as PluginTabs,
-  yi as PrimeAction,
+  vi as PrimeAction,
   ns as ProbeView,
-  vi as PurgeAction,
+  bi as PurgeAction,
   Xc as RFIDOverride,
   Fs as RebootContext,
   Bl as RebootProvider,
-  mu as RebootView,
-  pu as RemoteNNSModal,
+  pu as RebootView,
+  mu as RemoteNNSModal,
   hu as RemoteTrayDetail,
   fu as RemoteTraySummary,
-  Zc as ReplaceLine,
+  Uc as ReplaceLine,
   Kc as ReplacePump,
   Jc as SPMFieldCalibrationModal,
   Ms as SettingsContext,
@@ -7440,19 +7434,19 @@ export {
   Bs as SetupStepContext,
   Ul as SetupStepProvider,
   vu as Software,
-  Oi as StagedChangesProvider,
+  Ri as StagedChangesProvider,
   bu as StateExperience,
   qc as StepItem,
   Yc as StepTitle,
   In as SuccessMessage,
-  Fc as SuperPumpCard,
+  Mc as SuperPumpCard,
   nd as SystemDatePickerCard,
   vd as TROUBLE_PRIME,
   bd as TROUBLE_PURGE,
-  Hi as TimePickerCard,
+  Wi as TimePickerCard,
   wu as TimeSettings,
   rd as TimeZonePickerCard,
-  bi as TroubleAction,
+  wi as TroubleAction,
   tt as TroubleActionExtension,
   Zs as UtilitiesContainerContext,
   Yl as UtilitiesContainerProvider,
@@ -7462,23 +7456,23 @@ export {
   fs as ViewExtension,
   uu as WaterPumpCard,
   xu as WaterSettings,
-  pl as initDDKRegistration,
-  Ba as pumpTypeFactory,
-  Ka as troubleLabelByType,
+  ml as initDDKRegistration,
+  za as pumpTypeFactory,
+  Ha as troubleLabelByType,
   Zt as troubleLabelFactory,
   Jr as useAgitationControl,
   is as useAnimation,
   Sl as useAnimationContext,
   At as useApplication,
   Rn as useApplicationContext,
-  na as useCarbWater,
+  ra as useCarbWater,
   Id as useCombinedActions,
-  ra as useCopyLogs,
+  sa as useCopyLogs,
   as as useDashboardOperations,
   Pl as useDashboardOperationsContext,
   cs as useDispenserInfo,
   Nl as useDispenserInfoContext,
-  oa as useDoor,
+  ia as useDoor,
   _e as useFutureContainer,
   ys as useHolderContent,
   at as useHolderExperience,
@@ -7490,11 +7484,11 @@ export {
   xs as useNetworkTestContainer,
   Ml as useNetworkTestContainerContext,
   Vl as useNetworkTestContext,
-  Fa as useNutritiveSweetener,
-  Ma as usePlainWater,
+  Ma as useNutritiveSweetener,
+  Ba as usePlainWater,
   ct as usePluginExtensions,
   He as usePumpAction,
-  Wa as usePumpCalibration,
+  Xa as usePumpCalibration,
   An as useReboot,
   zl as useRebootContext,
   On as useSettings,
@@ -7504,36 +7498,36 @@ export {
   Wl as useSetupStepContainerContext,
   Kl as useSetupStepContext,
   ss as useStagedChanges,
-  Xa as useStart,
+  qa as useStart,
   Ed as useTroubleAction,
   Ss as useTroubleActionState,
   Ut as useTroubleData,
-  Ga as useTroubleDecoration,
+  Ja as useTroubleDecoration,
   vl as useTroubleVisibility,
   Ts as useUtilities,
   Is as useUtilitiesContainer,
   Gl as useUtilitiesContainerContext,
   ql as useUtilitiesContext,
-  Ra as useViewExtensions,
+  $a as useViewExtensions,
   dt as useVisibleTroubles,
   Pd as withAgitationControl,
-  ta as withAnimation,
+  na as withAnimation,
   Dd as withApplication,
   Nd as withCarbWater,
   Ad as withCopyLogs,
   Od as withDashboardOperations,
-  sa as withDispenserInfo,
+  oa as withDispenserInfo,
   Rd as withDoor,
   dl as withIngredientSummary,
-  La as withMacroAssignment,
+  Va as withMacroAssignment,
   ll as withNetworkTest,
-  Va as withNetworkTestContainer,
+  Fa as withNetworkTestContainer,
   ul as withNutritiveSweetener,
-  ml as withPlainWater,
+  pl as withPlainWater,
   hl as withReboot,
   _s as withSettings,
   fl as withSetupStep,
-  Ha as withSetupStepContainer,
+  Wa as withSetupStepContainer,
   Sd as withStagedChanges,
   gl as withStart,
   yl as withTroubleAction,