bug fixes
This commit is contained in:
parent
d49ff94a10
commit
b77ed83ed7
@ -1019,7 +1019,7 @@
|
|||||||
Add as contact
|
Add as contact
|
||||||
</button>`;
|
</button>`;
|
||||||
let markReadUnread
|
let markReadUnread
|
||||||
if (messenger.marked[floID]?.includes('unread')) {
|
if (messenger.marked[floID] && messenger.marked[floID].includes('unread')) {
|
||||||
markReadUnread = html`
|
markReadUnread = html`
|
||||||
<button id="mark_read_option" class="option" onclick="markAsRead()">
|
<button id="mark_read_option" class="option" onclick="markAsRead()">
|
||||||
<svg class="icon" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"> <g> <rect fill="none" height="24" width="24" /> <path d="M12,18l-6,0l-4,4V4c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2v7l-2,0V4H4v12l8,0V18z M23,14.34l-1.41-1.41l-4.24,4.24l-2.12-2.12 l-1.41,1.41L17.34,20L23,14.34z" /> </g> </svg>
|
<svg class="icon" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"> <g> <rect fill="none" height="24" width="24" /> <path d="M12,18l-6,0l-4,4V4c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2v7l-2,0V4H4v12l8,0V18z M23,14.34l-1.41-1.41l-4.24,4.24l-2.12-2.12 l-1.41,1.41L17.34,20L23,14.34z" /> </g> </svg>
|
||||||
@ -2332,7 +2332,7 @@
|
|||||||
for (let messageId in messagesData) {
|
for (let messageId in messagesData) {
|
||||||
console.log(messagesData[messageId])
|
console.log(messagesData[messageId])
|
||||||
const { category, floID, time, message, sender, groupID, admin, name } = messagesData[messageId]
|
const { category, floID, time, message, sender, groupID, admin, name } = messagesData[messageId]
|
||||||
if (activeChat?.floID === (floID || groupID)) {
|
if (activeChat && activeChat.floID === (floID || groupID)) {
|
||||||
if (floGlobals.unconfirmedMessages === 0)
|
if (floGlobals.unconfirmedMessages === 0)
|
||||||
getRef('messages_container').append(render.messageBubble(messagesData[messageId]))
|
getRef('messages_container').append(render.messageBubble(messagesData[messageId]))
|
||||||
if (chatScrollInfo['isScrolledUp']) {
|
if (chatScrollInfo['isScrolledUp']) {
|
||||||
@ -2947,7 +2947,7 @@
|
|||||||
|
|
||||||
async function renderChatList(chatOrder) {
|
async function renderChatList(chatOrder) {
|
||||||
const chats = chatOrder.map(floID => {
|
const chats = chatOrder.map(floID => {
|
||||||
const markUnread = messenger.marked[floID]?.includes('unread')
|
const markUnread = messenger.marked[floID] ? messenger.marked[floID].includes('unread') : false;
|
||||||
let type
|
let type
|
||||||
if (messenger.chats[floID])
|
if (messenger.chats[floID])
|
||||||
type = 'chat'
|
type = 'chat'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user