Safe view tabs as routes wip

src/routes/safe/components/Layout.jsx

@@ -1,6 +1,7 @@
 // @flow
 import * as React from 'react'
 import classNames from 'classnames/bind'
+import { Switch, Redirect, Route } from 'react-router-dom'
 import OpenInNew from '@material-ui/icons/OpenInNew'
 import Tabs from '@material-ui/core/Tabs'
 import Tab from '@material-ui/core/Tab'
@@ -21,9 +22,7 @@ import Receive from './Balances/Receive'
 import NoSafe from '~/components/NoSafe'
 import { type SelectorProps } from '~/routes/safe/container/selector'
 import { getEtherScanLink } from '~/logic/wallets/getWeb3'
-import {
+import { secondary, border } from '~/theme/variables'
-  secondary, border,
-} from '~/theme/variables'
 import { copyToClipboard } from '~/utils/clipboard'
 import { type Actions } from '../container/actions'
 import Balances from './Balances'
@@ -49,7 +48,7 @@ type Props = SelectorProps &
     onShow: Function,
     onHide: Function,
     showSendFunds: Function,
-    hideSendFunds: Function
+    hideSendFunds: Function,
   }
 
 const openIconStyle = {
@@ -99,6 +98,7 @@ class Layout extends React.Component<Props, State> {
       showSendFunds,
       hideSendFunds,
     } = this.props
+    console.log(this.props)
     const { tabIndex } = this.state
 
     if (!safe) {
@@ -139,7 +139,7 @@ class Layout extends React.Component<Props, State> {
                 disabled={!granted}
               >
                 <CallMade alt="Send Transaction" className={classNames(classes.leftIcon, classes.iconSmall)} />
-                  Send
+                Send
               </Button>
               <Button
                 variant="contained"
@@ -149,7 +149,7 @@ class Layout extends React.Component<Props, State> {
                 onClick={onShow('Receive')}
               >
                 <CallReceived alt="Receive Transaction" className={classNames(classes.leftIcon, classes.iconSmall)} />
-                  Receive
+                Receive
               </Button>
             </Row>
           </Block>
@@ -162,46 +162,61 @@ class Layout extends React.Component<Props, State> {
           </Tabs>
         </Row>
         <Hairline color={border} style={{ marginTop: '-2px' }} />
-        {tabIndex === 0 && (
+        <Switch>
-          <Balances
+          <Route
-            ethBalance={ethBalance}
+            exact
-            tokens={tokens}
+            path="balances"
-            activeTokens={activeTokens}
+            render={() => (
-            granted={granted}
+              <Balances
-            safeAddress={address}
+                ethBalance={ethBalance}
-            safeName={name}
+                tokens={tokens}
-            etherScanLink={etherScanLink}
+                activeTokens={activeTokens}
-            createTransaction={createTransaction}
+                granted={granted}
+                safeAddress={address}
+                safeName={name}
+                etherScanLink={etherScanLink}
+                createTransaction={createTransaction}
+              />
+            )}
           />
-        )}
+          <Route
-        {tabIndex === 1 && (
+            exact
-          <Transactions
+            path="transactions"
-            threshold={safe.threshold}
+            render={() => (
-            owners={safe.owners}
+              <Transactions
-            transactions={transactions}
+                threshold={safe.threshold}
-            fetchTransactions={fetchTransactions}
+                owners={safe.owners}
-            safeAddress={address}
+                transactions={transactions}
-            userAddress={userAddress}
+                fetchTransactions={fetchTransactions}
-            currentNetwork={network}
+                safeAddress={address}
-            granted={granted}
+                userAddress={userAddress}
-            createTransaction={createTransaction}
+                currentNetwork={network}
-            processTransaction={processTransaction}
+                granted={granted}
+                createTransaction={createTransaction}
+                processTransaction={processTransaction}
+              />
+            )}
           />
-        )}
+          <Route
-        {tabIndex === 2 && (
+            exact
-          <Settings
+            path="settings"
-            granted={granted}
+            render={() => (
-            safeAddress={address}
+              <Settings
-            safeName={name}
+                granted={granted}
-            etherScanLink={etherScanLink}
+                safeAddress={address}
-            updateSafe={updateSafe}
+                safeName={name}
-            threshold={safe.threshold}
+                etherScanLink={etherScanLink}
-            owners={safe.owners}
+                updateSafe={updateSafe}
-            network={network}
+                threshold={safe.threshold}
-            userAddress={userAddress}
+                owners={safe.owners}
-            createTransaction={createTransaction}
+                network={network}
+                userAddress={userAddress}
+                createTransaction={createTransaction}
+              />
+            )}
           />
-        )}
+          <Redirect to="balances" />
+        </Switch>
         <SendModal
           onClose={hideSendFunds}
           isOpen={sendFunds.isOpen}
@@ -221,12 +236,7 @@ class Layout extends React.Component<Props, State> {
           open={showReceive}
           paperClassName={classes.receiveModal}
         >
-          <Receive
+          <Receive safeName={name} safeAddress={address} etherScanLink={etherScanLink} onClose={onHide('Receive')} />
-            safeName={name}
-            safeAddress={address}
-            etherScanLink={etherScanLink}
-            onClose={onHide('Receive')}
-          />
         </Modal>
       </>
     )