diff --git a/src/app/chat/views/message_format.nim b/src/app/chat/views/message_format.nim
index a3d12be0e1..4745960dca 100644
--- a/src/app/chat/views/message_format.nim
+++ b/src/app/chat/views/message_format.nim
@@ -22,7 +22,7 @@ proc renderInline(self: ChatMessageList, elem: TextItem): string =
of "strong": result = fmt("{elem.literal} ")
of "link": result = elem.destination
of "mention": result = fmt("{self.mention(elem.literal)} ")
- of "status-tag": result = fmt("{elem.literal} ")
+ of "status-tag": result = fmt("#{elem.literal} ")
# See render-block in status-react/src/status_im/ui/screens/chat/message/message.cljs
proc renderBlock(self: ChatMessageList, message: Message): string =
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
index c0ee663243..8e8e3c8fe2 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
@@ -20,9 +20,9 @@ StyledTextEdit {
}
if (link.startsWith('//')) {
- let pk = link.replace("//", "");
- profileClick(chatsModel.userNameOrAlias(pk), pk, chatsModel.generateIdenticon(pk))
- return;
+ let pk = link.replace("//", "");
+ profilePopup.openPopup(chatsModel.userNameOrAlias(pk), pk, chatsModel.generateIdenticon(pk))
+ return;
}
Qt.openUrlExternally(link)
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml b/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml
index d548785b12..0d74480d14 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml
@@ -40,7 +40,7 @@ AddButton {
onTriggered: publicChatPopup.open()
}
onAboutToHide: {
- btnAdd.icon.state = "default"
+ btnAdd.iconImg.state = "default"
}
}
}
diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro
index 0ca4ce6d6d..61a84062dc 100644
--- a/ui/nim-status-client.pro
+++ b/ui/nim-status-client.pro
@@ -141,6 +141,7 @@ DISTFILES += \
app/AppLayouts/Chat/ChatColumn/MessageComponents/UserImage.qml \
app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml \
app/AppLayouts/Chat/ChatColumn/MessageComponents/qmldir \
+ app/AppLayouts/Chat/ContactsColumn/AddChat.qml \
app/AppLayouts/Chat/ContactsColumn/ClosedEmptyView.qml \
app/AppLayouts/Chat/components/EmojiCategoryButton.qml \
app/AppLayouts/Chat/components/EmojiPopup.qml \