diff --git a/src/components/modals/device/Type/index.js b/src/components/modals/device/Type/index.js
index 3ea87286..e9676ac3 100644
--- a/src/components/modals/device/Type/index.js
+++ b/src/components/modals/device/Type/index.js
@@ -48,13 +48,15 @@ class ForgetDevice extends Component<Props> {
     keyboardHandler: (event: KeyboardEvent) => void;
 
     foo(hidden: boolean) {
-        this.props.modalActions.onWalletTypeRequest(this.props.modal.device, hidden);
+        const { modal } = this.props;
+        if (!modal.opened) return;
+        this.props.modalActions.onWalletTypeRequest(modal.device, hidden);
     }
 
     render() {
         if (!this.props.modal.opened) return null;
         const { device } = this.props.modal;
-        const { onCancel } = this.props.modalActions;
+        // const { onCancel } = this.props.modalActions;
         return (
             <Wrapper>
                 <H3>RequestWalletType for { device.instanceLabel }?</H3>
diff --git a/src/components/modals/passphrase/Type/index.js b/src/components/modals/passphrase/Type/index.js
index 568c1c3d..7ce9951c 100644
--- a/src/components/modals/passphrase/Type/index.js
+++ b/src/components/modals/passphrase/Type/index.js
@@ -1,9 +1,14 @@
+/* @flow */
+
 import React from 'react';
 import Icon from 'components/Icon';
 import colors from 'config/colors';
 import icons from 'config/icons';
 import styled from 'styled-components';
 import { H3 } from 'components/Heading';
+import P from 'components/Paragraph';
+
+import type { Props } from 'components/modals/index';
 
 const Wrapper = styled.div`
     width: 360px;
@@ -12,7 +17,7 @@ const Wrapper = styled.div`
 
 const Header = styled.div``;
 
-const Confirmation = (props) => {
+const Confirmation = (props: Props) => {
     if (!props.modal.opened) return null;
     const { device } = props.modal;
 
@@ -21,6 +26,7 @@ const Confirmation = (props) => {
             <Header>
                 <Icon icon={icons.T1} size={60} color={colors.TEXT_SECONDARY} />
                 <H3>Complete the action on { device.label } device</H3>
+                <P isSmaller>TODO: add detailed text here. Explain passphrase/hidden wallet...</P>
             </Header>
         </Wrapper>
     );