diff --git a/package.json b/package.json index 58839592..f2d8f069 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "electron-log": "4.4.8" }, "devDependencies": { - "electron": "19.0.6", + "electron": "19.0.8", "electron-builder": "23.1.0", "electron-notarize": "1.2.1", "electron-packager": "15.5.1", @@ -44,4 +44,4 @@ "engines": { "node": ">=14.17.0" } -} +} \ No newline at end of file diff --git a/qortal-ui-core/package.json b/qortal-ui-core/package.json index b84ab79d..07386124 100644 --- a/qortal-ui-core/package.json +++ b/qortal-ui-core/package.json @@ -22,7 +22,7 @@ "sass": "1.53.0" }, "devDependencies": { - "@babel/core": "7.18.5", + "@babel/core": "7.18.6", "@material/mwc-button": "0.26.1", "@material/mwc-checkbox": "0.26.1", "@material/mwc-dialog": "0.26.1", @@ -58,21 +58,21 @@ "@rollup/plugin-commonjs": "22.0.0", "@rollup/plugin-node-resolve": "13.3.0", "@rollup/plugin-replace": "4.0.0", - "@vaadin/grid": "23.1.1", - "@vaadin/icons": "23.1.1", - "@vaadin/password-field": "23.1.1", + "@vaadin/grid": "23.1.4", + "@vaadin/icons": "23.1.4", + "@vaadin/password-field": "23.1.4", "asmcrypto.js": "2.3.2", "bcryptjs": "2.4.3", "epml": "0.3.3", "file-saver": "2.0.5", - "lit": "2.2.6", + "lit": "2.2.7", "lit-translate": "2.0.1", "postcss": "8.4.14", "pwa-helpers": "0.9.1", "random-sentence-generator": "0.0.8", "redux": "4.2.0", "redux-thunk": "2.4.1", - "rollup": "2.75.7", + "rollup": "2.77.0", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-progress": "1.1.2", 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 890fc227..80f818cf 100644 --- a/qortal-ui-core/src/components/settings-view/security-view.js +++ b/qortal-ui-core/src/components/settings-view/security-view.js @@ -1,7 +1,7 @@ import { LitElement, html, css } from 'lit' import { connect } from 'pwa-helpers' import { store } from '../../store.js' -import { translate, translateUnsafeHTML } from 'lit-translate' +import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate' import '@material/mwc-textfield' import '@material/mwc-icon' @@ -11,7 +11,8 @@ import FileSaver from 'file-saver' class SecurityView extends connect(store)(LitElement) { static get properties() { return { - theme: { type: String, reflect: true } + theme: { type: String, reflect: true }, + backupErrorMessage: { type: String } } } @@ -63,6 +64,7 @@ class SecurityView extends connect(store)(LitElement) { constructor() { super() this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light' + this.backupErrorMessage = '' } render() { @@ -76,8 +78,11 @@ class SecurityView extends connect(store)(LitElement) { password +
+ ${this.backupErrorMessage} +
-
this.downloadBackup()} class="q-button"> ${translate("settings.download")}
+
this.checkForDownload()} class="q-button"> ${translate("settings.download")}
@@ -87,7 +92,17 @@ class SecurityView extends connect(store)(LitElement) { stateChanged(state) { } + checkForDownload() { + const checkPass = this.shadowRoot.getElementById('downloadBackupPassword').value + if (checkPass === '') { + this.backupErrorMessage = get("login.pleaseenter") + } else { + this.downloadBackup() + } + } + async downloadBackup() { + this.backupErrorMessage = '' const state = store.getState() const password = this.shadowRoot.getElementById('downloadBackupPassword').value const data = await state.app.wallet.generateSaveWalletData(password, state.config.crypto.kdfThreads, () => { }) diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json index f67b1541..867c0d77 100644 --- a/qortal-ui-plugins/package.json +++ b/qortal-ui-plugins/package.json @@ -22,7 +22,7 @@ "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js" }, "devDependencies": { - "@babel/core": "7.18.5", + "@babel/core": "7.18.6", "@github/time-elements": "3.1.2", "@material/mwc-button": "0.26.1", "@material/mwc-checkbox": "0.26.1", @@ -46,14 +46,14 @@ "@rollup/plugin-commonjs": "22.0.0", "@rollup/plugin-node-resolve": "13.3.0", "@rollup/plugin-replace": "4.0.0", - "@vaadin/button": "23.1.1", - "@vaadin/grid": "23.1.1", - "@vaadin/icons": "23.1.1", + "@vaadin/button": "23.1.4", + "@vaadin/grid": "23.1.4", + "@vaadin/icons": "23.1.4", "epml": "0.3.3", "html-escaper": "3.0.3", - "lit": "2.2.6", + "lit": "2.2.7", "lit-translate": "2.0.1", - "rollup": "2.75.7", + "rollup": "2.77.0", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-progress": "1.1.2", "rollup-plugin-terser": "7.0.2"