diff --git a/package.json b/package.json index e9bdf975..aec3e12b 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,11 @@ "webpack-sources": "1.0.1" }, "dependencies": { - "@ledgerhq/currencies": "^4.5.0", - "@ledgerhq/hw-app-btc": "^4.6.0", + "@ledgerhq/currencies": "^4.7.0", + "@ledgerhq/hw-app-btc": "^4.7.0", "@ledgerhq/hw-app-eth": "^4.6.0", - "@ledgerhq/hw-transport": "^4.6.0", - "@ledgerhq/hw-transport-node-hid": "^4.6.0", + "@ledgerhq/hw-transport": "^4.7.0", + "@ledgerhq/hw-transport-node-hid": "^4.7.0", "axios": "^0.18.0", "babel-runtime": "^6.26.0", "bcryptjs": "^2.4.3", @@ -57,12 +57,12 @@ "cross-env": "^5.1.4", "d3": "^4.13.0", "debug": "^3.1.0", - "downshift": "^1.30.0", + "downshift": "^1.30.1", "electron-store": "^1.3.0", - "electron-updater": "^2.20.1", + "electron-updater": "^2.21.1", "fuse.js": "^3.2.0", "history": "^4.7.2", - "i18next": "^10.5.0", + "i18next": "^10.5.1", "i18next-node-fs-backend": "^1.0.0", "ledger-test-library": "KhalilBellakrid/ledger-test-library-nodejs#7d37482", "lodash": "^4.17.5", @@ -71,7 +71,7 @@ "qrcode": "^1.2.0", "query-string": "^6.0.0", "raven": "^2.4.2", - "raven-js": "^3.23.2", + "raven-js": "^3.23.3", "react": "^16.2.0", "react-dom": "^16.2.0", "react-i18next": "^7.5.0", @@ -86,10 +86,10 @@ "redux": "^3.7.2", "redux-actions": "^2.3.0", "redux-thunk": "^2.2.0", - "smooth-scrollbar": "^8.2.6", - "source-map": "0.6.0", - "source-map-support": "^0.5.3", - "styled-components": "^3.2.2", + "smooth-scrollbar": "^8.2.7", + "source-map": "0.7.2", + "source-map-support": "^0.5.4", + "styled-components": "^3.2.3", "styled-system": "^2.2.1", "tippy.js": "^2.3.0", "victory": "^0.25.6" @@ -113,12 +113,12 @@ "chance": "^1.0.13", "concurrently": "^3.5.1", "dotenv": "^5.0.1", - "electron": "1.8.3", + "electron": "1.8.4", "electron-builder": "^20.5.1", "electron-devtools-installer": "^2.2.3", "electron-rebuild": "^1.7.3", "electron-webpack": "1.13.0", - "eslint": "^4.18.1", + "eslint": "^4.19.0", "eslint-config-airbnb": "^16.1.0", "eslint-config-prettier": "^2.9.0", "eslint-import-resolver-babel-module": "^4.0.0", @@ -126,8 +126,8 @@ "eslint-plugin-import": "^2.9.0", "eslint-plugin-jsx-a11y": "^6.0.3", "eslint-plugin-react": "^7.7.0", - "flow-bin": "^0.67.1", - "flow-typed": "^2.3.0", + "flow-bin": "^0.68.0", + "flow-typed": "^2.4.0", "hard-source-webpack-plugin": "^0.6.0", "husky": "^0.14.3", "jest": "^22.4.2", diff --git a/src/components/DevTools.js b/src/components/DevTools.js index 94ab46b2..5999243d 100644 --- a/src/components/DevTools.js +++ b/src/components/DevTools.js @@ -40,6 +40,7 @@ type HslColor = { type ColorType = { name: string, val: string, + isDark: boolean, color: { isDark: () => boolean, hsl: () => HslColor, diff --git a/src/components/SettingsPage/Tools.js b/src/components/SettingsPage/Tools.js index 6a64ba87..a860a370 100644 --- a/src/components/SettingsPage/Tools.js +++ b/src/components/SettingsPage/Tools.js @@ -3,7 +3,7 @@ import React, { PureComponent } from 'react' import Box, { Card } from 'components/base/Box' -import Modal, { ModalBody } from 'components/base/Modal' +import Modal, { ModalBody, ModalContent, ModalTitle } from 'components/base/Modal' import Button from 'components/base/Button' import QRCodeExporter from 'components/QRCodeExporter' @@ -21,12 +21,14 @@ class TabProfile extends PureComponent<*, *> { } renderQRCodeModal = ({ onClose }: *) => ( - -

- {/* TODO translate */} - Open Ledger Wallet Mobile App, go to Settings {'>'} Import Accounts -

- + + {'QRCode Mobile Export'} + + + Open Ledger Wallet Mobile App, go to Settings {'>'} Import Accounts + + + ) diff --git a/src/stories/currencies.stories.js b/src/stories/currencies.stories.js index 9b2dc19e..1917ab05 100644 --- a/src/stories/currencies.stories.js +++ b/src/stories/currencies.stories.js @@ -51,7 +51,7 @@ stories.add('Currencies', () => ( {cur.units && (