From 8bb57f33b186e373ee6be4cb8f7418d38934f218 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Wed, 17 Jan 2018 18:17:41 -0800 Subject: [PATCH 1/9] add a `x` close button to gas calc loding screen on conf-tx --- ui/app/components/loading.js | 12 +++++++++++- ui/app/conf-tx.js | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ui/app/components/loading.js b/ui/app/components/loading.js index 163792584..b8e2eb599 100644 --- a/ui/app/components/loading.js +++ b/ui/app/components/loading.js @@ -11,7 +11,7 @@ function LoadingIndicator () { } LoadingIndicator.prototype.render = function () { - const { isLoading, loadingMessage } = this.props + const { isLoading, loadingMessage, canBypass, bypass } = this.props return ( isLoading ? h('.full-flex-height', { @@ -28,6 +28,16 @@ LoadingIndicator.prototype.render = function () { background: 'rgba(255, 255, 255, 0.8)', }, }, [ + canBypass ? h( 'i.fa.fa-close.cursor-pointer.close-loading', { + style: { + position: 'absolute', + top: '1px', + right: '15px', + color: '#AEAEAE', + }, + onClick: bypass, + }) : null, + h('img', { src: 'images/loading.svg', }), diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index ce4d153b5..9c8f98fa8 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -62,8 +62,12 @@ ConfirmTxScreen.prototype.render = function () { h('.flex-column.flex-grow', [ h(LoadingIndicator, { - isLoading: txData.loadingDefaults, + isLoading: this.state ? !this.state.bypassLoadingScreen : txData.loadingDefaults, loadingMessage: 'Estimating transaction cost…', + canBypass: true, + bypass: () => { + this.setState({bypassLoadingScreen: true}) + }, }), // subtitle and nav From 02df9a6bd1f0e7b2fca3d143e82e8956b09d01b1 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 19 Jan 2018 12:16:53 -0800 Subject: [PATCH 2/9] deps - bump providers for better JSON parse error messages --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0f36a1816..ba720249f 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "eth-block-tracker": "^2.3.0", "eth-contract-metadata": "^1.1.4", "eth-json-rpc-filters": "^1.2.5", - "eth-json-rpc-infura": "^2.0.7", + "eth-json-rpc-infura": "^2.0.8", "eth-keyring-controller": "^2.1.4", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", @@ -150,7 +150,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.5.0", + "web3-provider-engine": "^13.5.1", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, From 4670aad291cf3c7e17df25af84a369b7593de2e2 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 19 Jan 2018 14:07:38 -0800 Subject: [PATCH 3/9] deps - bump provider engine and infura-middleware for better retry and error messages --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ba720249f..cbe0a44e3 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "eth-block-tracker": "^2.3.0", "eth-contract-metadata": "^1.1.4", "eth-json-rpc-filters": "^1.2.5", - "eth-json-rpc-infura": "^2.0.8", + "eth-json-rpc-infura": "^2.0.11", "eth-keyring-controller": "^2.1.4", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", @@ -150,7 +150,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.5.1", + "web3-provider-engine": "^13.5.6", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, From 128b64cc2c955a31f542e3615364560c271de8a7 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 22 Jan 2018 11:15:05 -0800 Subject: [PATCH 4/9] Bump changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5f85dbb2..c4efbe00e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Add ability to bypass gas estimation loading indicator. + ## 3.13.5 2018-1-16 - Estimating gas limit for simple ether sends now faster & cheaper, by avoiding VM usage on recipients with no code. From 2b7542054e3d9370ab7f3be960922edd8ee09215 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 22 Jan 2018 12:52:15 -0800 Subject: [PATCH 5/9] deps - bump json rpc engine for bugfix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f36a1816..17cff5e5d 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "iframe-stream": "^3.0.0", "inject-css": "^0.1.1", "jazzicon": "^1.2.0", - "json-rpc-engine": "^3.5.0", + "json-rpc-engine": "^3.6.1", "json-rpc-middleware-stream": "^1.0.1", "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", From 4b9c166a6452110b9dc766e7fea5112a9c89c260 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 22 Jan 2018 15:46:09 -0800 Subject: [PATCH 6/9] Version 3.13.7 --- CHANGELOG.md | 7 +++++++ app/manifest.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4efbe00e..05f455245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,14 @@ ## Current Master +## 3.13.7 2018-1-22 + - Add ability to bypass gas estimation loading indicator. +- Re-add changes from 3.13.4 + +## 3.13.6 2017-1-18 + +- Roll back changes to 3.13.4 to fix some issues with the new Infura REST provider. ## 3.13.5 2018-1-16 diff --git a/app/manifest.json b/app/manifest.json index 3b6fc6b20..d795a225a 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.13.5", + "version": "3.13.7", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", From b91e2b5eb1f34e8f835ac4a8a35b7da16fe66c78 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 22 Jan 2018 15:54:26 -0800 Subject: [PATCH 7/9] sentry - report failed txs --- app/scripts/background.js | 12 +++++++++++- app/scripts/setupRaven.js | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 8c1252d3e..0471cee3b 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -27,7 +27,7 @@ global.METAMASK_NOTIFIER = notificationManager // setup sentry error reporting const release = platform.getVersion() -setupRaven({ release }) +const raven = setupRaven({ release }) let popupIsOpen = false @@ -77,6 +77,16 @@ function setupController (initState) { }) global.metamaskController = controller + // report failed transactions to Sentry + controller.txController.on(`tx:status-update`, (txId, status) => { + if (status !== 'failed') return + const txMeta = controller.txController.txStateManager.getTx(txId) + raven.captureMessage('Transaction Failed', { + // "extra" key is required by Sentry + extra: txMeta, + }) + }) + // setup state persistence pump( asStream(controller.store), diff --git a/app/scripts/setupRaven.js b/app/scripts/setupRaven.js index 4888c85fe..7beffeff9 100644 --- a/app/scripts/setupRaven.js +++ b/app/scripts/setupRaven.js @@ -21,4 +21,6 @@ function setupRaven(opts) { Raven.config(ravenTarget, { release, }).install() + + return Raven } From 7e32ba283314e21189850637ff28a4c6d12a213f Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 22 Jan 2018 15:57:25 -0800 Subject: [PATCH 8/9] changelog - add note on sentry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4efbe00e..065b7ba03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current Master - Add ability to bypass gas estimation loading indicator. +- Forward failed transactions to Sentry error reporting service ## 3.13.5 2018-1-16 From 5568053cd81d26f1888239d335708cd746f224df Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 22 Jan 2018 15:46:09 -0800 Subject: [PATCH 9/9] Version 3.13.7 --- CHANGELOG.md | 7 +++++++ app/manifest.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4efbe00e..85c75f879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,14 @@ ## Current Master +## 3.13.7 2018-1-22 + - Add ability to bypass gas estimation loading indicator. +- Re-add changes from 3.13.5 + +## 3.13.6 2017-1-18 + +- Roll back changes to 3.13.4 to fix some issues with the new Infura REST provider. ## 3.13.5 2018-1-16 diff --git a/app/manifest.json b/app/manifest.json index 3b6fc6b20..d795a225a 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.13.5", + "version": "3.13.7", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension",