From c116e064d8b4d136f1947a05b94e0c07767af07c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 9 Oct 2017 14:27:59 +0200 Subject: [PATCH] Merge master --- js/package-lock.json | 350 ++++++++++++------------- js/src/SyncWarning/syncWarning.spec.js | 35 +-- 2 files changed, 184 insertions(+), 201 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index c0d9453de..f1a9c8ab1 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@parity/abi": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@parity/abi/-/abi-2.0.4.tgz", - "integrity": "sha512-NA7YVcTFbY2qk5+WREFbBcnYH9emGsQ6YEhbVQkwqNCR1Gbkz2JeMZpnY9kJdITcc6dm5L4j0U8OHwLu3KbPUQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@parity/abi/-/abi-2.0.6.tgz", + "integrity": "sha512-bsTwVPodLBQFQaKyMVB6Xk0JlnTcGp+yQDUX4l6krE7nk6W8Z+bTa9Gjrm3ebzlNQiiBNA6tcEzshWu69LRI2A==", "requires": { "bignumber.js": "3.0.1", "js-sha3": "0.5.5", @@ -15,12 +15,12 @@ } }, "@parity/api": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.0.4.tgz", - "integrity": "sha512-JdR3HepsktYJdmJKl4pzKDBkSbW7uMmeJDsJZ1i2aJEB7rscExCn5qZWQLmi5jbIVCjk9q0YVj4tKXGFYcHjtA==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.0.6.tgz", + "integrity": "sha512-7VT7xCLyNZ7uhgvujJnyvJIpvjD6IOIRPxizNhQTzrcmfzqtJi92dfDeoEy0NpXqKgOuYWAnvp1r/sL/C61ukA==", "requires": { - "@parity/abi": "2.0.4", - "@parity/jsonrpc": "2.0.5", + "@parity/abi": "2.0.6", + "@parity/jsonrpc": "2.0.7", "@parity/wordlist": "1.1.0", "bignumber.js": "3.0.1", "blockies": "0.0.2", @@ -44,15 +44,15 @@ } }, "@parity/dapp-account": { - "version": "github:paritytech/dapp-account#d85d464b632818ea2a9701478dbc4588d225b2dc", + "version": "github:paritytech/dapp-account#64f31538e12cef2d1234ddfb49e9ed90a95fb067", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-accounts": "github:paritytech/dapp-accounts#d604f616ec01aae8957be1045a5585b1d9053831", - "@parity/dapp-vaults": "github:paritytech/dapp-vaults#6ba6f3affdb1b76f87ff99578b6b2ba039070cb8", + "@parity/api": "2.0.6", + "@parity/dapp-accounts": "github:paritytech/dapp-accounts#e99531b4cf38c71eed89dc3a6b3f6a50bceaa110", + "@parity/dapp-vaults": "github:paritytech/dapp-vaults#b5ba38bd81a6fabd937b8679967e7f8d686e1303", "@parity/parity.js": "1.8.7", - "@parity/shapeshift": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30", + "@parity/shapeshift": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32", "happypack": "3.1.0", "lodash": "4.17.2", "oo7": "0.5.3", @@ -71,12 +71,12 @@ } }, "@parity/dapp-accounts": { - "version": "github:paritytech/dapp-accounts#d604f616ec01aae8957be1045a5585b1d9053831", + "version": "github:paritytech/dapp-accounts#e99531b4cf38c71eed89dc3a6b3f6a50bceaa110", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-vaults": "github:paritytech/dapp-vaults#6ba6f3affdb1b76f87ff99578b6b2ba039070cb8", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30", + "@parity/api": "2.0.6", + "@parity/dapp-vaults": "github:paritytech/dapp-vaults#b5ba38bd81a6fabd937b8679967e7f8d686e1303", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32", "file-saver": "1.3.3", "react": "15.6.1", "react-dom": "15.6.1", @@ -86,92 +86,92 @@ } }, "@parity/dapp-address": { - "version": "github:paritytech/dapp-address#fcfad13d74dcb92700ca5e1d1bffd5e84aa63f60", + "version": "github:paritytech/dapp-address#781e573c2362b8ac5d7692c1064e1bbf070b2117", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-account": "github:paritytech/dapp-account#d85d464b632818ea2a9701478dbc4588d225b2dc", - "@parity/dapp-addresses": "github:paritytech/dapp-addresses#6b777476b146c95578697250a71f12c2b289e4ec", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/dapp-account": "github:paritytech/dapp-account#64f31538e12cef2d1234ddfb49e9ed90a95fb067", + "@parity/dapp-addresses": "github:paritytech/dapp-addresses#063bcf837e08b0f40681471c8752f05e60025326", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-addresses": { - "version": "github:paritytech/dapp-addresses#6b777476b146c95578697250a71f12c2b289e4ec", + "version": "github:paritytech/dapp-addresses#063bcf837e08b0f40681471c8752f05e60025326", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-accounts": "github:paritytech/dapp-accounts#d604f616ec01aae8957be1045a5585b1d9053831", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/dapp-accounts": "github:paritytech/dapp-accounts#e99531b4cf38c71eed89dc3a6b3f6a50bceaa110", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-chaindeploy": { - "version": "github:paritytech/dapp-chaindeploy#a84c57c3be5565910edfc5ee4799481ab84e8ec7", + "version": "github:paritytech/dapp-chaindeploy#3350dacea8144992fceeffc41efc0bef40512f33", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", "react": "15.6.1", "react-dom": "15.6.1" } }, "@parity/dapp-contract": { - "version": "github:paritytech/dapp-contract#3f31f208544af7489652905888fda65ff4e8f32a", + "version": "github:paritytech/dapp-contract#79aa98241b99de17f273eca4129c1afefa431111", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-account": "github:paritytech/dapp-account#d85d464b632818ea2a9701478dbc4588d225b2dc", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/dapp-account": "github:paritytech/dapp-account#64f31538e12cef2d1234ddfb49e9ed90a95fb067", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-contracts": { - "version": "github:paritytech/dapp-contracts#94e3a1191f7100c224a448aeba9fbb460b787afc", + "version": "github:paritytech/dapp-contracts#712af5d3cd354992e543077260e2d192ec23d501", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-account": "github:paritytech/dapp-account#d85d464b632818ea2a9701478dbc4588d225b2dc", - "@parity/dapp-accounts": "github:paritytech/dapp-accounts#d604f616ec01aae8957be1045a5585b1d9053831", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/dapp-account": "github:paritytech/dapp-account#64f31538e12cef2d1234ddfb49e9ed90a95fb067", + "@parity/dapp-accounts": "github:paritytech/dapp-accounts#e99531b4cf38c71eed89dc3a6b3f6a50bceaa110", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-dapp-accounts": { - "version": "github:paritytech/dapp-dapp-accounts#762ed5319d031e6547392159bf9a886ef036f222", + "version": "github:paritytech/dapp-dapp-accounts#631188314f4c8ecdc37e0ca7f562ccc17daaeb9a", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-dapp-methods": { - "version": "github:paritytech/dapp-dapp-methods#3f5c2a86142359f7350ddeef6b901e69e0625a8b", + "version": "github:paritytech/dapp-dapp-methods#0498f610c0acf973cd63854570b9fc61d56ef1fd", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-dapp-visible": { - "version": "github:paritytech/dapp-dapp-visible#6c519e40babaa5db35402fdb5d36eb04849bc606", + "version": "github:paritytech/dapp-dapp-visible#7e10e91844fef642d6a8205533f9d54f96c613a9", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-dappreg": { - "version": "github:paritytech/dapp-dappreg#8553fa7f578ec98f0a92a7fc778212e764799de5", + "version": "github:paritytech/dapp-dappreg#c7ed1355a848164a45232abe4ef456827a04db67", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-develop": { - "version": "github:paritytech/dapp-develop#ad9a0129157b1aabba0cc826c33f62bf3f22ac20", + "version": "github:paritytech/dapp-develop#d6dea214205d97d27a6fd9552c2369c89cd98fc9", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-contracts": "github:paritytech/dapp-contracts#94e3a1191f7100c224a448aeba9fbb460b787afc", + "@parity/api": "2.0.6", + "@parity/dapp-contracts": "github:paritytech/dapp-contracts#712af5d3cd354992e543077260e2d192ec23d501", "@parity/parity.js": "1.8.7", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32", "oo7": "0.5.3", "oo7-parity": "0.6.8", "oo7-react": "0.4.5", @@ -183,10 +183,10 @@ } }, "@parity/dapp-githubhint": { - "version": "github:paritytech/dapp-githubhint#6fc3c47eace743d921912f777f6ec80d1f6e4512", + "version": "github:paritytech/dapp-githubhint#f7e379d871348ba59b07a0d37836383b9b62f829", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", "moment": "2.17.0", "react": "15.6.1", "react-dom": "15.6.1", @@ -194,12 +194,12 @@ } }, "@parity/dapp-home": { - "version": "github:paritytech/dapp-home#a8df4b8a149cd779d51753ff62794ab6d7c299f4", + "version": "github:paritytech/dapp-home#e4793b9a893c9ad41a456001bdea79c89024469f", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-web": "github:paritytech/dapp-web#cfaa27782fad97295bc7cca306edf48ff7bd971f", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30", + "@parity/api": "2.0.6", + "@parity/dapp-web": "github:paritytech/dapp-web#bdf0e05bb155ac5b729e9002b6b24cf635ebc137", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32", "react-markdown": "2.4.4" }, "dependencies": { @@ -216,43 +216,43 @@ } }, "@parity/dapp-localtx": { - "version": "github:paritytech/dapp-localtx#17af35621e266208dc24d1c78483dd264445d3ae", + "version": "github:paritytech/dapp-localtx#20e18814af6e1b0d8310d74ddcccf2de0ac7d91f", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-playground": { "version": "github:paritytech/dapp-playground#ea47e806f05b1c08019b137bb4cc11056f605fc0", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-registry": { "version": "github:paritytech/dapp-registry#8a3f61d10e858fe81b3731dd231b73e66a0879d9", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30", + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32", "material-ui": "0.16.5" } }, "@parity/dapp-settings": { - "version": "github:paritytech/dapp-settings#b8210bdbc486d126fd6b1782d7c49d4eef75c94e", + "version": "github:paritytech/dapp-settings#553b86d8e3a4448da814acaad66768a68dfe1746", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-signaturereg": { "version": "github:paritytech/dapp-signaturereg#31d70570a5c11bd5d954ccdcccc3dbb8f0e26f76", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", "moment": "2.17.0", "react": "15.6.1", "react-dom": "15.6.1", @@ -262,34 +262,34 @@ "@parity/dapp-signer": { "version": "github:paritytech/dapp-signer#cb15b3ed1a30eb7f6a0d7d9951e98e6efeb9815a", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-status": { - "version": "github:paritytech/dapp-status#e4b0f7a9a338759d66e8051df2d8cde3bb3a5fbe", + "version": "github:paritytech/dapp-status#ff5756eeb0a9120d3ba1714a69716f388a834e67", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30", + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32", "bytes": "2.4.0", "format-number": "2.0.1" } }, "@parity/dapp-tokendeploy": { - "version": "github:paritytech/dapp-tokendeploy#863df6c8a88a841bfd60ff8cba4ade52e061f5ba", + "version": "github:paritytech/dapp-tokendeploy#74e323436718f5b497660fc9b774df80b13af492", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-tokenreg": { - "version": "github:paritytech/dapp-tokenreg#1a6f408532acadba465dfe31607c42cfb3223185", + "version": "github:paritytech/dapp-tokenreg#0cf6c7bc2d8b17e4b8bbd3e4e74a821880a9996d", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", "material-ui": "0.16.5", "react": "15.6.1", "react-dom": "15.6.1", @@ -297,37 +297,37 @@ } }, "@parity/dapp-vaults": { - "version": "github:paritytech/dapp-vaults#6ba6f3affdb1b76f87ff99578b6b2ba039070cb8", + "version": "github:paritytech/dapp-vaults#b5ba38bd81a6fabd937b8679967e7f8d686e1303", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-wallet": { - "version": "github:paritytech/dapp-wallet#3904d53c4fa412505749928701cc3d44adcf08c4", + "version": "github:paritytech/dapp-wallet#26991ba008b83e639484093e4bb4b52f30b0cb67", "requires": { - "@parity/api": "2.0.4", - "@parity/dapp-account": "github:paritytech/dapp-account#d85d464b632818ea2a9701478dbc4588d225b2dc", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30" + "@parity/api": "2.0.6", + "@parity/dapp-account": "github:paritytech/dapp-account#64f31538e12cef2d1234ddfb49e9ed90a95fb067", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32" } }, "@parity/dapp-web": { - "version": "github:paritytech/dapp-web#cfaa27782fad97295bc7cca306edf48ff7bd971f", + "version": "github:paritytech/dapp-web#bdf0e05bb155ac5b729e9002b6b24cf635ebc137", "requires": { - "@parity/api": "2.0.4", - "@parity/shared": "2.0.4", - "@parity/ui": "2.0.30", + "@parity/api": "2.0.6", + "@parity/shared": "2.0.6", + "@parity/ui": "2.0.32", "base32.js": "0.1.0" } }, "@parity/etherscan": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@parity/etherscan/-/etherscan-2.0.4.tgz", - "integrity": "sha512-0k4EWMvHW8ESWnnWjcQgGySN295l0bK5R2Y/WVKvmbKBba8ooy59K50Flg0iribKxpZ0RP9FSu1H5YYtR2YUBA==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@parity/etherscan/-/etherscan-2.0.6.tgz", + "integrity": "sha512-T/HgnuqWzuby+jzhhS1a40MkRpfhMZnUmdnRV41bNFl/PwuVO78xNzkvPYSkmn+FTUJL6Fz+BFGT4bIwJ8cH3Q==", "requires": { - "@parity/api": "2.0.4", + "@parity/api": "2.0.6", "bignumber.js": "3.0.1", "es6-promise": "4.1.1", "node-fetch": "1.6.3", @@ -343,14 +343,14 @@ } }, "@parity/jsonrpc": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.0.5.tgz", - "integrity": "sha512-rXUOwFGQMIkeIQM8r6XZPo7EgzuD5jVrXBYgBSUk8UPbtciSYBWsb7XuRgjcjtrBgfN9MFTBLaBsKL1YmInGKg==" + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.0.7.tgz", + "integrity": "sha512-5u36XAM7tS4nlREtx9bX+TKlMb24C8lVPoi40KARBHP6o13nhLmZBySEGn4yJ2AyZHqllUMD5QZ/U2GEiVI+Mg==" }, "@parity/ledger": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@parity/ledger/-/ledger-2.0.4.tgz", - "integrity": "sha512-kIawptg/+pNCB71jfsSHQhwGqYk8vUKxg5n1jO/W7wKhvWTcvQGrY8+G6vZTiq5eLUYthN6LubTCDw4nR2TEmg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@parity/ledger/-/ledger-2.0.6.tgz", + "integrity": "sha512-ZvvPwYovS1UyltCSElKiExYiME0lMweJZ5hMyt4QZ6mc0IcyHXgRB3N/DT7Fk+P6LSLuXVM2gZxaxJhrTyiGdw==", "requires": { "u2f-api": "0.0.9", "u2f-api-polyfill": "0.4.3" @@ -374,33 +374,33 @@ } }, "@parity/plugin-signer-account": { - "version": "github:paritytech/plugin-signer-account#dd09e1bd0fe939b056f65c0e768beb72c2eb261a", + "version": "github:paritytech/plugin-signer-account#a9c8cf83bd0fa2687236dd6b4fd481efe4045a53", "requires": { - "@parity/ui": "2.0.30" + "@parity/ui": "2.0.32" } }, "@parity/plugin-signer-default": { - "version": "github:paritytech/plugin-signer-default#ced5ce6a8ddc63475cbdc0a64d19de167eed9a83", + "version": "github:paritytech/plugin-signer-default#98db84abcaf1ed2e50c59f196ea59fa770dde8d5", "requires": { - "@parity/ui": "2.0.30" + "@parity/ui": "2.0.32" } }, "@parity/plugin-signer-hardware": { - "version": "github:paritytech/plugin-signer-hardware#21bfc970649609679d631e7da4125077627f5223", + "version": "github:paritytech/plugin-signer-hardware#e026021a1bf7b41b674da25a197a2091c2fe8db2", "requires": { - "@parity/ui": "2.0.30" + "@parity/ui": "2.0.32" } }, "@parity/plugin-signer-qr": { - "version": "github:paritytech/plugin-signer-qr#992cbe6de29a7d0f2123c63a3f72991d559c1b4a", + "version": "github:paritytech/plugin-signer-qr#4128c8269d7bcae64d14d3016ec7365f34741bb3", "requires": { - "@parity/ui": "2.0.30" + "@parity/ui": "2.0.32" } }, "@parity/shapeshift": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@parity/shapeshift/-/shapeshift-2.0.4.tgz", - "integrity": "sha512-iYcB8Cgb/oWUbwuv2yI0oymNTJp24+RfS5JJ40GYMXTN9Ehd0/XdxmDBEpzasJPU2REgIUl6jLlkPGt2o1+4Kg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@parity/shapeshift/-/shapeshift-2.0.6.tgz", + "integrity": "sha512-M8sNE0QRf4ddY/QXZlBFy/5OBF64FjkceLlZTZhcxVz2jOh64MaN3wfotGQmHptiVIHgDe0+BiZE0DDrfyQ8cQ==", "requires": { "es6-promise": "4.1.1", "node-fetch": "1.6.3", @@ -415,11 +415,11 @@ } }, "@parity/shared": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@parity/shared/-/shared-2.0.4.tgz", - "integrity": "sha512-XqygJ+4t9SwsHjqntWi1fgo0BPXzbr3hw+IxOuDVzA9H7HYy0u1nxZG61c0DoAvrZ+Sepvkf8rYOfWdeQKia5A==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@parity/shared/-/shared-2.0.6.tgz", + "integrity": "sha512-LP1WxrBl9Bby4J99oArGkAPhxSjHOwhO5a9mnUJb2oU59SUU8vlCAroE3cgAizptl8FOdWVBW98E/zL2syVuLg==", "requires": { - "@parity/ledger": "2.0.4", + "@parity/ledger": "2.0.6", "eventemitter3": "2.0.3", "loglevel": "1.4.1", "mobx": "2.6.4", @@ -436,13 +436,13 @@ } }, "@parity/ui": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-2.0.30.tgz", - "integrity": "sha512-rS+TJE06ehrN3C05bwPrz9VMiFJoSOVaMeIbBUuPkXp0BPH5O2r1W5GQo/8ITcTH7eeEqj2ZofT9iBb3wzvKrA==", + "version": "2.0.32", + "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-2.0.32.tgz", + "integrity": "sha512-CjC2YRszYXNup5+ZkwVd5BC5zUYxbvT4JPSIMQhLpzOjXAI/qcUguzriadHS/us0bYkBIP2qMLIHJr8Djs9qpA==", "requires": { - "@parity/api": "2.0.4", - "@parity/etherscan": "2.0.4", - "@parity/shared": "2.0.4", + "@parity/api": "2.0.6", + "@parity/etherscan": "2.0.6", + "@parity/shared": "2.0.6", "bignumber.js": "3.0.1", "brace": "0.9.0", "date-difference": "1.0.0", @@ -855,7 +855,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -868,7 +868,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "electron-to-chromium": "1.3.24" } } @@ -1786,7 +1786,7 @@ "babel-plugin-transform-es2015-unicode-regex": "6.24.1", "babel-plugin-transform-exponentiation-operator": "6.24.1", "babel-plugin-transform-regenerator": "6.26.0", - "browserslist": "2.4.0", + "browserslist": "2.5.1", "invariant": "2.2.2", "semver": "5.4.1" } @@ -2234,9 +2234,9 @@ } }, "bowser": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.7.3.tgz", - "integrity": "sha1-UEvbQxGMqNucu63yj9YPJlr5bk8=" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.8.0.tgz", + "integrity": "sha512-ARpB9VfvItCA47oBk9tVA/L93fU83Q2YwE1yTjhCyr1tu6Zw74mDHdpXNWutl5/tFGYhgCOfBH83WJY4RBGA3A==" }, "brace": { "version": "0.9.0", @@ -2347,12 +2347,12 @@ } }, "browserslist": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.4.0.tgz", - "integrity": "sha512-aM2Gt4x9bVlCUteADBS6JP0F+2tMWKM1jQzUulVROtdFWFIcIVvY76AJbr7GDqy0eDhn+PcnpzzivGxY4qiaKQ==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.5.1.tgz", + "integrity": "sha512-jAvM2ku7YDJ+leAq3bFH1DE0Ylw+F+EQDq4GkqZfgPEqpWYw9ofQH85uKSB9r3Tv7XDbfqVtE+sdvKJW7IlPJA==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000744", + "caniuse-lite": "1.0.30000745", "electron-to-chromium": "1.3.24" } }, @@ -2473,7 +2473,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" }, @@ -2484,22 +2484,22 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "electron-to-chromium": "1.3.24" } } } }, "caniuse-db": { - "version": "1.0.30000744", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000744.tgz", - "integrity": "sha1-AHWP991fcTjTShVgjcz3Glllb/4=", + "version": "1.0.30000745", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000745.tgz", + "integrity": "sha1-slmmFzej5IxPtLaxvETt6yZM1CI=", "dev": true }, "caniuse-lite": { - "version": "1.0.30000744", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000744.tgz", - "integrity": "sha1-hg+lyDujT+YZOX1gfzC7R0ghZxs=", + "version": "1.0.30000745", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000745.tgz", + "integrity": "sha1-INb+3hFXpJNRM1ApRvx+DmuIDaU=", "dev": true }, "capture-stack-trace": { @@ -4110,7 +4110,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "css-rule-stream": "1.1.0", "duplexer2": "0.0.2", "jsonfilter": "1.1.2", @@ -4129,7 +4129,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "electron-to-chromium": "1.3.24" } }, @@ -7693,7 +7693,7 @@ "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz", "integrity": "sha1-wVPH6I/YT+9cYC6VqBaLJ3BnH+c=", "requires": { - "bowser": "1.7.3", + "bowser": "1.8.0", "hyphenate-style-name": "1.0.2" } }, @@ -10831,7 +10831,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "electron-to-chromium": "1.3.24" } } @@ -11425,7 +11425,7 @@ "pump": "1.0.2", "rc": "1.2.1", "simple-get": "1.4.3", - "tar-fs": "1.15.3", + "tar-fs": "1.16.0", "tunnel-agent": "0.6.0", "xtend": "4.0.1" }, @@ -13541,7 +13541,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000744", + "caniuse-db": "1.0.30000745", "electron-to-chromium": "1.3.24" } }, @@ -13915,9 +13915,9 @@ "dev": true }, "tar-fs": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz", - "integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz", + "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==", "requires": { "chownr": "1.0.1", "mkdirp": "0.5.1", diff --git a/js/src/SyncWarning/syncWarning.spec.js b/js/src/SyncWarning/syncWarning.spec.js index 14256be5e..1767483dd 100644 --- a/js/src/SyncWarning/syncWarning.spec.js +++ b/js/src/SyncWarning/syncWarning.spec.js @@ -17,34 +17,21 @@ import { shallow } from 'enzyme'; import React from 'react'; +import StatusIndicator from '@parity/ui/StatusIndicator'; + import SyncWarning from './'; let component; -function createRedux (syncing = null) { - return { - dispatch: () => {}, - subscribe: () => {}, - getState: () => { - return { - nodeStatus: { - health: { - overall: { - status: syncing ? 'needsAttention' : 'ok', - message: [] - } - } - } - }; - } - }; +function createApi (syncing = null) { + return {}; } -function render (store) { +function render () { component = shallow( , - { context: { store: store || createRedux() } } - ).find('SyncWarning').shallow(); + { context: { api: createApi() } } + ); return component; } @@ -54,11 +41,7 @@ describe('SyncWarning', () => { expect(render()).to.be.ok; }); - it('does render when syncing', () => { - expect(render(createRedux({})).find('div')).to.have.length.gte(1); - }); - - it('does not render when not syncing', () => { - expect(render(createRedux(false)).find('div')).to.have.length(0); + it('does not render when healthy', () => { + expect(render().find('div')).to.have.length(0); }); });