Merge branch 'dev' into f56-billl-denominations

new-lamassu-admin/src/pages/Cashout/Wizard.js

@@ -17,7 +17,7 @@ const MODAL_WIDTH = 554
 const MODAL_HEIGHT = 520
 
 const Wizard = ({ machine, locale, onClose, save, error }) => {
-  const LAST_STEP = machine.numberOfCassettes + 2
+  const LAST_STEP = machine.numberOfCassettes + 1
   const [{ step, config }, setState] = useState({
     step: 0,
     config: { active: true }
@@ -46,34 +46,21 @@ const Wizard = ({ machine, locale, onClose, save, error }) => {
     })
   }
 
-  const steps = []
 
-  R.until(
-    R.gt(R.__, machine.numberOfCassettes),
-    it => {
-      steps.push({
-        type: `cassette${it}`,
-        display: `Cassette ${it}`,
-        component: Autocomplete,
-        inputProps: {
-          options: options,
-          labelProp: 'display',
-          valueProp: 'code'
-        }
-      })
-      return R.add(1, it)
-    },
-    1
+  const steps = R.map(
+    it => ({
+      type: `cassette${it}`,
+      display: `Cassette ${it}`,
+      component: Autocomplete,
+      inputProps: {
+        options: options,
+        labelProp: 'display',
+        valueProp: 'code'
+      }
+    }),
+    R.range(1, machine.numberOfCassettes + 1)
   )
 
-  steps.push({
-    type: 'zeroConfLimit',
-    display: '0-conf Limit',
-    schema: Yup.object().shape({
-      zeroConfLimit: Yup.number().required()
-    })
-  })
-
   const schema = () =>
     Yup.object().shape({
       cassette1: Yup.number().required(),
@@ -113,7 +100,7 @@ const Wizard = ({ machine, locale, onClose, save, error }) => {
           name={machine.name}
           numberOfCassettes={machine.numberOfCassettes}
           error={error}
-          lastStep={isLastStep}
+          isLastStep={isLastStep}
           steps={steps}
           fiatCurrency={locale.fiatCurrency}
           options={options}