m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix multiple signature requests showing an infinite spinner

Browse Source
This commit is contained in:
Alexander Tseung 2018-07-10 12:21:09 -07:00
parent f6e90bb3db
commit 76e80f631e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/app/components/signature-request.js
View File

@ -22,6 +22,8 @@ const {
conversionRateSelector, conversionRateSelector,
} = require('../selectors.js') } = require('../selectors.js')
import { clearConfirmTransaction } from '../ducks/confirm-transaction.duck'
const { DEFAULT_ROUTE } = require('../routes') const { DEFAULT_ROUTE } = require('../routes')
function mapStateToProps (state) { function mapStateToProps (state) {
@ -39,6 +41,7 @@ function mapStateToProps (state) {
function mapDispatchToProps (dispatch) { function mapDispatchToProps (dispatch) {
return { return {
goHome: () => dispatch(actions.goHome()), goHome: () => dispatch(actions.goHome()),
clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
} }
} }
@ -247,12 +250,18 @@ SignatureRequest.prototype.renderFooter = function () {
return h('div.request-signature__footer', [ return h('div.request-signature__footer', [
h('button.btn-default.btn--large.request-signature__footer__cancel-button', { h('button.btn-default.btn--large.request-signature__footer__cancel-button', {
onClick: event => { onClick: event => {
cancel(event).then(() => this.props.history.push(DEFAULT_ROUTE)) cancel(event).then(() => {
this.props.clearConfirmTransaction()
this.props.history.push(DEFAULT_ROUTE)
})
}, },
}, this.context.t('cancel')), }, this.context.t('cancel')),
h('button.btn-primary.btn--large', { h('button.btn-primary.btn--large', {
onClick: event => { onClick: event => {
sign(event).then(() => this.props.history.push(DEFAULT_ROUTE)) sign(event).then(() => {
this.props.clearConfirmTransaction()
this.props.history.push(DEFAULT_ROUTE)
})
}, },
}, this.context.t('sign')), }, this.context.t('sign')),
]) ])