diff --git a/packages/app-council/src/Overview/Candidate.tsx b/packages/app-council/src/Overview/Candidate.tsx index 43055c4b6f..f742fe1793 100644 --- a/packages/app-council/src/Overview/Candidate.tsx +++ b/packages/app-council/src/Overview/Candidate.tsx @@ -16,7 +16,6 @@ export default class Candidate extends React.PureComponent { return ( ); diff --git a/packages/app-council/src/Overview/Member.tsx b/packages/app-council/src/Overview/Member.tsx index f0d00080a6..b2c2264726 100644 --- a/packages/app-council/src/Overview/Member.tsx +++ b/packages/app-council/src/Overview/Member.tsx @@ -24,7 +24,6 @@ class Member extends React.PureComponent { #{formatNumber(block)}} defaultName='council member' - type='address' value={address} /> ); diff --git a/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx b/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx index a384f78328..23db35fb72 100644 --- a/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx +++ b/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx @@ -69,6 +69,7 @@ class SetRewardDestination extends TxComponent { private renderContent () { const { controllerId, defaultDestination, t } = this.props; + const { destination } = this.state; return ( <> @@ -90,6 +91,7 @@ class SetRewardDestination extends TxComponent { label={t('payment destination')} onChange={this.onChangeDestination} options={rewardDestinationOptions} + value={destination} /> diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index ddd90edd3e..530539713f 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -98,7 +98,6 @@ class Address extends React.PureComponent { defaultName={defaultName} iconInfo={this.renderOffline()} key={stashId || controllerId} - type='address' value={stashId} withBalance={{ bonded }} > diff --git a/packages/ui-app/src/AddressCard.tsx b/packages/ui-app/src/AddressCard.tsx index 87c804136c..fee6a1daaf 100644 --- a/packages/ui-app/src/AddressCard.tsx +++ b/packages/ui-app/src/AddressCard.tsx @@ -31,7 +31,6 @@ class AddressCard extends React.PureComponent { )} diff --git a/packages/ui-app/src/CardGrid.tsx b/packages/ui-app/src/CardGrid.tsx index 2eaba9f013..a89481129f 100644 --- a/packages/ui-app/src/CardGrid.tsx +++ b/packages/ui-app/src/CardGrid.tsx @@ -71,7 +71,7 @@ export default translate( > .ui--CardGrid-spacer { flex: 1 1; margin: 0.25rem; - padding: 1 1.5rem; + padding: 0 1.5rem; } } diff --git a/packages/ui-app/src/CopyButton.tsx b/packages/ui-app/src/CopyButton.tsx index a5e60282a0..b1da51eae3 100644 --- a/packages/ui-app/src/CopyButton.tsx +++ b/packages/ui-app/src/CopyButton.tsx @@ -36,12 +36,14 @@ class CopyButtonInner extends React.PureComponent { >
{children} -
@@ -85,4 +87,8 @@ export default styled(CopyButton)` button.ui.mini.icon.primary.button.iconButton { cursor: copy; } + + .copySpan { + white-space: nowrap; + } `; diff --git a/packages/ui-app/src/Row.tsx b/packages/ui-app/src/Row.tsx index 27b53e5d39..d8f8e3d1f8 100644 --- a/packages/ui-app/src/Row.tsx +++ b/packages/ui-app/src/Row.tsx @@ -9,7 +9,7 @@ import { Label } from 'semantic-ui-react'; import React from 'react'; import Button from './Button'; -import { classes, getAddressName } from './util'; +import { classes, toShortAddress } from './util'; import CopyButton from './CopyButton'; import Input from './Input'; import InputTags from './InputTags'; @@ -41,6 +41,10 @@ export const styles = ` z-index: 1; } + .editSpan { + white-space: nowrap; + } + .ui--Row-accountId, .ui--Row-accountIndex { font-family: monospace; @@ -109,14 +113,17 @@ export const styles = ` } } - .ui--Row-name { + .ui--Row-address-or-name { box-sizing: border-box; margin: 0; padding: 0; overflow: hidden; text-overflow: ellipsis; - text-transform: uppercase; white-space: normal; + + .withName { + text-transform: uppercase; + } } .ui--Row-name-input { @@ -134,7 +141,7 @@ export const styles = ` flex-wrap: wrap; justify-content: left; - > span { + .addTags { border: 1px #00000052 solid; border-radius: .5em; border-style: dashed; @@ -229,19 +236,23 @@ class Row

extends React.PureComponent + +