`
+ return html``
} else {
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`
+ ${this.nameText}
+
+ ${this._dialogUpdateName2}
+
+ ${this.newNameText}
+
+ ${this._dialogUpdateName3}
+ `
+ }
+
+ set dialogUpdateName1(dialogUpdateName1) {
+ this._dialogUpdateName1 = dialogUpdateName1
+ }
+
+ set dialogUpdateName2(dialogUpdateName2) {
+ this._dialogUpdateName2 = dialogUpdateName2
+ }
+
+ set dialogUpdateName3(dialogUpdateName3) {
+ this._dialogUpdateName3 = dialogUpdateName3
+ }
+
+ set fee(fee) {
+ this._fee = fee * QORT_DECIMALS
+ this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
+ }
+
+ set name(name) {
+ this.nameText = name
+ this._nameBytes = this.constructor.utils.stringtoUTF8Array(name)
+ this._nameLength = this.constructor.utils.int32ToBytes(this._nameBytes.length)
+ }
+
+ set newName(newName) {
+ this.newNameText = newName
+ this._newNameBytes = this.constructor.utils.stringtoUTF8Array(newName)
+ this._newNameLength = this.constructor.utils.int32ToBytes(this._newNameBytes.length)
+ }
+
+ set newData(newData) {
+ this.newDataText = newData.length === 0 ? "Registered Name on the Qortal Chain" : newData
+ this._newDataBytes = this.constructor.utils.stringtoUTF8Array(this.newDataText)
+ this._newDataLength = this.constructor.utils.int32ToBytes(this._newDataBytes.length)
+ }
+
+ get params() {
+ const params = super.params
+ params.push(
+ this._nameLength,
+ this._nameBytes,
+ this._newNameLength,
+ this._newNameBytes,
+ this._newDataLength,
+ this._newDataBytes,
+ this._feeBytes
+ )
+ return params
+ }
+}
\ No newline at end of file
diff --git a/qortal-ui-crypto/api/transactions/transactions.js b/qortal-ui-crypto/api/transactions/transactions.js
index 16b7b09b..9fa87e99 100644
--- a/qortal-ui-crypto/api/transactions/transactions.js
+++ b/qortal-ui-crypto/api/transactions/transactions.js
@@ -1,5 +1,6 @@
import PaymentTransaction from './PaymentTransaction.js'
import RegisterNameTransaction from './names/RegisterNameTransaction.js'
+import UpdateNameTransaction from './names/UpdateNameTransaction.js'
import SellNameTransacion from './names/SellNameTransacion.js'
import CancelSellNameTransacion from './names/CancelSellNameTransacion.js'
import BuyNameTransacion from './names/BuyNameTransacion.js'
@@ -25,6 +26,7 @@ import TransferPrivsTransaction from './TransferPrivsTransaction.js'
export const transactionTypes = {
2: PaymentTransaction,
3: RegisterNameTransaction,
+ 4: UpdateNameTransaction,
5: SellNameTransacion,
6: CancelSellNameTransacion,
7: BuyNameTransacion,
diff --git a/qortal-ui-crypto/package.json b/qortal-ui-crypto/package.json
index 8495143d..cae726c6 100644
--- a/qortal-ui-crypto/package.json
+++ b/qortal-ui-crypto/package.json
@@ -1,6 +1,6 @@
{
"name": "qortal-ui-crypto",
- "version": "3.0.0",
+ "version": "3.1.0",
"description": "Qortal Project - decentralize the world - Data storage, communications, web hosting, decentralized trading, complete infrastructure for the future blockchain-based Internet",
"keywords": [
"QORT",
@@ -23,6 +23,6 @@
"lodash": "4.17.21"
},
"engines": {
- "node": ">=16.17.1"
+ "node": ">=18.12.1"
}
-}
+}
\ No newline at end of file
diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json
index 19a1297e..759a24e6 100644
--- a/qortal-ui-plugins/package.json
+++ b/qortal-ui-plugins/package.json
@@ -1,6 +1,6 @@
{
"name": "qortal-ui-plugins",
- "version": "3.0.0",
+ "version": "3.1.0",
"description": "Qortal Project - decentralize the world - Data storage, communications, web hosting, decentralized trading, complete infrastructure for the future blockchain-based Internet",
"keywords": [
"QORT",
@@ -20,28 +20,28 @@
"@lit-labs/motion": "1.0.3",
"@material/mwc-list": "0.27.0",
"@material/mwc-select": "0.27.0",
- "@tiptap/pm": "2.0.0-beta.212",
- "@tiptap/core": "2.0.0-beta.212",
- "@tiptap/extension-highlight": "2.0.0-beta.212",
- "@tiptap/extension-image": "2.0.0-beta.212",
- "@tiptap/extension-placeholder": "2.0.0-beta.212",
- "@tiptap/extension-underline": "2.0.0-beta.212",
- "@tiptap/html": "2.0.0-beta.212",
- "@tiptap/starter-kit": "2.0.0-beta.212",
+ "@tiptap/pm": "2.0.0-beta.217",
+ "@tiptap/core": "2.0.0-beta.217",
+ "@tiptap/extension-highlight": "2.0.0-beta.217",
+ "@tiptap/extension-image": "2.0.0-beta.217",
+ "@tiptap/extension-placeholder": "2.0.0-beta.217",
+ "@tiptap/extension-underline": "2.0.0-beta.217",
+ "@tiptap/html": "2.0.0-beta.217",
+ "@tiptap/starter-kit": "2.0.0-beta.217",
"asmcrypto.js": "2.3.2",
"compressorjs": "1.1.1",
"emoji-picker-js": "https://github.com/Qortal/emoji-picker-js",
"localforage": "1.10.0",
"prosemirror-commands": "1.5.0",
- "prosemirror-dropcursor": "1.6.1",
+ "prosemirror-dropcursor": "1.7.0",
"prosemirror-gapcursor": "1.3.1",
"prosemirror-history": "1.3.0",
- "prosemirror-keymap": "1.2.0",
- "prosemirror-model": "1.18.3",
+ "prosemirror-keymap": "1.2.1",
+ "prosemirror-model": "1.19.0",
"prosemirror-schema-list": "1.2.2",
"prosemirror-state": "1.4.2",
- "prosemirror-transform": "1.7.0",
- "prosemirror-view": "1.29.1",
+ "prosemirror-transform": "1.7.1",
+ "prosemirror-view": "1.30.1",
"short-unique-id": "4.4.4"
},
"devDependencies": {
@@ -76,19 +76,21 @@
"@vaadin/grid": "23.3.7",
"@vaadin/icons": "23.3.7",
"@vaadin/tooltip": "23.3.7",
+ "axios": "1.3.3",
"epml": "0.3.3",
"file-saver": "2.0.5",
"highcharts": "10.3.3",
"html-escaper": "3.0.3",
"lit": "2.6.1",
"lit-translate": "2.0.1",
- "rollup": "3.14.0",
+ "passive-events-support": "1.0.33",
+ "rollup": "3.15.0",
"rollup-plugin-node-globals": "1.4.0",
"rollup-plugin-progress": "1.1.2",
- "rollup-plugin-web-worker-loader": "1.6.1",
- "passive-events-support": "1.0.33"
+ "rollup-plugin-web-worker-loader": "1.6.1"
+
},
"engines": {
- "node": ">=16.17.1"
+ "node": ">=18.12.1"
}
-}
+}
\ No newline at end of file
diff --git a/qortal-ui-plugins/plugins/core/components/ChatHead.js b/qortal-ui-plugins/plugins/core/components/ChatHead.js
index c28a583f..61a30fb2 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatHead.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatHead.js
@@ -1,11 +1,15 @@
import { LitElement, html, css } from 'lit'
import { render } from 'lit/html.js'
import { Epml } from '../../../epml.js'
+import localForage from "localforage";
+import { translate} from 'lit-translate';
import '@material/mwc-icon'
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
-
+const chatLastSeen = localForage.createInstance({
+ name: "chat-last-seen",
+});
class ChatHead extends LitElement {
static get properties() {
return {
@@ -15,7 +19,8 @@ class ChatHead extends LitElement {
iconName: { type: String },
activeChatHeadUrl: { type: String },
isImageLoaded: { type: Boolean },
- setActiveChatHeadUrl: {attribute: false}
+ setActiveChatHeadUrl: {attribute: false},
+ lastReadMessageTimestamp: {type: Number}
}
}
@@ -24,9 +29,13 @@ class ChatHead extends LitElement {
li {
width: 100%;
- padding: 7px 5px 7px 5px;
+ padding: 10px 5px 10px 5px;
cursor: pointer;
width: 100%;
+ box-sizing: border-box;
+ display: flex;
+ align-items: flex-start;
+
}
li:hover {
@@ -44,12 +53,21 @@ class ChatHead extends LitElement {
color: var(--chat-group);
}
- .about {
- margin-top: 8px;
- }
+
.about {
- padding-left: 8px;
+
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ margin: 0px;
+ }
+ .inner-container {
+ display: flex;
+ width: calc(100% - 45px);
+ flex-direction: column;
+ justify-content: center;
}
.status {
@@ -64,6 +82,13 @@ class ChatHead extends LitElement {
clear: both;
height: 0;
}
+
+ .name {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ }
`
}
@@ -82,9 +107,11 @@ class ChatHead extends LitElement {
this.activeChatHeadUrl = ''
this.isImageLoaded = false
this.imageFetches = 0
+ this.lastReadMessageTimestamp = 0
+ this.loggedInAddress = window.parent.reduxStore.getState().app.selectedAddress.address
}
- createImage(imageUrl) {
+ createImage(imageUrl) {
const imageHTMLRes = new Image();
imageHTMLRes.src = imageUrl;
imageHTMLRes.style= "width:40px; height:40px; float: left; border-radius:50%";
@@ -99,7 +126,7 @@ class ChatHead extends LitElement {
setTimeout(() => {
this.imageFetches = this.imageFetches + 1;
imageHTMLRes.src = imageUrl;
- }, 500);
+ }, 750);
} else {
@@ -109,32 +136,61 @@ class ChatHead extends LitElement {
return imageHTMLRes;
}
+
+
render() {
let avatarImg = '';
let backupAvatarImg = ''
+ let isUnread = false
+
if(this.chatInfo.name){
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
const avatarUrl = `${nodeUrl}/arbitrary/THUMBNAIL/${this.chatInfo.name}/qortal_avatar?async=true&apiKey=${myNode.apiKey}`;
avatarImg= this.createImage(avatarUrl)
-
}
+ if(this.lastReadMessageTimestamp && this.chatInfo.timestamp){
+ if(this.lastReadMessageTimestamp < this.chatInfo.timestamp){
+ isUnread = true
+ }
+ }
+
+ if(this.activeChatHeadUrl === this.chatInfo.url){
+ isUnread = false
+ }
+
+ if(this.chatInfo.sender === this.loggedInAddress){
+ isUnread = false
+ }
return html`
${this.chatInfo.name.charAt(0)}
`: ''}
- ${!this.isImageLoaded && this.chatInfo.groupName ? html`${this.chatInfo.groupName.charAt(0)}
`: ''}
+ ${!this.isImageLoaded && this.chatInfo.name ? html`${this.chatInfo.name.charAt(0)}
`: ''}
+ ${!this.isImageLoaded && this.chatInfo.groupName ? html`${this.chatInfo.groupName.charAt(0)}
`: ''}
+
-
+ ${this.chatInfo.groupName ? this.chatInfo.groupName : this.chatInfo.name !== undefined ? this.chatInfo.name : this.chatInfo.address.substr(0, 15)} ${this.chatInfo.groupId !== undefined ? 'lock_open' : 'lock'}
+ ${this.chatInfo.groupName ? this.chatInfo.groupName : this.chatInfo.name !== undefined ? this.chatInfo.name : this.chatInfo.address.substr(0, 15)} ${this.chatInfo.groupId !== undefined ? 'lock_open' : 'lock'}
+
+
+
+
+
+
+
-
- - ${this.isDeletingImage ? - translate("chatpage.cchange31") : translate("chatpage.cchange30")} -
-+ ${this.isDeletingImage ? + translate("chatpage.cchange31") : translate("chatpage.cchange30")} +
+ + + + + `: ''} + ${(this.isUploadingAttachment || this.isDeletingAttachment) ? html` +
+
+
+ `: ''}
+
+
+
+
+ + ${this.isDeletingAttachment ? + translate("chatpage.cchange76") : translate("chatpage.cchange75")} +
+
${this.imageFile && html`
@@ -1091,7 +1134,7 @@ class ChatPage extends LitElement {
placeholder=${this.chatEditorPlaceholder}
._sendMessage=${this._sendMessage}
.imageFile=${this.imageFile}
- .insertImage=${this.insertImage}
+ .insertFile=${this.insertFile}
.editedMessageObj=${this.editedMessageObj}
?isLoading=${this.isLoading}
?isLoadingMessages=${this.isLoadingMessages}
@@ -1114,7 +1157,6 @@ class ChatPage extends LitElement {
const chatTextEditor = this.shadowRoot.getElementById('chatTextCaption')
chatTextEditor.sendMessageFunc({
type: 'image',
- imageFile: this.imageFile,
})
}}
>
@@ -1124,6 +1166,58 @@ class ChatPage extends LitElement {
+
+
+ ${this.attachment && html`
+
+
+ 
+
+ `}
+
+
+
+ this.updatePlaceholder(editor, value)}
+ >
+
+
+
+ ${translate("chatpage.cchange41")}
@@ -1346,11 +1440,12 @@ class ChatPage extends LitElement { super.connectedCallback(); await this.initUpdate() this.webWorker = new WebWorker(); - this.webWorkerImage = new WebWorkerImage(); + this.webWorkerFile = new WebWorkerFile(); await this.getUpdateCompleteTextEditor(); - const elementChatId = this.shadowRoot.getElementById('_chatEditorDOM').shadowRoot.getElementById('_chatEditorDOM') - const elementChatImageId = this.shadowRoot.getElementById('chatTextCaption').shadowRoot.getElementById('newChat') + const elementChatId = this.shadowRoot.getElementById('_chatEditorDOM').shadowRoot.getElementById('_chatEditorDOM'); + const elementChatImageId = this.shadowRoot.getElementById('chatTextCaption').shadowRoot.getElementById('newChat'); + const elementChatAttachmentId = this.shadowRoot.getElementById('chatAttachmentId').shadowRoot.getElementById('newAttachmentChat'); this.editor = new Editor({ onUpdate: ()=> { this.shadowRoot.getElementById('_chatEditorDOM').getMessageSize(this.editor.getJSON()) @@ -1407,11 +1502,37 @@ class ChatPage extends LitElement { Extension.create({ addKeyboardShortcuts:()=> { return { - 'Enter':()=> { + 'Enter':() => { const chatTextEditor = this.shadowRoot.getElementById('chatTextCaption') chatTextEditor.sendMessageFunc({ - type: 'image', - imageFile: this.imageFile, + type: 'image' + }) + return true + } + } + }}) + ] + }) + + this.editorAttachment = new Editor({ + onUpdate: () => { + this.shadowRoot.getElementById('chatAttachmentId').getMessageSize(this.editorAttachment.getJSON()) + }, + element: elementChatAttachmentId, + extensions: [ + StarterKit, + Underline, + Highlight, + Placeholder.configure({ + placeholder: 'Write something …', + }), + Extension.create({ + addKeyboardShortcuts:()=> { + return { + 'Enter':()=> { + const chatTextEditor = this.shadowRoot.getElementById('chatAttachmentId') + chatTextEditor.sendMessageFunc({ + type: 'attachment' }) return true } @@ -1421,6 +1542,12 @@ class ChatPage extends LitElement { }) document.addEventListener('keydown', this.initialChat); document.addEventListener('paste', this.pasteImage); + if(this.chatId){ + window.parent.reduxStore.dispatch( window.parent.reduxAction.addChatLastSeen({ + key: this.chatId, + timestamp: Date.now() + })) + } } disconnectedCallback() { @@ -1444,10 +1571,18 @@ class ChatPage extends LitElement { document.removeEventListener('keydown', this.initialChat); document.removeEventListener('paste', this.pasteImage); + if(this.chatId){ + window.parent.reduxStore.dispatch( window.parent.reduxAction.addChatLastSeen({ + key: this.chatId, + timestamp: Date.now() + })) + + } + } initialChat(e) { - if (this.editor && !this.editor.isFocused && this.currentEditor === '_chatEditorDOM' && !this.openForwardOpen && !this.openTipUser) { + if (this.editor && !this.editor.isFocused && this.currentEditor === '_chatEditorDOM' && !this.openForwardOpen && !this.openTipUser) { // WARNING: Deprecated methods from KeyBoard Event if (e.code === "Space" || e.keyCode === 32 || e.which === 32) { } else if (inputKeyCodes.includes(e.keyCode)) { @@ -1465,9 +1600,7 @@ class ChatPage extends LitElement { const handleTransferIntoURL = (dataTransfer) => { try { const [firstItem] = dataTransfer.items; - console.log({firstItem}); const blob = firstItem.getAsFile(); - console.log({blob}); return blob; } catch (error) { console.log(error); @@ -1498,7 +1631,7 @@ class ChatPage extends LitElement { this.insertImage(file); } catch (error) { console.error(error); - let errorMsg = get("chatpage.cchange70") + let errorMsg = get("chatpage.cchange81") parentEpml.request('showSnackBar', `${errorMsg}`) } } else { @@ -1636,19 +1769,29 @@ class ChatPage extends LitElement { } - insertImage(file) { + insertFile(file) { if (file.type.includes('image')) { this.imageFile = file; - this.currentEditor = 'newChat' + this.currentEditor = 'newChat'; return; - } - parentEpml.request('showSnackBar', get("chatpage.cchange28")); + } else { + this.attachment = file; + this.currentEditor = "newAttachmentChat"; + return; + } + // parentEpml.request('showSnackBar', get("chatpage.cchange28")); } removeImage() { this.imageFile = null; - this.resetChatEditor() - this.currentEditor = '_chatEditorDOM' + this.resetChatEditor(); + this.currentEditor = '_chatEditorDOM'; + } + + removeAttachment() { + this.attachment = null; + this.resetChatEditor(); + this.currentEditor = '_chatEditorDOM'; } changeMsgInput(id) { @@ -1805,7 +1948,6 @@ class ChatPage extends LitElement { this.editor.setEditable(true) } } - } async getName (recipient) { @@ -2175,7 +2317,13 @@ class ChatPage extends LitElement { await this.renderNewMessage(msg) }) await Promise.all(renderEachMessage) - + if(this.chatId){ + window.parent.reduxStore.dispatch( window.parent.reduxAction.addChatLastSeen({ + key: this.chatId, + timestamp: Date.now() + })) + + } // this.newMessages = this.newMessages.concat(_newMessages) this.messagesRendered = [...this.messagesRendered].sort(function (a, b) { return a.timestamp @@ -2501,6 +2649,9 @@ class ChatPage extends LitElement { if(this.currentEditor === 'newChat'){ this.editorImage.commands.setContent('') } + if(this.currentEditor === 'newAttachmentChat'){ + this.editorAttachment.commands.setContent('') + } } async _sendMessage(outSideMsg, msg) { @@ -2543,6 +2694,7 @@ class ChatPage extends LitElement { // find specific object property in local let typeMessage = 'regular'; let workerImage; + let workerAttachment; this.isLoading = true; const trimmedMessage = msg @@ -2571,62 +2723,152 @@ class ChatPage extends LitElement { let compressedFile = '' var str = "iVBORw0KGgoAAAANSUhEUgAAAsAAAAGMAQMAAADuk4YmAAAAA1BMVEX///+nxBvIAAAAAXRSTlMAQObYZgAAADlJREFUeF7twDEBAAAAwiD7p7bGDlgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAGJrAABgPqdWQAAAABJRU5ErkJggg=="; - if (this.webWorkerImage) { - workerImage = this.webWorkerImage; + if (this.webWorkerFile) { + workerImage = this.webWorkerFile; } else { - this.webWorkerImage = new WebWorkerImage(); + this.webWorkerFile = new WebWorkerFile(); } - const b64toBlob = (b64Data, contentType='', sliceSize=512) => { - const byteCharacters = atob(b64Data); - const byteArrays = []; - - for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) { - const slice = byteCharacters.slice(offset, offset + sliceSize); - - const byteNumbers = new Array(slice.length); - for (let i = 0; i < slice.length; i++) { - byteNumbers[i] = slice.charCodeAt(i); + const b64toBlob = (b64Data, contentType='', sliceSize=512) => { + const byteCharacters = atob(b64Data); + const byteArrays = []; + + for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) { + const slice = byteCharacters.slice(offset, offset + sliceSize); + + const byteNumbers = new Array(slice.length); + for (let i = 0; i < slice.length; i++) { + byteNumbers[i] = slice.charCodeAt(i); + } + + const byteArray = new Uint8Array(byteNumbers); + byteArrays.push(byteArray); + } + + const blob = new Blob(byteArrays, {type: contentType}); + return blob; + } + const blob = b64toBlob(str, 'image/png'); + await new Promise(resolve => { + new Compressor(blob, { + quality: 0.6, + maxWidth: 500, + success(result) { + const file = new File([result], "name", { + type: 'image/png' + }); + + compressedFile = file; + resolve(); + }, + error(err) { + console.log(err.message); + }, + }) + }) + try { + await publishData({ + registeredName: userName, + file : compressedFile, + service: 'QCHAT_IMAGE', + identifier: identifier, + parentEpml, + metaData: undefined, + uploadType: 'file', + selectedAddress: this.selectedAddress, + worker: workerImage + }) + this.isDeletingImage = false + } catch (error) { + this.isLoading = false; + return + } + typeMessage = 'edit'; + let chatReference = outSideMsg.editedMessageObj.reference; + + if(outSideMsg.editedMessageObj.chatReference){ + chatReference = outSideMsg.editedMessageObj.chatReference; } - const byteArray = new Uint8Array(byteNumbers); - byteArrays.push(byteArray); + let message = ""; + try { + const parsedMessageObj = JSON.parse(outSideMsg.editedMessageObj.decodedMessage); + message = parsedMessageObj; + + } catch (error) { + message = outSideMsg.editedMessageObj.decodedMessage; } - - const blob = new Blob(byteArrays, {type: contentType}); - return blob; - } - const blob = b64toBlob(str, 'image/png'); - await new Promise(resolve => { - new Compressor(blob, { - quality: 0.6, - maxWidth: 500, - success(result) { - const file = new File([result], "name", { - type: 'image/png' - }); - - compressedFile = file; - resolve(); - }, - error(err) { - console.log(err.message); - }, + const messageObject = { + ...message, + isImageDeleted: true + } + const stringifyMessageObject = JSON.stringify(messageObject); + this.sendMessage(stringifyMessageObject, typeMessage, chatReference); + } else if (outSideMsg && outSideMsg.type === 'deleteAttachment') { + this.isDeletingAttachment = true; + let compressedFile = '' + var str = "iVBORw0KGgoAAAANSUhEUgAAAsAAAAGMAQMAAADuk4YmAAAAA1BMVEX///+nxBvIAAAAAXRSTlMAQObYZgAAADlJREFUeF7twDEBAAAAwiD7p7bGDlgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAGJrAABgPqdWQAAAABJRU5ErkJggg=="; + const userName = outSideMsg.name; + const identifier = outSideMsg.identifier; + + if (this.webWorkerFile) { + workerAttachment = this.webWorkerFile; + } else { + this.webWorkerFile = new WebWorkerFile(); + } + + const b64toBlob = (b64Data, contentType='', sliceSize=512) => { + const byteCharacters = atob(b64Data); + const byteArrays = []; + + for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) { + const slice = byteCharacters.slice(offset, offset + sliceSize); + + const byteNumbers = new Array(slice.length); + for (let i = 0; i < slice.length; i++) { + byteNumbers[i] = slice.charCodeAt(i); + } + + const byteArray = new Uint8Array(byteNumbers); + byteArrays.push(byteArray); + } + + const blob = new Blob(byteArrays, {type: contentType}); + return blob; + } + + const blob = b64toBlob(str, 'image/png'); + await new Promise(resolve => { + new Compressor(blob, { + quality: 0.6, + maxWidth: 500, + success(result) { + const file = new File([result], "name", { + type: 'image/png' + }); + + compressedFile = file; + resolve(); + }, + error(err) { + console.log(err.message); + }, + }) }) - }) + try { await publishData({ registeredName: userName, - file : compressedFile, - service: 'QCHAT_IMAGE', + file: compressedFile, + service: 'QCHAT_ATTACHMENT', identifier: identifier, parentEpml, metaData: undefined, uploadType: 'file', selectedAddress: this.selectedAddress, - worker: workerImage - }) - this.isDeletingImage = false + worker: workerAttachment + }) + this.isDeletingAttachment = false } catch (error) { this.isLoading = false; return @@ -2637,7 +2879,7 @@ class ChatPage extends LitElement { if(outSideMsg.editedMessageObj.chatReference){ chatReference = outSideMsg.editedMessageObj.chatReference; } - + let message = ""; try { const parsedMessageObj = JSON.parse(outSideMsg.editedMessageObj.decodedMessage); @@ -2648,14 +2890,11 @@ class ChatPage extends LitElement { } const messageObject = { ...message, - isImageDeleted: true + isAttachmentDeleted: true } const stringifyMessageObject = JSON.stringify(messageObject); this.sendMessage(stringifyMessageObject, typeMessage, chatReference); - - - } - else if (outSideMsg && outSideMsg.type === 'image') { + } else if (outSideMsg && outSideMsg.type === 'image') { this.isUploadingImage = true; const userName = await getName(this.selectedAddress.address); if (!userName) { @@ -2666,10 +2905,10 @@ class ChatPage extends LitElement { return; } - if (this.webWorkerImage) { - workerImage = this.webWorkerImage; + if (this.webWorkerFile) { + workerImage = this.webWorkerFile; } else { - this.webWorkerImage = new WebWorkerImage(); + this.webWorkerFile = new WebWorkerFile(); } const image = this.imageFile @@ -2679,7 +2918,7 @@ class ChatPage extends LitElement { await new Promise(resolve => { new Compressor( image, { quality: .6, - maxWidth: 500, + maxWidth: 1200, success(result){ const file = new File([result], "name", { type: image.type @@ -2699,41 +2938,101 @@ class ChatPage extends LitElement { this.isUploadingImage = false; return; } - try { - await publishData({ - registeredName: userName, - file : compressedFile, - service: 'QCHAT_IMAGE', - identifier : identifier, - parentEpml, - metaData: undefined, - uploadType: 'file', - selectedAddress: this.selectedAddress, - worker: workerImage - }); + try { + await publishData({ + registeredName: userName, + file : compressedFile, + service: 'QCHAT_IMAGE', + identifier : identifier, + parentEpml, + metaData: undefined, + uploadType: 'file', + selectedAddress: this.selectedAddress, + worker: workerImage + }); + this.isUploadingImage = false; + this.removeImage(); + } catch (error) { + console.error(error); + this.isLoading = false; this.isUploadingImage = false; - this.removeImage() - } catch (error) { - this.isLoading = false; - this.isUploadingImage = false; - return; - } + return; + } - - - const messageObject = { - messageText: trimmedMessage, - images: [{ - service: "QCHAT_IMAGE", - name: userName, - identifier: identifier - }], - isImageDeleted: false, - repliedTo: '', - version: 3 - }; - const stringifyMessageObject = JSON.stringify(messageObject); - this.sendMessage(stringifyMessageObject, typeMessage); + const messageObject = { + messageText: trimmedMessage, + images: [{ + service: "QCHAT_IMAGE", + name: userName, + identifier: identifier + }], + isImageDeleted: false, + repliedTo: '', + version: 2 + }; + const stringifyMessageObject = JSON.stringify(messageObject); + this.sendMessage(stringifyMessageObject, typeMessage); + } + else if (outSideMsg && outSideMsg.type === 'attachment') { + this.isUploadingAttachment = true; + const userName = await getName(this.selectedAddress.address); + if (!userName) { + parentEpml.request('showSnackBar', get("chatpage.cchange27")); + this.isLoading = false; + return; + } + + if (this.webWorkerFile) { + workerAttachment = this.webWorkerFile; + } else { + this.webWorkerFile = new WebWorkerFile(); + } + + const attachment = this.attachment; + const id = this.uid(); + const identifier = `qchat_${id}`; + const fileSize = attachment.size; + if (fileSize > 1000000) { + parentEpml.request('showSnackBar', get("chatpage.cchange77")); + this.isLoading = false; + this.isUploadingAttachment = false; + return; + } + try { + await publishData({ + registeredName: userName, + file : attachment, + service: 'QCHAT_ATTACHMENT', + identifier : identifier, + parentEpml, + metaData: undefined, + uploadType: 'file', + selectedAddress: this.selectedAddress, + worker: workerAttachment + }); + this.isUploadingAttachment = false; + this.removeAttachment(); + } catch (error) { + console.error(error); + this.isLoading = false; + this.isUploadingAttachment = false; + return; + } + const messageObject = { + messageText: trimmedMessage, + attachments: [{ + service: 'QCHAT_ATTACHMENT', + name: userName, + identifier: identifier, + attachmentName: attachment.name, + attachmentSize: attachment.size + }], + isAttachmentDeleted: false, + repliedTo: '', + version: 2 + }; + const stringifyMessageObject = JSON.stringify(messageObject); + this.sendMessage(stringifyMessageObject, typeMessage); } else if (outSideMsg && outSideMsg.type === 'reaction') { const userName = await getName(this.selectedAddress.address); typeMessage = 'edit'; diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js index bbe4778a..629f2a26 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js +++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js @@ -86,6 +86,7 @@ export const chatStyles = css` font-size: 13px; user-select: none; display: flex; + justify-content: space-between; width: 100%; padding-top: 2px; } @@ -97,6 +98,7 @@ export const chatStyles = css` font-size: 13px; user-select: none; display: flex; + justify-content: space-between; width: 100%; padding-top: 2px; } @@ -644,6 +646,7 @@ export const chatStyles = css` white-space: pre-wrap; margin: 0px; } + .replied-message pre code { color: inherit; padding: 0; @@ -651,12 +654,10 @@ export const chatStyles = css` font-size: 0.8rem; } - .replied-message img { width: 1.7em; height: 1.5em; margin: 0px; - } .replied-message blockquote { @@ -670,6 +671,79 @@ export const chatStyles = css` margin: 2rem 0; } + .attachment-container { + display: flex; + align-items: center; + justify-content: space-evenly; + padding: 5px 0 10px 0; + gap: 20px; + cursor: pointer; + } + + + .attachment-icon-container { + display: flex; + align-items: center; + justify-content: center; + height: 50px; + width: 50px; + border-radius: 50%; + border: none; + background-color: var(--mdc-theme-primary); + } + + .attachment-icon { + width: 70%; + } + + .attachment-info { + display: flex; + flex-direction: column; + gap: 5px; + } + + .attachment-name { + font-family: Work Sans, sans-serif; + font-size: 16px; + color: var(--chat-bubble-msg-color); + margin: 0; + letter-spacing: 0.4px; + padding: 5px 0; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .attachment-size { + font-family: Roboto, sans-serif; + font-size: 16px; + color: var(--chat-bubble-msg-color); + margin: 0; + letter-spacing: 0.3px; + font-weight: 300; + } + + .download-icon { + position: relative; + color: var(--chat-bubble-msg-color); + width: 19px; + background-color: transparent; + } + + .download-icon:hover::before { + background-color: rgb(161 158 158 / 41%); + } + + + .download-icon::before { + content: ""; + position: absolute; + border-radius: 50%; + padding: 18px; + background-color: transparent; + transition: all 0.3s ease-in-out; + } + .edited-message-style { font-family: "Work Sans", sans-serif; font-style: italic; diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js index cff2e0b5..4a6e7111 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js +++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js @@ -6,6 +6,7 @@ import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import { chatStyles } from './ChatScroller-css.js' import { Epml } from "../../../epml"; import { cropAddress } from "../../utils/cropAddress"; +import { roundToNearestDecimal } from '../../utils/roundToNearestDecimal.js'; import './LevelFounder.js'; import './NameMenu.js'; import './ChatModals.js'; @@ -18,7 +19,9 @@ import '@material/mwc-button'; import '@material/mwc-dialog'; import '@material/mwc-icon'; import { EmojiPicker } from 'emoji-picker-js'; -import { generateHTML } from '@tiptap/core' +import { generateHTML } from '@tiptap/core'; +import { saveAs } from 'file-saver'; +import axios from "axios"; import StarterKit from '@tiptap/starter-kit' import Underline from '@tiptap/extension-underline'; import Highlight from '@tiptap/extension-highlight' @@ -82,7 +85,6 @@ class ChatScroller extends LitElement { let timestamp; let sender; let repliedToData; - let firstMessageInChat; if (index === 0) { @@ -281,6 +283,7 @@ class MessageTemplate extends LitElement { sendMessageForward: { attribute: false }, openDialogImage: { attribute: false }, openDeleteImage: { type: Boolean }, + openDeleteAttachment: { type: Boolean }, isImageLoaded: { type: Boolean }, isFirstMessage: { type: Boolean }, isSingleMessageInGroup: { type: Boolean }, @@ -344,6 +347,22 @@ class MessageTemplate extends LitElement { } } + async downloadAttachment(attachment) { + + const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]; + + const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port; + try{ + axios.get(`${nodeUrl}/arbitrary/QCHAT_ATTACHMENT/${attachment.name}/${attachment.identifier}?apiKey=${myNode.apiKey}`, { responseType: 'blob'}) + .then(response =>{ + let filename = attachment.attachmentName; + let blob = new Blob([response.data], { type:"application/octet-stream" }); + saveAs(blob , filename); + }) + } catch (error) { + console.error(error); + } + } firstUpdated(){ const autoSeeChatList = window.parent.reduxStore.getState().app?.autoLoadImageChats if(autoSeeChatList.includes(this.chatId) || this.listSeenMessages.includes(this.messageObj.signature)){ @@ -366,9 +385,11 @@ class MessageTemplate extends LitElement { let repliedToData = null; let image = null; let isImageDeleted = false; + let isAttachmentDeleted = false; let version = 0; let isForwarded = false let isEdited = false + let attachment = null; try { const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage); console.log({parsedMessageObj}, +parsedMessageObj.version, +parsedMessageObj.version > 1) @@ -384,10 +405,14 @@ class MessageTemplate extends LitElement { message = parsedMessageObj.messageText; repliedToData = this.messageObj.repliedToData; isImageDeleted = parsedMessageObj.isImageDeleted; + isAttachmentDeleted = parsedMessageObj.isAttachmentDeleted; reactions = parsedMessageObj.reactions || []; version = parsedMessageObj.version; isForwarded = parsedMessageObj.type === 'forward'; isEdited = parsedMessageObj.isEdited && true; + if (parsedMessageObj.attachments && Array.isArray(parsedMessageObj.attachments) && parsedMessageObj.attachments.length > 0) { + attachment = parsedMessageObj.attachments[0]; + } if (parsedMessageObj.images && Array.isArray(parsedMessageObj.images) && parsedMessageObj.images.length > 0) { image = parsedMessageObj.images[0]; } @@ -444,12 +469,11 @@ class MessageTemplate extends LitElement { const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port; imageUrl = `${nodeUrl}/arbitrary/${image.service}/${image.name}/${image.identifier}?async=true&apiKey=${myNode.apiKey}`; - if(this.viewImage || this.myAddress === this.messageObj.sender){ + if (this.viewImage || this.myAddress === this.messageObj.sender) { imageHTML = createImage(imageUrl); imageHTMLDialog = createImage(imageUrl) imageHTMLDialog.style= "height: auto; max-height: 80vh; width: auto; max-width: 80vw; object-fit: contain; border-radius: 5px"; } - } nameMenu = html` @@ -595,10 +619,9 @@ class MessageTemplate extends LitElement { }} class=${[`image-container`, !this.isImageLoaded ? 'defaultSize' : ''].join(' ')} style=${this.isFirstMessage && "margin-top: 10px;"}> -
- ${translate("chatpage.cchange40")}
-
-
+
+ ${translate("chatpage.cchange40")}
+
` : html``}
${!this.isImageLoaded && image && this.viewImage ? html`
@@ -622,8 +645,53 @@ class MessageTemplate extends LitElement {
` : image && isImageDeleted ? html`
- This image has been deleted
+${translate("chatpage.cchange80")}
` : html``} + ${attachment && !isAttachmentDeleted ? + html` + await this.downloadAttachment(attachment)} class="attachment-container">
+
+
+ ${this.myAddress === this.messageObj.sender
+ ? html`
+ {
+ e.stopPropagation();
+ this.openDeleteAttachment = true;
+ }}
+ class="image-delete-icon" icon="vaadin:close" slot="icon">
+
+ ` : html``}
+
+ `
+ : attachment && isAttachmentDeleted ?
+ html`
+
+ `
+ : html``}
@@ -523,7 +528,7 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
html`
+
+
+
+
+
${this.isLoading === false ? html`
@@ -692,7 +697,20 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
repliedTo: '',
version: 3
};
- } else {
+ } else if (this.attachment && this.iframeId === 'newAttachmentChat') {
+ messageObject = {
+ messageText: trimmedMessage,
+ attachments: [{
+ service: "QCHAT_ATTACHMENT",
+ name: '123456789123456789123456789',
+ identifier: '123456',
+ attachmentName: "123456789123456789123456789",
+ attachmentSize: "123456"
+ }],
+ repliedTo: '',
+ version: 2
+ };
+ } else {
messageObject = {
messageText: trimmedMessage,
images: [''],
@@ -713,4 +731,4 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
}
-window.customElements.define("chat-text-editor", ChatTextEditor)
+window.customElements.define("chat-text-editor", ChatTextEditor)
\ No newline at end of file
diff --git a/qortal-ui-plugins/plugins/core/components/TimeAgo.js b/qortal-ui-plugins/plugins/core/components/TimeAgo.js
index ca3633b7..66164179 100644
--- a/qortal-ui-plugins/plugins/core/components/TimeAgo.js
+++ b/qortal-ui-plugins/plugins/core/components/TimeAgo.js
@@ -19,7 +19,7 @@ class TimeAgo extends LitElement {
updated(changedProps) {
changedProps.forEach((OldProp, name) => {
- if (name === 'timeIso') {
+ if (name === 'timeIso' || name === 'timestamp') {
this.renderTime(this.timestamp)
}
});
@@ -35,7 +35,6 @@ class TimeAgo extends LitElement {
}
render() {
-
return html`
`
diff --git a/qortal-ui-plugins/plugins/core/components/computePowWorkerImage.js b/qortal-ui-plugins/plugins/core/components/computePowWorkerFile.js
similarity index 100%
rename from qortal-ui-plugins/plugins/core/components/computePowWorkerImage.js
rename to qortal-ui-plugins/plugins/core/components/computePowWorkerFile.js
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 0148f33b..3338464c 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
@@ -22,6 +22,8 @@ import '@vaadin/icon'
import '@vaadin/icons'
import '@vaadin/grid'
import '@vaadin/grid/vaadin-grid-filter-column.js'
+import '@vaadin/grid/vaadin-grid-sort-column.js'
+import '@vaadin/text-field'
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
@@ -33,6 +35,7 @@ class GroupManagement extends LitElement {
privateGroups: { type: Array },
joinedGroups: { type: Array },
groupInvites: { type: Array },
+ filteredItems: { type: Array },
privateGroupSearch: { type: Array },
newMembersList: { type: Array },
newAdminsList: { type: Array },
@@ -111,6 +114,9 @@ class GroupManagement extends LitElement {
--_lumo-grid-secondary-border-color: var(--border2);
}
+[part="input-field"] {
+ background-color: #fff;
+}
#group-management-page {
background: var(--white);
padding: 12px 24px;
@@ -437,6 +443,7 @@ class GroupManagement extends LitElement {
this.privateGroups = []
this.joinedGroups = []
this.groupInvites = []
+ this.filteredItems = []
this.privateGroupSearch = []
this.newMembersList = []
this.newAdminsList = []
@@ -1314,8 +1321,8 @@ class GroupManagement extends LitElement {
{
render(html`${this.renderRole(data.item)}`, root)
}}>
@@ -1359,11 +1366,25 @@ class GroupManagement extends LitElement {
-
+
+
+ {
render(html` this.joinGroup(data.item)}>queue ${translate("grouppage.gchange51")} `, root)
}}>
@@ -1773,7 +1794,8 @@ class GroupManagement extends LitElement {
this.publicGroups = results
this.privateGroups = _privateGroups
this.joinedGroups = _joinedGroups
- setTimeout(getOpen_JoinedGroups, 60000)
+ this.filteredItems = this.publicGroups
+ setTimeout(getOpen_JoinedGroups, 600000)
}
window.addEventListener("contextmenu", (event) => {
diff --git a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
index 4b62cbf5..7cc835a7 100644
--- a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
+++ b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
@@ -8,6 +8,7 @@ import { Epml } from '../../../../epml.js';
import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate';
import { qchatStyles } from './q-chat-css.src.js'
import WebWorker from 'web-worker:./computePowWorker.src.js';
+import {repeat} from 'lit/directives/repeat.js';
registerTranslateConfig({
loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
@@ -28,8 +29,9 @@ import '@vaadin/grid'
import StarterKit from '@tiptap/starter-kit'
import Underline from '@tiptap/extension-underline';
import Placeholder from '@tiptap/extension-placeholder'
-import { Editor, Extension } from '@tiptap/core'
+import Highlight from '@tiptap/extension-highlight'
+import { Editor, Extension } from '@tiptap/core'
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
class Chat extends LitElement {
@@ -55,7 +57,7 @@ class Chat extends LitElement {
userFoundModalOpen: { type: Boolean },
userSelected: { type: Object },
editor: {type: Object},
- groupInvites: { type: Array }
+ groupInvites: { type: Array },
}
}
@@ -118,6 +120,7 @@ class Chat extends LitElement {
}
async connectedCallback() {
+
super.connectedCallback();
await this.getUpdateCompleteTextEditor();
@@ -147,15 +150,36 @@ class Chat extends LitElement {
}})
]
})
+
+ this.unsubscribeStore = window.parent.reduxStore.subscribe(() => {
+ try {
+
+ if(window.parent.location && window.parent.location.search){
+ const queryString = window.parent.location.search;
+ const params = new URLSearchParams(queryString);
+ const chat = params.get("chat")
+ if(chat && chat !== this.activeChatHeadUrl){
+ let url = window.parent.location.href;
+ let newUrl = url.split("?")[0];
+ window.parent.history.pushState({}, "", newUrl);
+ this.setActiveChatHeadUrl(chat)
+ }
+ }
+ } catch (error) {
+ console.error(error)
+ }
+
+ });
}
disconnectedCallback() {
super.disconnectedCallback();
- this.editor.destroy()
-
+ this.editor.destroy();
+ this.unsubscribeStore();
}
+
updatePlaceholder(editor, text){
editor.extensionManager.extensions.forEach((extension) => {
if (extension.name === "placeholder") {
@@ -215,7 +239,7 @@ class Chat extends LitElement {
@@ -367,6 +391,8 @@ class Chat extends LitElement {
`
}
+
+
async firstUpdated() {
this.changeLanguage();
this.changeTheme();
@@ -482,8 +508,11 @@ class Chat extends LitElement {
})
})
parentEpml.imReady()
+
}
+
+
setOpenPrivateMessage(props) {
this.openPrivateMessage = props.open;
this.shadowRoot.getElementById("sendTo").value = props.name
@@ -829,17 +858,14 @@ class Chat extends LitElement {
}
renderChatHead(chatHeadArr) {
-
- let tempUrl = document.location.href
- let splitedUrl = decodeURI(tempUrl).split('?')
- // let activeChatHeadUrl = splitedUrl[1] === undefined ? '' : splitedUrl[1]
-
+
return chatHeadArr.map(eachChatHead => {
return html`${translate("grouppage.gchange3")}
${translate("grouppage.gchange9")}
-+
- ${window.parent.location.pathname !== "/app/q-chat" || this.activeChatHeadUrl ? html`${this.renderChatPage(this.chatId)}` : html`${this.renderChatWelcomePage()}`}
+ ${this.activeChatHeadUrl ? html`${this.renderChatPage()}` : html`${this.renderChatWelcomePage()}`}
+
+
+
+
+ {
+ if (data.item.owner === this.selectedAddress.address) {
+ render(html`${this.renderCancelSellNameButton(data.item)}`, root)
+ } else {
+ render(html`${this.renderBuyNameButton(data.item)}`, root)
+ }
+ }}>
+
+
+ ${this.isEmptyArray(this.marketSellNames) ? html`
+ ${translate("registernamepage.nchange24")}
+ `: ''}
+
-
${translate("registernamepage.nchange22")}
++
${translate("registernamepage.nchange9")}
@@ -161,6 +360,204 @@ class NameRegistration extends LitElement { ${translate("general.close")}
+
+
+
+
+
+ ${translate("registernamepage.nchange19")}
++
+
+
+
+
+
+ ${this.renderClearSuccess()}
+ ${this.renderClearError()}
+ ${this.isLoading ? html`${translate("walletpage.wchange21")} ${this.sellFee} QORT
++
+
+
+
+
+
+ ${translate("registernamepage.nchange20")} ${translate("registernamepage.nchange5")}
++
+
+
+
+
+ ${this.renderClearSuccess()}
+ ${this.renderClearError()}
+ ${this.isLoading ? html`${translate("walletpage.wchange21")} ${this.cancelSellFee} QORT
++
+
+
+
+
+
+ ${translate("registernamepage.nchange21")}
++
+
+
+
+
+
+
+ ${this.renderClearSuccess()}
+ ${this.renderClearError()}
+ ${this.isLoading ? html`${translate("walletpage.wchange21")} ${this.buyFee} QORT
++
+ warning
+
+ ${translate("registernamepage.nchange35")}
+${translate("registernamepage.nchange36")}
+
+ warning
+
+ ${translate("registernamepage.nchange37")}
+${translate("registernamepage.nchange38")}
+
+ ${this.successMessage}
+
+
+
+ `
+ }
+ }
+
+ renderClearError() {
+ let strErrorValue = this.errorMessage
+ if (strErrorValue === "") {
+ return html``
+ } else {
+ return html`
+ ${translate("walletpage.wchange43")}
+
+ ${this.errorMessage}
+
+
+
+ `
+ }
+ }
+
renderCoreText() {
return html`${translate("registernamepage.nchange16")}`
}
@@ -263,6 +815,18 @@ class NameRegistration extends LitElement {
return html`${translate("registernamepage.nchange18")}`
}
+ renderSellSuccessText() {
+ return html`${translate("registernamepage.nchange32")}`
+ }
+
+ renderCancelSuccessText() {
+ return html`${translate("registernamepage.nchange33")}`
+ }
+
+ renderBuySuccessText() {
+ return html`${translate("registernamepage.nchange34")}`
+ }
+
renderFailText() {
return html`${translate("registernamepage.nchange17")}`
}
@@ -271,7 +835,7 @@ class NameRegistration extends LitElement {
let name = nameObj.name
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
- const url = `${nodeUrl}/arbitrary/THUMBNAIL/${name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`;
+ const url = `${nodeUrl}/arbitrary/THUMBNAIL/${name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`
return html`${translate("walletpage.wchange44")}
+
${this.getSelectedWalletAddress()}
-
${this.renderAddressbookButton()}
+
+ ${this.renderUnusedAddressButton()}
+
+
+
+ 
+
+
+
+ BTC
++
+ ${this.wallets.get(this._selectedWallet).unusedWalletAddress}
+
+ ${translate("walletpage.wchange38")}
+
+
+
+ 
+
+
+
+ LTC
++
+ ${this.wallets.get(this._selectedWallet).unusedWalletAddress}
+
+ ${translate("walletpage.wchange38")}
+
+
+
+ 
+
+
+
+ DOGE
++
+ ${this.wallets.get(this._selectedWallet).unusedWalletAddress}
+
+ ${translate("walletpage.wchange38")}
+
+
+
+ 
+
+
+
+ DGB
++
+ ${this.wallets.get(this._selectedWallet).unusedWalletAddress}
+
+ ${translate("walletpage.wchange38")}
+
+
+
+ 
+
+
+
+ RVN
++
+ ${this.wallets.get(this._selectedWallet).unusedWalletAddress}
+
+ ${translate("walletpage.wchange38")}
+
@@ -3846,7 +4029,7 @@ class MultiWallet extends LitElement {
renderCAB() {
return html`
${this.selectedTransaction.aTAddress}
-