Go back to root on import

packages/extension-base/src/background/handlers/Extension.ts

@@ -182,15 +182,13 @@ export default class Extension {
       const pair = keyring.restoreAccount(json, password);
 
       if (pair) {
-        const { address } = pair;
-
-        return { message: `Successfully added ${address}` };
+        return { error: null };
       }
     } catch (error) {
-      return { message: (error as Error).message };
+      return { error: (error as Error).message };
     }
 
-    return { message: 'Could not restore account.' };
+    return { error: 'Could not restore account.' };
   }
 
   private jsonVerifyFile ({ json }: RequestJsonRestore): boolean {

packages/extension-base/src/background/types.ts

@@ -317,5 +317,5 @@ export interface RequestJsonRestore {
 }
 
 export interface ResponseJsonRestore {
-  message: string;
+  error: string | null;
 }

packages/extension-ui/src/Popup/RestoreJson.tsx

@@ -3,8 +3,8 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { KeyringPair$Json } from '@polkadot/keyring/types';
-import React, { useCallback, useState } from 'react';
-import { InputWithLabel, InputFileWithLabel, Button, Address } from '../components';
+import React, { useCallback, useContext, useState } from 'react';
+import { ActionContext, InputWithLabel, InputFileWithLabel, Button, Address } from '../components';
 import { u8aToString } from '@polkadot/util';
 import styled from 'styled-components';
 import { jsonRestore, jsonVerifyPassword, jsonVerifyFile } from '../messaging';
@@ -39,15 +39,15 @@ async function parseFile (file: Uint8Array): Promise<FileState> {
 }
 
 export default function Upload (): React.ReactElement {
+  const onAction = useContext(ActionContext);
   const [{ address, isFileValid, json }, setJson] = useState<FileState>({ address: null, isFileValid: false, json: null });
   const [{ isPassValid, password }, setPass] = useState<PassState>({ isPassValid: false, password: '' });
-  const [message, setMessage] = useState<string>('');
 
   const _onChangePass = useCallback(
-    async (password: string): Promise<void> => {
-      const isPassValid = await jsonVerifyPassword(password);
-
-      setPass({ isPassValid, password });
+    (password: string): void => {
+      jsonVerifyPassword(password)
+        .then((isPassValid) => setPass({ isPassValid, password }))
+        .catch(console.error);
     }, []
   );
 
@@ -58,12 +58,22 @@ export default function Upload (): React.ReactElement {
   );
 
   const _onRestore = useCallback(
-    async (): Promise<void> => {
-      if (!json || !password) { return; }
-
-      setMessage((await jsonRestore(json, password)).message);
+    (): void => {
+      if (!json || !password) {
+        return;
+      }
+
+      jsonRestore(json, password)
+        .then(({ error }): void => {
+          if (error) {
+            setPass(({ password }) => ({ isPassValid: false, password }));
+          } else {
+            onAction('/');
+          }
+        })
+        .catch(console.error);
     },
-    [json, password]
+    [json, onAction, password]
   );
 
   return (
@@ -95,7 +105,6 @@ export default function Upload (): React.ReactElement {
         >
         Restore
         </Button>
-        {message}
       </div>
     </>
   );

packages/extension-ui/src/messaging.ts

@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Message } from '@polkadot/extension-base/types';
-import { AccountJson, AuthorizeRequest, SigningRequest, RequestTypes, MessageTypes, ResponseTypes, SeedLengths, SubscriptionMessageTypes, MetadataRequest, MessageTypesWithNullRequest, MessageTypesWithNoSubscriptions, MessageTypesWithSubscriptions, ResponseDeriveValidate } from '@polkadot/extension-base/background/types';
+import { AccountJson, AuthorizeRequest, SigningRequest, RequestTypes, MessageTypes, ResponseTypes, SeedLengths, SubscriptionMessageTypes, MetadataRequest, MessageTypesWithNullRequest, MessageTypesWithNoSubscriptions, MessageTypesWithSubscriptions, ResponseDeriveValidate, ResponseJsonRestore } from '@polkadot/extension-base/background/types';
 import { Chain } from '@polkadot/extension-chains/types';
 import { KeypairType } from '@polkadot/util-crypto/types';
 
@@ -169,6 +169,6 @@ export async function jsonVerifyPassword (password: string): Promise<boolean> {
   return sendMessage('pri(json.verify.password)', password);
 }
 
-export async function jsonRestore (json: KeyringPair$Json, password: string): Promise<{ message: string }> {
+export async function jsonRestore (json: KeyringPair$Json, password: string): Promise<ResponseJsonRestore> {
   return sendMessage('pri(json.restore)', { json, password });
 }