From bffd1cb4d3226f2c3cfe7d6e60fbba205d9e99f3 Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Sat, 19 Feb 2022 04:37:18 -0800
Subject: [PATCH] Update to latest vaadin

---
 qortal-ui-core/src/components/app-info.js             |  9 +++++++--
 .../components/login-view/create-account-section.js   | 11 ++---------
 .../src/components/login-view/login-section.js        |  7 ++-----
 .../src/components/settings-view/security-view.js     |  4 +---
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/qortal-ui-core/src/components/app-info.js b/qortal-ui-core/src/components/app-info.js
index bfdc4b28..34b6fb1e 100644
--- a/qortal-ui-core/src/components/app-info.js
+++ b/qortal-ui-core/src/components/app-info.js
@@ -89,8 +89,8 @@ class AppInfo extends connect(store)(LitElement) {
         return html`
             <div id="profileInMenu">
                 <span class="info">Block Height: ${this.blockInfo.height ? this.blockInfo.height : ''}  <span class=${this.cssStatus}>${this._renderStatus()}</span></span>
-                <span class="info">UI Version: ${this.nodeConfig.version ? this.nodeConfig.version : ''} </span>
-                <span class="info">Core Version: ${this.nodeInfo.buildVersion ? this.nodeInfo.buildVersion : ''} </span>
+                <span class="info">UI Version: ${this.nodeConfig.version ? this.nodeConfig.version : ''}</span>
+                ${this._renderCoreVersion()}
                 <a id="pageLink"></a>
             </div>
         `
@@ -117,6 +117,11 @@ class AppInfo extends connect(store)(LitElement) {
         }
     }
 
+    _renderCoreVersion() {
+        return html`<span class="info">Core Version: ${this.nodeInfo.buildVersion ? this.nodeInfo.buildVersion : ''}</span>`
+        setTimeout(_renderCoreVersion(), 60000)
+    }
+
     gotoPage(url) {
         const myLink = this.shadowRoot.querySelector('#pageLink')
         myLink.href = url
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 06db3ec1..cd19ad50 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
@@ -3,30 +3,23 @@ import { connect } from 'pwa-helpers'
 import { store } from '../../store.js'
 
 import { createWallet } from '../../../../qortal-ui-crypto/api/createWallet.js'
-
 import FileSaver from 'file-saver'
-
 import { doLogin, doLogout, doSelectAddress } from '../../redux/app/app-actions.js'
 import { doStoreWallet } from '../../redux/user/user-actions.js'
 import { checkApiKey } from '../../apiKeyUtils.js'
-
 import snackbar from '../../functional-components/snackbar.js'
-
 import '@material/mwc-button'
 import '@material/mwc-checkbox'
 import '@material/mwc-textfield'
 import '@material/mwc-icon'
 import '@material/mwc-dialog'
 import '@material/mwc-formfield'
-
 import '@polymer/iron-pages'
 import '@polymer/paper-input/paper-input-container.js'
 import '@polymer/paper-input/paper-input.js'
-import '@vaadin/vaadin-text-field/vaadin-text-field.js'
-import '@vaadin/vaadin-text-field/vaadin-password-field.js'
-
+import '@vaadin/text-field/vaadin-text-field.js'
+import '@vaadin/password-field/vaadin-password-field.js'
 import 'random-sentence-generator'
-
 import ripple from '../../functional-components/loading-ripple.js'
 
 let lastPassword = ''
diff --git a/qortal-ui-core/src/components/login-view/login-section.js b/qortal-ui-core/src/components/login-view/login-section.js
index d4ab564a..1f826e69 100644
--- a/qortal-ui-core/src/components/login-view/login-section.js
+++ b/qortal-ui-core/src/components/login-view/login-section.js
@@ -9,20 +9,17 @@ import '@material/mwc-textfield'
 import '@material/mwc-icon'
 import '@material/mwc-dialog'
 import '@material/mwc-formfield'
-
 import '@polymer/iron-pages'
 import '@polymer/paper-input/paper-input-container.js'
 import '@polymer/paper-input/paper-input.js'
 import '@polymer/paper-ripple'
 import '@polymer/iron-collapse'
 import '@polymer/paper-spinner/paper-spinner-lite.js'
-import '@vaadin/vaadin-text-field/vaadin-text-field.js'
-import '@vaadin/vaadin-text-field/vaadin-password-field.js'
-
+import '@vaadin/text-field/vaadin-text-field.js'
+import '@vaadin/password-field/vaadin-password-field.js'
 import { doLogin, doSelectAddress } from '../../redux/app/app-actions.js'
 import { doStoreWallet, doRemoveWallet } from '../../redux/user/user-actions.js'
 import { createWallet } from '../../../../qortal-ui-crypto/api/createWallet.js'
-
 import snackbar from '../../functional-components/snackbar.js'
 import '../../custom-elements/frag-file-input.js'
 import ripple from '../../functional-components/loading-ripple.js'
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 d4a5bc3c..2f3955b1 100644
--- a/qortal-ui-core/src/components/settings-view/security-view.js
+++ b/qortal-ui-core/src/components/settings-view/security-view.js
@@ -4,9 +4,7 @@ import { store } from '../../store.js'
 
 import '@material/mwc-textfield'
 import '@material/mwc-icon'
-
-import '@vaadin/vaadin-text-field/vaadin-password-field.js'
-
+import '@vaadin/password-field/vaadin-password-field.js'
 import FileSaver from 'file-saver'
 
 class SecurityView extends connect(store)(LitElement) {