arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-01 04:38:15 +00:00
Code Issues Releases Wiki Activity

Confirm moved to modals

Browse Source
This commit is contained in:
Vladimir Volek 2018-11-05 17:54:07 +01:00
parent 68a8307b49
commit dd6117b008
6 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/modals/confirm/Action/index.js Normal file
View File

@ -0,0 +1,21 @@
/* @flow */
import React from 'react';
import styled from 'styled-components';
import { H3 } from 'components/Heading';
const Wrapper = styled.div``;
const Header = styled.div`
padding: 48px;
`;
const ConfirmAction = () => (
<Wrapper>
<Header>
<H3>Confirm Action on your Trezor</H3>
</Header>
</Wrapper>
);
export default ConfirmAction;

2
src/components/modals/confirm/Address/index.js
View File

@ -7,7 +7,7 @@ import styled from 'styled-components';
import colors from 'config/colors';
import { FONT_SIZE } from 'config/variables';
import H3 from 'components/Heading';
import { H3 } from 'components/Heading';
import P from 'components/Paragraph';
import type { Props } from '../../Container';

4
src/components/modals/index.js
View File

@ -17,6 +17,7 @@ import InvalidPin from 'components/modals/pin/Invalid';
import Passphrase from 'components/modals/passphrase/Passphrase';
import PassphraseType from 'components/modals/passphrase/Type';
import ConfirmSignTx from 'components/modals/confirm/SignTx';
import ConfirmAction from 'components/modals/confirm/Action';
import ConfirmUnverifiedAddress from 'components/modals/confirm/UnverifiedAddress';
import ForgetDevice from 'components/modals/device/Forget';
import RememberDevice from 'components/modals/device/Remember';
@ -90,6 +91,9 @@ const getDeviceContextModal = (props: Props) => {
case 'ButtonRequest_SignTx':
return <ConfirmSignTx device={modal.device} sendForm={props.sendForm} />;
case 'ButtonRequest_Other':
return <ConfirmAction />;
case RECEIVE.REQUEST_UNVERIFIED:
return (
<ConfirmUnverifiedAddress

1
src/reducers/SignVerifyReducer.js
View File

@ -5,6 +5,7 @@ import * as SIGN_VERIFY from '../actions/constants/signVerify';
export type State = {
signature: string;
isSignProgress: boolean;
isVerifyProgress: boolean;
}
export const initialState: State = {

1
src/views/Wallet/views/Account/Receive/index.js
View File

@ -11,7 +11,6 @@ import Tooltip from 'components/Tooltip';
import Input from 'components/inputs/Input';
import ICONS from 'config/icons';
import TrezorConfirm from 'components/trezorActions/Confirm';
import colors from 'config/colors';
import { CONTEXT_DEVICE } from 'actions/constants/modal';

27
src/views/Wallet/views/Account/SignVerify/index.js
View File

@ -144,15 +144,6 @@ class SignVerify extends Component<Props, State> {
rows={4}
maxRows={4}
maxLength="255"
trezorAction={this.props.isSignProgress ? (
<ActionWrapper>
<StyledIcon
icon={ICONS.T1}
color={colors.WHITE}
/>
Check address on your Trezor
</ActionWrapper>
) : null}
/>
</Row>
<Row>
@ -189,15 +180,6 @@ class SignVerify extends Component<Props, State> {
state={(this.state.verifyAddress && validateAddress(this.state.verifyAddress)) ? 'error' : null}
bottomText={this.state.verifyAddress !== '' ? validateAddress(this.state.verifyAddress) : null}
isSmallText
trezorAction={this.props.isVerifyProgress ? (
<ActionWrapper>
<StyledIcon
icon={ICONS.T1}
color={colors.WHITE}
/>
Check address on your Trezor
</ActionWrapper>
) : null}
/>
</Row>
<Row>
@ -209,15 +191,6 @@ class SignVerify extends Component<Props, State> {
rows={4}
maxRows={4}
maxLength="255"
trezorAction={this.props.isVerifyProgress ? (
<ActionWrapper>
<StyledIcon
icon={ICONS.T1}
color={colors.WHITE}
/>
Check address on your Trezor
</ActionWrapper>
) : null}
/>
</Row>
<Row>