${this.boughtBTCTemplate()}
@@ -1193,7 +1191,7 @@ class UserInfoView extends connect(store)(LitElement) {
-
${this.soldBTCTemplate()}
@@ -1213,7 +1211,7 @@ class UserInfoView extends connect(store)(LitElement) {
- ${translate("walletpage.wchange5")}
@@ -1773,7 +1771,7 @@ class UserInfoView extends connect(store)(LitElement) { openTrades() { this.shadowRoot.getElementById('userTrades').open() - this.shadowRoot.getElementById('userInfoDialog').close() + this.shadowRoot.getElementById('userFullInfoDialog').close() } async openUserBoughtDialog() { diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js index a50cd34c..6fd8e544 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatPage.js +++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js @@ -700,6 +700,7 @@ class ChatPage extends LitElement { font-family: Roboto, sans-serif; font-size: 15px; color: var(--chat-bubble-msg-color); + box-sizing: border-box; } .name-input::selection { diff --git a/qortal-ui-plugins/plugins/core/components/TipUser.js b/qortal-ui-plugins/plugins/core/components/TipUser.js index c0be137f..6bc0ffbb 100644 --- a/qortal-ui-plugins/plugins/core/components/TipUser.js +++ b/qortal-ui-plugins/plugins/core/components/TipUser.js @@ -57,11 +57,11 @@ export class TipUser extends LitElement { } renderSuccessText() { - return html`${translate("grouppage.gchange67")}` + return html`${translate("chatpage.cchange55")}` } renderReceiverText() { - return html`${translate("grouppage.gchange66")}` + return html`${translate("chatpage.cchange54")}` } getApiKey() { @@ -76,7 +76,7 @@ export class TipUser extends LitElement { }) .then((res) => { if (isNaN(Number(res))) { - let snack4string = get("grouppage.gchange60") + let snack4string = get("chatpage.cchange48") parentEpml.request('showSnackBar', `${snack4string}`) } else { this.walletBalance = Number(res).toFixed(8); @@ -93,7 +93,7 @@ export class TipUser extends LitElement { if (parseFloat(amount) + parseFloat(0.001) > parseFloat(this.walletBalance)) { this.sendMoneyLoading = false; this.btnDisable = false; - let snack1string = get("grouppage.gchange63"); + let snack1string = get("chatpage.cchange51"); parentEpml.request('showSnackBar', `${snack1string}`); return false; } @@ -101,7 +101,7 @@ export class TipUser extends LitElement { if (parseFloat(amount) <= 0) { this.sendMoneyLoading = false; this.btnDisable = false; - let snack2string = get("grouppage.gchange64"); + let snack2string = get("chatpage.cchange52"); parentEpml.request('showSnackBar', `${snack2string}`); return false; } @@ -109,7 +109,7 @@ export class TipUser extends LitElement { if (recipient.length === 0) { this.sendMoneyLoading = false; this.btnDisable = false; - let snack3string = get("grouppage.gchange65"); + let snack3string = get("chatpage.cchange53"); parentEpml.request('showSnackBar', `${snack3string}`); return false; } @@ -239,12 +239,12 @@ export class TipUser extends LitElement { return html`
- ${translate("grouppage.gchange55")} ${this.userName}
+${translate("chatpage.cchange43")} ${this.userName}
-
@@ -257,7 +257,7 @@ export class TipUser extends LitElement {
style="width: 100%; cursor: pointer"
@click=${() => this.sendQort()}>
`}
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 e9f6d011..25dbdd19 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
@@ -30,8 +30,10 @@ class GroupManagement extends LitElement {
return {
loading: { type: Boolean },
publicGroups: { type: Array },
+ privateGroups: { type: Array },
joinedGroups: { type: Array },
groupInvites: { type: Array },
+ privateGroupSearch: { type: Array },
newMembersList: { type: Array },
newAdminsList: { type: Array },
newBannedList: { type: Array },
@@ -77,6 +79,7 @@ class GroupManagement extends LitElement {
toInviteMemberToGroup: { type: String },
toCancelInviteMemberName: { type: String },
toCancelInviteMemberAddress: { type: String },
+ searchGroupName: { type: String },
errorMessage: { type: String },
successMessage: { type: String }
}
@@ -410,6 +413,13 @@ class GroupManagement extends LitElement {
background: var(--white);
color: var(--black);
}
+
+ #search {
+ width: 100%;
+ display: flex;
+ margin: auto;
+ align-items: center;
+ }
`
}
@@ -418,8 +428,10 @@ class GroupManagement extends LitElement {
this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
this.selectedAddress = {}
this.publicGroups = []
+ this.privateGroups = []
this.joinedGroups = []
this.groupInvites = []
+ this.privateGroupSearch = []
this.newMembersList = []
this.newAdminsList = []
this.newBannedList = []
@@ -458,6 +470,7 @@ class GroupManagement extends LitElement {
this.toInviteMemberToGroup = ''
this.toCancelInviteMemberName = ''
this.toCancelInviteMemberAddress = ''
+ this.searchGroupName = ''
this.errorMessage = ''
this.successMessage = ''
this.selectedView = { id: 'group-members', name: 'Group Members' }
@@ -1136,6 +1149,45 @@ class GroupManagement extends LitElement {
${translate("grouppage.gchange59")}: ${this.walletBalance} QORT
- -${translate("grouppage.gchange61")}: 0.001 QORT
+${translate("chatpage.cchange47")}: ${this.walletBalance} QORT
+ +${translate("chatpage.cchange49")}: 0.001 QORT
${this.sendMoneyLoading ? html`
+
+
+ {
+ if (data.item.isOpen === true) {
+ render(html`${translate("managegroup.mg44")}`, root)
+ } else {
+ render(html`${translate("managegroup.mg45")}`, root)
+ }
+ }}>
+ {
+ render(html` this.joinGroup(data.item)}>queue ${translate("grouppage.gchange51")} `, root)
+ }}>
+
+
+
${translate("grouppage.gchange55")}
+
+
+
+
+
+
+
+
${translate("grouppage.gchange3")}
+ ${translate("grouppage.gchange8")}
+
`: ''}
+ ${translate("managegroup.mg35")}
+
`: ''}
+ warning
+
+
+