From 2cff843e881e64875b369557a26c81b33ab800d9 Mon Sep 17 00:00:00 2001 From: Bilal Date: Tue, 6 Oct 2020 09:55:59 +0300 Subject: [PATCH] rebase fix --- client/src/cash/Cash.js | 2 +- client/src/cash/MakeMoneyMove.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cash/Cash.js b/client/src/cash/Cash.js index 86fbf8f..a59ccd3 100644 --- a/client/src/cash/Cash.js +++ b/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'; diff --git a/client/src/cash/MakeMoneyMove.js b/client/src/cash/MakeMoneyMove.js index b1b5ca0..8b8ccd5 100644 --- a/client/src/cash/MakeMoneyMove.js +++ b/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);