From ad8838c74db85f5bdd8dbfa48182a821515a3c08 Mon Sep 17 00:00:00 2001 From: meriadec Date: Tue, 3 Apr 2018 16:41:55 +0200 Subject: [PATCH] Update wallet-common & currencies and fix flow --- package.json | 4 +- src/components/CounterValue/index.js | 1 + src/components/RequestAmount/index.js | 4 +- src/components/base/InputCurrency/index.js | 2 +- yarn.lock | 77 +++------------------- 5 files changed, 14 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index 049973ba..85e2aa74 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,12 @@ "webpack-sources": "1.0.1" }, "dependencies": { - "@ledgerhq/currencies": "^4.10.0", + "@ledgerhq/currencies": "^4.10.1", "@ledgerhq/hw-app-btc": "^4.7.3", "@ledgerhq/hw-app-eth": "^4.7.3", "@ledgerhq/hw-transport": "^4.7.3", "@ledgerhq/hw-transport-node-hid": "^4.7.6", - "@ledgerhq/wallet-common": "^0.11.0", + "@ledgerhq/wallet-common": "^0.12.0", "axios": "^0.18.0", "bcryptjs": "^2.4.3", "bitcoinjs-lib": "^3.3.2", diff --git a/src/components/CounterValue/index.js b/src/components/CounterValue/index.js index e865a8c5..9af13e76 100644 --- a/src/components/CounterValue/index.js +++ b/src/components/CounterValue/index.js @@ -63,6 +63,7 @@ class CounterValue extends PureComponent { function generateFakeCurrency(ticker) { return { + ticker, units: [ { code: ticker, diff --git a/src/components/RequestAmount/index.js b/src/components/RequestAmount/index.js index de2677a6..d8dcd796 100644 --- a/src/components/RequestAmount/index.js +++ b/src/components/RequestAmount/index.js @@ -6,7 +6,7 @@ import { translate } from 'react-i18next' import styled from 'styled-components' import { connect } from 'react-redux' import type { Account, CalculateCounterValue } from '@ledgerhq/wallet-common/lib/types' -import type { Unit } from '@ledgerhq/currencies' +import type { FiatUnit } from '@ledgerhq/currencies' import type { T } from 'types/common' @@ -59,7 +59,7 @@ type Props = { // used to determine the right input unit // retrieved via selector (take the chosen countervalue unit) - rightUnit: Unit, + rightUnit: FiatUnit, // used to calculate the opposite field value (right & left) getCounterValue: CalculateCounterValue, diff --git a/src/components/base/InputCurrency/index.js b/src/components/base/InputCurrency/index.js index b5686eb1..d25b8164 100644 --- a/src/components/base/InputCurrency/index.js +++ b/src/components/base/InputCurrency/index.js @@ -120,7 +120,7 @@ class InputCurrency extends PureComponent { handleBlur = () => this.syncInput({ isFocused: false }) handleFocus = () => this.syncInput({ isFocused: true }) - syncInput = ({ isFocused }) => { + syncInput = ({ isFocused }: { isFocused: boolean }) => { const { value, showAllDigits } = this.props const { unit } = this.state this.setState({ diff --git a/yarn.lock b/yarn.lock index 978cce51..6d758b3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -913,17 +913,9 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" -"@ledgerhq/currencies@^4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.10.0.tgz#8cc25a232ca62fa5f4e17140df0678cdb48123e0" - dependencies: - lodash "^4.17.5" - numeral "^2.0.6" - querystring "^0.2.0" - -"@ledgerhq/currencies@^4.7.1": - version "4.7.3" - resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.7.3.tgz#0e28c0f1c74cf00b990be6865fbec374f808b71f" +"@ledgerhq/currencies@^4.10.1": + version "4.10.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.10.1.tgz#462081005e3e37e0737bad9aba189eef1663e96a" dependencies: lodash "^4.17.5" numeral "^2.0.6" @@ -955,13 +947,13 @@ dependencies: events "^2.0.0" -"@ledgerhq/wallet-common@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/wallet-common/-/wallet-common-0.11.0.tgz#3b6bbc4f93ff766ff5f1c570322fe73260fe4835" +"@ledgerhq/wallet-common@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/wallet-common/-/wallet-common-0.12.0.tgz#50ac697929062772182735e4013266c41a661fe2" dependencies: - "@ledgerhq/currencies" "^4.7.1" + "@ledgerhq/currencies" "^4.10.1" axios "^0.18.0" - babel-jest "^23.0.0-alpha.0" + babel-jest "^22.4.3" invariant "^2.2.2" lodash "^4.17.4" prando "^3.0.1" @@ -1927,13 +1919,6 @@ babel-jest@^22.4.3: babel-plugin-istanbul "^4.1.5" babel-preset-jest "^22.4.3" -babel-jest@^23.0.0-alpha.0: - version "23.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.0-alpha.4.tgz#e3bb1e486f4178b381cc7b37e6cafb1af3a9d1bf" - dependencies: - babel-plugin-istanbul "^4.1.6" - babel-preset-jest "^23.0.0-alpha.4" - babel-loader@^7.1.4: version "7.1.4" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015" @@ -1976,23 +1961,10 @@ babel-plugin-istanbul@^4.1.5: istanbul-lib-instrument "^1.7.5" test-exclude "^4.1.1" -babel-plugin-istanbul@^4.1.6: - version "4.1.6" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.13.0" - find-up "^2.1.0" - istanbul-lib-instrument "^1.10.1" - test-exclude "^4.2.1" - babel-plugin-jest-hoist@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a" -babel-plugin-jest-hoist@^23.0.0-alpha.4: - version "23.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.0-alpha.4.tgz#3f32715d54640e37cc62a84a9d3d7eada6a067fc" - babel-plugin-macros@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.2.0.tgz#31fc16748d6480697a517f692dc4421cb7bff0cc" @@ -2584,13 +2556,6 @@ babel-preset-jest@^22.4.3: babel-plugin-jest-hoist "^22.4.3" babel-plugin-syntax-object-rest-spread "^6.13.0" -babel-preset-jest@^23.0.0-alpha.4: - version "23.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.0-alpha.4.tgz#d3080507330e6d23c47dcc366d69f7a330174f70" - dependencies: - babel-plugin-jest-hoist "^23.0.0-alpha.4" - babel-plugin-syntax-object-rest-spread "^6.13.0" - babel-preset-minify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz#7db64afa75f16f6e06c0aa5f25195f6f36784d77" @@ -7287,28 +7252,12 @@ istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14" -istanbul-lib-coverage@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341" - istanbul-lib-hook@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b" - dependencies: - babel-generator "^6.18.0" - babel-template "^6.16.0" - babel-traverse "^6.18.0" - babel-types "^6.18.0" - babylon "^6.18.0" - istanbul-lib-coverage "^1.2.0" - semver "^5.3.0" - istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.2: version "1.9.2" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz#84905bf47f7e0b401d6b840da7bad67086b4aab6" @@ -11928,16 +11877,6 @@ test-exclude@^4.1.1: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" -test-exclude@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa" - dependencies: - arrify "^1.0.1" - micromatch "^3.1.8" - object-assign "^4.1.0" - read-pkg-up "^1.0.1" - require-main-filename "^1.0.1" - text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"