Set mix and delay max range, fix touchtip copy

Opentrons · Aug 7, 2024 · 69d5d3e · 69d5d3e
1 parent 3b310dc
commit 69d5d3e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/app/src/organisms/QuickTransferFlow/QuickTransferAdvancedSettings/Delay.tsx b/app/src/organisms/QuickTransferFlow/QuickTransferAdvancedSettings/Delay.tsx
@@ -138,9 +138,19 @@ export function Delay(props: DelayProps): JSX.Element {
         })
       : null
 
+  // allow a maximum of 10 digits for delay duration
+  const durationRange = { min: 1, max: 9999999999 }
+  const durationError =
+    delayDuration != null &&
+    (delayDuration < durationRange.min || delayDuration > durationRange.max)
+      ? t(`value_out_of_range`, {
+          min: durationRange.min,
+          max: durationRange.max,
+        })
+      : null
   let buttonIsDisabled = false
   if (currentStep === 2) {
-    buttonIsDisabled = delayDuration == null
+    buttonIsDisabled = delayDuration == null || durationError != null
   } else if (currentStep === 3) {
     buttonIsDisabled = positionError != null || position == null
   }
@@ -199,6 +209,7 @@ export function Delay(props: DelayProps): JSX.Element {
             <InputField
               type="number"
               value={delayDuration}
+              error={durationError}
               title={t('delay_duration_s')}
               readOnly
             />

diff --git a/app/src/organisms/QuickTransferFlow/QuickTransferAdvancedSettings/Mix.tsx b/app/src/organisms/QuickTransferFlow/QuickTransferAdvancedSettings/Mix.tsx
@@ -118,11 +118,21 @@ export function Mix(props: MixProps): JSX.Element {
         })
       : null
 
+  const repititionRange = { min: 1, max: 999 }
+  const repititionError =
+    mixReps != null &&
+    (mixReps < repititionRange.min || mixReps > repititionRange.max)
+      ? t(`value_out_of_range`, {
+          min: repititionRange.min,
+          max: repititionRange.max,
+        })
+      : null
+
   let buttonIsDisabled = false
   if (currentStep === 2) {
     buttonIsDisabled = mixVolume == null || volumeError != null
   } else if (currentStep === 3) {
-    buttonIsDisabled = mixReps == null
+    buttonIsDisabled = mixReps == null || repititionError != null
   }
 
   return createPortal(
@@ -219,6 +229,7 @@ export function Mix(props: MixProps): JSX.Element {
             <InputField
               type="number"
               value={mixReps}
+              error={repititionError}
               title={t('mix_repetitions')}
               readOnly
             />

diff --git a/app/src/organisms/QuickTransferFlow/QuickTransferAdvancedSettings/TouchTip.tsx b/app/src/organisms/QuickTransferFlow/QuickTransferAdvancedSettings/TouchTip.tsx
@@ -183,7 +183,7 @@ export function TouchTip(props: TouchTipProps): JSX.Element {
             <InputField
               type="number"
               value={position}
-              title={t('delay_position_mm')}
+              title={t('touch_tip_position_mm')}
               error={positionError}
               readOnly
             />