From f3b0b75e4e762adf436da8f575ec3c97e09c3ba6 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 28 Jan 2022 20:59:36 +0100
Subject: [PATCH] Reactions: Fix overflow with buttons; Interactions: Handle
 Saved Messages (#1675)

---
 src/components/middle/message/Reactions.scss | 2 ++
 src/modules/actions/api/reactions.ts         | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/middle/message/Reactions.scss b/src/components/middle/message/Reactions.scss
index 6e044ff13..eaa47e9ad 100644
--- a/src/components/middle/message/Reactions.scss
+++ b/src/components/middle/message/Reactions.scss
@@ -47,6 +47,8 @@
 
     &.chosen {
       border-color: var(--accent-color);
+      position: relative;
+      z-index: 1;
     }
 
     &:hover {
diff --git a/src/modules/actions/api/reactions.ts b/src/modules/actions/api/reactions.ts
index 02f7c5566..ceea80556 100644
--- a/src/modules/actions/api/reactions.ts
+++ b/src/modules/actions/api/reactions.ts
@@ -63,7 +63,7 @@ addReducer('sendEmojiInteraction', (global, actions, payload) => {
 
   const chat = selectChat(global, chatId);
 
-  if (!chat || (!emoji && !localEffect)) {
+  if (!chat || (!emoji && !localEffect) || chatId === global.currentUserId) {
     return undefined;
   }
 
@@ -255,7 +255,7 @@ addReducer('sendWatchingEmojiInteraction', (global, actions, payload) => {
 
   const chat = selectChat(global, chatId);
 
-  if (!chat || !global.activeEmojiInteraction) {
+  if (!chat || !global.activeEmojiInteraction || chatId === global.currentUserId) {
     return undefined;
   }