Merge branch 'master' into FixSomeFormatting

# Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
8 years ago · 57aca116ed
parent 494b62dcf8 2fd03a60fb
commit 57aca116ed
6 changed files with 30 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,7 +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

--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@ -176,8 +176,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>
--- a/app/scripts/popup.js
+++ b/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({
--- a/ui/app/app.js
+++ b/ui/app/app.js
@ -355,4 +355,3 @@ App.prototype.toggleMetamaskActive = function () {
    this.props.dispatch(actions.lockMetamask(false))
  }
 }
-
--- 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 })
 }
--- 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))
 }
-