1
0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-30 20:28:09 +00:00

making sendform component a stateless + spliting advanced to a separate component

This commit is contained in:
Szymon Lesisz 2018-09-22 18:50:15 +02:00
parent 9f98e7dd7e
commit 91f731c34e
2 changed files with 457 additions and 441 deletions

View File

@ -0,0 +1,221 @@
/* @flow */
import React from 'react';
import styled from 'styled-components';
import colors from 'config/colors';
import Input from 'components/inputs/Input';
import Textarea from 'components/Textarea';
import Tooltip from 'components/Tooltip';
import Icon from 'components/Icon';
import Link from 'components/Link';
import ICONS from 'config/icons';
import type { Props } from '../../Container';
// duplicates from ../../Container
const InputRow = styled.div`
margin-bottom: 20px;
`;
// duplicates end
const InputLabelWrapper = styled.div`
display: flex;
align-items: center;
`;
const GreenSpan = styled.span`
color: ${colors.GREEN_PRIMARY};
`;
const AdvancedSettingsWrapper = styled.div`
padding: 20px 0;
display: flex;
flex-direction: column;
justify-content: space-between;
border-top: 1px solid ${colors.DIVIDER};
`;
const GasInputRow = styled(InputRow)`
width: 100%;
display: flex;
`;
const GasInput = styled(Input)`
&:first-child {
padding-right: 20px;
}
`;
const StyledTextarea = styled(Textarea)`
margin-bottom: 20px;
height: 80px;
`;
const AdvancedSettingsSendButtonWrapper = styled.div`
width: 100%;
display: flex;
justify-content: flex-end;
`;
const getGasLimitInputState = (gasLimitErrors: string, gasLimitWarnings: string): string => {
let state = '';
if (gasLimitWarnings && !gasLimitErrors) {
state = 'warning';
}
if (gasLimitErrors) {
state = 'error';
}
return state;
};
const getGasPriceInputState = (gasPriceErrors: string, gasPriceWarnings: string): string => {
let state = '';
if (gasPriceWarnings && !gasPriceErrors) {
state = 'warning';
}
if (gasPriceErrors) {
state = 'error';
}
return state;
};
// stateless component
const AdvancedForm = (props: Props) => {
const {
network,
} = props.selectedAccount;
if (!network) return null;
const {
networkSymbol,
currency,
recommendedGasPrice,
errors,
warnings,
infos,
data,
gasLimit,
gasPrice,
} = props.sendForm;
const {
onGasLimitChange,
onGasPriceChange,
onDataChange,
} = props.sendFormActions;
let gasLimitTooltipCurrency: string;
let gasLimitTooltipValue: string;
if (networkSymbol !== currency) {
gasLimitTooltipCurrency = 'tokens';
gasLimitTooltipValue = network.defaultGasLimitTokens.toString(10);
} else {
gasLimitTooltipCurrency = networkSymbol;
gasLimitTooltipValue = network.defaultGasLimit.toString(10);
}
return (
<AdvancedSettingsWrapper>
<GasInputRow>
<GasInput
state={getGasLimitInputState(errors.gasLimit, warnings.gasLimit)}
autoComplete="off"
autoCorrect="off"
autoCapitalize="off"
spellCheck="false"
topLabel={(
<InputLabelWrapper>
Gas limit
<Tooltip
content={(
<React.Fragment>
Gas limit is the amount of gas to send with your transaction.<br />
<GreenSpan>TX fee = gas price * gas limit</GreenSpan> &amp; is paid to miners for including your TX in a block.<br />
Increasing this number will not get your TX mined faster.<br />
Default value for sending {gasLimitTooltipCurrency} is <GreenSpan>{gasLimitTooltipValue}</GreenSpan>
</React.Fragment>
)}
placement="top"
>
<Icon
icon={ICONS.HELP}
color={colors.TEXT_SECONDARY}
size={24}
/>
</Tooltip>
</InputLabelWrapper>
)}
bottomText={errors.gasLimit || warnings.gasLimit || infos.gasLimit}
value={gasLimit}
isDisabled={networkSymbol === currency && data.length > 0}
onChange={event => onGasLimitChange(event.target.value)}
/>
<GasInput
state={getGasPriceInputState(errors.gasPrice, warnings.gasPrice)}
autoComplete="off"
autoCorrect="off"
autoCapitalize="off"
spellCheck="false"
topLabel={(
<InputLabelWrapper>
Gas price
<Tooltip
content={(
<React.Fragment>
Gas Price is the amount you pay per unit of gas.<br />
<GreenSpan>TX fee = gas price * gas limit</GreenSpan> &amp; is paid to miners for including your TX in a block.<br />
Higher the gas price = faster transaction, but more expensive. Recommended is <GreenSpan>{recommendedGasPrice} GWEI.</GreenSpan><br />
<Link href="https://myetherwallet.github.io/knowledge-base/gas/what-is-gas-ethereum.html" target="_blank" rel="noreferrer noopener" isGreen>Read more</Link>
</React.Fragment>
)}
placement="top"
>
<Icon
icon={ICONS.HELP}
color={colors.TEXT_SECONDARY}
size={24}
/>
</Tooltip>
</InputLabelWrapper>
)}
bottomText={errors.gasPrice || warnings.gasPrice || infos.gasPrice}
value={gasPrice}
onChange={event => onGasPriceChange(event.target.value)}
/>
</GasInputRow>
<StyledTextarea
topLabel={(
<InputLabelWrapper>
Data
<Tooltip
content={(
<React.Fragment>
Data is usually used when you send transactions to contracts.
</React.Fragment>
)}
placement="top"
>
<Icon
icon={ICONS.HELP}
color={colors.TEXT_SECONDARY}
size={24}
/>
</Tooltip>
</InputLabelWrapper>
)}
bottomText={errors.data || warnings.data || infos.data}
disabled={networkSymbol !== currency}
value={networkSymbol !== currency ? '' : data}
onChange={event => onDataChange(event.target.value)}
/>
<AdvancedSettingsSendButtonWrapper>
{ props.children }
</AdvancedSettingsSendButtonWrapper>
</AdvancedSettingsWrapper>
);
};
export default AdvancedForm;

