8 files changed, 33 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e70ef5e51..aa0eda9ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@
 - Fixed bug where MetaMask interfered with PDF loading.
 - Moved switch account icon into menu bar.
 - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions.
+<<<<<<< HEAD
+- Fix formatting on terms & conditions page.
+=======
+- Now enforce 30 character limit on wallet names.
+
+>>>>>>> master
 
 ## 2.4.4 2016-06-23
 
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 2f97f22ac..35ee5b6d7 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -144,8 +144,13 @@ function renderNotificationSVG(content, cb){
 }
 
 function svgWrapper(content){
+<<<<<<< HEAD
   var wrapperSource = `    
   <svg xmlns="http://www.w3.org/2000/svg" width="360" height="240">
+=======
+  var wrapperSource = `
+  <svg xmlns="http://www.w3.org/2000/svg" width="450" height="300">
+>>>>>>> master
      <foreignObject x="0" y="0" width="100%" height="100%">
         <body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body>
      </foreignObject>
@@ -156,4 +161,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/account-detail.js b/ui/app/account-detail.js
index 695a1a3f9..7daa3a4dd 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -145,7 +145,7 @@ AccountDetailScreen.prototype.render = function () {
             style: {
               margin: 10,
             },
-          }, 'SEND ETH'),
+          }, 'SEND'),
 
         ]),
 
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/components/editable-label.js b/ui/app/components/editable-label.js
index 3d7ca17d4..05ffd4c92 100644
--- a/ui/app/components/editable-label.js
+++ b/ui/app/components/editable-label.js
@@ -18,6 +18,7 @@ EditableLabel.prototype.render = function () {
     return h('div.editable-label', [
       h('input.sizing-input', {
         defaultValue: props.textValue,
+        maxLength: '30',
         onKeyPress: (event) => {
           this.saveIfEnter(event)
         },
@@ -44,6 +45,7 @@ EditableLabel.prototype.saveIfEnter = function (event) {
 EditableLabel.prototype.saveText = function () {
   var container = findDOMNode(this)
   var text = container.querySelector('.editable-label input').value
-  this.props.saveText(text)
-  this.setState({ isEditingLabel: false, textLabel: text })
+  var truncatedText = text.substring(0, 30)
+  this.props.saveText(truncatedText)
+  this.setState({ isEditingLabel: false, textLabel: truncatedText })
 }
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js
index bfd6c490d..7f615cfb0 100644
--- a/ui/app/first-time/disclaimer.js
+++ b/ui/app/first-time/disclaimer.js
@@ -38,7 +38,7 @@ DisclaimerScreen.prototype.render = function () {
         style: {
           whiteSpace: 'pre-line',
           background: 'rgb(235, 235, 235)',
-          height: '336px',
+          height: '310px',
           padding: '6px',
           width: '80%',
           overflowY: 'scroll',
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))
 }
-