oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1361 from Bilb/fix-mention-@-with-long-title

Browse source 
render @ mention correctly with long title on ConversationListItem
This commit is contained in:
Audric Ackermann 2020-10-05 11:34:50 +11:00 committed by GitHub
commit 68a1091e99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
stylesheets/_mentions.scss
View file

@ -100,9 +100,8 @@
padding-inline-start: 3px;
padding-inline-end: 3px;
position: absolute;
left: 50%;
margin-inline-start: 30px;
position: static;
margin-inline-start: 5px;
top: 2px;
font-weight: 300;

30
ts/components/ConversationListItem.tsx
View file

@ -108,28 +108,21 @@ class ConversationListItem extends React.PureComponent<Props> {
);
}
public renderUnread() {
const { unreadCount, mentionedUs } = this.props;
public renderHeader() {
const { unreadCount, mentionedUs, i18n, isMe, lastUpdated } = this.props;
const {} = this.props;
let atSymbol = null;
let unreadCountDiv = null;
if (unreadCount > 0) {
const atSymbol = mentionedUs ? <p className="at-symbol">@</p> : null;
return (
<div>
<p className="module-conversation-list-item__unread-count">
{unreadCount}
</p>
{atSymbol}
</div>
atSymbol = mentionedUs ? <p className="at-symbol">@</p> : null;
unreadCountDiv = (
<p className="module-conversation-list-item__unread-count">
{unreadCount}
</p>
);
}
return null;
}
public renderHeader() {
const { unreadCount, i18n, isMe, lastUpdated } = this.props;
return (
<div className="module-conversation-list-item__header">
<div
@ -142,7 +135,8 @@ class ConversationListItem extends React.PureComponent<Props> {
>
{this.renderUser()}
</div>
{this.renderUnread()}
{unreadCountDiv}
{atSymbol}
{
<div
className={classNames(