From ed5912e688af6277536d1e23ee0cc808d6437a0a Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Sun, 4 Mar 2018 16:38:26 +0100 Subject: [PATCH 1/2] Fix bug red bar not showing --- src/SyncWarning/syncWarning.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SyncWarning/syncWarning.js b/src/SyncWarning/syncWarning.js index dd5c7f0..bb25377 100644 --- a/src/SyncWarning/syncWarning.js +++ b/src/SyncWarning/syncWarning.js @@ -23,7 +23,7 @@ import styles from './syncWarning.css'; function SyncWarning ({ className }, { api }) { const statusStore = StatusIndicator.Store.get(api); - const isOk = !statusStore.nodeHealth.overall || (!statusStore.nodeHealth.overall.isNotReadyYet && statusStore.nodeHealth.overall.status === 'ok'); + const isOk = !statusStore.overall || (!statusStore.overall.isNotReadyYet && statusStore.overall.status === 'ok'); if (isOk) { return null; @@ -33,7 +33,7 @@ function SyncWarning ({ className }, { api }) {
{ - statusStore.nodeHealth.overall.message.map((message) => ( + statusStore.overall.message.map((message) => (

{message}

-- GitLab From 3c6f0d0a3e811b636c7c72b84ec953eef377e215 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 5 Mar 2018 10:09:37 +0100 Subject: [PATCH 2/2] Bump ui version --- package-lock.json | 88 ++++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index b1eff12..a3796e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "requires": { "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "mobx": "3.6.0", "mobx-react": "4.3.5", "prop-types": "15.6.1", @@ -124,7 +124,7 @@ "requires": { "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "mobx": "3.6.0", "mobx-react": "4.3.5", "prop-types": "15.6.1", @@ -218,7 +218,7 @@ "requires": { "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "format-number": "3.0.0", "mobx": "3.6.0", "mobx-react": "4.3.5", @@ -333,7 +333,7 @@ "version": "github:parity-js/plugin-signer-account#3acd84ba1965f9ee419edd04d84e13e097e6d661", "requires": { "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "lodash": "4.17.5", "prop-types": "15.6.1", "react-intl": "2.4.0", @@ -372,7 +372,7 @@ "@parity/plugin-signer-default": { "version": "github:parity-js/plugin-signer-default#dcf8cf23bb050070b6a691413b974b5c2d7d1ce6", "requires": { - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "lodash": "4.17.5", "react-intl": "2.4.0", "semantic-ui-react": "0.78.3" @@ -400,7 +400,7 @@ "@parity/plugin-signer-hardware": { "version": "github:parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", "requires": { - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "lodash.pick": "4.4.0", "react-intl": "2.4.0", "semantic-ui-react": "0.78.3" @@ -423,7 +423,7 @@ "@parity/plugin-signer-qr": { "version": "github:parity-js/plugin-signer-qr#c275ba13524e9f6759079fabd10faf49cc00cfc0", "requires": { - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "react-intl": "2.4.0" } }, @@ -486,9 +486,9 @@ } }, "@parity/ui": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.1.3.tgz", - "integrity": "sha512-o0fhHqQ+JmI796C0D/SiIVSCwRpw8RAnUBVWsaOogHgNJAoMsWvY9CDtpvlEXjxqWnVQxJWf8SDeiK9TnCleBQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.1.4.tgz", + "integrity": "sha512-aG79IOxMBeRsu92Zlq3QsR6Z6PAmlhmOdU9tQP+F9XB/44Y4sGxfSDNucGucWz/Jz0VGerJn53CoACa4Yj5uYA==", "requires": { "@parity/api": "2.1.15", "@parity/etherscan": "2.1.3", @@ -994,9 +994,19 @@ "dev": true }, "attr-accept": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.0.tgz", - "integrity": "sha1-tc01In8WOTWo8d4Q7T66FpQfa+Y=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.2.tgz", + "integrity": "sha512-NUj0itVSnpFkUYCj3XKSRCZ7N9gPwWcyX/tF7HosqyDBPMSygALivvJIGI8VvlPcunns5khMkpxoNshvmhy/ZQ==", + "requires": { + "core-js": "2.5.3" + }, + "dependencies": { + "core-js": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" + } + } }, "autoprefixer": { "version": "7.1.6", @@ -9264,6 +9274,9 @@ "verror": "1.10.0" } }, + "jsqr": { + "version": "git+https://github.com/cozmo/jsQR.git#d37c764bf43a41ed7c6aa1c17cbdf21b7f9cb69e" + }, "jsx-ast-utils": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz", @@ -12923,7 +12936,7 @@ "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.2.3.tgz", "integrity": "sha512-QAXuGDqBUPC0p560pskC3yyS8I1jJUnzvZC0PHrd5NayYBQRD4poQfM1D/bxg4jhUaFU4avNhOB3ehMQd4JMvA==", "requires": { - "attr-accept": "1.1.0", + "attr-accept": "1.1.2", "prop-types": "15.5.10" } }, @@ -12949,14 +12962,14 @@ "requires": { "babel-runtime": "6.26.0", "fbjs": "0.8.16", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "warning": "3.0.0" }, "dependencies": { "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -13057,14 +13070,9 @@ "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.0.1.tgz", "integrity": "sha512-J/VuCq/udEqry7Z4nXGTbguetfSdRJr1Cv0lYKbVKIW1blfhB0Xe6OjO+5Th5B8884+s40BDFwtqP67h7YTtYA==", "requires": { - "jsqr": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70", + "jsqr": "git+https://github.com/cozmo/jsQR.git#d37c764bf43a41ed7c6aa1c17cbdf21b7f9cb69e", "prop-types": "15.5.10", "webrtc-adapter": "5.0.6" - }, - "dependencies": { - "jsqr": { - "version": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70" - } } }, "react-redux": { @@ -13962,15 +13970,15 @@ "integrity": "sha1-sp2+vd3bBtIbWwiWIWf7nqwYl9g=", "requires": { "lodash": "4.17.4", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "raf": "3.4.0", "react-transition-group": "2.2.1" }, "dependencies": { "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -14017,13 +14025,13 @@ "integrity": "sha1-A38495fD5rG1jSU0zMjCx2r09S0=", "requires": { "classnames": "2.2.5", - "prop-types": "15.6.0" + "prop-types": "15.6.1" }, "dependencies": { "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -14158,7 +14166,7 @@ "d3-scale": "1.0.6", "d3-shape": "1.2.0", "lodash": "4.17.4", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react-resize-detector": "1.1.0", "react-smooth": "1.0.0", "recharts-scale": "0.3.2", @@ -14171,9 +14179,9 @@ "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=" }, "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -14649,9 +14657,9 @@ } }, "rtcpeerconnection-shim": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.8.tgz", - "integrity": "sha512-5Sx90FGru1sQw9aGOM+kHU4i6mbP8eJPgxliu2X3Syhg8qgDybx8dpDTxUwfJvPnubXFnZeRNl59DWr4AttJKQ==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.9.tgz", + "integrity": "sha512-OoZgZKlK5Vy1wizZorQnpPIWHkScm+70psBLBbtBmTHEuID8I/jnLLYApFAsDL5U9P96s8/+pp9WGBHDeJ+kPw==", "requires": { "sdp": "2.6.0" } @@ -17291,7 +17299,7 @@ "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-5.0.6.tgz", "integrity": "sha512-dh2hPQFOPP0tLEYlFxtGI5vuQmRqkOdYni5wMKUHIx5I2dw0TJ1HdG7P+UechRWt6TvwPWhtbjVNQcQf1KXJmQ==", "requires": { - "rtcpeerconnection-shim": "1.2.8", + "rtcpeerconnection-shim": "1.2.9", "sdp": "2.6.0" } }, diff --git a/package.json b/package.json index ba7bb53..0e1d402 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "@parity/plugin-signer-hardware": "github:parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", "@parity/plugin-signer-qr": "github:parity-js/plugin-signer-qr#c275ba13524e9f6759079fabd10faf49cc00cfc0", "@parity/shared": "2.2.24", - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "keythereum": "1.0.2", "lodash.flatten": "4.4.0", "lodash.omitby": "4.6.0", -- GitLab