Show onboarding page if currency is not set

client/src/homies/CashFlow.js

@@ -7,6 +7,7 @@ import {errorToast} from "../common/errorHelpers";
 
 const CashFlow = (props) => {
   const { homie_id } = useParams();
+  const originalGangsta = props.originalGangsta;
 
   const [cashFlow, setCashFlow] = useState([]);
 
@@ -34,7 +35,7 @@ const CashFlow = (props) => {
             <div>{ dateBlock(singleFlowData['created_at']) }</div>
           </div>
 
-          <div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount) }</div>
+          <div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount, originalGangsta) }</div>
         </div>
       </div>
     </li>
@@ -57,7 +58,7 @@ const CashFlow = (props) => {
             <strong>{`${totalCount} Records`}</strong><span className="grey-text">{` • ${fromDate} - ${toDate}`}</span>
           </div>
           <div className="col s6 right-align">
-            <span className="grey-text">Total cash flow:</span> <strong>{formatMoney(totalFlow)}</strong>
+            <span className="grey-text">Total cash flow:</span> <strong>{formatMoney(totalFlow, originalGangsta)}</strong>
           </div>
         </div>
       </div>

client/src/homies/Flow.js

@@ -7,6 +7,7 @@ import WorkFlow from "./WorkFlow";
 
 const Flow = (props) => {
   const [flowType, setFlowType] = useState('cash');
+  const originalGangsta = props.originalGangsta;
 
   return (
     <div className="container">
@@ -18,7 +19,7 @@ const Flow = (props) => {
         />
       </div>
 
-      { flowType === 'cash' && <CashFlow /> }
+      { flowType === 'cash' && <CashFlow originalGangsta={originalGangsta} /> }
       { flowType === 'work' && <WorkFlow /> }
 
     </div>

client/src/homies/NewHomieForm.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { Button, Collapsible, CollapsibleItem, Select, TextInput } from 'react-materialize';
 import axios from 'axios';
 import { errorToast } from "../common/errorHelpers";
@@ -8,31 +8,11 @@ const NewHomieForm = (props) => {
   const [homieName, setHomieName] = useState("");
   const [aboutHomie, setAboutHomie] = useState("");
   const [homieImportance, setHomieImportance] = useState("");
-  const [homieDefaultChip, setHomieDefaultChip] = useState("");
-  const [chips, setChips] = useState([]);
   const [busy, setBusy] = useState(false);
 
-  useEffect(() => {
-    (async () => {
-      try {
-        const response = await axios.get('/api/chips');
-        if (response.status === 200 && response.data) {
-          setChips(response.data);
-        }else {
-          errorToast();
-        }
-      }catch (e) {
-        errorToast();
-      }
-    })();
-  }, []);
-
-  const chipOptions = chips.map((chip, index) => <option key={index} value={chip.id}>{ chip.name }</option>);
-
   const disableAddButton = () => {
     return homieName.length === 0 ||
       homieImportance === "" ||
-      homieDefaultChip === "" ||
       busy;
   }
 
@@ -40,7 +20,6 @@ const NewHomieForm = (props) => {
     setHomieName("");
     setAboutHomie("");
     setHomieImportance("");
-    setHomieDefaultChip("");
 
     const collapsible = document.getElementById('new-homie-form-container');
     const collapsibleInstance = M.Collapsible.getInstance(collapsible);
@@ -54,8 +33,7 @@ const NewHomieForm = (props) => {
       homie: {
         name: homieName,
         about: aboutHomie,
-        importance: parseInt(homieImportance),
-        chip_id: parseInt(homieDefaultChip)
+        importance: parseInt(homieImportance)
       }
     }
 
@@ -103,12 +81,6 @@ const NewHomieForm = (props) => {
             <option value={0}>Guy from the hood</option>
           </Select>
 
-          <label className="required">Homie default chip: </label>
-          <Select value={homieDefaultChip} onChange={(e) => setHomieDefaultChip(e.target.value)} name="defaultChip">
-            <option disabled value="">Set default chip</option>
-            { chipOptions }
-          </Select>
-
           <br/>
 
           <Button disabled={disableAddButton()} onClick={addNewHomie}>Add to the hood</Button>