Merge branch 'master' into FixSomeFormatting

# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js

3 files changed, 9 insertions, 4 deletions

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