From 64eb818d2b96aa288b487c4bce059e5bb6bd9b0e Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 26 Jun 2018 17:39:15 +0200 Subject: [PATCH 1/8] Do not animate placeholder --- .../CreateAccountContainer/CreateAccountContainer.js | 1 + packages/fether-ui/src/AccountCard/AccountCard.js | 8 ++++---- packages/fether-ui/src/Placeholder/Placeholder.js | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/fether-react/src/Accounts/CreateAccount/CreateAccountContainer/CreateAccountContainer.js b/packages/fether-react/src/Accounts/CreateAccount/CreateAccountContainer/CreateAccountContainer.js index a75b06ad..d1f98420 100644 --- a/packages/fether-react/src/Accounts/CreateAccount/CreateAccountContainer/CreateAccountContainer.js +++ b/packages/fether-react/src/Accounts/CreateAccount/CreateAccountContainer/CreateAccountContainer.js @@ -19,6 +19,7 @@ class CreateAccountHeader extends Component { return ( {children}]} /> diff --git a/packages/fether-ui/src/AccountCard/AccountCard.js b/packages/fether-ui/src/AccountCard/AccountCard.js index 53ea45ca..c5073d3c 100644 --- a/packages/fether-ui/src/AccountCard/AccountCard.js +++ b/packages/fether-ui/src/AccountCard/AccountCard.js @@ -10,24 +10,24 @@ import PropTypes from 'prop-types'; import Card from '../Card'; import Placeholder from '../Placeholder'; -const AccountCard = ({ address, name, ...otherProps }) => ( +const AccountCard = ({ address, animate, name, ...otherProps }) => (
{address ? ( ) : ( - + )}
{name ? (
{name}
) : ( - + )}
- {address || } + {address || }
diff --git a/packages/fether-ui/src/Placeholder/Placeholder.js b/packages/fether-ui/src/Placeholder/Placeholder.js index 9ed5048b..0543faf6 100644 --- a/packages/fether-ui/src/Placeholder/Placeholder.js +++ b/packages/fether-ui/src/Placeholder/Placeholder.js @@ -7,12 +7,13 @@ import React from 'react'; import ContentLoader from 'react-content-loader'; import PropTypes from 'prop-types'; -const Placeholder = ({ height, width }) => ( +const Placeholder = ({ height, width, ...otherProps }) => ( -- GitLab From 1b61b81a92d8be66ee6263ad098f899ed782e359 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 26 Jun 2018 17:45:38 +0200 Subject: [PATCH 2/8] Correct redirect after creating account --- .../fether-react/src/Accounts/AccountsList/AccountsList.js | 5 ----- packages/fether-react/src/Tokens/Tokens.js | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/fether-react/src/Accounts/AccountsList/AccountsList.js b/packages/fether-react/src/Accounts/AccountsList/AccountsList.js index 7e3e21f8..331618be 100644 --- a/packages/fether-react/src/Accounts/AccountsList/AccountsList.js +++ b/packages/fether-react/src/Accounts/AccountsList/AccountsList.js @@ -8,7 +8,6 @@ import { AccountCard, Header } from 'fether-ui'; import { accountsInfo$, defaultAccount$ } from '@parity/light.js'; import { inject, observer } from 'mobx-react'; import light from 'light-hoc'; -import { Redirect } from 'react-router-dom'; import Health from '../../Health'; @@ -65,10 +64,6 @@ class AccountsList extends Component { render () { const { accountsInfo } = this.props; - if (accountsInfo && !Object.keys(accountsInfo).length) { - return ; - } - return (
; + return ; } // The address is defaultAccount, but if we are coming from the accounts -- GitLab From 46e431ac03514bfbc8beb01ef0dcbc5913827fa6 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 26 Jun 2018 17:47:13 +0200 Subject: [PATCH 3/8] Remove green progress indicator (fix #95) --- .../src/Accounts/CreateAccount/CreateAccount.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js index d9774f08..40295091 100644 --- a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js +++ b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js @@ -84,19 +84,6 @@ class CreateAccount extends Component { title={

{isImport ? 'Import account' : 'Create a new account'}

} - right={ -
- {Steps.map((_, index) => ( -
index ? '-complete' : '' - ].join(' ')} - key={`progress-indicator_step${index + 1}`} - /> - ))} -
- } />
-- GitLab From 0bedd189a78da7c7ed7ff06b89d51f980bc84a83 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 26 Jun 2018 18:10:48 +0200 Subject: [PATCH 4/8] Improve copy --- packages/fether-react/src/Overlay/Overlay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fether-react/src/Overlay/Overlay.js b/packages/fether-react/src/Overlay/Overlay.js index f80d23ee..fb57abdd 100644 --- a/packages/fether-react/src/Overlay/Overlay.js +++ b/packages/fether-react/src/Overlay/Overlay.js @@ -84,7 +84,7 @@ class Overlays extends Component { ? `${payload.percentage.toFixed(0)}%` : ''; case STATUS.NOINTERNET: - return 'Please check that you are connected to the internet'; + return 'Trying to reconnect to the network...'; default: return ''; } -- GitLab From 42f5e1891f62aa5c2719d37a2e1a0d2ce46d8bb6 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 26 Jun 2018 18:11:24 +0200 Subject: [PATCH 5/8] Add wording when copy secret phrase (fix #96) --- .../AccountCopyPhrase/AccountCopyPhrase.js | 14 ++++ .../AccountRewritePhrase.js} | 8 +- .../index.js | 4 +- .../Accounts/CreateAccount/CreateAccount.js | 6 +- .../src/assets/sass/modules/_reset.scss | 75 +++++++++++++++++-- .../src/assets/sass/shared/_text.scss | 6 +- 6 files changed, 96 insertions(+), 17 deletions(-) rename packages/fether-react/src/Accounts/CreateAccount/{AccountWritePhrase/AccountWritePhrase.js => AccountRewritePhrase/AccountRewritePhrase.js} (91%) rename packages/fether-react/src/Accounts/CreateAccount/{AccountWritePhrase => AccountRewritePhrase}/index.js (57%) diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js b/packages/fether-react/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js index 3305f6c2..7b66f61f 100644 --- a/packages/fether-react/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js +++ b/packages/fether-react/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js @@ -25,6 +25,20 @@ class AccountCopyPhrase extends Component {

Please write your secret phrase on a piece of paper:

{phrase}
+
+
+ Keep it secure and secret. +
    +
  • + If you lose your secret phrase, your wallet cannot be recovered. +
    • +
  • + If someone gets hold of your secret phrase, they will be able to + drain your account. +
    • +
+
+