From 9c400f0b6e9c78a79096c0dca749fae15185c481 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 7 Jan 2019 10:52:26 +0100 Subject: [PATCH 01/10] unify paddings in wallet views --- src/views/Wallet/views/Bootloader/index.js | 11 ++++---- src/views/Wallet/views/Dashboard/index.js | 12 ++++----- .../Wallet/views/DeviceSettings/index.js | 8 +++--- .../Wallet/views/FirmwareUpdate/index.js | 1 + src/views/Wallet/views/Initialize/index.js | 26 ++++++++++--------- src/views/Wallet/views/Seedless/index.js | 21 ++++++++------- .../Wallet/views/WalletSettings/index.js | 4 +-- 7 files changed, 45 insertions(+), 38 deletions(-) diff --git a/src/views/Wallet/views/Bootloader/index.js b/src/views/Wallet/views/Bootloader/index.js index 15230db0..273c0211 100644 --- a/src/views/Wallet/views/Bootloader/index.js +++ b/src/views/Wallet/views/Bootloader/index.js @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { H2 } from 'components/Heading'; +import { H1 } from 'components/Heading'; +import P from 'components/Paragraph'; import { connect } from 'react-redux'; const Wrapper = styled.div` @@ -15,16 +16,16 @@ const Row = styled.div` padding: 100px 48px; `; -const P = styled.p` - padding: 10px 0px; +const StyledP = styled(P)` + padding: 0 0 15px 0; text-align: center; `; const Bootloader = () => ( -

Your device is in firmware update mode

-

Please re-connect it

+

Your device is in firmware update mode

+ Please re-connect it ); diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index ea4dfc35..636e1b3a 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -3,7 +3,8 @@ import styled from 'styled-components'; import { connect } from 'react-redux'; import Content from 'views/Wallet/components/Content'; -import { H2 } from 'components/Heading'; +import { H1 } from 'components/Heading'; +import Paragraph from 'components/Paragraph'; import DashboardImg from 'images/dashboard.png'; const Wrapper = styled.div` @@ -20,18 +21,17 @@ const Row = styled.div` align-items: center; `; -const P = styled.p` - padding: 24px 0px; +const StyledP = styled(Paragraph)` + padding: 0 0 15px 0; text-align: center; `; const Dashboard = () => ( -

Dashboard

-

Please select your coin

-

You will gain access to receiving & sending selected coin

+

Please select your coin

+ You will gain access to receiving & sending selected coin Dashboard diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js index ca5c384e..4899d548 100644 --- a/src/views/Wallet/views/DeviceSettings/index.js +++ b/src/views/Wallet/views/DeviceSettings/index.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import { H2 } from 'components/Heading'; +import { H1 } from 'components/Heading'; import Icon from 'components/Icon'; import colors from 'config/colors'; import Button from 'components/Button'; @@ -24,7 +24,7 @@ const Row = styled.div` `; const StyledP = styled(P)` - padding: 10px 0 15px 0; + padding: 0 0 15px 0; text-align: center; `; @@ -37,8 +37,8 @@ const DeviceSettings = () => ( color={colors.WARNING_PRIMARY} icon={ICONS.WARNING} /> -

Device settings is under construction

- Please use Bitcoin wallet interface to change your device settings +

Device settings is under construction

+ Please use Bitcoin wallet interface to change your device settings diff --git a/src/views/Wallet/views/FirmwareUpdate/index.js b/src/views/Wallet/views/FirmwareUpdate/index.js index 6c6699ea..9cfa2ab1 100644 --- a/src/views/Wallet/views/FirmwareUpdate/index.js +++ b/src/views/Wallet/views/FirmwareUpdate/index.js @@ -46,6 +46,7 @@ const Image = styled.div` const StyledP = styled(P)` padding: 0 0 15px 0; + text-align: center; `; const FirmwareUpdate = (props: Props) => ( diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index 1a5a5309..8a9ecace 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -1,7 +1,8 @@ import styled from 'styled-components'; -import { H2 } from 'components/Heading'; +import { H1 } from 'components/Heading'; import Button from 'components/Button'; import Paragraph from 'components/Paragraph'; +import Content from 'views/Wallet/components/Content'; import React from 'react'; import { connect } from 'react-redux'; @@ -20,21 +21,22 @@ const Row = styled.div` const A = styled.a``; const StyledParagraph = styled(Paragraph)` - margin: 10px 50px; - display: block; + padding: 0 0 15px 0; text-align: center; `; const Initialize = () => ( - - -

Your device is in not initialized

- Please use Bitcoin wallet interface to start initialization process - - - - - + + + +

Your device is in not initialized

+ Please use Bitcoin wallet interface to start initialization process + + + + + + ); export default connect(null, null)(Initialize); diff --git a/src/views/Wallet/views/Seedless/index.js b/src/views/Wallet/views/Seedless/index.js index 15dd943d..c8266a72 100644 --- a/src/views/Wallet/views/Seedless/index.js +++ b/src/views/Wallet/views/Seedless/index.js @@ -1,9 +1,11 @@ import styled from 'styled-components'; -import { H2 } from 'components/Heading'; +import { H1 } from 'components/Heading'; import Paragraph from 'components/Paragraph'; +import Content from 'views/Wallet/components/Content'; import React from 'react'; import { connect } from 'react-redux'; + const Wrapper = styled.div` display: flex; flex-direction: column; @@ -17,18 +19,19 @@ const Row = styled.div` `; const StyledParagraph = styled(Paragraph)` - margin: 10px 50px; - display: block; + padding: 0 0 15px 0; text-align: center; `; const Seedless = () => ( - - -

Device is in seedless mode

- It's not suitable to use this service. - - + + + +

Device is in seedless mode

+ It's not suitable to use this service. + + + ); export default connect(null, null)(Seedless); diff --git a/src/views/Wallet/views/WalletSettings/index.js b/src/views/Wallet/views/WalletSettings/index.js index c584f958..43c2bd12 100644 --- a/src/views/Wallet/views/WalletSettings/index.js +++ b/src/views/Wallet/views/WalletSettings/index.js @@ -6,7 +6,7 @@ import colors from 'config/colors'; import icons from 'config/icons'; import Content from 'views/Wallet/components/Content'; -import { H2 } from 'components/Heading'; +import { H1 } from 'components/Heading'; import Icon from 'components/Icon'; import Link from 'components/Link'; import Button from 'components/Button'; @@ -32,7 +32,7 @@ const WalletSettings = () => ( color={colors.WARNING_PRIMARY} icon={icons.WARNING} /> -

Wallet settings is under construction

+

Wallet settings is under construction

From 0be0c918debb32eb11d2b4addf55213d9bb9eb14 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 7 Jan 2019 13:54:33 +0100 Subject: [PATCH 02/10] unify paddings in wallet views --- .../components/FirmwareUnsupported/index.js | 24 ++++++++----------- src/views/Wallet/views/Bootloader/index.js | 3 ++- src/views/Wallet/views/Dashboard/index.js | 2 +- .../Wallet/views/DeviceSettings/index.js | 2 +- .../Wallet/views/FirmwareUpdate/index.js | 2 +- src/views/Wallet/views/Initialize/index.js | 2 +- src/views/Wallet/views/Seedless/index.js | 2 +- .../Wallet/views/WalletSettings/index.js | 2 +- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/views/Wallet/components/Content/components/FirmwareUnsupported/index.js b/src/views/Wallet/components/Content/components/FirmwareUnsupported/index.js index 12ca6882..b48f562b 100644 --- a/src/views/Wallet/components/Content/components/FirmwareUnsupported/index.js +++ b/src/views/Wallet/components/Content/components/FirmwareUnsupported/index.js @@ -3,8 +3,8 @@ import React from 'react'; import styled from 'styled-components'; import colors from 'config/colors'; -import { FONT_SIZE } from 'config/variables'; -import { H2 } from 'components/Heading'; +import { H1 } from 'components/Heading'; +import Paragraph from 'components/Paragraph'; import Button from 'components/Button'; import Link from 'components/Link'; import CoinLogo from 'components/images/CoinLogo'; @@ -39,21 +39,17 @@ const StyledCoinLogo = styled(CoinLogo)` width: 32px; `; -const StyledLink = styled(Link)` - padding-top: 24px; -`; - const Row = styled.div` - flex: 1; display: flex; + padding: 50px 0; + flex-direction: column; - justify-content: center; align-items: center; + text-align: center; `; -const Message = styled.div` - font-size: ${FONT_SIZE.SMALL}; - color: ${colors.TEXT_SECONDARY}; +const Message = styled(Paragraph)` + padding: 0 0 15px 0; text-align: center; `; @@ -61,11 +57,11 @@ const FirmwareUnsupported = (props: Props) => ( {props.networkShortcut && } -

{props.title}

+

{props.title}

{props.message} - + - + ); diff --git a/src/views/Wallet/views/Bootloader/index.js b/src/views/Wallet/views/Bootloader/index.js index 273c0211..d82a7a2a 100644 --- a/src/views/Wallet/views/Bootloader/index.js +++ b/src/views/Wallet/views/Bootloader/index.js @@ -7,13 +7,14 @@ import { connect } from 'react-redux'; const Wrapper = styled.div` display: flex; flex-direction: column; + padding: 40px 35px 40px 35px; `; const Row = styled.div` display: flex; flex-direction: column; align-items: center; - padding: 100px 48px; + padding: 50px 0; `; const StyledP = styled(P)` diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index 636e1b3a..84c7a462 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -15,7 +15,7 @@ const Wrapper = styled.div` const Row = styled.div` flex: 1; display: flex; - padding: 100px 48px; + padding: 50px 0; flex-direction: column; align-items: center; diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js index 4899d548..4dbc1546 100644 --- a/src/views/Wallet/views/DeviceSettings/index.js +++ b/src/views/Wallet/views/DeviceSettings/index.js @@ -20,7 +20,7 @@ const Row = styled.div` display: flex; flex-direction: column; align-items: center; - padding: 100px 48px; + padding: 50px 0; `; const StyledP = styled(P)` diff --git a/src/views/Wallet/views/FirmwareUpdate/index.js b/src/views/Wallet/views/FirmwareUpdate/index.js index 9cfa2ab1..f15bcfa4 100644 --- a/src/views/Wallet/views/FirmwareUpdate/index.js +++ b/src/views/Wallet/views/FirmwareUpdate/index.js @@ -31,7 +31,7 @@ const Wrapper = styled.section` flex-direction: column; justify-content: center; align-items: center; - padding: 100px 48px; + padding: 90px 35px 40px 35px; `; const StyledNavLink = styled(Link)` diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index 8a9ecace..a537b57a 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -15,7 +15,7 @@ const Row = styled.div` display: flex; flex-direction: column; align-items: center; - padding: 100px 48px; + padding: 50px 0; `; const A = styled.a``; diff --git a/src/views/Wallet/views/Seedless/index.js b/src/views/Wallet/views/Seedless/index.js index c8266a72..db253641 100644 --- a/src/views/Wallet/views/Seedless/index.js +++ b/src/views/Wallet/views/Seedless/index.js @@ -15,7 +15,7 @@ const Row = styled.div` display: flex; flex-direction: column; align-items: center; - padding: 100px 48px; + padding: 50px 0; `; const StyledParagraph = styled(Paragraph)` diff --git a/src/views/Wallet/views/WalletSettings/index.js b/src/views/Wallet/views/WalletSettings/index.js index 43c2bd12..5f2b3c66 100644 --- a/src/views/Wallet/views/WalletSettings/index.js +++ b/src/views/Wallet/views/WalletSettings/index.js @@ -20,7 +20,7 @@ const Row = styled.div` display: flex; flex-direction: column; align-items: center; - padding: 100px 48px; + padding: 50px 0; `; const WalletSettings = () => ( From 313b40c546e1622761c757ec5b2f4a30ca86df27 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 7 Jan 2019 14:03:44 +0100 Subject: [PATCH 03/10] revert wrapping with Content component --- src/views/Wallet/views/Initialize/index.js | 22 ++++++++++------------ src/views/Wallet/views/Seedless/index.js | 16 +++++++--------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index a537b57a..34843190 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -2,13 +2,13 @@ import styled from 'styled-components'; import { H1 } from 'components/Heading'; import Button from 'components/Button'; import Paragraph from 'components/Paragraph'; -import Content from 'views/Wallet/components/Content'; import React from 'react'; import { connect } from 'react-redux'; const Wrapper = styled.div` display: flex; flex-direction: column; + padding: 40px 35px 40px 35px; `; const Row = styled.div` @@ -26,17 +26,15 @@ const StyledParagraph = styled(Paragraph)` `; const Initialize = () => ( - - - -

Your device is in not initialized

- Please use Bitcoin wallet interface to start initialization process - - - - - - + + +

Your device is in not initialized

+ Please use Bitcoin wallet interface to start initialization process + + + + + ); export default connect(null, null)(Initialize); diff --git a/src/views/Wallet/views/Seedless/index.js b/src/views/Wallet/views/Seedless/index.js index db253641..bde5f915 100644 --- a/src/views/Wallet/views/Seedless/index.js +++ b/src/views/Wallet/views/Seedless/index.js @@ -1,7 +1,6 @@ import styled from 'styled-components'; import { H1 } from 'components/Heading'; import Paragraph from 'components/Paragraph'; -import Content from 'views/Wallet/components/Content'; import React from 'react'; import { connect } from 'react-redux'; @@ -9,6 +8,7 @@ import { connect } from 'react-redux'; const Wrapper = styled.div` display: flex; flex-direction: column; + padding: 40px 35px 40px 35px; `; const Row = styled.div` @@ -24,14 +24,12 @@ const StyledParagraph = styled(Paragraph)` `; const Seedless = () => ( - - - -

Device is in seedless mode

- It's not suitable to use this service. - - - + + +

Device is in seedless mode

+ It's not suitable to use this service. + + ); export default connect(null, null)(Seedless); From 035a45df19696e515847026385a153c8f27eb502 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 7 Jan 2019 14:24:36 +0100 Subject: [PATCH 04/10] fix typo --- src/views/Wallet/views/Initialize/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index 34843190..39055a9f 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -28,7 +28,7 @@ const StyledParagraph = styled(Paragraph)` const Initialize = () => ( -

Your device is in not initialized

+

Your device is not initialized

Please use Bitcoin wallet interface to start initialization process From 5da7f3fa1aee8657fcf69b51e08e182a8e6f2e86 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 7 Jan 2019 14:37:09 +0100 Subject: [PATCH 05/10] Moved icons to shared folder, added correct icons to dashboard --- src/components/images/CoinLogo/index.js | 2 +- .../CoinLogo/images => images/coins}/ada.png | Bin .../CoinLogo/images => images/coins}/bch.png | Bin .../CoinLogo/images => images/coins}/btc.png | Bin .../CoinLogo/images => images/coins}/btg.png | Bin .../CoinLogo/images => images/coins}/dash.png | Bin .../CoinLogo/images => images/coins}/dgb.png | Bin .../CoinLogo/images => images/coins}/doge.png | Bin .../CoinLogo/images => images/coins}/etc.png | Bin .../CoinLogo/images => images/coins}/eth.png | Bin .../CoinLogo/images => images/coins}/ltc.png | Bin .../CoinLogo/images => images/coins}/nem.png | Bin .../CoinLogo/images => images/coins}/nmc.png | Bin .../images => images/coins}/rinkeby.png | Bin .../CoinLogo/images => images/coins}/trop.png | Bin .../CoinLogo/images => images/coins}/txrp.png | Bin .../CoinLogo/images => images/coins}/vtc.png | Bin .../CoinLogo/images => images/coins}/xem.png | Bin .../CoinLogo/images => images/coins}/xlm.png | Bin .../CoinLogo/images => images/coins}/xrp.png | Bin .../CoinLogo/images => images/coins}/zec.png | Bin src/views/Wallet/views/Dashboard/index.js | 25 ++++++++++++++++-- 22 files changed, 24 insertions(+), 3 deletions(-) rename src/{components/images/CoinLogo/images => images/coins}/ada.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/bch.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/btc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/btg.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/dash.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/dgb.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/doge.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/etc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/eth.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/ltc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/nem.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/nmc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/rinkeby.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/trop.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/txrp.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/vtc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/xem.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/xlm.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/xrp.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/zec.png (100%) diff --git a/src/components/images/CoinLogo/index.js b/src/components/images/CoinLogo/index.js index ae03c897..0cca9ba0 100644 --- a/src/components/images/CoinLogo/index.js +++ b/src/components/images/CoinLogo/index.js @@ -34,7 +34,7 @@ class CoinLogo extends PureComponent { ); diff --git a/src/components/images/CoinLogo/images/ada.png b/src/images/coins/ada.png similarity index 100% rename from src/components/images/CoinLogo/images/ada.png rename to src/images/coins/ada.png diff --git a/src/components/images/CoinLogo/images/bch.png b/src/images/coins/bch.png similarity index 100% rename from src/components/images/CoinLogo/images/bch.png rename to src/images/coins/bch.png diff --git a/src/components/images/CoinLogo/images/btc.png b/src/images/coins/btc.png similarity index 100% rename from src/components/images/CoinLogo/images/btc.png rename to src/images/coins/btc.png diff --git a/src/components/images/CoinLogo/images/btg.png b/src/images/coins/btg.png similarity index 100% rename from src/components/images/CoinLogo/images/btg.png rename to src/images/coins/btg.png diff --git a/src/components/images/CoinLogo/images/dash.png b/src/images/coins/dash.png similarity index 100% rename from src/components/images/CoinLogo/images/dash.png rename to src/images/coins/dash.png diff --git a/src/components/images/CoinLogo/images/dgb.png b/src/images/coins/dgb.png similarity index 100% rename from src/components/images/CoinLogo/images/dgb.png rename to src/images/coins/dgb.png diff --git a/src/components/images/CoinLogo/images/doge.png b/src/images/coins/doge.png similarity index 100% rename from src/components/images/CoinLogo/images/doge.png rename to src/images/coins/doge.png diff --git a/src/components/images/CoinLogo/images/etc.png b/src/images/coins/etc.png similarity index 100% rename from src/components/images/CoinLogo/images/etc.png rename to src/images/coins/etc.png diff --git a/src/components/images/CoinLogo/images/eth.png b/src/images/coins/eth.png similarity index 100% rename from src/components/images/CoinLogo/images/eth.png rename to src/images/coins/eth.png diff --git a/src/components/images/CoinLogo/images/ltc.png b/src/images/coins/ltc.png similarity index 100% rename from src/components/images/CoinLogo/images/ltc.png rename to src/images/coins/ltc.png diff --git a/src/components/images/CoinLogo/images/nem.png b/src/images/coins/nem.png similarity index 100% rename from src/components/images/CoinLogo/images/nem.png rename to src/images/coins/nem.png diff --git a/src/components/images/CoinLogo/images/nmc.png b/src/images/coins/nmc.png similarity index 100% rename from src/components/images/CoinLogo/images/nmc.png rename to src/images/coins/nmc.png diff --git a/src/components/images/CoinLogo/images/rinkeby.png b/src/images/coins/rinkeby.png similarity index 100% rename from src/components/images/CoinLogo/images/rinkeby.png rename to src/images/coins/rinkeby.png diff --git a/src/components/images/CoinLogo/images/trop.png b/src/images/coins/trop.png similarity index 100% rename from src/components/images/CoinLogo/images/trop.png rename to src/images/coins/trop.png diff --git a/src/components/images/CoinLogo/images/txrp.png b/src/images/coins/txrp.png similarity index 100% rename from src/components/images/CoinLogo/images/txrp.png rename to src/images/coins/txrp.png diff --git a/src/components/images/CoinLogo/images/vtc.png b/src/images/coins/vtc.png similarity index 100% rename from src/components/images/CoinLogo/images/vtc.png rename to src/images/coins/vtc.png diff --git a/src/components/images/CoinLogo/images/xem.png b/src/images/coins/xem.png similarity index 100% rename from src/components/images/CoinLogo/images/xem.png rename to src/images/coins/xem.png diff --git a/src/components/images/CoinLogo/images/xlm.png b/src/images/coins/xlm.png similarity index 100% rename from src/components/images/CoinLogo/images/xlm.png rename to src/images/coins/xlm.png diff --git a/src/components/images/CoinLogo/images/xrp.png b/src/images/coins/xrp.png similarity index 100% rename from src/components/images/CoinLogo/images/xrp.png rename to src/images/coins/xrp.png diff --git a/src/components/images/CoinLogo/images/zec.png b/src/images/coins/zec.png similarity index 100% rename from src/components/images/CoinLogo/images/zec.png rename to src/images/coins/zec.png diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index ea4dfc35..a3ea3bbb 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -3,8 +3,10 @@ import styled from 'styled-components'; import { connect } from 'react-redux'; import Content from 'views/Wallet/components/Content'; +import EthIcon from 'images/coins/eth.png'; +import RippleIcon from 'images/coins/xrp.png'; + import { H2 } from 'components/Heading'; -import DashboardImg from 'images/dashboard.png'; const Wrapper = styled.div` display: flex; @@ -25,6 +27,22 @@ const P = styled.p` text-align: center; `; +const Overlay = styled.div` + display: flex; + width: 100%; + height: 40px; + justify-content: center; + align-items: center; + opacity: 0.2; + background: white; +`; + +const Image = styled.img``; + +const EthImage = styled(Image)` + margin-right: 10px; +`; + const Dashboard = () => ( @@ -32,7 +50,10 @@ const Dashboard = () => (

Please select your coin

You will gain access to receiving & sending selected coin

- Dashboard + + + + From 76f4eff5f537892d39a52f0c68b958fec701fe8b Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 7 Jan 2019 15:22:04 +0100 Subject: [PATCH 06/10] Close popup after click on exernal link --- src/components/modals/external/Cardano/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modals/external/Cardano/index.js b/src/components/modals/external/Cardano/index.js index bb413f36..8479fed9 100644 --- a/src/components/modals/external/Cardano/index.js +++ b/src/components/modals/external/Cardano/index.js @@ -58,7 +58,7 @@ const CardanoWallet = (props: Props) => (

You will be redirected to external wallet

i.id === 'ada').url}> - Go to external wallet + Go to external wallet ); From e78e276d1e78f089f40bb4e84a55386e5af10a3f Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 7 Jan 2019 15:56:11 +0100 Subject: [PATCH 07/10] Better margin --- src/views/Wallet/views/Dashboard/index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index 77f61ecd..42c75d13 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -38,10 +38,12 @@ const Overlay = styled.div` background: white; `; -const Image = styled.img``; - -const EthImage = styled(Image)` +const Image = styled.img` margin-right: 10px; + + &:last-child { + margin-right: 0px; + } `; const Dashboard = () => ( @@ -51,7 +53,7 @@ const Dashboard = () => (

Please select your coin

You will gain access to receiving & sending selected coin - + From 4852838703754e230aea8d8ca00fe17802ce40fd Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 7 Jan 2019 16:00:41 +0100 Subject: [PATCH 08/10] more consistent design with the rest of the wallet --- src/views/Wallet/components/Content/index.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/Wallet/components/Content/index.js b/src/views/Wallet/components/Content/index.js index ab621a2b..150b84ff 100644 --- a/src/views/Wallet/components/Content/index.js +++ b/src/views/Wallet/components/Content/index.js @@ -4,7 +4,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import styled from 'styled-components'; import Loader from 'components/Loader'; -import { FONT_SIZE } from 'config/variables'; +import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; +import { H1 } from 'components/Heading'; +import P from 'components/Paragraph'; import colors from 'config/colors'; import type { State } from 'flowtype'; @@ -34,15 +36,15 @@ const Loading = styled.div` flex-direction: column; `; -const Text = styled.div` +const Title = styled(H1)` font-size: ${FONT_SIZE.BIGGER}; - color: ${colors.TEXT_SECONDARY}; + font-weight: ${FONT_WEIGHT.NORMAL}; + color: ${props => (props.type === 'progress' ? colors.TEXT_SECONDARY : '')}; margin-left: 10px; `; -const Message = styled.div` - font-size: ${FONT_SIZE.BASE}; - color: ${colors.TEXT_PRIMARY}; +const Message = styled(P)` + text-align: center; `; const Row = styled.div` @@ -74,7 +76,7 @@ const Content = ({ {loader.type === 'progress' && } - {loader.title || 'Initializing accounts'} + {loader.title || 'Initializing accounts'} {loader.message && {loader.message}} From ca160451fc497031b56f59c2f575ac8b39380404 Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Mon, 7 Jan 2019 18:33:00 +0100 Subject: [PATCH 09/10] bump trezor-connect --- package.json | 2 +- yarn.lock | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 75029bb7..c69fbe91 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "rimraf": "^2.6.2", "styled-components": "^4.1.2", "styled-normalize": "^8.0.4", - "trezor-connect": "6.0.3-beta.10", + "trezor-connect": "7.0.0-beta.1", "wallet-address-validator": "^0.2.4", "web3": "1.0.0-beta.35", "webpack": "^4.16.3", diff --git a/yarn.lock b/yarn.lock index ef2d6d3c..f203161f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -208,7 +208,6 @@ "@emotion/cache@10.0.0": version "10.0.0" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.0.tgz#e22eadcb770de4131ec707c84207e9e1ce210413" - integrity sha512-1/sT6GNyvWmxCtJek8ZDV+b+a+NMDx8/61UTnnF3rqrTY7bLTjw+fmXO7WgUIH0owuWKxza/J/FfAWC/RU4G7A== dependencies: "@emotion/sheet" "0.9.2" "@emotion/stylis" "0.8.3" @@ -218,7 +217,6 @@ "@emotion/hash@0.7.1": version "0.7.1" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53" - integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA== "@emotion/is-prop-valid@^0.6.8": version "0.6.8" @@ -229,7 +227,6 @@ "@emotion/memoize@0.7.1": version "0.7.1" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f" - integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg== "@emotion/memoize@^0.6.6": version "0.6.6" @@ -238,7 +235,6 @@ "@emotion/serialize@^0.11.3": version "0.11.3" resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.3.tgz#c4af2d96e3ddb9a749b7b567daa7556bcae45af2" - integrity sha512-6Q+XH/7kMdHwtylwZvdkOVMydaGZ989axQ56NF7urTR7eiDMLGun//pFUy31ha6QR4C6JB+KJVhZ3AEAJm9Z1g== dependencies: "@emotion/hash" "0.7.1" "@emotion/memoize" "0.7.1" @@ -249,12 +245,10 @@ "@emotion/sheet@0.9.2": version "0.9.2" resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.2.tgz#74e5c6b5e489a1ba30ab246ab5eedd96916487c4" - integrity sha512-pVBLzIbC/QCHDKJF2E82V2H/W/B004mDFQZiyo/MSR+VC4pV5JLG0TF/zgQDFvP3fZL/5RTPGEmXlYJBMUuJ+A== "@emotion/stylis@0.8.3": version "0.8.3" resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.3.tgz#3ca7e9bcb31b3cb4afbaeb66156d86ee85e23246" - integrity sha512-M3nMfJ6ndJMYloSIbYEBq6G3eqoYD41BpDOxreE8j0cb4fzz/5qvmqU9Mb2hzsXcCnIlGlWhS03PCzVGvTAe0Q== "@emotion/unitless@0.7.3", "@emotion/unitless@^0.7.0": version "0.7.3" @@ -263,12 +257,10 @@ "@emotion/utils@0.11.1": version "0.11.1" resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.1.tgz#8529b7412a6eb4b48bdf6e720cc1b8e6e1e17628" - integrity sha512-8M3VN0hetwhsJ8dH8VkVy7xo5/1VoBsDOk/T4SJOeXwTO1c4uIqVNx2qyecLFnnUWD5vvUqHQ1gASSeUN6zcTg== "@emotion/weak-memoize@0.2.2": version "0.2.2" resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e" - integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA== "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -2708,7 +2700,6 @@ create-ecdh@^4.0.0: create-emotion@^10.0.4: version "10.0.5" resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-10.0.5.tgz#22487f19b59a7ed10144f808289eadffebcfab06" - integrity sha512-MIOSeFiMtPrAULEtd2GFYGZEzeN2xnCFoiHrjvUYjxruYCJfGqUOBmh4YEN1yU+Ww5yXr+DIZibFl7FEOP57iA== dependencies: "@emotion/cache" "10.0.0" "@emotion/serialize" "^0.11.3" @@ -2845,7 +2836,6 @@ cssstyle@^1.0.0: csstype@^2.5.7: version "2.6.0" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.0.tgz#6cf7b2fa7fc32aab3d746802c244d4eda71371a2" - integrity sha512-by8hi8BlLbowQq0qtkx54d9aN73R9oUW20HISpka5kmgsR9F7nnxgfsemuR2sdCKZh+CDNf5egW9UZMm4mgJRg== currently-unhandled@^0.4.1: version "0.4.1" @@ -8045,7 +8035,6 @@ react-scale-text@^1.2.2: react-select@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.2.0.tgz#67c8b5c2dcb8df0384f2a103efe952570f5d6b93" - integrity sha512-FOnsm/zrJ2pZvYsEfs58Xvru0SHL1jXAZTCFTWcOxmQSnRKgYuXUDFdpDiET90GLtJEF+t6BaZeD43bUH6/NZQ== dependencies: classnames "^2.2.5" create-emotion "^10.0.4" @@ -9801,9 +9790,9 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -trezor-connect@6.0.3-beta.10: - version "6.0.3-beta.10" - resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-6.0.3-beta.10.tgz#a703b06946bb98912cbe719f2bb3393ee41f03b1" +trezor-connect@7.0.0-beta.1: + version "7.0.0-beta.1" + resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-7.0.0-beta.1.tgz#de87d8f1d9878101380f7b3198bf2531d7560a5c" dependencies: babel-runtime "^6.26.0" events "^1.1.1" From 9f65832e5343794caf06e916c609f7d25f37bcf1 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Fri, 4 Jan 2019 19:34:42 +0100 Subject: [PATCH 10/10] Remove ripple --- public/data/appConfig.json | 41 -------------------------------------- 1 file changed, 41 deletions(-) diff --git a/public/data/appConfig.json b/public/data/appConfig.json index 6125250a..8d8dbead 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -72,47 +72,6 @@ "tx": "https://ropsten.etherscan.io/tx/", "address": "https://ropsten.etherscan.io/address/" } - }, - { - "type": "ripple", - "name": "Ripple", - "symbol": "XRP", - "shortcut": "xrp", - "bip44": "m/44'/144'/a'/0/0", - "decimals": 6, - "fee": { - "defaultFee": "12", - "minFee": "10", - "maxFee": "10000", - "levels": [ - {"name": "Normal", "value": "12", "recommended": true } - ] - }, - "explorer": { - "tx": "https://xrpcharts.ripple.com/#/transactions/", - "address": "https://xrpcharts.ripple.com/#/graph/" - } - }, - { - "type": "ripple", - "name": "Ripple Testnet", - "testnet": true, - "symbol": "tXRP", - "shortcut": "txrp", - "bip44": "m/44'/144'/a'/0/0", - "decimals": 6, - "fee": { - "defaultFee": "12", - "minFee": "10", - "maxFee": "10000", - "levels": [ - {"name": "Normal", "value": "12", "recommended": true } - ] - }, - "explorer": { - "tx": "https://sisyfos.trezor.io/ripple-testnet-explorer/tx/", - "address": "https://sisyfos.trezor.io/ripple-testnet-explorer/address/" - } } ],