diff options
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js | 19 | ||||
| -rw-r--r-- | ui/app/components/modals/index.scss | 51 |
3 files changed, 57 insertions, 17 deletions
diff --git a/package.json b/package.json index d1d587474..1ae4063ed 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "github:MetaMask/eth-trezor-keyring#remove-and-forget", + "eth-trezor-keyring": "^0.1.0", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -234,7 +234,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "github:brunobar79/KeyringController#remove-account", + "eth-keyring-controller": "^3.3.0", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", diff --git a/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js b/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js index b9dc6364f..5a9f0f289 100644 --- a/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js +++ b/ui/app/components/modals/confirm-remove-account/confirm-remove-account.component.js @@ -25,25 +25,24 @@ class ConfirmRemoveAccount extends Component { renderSelectedAccount () { const { identity } = this.props return ( - <div className="modal-container__address"> - <div className="account_identicon"> + <div className="modal-container__account"> + <div className="modal-container__account__identicon"> <Identicon address={identity.address} diameter={32} - style={{'marginLeft': '10px'}} /> </div> - <div className="account_name"> - <span className="account_label">Name</span> + <div className="modal-container__account__name"> + <span className="modal-container__account__label">Name</span> <span className="account_value">{identity.name}</span> </div> - <div className="account_address"> - <span className="account_label">Public Address</span> - <span className="account_value">{ addressSummary(identity.address) }</span> + <div className="modal-container__account__address"> + <span className="modal-container__account__label">Public Address</span> + <span className="account_value">{ addressSummary(identity.address, 4, 4) }</span> </div> - <div className="account_link"> + <div className="modal-container__account__link"> <a - className="hw-account-list__item__link" + className="" href={genAccountLink(identity.address, this.props.network)} target={'_blank'} title={this.context.t('etherscanView')} diff --git a/ui/app/components/modals/index.scss b/ui/app/components/modals/index.scss index b7f1f249d..1cefcb49c 100644 --- a/ui/app/components/modals/index.scss +++ b/ui/app/components/modals/index.scss @@ -19,12 +19,53 @@ text-align: center; font-size: .875rem; } - - &__address { - text-align: center; - font-size: 1rem; - margin-top: 20px; + + &__account { + border: 1px solid #b7b7b7; + border-radius: 4px; + padding: 10px; + display: flex; + margin-top: 10px; margin-bottom: 20px; + width: 100%; + + &__identicon { + margin-right: 10px; + } + + &__name, + &__address { + margin-right: 10px; + font-size: 14px; + } + + &__name { + width: 100px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + &__label { + font-size: 11px; + display: block; + color: #9b9b9b; + } + + &__link { + margin-top: 16px; + + img { + width: 15px; + height: 15px; + } + } + + @media screen and (max-width: 575px) { + &__name { + width: 90px; + } + } } &__link { |