From 15606790276ac8f3d10596024e01293d43464592 Mon Sep 17 00:00:00 2001
From: Manuel Calavera <diserkin@gmail.com>
Date: Fri, 1 Nov 2019 15:27:30 -0700
Subject: [PATCH] fix: minor accounts details component and store refactoring

---
 src/v2/components/Accounts/Detail/index.jsx | 74 +++++++++++----------
 src/v2/components/Accounts/Detail/styles.js |  3 +
 src/v2/stores/accounts/detail.js            | 21 +++---
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/v2/components/Accounts/Detail/index.jsx b/src/v2/components/Accounts/Detail/index.jsx
index f05bb9d9..2d51e6b7 100644
--- a/src/v2/components/Accounts/Detail/index.jsx
+++ b/src/v2/components/Accounts/Detail/index.jsx
@@ -2,15 +2,14 @@
 import {observer} from 'mobx-react-lite';
 import {Container, Tabs, useTheme} from '@material-ui/core';
 import useMediaQuery from '@material-ui/core/useMediaQuery/useMediaQuery';
-import {map, eq} from 'lodash/fp';
-import React, {useState} from 'react';
+import {map} from 'lodash/fp';
+import React, {useEffect, useState} from 'react';
 import {Match} from 'react-router-dom';
 import SectionHeader from 'v2/components/UI/SectionHeader';
 import QRPopup from 'v2/components/QRPopup';
 import CopyBtn from 'v2/components/UI/CopyBtn';
 import Loader from 'v2/components/UI/Loader';
 import AccountDetailStore from 'v2/stores/accounts/detail';
-import {LAMPORT_SOL_RATIO} from 'v2/constants';
 import TabNav from 'v2/components/UI/TabNav';
 import AddToFavorites from 'v2/components/AddToFavorites';
 import InfoRow from 'v2/components/InfoRow';
