From 0a14b490876e93cb5b3f45bf64975a74d8e6eecb Mon Sep 17 00:00:00 2001 From: "Vlad G." Date: Tue, 3 Dec 2024 00:25:48 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 09eba7da900fc37f74ca165dbb10183250c8dea3 Author: Mirian Margiani Date: Mon Dec 2 13:06:04 2024 +0100 Add "😂" to list of quick reaction emojis Unicode "face with tears of joy" is (one of) the most used emoji (https://emojipedia.org/face-with-tears-of-joy), so it makes sense to have it in the quick reaction list. Signed-off-by: Mirian Margiani commit cd02ef60dc249d3360ae4f346e244d858b13b9ab Merge: 4ae47c09 58af5913 Author: R Midhun Suresh Date: Mon Oct 21 17:25:32 2024 +0530 Merge pull request #1190 from element-hq/sdk-release/0.3.1 Changes for sdk-release 0.3.1 commit 58af5913ab80ad5315f7e3eb3878663c60f5b1cd Author: R Midhun Suresh Date: Mon Oct 21 17:23:57 2024 +0530 Changes for sdk-release 0.3.1 --- src/platform/web/ui/session/room/timeline/BaseMessageView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/web/ui/session/room/timeline/BaseMessageView.js b/src/platform/web/ui/session/room/timeline/BaseMessageView.js index 84a4a1ad0d..06c8366d89 100644 --- a/src/platform/web/ui/session/room/timeline/BaseMessageView.js +++ b/src/platform/web/ui/session/room/timeline/BaseMessageView.js @@ -138,7 +138,7 @@ class QuickReactionsMenuOption { this._vm = vm; } toDOM(t) { - const emojiButtons = ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"].map(emoji => { + const emojiButtons = ["👍", "👎", "😂", "🎉", "😄", "😕", "❤️", "🚀", "👀"].map(emoji => { return t.button({onClick: () => this._vm.react(emoji)}, emoji); }); const customButton = t.button({onClick: () => {