Fixed add reaction from expanded menu

UnigramDev · Aug 12, 2023 · eeec74e · eeec74e
1 parent 0a86dc8
commit eeec74e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/Telegram/Controls/Messages/EmojiMenuFlyout.xaml.cs b/Telegram/Controls/Messages/EmojiMenuFlyout.xaml.cs
@@ -451,9 +451,13 @@ private void OnStatusClick(object sender, ItemClickEventArgs e)
             {
                 _popup.IsOpen = false;
 
-                if (_message != null)
+                if (_story != null)
                 {
-                    ToggleReaction(sticker.ToReactionType());
+                    StoryToggleReaction(sticker.ToReactionType());
+                }
+                else if (_message != null)
+                {
+                    MessageToggleReaction(sticker.ToReactionType());
                 }
                 else if (_mode == EmojiDrawerMode.CustomEmojis && sticker.FullType is StickerFullTypeCustomEmoji customEmoji)
                 {
@@ -485,18 +489,6 @@ private async void ChooseStatus(Sticker sticker)
             }
         }
 
-        private void ToggleReaction(ReactionType reaction)
-        {
-            if (_story != null)
-            {
-                StoryToggleReaction(reaction);
-            }
-            else if (_message != null)
-            {
-                MessageToggleReaction(reaction);
-            }
-        }
-
         private async void StoryToggleReaction(ReactionType reaction)
         {
             if (_story.ChosenReactionType != null && _story.ChosenReactionType.AreTheSame(reaction))

diff --git a/Telegram/Controls/Messages/ReactionsMenuFlyout.xaml.cs b/Telegram/Controls/Messages/ReactionsMenuFlyout.xaml.cs
@@ -330,19 +330,14 @@ private void Reaction_Click(object sender, RoutedEventArgs e)
 
             if (sender is HyperlinkButton button && button.Tag is ReactionType reaction)
             {
-                ToggleReaction(reaction);
-            }
-        }
-
-        private void ToggleReaction(ReactionType reaction)
-        {
-            if (_story != null)
-            {
-                StoryToggleReaction(reaction);
-            }
-            else if (_message != null)
-            {
-                MessageToggleReaction(reaction);
+                if (_story != null)
+                {
+                    StoryToggleReaction(reaction);
+                }
+                else if (_message != null)
+                {
+                    MessageToggleReaction(reaction);
+                }
             }
         }