@@ -504,6 +588,59 @@ class AppView extends connect(store)(LitElement) {
+
+
+
Qortal UI ${translate("login.lp1")}
+
+
+
+
${translate("login.lp2")}
+ ${translate("login.lp3")}
+
+
+ password
+
+
+
+ password
+
+
+
+ ${translate("login.lp4")}
+ ${translate("login.lp5")}
+
+
+
+
+
+ UI
+ ${translate("login.lp9")}
+ ${translate("login.lp10")}
+
+
+
password
+
+
+ ${this.helperMessage}
+
+
+
+
+
+
`
}
@@ -512,6 +649,44 @@ class AppView extends connect(store)(LitElement) {
addTradeBotRoutes(parentEpml)
parentEpml.imReady()
+ this.helperMessage = this.renderHelperPass()
+
+ this.salt = ''
+ this.salt = Base58.encode(store.getState().app.wallet._addresses[0].keyPair.privateKey)
+
+ this.storageData = ''
+ this.storageData = store.getState().app.selectedAddress.address
+
+ this.lockScreenPass = ''
+ this.lockScreenPass = 'lockScreenPass-' + this.storageData
+
+ this.lockScreenSet = ''
+ this.lockScreenSet = 'lockScreenSet-' + this.storageData
+
+ this.lockPass = ''
+ this.lockPass = encryptData(false, this.salt)
+
+ this.lockSet = ''
+ this.lockSet = encryptData(false, this.salt)
+
+ if (localStorage.getItem(this.lockScreenPass) === null && localStorage.getItem(this.lockScreenSet) === null) {
+ localStorage.setItem(this.lockScreenPass, this.lockPass)
+ localStorage.setItem(this.lockScreenSet, this.lockSet)
+ this.myLockScreenPass = ''
+ this.myLockScreenPass = decryptData(localStorage.getItem(this.lockScreenPass), this.salt)
+ this.myLockScreenSet = ''
+ this.myLockScreenSet = decryptData(localStorage.getItem(this.lockScreenSet), this.salt)
+ } else {
+ this.myLockScreenPass = ''
+ this.myLockScreenPass = decryptData(localStorage.getItem(this.lockScreenPass), this.salt)
+ this.myLockScreenSet = ''
+ this.myLockScreenSet = decryptData(localStorage.getItem(this.lockScreenSet), this.salt)
+ }
+
+ if (this.myLockScreenSet === true) {
+ this.shadowRoot.getElementById('lockScreenActive').open()
+ }
+
var drawerTog = this.shadowRoot.getElementById("mb")
var drawerOut = this.shadowRoot.getElementById("appsidebar")
@@ -1566,6 +1741,139 @@ class AppView extends connect(store)(LitElement) {
}
}
+ renderLockButton() {
+ if (this.myLockScreenPass === false && this.myLockScreenSet === false) {
+ return html`
+
+
this.openSetScreenLockPass()} title="${translate("login.lp11")}">
+
+ `
+ } else if (this.myLockScreenSet === false) {
+ return html`
+
+
this.setLockQortal()} title="${translate("login.lp11")}">
+
+ `
+ } else if (this.myLockScreenSet === true) {
+ return html`
+
+ `
+ }
+ }
+
+ openSetScreenLockPass() {
+ this.shadowRoot.getElementById('lockPassword').value = ''
+ this.shadowRoot.getElementById('lockPasswordConfirm').value = ''
+ this.shadowRoot.getElementById('setLockScreenPass').open()
+ }
+
+ closeSetScreenLockPass() {
+ this.shadowRoot.getElementById('setLockScreenPass').close()
+ }
+
+ checkPass() {
+ const password = this.shadowRoot.getElementById('lockPassword').value
+ const rePassword = this.shadowRoot.getElementById('lockPasswordConfirm').value
+
+ if (password === '') {
+ let snackbar1string = get("login.pleaseenter")
+ parentEpml.request('showSnackBar', `${snackbar1string}`)
+ return
+ }
+
+ if (password != rePassword) {
+ let snackbar2string = get("login.notmatch")
+ parentEpml.request('showSnackBar', `${snackbar2string}`)
+ return
+ }
+
+ if (password.length < 8) {
+ let snackbar3string = get("login.lessthen8")
+ parentEpml.request('showSnackBar', `${snackbar3string}`)
+ this.lowPass = ''
+ this.lowPass = password
+ this.extraConfirm()
+ }
+
+ if (password.length >= 8) {
+ this.setNewScreenPass()
+ let snackbar4string = get("login.lp6")
+ parentEpml.request('showSnackBar', `${snackbar4string}`)
+ }
+ }
+
+ extraConfirm() {
+ this.shadowRoot.getElementById('setLockScreenPass').close()
+ this.shadowRoot.getElementById('extraConfirmPass').open()
+ }
+
+ closExtraConfirmPass() {
+ this.shadowRoot.getElementById('extraConfirmPass').close()
+ this.shadowRoot.getElementById('lockPassword').value = ''
+ this.shadowRoot.getElementById('lockPasswordConfirm').value = ''
+ }
+
+ setNewScreenPass() {
+ const rawPassword = this.shadowRoot.getElementById('lockPassword').value
+ const cryptPassword = encryptData(rawPassword, this.salt)
+ localStorage.setItem(this.lockScreenPass, cryptPassword)
+ this.myLockScreenPass = ''
+ this.myLockScreenPass = decryptData(localStorage.getItem(this.lockScreenPass), this.salt)
+ this.shadowRoot.getElementById('setLockScreenPass').close()
+ this.shadowRoot.getElementById('extraConfirmPass').close()
+ this.shadowRoot.getElementById('lockPassword').value = ''
+ this.shadowRoot.getElementById('lockPasswordConfirm').value = ''
+ }
+
+ setLockQortal() {
+ this.helperMessage = this.renderHelperPass()
+ this.lockSet = ''
+ this.lockSet = encryptData(true, this.salt)
+ localStorage.setItem(this.lockScreenSet, this.lockSet)
+ this.myLockScreenSet = ''
+ this.myLockScreenSet = decryptData(localStorage.getItem(this.lockScreenSet), this.salt)
+ this.shadowRoot.getElementById('lockScreenActive').open()
+ }
+
+ passKeyListener(e) {
+ if (e.key === 'Enter') {
+ this.closeLockScreenActive()
+ }
+ }
+
+ async closeLockScreenActive() {
+ const myPass = decryptData(localStorage.getItem(this.lockScreenPass), this.salt)
+ const checkPass = this.shadowRoot.getElementById('unlockPassword').value
+ const errDelay = ms => new Promise(res => setTimeout(res, ms))
+
+ if (checkPass === myPass) {
+ this.lockSet = ''
+ this.lockSet = encryptData(false, this.salt)
+ localStorage.setItem(this.lockScreenSet, this.lockSet)
+ this.myLockScreenSet = ''
+ this.myLockScreenSet = decryptData(localStorage.getItem(this.lockScreenSet), this.salt)
+ this.shadowRoot.getElementById('lockScreenActive').close()
+ this.shadowRoot.getElementById('unlockPassword').value = ''
+ this.helperMessage = this.renderHelperPass()
+ } else {
+ this.shadowRoot.getElementById('unlockPassword').value = ''
+ this.helperMessage = this.renderHelperErr()
+ await errDelay(3000)
+ this.helperMessage = this.renderHelperPass()
+ return
+ }
+ }
+
+ renderHelperPass() {
+ return html`
${translate("login.pleaseenter")}`
+ }
+
+ renderHelperErr() {
+ return html`
${translate("login.lp8")}`
+ }
+
renderNodeManagement() {
const checkNodeManagement = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]
if ((checkNodeManagement.enableManagement = true)) {
diff --git a/core/src/lockScreen.js b/core/src/lockScreen.js
new file mode 100644
index 00000000..e552c879
--- /dev/null
+++ b/core/src/lockScreen.js
@@ -0,0 +1,11 @@
+import CryptoJS from 'crypto-js'
+
+export const encryptData = (data, salt) => CryptoJS.AES.encrypt(JSON.stringify(data), salt).toString()
+export const decryptData = (ciphertext, salt) => {
+ const bytes = CryptoJS.AES.decrypt(ciphertext, salt)
+ try {
+ return JSON.parse(bytes.toString(CryptoJS.enc.Utf8))
+ } catch(err) {
+ return null
+ }
+}
\ No newline at end of file
diff --git a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js
index 51928947..3b3c0802 100644
--- a/plugins/plugins/core/trade-bot/trade-bot-portal.src.js
+++ b/plugins/plugins/core/trade-bot/trade-bot-portal.src.js
@@ -3,6 +3,8 @@ import { render } from 'lit/html.js'
import { Epml } from '../../../epml.js'
import isElectron from 'is-electron'
import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+import Base58 from '../../../../crypto/api/deps/Base58.js'
+import { encryptData, decryptData } from '../../../../core/src/lockScreen.js'
registerTranslateConfig({
loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
@@ -24,6 +26,7 @@ import '@polymer/paper-icon-button/paper-icon-button.js'
import '@polymer/paper-spinner/paper-spinner-lite.js'
import '@vaadin/grid'
import '@vaadin/grid/vaadin-grid-sorter'
+import '@vaadin/password-field'
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
@@ -76,7 +79,16 @@ class TradeBotPortal extends LitElement {
tradeBotDogeBook: { type: Array },
tradeBotDgbBook: { type: Array },
tradeBotRvnBook: { type: Array },
- tradeBotArrrBook: { type: Array }
+ tradeBotArrrBook: { type: Array },
+ autoSalt: { type: String },
+ autoStorageData: { type: String },
+ autoLockScreenPass: { type: String },
+ autoLockScreenSet: { type: String },
+ autoLockPass: { type: String },
+ autoLockSet: { type: String },
+ myAutoLockScreenPass: { type: String },
+ myAutoLockScreenSet: { type: String },
+ autoHelperMessage: { type: String }
}
}
@@ -86,17 +98,17 @@ class TradeBotPortal extends LitElement {
--mdc-theme-primary: rgb(3, 169, 244);
--mdc-theme-secondary: var(--mdc-theme-primary);
--mdc-theme-error: rgb(255, 89, 89);
- --mdc-text-field-outlined-idle-border-color: var(--txtfieldborder);
+ --mdc-text-field-outlined-idle-border-color: var(--txtfieldborder);
--mdc-text-field-outlined-hover-border-color: var(--txtfieldhoverborder);
--mdc-text-field-label-ink-color: var(--black);
--mdc-text-field-ink-color: var(--black);
- --mdc-select-outlined-idle-border-color: var(--txtfieldborder);
+ --mdc-select-outlined-idle-border-color: var(--txtfieldborder);
--mdc-select-outlined-hover-border-color: var(--txtfieldhoverborder);
--mdc-select-label-ink-color: var(--black);
--mdc-select-ink-color: var(--black);
--mdc-theme-surface: var(--white);
--mdc-dialog-content-ink-color: var(--black);
- --mdc-dialog-shape-radius: 25px;
+ --mdc-dialog-shape-radius: 25px;
--paper-input-container-focus-color: var(--mdc-theme-primary);
--lumo-primary-text-color: rgb(0, 167, 245);
--lumo-primary-color-50pct: rgba(0, 167, 245, 0.5);
@@ -569,6 +581,56 @@ class TradeBotPortal extends LitElement {
.close-icon:hover {
cursor: pointer;
opacity: .6;
+ }
+ .setpass-wrapper {
+ width: 100%;
+ min-width: 400px;
+ max-width: 450px;
+ text-align: center;
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ padding: 10px 10px 0px;
+ box-shadow: 0px 10px 15px rgba(0, 0, 0, 0.1);
+ }
+ .lock-wrapper {
+ width: 100%;
+ height: 100%;
+ min-width: 600px;
+ max-width: 600px;
+ min-height: 400px;
+ max-height: 400px;
+ text-align: center;
+ background: url("/img/qortal-lock.jpg");
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 10px 10px 0px;
+ }
+ .text-wrapper {
+ width: 100%;
+ height: 100%;
+ min-width: 280px;
+ max-width: 280px;
+ min-height: 64px;
+ max-height: 64px;
+ text-align: center;
+ margin-left: 35px;
+ margin-top: 125px;
+ overflow: hidden;
+ }
+ .lock-title-white {
+ font-family: 'magistralbold';
+ font-weight: 700;
+ font-size: 26px;
+ line-height: 32px;
+ color: #ffffff;
+ }
+ .lock-title-red {
+ font-family: 'magistralbold';
+ font-weight: 700;
+ font-size: 26px;
+ line-height: 32px;
+ color: #df3636;
}
@media (min-width: 701px) {
* {
@@ -827,6 +889,15 @@ class TradeBotPortal extends LitElement {
this.tradeBotDgbBook = []
this.tradeBotRvnBook = []
this.tradeBotArrrBook = []
+ this.autoSalt = ''
+ this.autoStorageData = ''
+ this.autoLockScreenPass = ''
+ this.autoLockScreenSet = ''
+ this.autoLockPass = ''
+ this.autoLockSet = ''
+ this.myAutoLockScreenPass = ''
+ this.myAutoLockScreenSet = ''
+ this.autoHelperMessage = ''
}
openTradesTemplate() {
@@ -1470,11 +1541,14 @@ class TradeBotPortal extends LitElement {
DOGE / QORT
DGB / QORT
RVN / QORT
-
ARRR / QORT
+
ARRR / QORT
-
- this.shadowRoot.getElementById('buyInfoDialog').open()}>
-
+
+ this.shadowRoot.getElementById('buyInfoDialog').open()}>
+
+
+ ${this.renderAutoLockButton()}
+
+ ${this.renderTradeLockButton()}
+
+
@@ -1269,6 +1349,59 @@ class TradePortal extends LitElement {
${translate("info.inf6")}
+
+
+
Qortal ${translate("tabmenu.tm4")} ${translate("login.lp1")}
+
+
+
+
${translate("login.lp2")}
+ ${translate("login.lp3")}
+
+
+ password
+
+
+
+ password
+
+
+
+ ${translate("login.lp4")}
+ ${translate("login.lp5")}
+
+
+
+
+
+ ${translate("sidemenu.tradeportal")}
+ ${translate("login.lp9")}
+ ${translate("login.lp10")}
+
+
+
password
+
+
+ ${this.tradeHelperMessage}
+
+
+
+
+
+
`
}
@@ -1279,6 +1412,45 @@ class TradePortal extends LitElement {
this.changeTheme()
this.changeLanguage()
+
+ this.tradeHelperMessage = this.renderTradeHelperPass()
+
+ this.tradeSalt = ''
+ this.tradeSalt = Base58.encode(window.parent.reduxStore.getState().app.wallet._addresses[0].keyPair.privateKey)
+
+ this.tradeStorageData = ''
+ this.tradeStorageData = window.parent.reduxStore.getState().app.selectedAddress.address
+
+ this.tradeLockScreenPass = ''
+ this.tradeLockScreenPass = 'tradeLockScreenPass-' + this.tradeStorageData
+
+ this.tradeLockScreenSet = ''
+ this.tradeLockScreenSet = 'tradeLockScreenSet-' + this.tradeStorageData
+
+ this.tradeLockPass = ''
+ this.tradeLockPass = encryptData(false, this.tradeSalt)
+
+ this.tradeLockSet = ''
+ this.tradeLockSet = encryptData(false, this.tradeSalt)
+
+ if (localStorage.getItem(this.tradeLockScreenPass) === null && localStorage.getItem(this.tradeLockScreenSet) === null) {
+ localStorage.setItem(this.tradeLockScreenPass, this.tradeLockPass)
+ localStorage.setItem(this.tradeLockScreenSet, this.tradeLockSet)
+ this.myTradeLockScreenPass = ''
+ this.myTradeLockScreenPass = decryptData(localStorage.getItem(this.tradeLockScreenPass), this.tradeSalt)
+ this.myTradeLockScreenSet = ''
+ this.myTradeLockScreenSet = decryptData(localStorage.getItem(this.tradeLockScreenSet), this.tradeSalt)
+ } else {
+ this.myTradeLockScreenPass = ''
+ this.myTradeLockScreenPass = decryptData(localStorage.getItem(this.tradeLockScreenPass), this.tradeSalt)
+ this.myTradeLockScreenSet = ''
+ this.myTradeLockScreenSet = decryptData(localStorage.getItem(this.tradeLockScreenSet), this.tradeSalt)
+ }
+
+ if (this.myTradeLockScreenSet === true) {
+ this.shadowRoot.getElementById('tradeLockScreenActive').open()
+ }
+
this.updateWalletBalance()
this.fetchWalletAddress(this.selectedCoin)
@@ -1434,6 +1606,137 @@ class TradePortal extends LitElement {
setTimeout(() => this.shadowRoot.querySelector('[slot="vaadin-grid-cell-content-3"]').setAttribute('title', 'Last Seen'), 3000)
}
+ renderTradeLockButton() {
+ if (this.myTradeLockScreenPass === false && this.myTradeLockScreenSet === false) {
+ return html`
+
+
this.openTradeSetScreenLockPass()} title="${translate("login.lp11")}">
+
+ `
+ } else if (this.myTradeLockScreenSet === false) {
+ return html`
+
+
this.setTradeLockQortal()} title="${translate("login.lp11")}">
+
+ `
+ } else if (this.myTradeLockScreenSet === true) {
+ return html`
+
+ `
+ }
+ }
+
+ openTradeSetScreenLockPass() {
+ this.shadowRoot.getElementById('tradeLockPassword').value = ''
+ this.shadowRoot.getElementById('tradeLockPasswordConfirm').value = ''
+ this.shadowRoot.getElementById('setTradeLockScreenPass').open()
+ }
+
+ closewTradeSetScreenLockPass() {
+ this.shadowRoot.getElementById('setTradeLockScreenPass').close()
+ }
+
+ tradeCheckPass() {
+ const tradePassword = this.shadowRoot.getElementById('tradeLockPassword').value
+ const tradeRePassword = this.shadowRoot.getElementById('tradeLockPasswordConfirm').value
+
+ if (tradePassword === '') {
+ let snackbar1string = get("login.pleaseenter")
+ parentEpml.request('showSnackBar', `${snackbar1string}`)
+ return
+ }
+
+ if (tradePassword != tradeRePassword) {
+ let snackbar2string = get("login.notmatch")
+ parentEpml.request('showSnackBar', `${snackbar2string}`)
+ return
+ }
+
+ if (tradePassword.length < 8) {
+ let snackbar3string = get("login.lessthen8")
+ parentEpml.request('showSnackBar', `${snackbar3string}`)
+ this.tradeExtraConfirm()
+ }
+
+ if (tradePassword.length >= 8) {
+ this.setTradeNewScreenPass()
+ let snackbar4string = get("login.lp6")
+ parentEpml.request('showSnackBar', `${snackbar4string}`)
+ }
+ }
+
+ tradeExtraConfirm() {
+ this.shadowRoot.getElementById('setTradeLockScreenPass').close()
+ this.shadowRoot.getElementById('tradeExtraConfirmPass').open()
+ }
+
+ closTradeExtraConfirmPass() {
+ this.shadowRoot.getElementById('tradeExtraConfirmPass').close()
+ this.shadowRoot.getElementById('tradeLockPassword').value = ''
+ this.shadowRoot.getElementById('tradeLockPasswordConfirm').value = ''
+ }
+
+ setTradeNewScreenPass() {
+ const tradeRawPassword = this.shadowRoot.getElementById('tradeLockPassword').value
+ const tradeCryptPassword = encryptData(tradeRawPassword, this.tradeSalt)
+ localStorage.setItem(this.tradeLockScreenPass, tradeCryptPassword)
+ this.myTradeLockScreenPass = ''
+ this.myTradeLockScreenPass = decryptData(localStorage.getItem(this.tradeLockScreenPass), this.tradeSalt)
+ this.shadowRoot.getElementById('setTradeLockScreenPass').close()
+ this.shadowRoot.getElementById('tradeExtraConfirmPass').close()
+ this.shadowRoot.getElementById('tradeLockPassword').value = ''
+ this.shadowRoot.getElementById('tradeLockPasswordConfirm').value = ''
+ }
+
+ setTradeLockQortal() {
+ this.tradeHelperMessage = this.renderTradeHelperPass()
+ this.tradeLockSet = ''
+ this.tradeLockSet = encryptData(true, this.tradeSalt)
+ localStorage.setItem(this.tradeLockScreenSet, this.tradeLockSet)
+ this.myTradeLockScreenSet = ''
+ this.myTradeLockScreenSet = decryptData(localStorage.getItem(this.tradeLockScreenSet), this.tradeSalt)
+ this.shadowRoot.getElementById('tradeLockScreenActive').open()
+ }
+
+ tradePassKeyListener(e) {
+ if (e.key === 'Enter') {
+ this.closeTradeLockScreenActive()
+ }
+ }
+
+ async closeTradeLockScreenActive() {
+ const myTradePass = decryptData(localStorage.getItem(this.tradeLockScreenPass), this.tradeSalt)
+ const tradeCheckPass = this.shadowRoot.getElementById('tradeUnlockPassword').value
+ const errDelay = ms => new Promise(res => setTimeout(res, ms))
+
+ if (tradeCheckPass === myTradePass) {
+ this.tradeLockSet = ''
+ this.tradeLockSet = encryptData(false, this.tradeSalt)
+ localStorage.setItem(this.tradeLockScreenSet, this.tradeLockSet)
+ this.myTradeLockScreenSet = ''
+ this.myTradeLockScreenSet = decryptData(localStorage.getItem(this.tradeLockScreenSet), this.tradeSalt)
+ this.shadowRoot.getElementById('tradeLockScreenActive').close()
+ this.shadowRoot.getElementById('tradeUnlockPassword').value = ''
+ this.tradeHelperMessage = this.renderTradeHelperPass()
+ } else {
+ this.shadowRoot.getElementById('tradeUnlockPassword').value = ''
+ this.tradeHelperMessage = this.renderTradeHelperErr()
+ await errDelay(3000)
+ this.tradeHelperMessage = this.renderTradeHelperPass()
+ return
+ }
+ }
+
+ renderTradeHelperPass() {
+ return html`
${translate("login.pleaseenter")}`
+ }
+
+ renderTradeHelperErr() {
+ return html`
${translate("login.lp8")}`
+ }
+
requestTraderInfo(traderAddress) {
let getAddress = traderAddress
const theInfoView = this.shadowRoot.querySelector('trader-info-view')
diff --git a/plugins/plugins/core/wallet/wallet-app.src.js b/plugins/plugins/core/wallet/wallet-app.src.js
index ceedf181..a6829ceb 100644
--- a/plugins/plugins/core/wallet/wallet-app.src.js
+++ b/plugins/plugins/core/wallet/wallet-app.src.js
@@ -3,6 +3,8 @@ import { render } from 'lit/html.js'
import { Epml } from '../../../epml.js'
import isElectron from 'is-electron'
import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
+import Base58 from '../../../../crypto/api/deps/Base58.js'
+import { encryptData, decryptData } from '../../../../core/src/lockScreen.js'
registerTranslateConfig({
loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
@@ -21,6 +23,7 @@ import '@material/mwc-icon'
import '@material/mwc-icon-button'
import '@material/mwc-tab-bar'
import '@material/mwc-textfield'
+import '@polymer/paper-dialog/paper-dialog.js'
import '@polymer/paper-progress/paper-progress.js'
import '@polymer/paper-slider/paper-slider.js'
import '@polymer/paper-spinner/paper-spinner-lite.js'
@@ -30,6 +33,7 @@ import '@vaadin/button'
import '@vaadin/grid'
import '@vaadin/icon'
import '@vaadin/icons'
+import '@vaadin/password-field'
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
@@ -97,7 +101,16 @@ class MultiWallet extends LitElement {
dgbBookAddress: { type: String },
rvnBookAddress: { type: String },
arrrBookAddress: { type: String },
- myElementId: { type: String }
+ myElementId: { type: String },
+ walletSalt: { type: String },
+ walletStorageData: { type: String },
+ walletLockScreenPass: { type: String },
+ walletLockScreenSet: { type: String },
+ walletLockPass: { type: String },
+ walletLockSet: { type: String },
+ myWalletLockScreenPass: { type: String },
+ myWalletLockScreenSet: { type: String },
+ walletHelperMessage: { type: String }
}
}
@@ -112,6 +125,7 @@ class MultiWallet extends LitElement {
--mdc-theme-primary: rgb(3, 169, 244);
--mdc-theme-secondary: var(--mdc-theme-primary);
--mdc-theme-surface: var(--white);
+ --mdc-theme-error: rgb(255, 89, 89);
--mdc-dialog-content-ink-color: var(--black);
--mdc-dialog-min-width: 400px;
--mdc-dialog-max-width: 1024px;
@@ -121,6 +135,8 @@ class MultiWallet extends LitElement {
--lumo-primary-color-10pct: rgba(0, 167, 245, 0.1);
--lumo-primary-color: hsl(199, 100%, 48%);
--lumo-base-color: var(--white);
+ --lumo-secondary-text-color: var(--sectxt);
+ --lumo-contrast-60pct: var(--vdicon);
--lumo-body-text-color: var(--black);
--_lumo-grid-border-color: var(--border);
--_lumo-grid-secondary-border-color: var(--border2);
@@ -219,6 +235,18 @@ class MultiWallet extends LitElement {
font-family: 'Open Sans', sans-serif;
}
+ .magistral {
+ font-family: 'magistralbold';
+ }
+
+ .montserrat {
+ font-family: 'Montserrat', sans-serif;
+ }
+
+ .maven {
+ font-family: 'MavenPro', sans-serif;
+ }
+
.weight-100 {
font-weight: 100;
}
@@ -318,6 +346,7 @@ class MultiWallet extends LitElement {
}
.header-title {
+ display: inlinr;
font-size: 32px;
color: var(--black);
font-weight: 600;
@@ -592,18 +621,18 @@ class MultiWallet extends LitElement {
cursor: pointer;
}
- .warning-text {
- animation: blinker 1.5s linear infinite;
- text-align: center;
- margin-top: 10px;
- color: rgb(255, 89, 89);
- }
+ .warning-text {
+ animation: blinker 1.5s linear infinite;
+ text-align: center;
+ margin-top: 10px;
+ color: rgb(255, 89, 89);
+ }
- @keyframes blinker {
- 50% {
- opacity: 0;
- }
- }
+ @keyframes blinker {
+ 50% {
+ opacity: 0;
+ }
+ }
@media (max-width: 764px) {
.wallet {
@@ -641,6 +670,61 @@ class MultiWallet extends LitElement {
font: 18px/24px 'Open Sans', sans-serif;
}
}
+
+ .setpass-wrapper {
+ width: 100%;
+ min-width: 400px;
+ max-width: 450px;
+ text-align: center;
+ background: var(--white);
+ border: 1px solid var(--black);
+ border-radius: 15px;
+ padding: 10px 10px 0px;
+ box-shadow: 0px 10px 15px rgba(0, 0, 0, 0.1);
+ }
+
+ .lock-wrapper {
+ width: 100%;
+ height: 100%;
+ min-width: 600px;
+ max-width: 600px;
+ min-height: 400px;
+ max-height: 400px;
+ text-align: center;
+ background: url("/img/qortal-lock.jpg");
+ border: 1px solid var(--black);
+ border-radius: 25px;
+ padding: 10px 10px 0px;
+ }
+
+ .text-wrapper {
+ width: 100%;
+ height: 100%;
+ min-width: 280px;
+ max-width: 280px;
+ min-height: 64px;
+ max-height: 64px;
+ text-align: center;
+ margin-left: 35px;
+ margin-top: 125px;
+ overflow: hidden;
+ }
+
+ .lock-title-white {
+ font-family: 'magistralbold';
+ font-weight: 700;
+ font-size: 26px;
+ line-height: 32px;
+ color: #ffffff;
+ }
+
+ .lock-title-red {
+ font-family: 'magistralbold';
+ font-weight: 700;
+ font-size: 26px;
+ line-height: 32px;
+ color: #df3636;
+ }
`
}
@@ -719,6 +803,15 @@ class MultiWallet extends LitElement {
this.rvnFeePerByte = 1125
this.rvnSatMinFee = 1000
this.rvnSatMaxFee = 10000
+ this.walletSalt = ''
+ this.walletStorageData = ''
+ this.walletLockScreenPass = ''
+ this.walletLockScreenSet = ''
+ this.walletLockPass = ''
+ this.walletLockSet = ''
+ this.myWalletLockScreenPass = ''
+ this.myWalletLockScreenSet = ''
+ this.walletHelperMessage = ''
this.wallets = new Map()
@@ -764,7 +857,7 @@ class MultiWallet extends LitElement {
return html`
@@ -2627,6 +2720,59 @@ class MultiWallet extends LitElement {
+
+
+
Qortal ${translate("tabmenu.tm5")} ${translate("login.lp1")}
+
+
+
+
${translate("login.lp2")}
+ ${translate("login.lp3")}
+
+
+ password
+
+
+
+ password
+
+
+
+ ${translate("login.lp4")}
+ ${translate("login.lp5")}
+
+
+
+
+
+ ${translate("sidemenu.wallets")}
+ ${translate("login.lp9")}
+ ${translate("login.lp10")}
+
+
+
password
+
+
+ ${this.walletHelperMessage}
+
+
+
+
+
+
`
}
@@ -2634,6 +2780,45 @@ class MultiWallet extends LitElement {
this.changeTheme()
this.changeLanguage()
+
+ this.walletHelperMessage = this.renderWalletHelperPass()
+
+ this.walletSalt = ''
+ this.walletSalt = Base58.encode(window.parent.reduxStore.getState().app.wallet._addresses[0].keyPair.privateKey)
+
+ this.walletStorageData = ''
+ this.walletStorageData = window.parent.reduxStore.getState().app.selectedAddress.address
+
+ this.walletLockScreenPass = ''
+ this.walletLockScreenPass = 'walletLockScreenPass-' + this.walletStorageData
+
+ this.walletLockScreenSet = ''
+ this.walletLockScreenSet = 'walletLockScreenSet-' + this.walletStorageData
+
+ this.walletLockPass = ''
+ this.walletLockPass = encryptData(false, this.walletSalt)
+
+ this.walletLockSet = ''
+ this.walletLockSet = encryptData(false, this.walletSalt)
+
+ if (localStorage.getItem(this.walletLockScreenPass) === null && localStorage.getItem(this.walletLockScreenSet) === null) {
+ localStorage.setItem(this.walletLockScreenPass, this.walletLockPass)
+ localStorage.setItem(this.walletLockScreenSet, this.walletLockSet)
+ this.myWalletLockScreenPass = ''
+ this.myWalletLockScreenPass = decryptData(localStorage.getItem(this.walletLockScreenPass), this.walletSalt)
+ this.myWalletLockScreenSet = ''
+ this.myWalletLockScreenSet = decryptData(localStorage.getItem(this.walletLockScreenSet), this.walletSalt)
+ } else {
+ this.myWalletLockScreenPass = ''
+ this.myWalletLockScreenPass = decryptData(localStorage.getItem(this.walletLockScreenPass), this.walletSalt)
+ this.myWalletLockScreenSet = ''
+ this.myWalletLockScreenSet = decryptData(localStorage.getItem(this.walletLockScreenSet), this.walletSalt)
+ }
+
+ if (this.myWalletLockScreenSet === true) {
+ this.shadowRoot.getElementById('walletLockScreenActive').open()
+ }
+
this.qortAddressbook()
this.btcAddressbook()
this.ltcAddressbook()
@@ -2669,6 +2854,137 @@ class MultiWallet extends LitElement {
}
}
+ renderWalletLockButton() {
+ if (this.myWalletLockScreenPass === false && this.myWalletLockScreenSet === false) {
+ return html`
+
+
this.openWalletSetScreenLockPass()} title="${translate("login.lp11")}">
+
+ `
+ } else if (this.myWalletLockScreenSet === false) {
+ return html`
+
+
this.setWalletLockQortal()} title="${translate("login.lp11")}">
+
+ `
+ } else if (this.myWalletLockScreenSet === true) {
+ return html`
+
+ `
+ }
+ }
+
+ openWalletSetScreenLockPass() {
+ this.shadowRoot.getElementById('walletLockPassword').value = ''
+ this.shadowRoot.getElementById('walletLockPasswordConfirm').value = ''
+ this.shadowRoot.getElementById('setWalletLockScreenPass').open()
+ }
+
+ closewWalletSetScreenLockPass() {
+ this.shadowRoot.getElementById('setWalletLockScreenPass').close()
+ }
+
+ walletCheckPass() {
+ const walletPassword = this.shadowRoot.getElementById('walletLockPassword').value
+ const walletRePassword = this.shadowRoot.getElementById('walletLockPasswordConfirm').value
+
+ if (walletPassword === '') {
+ let snackbar1string = get("login.pleaseenter")
+ parentEpml.request('showSnackBar', `${snackbar1string}`)
+ return
+ }
+
+ if (walletPassword != walletRePassword) {
+ let snackbar2string = get("login.notmatch")
+ parentEpml.request('showSnackBar', `${snackbar2string}`)
+ return
+ }
+
+ if (walletPassword.length < 8) {
+ let snackbar3string = get("login.lessthen8")
+ parentEpml.request('showSnackBar', `${snackbar3string}`)
+ this.walletExtraConfirm()
+ }
+
+ if (walletPassword.length >= 8) {
+ this.setWalletNewScreenPass()
+ let snackbar4string = get("login.lp6")
+ parentEpml.request('showSnackBar', `${snackbar4string}`)
+ }
+ }
+
+ walletExtraConfirm() {
+ this.shadowRoot.getElementById('setWalletLockScreenPass').close()
+ this.shadowRoot.getElementById('walletExtraConfirmPass').open()
+ }
+
+ closWalletExtraConfirmPass() {
+ this.shadowRoot.getElementById('walletExtraConfirmPass').close()
+ this.shadowRoot.getElementById('walletLockPassword').value = ''
+ this.shadowRoot.getElementById('walletLockPasswordConfirm').value = ''
+ }
+
+ setWalletNewScreenPass() {
+ const walletRawPassword = this.shadowRoot.getElementById('walletLockPassword').value
+ const walletCryptPassword = encryptData(walletRawPassword, this.walletSalt)
+ localStorage.setItem(this.walletLockScreenPass, walletCryptPassword)
+ this.myWalletLockScreenPass = ''
+ this.myWalletLockScreenPass = decryptData(localStorage.getItem(this.walletLockScreenPass), this.walletSalt)
+ this.shadowRoot.getElementById('setWalletLockScreenPass').close()
+ this.shadowRoot.getElementById('walletExtraConfirmPass').close()
+ this.shadowRoot.getElementById('walletLockPassword').value = ''
+ this.shadowRoot.getElementById('walletLockPasswordConfirm').value = ''
+ }
+
+ setWalletLockQortal() {
+ this.walletHelperMessage = this.renderWalletHelperPass()
+ this.walletLockSet = ''
+ this.walletLockSet = encryptData(true, this.walletSalt)
+ localStorage.setItem(this.walletLockScreenSet, this.walletLockSet)
+ this.myWalletLockScreenSet = ''
+ this.myWalletLockScreenSet = decryptData(localStorage.getItem(this.walletLockScreenSet), this.walletSalt)
+ this.shadowRoot.getElementById('walletLockScreenActive').open()
+ }
+
+ walletPassKeyListener(e) {
+ if (e.key === 'Enter') {
+ this.closeWalletLockScreenActive()
+ }
+ }
+
+ async closeWalletLockScreenActive() {
+ const myWalletPass = decryptData(localStorage.getItem(this.walletLockScreenPass), this.walletSalt)
+ const walletCheckPass = this.shadowRoot.getElementById('walletUnlockPassword').value
+ const errDelay = ms => new Promise(res => setTimeout(res, ms))
+
+ if (walletCheckPass === myWalletPass) {
+ this.walletLockSet = ''
+ this.walletLockSet = encryptData(false, this.walletSalt)
+ localStorage.setItem(this.walletLockScreenSet, this.walletLockSet)
+ this.myWalletLockScreenSet = ''
+ this.myWalletLockScreenSet = decryptData(localStorage.getItem(this.walletLockScreenSet), this.walletSalt)
+ this.shadowRoot.getElementById('walletLockScreenActive').close()
+ this.shadowRoot.getElementById('walletUnlockPassword').value = ''
+ this.walletHelperMessage = this.renderWalletHelperPass()
+ } else {
+ this.shadowRoot.getElementById('walletUnlockPassword').value = ''
+ this.walletHelperMessage = this.renderWalletHelperErr()
+ await errDelay(3000)
+ this.walletHelperMessage = this.renderWalletHelperPass()
+ return
+ }
+ }
+
+ renderWalletHelperPass() {
+ return html`
${translate("login.pleaseenter")}`
+ }
+
+ renderWalletHelperErr() {
+ return html`
${translate("login.lp8")}`
+ }
+
renderWarning() {
return html`
${translate("tradepage.tchange48")} QORT`
}