3 files changed, 15 insertions, 3 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/ui/app/app.js b/ui/app/app.js
index 8a51f968b..1ae579664 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -325,6 +325,7 @@ App.prototype.renderPrimary = function () {
       return h(SendTransactionScreen, {key: 'send-transaction'})
 
     case 'confTx':
+      this.clearNotifications()
       return h(ConfirmTxScreen, {key: 'confirm-tx'})
 
     case 'config':
@@ -356,3 +357,10 @@ App.prototype.toggleMetamaskActive = function () {
   }
 }
 
+App.prototype.clearNotifications = function () {
+  chrome.notifications.getAll( function (object) {
+      for (let notification in object){
+        chrome.notifications.clear(notification)
+      }
+  })
+};
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))
 }
-