TheDude
/
ciphermask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix transaction confirmations

Browse Source
feature/default_network_editable
Alexander Tseung 7 years ago
parent 2e9273d2ac
commit bf38aa6f1d
4 changed files with 161 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 98
      package-lock.json
  2. 30
      ui/app/components/pages/home.js
  3. 19
      ui/app/conf-tx.js
  4. 49
      yarn.lock

98
package-lock.json generated
Unescape View File

@ -5112,7 +5112,7 @@
"lodash": "4.17.4", "lodash": "4.17.4",
"object.assign": "4.1.0", "object.assign": "4.1.0",
"object.values": "1.0.4", "object.values": "1.0.4",
"prop-types": "15.6.0" "prop-types": "15.6.1"
} }
}, },
"enzyme-adapter-utils": { "enzyme-adapter-utils": {
@ -5123,7 +5123,7 @@
"requires": { "requires": {
"lodash": "4.17.4", "lodash": "4.17.4",
"object.assign": "4.1.0", "object.assign": "4.1.0",
"prop-types": "15.6.0" "prop-types": "15.6.1"
} }
}, },
"errno": { "errno": {
@ -5454,7 +5454,7 @@
"doctrine": "2.0.2", "doctrine": "2.0.2",
"has": "1.0.1", "has": "1.0.1",
"jsx-ast-utils": "2.0.1", "jsx-ast-utils": "2.0.1",
"prop-types": "15.6.0" "prop-types": "15.6.1"
} }
}, },
"eslint-scope": { "eslint-scope": {
@ -10394,6 +10394,18 @@
"request": "2.83.0" "request": "2.83.0"
} }
}, },
"history": {
"version": "4.7.2",
"resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz",
"integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==",
"requires": {
"invariant": "2.2.2",
"loose-envify": "1.3.1",
"resolve-pathname": "2.2.0",
"value-equal": "0.4.0",
"warning": "3.0.0"
}
},
"hmac-drbg": { "hmac-drbg": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@ -18886,9 +18898,9 @@
} }
}, },
"prop-types": { "prop-types": {
"version": "15.6.0", "version": "15.6.1",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
"integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
"requires": { "requires": {
"fbjs": "0.8.16", "fbjs": "0.8.16",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
@ -19316,7 +19328,7 @@
"fbjs": "0.8.16", "fbjs": "0.8.16",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
"object-assign": "4.1.1", "object-assign": "4.1.1",
"prop-types": "15.6.0" "prop-types": "15.6.1"
} }
}, },
"react-addons-css-transition-group": { "react-addons-css-transition-group": {
@ -19335,7 +19347,7 @@
"chain-function": "1.0.0", "chain-function": "1.0.0",
"dom-helpers": "3.3.1", "dom-helpers": "3.3.1",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
"prop-types": "15.6.0", "prop-types": "15.6.1",
"warning": "3.0.0" "warning": "3.0.0"
} }
} }
@ -19355,7 +19367,7 @@
"fbjs": "0.8.16", "fbjs": "0.8.16",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
"object-assign": "4.1.1", "object-assign": "4.1.1",
"prop-types": "15.6.0" "prop-types": "15.6.1"
} }
}, },
"react-hyperscript": { "react-hyperscript": {
@ -19368,7 +19380,7 @@
"resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.1.2.tgz", "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.1.2.tgz",
"integrity": "sha512-uAfIE4XEfBNXqjqQvd31Eoo20UkVk0xHJpfgP8HRT8gLczaN4LEmB1e2d8CJ5ziEt4clWnsk/1+QhTN27iO/EA==", "integrity": "sha512-uAfIE4XEfBNXqjqQvd31Eoo20UkVk0xHJpfgP8HRT8gLczaN4LEmB1e2d8CJ5ziEt4clWnsk/1+QhTN27iO/EA==",
"requires": { "requires": {
"prop-types": "15.6.0" "prop-types": "15.6.1"
} }
}, },
"react-markdown": { "react-markdown": {
@ -19376,7 +19388,7 @@
"resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-3.1.4.tgz", "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-3.1.4.tgz",
"integrity": "sha512-i8WueytRXbYzyJ2GemIOTMRx/NigPo8r4m3R/KvWD7r+PxPyc9ke66cI3DR7MBRSS+nVG82VWEgRDE1VaZUCqA==", "integrity": "sha512-i8WueytRXbYzyJ2GemIOTMRx/NigPo8r4m3R/KvWD7r+PxPyc9ke66cI3DR7MBRSS+nVG82VWEgRDE1VaZUCqA==",
"requires": { "requires": {
"prop-types": "15.6.0", "prop-types": "15.6.1",
"remark-parse": "4.0.0", "remark-parse": "4.0.0",
"unified": "6.1.6", "unified": "6.1.6",
"unist-util-visit": "1.3.0", "unist-util-visit": "1.3.0",
@ -19389,7 +19401,7 @@
"integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==", "integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
"requires": { "requires": {
"performance-now": "0.2.0", "performance-now": "0.2.0",
"prop-types": "15.6.0", "prop-types": "15.6.1",
"raf": "3.4.0" "raf": "3.4.0"
}, },
"dependencies": { "dependencies": {
@ -19410,7 +19422,49 @@
"lodash": "4.17.4", "lodash": "4.17.4",
"lodash-es": "4.17.4", "lodash-es": "4.17.4",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
"prop-types": "15.6.0" "prop-types": "15.6.1"
}
},
"react-router": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-4.2.0.tgz",
"integrity": "sha512-DY6pjwRhdARE4TDw7XjxjZsbx9lKmIcyZoZ+SDO7SBJ1KUeWNxT22Kara2AC7u6/c2SYEHlEDLnzBCcNhLE8Vg==",
"requires": {
"history": "4.7.2",
"hoist-non-react-statics": "2.3.1",
"invariant": "2.2.2",
"loose-envify": "1.3.1",
"path-to-regexp": "1.7.0",
"prop-types": "15.6.1",
"warning": "3.0.0"
},
"dependencies": {
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
},
"path-to-regexp": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
"requires": {
"isarray": "0.0.1"
}
}
}
},
"react-router-dom": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.2.2.tgz",
"integrity": "sha512-cHMFC1ZoLDfEaMFoKTjN7fry/oczMgRt5BKfMAkTu5zEuJvUiPp1J8d0eXSVTnBh6pxlbdqDhozunOOLtmKfPA==",
"requires": {
"history": "4.7.2",
"invariant": "2.2.2",
"loose-envify": "1.3.1",
"prop-types": "15.6.1",
"react-router": "4.2.0",
"warning": "3.0.0"
} }
}, },
"react-select": { "react-select": {
@ -19419,7 +19473,7 @@
"integrity": "sha512-c4CdxweEHN9ra85HGWjSjIMBlJ5c0fsIXOymLFZS5UbZEQCiJGHnZTVLTt6/wDh8RKQnxl85gHUwzhG5XZLcyw==", "integrity": "sha512-c4CdxweEHN9ra85HGWjSjIMBlJ5c0fsIXOymLFZS5UbZEQCiJGHnZTVLTt6/wDh8RKQnxl85gHUwzhG5XZLcyw==",
"requires": { "requires": {
"classnames": "2.2.5", "classnames": "2.2.5",
"prop-types": "15.6.0", "prop-types": "15.6.1",
"react-input-autosize": "2.1.2" "react-input-autosize": "2.1.2"
} }
}, },
@ -19428,7 +19482,7 @@
"resolved": "https://registry.npmjs.org/react-simple-file-input/-/react-simple-file-input-2.0.1.tgz", "resolved": "https://registry.npmjs.org/react-simple-file-input/-/react-simple-file-input-2.0.1.tgz",
"integrity": "sha1-Fa1P/Hj+sbiCZJrWsBwDPvJ1ceY=", "integrity": "sha1-Fa1P/Hj+sbiCZJrWsBwDPvJ1ceY=",
"requires": { "requires": {
"prop-types": "15.6.0" "prop-types": "15.6.1"
} }
}, },
"react-test-renderer": { "react-test-renderer": {
@ -19472,7 +19526,7 @@
"resolved": "https://registry.npmjs.org/react-toggle-button/-/react-toggle-button-2.2.0.tgz", "resolved": "https://registry.npmjs.org/react-toggle-button/-/react-toggle-button-2.2.0.tgz",
"integrity": "sha1-obkhQ6oN9BRkL8sUHwh59UW8Wok=", "integrity": "sha1-obkhQ6oN9BRkL8sUHwh59UW8Wok=",
"requires": { "requires": {
"prop-types": "15.6.0", "prop-types": "15.6.1",
"react-motion": "0.5.2" "react-motion": "0.5.2"
} }
}, },
@ -19499,7 +19553,7 @@
"classnames": "2.2.5", "classnames": "2.2.5",
"dom-helpers": "3.3.1", "dom-helpers": "3.3.1",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
"prop-types": "15.6.0", "prop-types": "15.6.1",
"warning": "3.0.0" "warning": "3.0.0"
} }
}, },
@ -20058,6 +20112,11 @@
"value-or-function": "3.0.0" "value-or-function": "3.0.0"
} }
}, },
"resolve-pathname": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz",
"integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="
},
"resolve-url": { "resolve-url": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@ -23736,6 +23795,11 @@
"spdx-expression-parse": "1.0.4" "spdx-expression-parse": "1.0.4"
} }
}, },
"value-equal": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz",
"integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw=="
},
"value-or-function": { "value-or-function": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",

30
ui/app/components/pages/home.js
Unescape View File

@ -27,6 +27,22 @@ const {
} = require('../../routes') } = require('../../routes')
class Home extends Component { class Home extends Component {
componentDidMount () {
const {
history,
unapprovedTxs = {},
unapprovedMsgCount = 0,
unapprovedPersonalMsgCount = 0,
unapprovedTypedMessagesCount = 0,
} = this.props
// unapprovedTxs and unapproved messages
if (Object.keys(unapprovedTxs).length ||
unapprovedTypedMessagesCount + unapprovedMsgCount + unapprovedPersonalMsgCount > 0) {
history.push(CONFIRM_TRANSACTION_ROUTE)
}
}
render () { render () {
log.debug('rendering primary') log.debug('rendering primary')
const { const {
@ -36,10 +52,6 @@ class Home extends Component {
currentView, currentView,
activeAddress, activeAddress,
seedWords, seedWords,
unapprovedTxs = {},
unapprovedMsgCount = 0,
unapprovedPersonalMsgCount = 0,
unapprovedTypedMessagesCount = 0,
} = this.props } = this.props
// notices // notices
@ -70,16 +82,6 @@ class Home extends Component {
}) })
} }
// unapprovedTxs and unapproved messages
if (Object.keys(unapprovedTxs).length ||
unapprovedTypedMessagesCount + unapprovedMsgCount + unapprovedPersonalMsgCount > 0) {
return h(Redirect, {
to: {
pathname: CONFIRM_TRANSACTION_ROUTE,
},
})
}
// if (!props.noActiveNotices) { // if (!props.noActiveNotices) {
// log.debug('rendering notice screen for unread notices.') // log.debug('rendering notice screen for unread notices.')
// return h(NoticeScreen, { // return h(NoticeScreen, {

