Merge branch 'master' into title-truncate

CHANGELOG.md

@@ -5,6 +5,8 @@
 - 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.
+- Now enforce 30 character limit on wallet names.
+
 
 ## 2.4.4 2016-06-23
 

app/scripts/popup.js

@@ -65,12 +65,22 @@ 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')
 
   MetaMaskUi({

ui/app/app.js

@@ -355,4 +355,3 @@ App.prototype.toggleMetamaskActive = function () {
     this.props.dispatch(actions.lockMetamask(false))
   }
 }
-

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 })
 }

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))
 }
-