From 31771b20903436637722a7b83336bab7074ce904 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Wed, 29 Aug 2018 16:04:40 +0200 Subject: [PATCH 1/8] Revert "updated README" This reverts commit 84dc559775f36845095270f4da36695f90dc8f5f. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 416973de..3341504c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -👛 A webwallet using TREZOR as a private key storage https://wallet.trezor.io/trezor-wallet +# TREZOR Ethereum Wallet npm install / yarn + npm run dev / yarn run dev + npm run build / yarn run build \ No newline at end of file From 608b4e79cc87b16938c6e5f8280f4ee4a79132aa Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 30 Aug 2018 10:54:20 +0200 Subject: [PATCH 2/8] Buttons merged into folder --- src/components/Notification/index.js | 2 +- src/components/{ => buttons}/Button/index.js | 0 src/components/{ => buttons}/NotificationButton/index.js | 0 src/views/Landing/components/BrowserNotSupported/index.js | 2 +- src/views/Landing/components/ConnectDevice/index.js | 2 +- src/views/Landing/components/InstallBridge/index.js | 2 +- .../components/LeftNavigation/components/DeviceMenu/index.js | 2 +- src/views/Wallet/views/DeviceSettings/index.js | 2 +- src/views/Wallet/views/Initialize/index.js | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename src/components/{ => buttons}/Button/index.js (100%) rename src/components/{ => buttons}/NotificationButton/index.js (100%) diff --git a/src/components/Notification/index.js b/src/components/Notification/index.js index 9505e26f..8030dbec 100644 --- a/src/components/Notification/index.js +++ b/src/components/Notification/index.js @@ -3,7 +3,7 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import styled, { css } from 'styled-components'; import colors from 'config/colors'; -import NotificationButton from 'components/NotificationButton'; +import NotificationButton from 'components/buttons/NotificationButton'; import Icon from 'components/Icon'; import icons from 'config/icons'; import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; diff --git a/src/components/Button/index.js b/src/components/buttons/Button/index.js similarity index 100% rename from src/components/Button/index.js rename to src/components/buttons/Button/index.js diff --git a/src/components/NotificationButton/index.js b/src/components/buttons/NotificationButton/index.js similarity index 100% rename from src/components/NotificationButton/index.js rename to src/components/buttons/NotificationButton/index.js diff --git a/src/views/Landing/components/BrowserNotSupported/index.js b/src/views/Landing/components/BrowserNotSupported/index.js index 69dbfe11..867fb365 100644 --- a/src/views/Landing/components/BrowserNotSupported/index.js +++ b/src/views/Landing/components/BrowserNotSupported/index.js @@ -1,7 +1,7 @@ import React from 'react'; import styled, { css } from 'styled-components'; import Link from 'components/Link'; -import Button from 'components/Button'; +import Button from 'components/buttons/Button'; import P from 'components/Paragraph'; import { H2 } from 'components/Heading'; diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js index d9b40232..40ac60f3 100644 --- a/src/views/Landing/components/ConnectDevice/index.js +++ b/src/views/Landing/components/ConnectDevice/index.js @@ -4,7 +4,7 @@ import React, { Component } from 'react'; import styled, { keyframes } from 'styled-components'; import TrezorConnect from 'trezor-connect'; import P from 'components/Paragraph'; -import Button from 'components/Button'; +import Button from 'components/buttons/Button'; import { PULSATE } from 'config/animations'; import colors from 'config/colors'; import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; diff --git a/src/views/Landing/components/InstallBridge/index.js b/src/views/Landing/components/InstallBridge/index.js index 074cec7c..ccb5808f 100644 --- a/src/views/Landing/components/InstallBridge/index.js +++ b/src/views/Landing/components/InstallBridge/index.js @@ -7,7 +7,7 @@ import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; import installers from 'constants/bridge'; import Select from 'components/Select'; import Link from 'components/Link'; -import Button from 'components/Button'; +import Button from 'components/buttons/Button'; import Loader from 'components/Loader'; import P from 'components/Paragraph'; import ICONS from 'config/icons'; diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js index f27b36db..839ba306 100644 --- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js @@ -4,7 +4,7 @@ import styled from 'styled-components'; import TrezorConnect from 'trezor-connect'; import type { TrezorDevice } from 'flowtype'; import DeviceHeader from 'components/DeviceHeader'; -import Button from 'components/Button'; +import Button from 'components/buttons/Button'; import { isWebUSB } from 'utils/device'; import MenuItems from './components/MenuItems'; import DeviceList from './components/DeviceList'; diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js index 5cc3d11e..ec84012f 100644 --- a/src/views/Wallet/views/DeviceSettings/index.js +++ b/src/views/Wallet/views/DeviceSettings/index.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; import { H2 } from 'components/Heading'; import Icon from 'components/Icon'; import colors from 'config/colors'; -import Button from 'components/Button'; +import Button from 'components/buttons/Button'; import ICONS from 'config/icons'; import { connect } from 'react-redux'; diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index ca8cd301..a957c110 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -1,6 +1,6 @@ import styled from 'styled-components'; import { H2 } from 'components/Heading'; -import Button from 'components/Button'; +import Button from 'components/buttons/Button'; import Paragraph from 'components/Paragraph'; import React from 'react'; import { connect } from 'react-redux'; From d767ee0e05fba0daf7fdeaf30b832b9de2cb1eb2 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 30 Aug 2018 13:07:07 +0200 Subject: [PATCH 3/8] Remember device refactored --- src/components/modal/ConfirmSignTx/index.js | 55 +++++++++++++++++++++ src/components/modal/RememberDevice.js | 42 +--------------- 2 files changed, 56 insertions(+), 41 deletions(-) create mode 100644 src/components/modal/ConfirmSignTx/index.js diff --git a/src/components/modal/ConfirmSignTx/index.js b/src/components/modal/ConfirmSignTx/index.js new file mode 100644 index 00000000..94588b3a --- /dev/null +++ b/src/components/modal/ConfirmSignTx/index.js @@ -0,0 +1,55 @@ +import React from 'react'; +import colors from 'config/colors'; +import styled from 'styled-components'; +import P from 'components/Paragraph'; +import { H3 } from 'components/Heading'; + +const Wrapper = styled.div` + width: 390px; +`; + +const Header = styled.div` +`; + +const Content = styled.div` + border-top: 1px solid ${colors.DIVIDER}; + background: ${colors.MAIN}; + padding: 24px 48px; +`; + +const Label = styled.div` + font-size: 10px; + color: ${colors.TEXT_SECONDARY}; +`; + +const ConfirmSignTx = (props) => { + if (!props.modal.opened) return null; + const { device } = props.modal; + + const { + amount, + address, + currency, + total, + selectedFeeLevel, + } = props.sendForm; + + return ( + +
+

