From c2c7231cad8cb24995dfd2255f2ab07ffbfbe75f Mon Sep 17 00:00:00 2001 From: Nicolas Gotchac Date: Tue, 30 May 2017 19:28:50 +0200 Subject: [PATCH] Recover from empty phrase in dev mode (#5698) * Add dev chain to isTest * Fix signer * Fix no condfition transactions * Fix case : old parity * Fix propTypes. --- js/src/redux/providers/status.js | 7 +-- js/src/ui/TxList/TxRow/txRow.js | 4 +- .../components/RequestOrigin/requestOrigin.js | 11 +++- js/yarn.lock | 51 ++++++++++++++++++- 4 files changed, 65 insertions(+), 8 deletions(-) diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js index e2e4b81de..ef329f662 100644 --- a/js/src/redux/providers/status.js +++ b/js/src/redux/providers/status.js @@ -254,9 +254,10 @@ export default class Status { .all(statusPromises) .then(([nodeKind, netPeers, clientVersion, netVersion, netChain]) => { const isTest = [ - '2', // morden - '3', // ropsten - '42' // kovan + '2', // morden + '3', // ropsten, + '17', // devchain + '42' // kovan ].includes(netVersion); const nodeKindFull = nodeKind && diff --git a/js/src/ui/TxList/TxRow/txRow.js b/js/src/ui/TxList/TxRow/txRow.js index c839a04b1..c2061a581 100644 --- a/js/src/ui/TxList/TxRow/txRow.js +++ b/js/src/ui/TxList/TxRow/txRow.js @@ -319,7 +319,7 @@ class TxRow extends Component { getCondition = () => { const { blockNumber, tx } = this.props; - let { time, block } = tx.condition; + let { time, block } = tx.condition || {}; if (time) { if ((time.getTime() - Date.now()) >= 0) { @@ -336,7 +336,7 @@ class TxRow extends Component { } else { return 'submitting'; } - } else if (blockNumber) { + } else if (blockNumber && block) { block = blockNumber.minus(block); // return (block.toNumber() < 0) // ? block.abs().toFormat(0) + ' blocks left' diff --git a/js/src/views/Signer/components/RequestOrigin/requestOrigin.js b/js/src/views/Signer/components/RequestOrigin/requestOrigin.js index 435d90a6b..0f5055a1f 100644 --- a/js/src/views/Signer/components/RequestOrigin/requestOrigin.js +++ b/js/src/views/Signer/components/RequestOrigin/requestOrigin.js @@ -29,7 +29,12 @@ export default class RequestOrigin extends Component { static propTypes = { origin: PropTypes.shape({ type: PropTypes.oneOf(['unknown', 'dapp', 'rpc', 'ipc', 'signer']), - details: PropTypes.string.isRequired + details: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.shape({ + session: PropTypes.string.isRequired + }) + ]).isRequired }).isRequired }; @@ -126,7 +131,9 @@ export default class RequestOrigin extends Component { } if (origin.type === 'signer') { - return this.renderSigner(origin.details); + const session = origin.details && origin.details.session || origin.details; + + return this.renderSigner(session); } } diff --git a/js/yarn.lock b/js/yarn.lock index c1367d8fe..6a817fe5e 100644 --- a/js/yarn.lock +++ b/js/yarn.lock @@ -724,6 +724,15 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015 babel-runtime "^6.22.0" babel-template "^6.22.0" +babel-plugin-transform-es2015-modules-commonjs@6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe" + dependencies: + babel-plugin-transform-strict-mode "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-types "^6.24.1" + babel-plugin-transform-es2015-modules-commonjs@^6.22.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.0, babel-plugin-transform-es2015-modules-commonjs@^6.6.0: version "6.24.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f" @@ -895,6 +904,13 @@ babel-plugin-transform-strict-mode@^6.22.0: babel-runtime "^6.22.0" babel-types "^6.22.0" +babel-plugin-transform-strict-mode@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + babel-plugin-webpack-alias@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/babel-plugin-webpack-alias/-/babel-plugin-webpack-alias-2.1.2.tgz#05a1ba23c28595660fb6ea5736424fc596b4a247" @@ -904,7 +920,7 @@ babel-plugin-webpack-alias@2.1.2: lodash.some "^4.5.1" lodash.template "^4.3.0" -babel-polyfill@6.23.0, babel-polyfill@^6.23.0: +babel-polyfill@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d" dependencies: @@ -1070,6 +1086,16 @@ babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0, babel-te babylon "^6.11.0" lodash "^4.2.0" +babel-template@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333" + dependencies: + babel-runtime "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + babylon "^6.11.0" + lodash "^4.2.0" + babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.19.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1: version "6.23.1" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48" @@ -1084,6 +1110,20 @@ babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.19.0, babel-tr invariant "^2.2.0" lodash "^4.2.0" +babel-traverse@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695" + dependencies: + babel-code-frame "^6.22.0" + babel-messages "^6.23.0" + babel-runtime "^6.22.0" + babel-types "^6.24.1" + babylon "^6.15.0" + debug "^2.2.0" + globals "^9.0.0" + invariant "^2.2.0" + lodash "^4.2.0" + babel-types@^6.14.0, babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf" @@ -1093,6 +1133,15 @@ babel-types@^6.14.0, babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19 lodash "^4.2.0" to-fast-properties "^1.0.1" +babel-types@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975" + dependencies: + babel-runtime "^6.22.0" + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^1.0.1" + babylon@^6.11.0, babylon@^6.13.0, babylon@^6.14.1, babylon@^6.15.0: version "6.16.1" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"