M app/src/containers/PassengersList/index.js → app/src/containers/PassengersList/index.js

@@ -9,9 +9,8 @@ import Input from './Input';
 import Passenger from './Passenger';
 
 const PassengersList = ({
-  hideEmpty,
   passengers,
-  places = 0,
+  places,
   addPassenger,
   icon,
   onClick,
@@ -22,14 +21,12 @@ const classes = useStyles();
 
   let list = passengers;
 
-  if (!hideEmpty) {
+  if (!!places) {
     const emptyList = [...Array(places)];
     list = Array.isArray(passengers)
       ? emptyList.map((u, index) => passengers[index])
       : emptyList;
   }
-
-  const emptyPlaces = !!passengers ? places - passengers.length : places;
 
   const button = index => {
     return !!onClick ? (
@@ -45,10 +42,13 @@ };
 
   return (
     <div className={classes.container}>
-      {emptyPlaces > 0 && <Input addPassenger={addPassenger} />}
+      {(!!places
+        ? !!passengers
+          ? places - passengers.length > 0
+          : places > 0
+        : true) && <Input addPassenger={addPassenger} />}
       <List disablePadding>
-        {!!places &&
-          !!list &&
+        {!!list &&
           list.map((passenger, index) => (
             <ListItem
               key={index}

M app/src/containers/WaitingList/index.js → app/src/containers/WaitingList/index.js

@@ -86,6 +86,11 @@ }
     setAdding(null);
   };
 
+  const onPress = index => {
+    if (isEditing) setRemoving(index);
+    else setAdding(index);
+  };
+
   return (
     <>
       <Paper className={classes.root}>
@@ -104,27 +109,13 @@ {t('passenger.availability.seats', {count: availability})}
           </Typography>
         </div>
         <Divider />
-        {isEditing ? (
-          <PassengersList
-            hideEmpty
-            places={Number.MAX_SAFE_INTEGER}
-            passengers={passengers}
-            addPassenger={addPassenger}
-            onPress={setRemoving}
-            icon={'close'}
-            disabled={false}
-          />
-        ) : (
-          <PassengersList
-            hideEmpty
-            places={Number.MAX_SAFE_INTEGER}
-            passengers={passengers}
-            addPassenger={addPassenger}
-            onPress={setAdding}
-            icon={'chevron_right'}
-            disabled={availability <= 0}
-          />
-        )}
+        <PassengersList
+          passengers={passengers}
+          addPassenger={addPassenger}
+          onPress={onPress}
+          icon={isEditing ? 'close' : 'chevron_right'}
+          disabled={!isEditing && availability <= 0}
+        />
       </Paper>
       <RemoveDialog
         text={