pull/441/head
Vladimir Volek 5 years ago
parent 8f642d9b58
commit b4a87a0ce1

@ -3,9 +3,9 @@
"eslint-config-airbnb", "eslint-config-airbnb",
"prettier", "prettier",
"prettier/babel", "prettier/babel",
"plugin:flowtype/recommended",
"prettier/flowtype", "prettier/flowtype",
"prettier/react", "prettier/react",
"plugin:flowtype/recommended",
"plugin:jest/recommended" "plugin:jest/recommended"
], ],
"globals": { "globals": {

@ -16,8 +16,8 @@ import TezosImage from './images/xtz.png';
import type { Props as BaseProps } from '../../Container'; import type { Props as BaseProps } from '../../Container';
type Props = { type Props = {
onCancel: $ElementType<$ElementType<BaseProps, 'modalActions'>, 'onCancel'>; onCancel: $ElementType<$ElementType<BaseProps, 'modalActions'>, 'onCancel'>,
} };
const Wrapper = styled.div` const Wrapper = styled.div`
width: 100%; width: 100%;
@ -47,11 +47,7 @@ const Img = styled.img`
const TezosWallet = (props: Props) => ( const TezosWallet = (props: Props) => (
<Wrapper> <Wrapper>
<StyledLink onClick={props.onCancel}> <StyledLink onClick={props.onCancel}>
<Icon <Icon size={24} color={colors.TEXT_SECONDARY} icon={icons.CLOSE} />
size={24}
color={colors.TEXT_SECONDARY}
icon={icons.CLOSE}
/>
</StyledLink> </StyledLink>
<Img src={TezosImage} /> <Img src={TezosImage} />
<H2>Tezos wallet</H2> <H2>Tezos wallet</H2>
@ -67,4 +63,4 @@ TezosWallet.propTypes = {
onCancel: PropTypes.func.isRequired, onCancel: PropTypes.func.isRequired,
}; };
export default TezosWallet; export default TezosWallet;

@ -169,9 +169,9 @@ const getExternalContextModal = (props: Props) => {
case 'xlm': case 'xlm':
return <Stellar onCancel={modalActions.onCancel} />; return <Stellar onCancel={modalActions.onCancel} />;
case 'ada': case 'ada':
return (<Cardano onCancel={modalActions.onCancel} />); return <Cardano onCancel={modalActions.onCancel} />;
case 'xtz': case 'xtz':
return (<Tezos onCancel={modalActions.onCancel} />); return <Tezos onCancel={modalActions.onCancel} />;
default: default:
return null; return null;
} }

@ -102,17 +102,8 @@ const Left = styled.div`
const AdvancedForm = (props: Props) => { const AdvancedForm = (props: Props) => {
const { network } = props.selectedAccount; const { network } = props.selectedAccount;
if (!network) return null; if (!network) return null;
const { const { errors, warnings, infos, fee, destinationTag } = props.sendForm;
errors, const { onFeeChange, onDestinationTagChange } = props.sendFormActions;
warnings,
infos,
fee,
destinationTag,
} = props.sendForm;
const {
onFeeChange,
onDestinationTagChange,
} = props.sendFormActions;
return ( return (
<AdvancedSettingsWrapper> <AdvancedSettingsWrapper>
@ -152,17 +143,24 @@ const AdvancedForm = (props: Props) => {
<InputRow> <InputRow>
<StyledInput <StyledInput
state={getDestinationTagInputState(errors.destinationTag, warnings.destinationTag)} state={getDestinationTagInputState(
errors.destinationTag,
warnings.destinationTag
)}
autoComplete="off" autoComplete="off"
autoCorrect="off" autoCorrect="off"
autoCapitalize="off" autoCapitalize="off"
spellCheck="false" spellCheck="false"
topLabel={( topLabel={
<InputLabelWrapper> <InputLabelWrapper>
<Left> <Left>
<FormattedMessage {...l10nMessages.TR_XRP_DESTINATION_TAG} /> <FormattedMessage {...l10nMessages.TR_XRP_DESTINATION_TAG} />
<Tooltip <Tooltip
content={<FormattedMessage {...l10nMessages.TR_XRP_DESTINATION_TAG_EXPLAINED} />} content={
<FormattedMessage
{...l10nMessages.TR_XRP_DESTINATION_TAG_EXPLAINED}
/>
}
maxWidth={200} maxWidth={200}
readMoreLink="https://wiki.trezor.io/Ripple_(XRP)" readMoreLink="https://wiki.trezor.io/Ripple_(XRP)"
placement="top" placement="top"
@ -175,8 +173,10 @@ const AdvancedForm = (props: Props) => {
</Tooltip> </Tooltip>
</Left> </Left>
</InputLabelWrapper> </InputLabelWrapper>
)} }
bottomText={errors.destinationTag || warnings.destinationTag || infos.destinationTag} bottomText={
errors.destinationTag || warnings.destinationTag || infos.destinationTag
}
value={destinationTag} value={destinationTag}
onChange={event => onDestinationTagChange(event.target.value)} onChange={event => onDestinationTagChange(event.target.value)}
/> />

Loading…
Cancel
Save