arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-02 13:18:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #483 from trezor/fix/initial-arrow-animation

Browse Source 
Fix/selecting send form tab activates arrow animation
This commit is contained in:
Vladimir Volek 2019-04-02 16:02:05 +02:00 committed by GitHub
commit d6970c8f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* @flow */ /* @flow */
import React from 'react'; import React, { useState } from 'react';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import styled, { css } from 'styled-components'; import styled, { css } from 'styled-components';
import { Select, Button, Input, Link, Icon, P, colors, icons as ICONS } from 'trezor-ui-components'; import { Select, Button, Input, Link, Icon, P, colors, icons as ICONS } from 'trezor-ui-components';
@ -285,6 +285,8 @@ const AccountSend = (props: Props) => {
onClear, onClear,
} = props.sendFormActions; } = props.sendFormActions;
const [touched, setTouched] = useState(false);
if (!device || !account || !discovery || !network || !shouldRender) { if (!device || !account || !discovery || !network || !shouldRender) {
const { loader, exceptionPage } = props.selectedAccount; const { loader, exceptionPage } = props.selectedAccount;
return <Content loader={loader} exceptionPage={exceptionPage} isLoading />; return <Content loader={loader} exceptionPage={exceptionPage} isLoading />;
@ -472,14 +474,20 @@ const AccountSend = (props: Props) => {
</InputRow> </InputRow>
<ToggleAdvancedSettingsWrapper isAdvancedSettingsHidden={isAdvancedSettingsHidden}> <ToggleAdvancedSettingsWrapper isAdvancedSettingsHidden={isAdvancedSettingsHidden}>
<ToggleAdvancedSettingsButton isTransparent onClick={toggleAdvanced}> <ToggleAdvancedSettingsButton
isTransparent
onClick={() => {
toggleAdvanced();
setTouched(true);
}}
>
<FormattedMessage {...l10nSendMessages.TR_ADVANCED_SETTINGS} /> <FormattedMessage {...l10nSendMessages.TR_ADVANCED_SETTINGS} />
<AdvancedSettingsIcon <AdvancedSettingsIcon
icon={ICONS.ARROW_DOWN} icon={ICONS.ARROW_DOWN}
color={colors.TEXT_SECONDARY} color={colors.TEXT_SECONDARY}
size={12} size={12}
isActive={advanced} isActive={advanced}
canAnimate canAnimate={touched || advanced}
/> />
</ToggleAdvancedSettingsButton> </ToggleAdvancedSettingsButton>

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

@ -1,6 +1,6 @@
/* @flow */ /* @flow */
import React from 'react'; import React, { useState } from 'react';
import styled, { css } from 'styled-components'; import styled, { css } from 'styled-components';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
@ -267,6 +267,8 @@ const AccountSend = (props: Props) => {
onClear, onClear,
} = props.sendFormActions; } = props.sendFormActions;
const [touched, setTouched] = useState(false);
if (!device || !account || !discovery || !network || !shouldRender) { if (!device || !account || !discovery || !network || !shouldRender) {
const { loader, exceptionPage } = props.selectedAccount; const { loader, exceptionPage } = props.selectedAccount;
return <Content loader={loader} exceptionPage={exceptionPage} isLoading />; return <Content loader={loader} exceptionPage={exceptionPage} isLoading />;
@ -437,14 +439,20 @@ const AccountSend = (props: Props) => {
</InputRow> </InputRow>
<ToggleAdvancedSettingsWrapper isAdvancedSettingsHidden={isAdvancedSettingsHidden}> <ToggleAdvancedSettingsWrapper isAdvancedSettingsHidden={isAdvancedSettingsHidden}>
<ToggleAdvancedSettingsButton isTransparent onClick={toggleAdvanced}> <ToggleAdvancedSettingsButton
isTransparent
onClick={() => {
toggleAdvanced();
setTouched(true);
}}
>
<FormattedMessage {...l10nSendMessages.TR_ADVANCED_SETTINGS} /> <FormattedMessage {...l10nSendMessages.TR_ADVANCED_SETTINGS} />
<AdvancedSettingsIcon <AdvancedSettingsIcon
icon={ICONS.ARROW_DOWN} icon={ICONS.ARROW_DOWN}
color={colors.TEXT_SECONDARY} color={colors.TEXT_SECONDARY}
size={12} size={12}
isActive={advanced} isActive={advanced}
canAnimate canAnimate={touched || advanced}
/> />
</ToggleAdvancedSettingsButton> </ToggleAdvancedSettingsButton>