diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
commit | 69f4c8c336a0f2fad2027c4a5f76e28a976b5e75 (patch) | |
tree | c34647abca3a765d525e222855a7a93f4658f800 /app/scripts | |
parent | d4a15f22c24074f44daa9eeb4fda192ea3742792 (diff) | |
parent | e715d0e6915a9bb0ac69db06144253ddff54ba44 (diff) | |
download | tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.gz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.zst tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.zip |
fix merge conflicts
Diffstat (limited to 'app/scripts')
-rw-r--r-- | app/scripts/contentscript.js | 1 | ||||
-rw-r--r-- | app/scripts/controllers/network/network.js | 3 | ||||
-rw-r--r-- | app/scripts/controllers/transactions/tx-gas-utils.js | 10 | ||||
-rw-r--r-- | app/scripts/migrations/index.js | 1 | ||||
-rw-r--r-- | app/scripts/platforms/extension.js | 6 | ||||
-rw-r--r-- | app/scripts/ui.js | 1 |
6 files changed, 14 insertions, 8 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 72de16f31..031cfca43 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -178,6 +178,7 @@ function blacklistedDomainCheck () { 'adyen.com', 'gravityforms.com', 'harbourair.com', + 'ani.gamer.com.tw', 'blueskybooking.com', ] var currentUrl = window.location.href diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index a50f6dc45..b6f7705b5 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -9,6 +9,7 @@ const extend = require('xtend') const EthQuery = require('eth-query') const createEventEmitterProxy = require('../../lib/events-proxy.js') const log = require('loglevel') +const urlUtil = require('url') const { ROPSTEN, RINKEBY, @@ -155,6 +156,8 @@ module.exports = class NetworkController extends EventEmitter { } _configureStandardProvider ({ rpcUrl }) { + // urlUtil handles malformed urls + rpcUrl = urlUtil.parse(rpcUrl).format() const providerParams = extend(this._baseProviderParams, { rpcUrl, engineParams: { diff --git a/app/scripts/controllers/transactions/tx-gas-utils.js b/app/scripts/controllers/transactions/tx-gas-utils.js index ab4031faa..5cd0f5407 100644 --- a/app/scripts/controllers/transactions/tx-gas-utils.js +++ b/app/scripts/controllers/transactions/tx-gas-utils.js @@ -30,14 +30,10 @@ class TxGasUtil { try { estimatedGasHex = await this.estimateTxGas(txMeta, block.gasLimit) } catch (err) { - const simulationFailed = ( - err.message.includes('Transaction execution error.') || - err.message.includes('gas required exceeds allowance or always failing transaction') - ) - if (simulationFailed) { - txMeta.simulationFails = true - return txMeta + txMeta.simulationFails = { + reason: err.message, } + return txMeta } this.setTxGas(txMeta, block.gasLimit, estimatedGasHex) return txMeta diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js index 04d90bfff..bd0005221 100644 --- a/app/scripts/migrations/index.js +++ b/app/scripts/migrations/index.js @@ -37,4 +37,5 @@ module.exports = [ require('./024'), require('./025'), require('./026'), + require('./027'), ] diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js index 452a51bd8..844670537 100644 --- a/app/scripts/platforms/extension.js +++ b/app/scripts/platforms/extension.js @@ -13,6 +13,12 @@ class ExtensionPlatform { extension.tabs.create({ url }) } + closeCurrentWindow () { + return extension.windows.getCurrent((windowDetails) => { + return extension.windows.remove(windowDetails.id) + }) + } + getVersion () { return extension.runtime.getManifest().version } diff --git a/app/scripts/ui.js b/app/scripts/ui.js index 9bf97be87..da100f928 100644 --- a/app/scripts/ui.js +++ b/app/scripts/ui.js @@ -64,7 +64,6 @@ async function start () { css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss() deleteInjectedCss = injectCss(css) } - if (state.appState.shouldClose) notificationManager.closePopup() }) }) |