{ this.renderCopyButton() }
{ children }
diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js
index 65fb4ce7c..6e10a1c98 100644
--- a/js/src/ui/Form/InputAddress/inputAddress.js
+++ b/js/src/ui/Form/InputAddress/inputAddress.js
@@ -66,7 +66,16 @@ class InputAddress extends Component {
classes.push(!icon ? styles.inputEmpty : styles.input);
const containerClasses = [ styles.container ];
- const nullName = (disabled || readOnly) && isNullAddress(value) ? 'null' : null;
+ const nullName = (disabled || readOnly) && isNullAddress(value)
+ ? 'null'
+ : null;
+
+ // FIXME: The is not advisable, fixes the display issue, however the name should come from
+ // a common component.
+ // account.name || (value ? 'UNNAMED' : value)
+ const displayValue = text && account
+ ? (account.name || (value ? 'UNNAMED' : value))
+ : (nullName || value);
if (small) {
containerClasses.push(styles.small);
@@ -78,9 +87,6 @@ class InputAddress extends Component {
props.focused = focused;
}
- // FIXME: The is not advisable, fixes the display issue, however the name should come from
- // a common component.
- // account.name || (value ? 'UNNAMED' : value)
return (
{ icon }
diff --git a/js/src/views/Accounts/CreateAccount/createAccount.css b/js/src/views/Accounts/CreateAccount/createAccount.css
index 0b997bb93..744130024 100644
--- a/js/src/views/Accounts/CreateAccount/createAccount.css
+++ b/js/src/views/Accounts/CreateAccount/createAccount.css
@@ -80,23 +80,31 @@
}
.identities {
+ align-items: center;
display: flex;
.identity {
- border: 1px solid transparent;
cursor: pointer;
flex: 0 1 12.5%;
padding: 0.75em 0;
text-align: center;
width: 12.5% !important;
+ > img {
+ border: 2px solid transparent;
+ box-sizing: content-box;
+ padding: 1em;
+ }
+
&.selected {
- border-color: #2185D0;
- border-radius: 8px;
- background: rgba(200, 200, 225, 0.5);
+ > img {
+ background: white;
+ border-color: #2185D0;
+ }
}
&.unselected {
+ opacity: 0.75;
}
}
}
diff --git a/js/src/views/Wallet/wallet.css b/js/src/views/Wallet/wallet.css
index e54760d67..6a07b8703 100644
--- a/js/src/views/Wallet/wallet.css
+++ b/js/src/views/Wallet/wallet.css
@@ -70,7 +70,6 @@
.detail {
font-size: 1.125em;
- color: white;
margin: 0 0.375em;
line-height: 1.5em;
diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js
index 3e75967bc..4a19dd6a5 100644
--- a/js/src/views/Wallet/wallet.js
+++ b/js/src/views/Wallet/wallet.js
@@ -39,29 +39,6 @@ import styles from './wallet.css';
const accountsHistory = HistoryStore.get('accounts');
-class WalletContainer extends Component {
- static propTypes = {
- netVersion: PropTypes.string.isRequired
- };
-
- render () {
- const { netVersion, ...others } = this.props;
-
- if (netVersion === '0') {
- return (
-
- );
- }
-
- return (
-
- );
- }
-}
-
class Wallet extends Component {
static contextTypes = {
api: PropTypes.object.isRequired
@@ -422,4 +399,4 @@ function mapDispatchToProps (dispatch) {
export default connect(
mapStateToProps,
mapDispatchToProps
-)(WalletContainer);
+)(Wallet);