aljaz/mutiny-web
1
0
Fork 0
mirror of https://github.com/aljazceru/mutiny-web.git synced 2026-01-09 09:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from MutinyWallet/import-fix

Browse Source 
Make imports await on file upload
This commit is contained in:
Tony Giorgio
2023-05-16 18:23:06 -05:00
committed by GitHub
parent 18dbba370b df4a678a15
commit 001516ae00
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/components/ImportExport.tsx
View File

@@ -24,27 +24,36 @@ export function ImportExport() {
try {
const file: File = files()[0].file;
fileReader.readAsText(file, "UTF-8");
fileReader.onload = e => {
const text = e.target?.result?.toString();
if (text) {
// This should throw if there's a parse error, so we won't end up clearing
JSON.parse(text);
const text = await new Promise<string | null>((resolve, reject) => {
fileReader.onload = e => {
const result = e.target?.result?.toString();
if (result) {
resolve(result);
} else {
reject(new Error("No text found in file"));
}
};
fileReader.onerror = e => reject(new Error("File read error"));
fileReader.readAsText(file, "UTF-8");
});
MutinyWallet.import_json(text);
// This should throw if there's a parse error, so we won't end up clearing
JSON.parse(text);
window.location.href = "/"
} else {
throw new Error("No text found in file")
}
MutinyWallet.import_json(text);
if (state.mutiny_wallet) {
await state.mutiny_wallet.stop();
}
window.location.href = "/";
} catch (e) {
showToast(eify(e));
} finally {
setConfirmOpen(false);
setConfirmLoading(false);
}
setConfirmOpen(false);
setConfirmLoading(false);
}
async function uploadFile() {
@@ -72,4 +81,4 @@ export function ImportExport() {
</ConfirmDialog>
</>
)
}
}