From 8a7d54e149ec8adc097ada6e5118a9a0a542760e Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Thu, 24 May 2018 12:39:57 +0200
Subject: [PATCH] Polish and retrieve original value from balance history

---
 src/components/BalanceSummary/index.js         |  4 +++-
 src/components/CalculateBalance.js             | 14 ++++++++++++++
 src/components/CounterValue/index.js           |  4 +++-
 src/components/base/Chart/Tooltip.js           | 17 ++++++++---------
 src/components/base/Chart/handleMouseEvents.js |  2 +-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/components/BalanceSummary/index.js b/src/components/BalanceSummary/index.js
index f0edf2b5..d17c6bcb 100644
--- a/src/components/BalanceSummary/index.js
+++ b/src/components/BalanceSummary/index.js
@@ -80,7 +80,9 @@ const BalanceSummary = ({
                               fiat={counterValue}
                               val={d.value}
                             />
-                            <Box mt="auto">{d.date.toISOString().substr(0, 10)}</Box>
+                            <Box ff="Open Sans|Regular" color="grey" fontSize={3} mt={2}>
+                              {d.date.toISOString().substr(0, 10)}
+                            </Box>
                           </Fragment>
                         )
                       : null
diff --git a/src/components/CalculateBalance.js b/src/components/CalculateBalance.js
index 7c4337ce..4f430e45 100644
--- a/src/components/CalculateBalance.js
+++ b/src/components/CalculateBalance.js
@@ -26,10 +26,18 @@ type Props = OwnProps & {
 const mapStateToProps = (state: State, props: OwnProps) => {
   const counterValueCurrency = counterValueCurrencySelector(state)
   let isAvailable = true
+
+  // create array of original values, used to reconciliate
+  // with counter values after calculation
+  const originalValues = []
+
   const balanceHistory = getBalanceHistorySum(
     props.accounts,
     props.daysCount,
     (account, value, date) => {
+      // keep track of original value
+      originalValues.push(value)
+
       const cv = CounterValues.calculateSelector(state, {
         value,
         date,
@@ -44,6 +52,12 @@ const mapStateToProps = (state: State, props: OwnProps) => {
       return cv
     },
   )
+
+  // reconciliate balance history with original values
+  balanceHistory.forEach((item, i) => {
+    item.originalValue = originalValues[i] || 0
+  })
+
   return {
     isAvailable,
     balanceHistory,
diff --git a/src/components/CounterValue/index.js b/src/components/CounterValue/index.js
index 4b46b8a9..1874ee01 100644
--- a/src/components/CounterValue/index.js
+++ b/src/components/CounterValue/index.js
@@ -49,7 +49,9 @@ const mapStateToProps = (state: State, props: OwnProps) => {
 class CounterValue extends PureComponent<Props> {
   render() {
     const { value, counterValueCurrency, date, ...props } = this.props
-    if (!value && value !== 0) return null
+    if (!value && value !== 0) {
+      return null
+    }
     return (
       <FormattedVal
         val={value}
diff --git a/src/components/base/Chart/Tooltip.js b/src/components/base/Chart/Tooltip.js
index 7ea0e93f..bbbe9ac1 100644
--- a/src/components/base/Chart/Tooltip.js
+++ b/src/components/base/Chart/Tooltip.js
@@ -5,7 +5,6 @@ import styled from 'styled-components'
 
 import type { Account } from '@ledgerhq/live-common/lib/types'
 
-import CounterValue from 'components/CounterValue'
 import FormattedVal from 'components/base/FormattedVal'
 import Box from 'components/base/Box'
 
@@ -20,7 +19,6 @@ const Container = styled(Box).attrs({
   border: 1px solid #d8d8d8;
   border-radius: 4px;
   width: 150px;
-  height: 90px;
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.03);
 `
 
@@ -54,17 +52,18 @@ const Tooltip = ({
               fontSize={5}
               alwaysShowSign={false}
               showCode
-              unit={account.currency.units[0]}
+              fiat="USD"
               val={item.value}
             />
-            <CounterValue
-              account={account}
-              currency={account.currency}
-              value={item.value}
-              disableRounding
+            <FormattedVal
+              color="grey"
+              fontSize={3}
+              alwaysShowSign={false}
               showCode
+              unit={account.unit}
+              val={item.originalValue}
             />
-            <Box ff="Open Sans|Regular" color="grey" fontSize={3} mt="auto">
+            <Box ff="Open Sans|Regular" color="grey" fontSize={3} mt={2}>
               {item.date.toISOString().substr(0, 10)}
             </Box>
           </Fragment>
diff --git a/src/components/base/Chart/handleMouseEvents.js b/src/components/base/Chart/handleMouseEvents.js
index b30c7742..9809b066 100644
--- a/src/components/base/Chart/handleMouseEvents.js
+++ b/src/components/base/Chart/handleMouseEvents.js
@@ -100,7 +100,7 @@ export default function handleMouseEvents({
     NODES.xBar
       .attr('x1', x(d.parsedDate))
       .attr('x2', x(d.parsedDate))
-      .attr('y1', 0)
+      .attr('y1', -30) // ensure that xbar is covered
       .attr('y2', HEIGHT)
   }