From 7c9fcf26ba16288e7fbaa019cdec522284ff611a Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 27 Mar 2018 02:07:31 -0230 Subject: Stop using navigateTo for external link in settings. --- old-ui/app/config.js | 5 ----- 1 file changed, 5 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/config.js b/old-ui/app/config.js index 9e07cf348..7da3694ac 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -168,7 +168,6 @@ ConfigScreen.prototype.render = function () { h('a', { href: 'http://metamask.helpscoutdocs.com/article/36-resetting-an-account', target: '_blank', - onClick (event) { this.navigateTo(event.target.href) }, }, 'Read more.'), ]), h('br'), @@ -260,7 +259,3 @@ function currentProviderDisplay (metamaskState) { h('span', value), ]) } - -ConfigScreen.prototype.navigateTo = function (url) { - global.platform.openWindow({ url }) -} -- cgit v1.2.3 From 21b6a3442d8cae8c95a3d7e0b9e216d91bc8bd19 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 28 Mar 2018 10:51:16 -0230 Subject: Fix display of unapprovedMessages in txList (old and new ui); includes fix of undefined txParams. --- old-ui/app/components/transaction-list-item.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'old-ui') diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index 7ab3414e5..f7d59005a 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -31,6 +31,11 @@ function TransactionListItem () { TransactionListItem.prototype.showRetryButton = function () { const { transaction = {}, transactions } = this.props const { status, submittedTime, txParams } = transaction + + if (!txParams) { + return false + } + const currentNonce = txParams.nonce const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') -- cgit v1.2.3 From 10609493c5a23a930dd8f7bda0435e576fd24815 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Mar 2018 22:30:35 -0700 Subject: ui - use relative location for images --- old-ui/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'old-ui') diff --git a/old-ui/app/app.js b/old-ui/app/app.js index c79ac633a..e9ab185f3 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -171,7 +171,7 @@ App.prototype.renderAppBar = function () { h('img', { height: 24, width: 24, - src: '/images/icon-128.png', + src: './images/icon-128.png', }), h(NetworkIndicator, { -- cgit v1.2.3 From 4d2d3d443076e4b399c5e9266c62e3f09218d069 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 29 Mar 2018 12:28:50 -0700 Subject: Increase permitted safe gas limit Block gas limits have been incredibly stable lately: https://etherscan.io/chart/gaslimit And this validation has prevented Aragon's new beta from working: https://twitter.com/izqui9/status/979373309312815104 Fixes #3790 --- old-ui/app/components/pending-tx.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js index 720df2243..7f63d9fdf 100644 --- a/old-ui/app/components/pending-tx.js +++ b/old-ui/app/components/pending-tx.js @@ -62,8 +62,8 @@ PendingTx.prototype.render = function () { const gasBn = hexToBn(gas) // default to 8MM gas limit const gasLimit = new BN(parseInt(blockGasLimit) || '8000000') - const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20) - const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20) + const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 99, 100) + const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 98, 100) const safeGasLimit = safeGasLimitBN.toString(10) // Gas Price @@ -311,7 +311,7 @@ PendingTx.prototype.render = function () { style: { fontSize: '0.9em', }, - }, 'Gas limit set dangerously high. Approving this transaction is likely to fail.') + }, 'Gas limit set dangerously high. Approving this transaction is liable to fail.') : null, ]), -- cgit v1.2.3 From b7b95f269d8b1a2237bfe25e36e8a9832116a6b2 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 2 Apr 2018 12:48:01 -0700 Subject: old-ui - lint fixes --- old-ui/app/app.js | 1 - old-ui/app/components/buy-button-subview.js | 1 - old-ui/app/components/qr-code.js | 1 - old-ui/app/components/transaction-list-item.js | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/app.js b/old-ui/app/app.js index e9ab185f3..37611987f 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -581,7 +581,6 @@ App.prototype.renderPrimary = function () { case 'qr': log.debug('rendering show qr screen') - console.log(`QrView`, QrView); return h('div', { style: { position: 'absolute', diff --git a/old-ui/app/components/buy-button-subview.js b/old-ui/app/components/buy-button-subview.js index 843627c33..56d173839 100644 --- a/old-ui/app/components/buy-button-subview.js +++ b/old-ui/app/components/buy-button-subview.js @@ -247,7 +247,6 @@ BuyButtonSubview.prototype.backButtonContext = function () { if (this.props.context === 'confTx') { this.props.dispatch(actions.showConfTxPage(false)) } else { - console.log(`actions.goHome`, actions.goHome); this.props.dispatch(actions.goHome()) } } diff --git a/old-ui/app/components/qr-code.js b/old-ui/app/components/qr-code.js index fa38dcd92..06b9aed9b 100644 --- a/old-ui/app/components/qr-code.js +++ b/old-ui/app/components/qr-code.js @@ -25,7 +25,6 @@ function QrCodeView () { QrCodeView.prototype.render = function () { const props = this.props const Qr = props.Qr - console.log(`QrCodeView Qr`, Qr); const address = `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}` const qrImage = qrCode(4, 'M') qrImage.addData(address) diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index f7d59005a..b9f82c668 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -30,7 +30,7 @@ function TransactionListItem () { TransactionListItem.prototype.showRetryButton = function () { const { transaction = {}, transactions } = this.props - const { status, submittedTime, txParams } = transaction + const { submittedTime, txParams } = transaction if (!txParams) { return false -- cgit v1.2.3 From f0e4097972342ea9b8f0e40ef24a1b9ea33d1812 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 2 Apr 2018 12:52:01 -0700 Subject: lint - remove use of 'event' global --- old-ui/app/components/range-slider.js | 4 ++-- old-ui/app/config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/components/range-slider.js b/old-ui/app/components/range-slider.js index 823f5eb01..bae740a74 100644 --- a/old-ui/app/components/range-slider.js +++ b/old-ui/app/components/range-slider.js @@ -35,7 +35,7 @@ RangeSlider.prototype.render = function () { step: increment, style: range, value: state.value || defaultValue, - onChange: mirrorInput ? this.mirrorInputs.bind(this, event) : onInput, + onChange: mirrorInput ? this.mirrorInputs.bind(this) : onInput, }), // Mirrored input for range @@ -47,7 +47,7 @@ RangeSlider.prototype.render = function () { value: state.value || defaultValue, step: increment, style: input, - onChange: this.mirrorInputs.bind(this, event), + onChange: this.mirrorInputs.bind(this), }) : null, ]) ) diff --git a/old-ui/app/config.js b/old-ui/app/config.js index 7da3694ac..508770bd4 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -42,7 +42,7 @@ ConfigScreen.prototype.render = function () { // subtitle and nav h('.section-title.flex-row.flex-center', [ h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { - onClick: (event) => { + onClick: () => { state.dispatch(actions.goHome()) }, }), -- cgit v1.2.3 From 18e0a7e4f98fcad3c49fecf94bcfdc9bb1b50e0f Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 4 Apr 2018 16:26:05 -0700 Subject: Add target=_blank exportAsFile --- old-ui/app/util.js | 1 + 1 file changed, 1 insertion(+) (limited to 'old-ui') diff --git a/old-ui/app/util.js b/old-ui/app/util.js index 3f8b4dcc3..30ae308d2 100644 --- a/old-ui/app/util.js +++ b/old-ui/app/util.js @@ -231,6 +231,7 @@ function exportAsFile (filename, data) { window.navigator.msSaveBlob(blob, filename) } else { const elem = window.document.createElement('a') + elem.target = "_blank" elem.href = window.URL.createObjectURL(blob) elem.download = filename document.body.appendChild(elem) -- cgit v1.2.3 From 4ffa74cbe6b5415b11ace8c4c2f32bce40a2e247 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 4 Apr 2018 16:42:54 -0700 Subject: Change double-quotes to single-quotes --- old-ui/app/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'old-ui') diff --git a/old-ui/app/util.js b/old-ui/app/util.js index 30ae308d2..962832ce7 100644 --- a/old-ui/app/util.js +++ b/old-ui/app/util.js @@ -231,7 +231,7 @@ function exportAsFile (filename, data) { window.navigator.msSaveBlob(blob, filename) } else { const elem = window.document.createElement('a') - elem.target = "_blank" + elem.target = '_blank' elem.href = window.URL.createObjectURL(blob) elem.download = filename document.body.appendChild(elem) -- cgit v1.2.3