diff --git a/package.json b/package.json
index f085da15..4a030d08 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
"history": "^4.7.2",
"i18next": "^10.5.0",
"i18next-node-fs-backend": "^1.0.0",
- "ledger-test-library": "KhalilBellakrid/ledger-test-library-nodejs",
+ "ledger-test-library": "KhalilBellakrid/ledger-test-library-nodejs#7d37482",
"lodash": "^4.17.5",
"moment": "^2.20.1",
"object-path": "^0.11.4",
@@ -118,7 +118,7 @@
"chance": "^1.0.13",
"concurrently": "^3.5.1",
"dotenv": "^5.0.1",
- "electron": "1.8.2",
+ "electron": "1.8.3",
"electron-builder": "^20.2.0",
"electron-devtools-installer": "^2.2.3",
"electron-rebuild": "^1.7.3",
diff --git a/src/components/SelectAccount/index.js b/src/components/SelectAccount/index.js
index 37d4df94..59c5f426 100644
--- a/src/components/SelectAccount/index.js
+++ b/src/components/SelectAccount/index.js
@@ -9,11 +9,10 @@ import noop from 'lodash/noop'
import type { MapStateToProps } from 'react-redux'
import type { T, Accounts, Account } from 'types/common'
-import { formatBTC } from 'helpers/format'
-
import { getVisibleAccounts } from 'reducers/accounts'
import Select from 'components/base/Select'
+import FormattedVal from 'components/base/FormattedVal'
import Box from 'components/base/Box'
import Text from 'components/base/Text'
@@ -21,17 +20,15 @@ const mapStateToProps: MapStateToProps<*, *, *> = state => ({
accounts: getVisibleAccounts(state),
})
-const renderItem = item => (
+const renderItem = a => (
- {item.name}
+ {a.name}
-
- {formatBTC(item.balance)}
-
+
)
diff --git a/src/components/base/Chart/index.js b/src/components/base/Chart/index.js
index 66f6633e..ead27c5d 100644
--- a/src/components/base/Chart/index.js
+++ b/src/components/base/Chart/index.js
@@ -2,20 +2,19 @@
/* eslint-disable react/no-multi-comp */
-import React, { Fragment, PureComponent } from 'react'
+import React, { Fragment, Component, PureComponent } from 'react'
import {
VictoryChart,
VictoryArea,
VictoryAxis,
VictoryTooltip,
VictoryVoronoiContainer,
- VictoryLabel,
} from 'victory'
-import { radii, space, colors, fontSizes } from 'styles/theme'
-import { ff } from 'styles/helpers'
+import { space, colors, fontSizes } from 'styles/theme'
import Box from 'components/base/Box'
+import { TooltipContainer } from 'components/base/Tooltip'
const ANIMATION_DURATION = 600
const DEFAULT_PROPS = {
@@ -112,6 +111,36 @@ function getLinearGradient({
) : null
}
+class CustomTooltip extends Component