From 0a38f454e335f4412f514844f414c1a4226f66ff Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Tue, 9 Oct 2018 17:21:14 +0200
Subject: [PATCH] Re-lock account only after save

---
 packages/app-accounts/src/Restore.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/app-accounts/src/Restore.tsx b/packages/app-accounts/src/Restore.tsx
index 5b8984f9f4..1b6496556d 100644
--- a/packages/app-accounts/src/Restore.tsx
+++ b/packages/app-accounts/src/Restore.tsx
@@ -153,10 +153,11 @@ class Restore extends React.PureComponent<Props, State> {
         hexToU8a(json.encoded)
       );
 
+      // unlock, save account and then lock (locking cleans secretKey, so needs to be last)
       pair.decodePkcs8(password);
+      keyring.addAccountPair(pair, password);
       pair.lock();
 
-      keyring.addAccountPair(pair, password);
       InputAddress.setLastValue('account', pair.address());
       onBack();
     } catch (error) {