forked from Qortal/qortal-ui
fix loader and placeholder
This commit is contained in:
parent
9fa91ce66f
commit
c33b16e7ff
@ -801,6 +801,7 @@ class ChatPage extends LitElement {
|
|||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const isRecipient = this.chatId.includes('direct') === true ? true : false;
|
const isRecipient = this.chatId.includes('direct') === true ? true : false;
|
||||||
this.chatId.includes('direct') === true ? this.isReceipient = true : this.isReceipient = false;
|
this.chatId.includes('direct') === true ? this.isReceipient = true : this.isReceipient = false;
|
||||||
@ -847,9 +848,30 @@ class ChatPage extends LitElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
renderPlaceholder() {
|
async renderPlaceholder() {
|
||||||
|
const getName = async (recipient)=> {
|
||||||
|
try {
|
||||||
|
const getNames = await parentEpml.request("apiCall", {
|
||||||
|
type: "api",
|
||||||
|
url: `/names/address/${recipient}`,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (Array.isArray(getNames) && getNames.length > 0 ) {
|
||||||
|
return getNames[0].name
|
||||||
|
} else {
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let userName = ""
|
||||||
|
if(this.isReceipient){
|
||||||
|
userName = await getName(this._chatId);
|
||||||
|
}
|
||||||
const mstring = get("chatpage.cchange8");
|
const mstring = get("chatpage.cchange8");
|
||||||
const placeholder = this.isReceipient === true ? `Message ${this._chatId}` : `${mstring}`;
|
const placeholder = this.isReceipient === true ? `Message ${userName ? userName : this._chatId}` : `${mstring}`;
|
||||||
return placeholder;
|
return placeholder;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -950,7 +972,6 @@ class ChatPage extends LitElement {
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async processMessages(messages, isInitial) {
|
async processMessages(messages, isInitial) {
|
||||||
@ -969,7 +990,7 @@ class ChatPage extends LitElement {
|
|||||||
})
|
})
|
||||||
|
|
||||||
if (isInitial) {
|
if (isInitial) {
|
||||||
this.chatEditorPlaceholder = this.renderPlaceholder();
|
this.chatEditorPlaceholder = await this.renderPlaceholder();
|
||||||
const replacedMessages = await replaceMessagesEdited({
|
const replacedMessages = await replaceMessagesEdited({
|
||||||
decodedMessages: decodedMessages,
|
decodedMessages: decodedMessages,
|
||||||
parentEpml,
|
parentEpml,
|
||||||
|
@ -70,7 +70,6 @@ class ChatScroller extends LitElement {
|
|||||||
...message
|
...message
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
console.log(messageArray, 'messages here');
|
|
||||||
return messageArray;
|
return messageArray;
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
@ -156,6 +155,9 @@ class ChatScroller extends LitElement {
|
|||||||
|
|
||||||
_upObserverhandler(entries) {
|
_upObserverhandler(entries) {
|
||||||
if (entries[0].isIntersecting) {
|
if (entries[0].isIntersecting) {
|
||||||
|
if(this.messages.length < 20){
|
||||||
|
return
|
||||||
|
}
|
||||||
this.setIsLoadingMessages(true);
|
this.setIsLoadingMessages(true);
|
||||||
let _scrollElement = entries[0].target.nextElementSibling;
|
let _scrollElement = entries[0].target.nextElementSibling;
|
||||||
this._getOldMessage(_scrollElement);
|
this._getOldMessage(_scrollElement);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user