From dd6117b008cb22de1efc27a82eaec37ce26708f1 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Mon, 5 Nov 2018 17:54:07 +0100
Subject: [PATCH] Confirm moved to modals

---
 src/components/modals/confirm/Action/index.js | 21 +++++++++++++++
 .../modals/confirm/Address/index.js           |  2 +-
 src/components/modals/index.js                |  4 +++
 src/reducers/SignVerifyReducer.js             |  1 +
 .../Wallet/views/Account/Receive/index.js     |  1 -
 .../Wallet/views/Account/SignVerify/index.js  | 27 -------------------
 6 files changed, 27 insertions(+), 29 deletions(-)
 create mode 100644 src/components/modals/confirm/Action/index.js

diff --git a/src/components/modals/confirm/Action/index.js b/src/components/modals/confirm/Action/index.js
new file mode 100644
index 00000000..9a8f9947
--- /dev/null
+++ b/src/components/modals/confirm/Action/index.js
@@ -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;
\ No newline at end of file
diff --git a/src/components/modals/confirm/Address/index.js b/src/components/modals/confirm/Address/index.js
index 05314500..f47c18e9 100644
--- a/src/components/modals/confirm/Address/index.js
+++ b/src/components/modals/confirm/Address/index.js
@@ -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';
diff --git a/src/components/modals/index.js b/src/components/modals/index.js
index 54e37ae8..018d10d4 100644
--- a/src/components/modals/index.js
+++ b/src/components/modals/index.js
@@ -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
diff --git a/src/reducers/SignVerifyReducer.js b/src/reducers/SignVerifyReducer.js
index 97db29ec..b899d7ed 100644
--- a/src/reducers/SignVerifyReducer.js
+++ b/src/reducers/SignVerifyReducer.js
@@ -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 = {
diff --git a/src/views/Wallet/views/Account/Receive/index.js b/src/views/Wallet/views/Account/Receive/index.js
index be8c1646..64ba42f0 100644
--- a/src/views/Wallet/views/Account/Receive/index.js
+++ b/src/views/Wallet/views/Account/Receive/index.js
@@ -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';
 
diff --git a/src/views/Wallet/views/Account/SignVerify/index.js b/src/views/Wallet/views/Account/SignVerify/index.js
index 20739685..9c753d6f 100644
--- a/src/views/Wallet/views/Account/SignVerify/index.js
+++ b/src/views/Wallet/views/Account/SignVerify/index.js
@@ -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>