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-04-06 00:14:28 +05:30
parent 9de4585c9b
commit b917378aa4
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/main.css
View File

@ -1094,14 +1094,14 @@ ol li::before {
font-weight: 500; font-weight: 500;
justify-self: flex-start; justify-self: flex-start;
} }
.contact.no-message.chat, .contact.no-message.group { .contact.collapsed.chat, .contact.collapsed.group {
grid-template-areas: "dp name menu"; grid-template-areas: "dp name menu";
grid-template-rows: 1fr; grid-template-rows: 1fr;
} }
.contact.no-message.pipeline { .contact.collapsed.pipeline {
grid-template-areas: "dp tag tag" "dp name menu"; grid-template-areas: "dp tag tag" "dp name menu";
} }
.contact.no-message .name { .contact.collapsed .name {
margin-bottom: 0; margin-bottom: 0;
} }
.contact .name { .contact .name {

2
css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
css/main.scss
View File

@ -1112,7 +1112,7 @@ ol {
font-weight: 500; font-weight: 500;
justify-self: flex-start; justify-self: flex-start;
} }
&.no-message { &.collapsed {
&.chat, &.chat,
&.group { &.group {
grid-template-areas: "dp name menu"; grid-template-areas: "dp name menu";

14
index.html
View File

@ -2588,7 +2588,7 @@
`; `;
chatCard.append(html.node`${timeAndOptions}`) chatCard.append(html.node`${timeAndOptions}`)
if (time) if (time)
chatCard.classList.remove('no-message') chatCard.classList.remove('collapsed')
} }
}).catch(error => console.error(error)) }).catch(error => console.error(error))
if (prepend) { if (prepend) {
@ -2600,7 +2600,7 @@
if (type === 'pipeline' && messenger.pipeline[contactAddress].model === 'flo_multisig') { if (type === 'pipeline' && messenger.pipeline[contactAddress].model === 'flo_multisig') {
tag = 'FLO' tag = 'FLO'
} }
const className = `contact ${type !== 'contact' ? type : ''} ${markUnread ? 'unread' : ''} interactive no-message` const className = `contact ${type !== 'contact' ? type : ''} ${markUnread ? 'unread' : ''} interactive collapsed`
return html.for(ref, contactAddress)` return html.for(ref, contactAddress)`
<div class="${className}" .dataset=${{ floAddress: contactAddress }} style=${`--contact-color: var(${contactColor(contactAddress)})`}> <div class="${className}" .dataset=${{ floAddress: contactAddress }} style=${`--contact-color: var(${contactColor(contactAddress)})`}>
<div class="initial flex align-center"> <div class="initial flex align-center">
@ -2732,9 +2732,6 @@
$('#transaction_details').remove() $('#transaction_details').remove()
// disable chatting // disable chatting
getRef('chat_footer').classList.add('hidden') getRef('chat_footer').classList.add('hidden')
const chatCard = getChatCard(activeChat.address)
if (chatCard)
chatCard.querySelector('.tag').textContent += ' - Completed'
let redirectTo = `https://live.blockcypher.com/btc/tx/` let redirectTo = `https://live.blockcypher.com/btc/tx/`
if (messenger.pipeline[activeChat.address].model === 'flo_multisig') if (messenger.pipeline[activeChat.address].model === 'flo_multisig')
redirectTo = `https://flosight.ranchimall.net/tx/` redirectTo = `https://flosight.ranchimall.net/tx/`
@ -3179,6 +3176,10 @@
], animOptions).finished ], animOptions).finished
getRef('chats_list').scroll({ top: 0, behavior: 'smooth' }) getRef('chats_list').scroll({ top: 0, behavior: 'smooth' })
} }
if (type && type === 'BROADCAST') {
chatCard.querySelector('.tag').textContent += ' - Completed'
chatCard.classList.add('collapsed')
}
} else { } else {
const chatType = floID ? 'chat' : groupID ? 'group' : 'pipeline' const chatType = floID ? 'chat' : groupID ? 'group' : 'pipeline'
if (floID) { if (floID) {
@ -3200,7 +3201,7 @@
finalMessage = message finalMessage = message
if (chatCard.querySelector('.last-message')) { if (chatCard.querySelector('.last-message')) {
chatCard.querySelector('.last-message').textContent = finalMessage chatCard.querySelector('.last-message').textContent = finalMessage
chatCard.classList.remove('no-message') chatCard.classList.remove('collapsed')
} }
if (chatCard.querySelector('.time')) if (chatCard.querySelector('.time'))
chatCard.querySelector('.time').textContent = getFormattedTime(time, 'relative') chatCard.querySelector('.time').textContent = getFormattedTime(time, 'relative')
@ -3221,6 +3222,7 @@
getChatCard(chatAddress).classList.add('unread') getChatCard(chatAddress).classList.add('unread')
} }
} }
} }
getRef('feature_mode').addEventListener('change', e => { getRef('feature_mode').addEventListener('change', e => {
const sections = ['dm', 'multisig', 'requests']; const sections = ['dm', 'multisig', 'requests'];