Skip to content

Restore Account with JSON Backup #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacogr merged 12 commits into from
May 30, 2020
Merged

Restore Account with JSON Backup #336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
82ab322
initial mockup
shawntabrizi May 22, 2020
70361df
it works!
shawntabrizi May 22, 2020
7de09e1
forgot a file
shawntabrizi May 22, 2020
f51e389
refactor a bit
shawntabrizi May 22, 2020
ef16be5
fix lint
shawntabrizi May 22, 2020
166dbef
fix styling, refactor
shawntabrizi May 24, 2020
f22efa5
fix lint
shawntabrizi May 24, 2020
3c872ce
Apply suggestions from code review
shawntabrizi May 27, 2020
5e98803
Open message rename
jacogr May 30, 2020
3f53f74
Merge branch 'master' into shawntabrizi-restore-json
jacogr May 30, 2020
4b5d662
Go back to root on import
jacogr May 30, 2020
7db8c4b
Only open in new when not in a window, add back
jacogr May 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Only open in new when not in a window, add back
  • Loading branch information
@jacogr
jacogr committed May 30, 2020
commit 7db8c4bcc70f829bb157ee31fbeb842e8856c123
11 changes: 10 additions & 1 deletion packages/extension-ui/src/Popup/ImportSeed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ export default function Import (): React.ReactElement {
}
}, [account, name, onAction, password]);

const _toJson = useCallback((): void => {
// are we in a popup?
if (window.innerWidth <= 480) {
jsonRestoreWindowOpen().catch(console.error);
} else {
onAction('/account/restore-json');
}
}, [onAction]);

return (
<>
<HeaderWithSmallerMargin
Expand Down Expand Up @@ -90,7 +99,7 @@ export default function Import (): React.ReactElement {
<ButtonsRow>
<ActionText
icon={upload}
onClick={jsonRestoreWindowOpen}
onClick={_toJson}
text='Restore from JSON backup'
/>
</ButtonsRow>
Expand Down
11 changes: 7 additions & 4 deletions packages/extension-ui/src/Popup/RestoreJson.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ interface FileState {
json: KeyringPair$Json | null;
}

// FIXME We want to display the decodeError
interface PassState {
decodeError?: string | null;
isPassValid: boolean;
password: string;
}
Expand Down Expand Up @@ -66,7 +68,7 @@ export default function Upload (): React.ReactElement {
jsonRestore(json, password)
.then(({ error }): void => {
if (error) {
setPass(({ password }) => ({ isPassValid: false, password }));
setPass(({ password }) => ({ decodeError: error, isPassValid: false, password }));
} else {
onAction('/');
}
Expand All @@ -79,12 +81,13 @@ export default function Upload (): React.ReactElement {
return (
<>
<HeaderWithSmallerMargin
text='Restore Account from JSON'
showBackArrow
text='Restore from JSON'
/>
<div>
<Address
address={isFileValid && address ? address : null}
name={isFileValid && json ? json.meta.name as string : null}
address={(isFileValid && address) || null}
name={(isFileValid && json?.meta.name as string) || null}
/>
<InputFileWithLabel
accept={acceptedFormats}
Expand Down