rebase fix

client/src/cash/Cash.js

@@ -5,7 +5,7 @@ import axios from 'axios';
 import { MAKE_MONEY_MOVE } from '../RouteNames';
 import { withRouter } from 'react-router-dom';
 import { formatMoney, formatTime } from '../common/formatting';
-import YesNoModal from "../common/YesNoModal";
+import InputModal from "../common/InputModal";
 import { errorToast } from "../common/errorHelpers";
 import M from 'materialize-css';
 

client/src/cash/MakeMoneyMove.js

@@ -16,7 +16,7 @@ const MakeMoneyMove = (props) => {
     useEffect(() => {
         const getCashForHomies = async () => {
             try {
-                const cash = await axios.get(`/api/homies/cash`);
+                const cash = await axios.get(`/api/homies/info`);
                 setHomiesCash(cash.data);
             } catch (e) {
                 console.log("Error fetching", e);