From db08c3280f7465cac4408bc509ba65f4326a57b1 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sat, 6 May 2023 14:32:31 +0200 Subject: [PATCH] add file-saver --- .../login-view/create-account-section.js | 25 +++---------------- .../components/settings-view/export-keys.js | 3 ++- .../components/settings-view/security-view.js | 3 ++- .../functional-components/settings-page.js | 4 ++- .../plugins/core/wallet/wallet-app.src.js | 3 ++- 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/qortal-ui-core/src/components/login-view/create-account-section.js b/qortal-ui-core/src/components/login-view/create-account-section.js index 4e533ad2..803fb7ad 100644 --- a/qortal-ui-core/src/components/login-view/create-account-section.js +++ b/qortal-ui-core/src/components/login-view/create-account-section.js @@ -8,7 +8,6 @@ import { doLogin, doLogout, doSelectAddress } from '../../redux/app/app-actions. import { doStoreWallet } from '../../redux/user/user-actions.js' import { checkApiKey } from '../../apiKeyUtils.js' import FileSaver from 'file-saver' -import isElectron from 'is-electron' import ripple from '../../functional-components/loading-ripple.js' import snackbar from '../../functional-components/snackbar.js' import '../../functional-components/random-sentence-generator.js' @@ -594,16 +593,7 @@ class CreateAccountSection extends connect(store)(LitElement) { const dataString = JSON.stringify(data) const blob = new Blob([dataString], { type: 'text/plain;charset=utf-8' }) backupname = "qortal_backup_" + wallet.addresses[0].address + ".json" - if (!isElectron()) { - await FileSaver.saveAs(blob, `qortal_backup_${wallet.addresses[0].address}.json`) - let snack4string = get("general.save") - snackbar.add({ - labelText: `${snack4string} ${backupname} ✅`, - dismiss: true - }) - } else { - this.saveFileToDisk(blob, backupname) - } + this.saveFileToDisk(blob, backupname) } async downloadSeedphrase() { @@ -611,16 +601,7 @@ class CreateAccountSection extends connect(store)(LitElement) { const seed = this.shadowRoot.getElementById('randSentence').parsedString const blob = new Blob([seed], { type: 'text/plain;charset=utf-8' }) seedname = "qortal_seedphrase.txt" - if (!isElectron()) { - await FileSaver.saveAs(blob, `qortal_seedphrase.txt`) - let snack4string = get("general.save") - snackbar.add({ - labelText: `${snack4string} ${seedname} ✅`, - dismiss: true - }) - } else { - this.saveFileToDisk(blob, seedname) - } + this.saveFileToDisk(blob, seedname) } async saveFileToDisk(blob, fileName) { @@ -643,7 +624,7 @@ class CreateAccountSection extends connect(store)(LitElement) { dismiss: true }) } catch (error) { - console.log(error) + FileSaver.saveAs(blob, filename) } } } diff --git a/qortal-ui-core/src/components/settings-view/export-keys.js b/qortal-ui-core/src/components/settings-view/export-keys.js index dc7d623c..e24df36d 100644 --- a/qortal-ui-core/src/components/settings-view/export-keys.js +++ b/qortal-ui-core/src/components/settings-view/export-keys.js @@ -3,6 +3,7 @@ import { connect } from 'pwa-helpers' import { store } from '../../store.js' import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate' import snackbar from '../../functional-components/snackbar.js' +import FileSaver from 'file-saver' import '@material/mwc-dialog' import '@material/mwc-button' @@ -251,7 +252,7 @@ class ExportKeys extends connect(store)(LitElement) { dismiss: true }) } catch (error) { - console.log(error) + FileSaver.saveAs(blob, filename) } } diff --git a/qortal-ui-core/src/components/settings-view/security-view.js b/qortal-ui-core/src/components/settings-view/security-view.js index 918e6321..0dea81e8 100644 --- a/qortal-ui-core/src/components/settings-view/security-view.js +++ b/qortal-ui-core/src/components/settings-view/security-view.js @@ -4,6 +4,7 @@ import { store } from '../../store.js' import { allowQAPPAutoAuth, removeQAPPAutoAuth, removeQAPPAutoLists, allowQAPPAutoLists } from '../../redux/app/app-actions.js' import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate' import snackbar from '../../functional-components/snackbar.js' +import FileSaver from 'file-saver' import '@material/mwc-checkbox' import '@material/mwc-textfield' @@ -186,7 +187,7 @@ class SecurityView extends connect(store)(LitElement) { dismiss: true }) } catch (error) { - console.log(error) + FileSaver.saveAs(blob, filename) } } } diff --git a/qortal-ui-core/src/functional-components/settings-page.js b/qortal-ui-core/src/functional-components/settings-page.js index 5e951730..a45477aa 100644 --- a/qortal-ui-core/src/functional-components/settings-page.js +++ b/qortal-ui-core/src/functional-components/settings-page.js @@ -6,6 +6,8 @@ import { get, translate, translateUnsafeHTML } from 'lit-translate' import snackbar from './snackbar.js' import '../components/language-selector.js' import '../custom-elements/frag-file-input.js' +import FileSaver from 'file-saver' + import '@material/mwc-dialog' import '@material/mwc-button' import '@material/mwc-select' @@ -347,7 +349,7 @@ class SettingsPage extends connect(store)(LitElement) { dismiss: true }) } catch (error) { - console.log(error) + FileSaver.saveAs(blob, filename) } } diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js index 903ed5fb..a7c1d722 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -7,6 +7,7 @@ registerTranslateConfig({ loader: lang => fetch(`/language/${lang}.json`).then(res => res.json()) }) +import FileSaver from 'file-saver' import '../components/ButtonIconCopy.js' import '../components/QortalQrcodeGenerator.js' import '../components/frag-file-input.js' @@ -5810,7 +5811,7 @@ class MultiWallet extends LitElement { let snack4string = get("general.save") parentEpml.request('showSnackBar', `${snack4string} ${fileName} ✅`) } catch (error) { - console.log(error) + FileSaver.saveAs(blob, filename) } }