Merge branch 'styled-components-refactor' of https://github.com/satoshilabs/trezor-wallet into styled-components-refactor

src/components/buttons/Button/index.js

@@ -112,7 +112,7 @@ const IconWrapper = styled.span`
 `;
 
 const Button = ({
-    children, className, text, icon, onClick = () => { }, disabled, isWhite = false, isWebUsb = false, isTransparent = false,
+    children, className, icon, onClick = () => { }, disabled, isWhite = false, isWebUsb = false, isTransparent = false,
 }) => (
     <Wrapper
         className={className}
@@ -151,7 +151,6 @@ Button.propTypes = {
         color: PropTypes.string,
         size: PropTypes.number,
     }),
-    text: PropTypes.string.isRequired,
 };
 
 export default Button;

src/components/modals/RememberDevice/index.js

@@ -138,7 +138,7 @@ export default class RememberDevice extends Component<Props, State> {
                     </StyledButton>
                     <StyledButton
                         isWhite
-                        onClick={event => onRememberDevice(device)}
+                        onClick={() => onRememberDevice(device)}
                     >Remember
                     </StyledButton>
                 </Column>

src/components/modals/index.js

@@ -19,16 +19,16 @@ import * as CONNECT from 'actions/constants/TrezorConnect';
 import type { MapStateToProps, MapDispatchToProps } from 'react-redux';
 import type { State, Dispatch } from 'flowtype';
 
-import ForgetDevice from 'components/modal/ForgetDevice';
-
-import Pin from 'components/modal/Pin';
-import InvalidPin from 'components/modal/InvalidPin';
-import Passphrase from 'components/modal/Passphrase';
-import PassphraseType from 'components/modal/PassphraseType';
-import ConfirmSignTx from 'components/modal/ConfirmSignTx';
-import ConfirmAddress, { ConfirmUnverifiedAddress } from 'components/modal/ConfirmAddress';
-import RememberDevice from 'components/modal/RememberDevice';
-import DuplicateDevice from 'components/modal/DuplicateDevice';
+import ForgetDevice from 'components/modals/ForgetDevice';
+
+import Pin from 'components/modals/Pin';
+import InvalidPin from 'components/modals/InvalidPin';
+import Passphrase from 'components/modals/Passphrase';
+import PassphraseType from 'components/modals/PassphraseType';
+import ConfirmSignTx from 'components/modals/ConfirmSignTx';
+import ConfirmAddress, { ConfirmUnverifiedAddress } from 'components/modals/ConfirmAddress';
+import RememberDevice from 'components/modals/RememberDevice';
+import DuplicateDevice from 'components/modals/DuplicateDevice';
 
 
 type OwnProps = { }

src/views/Wallet/index.js

@@ -11,7 +11,7 @@ import type { State, Dispatch } from 'flowtype';
 
 import Header from 'components/Header';
 import Footer from 'components/Footer';
-import ModalContainer from 'components/modal';
+import ModalContainer from 'components/modals';
 import Notifications from 'components/Notification';
 import Log from 'components/Log';