19
ui/app/conf-tx.js
Unescape View File

@ -2,7 +2,7 @@ const inherits = require('util').inherits
const Component = require('react').Component const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const connect = require('react-redux').connect const connect = require('react-redux').connect
const { withRouter, Redirect } = require('react-router-dom') const { withRouter } = require('react-router-dom')
const { compose } = require('recompose') const { compose } = require('recompose')
const actions = require('./actions') const actions = require('./actions')
const txHelper = require('../lib/tx-helper') const txHelper = require('../lib/tx-helper')
@ -25,6 +25,7 @@ function mapStateToProps (state) {
const { const {
unapprovedMsgCount, unapprovedMsgCount,
unapprovedPersonalMsgCount, unapprovedPersonalMsgCount,
unapprovedTypedMessagesCount,
} = metamask } = metamask
return { return {
@ -45,6 +46,7 @@ function mapStateToProps (state) {
computedBalances: state.metamask.computedBalances, computedBalances: state.metamask.computedBalances,
unapprovedMsgCount, unapprovedMsgCount,
unapprovedPersonalMsgCount, unapprovedPersonalMsgCount,
unapprovedTypedMessagesCount,
send: state.metamask.send, send: state.metamask.send,
selectedAddressTxList: state.metamask.selectedAddressTxList, selectedAddressTxList: state.metamask.selectedAddressTxList,
} }
@ -55,6 +57,16 @@ function ConfirmTxScreen () {
Component.call(this) Component.call(this)
} }
ConfirmTxScreen.prototype.getUnapprovedMessagesTotal = function () {
const {
unapprovedMsgCount = 0,
unapprovedPersonalMsgCount = 0,
unapprovedTypedMessagesCount = 0,
} = this.props
return unapprovedTypedMessagesCount + unapprovedMsgCount + unapprovedPersonalMsgCount
}
ConfirmTxScreen.prototype.componentDidMount = function () { ConfirmTxScreen.prototype.componentDidMount = function () {
const { const {
unapprovedTxs = {}, unapprovedTxs = {},
@ -63,7 +75,7 @@ ConfirmTxScreen.prototype.componentDidMount = function () {
} = this.props } = this.props
const unconfTxList = txHelper(unapprovedTxs, {}, {}, {}, network) const unconfTxList = txHelper(unapprovedTxs, {}, {}, {}, network)
if (unconfTxList.length === 0 && !send.to) { if (unconfTxList.length === 0 && !send.to && this.getUnapprovedMessagesTotal() === 0) {
this.props.history.push(DEFAULT_ROUTE) this.props.history.push(DEFAULT_ROUTE)
} }
} }
@ -81,7 +93,8 @@ ConfirmTxScreen.prototype.componentDidUpdate = function (prevProps) {
const prevTx = selectedAddressTxList.find(({ id }) => id === prevTxData.id) || {} const prevTx = selectedAddressTxList.find(({ id }) => id === prevTxData.id) || {}
const unconfTxList = txHelper(unapprovedTxs, {}, {}, {}, network) const unconfTxList = txHelper(unapprovedTxs, {}, {}, {}, network)
if (unconfTxList.length === 0 && (prevTx.status === 'dropped' || !send.to)) { if (unconfTxList.length === 0 &&
(prevTx.status === 'dropped' || !send.to && this.getUnapprovedMessagesTotal() === 0)) {
this.props.history.push(DEFAULT_ROUTE) this.props.history.push(DEFAULT_ROUTE)
} }
} }

49
yarn.lock
Unescape View File

@ -646,6 +646,47 @@ async-settle@^1.0.0:
dependencies: dependencies:
async-done "^1.2.2" async-done "^1.2.2"
async.queue@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.queue/-/async.queue-0.5.2.tgz#8d5d90812e1481066bc0904e8cc1712b17c3bd7c"
dependencies:
async.util.queue "0.5.2"
async.util.arrayeach@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.util.arrayeach/-/async.util.arrayeach-0.5.2.tgz#58c4e98028d55d69bfb05aeb3af44e0a555a829c"
async.util.isarray@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.util.isarray/-/async.util.isarray-0.5.2.tgz#e62dac8f2636f65875dcf7521c2d24d0dfb2bbdf"
async.util.map@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.util.map/-/async.util.map-0.5.2.tgz#e588ef86e0b3ab5f027d97af4d6835d055ca69d6"
async.util.noop@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.util.noop/-/async.util.noop-0.5.2.tgz#bdd62b97cb0aa3f60b586ad148468698975e58b9"
async.util.onlyonce@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.util.onlyonce/-/async.util.onlyonce-0.5.2.tgz#b8e6fc004adc923164d79e32f2813ee465c24ff2"
async.util.queue@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.util.queue/-/async.util.queue-0.5.2.tgz#57f65abe1a3cdf273d31abd28ab95425f8222ee5"
dependencies:
async.util.arrayeach "0.5.2"
async.util.isarray "0.5.2"
async.util.map "0.5.2"
async.util.noop "0.5.2"
async.util.onlyonce "0.5.2"
async.util.setimmediate "0.5.2"
async.util.setimmediate@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/async.util.setimmediate/-/async.util.setimmediate-0.5.2.tgz#2812ebabf2a58027758d4bc7793d1ccfaf10255f"
async@^1.4.0, async@^1.4.2, async@^1.5.0: async@^1.4.0, async@^1.4.2, async@^1.5.0:
version "1.5.2" version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@ -5854,6 +5895,12 @@ gulp-livereload@^3.8.1:
lodash.assign "^3.0.0" lodash.assign "^3.0.0"
mini-lr "^0.1.8" mini-lr "^0.1.8"
gulp-multi-process@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/gulp-multi-process/-/gulp-multi-process-1.3.1.tgz#e12aa818e4c234357ad99d5caff8df8a18f46e9e"
dependencies:
async.queue "^0.5.2"
gulp-replace@^0.6.1: gulp-replace@^0.6.1:
version "0.6.1" version "0.6.1"
resolved "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-0.6.1.tgz#11bf8c8fce533e33e2f6a8f2f430b955ba0be066" resolved "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-0.6.1.tgz#11bf8c8fce533e33e2f6a8f2f430b955ba0be066"
@ -12680,7 +12727,7 @@ uglify-to-browserify@~1.0.0:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
uglifyify@^4.0.2: uglifyify@^4.0.5:
version "4.0.5" version "4.0.5"
resolved "https://registry.yarnpkg.com/uglifyify/-/uglifyify-4.0.5.tgz#49c1fca9828c10a5a8e8d70f191a95f7ab475911" resolved "https://registry.yarnpkg.com/uglifyify/-/uglifyify-4.0.5.tgz#49c1fca9828c10a5a8e8d70f191a95f7ab475911"
dependencies: dependencies:

Write Preview
Loading…
Cancel
Save