diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json
index e16602ec..1032f66b 100644
--- a/qortal-ui-core/language/us.json
+++ b/qortal-ui-core/language/us.json
@@ -525,7 +525,27 @@
"bchange13": "Error occurred when trying to block this registered name. Please try again!",
"bchange14": "Error occurred when trying to unblock this registered name. Please try again!",
"bchange15": "Can't delete data from followed names. Please unfollow first.",
- "bchange16": "Error occurred when trying to delete this resource. Please try again!"
+ "bchange16": "Error occurred when trying to delete this resource. Please try again!",
+ "bchange17": "User declined to share account details",
+ "bchange18": "has requested authentication. Would you like to authenticate?",
+ "bchange19": "Do you give this application permission to publish to QDN?",
+ "bchange20": "Do you give this application permission to get your wallet balance?",
+ "bchange21": "Fetch Wallet Failed. Please try again!",
+ "bchange22": "Do you give this application permission to send a chat message?",
+ "bchange23": "Message Sent!",
+ "bchange24": "This shares your QORT address and allows your account to interact with the",
+ "bchange25": "No sensitive data is shared.",
+ "bchange26": "Always authenticate automatically",
+ "bchange27": "Reject",
+ "bchange28": "Accept",
+ "bchange29": "Instant publish (requires 0.001 QORT fee)",
+ "bchange30": "Service",
+ "bchange31": "Name",
+ "bchange32": "Identifier",
+ "bchange33": "Instant publish",
+ "bchange34": "Filename",
+ "bchange35": "Do you give this application permission to send coins?",
+ "bchange36": "Do you want to publish instant to QDN without computing proof-of-work?"
},
"datapage": {
"dchange1": "Data Management",
diff --git a/qortal-ui-core/src/components/login-view/login-view.js b/qortal-ui-core/src/components/login-view/login-view.js
index ebdf31f2..52cb406c 100644
--- a/qortal-ui-core/src/components/login-view/login-view.js
+++ b/qortal-ui-core/src/components/login-view/login-view.js
@@ -2,6 +2,7 @@ import { LitElement, html, css } from 'lit'
import { connect } from 'pwa-helpers'
import { store } from '../../store.js'
import { stateAwait } from '../../stateAwait.js'
+import { translate, translateUnsafeHTML } from 'lit-translate'
import '@material/mwc-button'
import '@material/mwc-icon'
@@ -36,6 +37,7 @@ class LoginView extends connect(store)(LitElement) {
config: { type: Object },
rippleLoadingMessage: { type: String },
selectedPageElement: {},
+ nodeConfig: { type: Object },
theme: { type: String, reflect: true }
}
}
@@ -132,10 +134,8 @@ class LoginView extends connect(store)(LitElement) {
max-height:var(--window-height);
margin-right: auto;
margin-left: auto;
-
width: calc(100vw);
}
-
.qortal-logo {
margin-left: auto;
margin-right: auto;
@@ -202,7 +202,6 @@ class LoginView extends connect(store)(LitElement) {
border-radius: 4px;
}
#loginContainerPages [page="welcome"] {
-
}
}
@media only screen and (max-width: ${getComputedStyle(document.body).getPropertyValue('--layout-breakpoint-tablet')}) {
@@ -222,7 +221,6 @@ class LoginView extends connect(store)(LitElement) {
padding-left:12px;
}
}
-
@keyframes fade {
from {
opacity: 0;
@@ -258,7 +256,6 @@ class LoginView extends connect(store)(LitElement) {
display: none;
}
-
settings.show()}>
@@ -266,6 +263,7 @@ class LoginView extends connect(store)(LitElement) {

+
${translate("appinfo.uiversion")}: ${this.nodeConfig.version ? this.nodeConfig.version : ''}
this.selectedPageElement.next(e)} page="welcome">
this.selectedPageElement.next(e)} page="create-account">
@@ -294,6 +292,7 @@ class LoginView extends connect(store)(LitElement) {
if (this.loggedIn && !state.app.loggedIn) this.cleanup()
this.loggedIn = state.app.loggedIn
this.config = state.config
+ this.nodeConfig = state.app.nodeConfig
}
cleanup() {
diff --git a/qortal-ui-core/src/components/wallet-profile.js b/qortal-ui-core/src/components/wallet-profile.js
index 65e2ec6c..874a5951 100644
--- a/qortal-ui-core/src/components/wallet-profile.js
+++ b/qortal-ui-core/src/components/wallet-profile.js
@@ -12,6 +12,7 @@ class WalletProfile extends connect(store)(LitElement) {
wallet: { type: Object },
nodeConfig: { type: Object },
accountInfo: { type: Object },
+ imageUrl: { type: String },
theme: { type: String, reflect: true }
}
}
@@ -30,6 +31,7 @@ class WalletProfile extends connect(store)(LitElement) {
names: [],
addressInfo: {}
}
+ this.imageUrl = ''
this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
}
@@ -42,32 +44,27 @@ class WalletProfile extends connect(store)(LitElement) {
background: var(--sidetopbar);
color: var(--black);
}
-
#profileInMenu:hover {
}
-
#accountIcon {
font-size:48px;
color: var(--mdc-theme-primary);
display: inline-block;
}
-
#accountName {
margin: 0;
font-size: 18px;
font-weight:500;
- display: inline-block;
width:100%;
padding-bottom:8px;
+ display: flex;
}
-
#blocksMinted {
margin:0;
margin-top: 0;
- font-size: 11px;
+ font-size: 12px;
color: #03a9f4;
}
-
#address {
white-space: nowrap;
overflow: hidden;
@@ -76,16 +73,32 @@ class WalletProfile extends connect(store)(LitElement) {
margin-top:8px;
font-size:11px;
}
+ .round-fullinfo {
+ position: relative;
+ width: 68px;
+ height: 68px;
+ border-radius: 50%;
+ }
+ .full-info-logo {
+ width: 68px;
+ height: 68px;
+ border-radius: 50%;
+ }
+ .inline-block-child {
+ flex: 1;
+ }
-
-
@@ -106,6 +119,23 @@ class WalletProfile extends connect(store)(LitElement) {
this.toast = container.appendChild(toast)
}
+ async getAllWithAddress(myAddress) {
+ await this.getAddressUserAvatar(myAddress)
+ }
+
+ getAvatar() {
+ const avatarNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]
+ const avatarUrl = avatarNode.protocol + '://' + avatarNode.domain + ':' + avatarNode.port
+ const url = `${avatarUrl}/arbitrary/THUMBNAIL/${this.accountInfo.names[0].name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`
+ return html`
`
+ }
+
+ getApiKey() {
+ const apiNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node];
+ let apiKey = apiNode.apiKey;
+ return apiKey;
+ }
+
stateChanged(state) {
this.wallet = state.app.wallet
this.nodeConfig = state.app.nodeConfig
diff --git a/qortal-ui-plugins/plugins/core/group-management/group-management.src.js b/qortal-ui-plugins/plugins/core/group-management/group-management.src.js
index 3338464c..2216124b 100644
--- a/qortal-ui-plugins/plugins/core/group-management/group-management.src.js
+++ b/qortal-ui-plugins/plugins/core/group-management/group-management.src.js
@@ -1320,9 +1320,9 @@ class GroupManagement extends LitElement {
${translate("grouppage.gchange3")}
-
-
-
+
+
+
{
render(html`${this.renderRole(data.item)}`, root)
}}>
@@ -1382,9 +1382,9 @@ class GroupManagement extends LitElement {
-
-
-
+
+
+
{
render(html` this.joinGroup(data.item)}>queue ${translate("grouppage.gchange51")}`, root)
}}>
@@ -1979,7 +1979,7 @@ class GroupManagement extends LitElement {
}
renderBanButton(groupObj) {
- return html` this.openCreateBanMemberDialog(groupObj)}>create ${translate("managegroup.mg6")}`
+ return html` this.openCreateBanMemberDialog(groupObj)}>hardware ${translate("managegroup.mg6")}`
}
openCreateBanMemberDialog(groupObj) {
@@ -2029,7 +2029,7 @@ class GroupManagement extends LitElement {
}
renderKickGroupMemberButton(groupObj) {
- return html` this.openKickGroupMemberDialog(groupObj)}>exit_to_app ${translate("managegroup.mg7")}`
+ return html` this.openKickGroupMemberDialog(groupObj)}>exit_to_app ${translate("managegroup.mg7")}`
}
openKickGroupMemberDialog(groupObj) {
@@ -2674,9 +2674,9 @@ class GroupManagement extends LitElement {
renderManageButton(groupObj) {
if (groupObj.owner === this.selectedAddress.address) {
- return html` this.manageGroupOwner(groupObj)}>create ${translate("grouppage.gchange40")}`
+ return html` this.manageGroupOwner(groupObj)}>create ${translate("grouppage.gchange40")}`
} else if (groupObj.isAdmin === true) {
- return html` this.manageGroupAdmin(groupObj)}>create ${translate("grouppage.gchange40")}`
+ return html` this.manageGroupAdmin(groupObj)}>create ${translate("grouppage.gchange40")}`
} else {
return html` this.leaveGroup(groupObj)}>exit_to_app ${translate("grouppage.gchange50")}`
}
diff --git a/qortal-ui-plugins/plugins/core/names-market/names-market.src.js b/qortal-ui-plugins/plugins/core/names-market/names-market.src.js
index c06534f5..ff5e72b8 100644
--- a/qortal-ui-plugins/plugins/core/names-market/names-market.src.js
+++ b/qortal-ui-plugins/plugins/core/names-market/names-market.src.js
@@ -679,7 +679,7 @@ class NamesMarket extends LitElement {
async updatePageSoldSize() {
this.filteredSoldItems = []
- this.marketSoldNames.sort((a, b) => parseFloat(a.amount) - parseFloat(b.amount))
+ this.marketSoldNames.sort((b, a) => parseFloat(a.amount) - parseFloat(b.amount))
this.filteredSoldItems = this.marketSoldNames
await this.setSoldPages()
await this.updateItemsSoldFromPage(1, true)