Revert "Merge branch 'transform-currency-support' into 'master'"

This reverts merge request !14

client/src/App.js

@@ -1,75 +1,24 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import './App.css';
 import { Navbar } from 'react-materialize';
 import MakeMoneyMove from './cash/MakeMoneyMove';
 import Flow from "./homies/Flow";
 import Cash from './cash/Cash';
+import Chips from './chips/Chips';
 import Homies from './homies/Homies';
 import { BrowserRouter as Router, Route } from "react-router-dom";
 import RoutableNavItem from './common/RoutableNavItem';
-import axios from 'axios';
 import {
   CRIB,
+  CHIPS,
   MAKE_MONEY_MOVE,
   HOMIE_FLOW,
   HOMIES, PUT_IN_WORK
 } from './RouteNames';
 import PutInWork from "./cash/PutInWork";
-import ChipSelection from "./ogOnboarding/ChipSelection";
-import {errorToast} from "./common/errorHelpers";
 
 
-const App = (props) => {
-  const [loading, setLoading] = useState(true);
-  const [og, setOg] = useState({});
-
-  useEffect(() => {
-    (async() => {
-      try {
-        setLoading(true);
-        const response = await axios.get(`/api/og`);
-        if (response.status === 200 && response.data){
-          setOg(response.data);
-        }else{
-          errorToast();
-        }
-      } catch (e) {
-        errorToast();
-      }
-      setLoading(false);
-    })();
-  }, []);
-
-  const routes = ([
-    <Route key='1' exact path={CRIB} component={() => <Cash og={og} />} />,
-    <Route key='2' exact path={HOMIES} component={() => <Homies og={og} />} />,
-    <Route key='3' path={HOMIE_FLOW} component={() => <Flow og={og} />} />,
-    <Route key='4' path={MAKE_MONEY_MOVE} component={() => <MakeMoneyMove og={og} />} />
-    ]
-  );
-
-  const onboarded = () => og.chip_name && og.chip_name.length > 0;
-
-  const preloaderCircle = (
-    <div className="container">
-      <div className="valign-wrapper center-align preloader-circle">
-        <div className="preloader-wrapper big active">
-          <div className="spinner-layer spinner-blue-only">
-            <div className="circle-clipper left">
-              <div className="circle" />
-            </div>
-            <div className="gap-patch">
-              <div className="circle" />
-            </div>
-            <div className="circle-clipper right">
-              <div className="circle" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-
+function App() {
   return (
     <Router>
       <div className="navbar-fixed">
@@ -82,6 +31,10 @@ const App = (props) => {
             Homies
           </RoutableNavItem>
 
+          <RoutableNavItem href={CHIPS}>
+            Chips
+          </RoutableNavItem>
+
           <RoutableNavItem href={MAKE_MONEY_MOVE}>
             Make Money Move
           </RoutableNavItem>
@@ -96,11 +49,9 @@ const App = (props) => {
         <Route exact path={CRIB} component={Cash} />
         <Route exact path={HOMIES} component={Homies} />
         <Route path={HOMIE_FLOW} component={Flow} />
+        <Route path={CHIPS} component={Chips} />
         <Route path={MAKE_MONEY_MOVE} component={MakeMoneyMove} />
         <Route path={PUT_IN_WORK} component={PutInWork} />
-        { loading && preloaderCircle }
-        { !loading && !onboarded() && <ChipSelection /> }
-        { !loading && onboarded() && routes }
       </div>
     </Router>
   );