Merge pull request #352 from MetaMask/pr/351

Limit account nicknames

3 files changed, 5 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa0eda9ce..1a4d0ddf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,11 @@
 - 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
+- Now enforce 20 character limit on wallet names.
+- Wallet titles are now properly truncated in transaction confirmation.
 - Fix formatting on terms & conditions page.
-=======
 - Now enforce 30 character limit on wallet names.
 
->>>>>>> master
-
 ## 2.4.4 2016-06-23
 
 - Update web3-stream-provider for batch payload bug fix
diff --git a/ui/app/components/account-panel.js b/ui/app/components/account-panel.js
index c69557d62..d50522fa2 100644
--- a/ui/app/components/account-panel.js
+++ b/ui/app/components/account-panel.js
@@ -48,7 +48,7 @@ AccountPanel.prototype.render = function () {
           address: panelState.identiconKey,
           imageify: state.imageifyIdenticons,
         }),
-        h('span.font-small', panelState.identiconLabel),
+        h('span.font-small', panelState.identiconLabel.substring(0, 7) + '...'),
       ]),
 
       // account address, balance
diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js
index 05ffd4c92..41936f5e0 100644
--- a/ui/app/components/editable-label.js
+++ b/ui/app/components/editable-label.js
@@ -18,7 +18,7 @@ EditableLabel.prototype.render = function () {
     return h('div.editable-label', [
       h('input.sizing-input', {
         defaultValue: props.textValue,
-        maxLength: '30',
+        maxLength: '20',
         onKeyPress: (event) => {
           this.saveIfEnter(event)
         },
@@ -45,7 +45,7 @@ EditableLabel.prototype.saveIfEnter = function (event) {
 EditableLabel.prototype.saveText = function () {
   var container = findDOMNode(this)
   var text = container.querySelector('.editable-label input').value
-  var truncatedText = text.substring(0, 30)
+  var truncatedText = text.substring(0, 20)
   this.props.saveText(truncatedText)
   this.setState({ isEditingLabel: false, textLabel: truncatedText })
 }