diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-02-22 02:22:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 02:22:19 +0800 |
| commit | b8ee83e973687dffee0700dbf8e6895cf63a9ac8 (patch) | |
| tree | fb8528b7bd20d272f736a74b28bd5e25cb750b67 /old-ui | |
| parent | 13b12efa033a7961d59372bd53473f6251458d98 (diff) | |
| parent | c26c57fad774e21fcb0b817227e9d0d99418f8a0 (diff) | |
| download | tangerine-wallet-browser-b8ee83e973687dffee0700dbf8e6895cf63a9ac8.tar.gz tangerine-wallet-browser-b8ee83e973687dffee0700dbf8e6895cf63a9ac8.tar.zst tangerine-wallet-browser-b8ee83e973687dffee0700dbf8e6895cf63a9ac8.zip | |
Merge pull request #3296 from danjm/MM-806-new-ui-first-time-import-seed-in-popup
[NewUI] Fix Import Existing DEN in popup New UI first time flow.
Diffstat (limited to 'old-ui')
| -rw-r--r-- | old-ui/app/app.js | 4 | ||||
| -rw-r--r-- | old-ui/app/components/pending-tx.js | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 61f6223bc..c79ac633a 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -456,7 +456,9 @@ App.prototype.renderPrimary = function () { // notices if (!props.noActiveNotices) { log.debug('rendering notice screen for unread notices.') - return h('div', [ + return h('div', { + style: { width: '100%' }, + }, [ h(NoticeScreen, { notice: props.lastUnreadNotice, diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js index 10208b5ce..720df2243 100644 --- a/old-ui/app/components/pending-tx.js +++ b/old-ui/app/components/pending-tx.js @@ -60,7 +60,8 @@ PendingTx.prototype.render = function () { // Gas const gas = txParams.gas const gasBn = hexToBn(gas) - const gasLimit = new BN(parseInt(blockGasLimit)) + // 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 safeGasLimit = safeGasLimitBN.toString(10) |