diff --git a/src/Accounts/Accounts.js b/src/Accounts/Accounts.js index 1b8b132681c8e40c6e1c240bef93263819a784d9..6decf0d6c615affb540c0455524dcc2d7584b74c 100644 --- a/src/Accounts/Accounts.js +++ b/src/Accounts/Accounts.js @@ -9,6 +9,7 @@ import Blockies from 'react-blockies'; import { inject, observer } from 'mobx-react'; import { Redirect, Route, Switch } from 'react-router-dom'; +import Health from '../Health'; import CreateAccount from './CreateAccount/CreateAccount'; import light from '../hoc'; @@ -31,11 +32,6 @@ class Accounts extends Component { this.props.history.push('/accounts/new'); }; - handleImportAccount = () => { - this.props.createAccountStore.setIsImporting(true); - this.props.history.push('/accounts/new'); - }; - render () { return ( @@ -57,7 +53,11 @@ class Accounts extends Component {

Accounts

-
+
+ + New account + +
@@ -93,13 +93,8 @@ class Accounts extends Component {
diff --git a/src/Accounts/CreateAccount/AccountConfirm/AccountConfirm.js b/src/Accounts/CreateAccount/AccountConfirm/AccountConfirm.js index 5695c32bb879ac8b2c7319c6a6ee87fabdf770f5..cb5f350ff8e2f37d0f951b1078b1fb187eb2810c 100644 --- a/src/Accounts/CreateAccount/AccountConfirm/AccountConfirm.js +++ b/src/Accounts/CreateAccount/AccountConfirm/AccountConfirm.js @@ -17,26 +17,19 @@ class AccountConfirm extends Component { }; render () { - const { createAccountStore: { hint } } = this.props; - return ( -
-
-
- -
-
-

Ready to create account?

-
-
- {hint} -
- +
+
+ +
+
+

Ready to create account?

+
diff --git a/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js b/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js index 646977fa7be3849fd6e0c5d4a69a3b15cbb5c63c..22401a5c7537b8d2057142a729ce3047b3ebfa8a 100644 --- a/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js +++ b/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js @@ -20,23 +20,21 @@ class AccountCopyPhrase extends Component { const currentStep = pathname.slice(-1); return ( -
-
-
- -
-
-

Please write your secret phrase on a piece of paper:

-
-
- {phrase} -
- +
+
+ +
+
+

Please write your secret phrase on a piece of paper:

+
+ {phrase} +
+
diff --git a/src/Accounts/CreateAccount/AccountName/AccountName.js b/src/Accounts/CreateAccount/AccountName/AccountName.js index 6be8ee8cd8c973aa3790f126fd9539a15524b7e0..6d9b7fdee52630637d7fbabb68671638156b19c4 100644 --- a/src/Accounts/CreateAccount/AccountName/AccountName.js +++ b/src/Accounts/CreateAccount/AccountName/AccountName.js @@ -27,7 +27,7 @@ class AccountName extends Component { const currentStep = pathname.slice(-1); return ( -
+
{address &&
@@ -42,12 +42,15 @@ class AccountName extends Component { Regenerate address
} +
+

Please give this account a name:

+
diff --git a/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js b/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js index 3afd0d81d208d699a33fdb3235541ae334f46c7f..836d4a426ef1f991c2618dece3152a978c880a8e 100644 --- a/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js +++ b/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js @@ -43,54 +43,52 @@ class AccountPassword extends Component { const { confirm, hint, password } = this.state; return ( -
-
-
- -
-
-
-

Secure your account with a password:

-
+
+
+ +
+ +
+

Secure your account with a password:

+
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
- - -
+ +
diff --git a/src/Accounts/CreateAccount/AccountWritePhrase/AccountWritePhrase.js b/src/Accounts/CreateAccount/AccountWritePhrase/AccountWritePhrase.js index 8c770b8f4b69820769bf84ffc5c0ebe08ab6c726..bffd03e5ff50c8c20691200606b288f69be50547 100644 --- a/src/Accounts/CreateAccount/AccountWritePhrase/AccountWritePhrase.js +++ b/src/Accounts/CreateAccount/AccountWritePhrase/AccountWritePhrase.js @@ -35,23 +35,21 @@ class AccountWritePhrase extends Component { const { value } = this.state; return ( -
-
-
- {isImport ? : } -
-
-

Please write your recovery phrase here:

-
-
- - -
- - +
+
+ {isImport ? : } +
+
+

Please write your recovery phrase:

+
+
+ +