diff --git a/client/src/cash/MakeMoneyMove.js b/client/src/cash/MakeMoneyMove.js index ac8f499..b1b5ca0 100644 --- a/client/src/cash/MakeMoneyMove.js +++ b/client/src/cash/MakeMoneyMove.js @@ -7,9 +7,9 @@ import axios from 'axios'; const MakeMoneyMove = (props) => { const [selectedFrom, setSelectedFrom] = useState(""); - const [selectedTo, setSelectedTo] = useState(""); + const [selectedTo, setSelectedTo] = useState("-1"); const [homiesCash, setHomiesCash] = useState([]); - const [amountToMove, setAmountToMove] = useState(null); + const [amountToMove, setAmountToMove] = useState(''); const [moveDescription, setMoveDescription] = useState(""); const [submitInProgress, setSubmitInProgress] = useState(false); @@ -40,9 +40,26 @@ const MakeMoneyMove = (props) => { const handleFromHomieChange = (e) => { setSelectedFrom(e.target.value); + + if (selectedTo === e.target.value) { + setSelectedTo('-1'); + } }; - const filteredHomieCashes = homiesCash.filter((homieCash) => homieCash.homie.id !== parseInt(selectedFrom)); - const filteredHomieOptions = filteredHomieCashes.map(homieToOptionMapper); + + const notSayingOption = + + const filteredHomieOptions = () => { + if (selectedFrom === ''){ + return homiesCash.map(homieToOptionMapper); + }else{ + const filteredHomieCashes = homiesCash.filter((homieCash) => homieCash.homie.id !== parseInt(selectedFrom)); + return [ + notSayingOption, + ...filteredHomieCashes.map(homieToOptionMapper) + ]; + } + + } const handleToHomieChange = (e) => { setSelectedTo(e.target.value); @@ -84,7 +101,7 @@ const MakeMoneyMove = (props) => { const formComplete = () => ( selectedFrom !== selectedTo && - selectedTo !== "" && + selectedTo !== '-1' && amountToMove > 0 ); @@ -101,16 +118,16 @@ const MakeMoneyMove = (props) => { - + - +