RanchiMall/messenger
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
sairaj mote 2023-03-20 23:32:27 +05:30
parent 651cc73023
commit a0bc71695d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
index.html
View File

@ -126,7 +126,7 @@
<div id="landing" class="grid inner-page hidden"> <div id="landing" class="grid inner-page hidden">
<div class="left"> <div class="left">
<h1 class="title-font"> <h1 class="title-font">
Truly Secure, Private and Reliable. Secure, Private and Reliable.
</h1> </h1>
<p class="margin-block-1">A messenger made with Blockchain and Open Source technologies. Your data <p class="margin-block-1">A messenger made with Blockchain and Open Source technologies. Your data
remains with you, as it should.</p> remains with you, as it should.</p>
@ -3052,8 +3052,6 @@
for (let messageId in messagesData) { for (let messageId in messagesData) {
const { category, floID, time, message, sender, groupID, admin, name, pipeID, unconfirmed } = messagesData[messageId] const { category, floID, time, message, sender, groupID, admin, name, pipeID, unconfirmed } = messagesData[messageId]
const chatAddress = floID || groupID || pipeID const chatAddress = floID || groupID || pipeID
const activeChatFloAdress = floCrypto.toFloID(activeChat.address)
const activeChatBtcAddress = btcOperator.convert.legacy2bech(activeChatFloAdress)
// code to run if a chat is opened // code to run if a chat is opened
if (activeChat && (activeChat.address === chatAddress || activeChat.address === floCrypto.toFloID(chatAddress))) { if (activeChat && (activeChat.address === chatAddress || activeChat.address === floCrypto.toFloID(chatAddress))) {
if (!sentByMe && sender && sender === floDapps.user.id) { if (!sentByMe && sender && sender === floDapps.user.id) {
@ -3112,13 +3110,14 @@
} }
let finalMessage let finalMessage
if (messenger.groups && messenger.groups[groupID]) { if (messenger.groups && messenger.groups[groupID]) {
if (sender === floDapps.user.id) if (floGlobals.contacts[sender])
finalMessage = `You: ${message}`
else if (floGlobals.contacts[sender])
finalMessage = `${floGlobals.contacts[sender]}: ${message}` finalMessage = `${floGlobals.contacts[sender]}: ${message}`
else if (sender === floDapps.user.id)
finalMessage = `You: ${message}`
} }
else else
finalMessage = message finalMessage = message
console.log(finalMessage, 'finalMessage')
if (chatCard.querySelector('.last-message')) if (chatCard.querySelector('.last-message'))
chatCard.querySelector('.last-message').textContent = finalMessage chatCard.querySelector('.last-message').textContent = finalMessage
if (chatCard.querySelector('.time')) if (chatCard.querySelector('.time'))