diff --git a/electron-builder.yml b/electron-builder.yml index bde2f549..317554a5 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -43,7 +43,23 @@ nsis: files: - dist/internals - - "!node_modules/jsqr/test-data${/*}" - - "!node_modules/ledger-test-library/deps/djinni${/*}" - - "!node_modules/ledger-test-library/deps/gyp${/*}" - - "!node_modules/raven-js/dist${/*}" + - "!node_modules/7zip-bin-linux" + - "!node_modules/7zip-bin-mac" + - "!node_modules/7zip-bin-win" + - "!node_modules/app-builder-bin-linux" + - "!node_modules/app-builder-bin-mac" + - "!node_modules/app-builder-bin-win" + - "!node_modules/app-builder-util" + - "!node_modules/builder-util" + - "!node_modules/dmg-builder" + - "!node_modules/electron-builder-lib" + - "!node_modules/electron-rebuild" + - "!node_modules/electron" + - "!node_modules/jsqr/test-data" + - "!node_modules/ledger-test-library/deps/djinni" + - "!node_modules/ledger-test-library/deps/gyp" + - "!node_modules/node-gyp" + - "!node_modules/opencollective" + - "!node_modules/raven-js/dist" + - "!node_modules/rxjs" + - "!node_modules/victory-pie" diff --git a/package.json b/package.json index 4a030d08..cc6da6b0 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@fortawesome/fontawesome-free-solid": "^5.0.7", "@fortawesome/react-fontawesome": "^0.0.17", "@ledgerhq/common": "^4.2.0", - "@ledgerhq/currencies": "^4.3.0-beta.f8165b69", + "@ledgerhq/currencies": "^4.5.0", "@ledgerhq/hw-app-btc": "^4.2.2", "@ledgerhq/hw-app-eth": "^4.2.0", "@ledgerhq/hw-transport": "^4.2.0", @@ -107,7 +107,7 @@ "@storybook/react": "^3.3.14", "babel-core": "^6.26.0", "babel-eslint": "^8.2.1", - "babel-loader": "^7.1.3", + "babel-loader": "^7.1.4", "babel-plugin-module-resolver": "^3.1.0", "babel-plugin-styled-components": "^1.5.0", "babel-preset-env": "^1.6.1", @@ -121,7 +121,6 @@ "electron": "1.8.3", "electron-builder": "^20.2.0", "electron-devtools-installer": "^2.2.3", - "electron-rebuild": "^1.7.3", "electron-webpack": "1.13.0", "eslint": "^4.18.1", "eslint-config-airbnb": "^16.1.0", diff --git a/src/components/BalanceSummary/index.js b/src/components/BalanceSummary/index.js index b979b497..236d5084 100644 --- a/src/components/BalanceSummary/index.js +++ b/src/components/BalanceSummary/index.js @@ -3,7 +3,7 @@ import React, { Fragment } from 'react' import moment from 'moment' -import { formatShort, formatCurrencyUnit, getFiatUnit } from '@ledgerhq/currencies' +import { formatShort, getFiatUnit } from '@ledgerhq/currencies' import type { Accounts } from 'types/common' @@ -12,6 +12,7 @@ import { space } from 'styles/theme' import { AreaChart } from 'components/base/Chart' import Box, { Card } from 'components/base/Box' import CalculateBalance from 'components/CalculateBalance' +import FormattedVal from 'components/base/FormattedVal' function getTickCountX(selectedTime) { switch (selectedTime) { @@ -88,11 +89,16 @@ const BalanceSummary = ({ right: space[6], }} strokeWidth={2} - renderLabels={d => - formatCurrencyUnit(unit, d.y * 100, { - showCode: true, - }) - } + renderLabels={d => d.y} + renderTooltip={d => ( + + )} renderTickX={renderTickX(selectedTime)} renderTickY={t => formatShort(unit, t)} tickCountX={getTickCountX(selectedTime)} diff --git a/src/components/DevTools.js b/src/components/DevTools.js index 1ca4312d..94ab46b2 100644 --- a/src/components/DevTools.js +++ b/src/components/DevTools.js @@ -5,7 +5,7 @@ import React, { PureComponent } from 'react' import { remote, ipcRenderer } from 'electron' import { translate } from 'react-i18next' -import { VictoryArea } from 'victory' +import VictoryArea from 'victory-chart/lib/components/victory-area/victory-area' import styled from 'styled-components' import color from 'color' import fs from 'fs' diff --git a/src/components/base/Chart/index.js b/src/components/base/Chart/index.js index d3324d5c..c5a5f3ae 100644 --- a/src/components/base/Chart/index.js +++ b/src/components/base/Chart/index.js @@ -3,17 +3,17 @@ /* eslint-disable react/no-multi-comp */ import React, { Fragment, Component, PureComponent } from 'react' -import { - VictoryChart, - VictoryArea, - VictoryAxis, - VictoryTooltip, - VictoryVoronoiContainer, -} from 'victory' + +import VictoryChart from 'victory-chart/lib/components/victory-chart/victory-chart' +import VictoryArea from 'victory-chart/lib/components/victory-area/victory-area' +import VictoryAxis from 'victory-chart/lib/components/victory-axis/victory-axis' +import VictoryTooltip from 'victory-core/lib/victory-tooltip/victory-tooltip' +import VictoryVoronoiContainer from 'victory-chart/lib/components/containers/victory-voronoi-container' import { space, colors, fontSizes } from 'styles/theme' import Box from 'components/base/Box' +import Text from 'components/base/Text' import { TooltipContainer } from 'components/base/Tooltip' const ANIMATION_DURATION = 600 @@ -122,7 +122,7 @@ class CustomTooltip extends Component { } render() { - const { x, y, active, text, datum } = this.props + const { x, y, active, text, datum, renderer } = this.props if (!active) { return null @@ -134,7 +134,7 @@ class CustomTooltip extends Component { mt={-space[1]} style={{ position: 'absolute', top: y, left: x, transform: `translate3d(-50%, 0, 0)` }} > - {text(datum)} + {renderer(text(datum))} ) @@ -152,13 +152,6 @@ type GenericChart = { color: string, data: Array, } -type Chart = GenericChart & { - renderLabels: Function, - renderTickX: Function, - renderTickY: Function, - tickCountX: number, - tickCountY: number, -} export const SimpleAreaChart = ({ linearGradient, @@ -209,7 +202,14 @@ SimpleAreaChart.defaultProps = { ...DEFAULT_PROPS, } -const areaChartTooltip = +type Chart = GenericChart & { + renderLabels: Function, + renderTickX: Function, + renderTickY: Function, + renderTooltip: Function, + tickCountX: number, + tickCountY: number, +} const AreaChartContainer = @@ -225,6 +225,8 @@ export class AreaChart extends PureComponent { ...DEFAULT_PROPS, } + _tooltip = + render() { const { color, @@ -303,7 +305,7 @@ export class AreaChart extends PureComponent { data={data} x="name" y="value" - labelComponent={areaChartTooltip} + labelComponent={this._tooltip} labels={renderLabels} style={{ data: { diff --git a/yarn.lock b/yarn.lock index a6234fdd..c465376e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -165,9 +165,9 @@ redux "^3.7.2" redux-thunk "^2.2.0" -"@ledgerhq/currencies@^4.3.0-beta.f8165b69": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.3.0.tgz#d06d82030b374e72c237d0fb065d1fc175399c9e" +"@ledgerhq/currencies@^4.5.0": + version "4.5.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.5.0.tgz#b54650049be6e2452e3b9f869edd6ea5deb45169" dependencies: lodash "^4.17.5" numeral "^2.0.6" @@ -1091,7 +1091,7 @@ babel-jest@^22.4.1: babel-plugin-istanbul "^4.1.5" babel-preset-jest "^22.4.1" -babel-loader@^7.1.2, babel-loader@^7.1.3: +babel-loader@^7.1.2: version "7.1.3" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.3.tgz#ff5b440da716e9153abb946251a9ab7670037b16" dependencies: @@ -1099,6 +1099,14 @@ babel-loader@^7.1.2, babel-loader@^7.1.3: loader-utils "^1.0.2" mkdirp "^0.5.1" +babel-loader@^7.1.4: + version "7.1.4" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015" + dependencies: + find-cache-dir "^1.0.0" + loader-utils "^1.0.2" + mkdirp "^0.5.1" + babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"