@@ -26,20 +25,25 @@ const AccountDetail = ({match}: {match: Match}) => {
   const {
     isLoading,
     accountId,
-    accountInfo = {},
+    accountInfo,
     accountView,
+    init,
   } = AccountDetailStore;
 
-  if (accountId !== match.params.id) {
-    AccountDetailStore.init({accountId: match.params.id});
-  }
+  useEffect(() => {
+    init({accountId: match.params.id});
+  }, [init, match.params.id]);
 
   const [tab, setTab] = useState(0);
   const theme = useTheme();
   const verticalTable = useMediaQuery(theme.breakpoints.down('xs'));
 
   if (isLoading) {
-    return <Loader width="533" height="290" />;
+    return (
+      <Container className={classes.loader}>
+        <Loader width="533" height="290" />
+      </Container>
+    );
   }
 
   const handleTabChange = (event, tab) => setTab(tab);
@@ -48,9 +52,7 @@ const AccountDetail = ({match}: {match: Match}) => {
     {
       label: 'Balance',
       hint: '',
-      value: `${((accountInfo.lamports || 0) * LAMPORT_SOL_RATIO).toFixed(
-        8,
-      )} SOL`,
+      value: `${accountInfo.balance} SOL`,
     },
     {
       label: 'Transactions',
@@ -72,7 +74,11 @@ const AccountDetail = ({match}: {match: Match}) => {
   const renderSpec = info => <InfoRow key={info.label} {...info} />;
 
   const tabNav = ['transaction', 'analytics', 'code/source'];
-
+  const tabs = {
+    0: <Transactions transactions={[]} />,
+    1: <Chart />,
+    2: <AccountCode accountView={accountView} />,
+  };
   const renderTabNav = label => <TabNav key={label} label={label} />;
   const url = currentURL();
   const favoritesData = {
@@ -82,32 +88,28 @@ const AccountDetail = ({match}: {match: Match}) => {
 
   return (
     <Container>
-      <div className={classes.root}>
-        <SectionHeader title="Account Detail">
-          <div className={classes.programTitle}>
-            <span>{accountId}</span>
-            <CopyBtn text={accountId} />
-            <QRPopup url={url} />
-            <AddToFavorites item={favoritesData} type="accounts" />
-          </div>
-        </SectionHeader>
-        <div className={classes.body}>
-          <div className={classes.spec}>{map(renderSpec)(specs)}</div>
+      <SectionHeader title="Account Detail">
+        <div className={classes.programTitle}>
+          <span>{accountId}</span>
+          <CopyBtn text={accountId} />
+          <QRPopup url={url} />
+          <AddToFavorites item={favoritesData} type="accounts" />
         </div>
-        <Tabs
-          orientation={verticalTable ? 'vertical' : 'horizontal'}
-          className={classes.tabs}
-          classes={{indicator: classes.indicator}}
-          value={tab}
-          variant="fullWidth"
-          onChange={handleTabChange}
-        >
-          {map(renderTabNav)(tabNav)}
-        </Tabs>
-        {eq(0, tab) && <Transactions transactions={[]} />}
-        {eq(1, tab) && <Chart />}
-        {eq(2, tab) && <AccountCode accountView={accountView} />}
+      </SectionHeader>
+      <div className={classes.body}>
+        <div className={classes.spec}>{map(renderSpec)(specs)}</div>
       </div>
+      <Tabs
+        orientation={verticalTable ? 'vertical' : 'horizontal'}
+        className={classes.tabs}
+        classes={{indicator: classes.indicator}}
+        value={tab}
+        variant="fullWidth"
+        onChange={handleTabChange}
+      >
+        {map(renderTabNav)(tabNav)}
+      </Tabs>
+      {tabs[tab]}
     </Container>
   );
 };
diff --git a/src/v2/components/Accounts/Detail/styles.js b/src/v2/components/Accounts/Detail/styles.js
index 5c561d36..eae862b2 100644
--- a/src/v2/components/Accounts/Detail/styles.js
+++ b/src/v2/components/Accounts/Detail/styles.js
@@ -40,4 +40,7 @@ export default makeStyles(theme => ({
   indicator: {
     display: 'none',
   },
+  loader: {
+    marginTop: 40,
+  },
 }));
diff --git a/src/v2/stores/accounts/detail.js b/src/v2/stores/accounts/detail.js
index 6610a09d..d0f936a9 100644
--- a/src/v2/stores/accounts/detail.js
+++ b/src/v2/stores/accounts/detail.js
@@ -1,8 +1,14 @@
 import {action, flow, observable, decorate} from 'mobx';
 import {apiGetAccountDetail} from 'v2/api/accounts';
+import {LAMPORT_SOL_RATIO} from 'v2/constants';
+
+const extendAccountInfo = (account = {}) => ({
+  ...account,
+  balance: ((account.lamports || 0) * LAMPORT_SOL_RATIO).toFixed(8),
+});
 
 class Store {
-  isLoading = false;
+  isLoading = true;
   accountId = null;
   accountView = {};
   accountInfo = {};
@@ -13,16 +19,12 @@ class Store {
     this.setLoading(true);
     this.accountId = accountId;
 
-    if (this.accountInfo.pubkey) {
-      return this.accountInfo;
-    }
-
     const res = yield apiGetAccountDetail({accountId});
-
+    const {accountInfo, programAccounts, timestamp} = res.data;
     this.accountView = res.data;
-    this.accountInfo = res.data.accountInfo;
-    this.programAccounts.replace(res.data.programAccounts);
-    this.timestamp = res.data.timestamp;
+    this.accountInfo = extendAccountInfo(accountInfo);
+    this.programAccounts.replace(programAccounts);
+    this.timestamp = timestamp;
     this.setLoading(false);
 
     return res;
@@ -35,6 +37,7 @@ class Store {
 
 decorate(Store, {
   setLoading: action.bound,
+  init: action.bound,
   isLoading: observable,
   accountInfo: observable,
   programAccounts: observable,