View File

@ -1,6 +1,6 @@
/* @flow */ /* @flow */
import React, { Component } from 'react'; import React from 'react';
import styled, { css } from 'styled-components'; import styled, { css } from 'styled-components';
import { Select } from 'components/Select'; import { Select } from 'components/Select';
import Button from 'components/Button'; import Button from 'components/Button';
@ -12,11 +12,9 @@ import { FONT_SIZE, FONT_WEIGHT, TRANSITION } from 'config/variables';
import colors from 'config/colors'; import colors from 'config/colors';
import P from 'components/Paragraph'; import P from 'components/Paragraph';
import { H2 } from 'components/Heading'; import { H2 } from 'components/Heading';
import Textarea from 'components/Textarea';
import Tooltip from 'components/Tooltip';
import { calculate, validation } from 'actions/SendFormActions';
import SelectedAccount from 'views/Wallet/components/SelectedAccount'; import SelectedAccount from 'views/Wallet/components/SelectedAccount';
import type { Token } from 'flowtype'; import type { Token } from 'flowtype';
import AdvancedForm from './components/Advanced';
import PendingTransactions from './components/PendingTransactions'; import PendingTransactions from './components/PendingTransactions';
import type { Props } from './Container'; import type { Props } from './Container';
@ -25,11 +23,6 @@ import type { Props } from './Container';
// and put it inside config/variables.js // and put it inside config/variables.js
const SmallScreenWidth = '850px'; const SmallScreenWidth = '850px';
type State = {
isAdvancedSettingsHidden: boolean,
shouldAnimateAdvancedSettingsToggle: boolean,
};
const Wrapper = styled.section` const Wrapper = styled.section`
padding: 0 48px; padding: 0 48px;
`; `;
@ -143,65 +136,12 @@ const SendButton = styled(Button)`
} }
`; `;
const AdvancedSettingsWrapper = styled.div`
padding: 20px 0;
display: flex;
flex-direction: column;
justify-content: space-between;
border-top: 1px solid ${colors.DIVIDER};
`;
const GasInputRow = styled(InputRow)`
width: 100%;
display: flex;
`;
const GasInput = styled(Input)`
&:first-child {
padding-right: 20px;
}
`;
const AdvancedSettingsSendButtonWrapper = styled.div`
width: 100%;
display: flex;
justify-content: flex-end;
`;
const StyledTextarea = styled(Textarea)`
margin-bottom: 20px;
height: 80px;
`;
const AdvancedSettingsIcon = styled(Icon)` const AdvancedSettingsIcon = styled(Icon)`
margin-left: 10px; margin-left: 10px;
`; `;
const GreenSpan = styled.span` // render helpers
color: ${colors.GREEN_PRIMARY}; const getAddressInputState = (address: string, addressErrors: string, addressWarnings: string): string => {
`;
const InputLabelWrapper = styled.div`
display: flex;
align-items: center;
`;
class AccountSend extends Component<Props, State> {
constructor(props: Props) {
super(props);
this.state = {
isAdvancedSettingsHidden: true,
shouldAnimateAdvancedSettingsToggle: false,
};
}
componentWillReceiveProps(newProps: Props) {
calculate(this.props, newProps);
validation(newProps);
}
getAddressInputState(address: string, addressErrors: string, addressWarnings: string) {
let state = ''; let state = '';
if (address && !addressErrors) { if (address && !addressErrors) {
state = 'success'; state = 'success';
@ -213,9 +153,9 @@ class AccountSend extends Component<Props, State> {
state = 'error'; state = 'error';
} }
return state; return state;
} };
getAmountInputState(amountErrors: string, amountWarnings: string) { const getAmountInputState = (amountErrors: string, amountWarnings: string): string => {
let state = ''; let state = '';
if (amountWarnings && !amountErrors) { if (amountWarnings && !amountErrors) {
state = 'warning'; state = 'warning';
@ -224,56 +164,24 @@ class AccountSend extends Component<Props, State> {
state = 'error'; state = 'error';
} }
return state; return state;
} };
getGasLimitInputState(gasLimitErrors: string, gasLimitWarnings: string) { const getTokensSelectData = (tokens: Array<Token>, accountNetwork: any): Array<{ value: string, label: string }> => {
let state = '';
if (gasLimitWarnings && !gasLimitErrors) {
state = 'warning';
}
if (gasLimitErrors) {
state = 'error';
}
return state;
}
getGasPriceInputState(gasPriceErrors: string, gasPriceWarnings: string) {
let state = '';
if (gasPriceWarnings && !gasPriceErrors) {
state = 'warning';
}
if (gasPriceErrors) {
state = 'error';
}
return state;
}
getTokensSelectData(tokens: Array<Token>, accountNetwork: any) {
const tokensSelectData: Array<{ value: string, label: string }> = tokens.map(t => ({ value: t.symbol, label: t.symbol })); const tokensSelectData: Array<{ value: string, label: string }> = tokens.map(t => ({ value: t.symbol, label: t.symbol }));
tokensSelectData.unshift({ value: accountNetwork.symbol, label: accountNetwork.symbol }); tokensSelectData.unshift({ value: accountNetwork.symbol, label: accountNetwork.symbol });
return tokensSelectData; return tokensSelectData;
} };
handleToggleAdvancedSettingsButton() { // stateless component
this.toggleAdvancedSettings(); const AccountSend = (props: Props) => {
} const device = props.wallet.selectedDevice;
toggleAdvancedSettings() {
this.setState(previousState => ({
isAdvancedSettingsHidden: !previousState.isAdvancedSettingsHidden,
shouldAnimateAdvancedSettingsToggle: true,
}));
}
render() {
const device = this.props.wallet.selectedDevice;
const { const {
account, account,
network, network,
discovery, discovery,
tokens, tokens,
} = this.props.selectedAccount; } = props.selectedAccount;
const { const {
address, address,
amount, amount,
@ -282,7 +190,6 @@ class AccountSend extends Component<Props, State> {
currency, currency,
feeLevels, feeLevels,
selectedFeeLevel, selectedFeeLevel,
recommendedGasPrice,
gasPriceNeedsUpdate, gasPriceNeedsUpdate,
total, total,
errors, errors,
@ -290,11 +197,11 @@ class AccountSend extends Component<Props, State> {
infos, infos,
data, data,
sending, sending,
gasLimit, advanced,
gasPrice, } = props.sendForm;
} = this.props.sendForm;
const { const {
toggleAdvanced,
onAddressChange, onAddressChange,
onAmountChange, onAmountChange,
onSetMax, onSetMax,
@ -302,10 +209,7 @@ class AccountSend extends Component<Props, State> {
onFeeLevelChange, onFeeLevelChange,
updateFeeLevels, updateFeeLevels,
onSend, onSend,
onGasLimitChange, } = props.sendFormActions;
onGasPriceChange,
onDataChange,
} = this.props.sendFormActions;
if (!device || !account || !discovery || !network) return null; if (!device || !account || !discovery || !network) return null;
@ -328,26 +232,20 @@ class AccountSend extends Component<Props, State> {
isSendButtonDisabled = true; isSendButtonDisabled = true;
} }
const tokensSelectData = this.getTokensSelectData(tokens, network); const tokensSelectData = getTokensSelectData(tokens, network);
const isAdvancedSettingsHidden = !advanced;
let gasLimitTooltipCurrency: string; // eslint workaround (is this some bug?)
let gasLimitTooltipValue: string; // if i put {true} directly to "AdvancedSettingsIcon" component
if (networkSymbol !== currency) { // i get eslint error
gasLimitTooltipCurrency = 'tokens'; const advancedButtonCanAnimate = true;
gasLimitTooltipValue = network.defaultGasLimitTokens.toString(10);
} else {
gasLimitTooltipCurrency = networkSymbol;
gasLimitTooltipValue = network.defaultGasLimit.toString(10);
}
return ( return (
<SelectedAccount {...this.props}> <SelectedAccount {...props}>
<Wrapper> <Wrapper>
<StyledH2>Send Ethereum or tokens</StyledH2> <StyledH2>Send Ethereum or tokens</StyledH2>
<InputRow> <InputRow>
<Input <Input
state={this.getAddressInputState(address, errors.address, warnings.address)} state={getAddressInputState(address, errors.address, warnings.address)}
autoComplete="off" autoComplete="off"
autoCorrect="off" autoCorrect="off"
autoCapitalize="off" autoCapitalize="off"
@ -361,7 +259,7 @@ class AccountSend extends Component<Props, State> {
<InputRow> <InputRow>
<Input <Input
state={this.getAmountInputState(errors.amount, warnings.amount)} state={getAmountInputState(errors.amount, warnings.amount)}
autoComplete="off" autoComplete="off"
autoCorrect="off" autoCorrect="off"
autoCapitalize="off" autoCapitalize="off"
@ -427,12 +325,7 @@ class AccountSend extends Component<Props, State> {
isSearchable={false} isSearchable={false}
isClearable={false} isClearable={false}
value={selectedFeeLevel} value={selectedFeeLevel}
onChange={(option) => { onChange={onFeeLevelChange}
if (option.value === 'Custom') {
this.toggleAdvancedSettings();
}
onFeeLevelChange(option);
}}
options={feeLevels} options={feeLevels}
formatOptionLabel={option => ( formatOptionLabel={option => (
<FeeOptionWrapper> <FeeOptionWrapper>
@ -444,26 +337,26 @@ class AccountSend extends Component<Props, State> {
</InputRow> </InputRow>
<ToggleAdvancedSettingsWrapper <ToggleAdvancedSettingsWrapper
isAdvancedSettingsHidden={this.state.isAdvancedSettingsHidden} isAdvancedSettingsHidden={isAdvancedSettingsHidden}
> >
<ToggleAdvancedSettingsButton <ToggleAdvancedSettingsButton
isTransparent isTransparent
onClick={() => this.handleToggleAdvancedSettingsButton()} onClick={toggleAdvanced}
> >
Advanced settings Advanced settings
<AdvancedSettingsIcon <AdvancedSettingsIcon
icon={ICONS.ARROW_DOWN} icon={ICONS.ARROW_DOWN}
color={colors.TEXT_SECONDARY} color={colors.TEXT_SECONDARY}
size={24} size={24}
isActive={this.state.isAdvancedSettingsHidden} isActive={advanced}
canAnimate={this.state.shouldAnimateAdvancedSettingsToggle} canAnimate={advancedButtonCanAnimate}
/> />
</ToggleAdvancedSettingsButton> </ToggleAdvancedSettingsButton>
{this.state.isAdvancedSettingsHidden && ( {isAdvancedSettingsHidden && (
<SendButton <SendButton
isDisabled={isSendButtonDisabled} isDisabled={isSendButtonDisabled}
isAdvancedSettingsHidden={this.state.isAdvancedSettingsHidden} isAdvancedSettingsHidden={isAdvancedSettingsHidden}
onClick={() => onSend()} onClick={() => onSend()}
> >
{sendButtonText} {sendButtonText}
@ -471,125 +364,27 @@ class AccountSend extends Component<Props, State> {
)} )}
</ToggleAdvancedSettingsWrapper> </ToggleAdvancedSettingsWrapper>
{!this.state.isAdvancedSettingsHidden && ( {advanced && (
<AdvancedSettingsWrapper> <AdvancedForm {...props}>
<GasInputRow>
<GasInput
state={this.getGasLimitInputState(errors.gasLimit, warnings.gasLimit)}
autoComplete="off"
autoCorrect="off"
autoCapitalize="off"
spellCheck="false"
topLabel={(
<InputLabelWrapper>
Gas limit
<Tooltip
content={(
<React.Fragment>
Gas limit is the amount of gas to send with your transaction.<br />
<GreenSpan>TX fee = gas price * gas limit</GreenSpan> &amp; is paid to miners for including your TX in a block.<br />
Increasing this number will not get your TX mined faster.<br />
Default value for sending {gasLimitTooltipCurrency} is <GreenSpan>{gasLimitTooltipValue}</GreenSpan>
</React.Fragment>
)}
placement="top"
>
<Icon
icon={ICONS.HELP}
color={colors.TEXT_SECONDARY}
size={24}
/>
</Tooltip>
</InputLabelWrapper>
)}
bottomText={errors.gasLimit || warnings.gasLimit || infos.gasLimit}
value={gasLimit}
isDisabled={networkSymbol === currency && data.length > 0}
onChange={event => onGasLimitChange(event.target.value)}
/>
<GasInput
state={this.getGasPriceInputState(errors.gasPrice, warnings.gasPrice)}
autoComplete="off"
autoCorrect="off"
autoCapitalize="off"
spellCheck="false"
topLabel={(
<InputLabelWrapper>
Gas price
<Tooltip
content={(
<React.Fragment>
Gas Price is the amount you pay per unit of gas.<br />
<GreenSpan>TX fee = gas price * gas limit</GreenSpan> &amp; is paid to miners for including your TX in a block.<br />
Higher the gas price = faster transaction, but more expensive. Recommended is <GreenSpan>{recommendedGasPrice} GWEI.</GreenSpan><br />
<Link href="https://myetherwallet.github.io/knowledge-base/gas/what-is-gas-ethereum.html" target="_blank" rel="noreferrer noopener" isGreen>Read more</Link>
</React.Fragment>
)}
placement="top"
>
<Icon
icon={ICONS.HELP}
color={colors.TEXT_SECONDARY}
size={24}
/>
</Tooltip>
</InputLabelWrapper>
)}
bottomText={errors.gasPrice || warnings.gasPrice || infos.gasPrice}
value={gasPrice}
onChange={event => onGasPriceChange(event.target.value)}
/>
</GasInputRow>
<StyledTextarea
topLabel={(
<InputLabelWrapper>
Data
<Tooltip
content={(
<React.Fragment>
Data is usually used when you send transactions to contracts.
</React.Fragment>
)}
placement="top"
>
<Icon
icon={ICONS.HELP}
color={colors.TEXT_SECONDARY}
size={24}
/>
</Tooltip>
</InputLabelWrapper>
)}
disabled={networkSymbol !== currency}
value={networkSymbol !== currency ? '' : data}
onChange={event => onDataChange(event.target.value)}
/>
<AdvancedSettingsSendButtonWrapper>
<SendButton <SendButton
isDisabled={isSendButtonDisabled} isDisabled={isSendButtonDisabled}
onClick={() => onSend()} onClick={() => onSend()}
> >
{sendButtonText} {sendButtonText}
</SendButton> </SendButton>
</AdvancedSettingsSendButtonWrapper> </AdvancedForm>
</AdvancedSettingsWrapper>
)} )}
{this.props.selectedAccount.pending.length > 0 && ( {props.selectedAccount.pending.length > 0 && (
<PendingTransactions <PendingTransactions
pending={this.props.selectedAccount.pending} pending={props.selectedAccount.pending}
tokens={this.props.selectedAccount.tokens} tokens={props.selectedAccount.tokens}
network={network} network={network}
/> />
)} )}
</Wrapper> </Wrapper>
</SelectedAccount> </SelectedAccount>
); );
} };
}
export default AccountSend; export default AccountSend;