arno
/
trezor-wallet
mirror of https://github.com/trezor/trezor-wallet
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor passed value to bottomText prop

Browse Source
pull/539/head
slowbackspace 5 years ago
parent 9a083dff87
commit 3bcf991ef9
5 changed files with 33 additions and 76 deletions
Show Stats Download Patch File Download Diff File

16
src/utils/uiUtils.js
Unescape View File

@ -0,0 +1,16 @@
/* @flow */
import * as React from 'react';
import { FormattedMessage } from 'react-intl';
export const getBottomText = (error: any, warning: any, info: any): React.Node => {
if (error) {
return <FormattedMessage {...error} />;
}
if (warning) {
return <FormattedMessage {...warning} />;
}
if (info) {
return <FormattedMessage {...info} />;
}
return null;
};

30
src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js
Unescape View File

@ -15,7 +15,7 @@ import {
import type { IntlShape } from 'react-intl';
import { FONT_SIZE } from 'config/variables';
import { getBottomText } from 'utils/uiUtils';
import l10nCommonMessages from 'views/common.messages';
import l10nMessages from './index.messages';
@ -234,15 +234,7 @@ const AdvancedForm = (props: Props) => {
)}
</InputLabelWrapper>
}
bottomText={
<>
{(errors.gasLimit && <FormattedMessage {...errors.gasLimit} />) ||
(warnings.gasLimit && (
<FormattedMessage {...warnings.gasLimit} />
)) ||
(infos.gasLimit && <FormattedMessage {...infos.gasLimit} />)}
</>
}
bottomText={getBottomText(errors.gasLimit, warnings.gasLimit, infos.gasLimit)}
value={
calculatingGasLimit
? props.intl.formatMessage(l10nMessages.TR_CALCULATING_DOT_DOT)
@ -300,15 +292,7 @@ const AdvancedForm = (props: Props) => {
</Left>
</InputLabelWrapper>
}
bottomText={
<>
{(errors.gasPrice && <FormattedMessage {...errors.gasPrice} />) ||
(warnings.gasPrice && (
<FormattedMessage {...warnings.gasPrice} />
)) ||
(infos.v && <FormattedMessage {...infos.gasPrice} />)}
</>
}
bottomText={getBottomText(errors.gasPrice, warnings.gasPrice, infos.gasPrice)}
value={gasPrice}
onChange={event => onGasPriceChange(event.target.value)}
/>
@ -339,13 +323,7 @@ const AdvancedForm = (props: Props) => {
</InputLabelWrapper>
}
state={getDataTextareaState(!!errors.data, !!warnings.data)}
bottomText={
<>
{(errors.data && <FormattedMessage {...errors.data} />) ||
(warnings.data && <FormattedMessage {...warnings.data} />) ||
(infos.data && <FormattedMessage {...infos.data} />)}
</>
}
bottomText={getBottomText(errors.data, warnings.data, infos.data)}
isDisabled={networkSymbol !== currency}
value={networkSymbol !== currency ? '' : data}
onChange={event => onDataChange(event.target.value)}

17
src/views/Wallet/views/Account/Send/ethereum/index.js
Unescape View File

@ -12,6 +12,7 @@ import * as stateUtils from 'reducers/utils';
import type { Token } from 'flowtype';
import { FormattedMessage } from 'react-intl';
import l10nCommonMessages from 'views/common.messages';
import { getBottomText } from 'utils/uiUtils';
import AdvancedForm from './components/AdvancedForm';
import PendingTransactions from '../components/PendingTransactions';
@ -353,13 +354,7 @@ const AccountSend = (props: Props) => {
autoCapitalize="off"
spellCheck="false"
topLabel={props.intl.formatMessage(l10nCommonMessages.TR_ADDRESS)}
bottomText={
<>
{(errors.address && <FormattedMessage {...errors.address} />) ||
(warnings.address && <FormattedMessage {...warnings.address} />) ||
(infos.address && <FormattedMessage {...infos.address} />)}
</>
}
bottomText={getBottomText(errors.address, warnings.address, infos.address)}
value={address}
onChange={event => onAddressChange(event.target.value)}
sideAddons={[
@ -397,13 +392,7 @@ const AccountSend = (props: Props) => {
}
value={amount}
onChange={event => onAmountChange(event.target.value)}
bottomText={
<>
{(errors.amount && <FormattedMessage {...errors.amount} />) ||
(warnings.amount && <FormattedMessage {...warnings.amount} />) ||
(infos.amount && <FormattedMessage {...infos.amount} />)}
</>
}
bottomText={getBottomText(errors.amount, warnings.amount, infos.amount)}
sideAddons={[
<SetMaxAmountButton key="icon" onClick={() => onSetMax()} isWhite={!setMax}>
{!setMax && (

28
src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js
Unescape View File

@ -4,7 +4,7 @@ import * as React from 'react';
import { FormattedMessage } from 'react-intl';
import styled from 'styled-components';
import { Input, Tooltip, Icon, colors, icons as ICONS } from 'trezor-ui-components';
import { getBottomText } from 'utils/uiUtils';
import l10nCommonMessages from 'views/common.messages';
import l10nSendMessages from 'views/Wallet/views/Account/common.messages';
import l10nMessages from './index.messages';
@ -125,13 +125,7 @@ const AdvancedForm = (props: Props) => {
</Left>
</InputLabelWrapper>
}
bottomText={
<>
{(errors.fee && <FormattedMessage {...errors.fee} />) ||
(warnings.fee && <FormattedMessage {...warnings.fee} />) ||
(infos.fee && <FormattedMessage {...infos.fee} />)}
</>
}
bottomText={getBottomText(errors.fee, warnings.fee, infos.fee)}
value={fee}
onChange={event => onFeeChange(event.target.value)}
/>
@ -177,19 +171,11 @@ const AdvancedForm = (props: Props) => {
</Left>
</InputLabelWrapper>
}
bottomText={
<>
{(errors.destinationTag && (
<FormattedMessage {...errors.destinationTag} />
)) ||
(warnings.destinationTag && (
<FormattedMessage {...warnings.destinationTag} />
)) ||
(infos.destinationTag && (
<FormattedMessage {...infos.destinationTag} />
))}
</>
}
bottomText={getBottomText(
errors.destinationTag,
warnings.destinationTag,
infos.destinationTag
)}
value={destinationTag}
onChange={event => onDestinationTagChange(event.target.value)}
/>

18
src/views/Wallet/views/Account/Send/ripple/index.js
Unescape View File

@ -10,9 +10,9 @@ import { FIAT_CURRENCIES } from 'config/app';
import Title from 'views/Wallet/components/Title';
import l10nCommonMessages from 'views/common.messages';
import Content from 'views/Wallet/components/Content';
import { getBottomText } from 'utils/uiUtils';
import PendingTransactions from '../components/PendingTransactions';
import AdvancedForm from './components/AdvancedForm';
import l10nMessages from './index.messages';
import l10nSendMessages from '../../common.messages';
@ -323,13 +323,7 @@ const AccountSend = (props: Props) => {
autoCapitalize="off"
spellCheck="false"
topLabel={props.intl.formatMessage(l10nCommonMessages.TR_ADDRESS)}
bottomText={
<>
{(errors.address && <FormattedMessage {...errors.address} />) ||
(warnings.address && <FormattedMessage {...warnings.address} />) ||
(infos.address && <FormattedMessage {...infos.address} />)}
</>
}
bottomText={getBottomText(errors.address, warnings.address, infos.address)}
value={address}
onChange={event => onAddressChange(event.target.value)}
sideAddons={[
@ -363,13 +357,7 @@ const AccountSend = (props: Props) => {
}
value={amount}
onChange={event => onAmountChange(event.target.value)}
bottomText={
<>
{(errors.amount && <FormattedMessage {...errors.amount} />) ||
(warnings.amount && <FormattedMessage {...warnings.amount} />) ||
(infos.amount && <FormattedMessage {...infos.amount} />)}
</>
}
bottomText={getBottomText(errors.amount, warnings.amount, infos.amount)}
sideAddons={[
<SetMaxAmountButton key="icon" onClick={() => onSetMax()} isWhite={!setMax}>
{!setMax && (

Write Preview
Loading…
Cancel
Save