1
0
mirror of https://github.com/trezor/trezor-wallet synced 2025-02-11 23:52:47 +00:00

Merge pull request #363 from trezor/update-some-major

Update some major versions modules
This commit is contained in:
Maroš 2019-02-07 10:55:23 +01:00 committed by GitHub
commit fdf4f9da74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 399 additions and 398 deletions

View File

@ -42,18 +42,18 @@
"express": "^4.16.4", "express": "^4.16.4",
"friendly-errors-webpack-plugin": "^1.7.0", "friendly-errors-webpack-plugin": "^1.7.0",
"git-revision-webpack-plugin": "^3.0.3", "git-revision-webpack-plugin": "^3.0.3",
"hdkey": "^0.8.0", "hdkey": "^1.1.0",
"history": "^4.7.2", "history": "^4.7.2",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"jest-fetch-mock": "^1.6.5", "jest-fetch-mock": "^2.1.0",
"morgan": "^1.9.1", "morgan": "^1.9.1",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"raf": "^3.4.1", "raf": "^3.4.1",
"raven-js": "^3.27.0", "raven-js": "^3.27.0",
"rc-tooltip": "^3.7.3", "rc-tooltip": "^3.7.3",
"react": "^16.7.0", "react": "^16.8.0",
"react-dom": "^16.7.0", "react-dom": "^16.8.0",
"react-hot-loader": "^4.6.5", "react-hot-loader": "^4.6.5",
"react-json-view": "^1.19.1", "react-json-view": "^1.19.1",
"react-qr-reader": "^2.1.2", "react-qr-reader": "^2.1.2",
@ -77,11 +77,11 @@
"trezor-bridge-communicator": "1.0.2", "trezor-bridge-communicator": "1.0.2",
"trezor-connect": "7.0.0-beta.2", "trezor-connect": "7.0.0-beta.2",
"wallet-address-validator": "^0.2.4", "wallet-address-validator": "^0.2.4",
"web3": "1.0.0-beta.35", "web3": "1.0.0-beta.41",
"webpack": "^4.29.1", "webpack": "^4.29.1",
"webpack-build-notifier": "^0.1.30", "webpack-build-notifier": "^0.1.30",
"webpack-bundle-analyzer": "^3.0.3", "webpack-bundle-analyzer": "^3.0.3",
"whatwg-fetch": "^2.0.4", "whatwg-fetch": "^3.0.0",
"yarn-run-all": "^3.1.1" "yarn-run-all": "^3.1.1"
}, },
"devDependencies": { "devDependencies": {
@ -124,7 +124,7 @@
"stylelint-webpack-plugin": "^0.10.5", "stylelint-webpack-plugin": "^0.10.5",
"webpack-cli": "^3.2.3", "webpack-cli": "^3.2.3",
"webpack-dev-server": "^3.1.14", "webpack-dev-server": "^3.1.14",
"yargs": "11.0.0" "yargs": "12.0.5"
}, },
"optionalDependencies": { "optionalDependencies": {
"fsevents": "1.2.7" "fsevents": "1.2.7"

View File

@ -236,7 +236,7 @@ class LeftNavigation extends React.PureComponent<Props, State> {
isOpen={this.props.wallet.dropdownOpened} isOpen={this.props.wallet.dropdownOpened}
icon={( icon={(
<React.Fragment> <React.Fragment>
{showWalletType ? ( {showWalletType && (
<Tooltip <Tooltip
content={walletTooltipMsg} content={walletTooltipMsg}
maxWidth={200} maxWidth={200}
@ -258,7 +258,7 @@ class LeftNavigation extends React.PureComponent<Props, State> {
/> />
</WalletTypeIconWrapper> </WalletTypeIconWrapper>
</Tooltip> </Tooltip>
) : null )
} }
{this.props.devices.length > 1 && ( {this.props.devices.length > 1 && (
<Tooltip <Tooltip

779
yarn.lock

File diff suppressed because it is too large Load Diff