From 3b1b8240f6307f207f8a6056df3f145462478b1d Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@protonmail.com>
Date: Thu, 5 Jul 2018 14:33:20 +0200
Subject: [PATCH] Clear account on import toggle (fix #136)

---
 .../CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js  | 2 +-
 .../fether-react/src/Accounts/CreateAccount/CreateAccount.js    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js b/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
index b50af0ec..9e8f7b8d 100644
--- a/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
+++ b/packages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
@@ -25,7 +25,7 @@ class AccountRewritePhrase extends Component {
 
     // If we're importing, we show the current address generated by the current
     // recovery phrase
-    if (isImport) {
+    if (isImport && value) {
       this.setState({ isLoading: true });
       this.handleSavePhrase();
     }
diff --git a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js
index 104b107c..0351f482 100644
--- a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js
+++ b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js
@@ -37,6 +37,7 @@ class CreateAccount extends Component {
         params: { step }
       }
     } = this.props;
+    createAccountStore.clear();
     createAccountStore.setIsImport(!createAccountStore.isImport);
 
     // If we were further in the account creation, go back to step 1
-- 
GitLab