update to new buttons

pull/543/head
slowbackspace 5 years ago
parent 2722393981
commit e63bc301e6

@ -36,20 +36,6 @@ const BackupButton = styled(Button)`
margin-bottom: 10px; margin-bottom: 10px;
`; `;
const ProceedButton = styled(Button)`
background: transparent;
border-color: ${colors.WARNING_PRIMARY};
color: ${colors.WARNING_PRIMARY};
&:focus,
&:hover,
&:active {
color: ${colors.WHITE};
background: ${colors.WARNING_PRIMARY};
box-shadow: none;
}
`;
const StyledP = styled(P)` const StyledP = styled(P)`
/* boost-specificity hack to override P base styling */ /* boost-specificity hack to override P base styling */
&& { && {
@ -80,9 +66,9 @@ const Confirmation = (props: Props) => (
<FormattedMessage {...l10nCommonMessages.TR_CREATE_BACKUP_IN_3_MINUTES} /> <FormattedMessage {...l10nCommonMessages.TR_CREATE_BACKUP_IN_3_MINUTES} />
</BackupButton> </BackupButton>
</Link> </Link>
<ProceedButton isWhite onClick={() => props.onReceiveConfirmation(true)}> <Button isInverse variant="warning" onClick={() => props.onReceiveConfirmation(true)}>
<FormattedMessage {...l10nCommonMessages.TR_SHOW_ADDRESS_I_WILL_TAKE_THE_RISK} /> <FormattedMessage {...l10nCommonMessages.TR_SHOW_ADDRESS_I_WILL_TAKE_THE_RISK} />
</ProceedButton> </Button>
</Row> </Row>
</Wrapper> </Wrapper>
); );

@ -64,20 +64,6 @@ const BackupButton = styled(Button)`
width: 100%; width: 100%;
`; `;
const WarnButton = styled(Button)`
background: transparent;
border-color: ${colors.WARNING_PRIMARY};
color: ${colors.WARNING_PRIMARY};
&:focus,
&:hover,
&:active {
color: ${colors.WHITE};
background: ${colors.WARNING_PRIMARY};
box-shadow: none;
}
`;
class ConfirmUnverifiedAddress extends PureComponent<Props> { class ConfirmUnverifiedAddress extends PureComponent<Props> {
componentDidMount(): void { componentDidMount(): void {
this.keyboardHandler = this.keyboardHandler.bind(this); this.keyboardHandler = this.keyboardHandler.bind(this);
@ -161,9 +147,13 @@ class ConfirmUnverifiedAddress extends PureComponent<Props> {
<Button onClick={() => (!account ? this.verifyAddress() : 'false')}> <Button onClick={() => (!account ? this.verifyAddress() : 'false')}>
<FormattedMessage {...l10nMessages.TR_TRY_AGAIN} /> <FormattedMessage {...l10nMessages.TR_TRY_AGAIN} />
</Button> </Button>
<WarnButton isWhite onClick={() => this.showUnverifiedAddress()}> <Button
isInverse
variant="warning"
onClick={() => this.showUnverifiedAddress()}
>
<FormattedMessage {...l10nMessages.TR_SHOW_UNVERIFIED_ADDRESS} /> <FormattedMessage {...l10nMessages.TR_SHOW_UNVERIFIED_ADDRESS} />
</WarnButton> </Button>
</Row> </Row>
</Content> </Content>
{needsBackup && <Divider />} {needsBackup && <Divider />}

@ -86,6 +86,7 @@ const Import = (props: Props) => {
isDisabled={ isDisabled={
!selectedNetwork || address === '' || props.importAccount.loading !selectedNetwork || address === '' || props.importAccount.loading
} }
isLoading={props.importAccount.loading}
onClick={() => onClick={() =>
props.importAddress( props.importAddress(
address, address,

Loading…
Cancel
Save