diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-06-29 04:00:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 04:00:37 +0800 |
| commit | 7026eca222283ea873fd576c4cae5ba0ab5ad129 (patch) | |
| tree | 9e9749754f8eb8b8360eb72c534de4f4ee94a2cd | |
| parent | 204cb7f1edea12c8438655ab3d601d415ab77e54 (diff) | |
| parent | 16566ee7dbe00c40941b0ed3c7f3b96179cae3aa (diff) | |
| download | tangerine-wallet-browser-7026eca222283ea873fd576c4cae5ba0ab5ad129.tar tangerine-wallet-browser-7026eca222283ea873fd576c4cae5ba0ab5ad129.tar.gz tangerine-wallet-browser-7026eca222283ea873fd576c4cae5ba0ab5ad129.tar.bz2 tangerine-wallet-browser-7026eca222283ea873fd576c4cae5ba0ab5ad129.tar.lz tangerine-wallet-browser-7026eca222283ea873fd576c4cae5ba0ab5ad129.tar.xz tangerine-wallet-browser-7026eca222283ea873fd576c4cae5ba0ab5ad129.tar.zst tangerine-wallet-browser-7026eca222283ea873fd576c4cae5ba0ab5ad129.zip | |
Merge pull request #348 from MetaMask/i341
Clear notifications on extension open + guard against negative sends
| -rw-r--r-- | app/scripts/lib/notifications.js | 4 | ||||
| -rw-r--r-- | app/scripts/popup.js | 10 | ||||
| -rw-r--r-- | ui/app/app.js | 1 | ||||
| -rw-r--r-- | ui/app/send.js | 6 |
4 files changed, 17 insertions, 4 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index a5746ae6e..a31949108 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -176,7 +176,7 @@ function renderNotificationSVG(content, cb){ } function svgWrapper(content){ - var wrapperSource = ` + var wrapperSource = ` <svg xmlns="http://www.w3.org/2000/svg" width="450" height="300"> <foreignObject x="0" y="0" width="100%" height="100%"> <body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body> @@ -188,4 +188,4 @@ function svgWrapper(content){ function toSvgUri(content){ return 'data:image/svg+xml;utf8,' + encodeURIComponent(content) -}
\ No newline at end of file +} diff --git a/app/scripts/popup.js b/app/scripts/popup.js index 5173507fa..5c5cf0455 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -65,11 +65,21 @@ function getCurrentDomain (cb) { }) } +function clearNotifications(){ + chrome.notifications.getAll(function (object) { + for (let notification in object){ + chrome.notifications.clear(notification) + } + }) +} + function setupApp (err, opts) { if (err) { alert(err.stack) throw err } + + clearNotifications() var container = document.getElementById('app-content') diff --git a/ui/app/app.js b/ui/app/app.js index 8a51f968b..80521d220 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -355,4 +355,3 @@ App.prototype.toggleMetamaskActive = function () { this.props.dispatch(actions.lockMetamask(false)) } } - diff --git a/ui/app/send.js b/ui/app/send.js index 4b501a7b5..540d85382 100644 --- a/ui/app/send.js +++ b/ui/app/send.js @@ -216,6 +216,11 @@ SendTransactionScreen.prototype.onSubmit = function () { return this.props.dispatch(actions.displayWarning(message)) } + if (input < 0) { + message = 'Can not send negative amounts of ETH.' + return this.props.dispatch(actions.displayWarning(message)) + } + if ((!util.isValidAddress(recipient) && !txData) || (!recipient && !txData)) { message = 'Recipient address is invalid.' return this.props.dispatch(actions.displayWarning(message)) @@ -234,4 +239,3 @@ SendTransactionScreen.prototype.onSubmit = function () { this.props.dispatch(actions.signTx(txParams)) } - |