From 78581920586e6930e7849cad83f8ddd0ffe3dbbe Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 27 Feb 2019 10:58:07 +0100 Subject: [PATCH] Check for both v0 & v1 files (#762) --- packages/app-accounts/src/Restore.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/app-accounts/src/Restore.tsx b/packages/app-accounts/src/Restore.tsx index 1f8e80d3e9..2aecdfb9dc 100644 --- a/packages/app-accounts/src/Restore.tsx +++ b/packages/app-accounts/src/Restore.tsx @@ -95,11 +95,11 @@ class Restore extends React.PureComponent { private onChangeFile = (file: Uint8Array): void => { try { const json = JSON.parse(u8aToString(file)); - const isFileValid = keyring.decodeAddress(json.address).length === 32 && - isHex(json.encoded) && - isObject(json.meta) && - json.encoding.content[0] === 'pkcs8' && - json.encoding.content[1] === 'ed25519'; + const isFileValid = keyring.decodeAddress(json.address).length === 32 && isHex(json.encoded) && isObject(json.meta) && ( + Array.isArray(json.encoding.content) + ? json.encoding.content[0] === 'pkcs8' + : json.encoding.content === 'pkcs8' + ); this.setState({ isFileValid,