Confirm transaction on { device.label } device

+

Details are shown on display

+
+ + +

{ `${amount} ${currency}` }

+ +

{ address }

+ +

{ selectedFeeLevel.label }

+ + + ); +}; + +export default ConfirmSignTx; \ No newline at end of file diff --git a/src/components/modal/RememberDevice.js b/src/components/modal/RememberDevice.js index 2e318f7b..8d716176 100644 --- a/src/components/modal/RememberDevice.js +++ b/src/components/modal/RememberDevice.js @@ -94,44 +94,4 @@ export default class RememberDevice extends Component { ); } -} - -export class ForgetDevice extends Component { - keyboardHandler: (event: KeyboardEvent) => void; - - keyboardHandler(event: KeyboardEvent): void { - if (event.keyCode === 13) { - event.preventDefault(); - this.forget(); - } - } - - componentDidMount(): void { - this.keyboardHandler = this.keyboardHandler.bind(this); - window.addEventListener('keydown', this.keyboardHandler, false); - } - - componentWillUnmount(): void { - window.removeEventListener('keydown', this.keyboardHandler, false); - } - - forget() { - if (this.props.modal.opened) { - this.props.modalActions.onForgetSingleDevice(this.props.modal.device); - } - } - - render() { - if (!this.props.modal.opened) return null; - const { device } = this.props.modal; - const { onCancel } = this.props.modalActions; - return ( -
-

Forget { device.instanceLabel } ?

-

Forgetting only removes the device from the list on the left, your coins are still safe and you can access them by reconnecting your TREZOR again.

- - -
- ); - } -} +} \ No newline at end of file From 77135e819824ad1c5528e351cfb5f2178baf8e47 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 30 Aug 2018 13:07:34 +0200 Subject: [PATCH 4/8] Forget device refactored --- src/components/buttons/Button/index.js | 6 +- src/components/modal/ConfirmSignTx.js | 37 ------------ src/components/modal/ForgetDevice/index.js | 66 ++++++++++++++++++++++ src/components/modal/index.js | 19 ++++--- 4 files changed, 79 insertions(+), 49 deletions(-) delete mode 100644 src/components/modal/ConfirmSignTx.js create mode 100644 src/components/modal/ForgetDevice/index.js diff --git a/src/components/buttons/Button/index.js b/src/components/buttons/Button/index.js index 876fe893..a38dc59c 100644 --- a/src/components/buttons/Button/index.js +++ b/src/components/buttons/Button/index.js @@ -29,7 +29,7 @@ const Wrapper = styled.button` background: ${colors.GRAY_LIGHT}; `} - ${props => props.color === 'white' && css` + ${props => props.isWhite && css` background: ${colors.WHITE}; color: ${colors.TEXT_SECONDARY}; border: 1px solid ${colors.DIVIDER}; @@ -113,14 +113,13 @@ const IconWrapper = styled.span` `; const Button = ({ - className, text, icon, onClick = () => { }, disabled, color = null, isWhite = false, isWebUsb = false, isTransparent = false, + className, text, icon, onClick = () => { }, disabled, isWhite = false, isWebUsb = false, isTransparent = false, }) => ( { - if (!props.modal.opened) return null; - const { device } = props.modal; - - const { - amount, - address, - currency, - total, - selectedFeeLevel, - } = props.sendForm; - - return ( -
-
-

Confirm transaction on { device.label } device

-

Details are shown on display

-
-
- -

{ `${amount} ${currency}` }

- -

{ address }

- -

{ selectedFeeLevel.label }

-
-
- ); -}; - -export default Confirmation; \ No newline at end of file diff --git a/src/components/modal/ForgetDevice/index.js b/src/components/modal/ForgetDevice/index.js new file mode 100644 index 00000000..2484985d --- /dev/null +++ b/src/components/modal/ForgetDevice/index.js @@ -0,0 +1,66 @@ +import React, { Component } from 'react'; +import styled from 'styled-components'; +import { H3 } from 'components/Heading'; +import P from 'components/Paragraph'; +import Button from 'components/buttons/Button'; + +const Remember = styled.div` + width: 360px; + padding: 24px 48px; +`; + +const StyledP = styled(P)` + padding: 14px 0px; +`; + +const StyledButton = styled(Button)` + margin: 0 0 10px 0; +`; + +const Row = styled.div` + display: flex; + flex-direction: column; + padding: 10px 0; +`; + +class ForgetDevice extends Component { + componentDidMount() { + this.keyboardHandler = this.keyboardHandler.bind(this); + window.addEventListener('keydown', this.keyboardHandler, false); + } + + componentWillUnmount() { + window.removeEventListener('keydown', this.keyboardHandler, false); + } + + keyboardHandler(event) { + if (event.keyCode === 13) { + event.preventDefault(); + this.forget(); + } + } + + forget() { + if (this.props.modal.opened) { + this.props.modalActions.onForgetSingleDevice(this.props.modal.device); + } + } + + render() { + if (!this.props.modal.opened) return null; + const { device } = this.props.modal; + const { onCancel } = this.props.modalActions; + return ( + +

Forget { device.instanceLabel } ?

+ Forgetting only removes the device from the list on the left, your coins are still safe and you can access them by reconnecting your TREZOR again. + + this.forget()} text="Forget" /> + + + + ); + } +} + +export default ForgetDevice; \ No newline at end of file diff --git a/src/components/modal/index.js b/src/components/modal/index.js index 47984166..dbd01584 100644 --- a/src/components/modal/index.js +++ b/src/components/modal/index.js @@ -18,14 +18,17 @@ import * as MODAL from 'actions/constants/modal'; import * as CONNECT from 'actions/constants/TrezorConnect'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; import type { State, Dispatch } from 'flowtype'; -import Pin from './Pin'; -import InvalidPin from './InvalidPin'; -import Passphrase from './Passphrase'; -import PassphraseType from './PassphraseType'; -import ConfirmSignTx from './ConfirmSignTx'; -import ConfirmAddress, { ConfirmUnverifiedAddress } from './ConfirmAddress'; -import RememberDevice, { ForgetDevice } from './RememberDevice'; -import DuplicateDevice from './DuplicateDevice'; + +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'; type OwnProps = { } From 847f9817672798c20e5ce641a827499f9d6080ca Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 30 Aug 2018 13:16:11 +0200 Subject: [PATCH 5/8] Bootloader refactored --- src/views/Wallet/views/Bootloader/index.js | 35 +++++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/src/views/Wallet/views/Bootloader/index.js b/src/views/Wallet/views/Bootloader/index.js index e7a0f1f1..0f245f7a 100644 --- a/src/views/Wallet/views/Bootloader/index.js +++ b/src/views/Wallet/views/Bootloader/index.js @@ -1,17 +1,36 @@ -/* @flow */ - import React from 'react'; +import styled from 'styled-components'; import { H2 } from 'components/Heading'; -import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; +const Wrapper = styled.div` + display: flex; + flex-direction: column; + flex: 1; +`; + +const Row = styled.div` + flex: 1; + display: flex; + padding: 0px 48px; + + flex-direction: column; + justify-content: center; + align-items: center; +`; + +const P = styled.p` + padding: 10px 0px; + text-align: center; +`; + const Bootloader = () => ( -
-
+ +

Your device is in firmware update mode

-

Please re-connect it

-
-
+

Please re-connect it

+ + ); export default connect(null, null)(Bootloader); From 64d5db3e6aa80336ca5c3651cff4b06cdd81df03 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 30 Aug 2018 14:16:43 +0200 Subject: [PATCH 6/8] Added children for button not text, refactored remember device --- src/components/Loader/index.js | 9 ++- src/components/buttons/Button/index.js | 6 +- src/components/modal/ForgetDevice/index.js | 8 +-- .../index.js} | 67 ++++++++++++++++--- src/components/modal/index.js | 41 +++++++++--- src/styles/modal.less | 23 ------- 6 files changed, 104 insertions(+), 50 deletions(-) rename src/components/modal/{RememberDevice.js => RememberDevice/index.js} (61%) diff --git a/src/components/Loader/index.js b/src/components/Loader/index.js index e977cb59..5a582df3 100644 --- a/src/components/Loader/index.js +++ b/src/components/Loader/index.js @@ -35,11 +35,15 @@ const CircleWrapper = styled.circle` `}; `; +const StyledParagraph = styled(Paragraph)` + color: ${props => (props.isWhiteText ? colors.WHITE : colors.TEXT_PRIMARY)}; +`; + const Loader = ({ - className, text, size = 100, + className, text, isWhiteText = false, size = 100, }) => ( - {text} + {text} { }, disabled, isWhite = false, isWebUsb = false, isTransparent = false, + children, className, text, icon, onClick = () => { }, disabled, isWhite = false, isWebUsb = false, isTransparent = false, }) => ( )} - {text} + {children} ); Button.propTypes = { + children: PropTypes.element.isRequired, className: PropTypes.string, onClick: PropTypes.func, disabled: PropTypes.bool, diff --git a/src/components/modal/ForgetDevice/index.js b/src/components/modal/ForgetDevice/index.js index 2484985d..d0b09cd0 100644 --- a/src/components/modal/ForgetDevice/index.js +++ b/src/components/modal/ForgetDevice/index.js @@ -4,7 +4,7 @@ import { H3 } from 'components/Heading'; import P from 'components/Paragraph'; import Button from 'components/buttons/Button'; -const Remember = styled.div` +const Wrapper = styled.div` width: 360px; padding: 24px 48px; `; @@ -51,14 +51,14 @@ class ForgetDevice extends Component { const { device } = this.props.modal; const { onCancel } = this.props.modalActions; return ( - -

Forget { device.instanceLabel } ?

+ +

Forget { device.instanceLabel }?

Forgetting only removes the device from the list on the left, your coins are still safe and you can access them by reconnecting your TREZOR again. this.forget()} text="Forget" /> - + ); } } diff --git a/src/components/modal/RememberDevice.js b/src/components/modal/RememberDevice/index.js similarity index 61% rename from src/components/modal/RememberDevice.js rename to src/components/modal/RememberDevice/index.js index 8d716176..cb661436 100644 --- a/src/components/modal/RememberDevice.js +++ b/src/components/modal/RememberDevice/index.js @@ -1,8 +1,10 @@ /* @flow */ - - import React, { Component } from 'react'; +import styled from 'styled-components'; +import { H3 } from 'components/Heading'; +import P from 'components/Paragraph'; import Loader from 'components/Loader'; +import Button from 'components/buttons/Button'; import type { Props } from './index'; @@ -11,6 +13,40 @@ type State = { ticker?: number; } +const ButtonContent = styled.div` + display: flex; + justify-content: center; + align-items: center; + flex-direction: row; +`; + +const StyledP = styled(P)` + padding: 10px 0; +`; + +const Wrapper = styled.div` + width: 360px; + padding: 24px 48px; +`; + +const Text = styled.div` + padding-right: 10px; +`; + +const Column = styled.div` + display: flex; + flex-direction: column; +`; + +const StyledButton = styled(Button)` + margin: 5px 0; +`; + +const StyledLoader = styled(Loader)` + position: absolute; + left: 200px; +`; + export default class RememberDevice extends Component { keyboardHandler: (event: KeyboardEvent) => void; @@ -86,12 +122,27 @@ export default class RememberDevice extends Component { }); } return ( -
-

Forget {label}?

-

Would you like TREZOR Wallet to forget your { devicePlural }, so that it is still visible even while disconnected?

- - -
+ +

Forget {label}?

+ Would you like TREZOR Wallet to forget your { devicePlural }, so that it is still visible even while disconnected? + + this.forget()}> + + Forget + + + + onRememberDevice(device)} + >Remember + + + ); } } \ No newline at end of file diff --git a/src/components/modal/index.js b/src/components/modal/index.js index dbd01584..57e5d8fd 100644 --- a/src/components/modal/index.js +++ b/src/components/modal/index.js @@ -1,10 +1,10 @@ /* @flow */ - - import React, { Component } from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; +import styled from 'styled-components'; +import colors from 'config/colors'; import { CSSTransition, Transition } from 'react-transition-group'; @@ -65,12 +65,35 @@ const Fade = ({ children, ...props }) => ( ); +const ModalContainer = styled.div` + position: fixed; + z-index: 10000; + width: 100%; + height: 100%; + top: 0px; + left: 0px; + background: rgba(0, 0, 0, 0.35); + display: flex; + flex-direction: column; + align-items: center; + overflow: auto; + padding: 20px; +`; + +const ModalWindow = styled.div` + margin: auto; + position: relative; + border-radius: 4px; + background-color: ${colors.WHITE}; + text-align: center; +`; + class Modal extends Component { render() { if (!this.props.modal.opened) return null; - const { opened, windowType } = this.props.modal; - + const { opened } = this.props.modal; + const windowType = CONNECT.REMEMBER_REQUEST; let component = null; switch (windowType) { case UI.REQUEST_PIN: @@ -86,8 +109,6 @@ class Modal extends Component { component = (); break; // case "ButtonRequest_Address" : - // component = () - // break; case 'ButtonRequest_PassphraseType': component = (); break; @@ -114,11 +135,11 @@ class Modal extends Component { if (opened) { ch = ( -
-
+ + { component } -
-
+ + ); } diff --git a/src/styles/modal.less b/src/styles/modal.less index 7ba6bc93..06fae1ac 100644 --- a/src/styles/modal.less +++ b/src/styles/modal.less @@ -1,27 +1,4 @@ .modal-container { - position: fixed; - z-index: 10000; - width: 100%; - height: 100%; - top: 0px; - left: 0px; - background: rgba(0, 0, 0, 0.35); - display: flex; - flex-direction: column; - align-items: center; - overflow: auto; - padding: 20px; - - .modal-window { - margin: auto; - // padding: 24px 48px; - position: relative; - border-radius: 4px; - background-color: @color_white; - text-align: center; - // overflow: hidden; - } - h3 { color: @color_text_primary; font-size: 16px; From 3fcb9dc25fd702e54978f3dab3be3beb6e485bbb Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 30 Aug 2018 14:20:42 +0200 Subject: [PATCH 7/8] Switched all other button to children not text --- src/components/modal/ForgetDevice/index.js | 4 ++-- src/views/Landing/components/BrowserNotSupported/index.js | 8 ++------ src/views/Landing/components/ConnectDevice/index.js | 4 ++-- src/views/Landing/components/InstallBridge/index.js | 4 ++-- .../LeftNavigation/components/DeviceMenu/index.js | 4 ++-- src/views/Wallet/views/DeviceSettings/index.js | 2 +- src/views/Wallet/views/Initialize/index.js | 2 +- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/components/modal/ForgetDevice/index.js b/src/components/modal/ForgetDevice/index.js index d0b09cd0..75ab4a70 100644 --- a/src/components/modal/ForgetDevice/index.js +++ b/src/components/modal/ForgetDevice/index.js @@ -55,8 +55,8 @@ class ForgetDevice extends Component {

Forget { device.instanceLabel }?

Forgetting only removes the device from the list on the left, your coins are still safe and you can access them by reconnecting your TREZOR again. - this.forget()} text="Forget" /> - + this.forget()}>Forget + Don't forget ); diff --git a/src/views/Landing/components/BrowserNotSupported/index.js b/src/views/Landing/components/BrowserNotSupported/index.js index 867fb365..34b5920e 100644 --- a/src/views/Landing/components/BrowserNotSupported/index.js +++ b/src/views/Landing/components/BrowserNotSupported/index.js @@ -44,9 +44,7 @@ const BrowserNotSupported = () => ( target="_blank" rel="noreferrer noopener" > - @@ -57,9 +55,7 @@ const BrowserNotSupported = () => ( target="_blank" rel="noreferrer noopener" > - diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js index 40ac60f3..f7600bee 100644 --- a/src/views/Landing/components/ConnectDevice/index.js +++ b/src/views/Landing/components/ConnectDevice/index.js @@ -91,9 +91,9 @@ class ConnectDevice extends Component {

and

)} diff --git a/src/views/Landing/components/InstallBridge/index.js b/src/views/Landing/components/InstallBridge/index.js index ccb5808f..e2dc186d 100644 --- a/src/views/Landing/components/InstallBridge/index.js +++ b/src/views/Landing/components/InstallBridge/index.js @@ -126,8 +126,8 @@ export default class InstallBridge extends Component { color: colors.WHITE, size: 30, }} - text={`Download for ${label}`} - /> + >Download for {label} +

diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js index 839ba306..cf8f15a5 100644 --- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js @@ -109,9 +109,9 @@ class DeviceMenu extends Component { {isWebUSB(transport) && ( )} diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js index ec84012f..c1cb2a05 100644 --- a/src/views/Wallet/views/DeviceSettings/index.js +++ b/src/views/Wallet/views/DeviceSettings/index.js @@ -40,7 +40,7 @@ const DeviceSettings = () => ( Device settings is under construction

Please use Bitcoin wallet interface to change your device settings

- diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index a957c110..a9ee478d 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -33,7 +33,7 @@ const Initialize = () => (

Your device is in not initialized

Please use Bitcoin wallet interface to start initialization process - From 5c89786452a63edbc0ad53db9c2d4fdc8423ae5d Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Thu, 30 Aug 2018 14:25:49 +0200 Subject: [PATCH 8/8] Fix modals --- src/components/modal/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/modal/index.js b/src/components/modal/index.js index 57e5d8fd..0709617b 100644 --- a/src/components/modal/index.js +++ b/src/components/modal/index.js @@ -92,8 +92,8 @@ class Modal extends Component { render() { if (!this.props.modal.opened) return null; - const { opened } = this.props.modal; - const windowType = CONNECT.REMEMBER_REQUEST; + const { opened, windowType } = this.props.modal; + let component = null; switch (windowType) { case UI.REQUEST_PIN: