merge master into jr-use-badge-reg

js/src/views/Account/Header/header.css

@@ -31,6 +31,10 @@
 .infoline,
 .uuidline {
   line-height: 1.618em;
+
+  &.bigaddress {
+    font-size: 1.25em;
+  }
 }
 
 .infoline,

js/src/views/Account/Header/header.js

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -27,16 +27,20 @@ export default class Header extends Component {
     account: PropTypes.object,
     balance: PropTypes.object,
     className: PropTypes.string,
-    children: PropTypes.node
+    children: PropTypes.node,
+    isContract: PropTypes.bool,
+    hideName: PropTypes.bool
   };
 
   static defaultProps = {
     className: '',
-    children: null
+    children: null,
+    isContract: false,
+    hideName: false
   };
 
   render () {
-    const { account, balance, className, children } = this.props;
+    const { account, balance, className, children, hideName } = this.props;
     const { address, meta, uuid } = account;
 
     if (!account) {
@@ -53,17 +57,20 @@ export default class Header extends Component {
           <IdentityIcon
             address={ address } />
           <div className={ styles.floatleft }>
-            <ContainerTitle title={ <IdentityName address={ address } unknown /> } />
-            <div className={ styles.addressline }>
+            { this.renderName(address) }
+
+            <div className={ [ hideName ? styles.bigaddress : '', styles.addressline ].join(' ') }>
               <CopyToClipboard data={ address } />
               <div className={ styles.address }>{ address }</div>
             </div>
+
             { uuidText }
             <div className={ styles.infoline }>
               { meta.description }
             </div>
             { this.renderTxCount() }
           </div>
+
           <div className={ styles.tags }>
             <Tags tags={ meta.tags } />
           </div>
@@ -81,10 +88,22 @@ export default class Header extends Component {
     );
   }
 
-  renderTxCount () {
-    const { balance } = this.props;
+  renderName (address) {
+    const { hideName } = this.props;
 
-    if (!balance) {
+    if (hideName) {
+      return null;
+    }
+
+    return (
+      <ContainerTitle title={ <IdentityName address={ address } unknown /> } />
+    );
+  }
+
+  renderTxCount () {
+    const { balance, isContract } = this.props;
+
+    if (!balance || isContract) {
       return null;
     }
 

js/src/views/Account/Header/index.js

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify