From 040d76e3584877623211f211177c3adceea38a43 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Mon, 1 Jun 2026 15:22:08 +0300
Subject: [PATCH 01/13] ShowUserPopUp 1.0

added a scroll bar to popup reactionfield so that it wont go over the tab
(still haven't gotten reactionfield buttons work at  ShowUserPopUp on the popup, it sorta works but it only updates the messagebox reactionfield)
---
 Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab |   4 +-
 .../Windows/GlobalWindows/ChatView.prefab     | 250 ++++++++++++++++--
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    |   3 +
 .../Scripts/Chat/MessageReactionsHandler.cs   |  44 +--
 4 files changed, 268 insertions(+), 33 deletions(-)

diff --git a/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab b/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab
index 176bd84776..97c6a79039 100644
--- a/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab
+++ b/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab
@@ -1427,7 +1427,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
+  m_HorizontalFit: 2
   m_VerticalFit: 2
 --- !u!1 &8709729911892892704
 GameObject:
@@ -1440,7 +1440,7 @@ GameObject:
   - component: {fileID: 6897423349860991160}
   - component: {fileID: 1748575566865397314}
   m_Layer: 5
-  m_Name: Reactions (1)
+  m_Name: Reactions
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
index e703339786..95ee3291b7 100644
--- a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
+++ b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
@@ -3238,7 +3238,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2564540923251323573}
-  - {fileID: 4349249108874952513}
+  - {fileID: 4325108700598219797}
   m_Father: {fileID: 3684371136031284224}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -3389,7 +3389,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -61.80227}
+  m_AnchoredPosition: {x: 50, y: -63.58013}
   m_SizeDelta: {x: 100, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7696485582972512613
@@ -4771,6 +4771,134 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &4711497440853259810
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4325108700598219797}
+  - component: {fileID: 8638815110373297450}
+  - component: {fileID: 2053480718372948307}
+  - component: {fileID: 959950731169273863}
+  - component: {fileID: 8849115530695733483}
+  m_Layer: 0
+  m_Name: ScrollRect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4325108700598219797
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4711497440853259810}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1.4434044}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7808444925369831179}
+  m_Father: {fileID: 6937871787955167669}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 417.5, y: -55}
+  m_SizeDelta: {x: 565, y: 110}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8638815110373297450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4711497440853259810}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.1792453, g: 0.1792453, b: 0.1792453, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2053480718372948307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4711497440853259810}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 565
+  m_PreferredHeight: 110
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &959950731169273863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4711497440853259810}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 0}
+  m_Horizontal: 1
+  m_Vertical: 0
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 7808444925369831179}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!222 &8849115530695733483
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4711497440853259810}
+  m_CullTransparentMesh: 1
 --- !u!1 &4748461315105360402
 GameObject:
   m_ObjectHideFlags: 0
@@ -5414,6 +5542,96 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5163482810798233842
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7808444925369831179}
+  - component: {fileID: 7813754295863667734}
+  - component: {fileID: 729734700785514752}
+  - component: {fileID: 8702523111131546619}
+  m_Layer: 0
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7808444925369831179
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5163482810798233842}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4349249108874952513}
+  m_Father: {fileID: 4325108700598219797}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &7813754295863667734
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5163482810798233842}
+  m_CullTransparentMesh: 1
+--- !u!114 &729734700785514752
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5163482810798233842}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8702523111131546619
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5163482810798233842}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &5282149747019341538
 GameObject:
   m_ObjectHideFlags: 0
@@ -5659,16 +5877,16 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5612372508043473246}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -1.4434044}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6937871787955167669}
+  m_Father: {fileID: 7808444925369831179}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 135, y: -55}
-  m_SizeDelta: {x: 0, y: 110}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4225351530599048031
 MonoBehaviour:
@@ -5979,6 +6197,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: a12221f1d2fd7194dbb2e0620c4fe9b8, type: 3}
   _image: {fileID: 4777644748716934985}
   _OrderButtonText: {fileID: 4953989987484460405}
+  _scrollRect: {fileID: 959950731169273863}
 --- !u!114 &7249710220094630189
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7294,9 +7513,8 @@ MonoBehaviour:
   _InputAreaArrow: {fileID: 8800692130466575762}
   ShowUsersPopUp: {fileID: 5763485112562100175}
   ChatShowUsersPopUpData: {fileID: 3137927778324403408}
-  characterResponseList: {fileID: 11400000, guid: 0c97ef5ec4dd42d49854c48853a3e90c,
-    type: 2}
   currentMood: 2
+  lasttimeMood: 2
   _responsesData: {fileID: 1228178274405547610}
   _chatType: 0
 --- !u!114 &1176563068381732146
@@ -9810,7 +10028,7 @@ PrefabInstance:
     - target: {fileID: 2641932565321544379, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.94188035
+      value: 0.9581281
       objectReference: {fileID: 0}
     - target: {fileID: 2664587007262820359, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -9896,12 +10114,12 @@ PrefabInstance:
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.8468803
+      value: 0.8631041
       objectReference: {fileID: 0}
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.1975
+      value: 0.197584
       objectReference: {fileID: 0}
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -11790,7 +12008,7 @@ PrefabInstance:
     - target: {fileID: 7827142668286818857, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.1975
+      value: 0.197584
       objectReference: {fileID: 0}
     - target: {fileID: 7887861368517116277, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -12025,12 +12243,12 @@ PrefabInstance:
     - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.94188035
+      value: 0.9581281
       objectReference: {fileID: 0}
     - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.8468803
+      value: 0.8631041
       objectReference: {fileID: 0}
     - target: {fileID: 9011883256918754321, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index 2e5f05e2c0..371d9ad7ed 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -42,6 +42,8 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     private int LineOrder = 0;
     private int currentOrder = 1;
 
+    public ScrollRect _scrollRect;
+
 
     //[SerializeField] private TextLanguageSelectorCaller _reactionAmount;
     private void Start()
@@ -70,6 +72,7 @@ public void ClosePopup()
 
         Destroy(CopiedReactionField);
         CopiedReactionField = null;
+        _scrollRect.content = null;
         _messageReactionsHandler = null;
         gameObject.SetActive(false);
         LineOrder = 0;
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index 688bb1eb55..fd30fabb3b 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -263,8 +263,8 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             chatReactionHandler.AddReaction(_reaction);
             _reactionHandlers.Add(chatReactionHandler);
             ReactionData.Add(_reaction);
-            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, message, _reaction));
-            chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(message));
+            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, message));
+            chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(chatReactionHandler, message));
             
             StartCoroutine(GetPlayerData(player =>
             {
@@ -312,7 +312,7 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
     /// Toggles the added reactions as selected and unselected.
     /// </summary>
     /// <param name="reactionHandler"></param>
-    public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage message, ServerReactions _reaction)
+    public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage message)
     {
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
@@ -343,34 +343,48 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage mess
         }
     }
 
-    private void ShowUsers(ChatMessage message)
+    private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
     {
 
         
         //halts the button as when field get copied it the button will rerun the script again duplicating it twice
-        /*if(Popup.gameObject.activeSelf)
+        if(Popup.gameObject.activeSelf)
             return;
 
+
         //Gets needed data for ChatShowUserPopUpData
         Popup._messageReactionsHandler = gameObject.GetComponent<MessageReactionsHandler>();
         Popup.gameObject.SetActive(true);
         Popup.CopiedReactionField = Instantiate(_reactionPaneldata._reactionField, Popup.ReactionFieldLocation);
+
+        Popup._scrollRect.content = Popup.CopiedReactionField.GetComponent<RectTransform>();
+
         GenarateReactionObjects(Popup.PopUpAllReactions);
         UpdateReactionStatus(Popup.PopUpAllReactions);
+
+        //Changes the reactions object sizes
+        foreach(RectTransform child in Popup.CopiedReactionField.transform)
+        {
+            ContentSizeFitter childFitter = child.GetComponent<ContentSizeFitter>();
+            childFitter.enabled = false;
+
+            Button test = child.GetComponent<Button>();
+
+            test.onClick.RemoveAllListeners();
+
+            test.onClick.AddListener(() => ToggleReaction(reactionHandler, message));
+
+
+
+
+            child.sizeDelta = new Vector2(150, 110);
+        }
+
+
         foreach (var reactionData in ReactionData)
         {
             Popup.AddUsersReaction(message, reactionData);
         }
-        // RectTransform rtReactionField = _reactionPaneldata[0]._reactionField.GetComponent<RectTransform>();
-        /*foreach(var i in _reactionHandlers)
-        {
-            ContentSizeFitter SizeFitter = i._messageReaction.GetComponent<ContentSizeFitter>();
-            RectTransform transform = i._messageReaction.GetComponent<RectTransform>();
-            layoutElement.ignoreLayout = false;
-            SizeFitter.enabled = false;
-
-            transform.sizeDelta = new Vector2(150,  110);
-        } */
 
         _longClick = true;
 

From d51ba5faaeafa157d7895fc59e484678c77212cf Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Tue, 2 Jun 2026 15:36:47 +0300
Subject: [PATCH 02/13] ShowUserPopUp 1.1

system now updates correct reactions
---
 .../Scripts/Chat/MessageReactionsHandler.cs   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index fd30fabb3b..f731875911 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -237,6 +237,14 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                                 //Removes the selected reaction
                                 _reactionList[i].Selected = true;
                                 addedReaction.Select();
+
+                                ReactionData.Add(_reaction);
+
+                                if(Popup.gameObject.activeSelf)
+                                foreach (var reactionData in ReactionData)
+                                {
+                                    Popup.AddUsersReaction(message, reactionData);
+                                }
                             }
                     }));
 
@@ -275,6 +283,11 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                         chatReactionHandler.Select();
                         //Removes the selected Mood from the list  by checking what sprite is being used
                         _reactionList[i].Selected = true;
+
+                        foreach (var reactionData in ReactionData)
+                        {
+                            Popup.AddUsersReaction(message, reactionData);
+                        }
                     }
 
             }));
@@ -320,7 +333,20 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage mess
             _selectedMessage.SetMessageInactive();
 
             reactionHandler.Deselect();
+            StartCoroutine(GetPlayerData(player =>
+            {
+                for (int i = 0; i < ReactionData.Count; i++)
+                {
+                    if (ReactionData[i].sender_id == player.Id)
+                    {
+                        ReactionData.Remove(ReactionData[i]);
 
+                        if(Popup.gameObject.activeSelf)
+                        Popup.RemoveUserReaction(player.Id);
+                        
+                    }
+                }
+            }));
             if (reactionHandler.Selected)
             {
 

From b71610c9ac75b84158dabba12b9f2d16c381cb23 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Tue, 2 Jun 2026 15:44:40 +0300
Subject: [PATCH 03/13] ShowUserPopUp 1.2

- LineOrder place changed so that it wont increase when there isnt new reaction added
- Forgot to add " if(Popup.gameObject.activeSelf)" for 288
---
 Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs  | 2 +-
 Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index 371d9ad7ed..ef3ef1dcb5 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -115,7 +115,6 @@ public void reactiontext()
 
     public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
     {
-        LineOrder++;
                 Mood mood = (Mood)Enum.Parse(typeof(Mood), Emoji.emoji);
 
         //halts the system if there's already a same user on the list
@@ -136,6 +135,7 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
                 return;
             }
         }
+        LineOrder++;
             //Gets sprite
         Sprite reactionSprite = _reactionList.FirstOrDefault(x => x.Mood == mood)?.Sprite;
 
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index f731875911..33aaa17a42 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -284,6 +284,7 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                         //Removes the selected Mood from the list  by checking what sprite is being used
                         _reactionList[i].Selected = true;
 
+                        if(Popup.gameObject.activeSelf)
                         foreach (var reactionData in ReactionData)
                         {
                             Popup.AddUsersReaction(message, reactionData);

From 408e9ccbb7f8b987cc1d8bc765a1347072c60cff Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Wed, 3 Jun 2026 16:15:44 +0300
Subject: [PATCH 04/13] ShowUserPopUp 1.3

Reactions are now updated on Reaction PopUp
---
 .../Windows/GlobalWindows/ChatView.prefab     |   1 -
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    |  34 +++--
 .../Scripts/Chat/MessageReactionsHandler.cs   | 126 ++++++------------
 3 files changed, 61 insertions(+), 100 deletions(-)

diff --git a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
index 95ee3291b7..0939d178c7 100644
--- a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
+++ b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
@@ -6167,7 +6167,6 @@ MonoBehaviour:
   _closeAllReactionButton: {fileID: 2014114443139516172}
   _listOrderButton: {fileID: 3052950907519947448}
   ShowUsersPopUp: {fileID: 5763485112562100175}
-  _messageReactionsHandler: {fileID: 0}
   _userContent: {fileID: 7215285588370245146}
   _userData: {fileID: 8844569307860996610, guid: d9e96f8283e71824cadeec334b0a267e,
     type: 3}
diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index ef3ef1dcb5..508b96d4f9 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -20,7 +20,6 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     [SerializeField] private GameObject ShowUsersPopUp;
 
     [Header("Scripts")]
-    public MessageReactionsHandler _messageReactionsHandler;
     [Header("User Info")]
 
     [SerializeField] private VerticalLayoutGroup _userContent;
@@ -31,9 +30,9 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     [Header("Reactions")]
     [SerializeField] private List<ReactionObject> _reactionList;
     [SerializeField] private GameObject _allReactions;
-    public GameObject _selectedReaction;
+    [SerializeField] private GameObject _selectedReaction;
     [SerializeField] private GameObject _noReactions;
-    public GameObject CopiedReactionField;
+    private GameObject CopiedReactionField;
     public Transform ReactionFieldLocation;
     public Transform PopUpAllReactions;
     [SerializeField] private Sprite[] _sprites;
@@ -49,8 +48,7 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     private void Start()
     {
         _closeAllReactionButton.onClick.AddListener(LayoutButton);
-        _listOrderButton.onClick.AddListener(() => currentOrder++);
-        _listOrderButton.onClick.AddListener(() => ListOrder(currentOrder));
+        _listOrderButton.onClick.AddListener(() => {currentOrder++; ListOrder(currentOrder);});
         reactiontext();
         foreach (Button button in _closeButtons)
         {
@@ -61,8 +59,6 @@ private void Start()
     //Puts back the reactions and popup back to messageobject
     public void ClosePopup()
     {
-
-        //---- Put the new data that been added to popup here ----
         for (int i = _userInfo.Count - 1; i >= 0; i--)
         {
             Destroy(_userInfo[i].UserDataObj);
@@ -73,7 +69,6 @@ public void ClosePopup()
         Destroy(CopiedReactionField);
         CopiedReactionField = null;
         _scrollRect.content = null;
-        _messageReactionsHandler = null;
         gameObject.SetActive(false);
         LineOrder = 0;
 
@@ -88,7 +83,6 @@ void OnEnable()
     //Incane user leaves the chat
     private void OnDisable()
     {
-        
         ListOrder(1);
         ClosePopup();
     }
@@ -191,7 +185,23 @@ void LayoutButton()
     }
     //Sets the List in certain order
 
+    //Changes the reactions object sizes
+    public void ReactionFieldCopyUpdate(GameObject ReactionField, Transform ReactionLocation)
+    {
+        Destroy(CopiedReactionField);
+
+        CopiedReactionField = Instantiate(ReactionField, ReactionLocation);
 
+        _scrollRect.content = CopiedReactionField.GetComponent<RectTransform>();
+
+        foreach (RectTransform child in CopiedReactionField.transform)
+        {
+            ContentSizeFitter childFitter = child.GetComponent<ContentSizeFitter>();
+            childFitter.enabled = false;
+
+            child.sizeDelta = new Vector2(150, 110);
+        }
+    }
 
 
     void ListOrder(int order)
@@ -207,7 +217,7 @@ void ListOrder(int order)
 
             //Oldest => Newest
             case 1:
-                Debug.LogWarning("FIND ME Order 1");
+                
                 _userInfo = _userInfo.OrderBy(m => m._order).ToList();
                 _OrderButtonText.text = "Old";
                 _image.sprite = null;
@@ -215,7 +225,6 @@ void ListOrder(int order)
 
             //Newest => Oldest
             case 2:
-                Debug.LogWarning("FIND ME Order 2");
                 _userInfo = _userInfo.OrderByDescending(m => m._order).ToList();
                 _OrderButtonText.text = "New";
                 _image.sprite = null;
@@ -223,7 +232,6 @@ void ListOrder(int order)
 
             // A => Z By Username
             case 3:
-                Debug.LogWarning("FIND ME Order 3");
                 _userInfo = _userInfo.OrderBy(m => m._name.ToLower().Trim()).ToList();
                 _OrderButtonText.text = "A-Z";
                 _image.sprite = null;
@@ -231,7 +239,6 @@ void ListOrder(int order)
 
             // Z => A By Username
             case 4:
-                Debug.LogWarning("FIND ME Order 4");
                 _userInfo = _userInfo.OrderByDescending(m => m._name.ToLower().Trim()).ToList();
                 _OrderButtonText.text = "Z-A";
                 _image.sprite = null;
@@ -239,7 +246,6 @@ void ListOrder(int order)
 
             //Sadness => Love by Reactions
             case 5:
-                Debug.LogWarning("FIND ME Order 5");
                 _userInfo = _userInfo.OrderBy(m => m._mood).ToList();
                 _OrderButtonText.text = "";
                 if (_sprites[4] != null)
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index 33aaa17a42..d55b9c746c 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -13,7 +13,7 @@ public class MessageReactionsHandler : AltMonoBehaviour
     [SerializeField] private GameObject _commonReactionsPanel;
     [SerializeField] private GameObject _allReactionsPanel;
 
-    [SerializeField] public reactionPanelGroup _reactionPaneldata;
+    [SerializeField]  private reactionPanelGroup _reactionPaneldata;
     [Header("Prefabs")]
     [SerializeField] private GameObject _addedReactionPrefab;
 
@@ -21,7 +21,7 @@ public class MessageReactionsHandler : AltMonoBehaviour
     [SerializeField] private MessageObjectHandler _selectedMessage;
 
     [Header("Reactions")]
-    [SerializeField] public List<ReactionObject> _reactionList;
+    [SerializeField] private List<ReactionObject> _reactionList;
     [SerializeField] private GameObject _reactionObject;
 
     /*[Header("Added Features")]
@@ -34,8 +34,7 @@ public class MessageReactionsHandler : AltMonoBehaviour
     private List<ChatReactionHandler> _reactionHandlers = new();
     private List<int> _commonReactions = new();
     private bool _longClick = false;
-    private ChatShowUsersPopUpData Popup = Chat.instance?.ChatShowUsersPopUpData;
-    public MessageObjectHandler _messageObjectHandler;
+    private ChatShowUsersPopUpData _reactionPopup = Chat.instance?.ChatShowUsersPopUpData;
 
 
     [SerializeField]public List<ServerReactions> ReactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
@@ -55,9 +54,7 @@ void Start()
         //ReactionObjectHandler.OnReactionPressed += AddReaction;
 
 
-            GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-            UpdateReactionStatus(_reactionPaneldata._reactionsContent);
-        
+        GenarateReactionObjects(_reactionPaneldata._reactionsContent);
 
         PickCommonReactions();
     }
@@ -90,6 +87,7 @@ private void GenarateReactionObjects(Transform reactionPanel)
                 _reactions.Add(handler);
             }
         }
+        UpdateReactionStatus(reactionPanel);
     }
 
     private void UpdateReactionStatus(Transform reactionPanel)
@@ -168,8 +166,6 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
             foreach (ChatReactionHandler addedReaction in _reactionHandlers)
             {
                 addedReaction.ResetReactions();
-
-
             }
             foreach (ServerReactions reaction in reactions)
             {
@@ -183,16 +179,18 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
                 if (addedReaction.Count <= 0)
                 {
                     removableReactions.Add(addedReaction);
-
-
                 } 
 
             }
             for (int i = removableReactions.Count - 1; i >= 0; i--)
             {
                 RemoveReaction(removableReactions[i]);
+            }
 
-
+            //Used for "ChatShowUserPopUpData"
+            if(_reactionPopup.gameObject.activeSelf)
+            {
+                _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, _reactionPopup.ReactionFieldLocation);
             }
         
     }
@@ -234,16 +232,20 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
                             if (player.Id == _reaction.sender_id)
                             {
-                                //Removes the selected reaction
+
                                 _reactionList[i].Selected = true;
                                 addedReaction.Select();
 
                                 ReactionData.Add(_reaction);
 
-                                if(Popup.gameObject.activeSelf)
-                                foreach (var reactionData in ReactionData)
+                                if (_reactionPopup.gameObject.activeSelf)
                                 {
-                                    Popup.AddUsersReaction(message, reactionData);
+
+                                    foreach (var reactionData in ReactionData)
+                                    {
+                                        _reactionPopup.AddUsersReaction(message, reactionData);
+
+                                    }
                                 }
                             }
                     }));
@@ -257,19 +259,13 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             // Creates a reaction with the needed info and adds it to the selected message.
             GameObject newReaction = Instantiate(_addedReactionPrefab, reactionsFields.transform);
 
-            //adjusts the imported reactions size if ShowUsersPopUp is active
-            /*if (_usersWhoAdded.activeSelf == true)
-            {
-                RectTransform rt = newReaction.GetComponent<RectTransform>();
-                ContentSizeFitter SizeFitter = newReaction.GetComponent<ContentSizeFitter>();
 
-                SizeFitter.enabled = false;
-                rt.sizeDelta = new Vector2(150, 110);
-            }*/
+
             ChatReactionHandler chatReactionHandler = newReaction.GetComponentInChildren<ChatReactionHandler>();
             chatReactionHandler.SetReactionInfo(reactionSprite, messageID, mood);
             chatReactionHandler.AddReaction(_reaction);
             _reactionHandlers.Add(chatReactionHandler);
+
             ReactionData.Add(_reaction);
             chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, message));
             chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(chatReactionHandler, message));
@@ -284,36 +280,31 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                         //Removes the selected Mood from the list  by checking what sprite is being used
                         _reactionList[i].Selected = true;
 
-                        if(Popup.gameObject.activeSelf)
+                        if(_reactionPopup.gameObject.activeSelf)
                         foreach (var reactionData in ReactionData)
                         {
-                            Popup.AddUsersReaction(message, reactionData);
+                            _reactionPopup.AddUsersReaction(message, reactionData);
                         }
                     }
 
             }));
-            if(Popup.gameObject.activeSelf)
+            if(_reactionPopup.gameObject.activeSelf)
             {
-                Popup.AddUsersReaction(message, _reaction);
+                _reactionPopup.AddUsersReaction(message, _reaction);
             }
 
                 GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-                UpdateReactionStatus(_reactionPaneldata._reactionsContent);
             
             PickCommonReactions();
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(ReactionPanel.GetComponent<RectTransform>());
 
-            if(Popup.gameObject.activeSelf)
+            if(_reactionPopup.gameObject.activeSelf)
             {
-            GenarateReactionObjects(Popup.PopUpAllReactions);
-            UpdateReactionStatus(Popup.PopUpAllReactions);
+                GenarateReactionObjects(_reactionPopup.PopUpAllReactions);
             }
 
 
-
-
-
             _selectedMessage.SetMessageInactive();
 
 
@@ -342,8 +333,8 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage mess
                     {
                         ReactionData.Remove(ReactionData[i]);
 
-                        if(Popup.gameObject.activeSelf)
-                        Popup.RemoveUserReaction(player.Id);
+                        if(_reactionPopup.gameObject.activeSelf)
+                        _reactionPopup.RemoveUserReaction(player.Id);
                         
                     }
                 }
@@ -375,42 +366,22 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
 
         
         //halts the button as when field get copied it the button will rerun the script again duplicating it twice
-        if(Popup.gameObject.activeSelf)
+        if(_reactionPopup.gameObject.activeSelf)
             return;
 
 
-        //Gets needed data for ChatShowUserPopUpData
-        Popup._messageReactionsHandler = gameObject.GetComponent<MessageReactionsHandler>();
-        Popup.gameObject.SetActive(true);
-        Popup.CopiedReactionField = Instantiate(_reactionPaneldata._reactionField, Popup.ReactionFieldLocation);
-
-        Popup._scrollRect.content = Popup.CopiedReactionField.GetComponent<RectTransform>();
+        //Gets needed data for ChatShowUserPopUpData1
+        _reactionPopup.gameObject.SetActive(true);
 
-        GenarateReactionObjects(Popup.PopUpAllReactions);
-        UpdateReactionStatus(Popup.PopUpAllReactions);
 
         //Changes the reactions object sizes
-        foreach(RectTransform child in Popup.CopiedReactionField.transform)
-        {
-            ContentSizeFitter childFitter = child.GetComponent<ContentSizeFitter>();
-            childFitter.enabled = false;
-
-            Button test = child.GetComponent<Button>();
-
-            test.onClick.RemoveAllListeners();
-
-            test.onClick.AddListener(() => ToggleReaction(reactionHandler, message));
-
-
-
-
-            child.sizeDelta = new Vector2(150, 110);
-        }
+        _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, _reactionPopup.ReactionFieldLocation);
 
+        GenarateReactionObjects(_reactionPopup.PopUpAllReactions);
 
         foreach (var reactionData in ReactionData)
         {
-            Popup.AddUsersReaction(message, reactionData);
+            _reactionPopup.AddUsersReaction(message, reactionData);
         }
 
         _longClick = true;
@@ -447,10 +418,10 @@ private void RemoveReaction(ChatReactionHandler reaction)
 
 
             
-            reaction.transform.SetParent(null);
-            _reactionHandlers.Remove(reaction);
+        reaction.transform.SetParent(null);
+        _reactionHandlers.Remove(reaction);
 
-            Destroy(reaction.gameObject);
+        Destroy(reaction.gameObject);
 
         StartCoroutine(GetPlayerData(player =>
         {
@@ -464,12 +435,12 @@ private void RemoveReaction(ChatReactionHandler reaction)
         }));
 
         GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-        UpdateReactionStatus(_reactionPaneldata._reactionsContent);
-        if (Popup.gameObject.activeSelf)
+        
+        if (_reactionPopup.gameObject.activeSelf)
         {
-            GenarateReactionObjects(Popup.PopUpAllReactions);
-            UpdateReactionStatus(Popup.PopUpAllReactions);
+            GenarateReactionObjects(_reactionPopup.PopUpAllReactions);
         }
+
         PickCommonReactions();
             _selectedMessage.SizeCall();
             
@@ -478,21 +449,6 @@ private void RemoveReaction(ChatReactionHandler reaction)
 
 
         }
-    //_chatScript.UpdateContentLayout(reactionsField);
-    public void ReactionResize()
-    {
-       /* foreach (var i in _reactionHandlers)
-        {
-            ContentSizeFitter SizeFitter = i._messageReaction.GetComponent<ContentSizeFitter>();
-            RectTransform transform = i._messageReaction.GetComponent<RectTransform>();
-            SizeFitter.enabled = true;
-
-            transform.sizeDelta = new Vector2(transform.sizeDelta.x, 70);
-
-            
-
-        }*/
-    }
 }
 
     //Reverts reactions size back to orignal size when leaving ShowUserPopUp

From b67995297d705b7e96771880451e41fbaddfeb5d Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Tue, 9 Jun 2026 10:55:38 +0300
Subject: [PATCH 05/13] ShowUserPopUp 1.4

- Changed all ChatShowUsersPopUpData variable's into private
- fixed an issue where reaction selection did not update properly
---
 .../Windows/GlobalWindows/ChatView.prefab     |   7 +-
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    |  29 ++---
 .../Scripts/Chat/MessageReactionsHandler.cs   | 106 ++++++++----------
 3 files changed, 64 insertions(+), 78 deletions(-)

diff --git a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
index 0939d178c7..1820734487 100644
--- a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
+++ b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
@@ -6167,6 +6167,9 @@ MonoBehaviour:
   _closeAllReactionButton: {fileID: 2014114443139516172}
   _listOrderButton: {fileID: 3052950907519947448}
   ShowUsersPopUp: {fileID: 5763485112562100175}
+  _reactionFieldLocation: {fileID: 4349249108874952513}
+  PopUpAllReactions: {fileID: 8542177965822184391}
+  _scrollRect: {fileID: 959950731169273863}
   _userContent: {fileID: 7215285588370245146}
   _userData: {fileID: 8844569307860996610, guid: d9e96f8283e71824cadeec334b0a267e,
     type: 3}
@@ -6185,9 +6188,6 @@ MonoBehaviour:
   _allReactions: {fileID: 7575259912955991635}
   _selectedReaction: {fileID: 3062161777963099109}
   _noReactions: {fileID: 8829262437161837364}
-  CopiedReactionField: {fileID: 0}
-  ReactionFieldLocation: {fileID: 4349249108874952513}
-  PopUpAllReactions: {fileID: 8542177965822184391}
   _sprites:
   - {fileID: 0}
   - {fileID: 0}
@@ -6196,7 +6196,6 @@ MonoBehaviour:
   - {fileID: 21300000, guid: a12221f1d2fd7194dbb2e0620c4fe9b8, type: 3}
   _image: {fileID: 4777644748716934985}
   _OrderButtonText: {fileID: 4953989987484460405}
-  _scrollRect: {fileID: 959950731169273863}
 --- !u!114 &7249710220094630189
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index 508b96d4f9..857b9ddc92 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -4,7 +4,6 @@
 using UnityEngine;
 using TMPro;
 using UnityEngine.UI;
-using static MessageReactionsHandler;
 using System;
 using Altzone.Scripts.Chat;
 using Altzone.Scripts.Model.Poco.Player;
@@ -13,38 +12,37 @@
 
 public class ChatShowUsersPopUpData : MonoBehaviour
 {
-    [SerializeField] private TextMeshProUGUI ReactionAmounText;
+    [Header("Buttons")]
     [SerializeField] private Button[] _closeButtons;
     [SerializeField] private Button _closeAllReactionButton;
     [SerializeField] private Button _listOrderButton;
-    [SerializeField] private GameObject ShowUsersPopUp;
 
-    [Header("Scripts")]
-    [Header("User Info")]
+    [Header("For Copied Reactions")]
+    [SerializeField] private Transform _reactionFieldLocation;
+    private GameObject CopiedReactionField;
+    [SerializeField] private Transform PopUpAllReactions;
+    [SerializeField] private ScrollRect _scrollRect;
 
+    [Header("User Info")]
     [SerializeField] private VerticalLayoutGroup _userContent;
     [SerializeField] private GameObject _userData;
     private List<UsersReactionData> _usersReactionData = new();
     [SerializeField] private List<UserReactionInfo> _userInfo;
 
     [Header("Reactions")]
+    [SerializeField] private TextMeshProUGUI ReactionAmounText;
     [SerializeField] private List<ReactionObject> _reactionList;
     [SerializeField] private GameObject _allReactions;
     [SerializeField] private GameObject _selectedReaction;
     [SerializeField] private GameObject _noReactions;
-    private GameObject CopiedReactionField;
-    public Transform ReactionFieldLocation;
-    public Transform PopUpAllReactions;
+
+    [Header("List Order")]
     [SerializeField] private Sprite[] _sprites;
     [SerializeField] private Image _image;
     [SerializeField] private TextMeshProUGUI _OrderButtonText;
     private int LineOrder = 0;
     private int currentOrder = 1;
 
-    public ScrollRect _scrollRect;
-
-
-    //[SerializeField] private TextLanguageSelectorCaller _reactionAmount;
     private void Start()
     {
         _closeAllReactionButton.onClick.AddListener(LayoutButton);
@@ -186,11 +184,11 @@ void LayoutButton()
     //Sets the List in certain order
 
     //Changes the reactions object sizes
-    public void ReactionFieldCopyUpdate(GameObject ReactionField, Transform ReactionLocation)
+    public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHandler ReactionHandler)
     {
         Destroy(CopiedReactionField);
 
-        CopiedReactionField = Instantiate(ReactionField, ReactionLocation);
+        CopiedReactionField = Instantiate(ReactionField, _reactionFieldLocation);
 
         _scrollRect.content = CopiedReactionField.GetComponent<RectTransform>();
 
@@ -201,6 +199,9 @@ public void ReactionFieldCopyUpdate(GameObject ReactionField, Transform Reaction
 
             child.sizeDelta = new Vector2(150, 110);
         }
+
+        ReactionHandler.GenarateReactionObjects(PopUpAllReactions);
+
     }
 
 
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index d55b9c746c..194cdef2bf 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -66,7 +66,7 @@ private void OnDestroy()
         //ReactionObjectHandler.OnReactionPressed -= AddReaction;
     }
 
-    private void GenarateReactionObjects(Transform reactionPanel)
+    public void GenarateReactionObjects(Transform reactionPanel)
     {
         _reactions.Clear();
         foreach (Transform reaction in reactionPanel)
@@ -130,6 +130,7 @@ private void PickCommonReactions()
                 randomReaction = UnityEngine.Random.Range(0, availableReactions.Count);
             }
             while (_commonReactions.Contains(randomReaction));*/
+
             if (availableReactions.Count <= i) break;
             randomReaction = i;
 
@@ -162,7 +163,6 @@ private void PickCommonReactions()
     /// </summary>
     public void UpdateReactions(List<ServerReactions> reactions, string messageid, ChatMessage message)
     {
-
             foreach (ChatReactionHandler addedReaction in _reactionHandlers)
             {
                 addedReaction.ResetReactions();
@@ -190,7 +190,7 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
             //Used for "ChatShowUserPopUpData"
             if(_reactionPopup.gameObject.activeSelf)
             {
-                _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, _reactionPopup.ReactionFieldLocation);
+                _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this);
             }
         
     }
@@ -200,9 +200,6 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
     /// </summary>
     public void AddReaction(ServerReactions _reaction, Mood mood, string message_id, GameObject ReactionPanel = null, ChatMessage message = null)
     {
-
-
-        
         if (_selectedMessage != null)
         {
 
@@ -210,6 +207,11 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             if (messageID != message_id)
                 return;
 
+            foreach (var j in _reactionList)
+            {
+                    //Adds the set sprite back in to reaction selection
+                    j.Selected = false;
+            }
 
             HorizontalLayoutGroup reactionsFields = ReactionPanel.GetComponent<HorizontalLayoutGroup>();
 
@@ -232,6 +234,8 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
                             if (player.Id == _reaction.sender_id)
                             {
+                                
+
 
                                 _reactionList[i].Selected = true;
                                 addedReaction.Select();
@@ -249,13 +253,12 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                                 }
                             }
                     }));
-
+                        GenarateReactionObjects(_reactionPaneldata._reactionsContent);
                         _selectedMessage.SetMessageInactive();
                     return;
 
                 }
             }
-
             // Creates a reaction with the needed info and adds it to the selected message.
             GameObject newReaction = Instantiate(_addedReactionPrefab, reactionsFields.transform);
 
@@ -293,18 +296,12 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                 _reactionPopup.AddUsersReaction(message, _reaction);
             }
 
-                GenarateReactionObjects(_reactionPaneldata._reactionsContent);
+            GenarateReactionObjects(_reactionPaneldata._reactionsContent);
             
             PickCommonReactions();
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(ReactionPanel.GetComponent<RectTransform>());
 
-            if(_reactionPopup.gameObject.activeSelf)
-            {
-                GenarateReactionObjects(_reactionPopup.PopUpAllReactions);
-            }
-
-
             _selectedMessage.SetMessageInactive();
 
 
@@ -322,9 +319,18 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage mess
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
         {
-            _selectedMessage.SetMessageInactive();
+            foreach (var i in _reactionList)
+            {
+                if (i.Mood != reactionHandler.Mood)
+                {
+                    //Resets the reactions selections list back to zero
+                    i.Selected = false;
 
-            reactionHandler.Deselect();
+                }
+            }
+
+            _selectedMessage.SetMessageInactive();
+            
             StartCoroutine(GetPlayerData(player =>
             {
                 for (int i = 0; i < ReactionData.Count; i++)
@@ -339,24 +345,16 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage mess
                     }
                 }
             }));
+
             if (reactionHandler.Selected)
             {
-
-                foreach (var i in _reactionList)
-                {
-                    if (i.Mood == reactionHandler.Mood)
-                    {
-                        //Adds the set sprite back in to reaction selection
-                        i.Selected = false;
-                       
-                    }
-                }
+               reactionHandler.Deselect();
             }
             else
             {
                 reactionHandler.Select();
             }
-
+            GenarateReactionObjects(_reactionPaneldata._reactionsContent);
 
         }
     }
@@ -375,9 +373,9 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
 
 
         //Changes the reactions object sizes
-        _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, _reactionPopup.ReactionFieldLocation);
+        _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this);
 
-        GenarateReactionObjects(_reactionPopup.PopUpAllReactions);
+        
 
         foreach (var reactionData in ReactionData)
         {
@@ -401,54 +399,42 @@ private void ResetLongClick()
 
     private void RemoveReaction(ChatReactionHandler reaction)
     {
-
         //Checks if the set gameObject is on or not
-            HorizontalLayoutGroup reactionsField = _reactionPaneldata._reactionField.GetComponent<HorizontalLayoutGroup>();
-
-
+        HorizontalLayoutGroup reactionsField = _reactionPaneldata._reactionField.GetComponent<HorizontalLayoutGroup>();
+        reaction.transform.SetParent(null);
+        _reactionHandlers.Remove(reaction);
 
-            foreach (var i in _reactionList)
+        foreach (var i in _reactionList)
+        {
+            if (i.Mood == reaction.Mood)
             {
-                if (i.Mood == reaction.Mood)
-                {
-                    i.Selected = false;
+                //Resets the reactions selections list back to zero
+                i.Selected = false;
 
-                }
             }
-
-
-            
-        reaction.transform.SetParent(null);
-        _reactionHandlers.Remove(reaction);
+        }
 
         Destroy(reaction.gameObject);
 
         StartCoroutine(GetPlayerData(player =>
         {
-        for (int i = 0; i < ReactionData.Count; i++)
-            {
-                if (ReactionData[i].sender_id == player.Id)
+            for (int i = 0; i < ReactionData.Count; i++)
                 {
-                    ReactionData.Remove(ReactionData[i]);
+                    if (ReactionData[i].sender_id == player.Id)
+                    {
+                        ReactionData.Remove(ReactionData[i]);
+                    }
                 }
-            }
         }));
 
         GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-        
-        if (_reactionPopup.gameObject.activeSelf)
-        {
-            GenarateReactionObjects(_reactionPopup.PopUpAllReactions);
-        }
+
 
         PickCommonReactions();
-            _selectedMessage.SizeCall();
+        _selectedMessage.SizeCall();
             
-            LayoutRebuilder.ForceRebuildLayoutImmediate(reactionsField.GetComponent<RectTransform>());
-                  
-
-
-        }
+        LayoutRebuilder.ForceRebuildLayoutImmediate(reactionsField.GetComponent<RectTransform>());
+    }
 }
 
     //Reverts reactions size back to orignal size when leaving ShowUserPopUp

From 528d27f52ae719ed5ebe8edf3364f7c676080ca2 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Thu, 11 Jun 2026 15:40:53 +0300
Subject: [PATCH 06/13] ShowUserPopUp 1.5

- Fixed an issue where other user adding reaction from a other message wont update the popup
- Fixed an issue where reaction selection gets updated when other user is adding their own reaction
---
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    |  35 +++-
 .../Scripts/Chat/MessageReactionsHandler.cs   | 180 +++++++++---------
 2 files changed, 118 insertions(+), 97 deletions(-)

diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index 857b9ddc92..d3effd0bc0 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -40,6 +40,8 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     [SerializeField] private Sprite[] _sprites;
     [SerializeField] private Image _image;
     [SerializeField] private TextMeshProUGUI _OrderButtonText;
+
+    private string CurrentMessage;
     private int LineOrder = 0;
     private int currentOrder = 1;
 
@@ -67,6 +69,7 @@ public void ClosePopup()
         Destroy(CopiedReactionField);
         CopiedReactionField = null;
         _scrollRect.content = null;
+        CurrentMessage = null;
         gameObject.SetActive(false);
         LineOrder = 0;
 
@@ -107,6 +110,17 @@ public void reactiontext()
 
     public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
     {
+        //Checks if it's on a correct Message section
+        if (CurrentMessage != null)
+        {
+            if (CurrentMessage != message.Id)
+                return;
+        }
+        else
+        {
+            CurrentMessage = message.Id;
+        }
+
                 Mood mood = (Mood)Enum.Parse(typeof(Mood), Emoji.emoji);
 
         //halts the system if there's already a same user on the list
@@ -118,7 +132,7 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
 
             if (_userInfo[i]._id == Emoji.sender_id &&  _userInfo[i]._mood != mood)
             {
-                RemoveUserReaction(Emoji.sender_id);
+                RemoveUserReaction(Emoji.sender_id, message);
                 continue;
             }
             else if (_userInfo[i]._id == Emoji.sender_id && _userInfo[i]._mood == mood)
@@ -148,10 +162,14 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
     }
 
     //removes the userData
-    public void RemoveUserReaction(string Userid)
+    public void RemoveUserReaction(string Userid, ChatMessage message)
     {
+        if (CurrentMessage != null)
+        {
+            if (CurrentMessage != message.Id)
+                return;
+        }
 
-        
         for (int i = _userInfo.Count - 1; i >= 0; i--)
             {
 
@@ -184,8 +202,17 @@ void LayoutButton()
     //Sets the List in certain order
 
     //Changes the reactions object sizes
-    public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHandler ReactionHandler)
+    public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHandler ReactionHandler, ChatMessage message)
     {
+
+        //Checks if it's on a correct Message section
+        if (CurrentMessage != null)
+        {
+            if (CurrentMessage != message.Id)
+                return;
+        }
+
+
         Destroy(CopiedReactionField);
 
         CopiedReactionField = Instantiate(ReactionField, _reactionFieldLocation);
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index 194cdef2bf..b52da808c2 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -13,7 +13,7 @@ public class MessageReactionsHandler : AltMonoBehaviour
     [SerializeField] private GameObject _commonReactionsPanel;
     [SerializeField] private GameObject _allReactionsPanel;
 
-    [SerializeField]  private reactionPanelGroup _reactionPaneldata;
+    [SerializeField] private reactionPanelGroup _reactionPaneldata;
     [Header("Prefabs")]
     [SerializeField] private GameObject _addedReactionPrefab;
 
@@ -37,12 +37,13 @@ public class MessageReactionsHandler : AltMonoBehaviour
     private ChatShowUsersPopUpData _reactionPopup = Chat.instance?.ChatShowUsersPopUpData;
 
 
-    [SerializeField]public List<ServerReactions> ReactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
+    [SerializeField] public List<ServerReactions> ReactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
 
     void Start()
     {
         //For "AddReactions"
-        _openMoreButton.onClick.AddListener((() => {
+        _openMoreButton.onClick.AddListener((() =>
+        {
             _allReactionsPanel.SetActive(true);
             _selectedMessage.SizeCall();
             _commonReactionsPanel.SetActive(false);
@@ -163,36 +164,37 @@ private void PickCommonReactions()
     /// </summary>
     public void UpdateReactions(List<ServerReactions> reactions, string messageid, ChatMessage message)
     {
-            foreach (ChatReactionHandler addedReaction in _reactionHandlers)
-            {
-                addedReaction.ResetReactions();
-            }
-            foreach (ServerReactions reaction in reactions)
-            {
-                AddReaction(reaction, (Mood)Enum.Parse(typeof(Mood), reaction.emoji), messageid, _reactionPaneldata._reactionField, message);
-                
-            }
-            List<ChatReactionHandler> removableReactions = new();
-            foreach (ChatReactionHandler addedReaction in _reactionHandlers)
-            {
 
-                if (addedReaction.Count <= 0)
-                {
-                    removableReactions.Add(addedReaction);
-                } 
+        foreach (ChatReactionHandler addedReaction in _reactionHandlers)
+        {
+            addedReaction.ResetReactions();
+        }
+        foreach (ServerReactions reaction in reactions)
+        {
+            AddReaction(reaction, (Mood)Enum.Parse(typeof(Mood), reaction.emoji), messageid, _reactionPaneldata._reactionField, message);
 
-            }
-            for (int i = removableReactions.Count - 1; i >= 0; i--)
-            {
-                RemoveReaction(removableReactions[i]);
-            }
+        }
+        List<ChatReactionHandler> removableReactions = new();
+        foreach (ChatReactionHandler addedReaction in _reactionHandlers)
+        {
 
-            //Used for "ChatShowUserPopUpData"
-            if(_reactionPopup.gameObject.activeSelf)
+            if (addedReaction.Count <= 0)
             {
-                _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this);
+                removableReactions.Add(addedReaction);
             }
-        
+
+        }
+        for (int i = removableReactions.Count - 1; i >= 0; i--)
+        {
+            RemoveReaction(removableReactions[i]);
+        }
+
+        //Used for "ChatShowUserPopUpData"
+        if (_reactionPopup.gameObject.activeSelf)
+        {
+            _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this, message);
+        }
+
     }
 
     /// <summary>
@@ -202,17 +204,10 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
     {
         if (_selectedMessage != null)
         {
-
             string messageID = _selectedMessage.Id;
             if (messageID != message_id)
                 return;
 
-            foreach (var j in _reactionList)
-            {
-                    //Adds the set sprite back in to reaction selection
-                    j.Selected = false;
-            }
-
             HorizontalLayoutGroup reactionsFields = ReactionPanel.GetComponent<HorizontalLayoutGroup>();
 
 
@@ -221,7 +216,7 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             Sprite reactionSprite = _reactionList.FirstOrDefault(x => x.Mood == mood)?.Sprite;
             int i = _reactionList.FindIndex(m => m.Sprite == reactionSprite);
 
-                    
+
             // Checks if chosen reaction is already added to the selected message. If so, deletes it.
             foreach (ChatReactionHandler addedReaction in _reactionHandlers)
             {
@@ -234,12 +229,17 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
                             if (player.Id == _reaction.sender_id)
                             {
-                                
-
+                                //Refreshes the reaction selection
+                                ClearList(_reaction);
 
                                 _reactionList[i].Selected = true;
+
                                 addedReaction.Select();
 
+                              // ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
+
+
+
                                 ReactionData.Add(_reaction);
 
                                 if (_reactionPopup.gameObject.activeSelf)
@@ -253,8 +253,8 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                                 }
                             }
                     }));
-                        GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-                        _selectedMessage.SetMessageInactive();
+                    GenarateReactionObjects(_reactionPaneldata._reactionsContent);
+                    _selectedMessage.SetMessageInactive();
                     return;
 
                 }
@@ -269,35 +269,38 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             chatReactionHandler.AddReaction(_reaction);
             _reactionHandlers.Add(chatReactionHandler);
 
+            //ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
             ReactionData.Add(_reaction);
-            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, message));
+            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction));
             chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(chatReactionHandler, message));
-            
+
             StartCoroutine(GetPlayerData(player =>
             {
                 if (player != null)
                     if (player.Id == _reaction.sender_id)
                     {
-                        
+
                         chatReactionHandler.Select();
-                        //Removes the selected Mood from the list  by checking what sprite is being used
+
+                        //Refreshes the reaction selection
+                        ClearList(_reaction);
                         _reactionList[i].Selected = true;
 
-                        if(_reactionPopup.gameObject.activeSelf)
-                        foreach (var reactionData in ReactionData)
-                        {
-                            _reactionPopup.AddUsersReaction(message, reactionData);
-                        }
+                        if (_reactionPopup.gameObject.activeSelf)
+                            foreach (var reactionData in ReactionData)
+                            {
+                                _reactionPopup.AddUsersReaction(message, reactionData);
+                            }
                     }
 
             }));
-            if(_reactionPopup.gameObject.activeSelf)
+            if (_reactionPopup.gameObject.activeSelf)
             {
                 _reactionPopup.AddUsersReaction(message, _reaction);
             }
 
             GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-            
+
             PickCommonReactions();
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(ReactionPanel.GetComponent<RectTransform>());
@@ -314,41 +317,22 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
     /// Toggles the added reactions as selected and unselected.
     /// </summary>
     /// <param name="reactionHandler"></param>
-    public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage message)
+    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction)
     {
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
         {
-            foreach (var i in _reactionList)
-            {
-                if (i.Mood != reactionHandler.Mood)
-                {
-                    //Resets the reactions selections list back to zero
-                    i.Selected = false;
 
-                }
-            }
 
             _selectedMessage.SetMessageInactive();
-            
-            StartCoroutine(GetPlayerData(player =>
-            {
-                for (int i = 0; i < ReactionData.Count; i++)
-                {
-                    if (ReactionData[i].sender_id == player.Id)
-                    {
-                        ReactionData.Remove(ReactionData[i]);
 
-                        if(_reactionPopup.gameObject.activeSelf)
-                        _reactionPopup.RemoveUserReaction(player.Id);
-                        
-                    }
-                }
-            }));
+            //ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
+
+            ClearList(_reaction);
 
             if (reactionHandler.Selected)
             {
-               reactionHandler.Deselect();
+                reactionHandler.Deselect();
             }
             else
             {
@@ -362,9 +346,9 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ChatMessage mess
     private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
     {
 
-        
+
         //halts the button as when field get copied it the button will rerun the script again duplicating it twice
-        if(_reactionPopup.gameObject.activeSelf)
+        if (_reactionPopup.gameObject.activeSelf)
             return;
 
 
@@ -373,9 +357,9 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
 
 
         //Changes the reactions object sizes
-        _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this);
+        _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this, message);
+
 
-        
 
         foreach (var reactionData in ReactionData)
         {
@@ -386,7 +370,7 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
 
 
         //_usersWhoAdded.SetActive(true);
-        
+
         //_chatScript.OpenUsersWhoAddedReactionPanel();
 
         Invoke("ResetLongClick", 2);
@@ -399,11 +383,15 @@ private void ResetLongClick()
 
     private void RemoveReaction(ChatReactionHandler reaction)
     {
+
         //Checks if the set gameObject is on or not
         HorizontalLayoutGroup reactionsField = _reactionPaneldata._reactionField.GetComponent<HorizontalLayoutGroup>();
         reaction.transform.SetParent(null);
         _reactionHandlers.Remove(reaction);
 
+        //ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
+
+
         foreach (var i in _reactionList)
         {
             if (i.Mood == reaction.Mood)
@@ -413,28 +401,34 @@ private void RemoveReaction(ChatReactionHandler reaction)
 
             }
         }
-
         Destroy(reaction.gameObject);
 
-        StartCoroutine(GetPlayerData(player =>
-        {
-            for (int i = 0; i < ReactionData.Count; i++)
-                {
-                    if (ReactionData[i].sender_id == player.Id)
-                    {
-                        ReactionData.Remove(ReactionData[i]);
-                    }
-                }
-        }));
-
         GenarateReactionObjects(_reactionPaneldata._reactionsContent);
 
 
         PickCommonReactions();
         _selectedMessage.SizeCall();
-            
+
         LayoutRebuilder.ForceRebuildLayoutImmediate(reactionsField.GetComponent<RectTransform>());
     }
+
+
+    //Clearns the list empty (with those what has players ID) so that new data can be added
+    private void ClearList(ServerReactions _reaction)
+    {
+
+        for (int i = 0; i < ReactionData.Count; i++)
+        {
+            if (ReactionData[i].sender_id == _reaction.sender_id)
+            {
+                foreach (var j in _reactionList)
+                {
+                    //Adds the set sprite back in to reaction selection
+                    j.Selected = false;
+                }
+            }
+        }
+    }
 }
 
     //Reverts reactions size back to orignal size when leaving ShowUserPopUp

From 073688196f76a7be84977e4709f6018480ac25e2 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Fri, 12 Jun 2026 16:39:07 +0300
Subject: [PATCH 07/13] ShowUserPopUp 1.6

- System now updates the ReactionData both main player and other users reactions data (removing system for it, isn't here yet)
---
 .../Scripts/Chat/MessageReactionsHandler.cs   | 85 +++++++++++++------
 1 file changed, 59 insertions(+), 26 deletions(-)

diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index b52da808c2..cb6b72c604 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -6,6 +6,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 using static ServerChatMessage;
+using static UnityEngine.InputSystem.DefaultInputActions;
 
 public class MessageReactionsHandler : AltMonoBehaviour
 {
@@ -186,9 +187,15 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
         }
         for (int i = removableReactions.Count - 1; i >= 0; i--)
         {
+
+
             RemoveReaction(removableReactions[i]);
+
         }
 
+
+
+
         //Used for "ChatShowUserPopUpData"
         if (_reactionPopup.gameObject.activeSelf)
         {
@@ -217,7 +224,10 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             int i = _reactionList.FindIndex(m => m.Sprite == reactionSprite);
 
 
+
+
             // Checks if chosen reaction is already added to the selected message. If so, deletes it.
+                                //Debug.LogWarning("FIND ME UK WHY rawfwafw" + messageID + " === " + _reaction.sender_id);
             foreach (ChatReactionHandler addedReaction in _reactionHandlers)
             {
                 if (addedReaction.Mood == mood)
@@ -229,6 +239,7 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
                             if (player.Id == _reaction.sender_id)
                             {
+                                
                                 //Refreshes the reaction selection
                                 ClearList(_reaction);
 
@@ -236,22 +247,21 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
                                 addedReaction.Select();
 
-                              // ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
-
-
-
-                                ReactionData.Add(_reaction);
+                            }
+                        //Empties the list and Adds the newly added data for that user ID
+                        ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
+                        ReactionData.Add(_reaction);
 
-                                if (_reactionPopup.gameObject.activeSelf)
-                                {
+                        if (_reactionPopup.gameObject.activeSelf)
+                        {
 
-                                    foreach (var reactionData in ReactionData)
-                                    {
-                                        _reactionPopup.AddUsersReaction(message, reactionData);
+                            foreach (var reactionData in ReactionData)
+                            {
+                                _reactionPopup.AddUsersReaction(message, reactionData);
 
-                                    }
-                                }
                             }
+                        }
+
                     }));
                     GenarateReactionObjects(_reactionPaneldata._reactionsContent);
                     _selectedMessage.SetMessageInactive();
@@ -267,11 +277,14 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             ChatReactionHandler chatReactionHandler = newReaction.GetComponentInChildren<ChatReactionHandler>();
             chatReactionHandler.SetReactionInfo(reactionSprite, messageID, mood);
             chatReactionHandler.AddReaction(_reaction);
-            _reactionHandlers.Add(chatReactionHandler);
 
-            //ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
-            ReactionData.Add(_reaction);
-            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction));
+
+
+
+
+
+            _reactionHandlers.Add(chatReactionHandler);
+            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction, messageID, message));
             chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(chatReactionHandler, message));
 
             StartCoroutine(GetPlayerData(player =>
@@ -286,11 +299,20 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                         ClearList(_reaction);
                         _reactionList[i].Selected = true;
 
-                        if (_reactionPopup.gameObject.activeSelf)
-                            foreach (var reactionData in ReactionData)
-                            {
-                                _reactionPopup.AddUsersReaction(message, reactionData);
-                            }
+
+                    }
+                    //Empties the list and Adds the newly added data for that user ID
+                    ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
+                    ReactionData.Add(_reaction);
+
+                    if (_reactionPopup.gameObject.activeSelf)
+                    {
+
+                        foreach (var reactionData in ReactionData)
+                        {
+                            _reactionPopup.AddUsersReaction(message, reactionData);
+
+                        }
                     }
 
             }));
@@ -317,13 +339,27 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
     /// Toggles the added reactions as selected and unselected.
     /// </summary>
     /// <param name="reactionHandler"></param>
-    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction)
+    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction, string messageID, ChatMessage message)
     {
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
         {
 
 
+            ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
+            ReactionData.Add(_reaction);
+
+
+            if (_reactionPopup.gameObject.activeSelf)
+            {
+
+                foreach (var reactionData in ReactionData)
+                {
+                    _reactionPopup.AddUsersReaction(message, reactionData);
+
+                }
+            }
+
             _selectedMessage.SetMessageInactive();
 
             //ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
@@ -345,9 +381,6 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions
 
     private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
     {
-
-
-        //halts the button as when field get copied it the button will rerun the script again duplicating it twice
         if (_reactionPopup.gameObject.activeSelf)
             return;
 
@@ -383,7 +416,7 @@ private void ResetLongClick()
 
     private void RemoveReaction(ChatReactionHandler reaction)
     {
-
+        
         //Checks if the set gameObject is on or not
         HorizontalLayoutGroup reactionsField = _reactionPaneldata._reactionField.GetComponent<HorizontalLayoutGroup>();
         reaction.transform.SetParent(null);

From b69c4587e5faec25bf9215686f10535a82cbc6c4 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Tue, 16 Jun 2026 15:33:17 +0300
Subject: [PATCH 08/13] ShowUserPopUp 1.7

- ReactionData now removes correct user ID in toggle system (right now the system only works to main user directly not other users yet)
---
 .../Scripts/Chat/MessageReactionsHandler.cs   | 60 +++++++------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index cb6b72c604..0a18861c73 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -40,6 +40,8 @@ public class MessageReactionsHandler : AltMonoBehaviour
 
     [SerializeField] public List<ServerReactions> ReactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
 
+    [SerializeField] private string playerID;
+
     void Start()
     {
         //For "AddReactions"
@@ -52,11 +54,17 @@ void Start()
         }));
 
 
+        //Puts up the players ID
+        StartCoroutine(GetPlayerData(player =>
+        {
+            playerID = player.Id;
 
-        //ReactionObjectHandler.OnReactionPressed += AddReaction;
+        }));
 
+            //ReactionObjectHandler.OnReactionPressed += AddReaction;
 
-        GenarateReactionObjects(_reactionPaneldata._reactionsContent);
+
+            GenarateReactionObjects(_reactionPaneldata._reactionsContent);
 
         PickCommonReactions();
     }
@@ -165,13 +173,13 @@ private void PickCommonReactions()
     /// </summary>
     public void UpdateReactions(List<ServerReactions> reactions, string messageid, ChatMessage message)
     {
-
         foreach (ChatReactionHandler addedReaction in _reactionHandlers)
         {
             addedReaction.ResetReactions();
         }
         foreach (ServerReactions reaction in reactions)
         {
+            ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == reaction.sender_id);
             AddReaction(reaction, (Mood)Enum.Parse(typeof(Mood), reaction.emoji), messageid, _reactionPaneldata._reactionField, message);
 
         }
@@ -187,10 +195,7 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
         }
         for (int i = removableReactions.Count - 1; i >= 0; i--)
         {
-
-
             RemoveReaction(removableReactions[i]);
-
         }
 
 
@@ -227,7 +232,6 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
 
             // Checks if chosen reaction is already added to the selected message. If so, deletes it.
-                                //Debug.LogWarning("FIND ME UK WHY rawfwafw" + messageID + " === " + _reaction.sender_id);
             foreach (ChatReactionHandler addedReaction in _reactionHandlers)
             {
                 if (addedReaction.Mood == mood)
@@ -246,11 +250,12 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                                 _reactionList[i].Selected = true;
 
                                 addedReaction.Select();
+                                
 
                             }
-                        //Empties the list and Adds the newly added data for that user ID
-                        ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
-                        ReactionData.Add(_reaction);
+                            ReactionData.Add(_reaction);
+                            
+
 
                         if (_reactionPopup.gameObject.activeSelf)
                         {
@@ -277,14 +282,8 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             ChatReactionHandler chatReactionHandler = newReaction.GetComponentInChildren<ChatReactionHandler>();
             chatReactionHandler.SetReactionInfo(reactionSprite, messageID, mood);
             chatReactionHandler.AddReaction(_reaction);
-
-
-
-
-
-
             _reactionHandlers.Add(chatReactionHandler);
-            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction, messageID, message));
+            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction, playerID, message));
             chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(chatReactionHandler, message));
 
             StartCoroutine(GetPlayerData(player =>
@@ -299,11 +298,9 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                         ClearList(_reaction);
                         _reactionList[i].Selected = true;
 
-
-                    }
-                    //Empties the list and Adds the newly added data for that user ID
-                    ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
-                    ReactionData.Add(_reaction);
+                    } 
+                        ReactionData.Add(_reaction);
+                    
 
                     if (_reactionPopup.gameObject.activeSelf)
                     {
@@ -339,32 +336,25 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
     /// Toggles the added reactions as selected and unselected.
     /// </summary>
     /// <param name="reactionHandler"></param>
-    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction, string messageID, ChatMessage message)
+    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction, string playerID, ChatMessage message)
     {
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
         {
 
-
-            ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
-            ReactionData.Add(_reaction);
-
+            ClearList(_reaction);
+            
+            ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == playerID);
 
             if (_reactionPopup.gameObject.activeSelf)
             {
-
                 foreach (var reactionData in ReactionData)
                 {
                     _reactionPopup.AddUsersReaction(message, reactionData);
-
                 }
             }
-
             _selectedMessage.SetMessageInactive();
 
-            //ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
-
-            ClearList(_reaction);
 
             if (reactionHandler.Selected)
             {
@@ -375,7 +365,6 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions
                 reactionHandler.Select();
             }
             GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-
         }
     }
 
@@ -416,14 +405,11 @@ private void ResetLongClick()
 
     private void RemoveReaction(ChatReactionHandler reaction)
     {
-        
         //Checks if the set gameObject is on or not
         HorizontalLayoutGroup reactionsField = _reactionPaneldata._reactionField.GetComponent<HorizontalLayoutGroup>();
         reaction.transform.SetParent(null);
         _reactionHandlers.Remove(reaction);
 
-        //ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == _reaction.sender_id);
-
 
         foreach (var i in _reactionList)
         {

From 1a76707fb02ffd50095f9ce4c55a5a8bb7bb8e84 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Mon, 22 Jun 2026 16:12:27 +0300
Subject: [PATCH 09/13] ShowUserPopUp 1.8

- System now updates the info even if its main player or other players

I finally got the thing work after so long of grinding the code
---
 .../Scripts/Chat/MessageObjectHandler.cs      |  3 +
 .../Scripts/Chat/MessageReactionsHandler.cs   | 92 ++++++++-----------
 2 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
index 79ef30cf6d..d8013efc5d 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
@@ -159,6 +159,9 @@ public void ReactionChatCall(ServerReactions EmojiId, ChatMessage message)
         //Gets the set data we need to get to import saved reactions
         MessageReactionsHandler ChildsScript = ReactionObject.GetComponent<MessageReactionsHandler>();
         ChildsScript.AddReaction(EmojiId, (Mood)Enum.Parse(typeof(Mood), EmojiId.emoji), _id, ReactionsPanel, message);
+
+        //Used for ChatShowUsersPopUpData
+        ChildsScript.ReactionData.Add(EmojiId);
     }
 
     private void UpdateReactions(ChatChannelType chatChannelType, ChatMessage message)
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index 0a18861c73..e3fdc01ede 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -37,7 +37,6 @@ public class MessageReactionsHandler : AltMonoBehaviour
     private bool _longClick = false;
     private ChatShowUsersPopUpData _reactionPopup = Chat.instance?.ChatShowUsersPopUpData;
 
-
     [SerializeField] public List<ServerReactions> ReactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
 
     [SerializeField] private string playerID;
@@ -179,36 +178,34 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
         }
         foreach (ServerReactions reaction in reactions)
         {
-            ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == reaction.sender_id);
+
+            
             AddReaction(reaction, (Mood)Enum.Parse(typeof(Mood), reaction.emoji), messageid, _reactionPaneldata._reactionField, message);
 
         }
         List<ChatReactionHandler> removableReactions = new();
         foreach (ChatReactionHandler addedReaction in _reactionHandlers)
         {
-
             if (addedReaction.Count <= 0)
             {
                 removableReactions.Add(addedReaction);
             }
-
         }
         for (int i = removableReactions.Count - 1; i >= 0; i--)
         {
-            RemoveReaction(removableReactions[i]);
+            RemoveReaction(removableReactions[i], message);
         }
 
+            UpdateReactionData(reactions, message);
 
 
-
-        //Used for "ChatShowUserPopUpData"
-        if (_reactionPopup.gameObject.activeSelf)
+            //Used for "ChatShowUserPopUpData"
+            if (_reactionPopup.gameObject.activeSelf)
         {
             _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this, message);
         }
 
     }
-
     /// <summary>
     /// Adds the chosen reaction to the selected message.
     /// </summary>
@@ -253,20 +250,6 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                                 
 
                             }
-                            ReactionData.Add(_reaction);
-                            
-
-
-                        if (_reactionPopup.gameObject.activeSelf)
-                        {
-
-                            foreach (var reactionData in ReactionData)
-                            {
-                                _reactionPopup.AddUsersReaction(message, reactionData);
-
-                            }
-                        }
-
                     }));
                     GenarateReactionObjects(_reactionPaneldata._reactionsContent);
                     _selectedMessage.SetMessageInactive();
@@ -299,24 +282,7 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                         _reactionList[i].Selected = true;
 
                     } 
-                        ReactionData.Add(_reaction);
-                    
-
-                    if (_reactionPopup.gameObject.activeSelf)
-                    {
-
-                        foreach (var reactionData in ReactionData)
-                        {
-                            _reactionPopup.AddUsersReaction(message, reactionData);
-
-                        }
-                    }
-
             }));
-            if (_reactionPopup.gameObject.activeSelf)
-            {
-                _reactionPopup.AddUsersReaction(message, _reaction);
-            }
 
             GenarateReactionObjects(_reactionPaneldata._reactionsContent);
 
@@ -344,17 +310,6 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions
 
             ClearList(_reaction);
             
-            ReactionData.RemoveAll(ReactionData => ReactionData.sender_id == playerID);
-
-            if (_reactionPopup.gameObject.activeSelf)
-            {
-                foreach (var reactionData in ReactionData)
-                {
-                    _reactionPopup.AddUsersReaction(message, reactionData);
-                }
-            }
-            _selectedMessage.SetMessageInactive();
-
 
             if (reactionHandler.Selected)
             {
@@ -398,12 +353,45 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
         Invoke("ResetLongClick", 2);
     }
 
+    //Used for ChatShowUsersPopUpData to update the data
+    void UpdateReactionData(List<ServerReactions> reactions, ChatMessage message)
+    {
+        //Empties the data
+        if (_reactionPopup.gameObject.activeSelf)
+        {
+            foreach (var i in ReactionData)
+            {
+                _reactionPopup.RemoveUserReaction(i.sender_id, message);
+            }
+        }
+
+        ReactionData.Clear();
+
+
+        //Adds the data
+        foreach (ServerReactions reaction in reactions)
+        {
+            ReactionData.Add(reaction);
+
+        }
+
+        if (_reactionPopup.gameObject.activeSelf)
+        {
+
+            foreach (var reactionData in ReactionData)
+            {
+                _reactionPopup.AddUsersReaction(message, reactionData);
+
+            }
+        }
+    }
+
     private void ResetLongClick()
     {
         _longClick = false;
     }
 
-    private void RemoveReaction(ChatReactionHandler reaction)
+    private void RemoveReaction(ChatReactionHandler reaction, ChatMessage message)
     {
         //Checks if the set gameObject is on or not
         HorizontalLayoutGroup reactionsField = _reactionPaneldata._reactionField.GetComponent<HorizontalLayoutGroup>();

From cd431425878d6de3a289a3b1389030c209d3f16f Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Tue, 23 Jun 2026 13:44:59 +0300
Subject: [PATCH 10/13] ShowUserPopUp 2.0

- Cleared some code and did some adjustment to some parts
---
 .../Windows/GlobalWindows/ChatView.prefab     | 115 +++++++++++++++---
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    |  47 +++----
 .../Scripts/Chat/MessageReactionResize.cs     |   2 -
 .../Scripts/Chat/MessageReactionsHandler.cs   |  38 ++----
 4 files changed, 121 insertions(+), 81 deletions(-)

diff --git a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
index 1820734487..cc76ec62bc 100644
--- a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
+++ b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
@@ -731,6 +731,7 @@ GameObject:
   - component: {fileID: 5116059480852723547}
   - component: {fileID: 2736510401390861386}
   - component: {fileID: 2806177258080298227}
+  - component: {fileID: 5728103865936316895}
   m_Layer: 0
   m_Name: Viewport
   m_TagString: Untagged
@@ -750,6 +751,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5845669023103182092}
   - {fileID: 8542177965822184391}
   m_Father: {fileID: 4740981227950461619}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -809,6 +811,32 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!114 &5728103865936316895
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 774704010474596688}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &1035830549583425871
 GameObject:
   m_ObjectHideFlags: 0
@@ -878,7 +906,7 @@ RectTransform:
   m_Father: {fileID: 8651422333607763989}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2124,7 +2152,7 @@ RectTransform:
   m_Father: {fileID: 7802744954756901397}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -3389,7 +3417,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -63.58013}
+  m_AnchoredPosition: {x: 50, y: -71.28984}
   m_SizeDelta: {x: 100, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7696485582972512613
@@ -3634,6 +3662,62 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
+--- !u!1 &3435556442958773812
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5845669023103182092}
+  - component: {fileID: 9195409789549020322}
+  m_Layer: 0
+  m_Name: Space
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5845669023103182092
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3435556442958773812}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9004813816187228610}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 10, y: 110}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &9195409789549020322
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3435556442958773812}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 5
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &3493400003683782732
 GameObject:
   m_ObjectHideFlags: 0
@@ -4189,7 +4273,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7618322532180933409
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6159,14 +6243,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 477b38ea3c6f9974491f82799fbc1307, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ReactionAmounText: {fileID: 1480503946665984614}
   _closeButtons:
   - {fileID: 2943311908611794494}
   - {fileID: 7477148938460072697}
   - {fileID: 5020424597918123324}
   _closeAllReactionButton: {fileID: 2014114443139516172}
   _listOrderButton: {fileID: 3052950907519947448}
-  ShowUsersPopUp: {fileID: 5763485112562100175}
   _reactionFieldLocation: {fileID: 4349249108874952513}
   PopUpAllReactions: {fileID: 8542177965822184391}
   _scrollRect: {fileID: 959950731169273863}
@@ -6174,6 +6256,7 @@ MonoBehaviour:
   _userData: {fileID: 8844569307860996610, guid: d9e96f8283e71824cadeec334b0a267e,
     type: 3}
   _userInfo: []
+  ReactionAmounText: {fileID: 1480503946665984614}
   _reactionList:
   - Sprite: {fileID: 21300000, guid: 97d495bb5e2207e47b120d397738ae7f, type: 3}
     Mood: 1
@@ -6228,7 +6311,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8941222625236737338
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7806,7 +7889,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _rectTranformParent: {fileID: 4740981227950461619}
   _gridLayout: {fileID: 1398436554631707718}
-  _limitX: 120
+  _limitX: 110
   _limitY: 0
 --- !u!114 &2627813341174848299
 MonoBehaviour:
@@ -10026,7 +10109,7 @@ PrefabInstance:
     - target: {fileID: 2641932565321544379, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.9581281
+      value: 0.9491228
       objectReference: {fileID: 0}
     - target: {fileID: 2664587007262820359, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -10112,12 +10195,12 @@ PrefabInstance:
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.8631041
+      value: 0.85312283
       objectReference: {fileID: 0}
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.197584
+      value: 0.1005
       objectReference: {fileID: 0}
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -11494,7 +11577,7 @@ PrefabInstance:
     - target: {fileID: 6891754130952581934, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_fontSize
-      value: 29.85
+      value: 29.4
       objectReference: {fileID: 0}
     - target: {fileID: 6908065752443577215, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -12006,7 +12089,7 @@ PrefabInstance:
     - target: {fileID: 7827142668286818857, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.197584
+      value: 0.1005
       objectReference: {fileID: 0}
     - target: {fileID: 7887861368517116277, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -12241,17 +12324,17 @@ PrefabInstance:
     - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.9581281
+      value: 0.9491228
       objectReference: {fileID: 0}
     - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.8631041
+      value: 0.85312283
       objectReference: {fileID: 0}
     - target: {fileID: 9011883256918754321, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_fontSize
-      value: 43.85
+      value: 42.75
       objectReference: {fileID: 0}
     - target: {fileID: 9092001840253612742, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index d3effd0bc0..d21db94321 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Threading;
 using UnityEngine;
 using TMPro;
 using UnityEngine.UI;
@@ -42,13 +41,13 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     [SerializeField] private TextMeshProUGUI _OrderButtonText;
 
     private string CurrentMessage;
-    private int LineOrder = 0;
-    private int currentOrder = 1;
+    private int LineOrder = 0;    //Whats the newest and the oldest reaction set
+    private int currentOrder = 1; //What type of order we are on the list
 
     private void Start()
     {
         _closeAllReactionButton.onClick.AddListener(LayoutButton);
-        _listOrderButton.onClick.AddListener(() => {currentOrder++; ListOrder(currentOrder);});
+        _listOrderButton.onClick.AddListener(() => {currentOrder++; ListOrderSystem(currentOrder);});
         reactiontext();
         foreach (Button button in _closeButtons)
         {
@@ -57,7 +56,7 @@ private void Start()
     }
 
     //Puts back the reactions and popup back to messageobject
-    public void ClosePopup()
+    private void ClosePopup()
     {
         for (int i = _userInfo.Count - 1; i >= 0; i--)
         {
@@ -71,25 +70,25 @@ public void ClosePopup()
         _scrollRect.content = null;
         CurrentMessage = null;
         gameObject.SetActive(false);
-        LineOrder = 0;
-
+        LineOrder = 0; 
+        currentOrder = 1; 
     }
 
     void OnEnable()
     {
         reactiontext();
+        ListOrderSystem(currentOrder);
     }
 
 
     //Incane user leaves the chat
     private void OnDisable()
     {
-        ListOrder(1);
         ClosePopup();
     }
 
 
-    public void reactiontext()
+    private void reactiontext()
     {
         int activeChildren = 0;
         foreach (Transform container in _userContent.transform)
@@ -123,24 +122,6 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
 
                 Mood mood = (Mood)Enum.Parse(typeof(Mood), Emoji.emoji);
 
-        //halts the system if there's already a same user on the list
-        for (int i = _userInfo.Count - 1; i >= 0; i--)
-        {
-            if (_userInfo[i]._id != Emoji.sender_id)
-                continue;
-
-
-            if (_userInfo[i]._id == Emoji.sender_id &&  _userInfo[i]._mood != mood)
-            {
-                RemoveUserReaction(Emoji.sender_id, message);
-                continue;
-            }
-            else if (_userInfo[i]._id == Emoji.sender_id && _userInfo[i]._mood == mood)
-            {
-                
-                return;
-            }
-        }
         LineOrder++;
             //Gets sprite
         Sprite reactionSprite = _reactionList.FirstOrDefault(x => x.Mood == mood)?.Sprite;
@@ -152,7 +133,7 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
        userData.SetReactionInfo(_userInfo[_userInfo.Count - 1]._avatar, _userInfo[_userInfo.Count - 1]._name, _userInfo[_userInfo.Count - 1]._id, _userInfo[_userInfo.Count - 1].Emoji);
         _usersReactionData.Add(userData);
         reactiontext();
-        ListOrder(currentOrder);
+        ListOrderSystem(currentOrder);
 
         if (CopiedReactionField.transform.childCount > 0)
         {
@@ -164,6 +145,7 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
     //removes the userData
     public void RemoveUserReaction(string Userid, ChatMessage message)
     {
+        //Checks if it's on a correct Message section
         if (CurrentMessage != null)
         {
             if (CurrentMessage != message.Id)
@@ -201,7 +183,7 @@ void LayoutButton()
     }
     //Sets the List in certain order
 
-    //Changes the reactions object sizes
+    //Copies the Reaction
     public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHandler ReactionHandler, ChatMessage message)
     {
 
@@ -215,10 +197,11 @@ public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHa
 
         Destroy(CopiedReactionField);
 
-        CopiedReactionField = Instantiate(ReactionField, _reactionFieldLocation);
+            CopiedReactionField = Instantiate(ReactionField, _reactionFieldLocation);
 
-        _scrollRect.content = CopiedReactionField.GetComponent<RectTransform>();
+            _scrollRect.content = CopiedReactionField.GetComponent<RectTransform>();
 
+        //Changes the reactions object sizes
         foreach (RectTransform child in CopiedReactionField.transform)
         {
             ContentSizeFitter childFitter = child.GetComponent<ContentSizeFitter>();
@@ -232,7 +215,7 @@ public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHa
     }
 
 
-    void ListOrder(int order)
+    void ListOrderSystem(int order)
     {
         if (order >= 6)
         {
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionResize.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionResize.cs
index 924e0c7152..212e2aabd3 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionResize.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionResize.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index e3fdc01ede..900cf1a048 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -6,7 +6,6 @@
 using UnityEngine;
 using UnityEngine.UI;
 using static ServerChatMessage;
-using static UnityEngine.InputSystem.DefaultInputActions;
 
 public class MessageReactionsHandler : AltMonoBehaviour
 {
@@ -39,7 +38,6 @@ public class MessageReactionsHandler : AltMonoBehaviour
 
     [SerializeField] public List<ServerReactions> ReactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
 
-    [SerializeField] private string playerID;
 
     void Start()
     {
@@ -53,13 +51,6 @@ void Start()
         }));
 
 
-        //Puts up the players ID
-        StartCoroutine(GetPlayerData(player =>
-        {
-            playerID = player.Id;
-
-        }));
-
             //ReactionObjectHandler.OnReactionPressed += AddReaction;
 
 
@@ -219,15 +210,9 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
             HorizontalLayoutGroup reactionsFields = ReactionPanel.GetComponent<HorizontalLayoutGroup>();
 
-
-
-
             Sprite reactionSprite = _reactionList.FirstOrDefault(x => x.Mood == mood)?.Sprite;
             int i = _reactionList.FindIndex(m => m.Sprite == reactionSprite);
 
-
-
-
             // Checks if chosen reaction is already added to the selected message. If so, deletes it.
             foreach (ChatReactionHandler addedReaction in _reactionHandlers)
             {
@@ -247,7 +232,6 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
                                 _reactionList[i].Selected = true;
 
                                 addedReaction.Select();
-                                
 
                             }
                     }));
@@ -260,13 +244,11 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             // Creates a reaction with the needed info and adds it to the selected message.
             GameObject newReaction = Instantiate(_addedReactionPrefab, reactionsFields.transform);
 
-
-
             ChatReactionHandler chatReactionHandler = newReaction.GetComponentInChildren<ChatReactionHandler>();
             chatReactionHandler.SetReactionInfo(reactionSprite, messageID, mood);
             chatReactionHandler.AddReaction(_reaction);
             _reactionHandlers.Add(chatReactionHandler);
-            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction, playerID, message));
+            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction, message));
             chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(chatReactionHandler, message));
 
             StartCoroutine(GetPlayerData(player =>
@@ -302,12 +284,13 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
     /// Toggles the added reactions as selected and unselected.
     /// </summary>
     /// <param name="reactionHandler"></param>
-    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction, string playerID, ChatMessage message)
+    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction, ChatMessage message)
     {
+
+
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
         {
-
             ClearList(_reaction);
             
 
@@ -325,19 +308,16 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions
 
     private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
     {
+
         if (_reactionPopup.gameObject.activeSelf)
             return;
 
-
         //Gets needed data for ChatShowUserPopUpData1
         _reactionPopup.gameObject.SetActive(true);
 
-
         //Changes the reactions object sizes
         _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this, message);
 
-
-
         foreach (var reactionData in ReactionData)
         {
             _reactionPopup.AddUsersReaction(message, reactionData);
@@ -345,16 +325,12 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
 
         _longClick = true;
 
-
-        //_usersWhoAdded.SetActive(true);
-
-        //_chatScript.OpenUsersWhoAddedReactionPanel();
-
         Invoke("ResetLongClick", 2);
+
     }
 
     //Used for ChatShowUsersPopUpData to update the data
-    void UpdateReactionData(List<ServerReactions> reactions, ChatMessage message)
+    private void UpdateReactionData(List<ServerReactions> reactions, ChatMessage message)
     {
         //Empties the data
         if (_reactionPopup.gameObject.activeSelf)

From ac3ed27b82871c7892c0f0c5ee6374703d1a8624 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Mon, 29 Jun 2026 11:50:37 +0300
Subject: [PATCH 11/13] ShowUserPopUp 2.1

- fixed the reaction content sizing for other devices
- some code cleaning
---
 .../Windows/GlobalWindows/ChatView.prefab     | 68 +++++++--------
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    | 87 ++++++++++---------
 .../Scripts/Chat/MessageObjectHandler.cs      |  2 +-
 .../Scripts/Chat/MessageReactionsHandler.cs   | 16 ++--
 4 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
index cc76ec62bc..fa6fc865a8 100644
--- a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
+++ b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
@@ -340,7 +340,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 386.8, y: -300.74414}
+  m_AnchoredPosition: {x: 388.8, y: -312.58392}
   m_SizeDelta: {x: 700, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8012900771599692130
@@ -373,7 +373,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: -1
-  m_PreferredHeight: 85
+  m_PreferredHeight: 110
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -906,7 +906,7 @@ RectTransform:
   m_Father: {fileID: 8651422333607763989}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1143,7 +1143,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.88235295, g: 0.88235295, b: 0.88235295, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1744,7 +1744,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -0.00012207031}
-  m_SizeDelta: {x: -700, y: -650}
+  m_SizeDelta: {x: -700, y: -600}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &7215285588370245146
 MonoBehaviour:
@@ -2152,7 +2152,7 @@ RectTransform:
   m_Father: {fileID: 7802744954756901397}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2868,7 +2868,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.1, y: 0.1}
   m_AnchorMax: {x: 0.9, y: 0.85}
-  m_AnchoredPosition: {x: 0, y: -25}
+  m_AnchoredPosition: {x: 0, y: -25.000061}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1485619431382498838
@@ -3417,7 +3417,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -71.28984}
+  m_AnchoredPosition: {x: 50, y: -71.85737}
   m_SizeDelta: {x: 100, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7696485582972512613
@@ -3693,9 +3693,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9004813816187228610}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 5, y: -55}
   m_SizeDelta: {x: 10, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9195409789549020322
@@ -3754,7 +3754,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 386.8, y: -408.24414}
+  m_AnchoredPosition: {x: 388.8, y: -420.08392}
   m_SizeDelta: {x: 700, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7912668250702345692
@@ -4273,7 +4273,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7618322532180933409
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4527,8 +4527,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.05, y: 0.05}
   m_AnchorMax: {x: 0.95, y: 0.95}
-  m_AnchoredPosition: {x: 2, y: 0}
-  m_SizeDelta: {x: -4, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2029458685561180645
 MonoBehaviour:
@@ -4552,7 +4552,7 @@ MonoBehaviour:
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
+  m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
@@ -5021,10 +5021,10 @@ RectTransform:
   - {fileID: 7538245496696105330}
   m_Father: {fileID: 9004813816187228610}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 10, y: 0}
+  m_SizeDelta: {x: 630, y: 110}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1398436554631707718
 MonoBehaviour:
@@ -6250,13 +6250,13 @@ MonoBehaviour:
   _closeAllReactionButton: {fileID: 2014114443139516172}
   _listOrderButton: {fileID: 3052950907519947448}
   _reactionFieldLocation: {fileID: 4349249108874952513}
-  PopUpAllReactions: {fileID: 8542177965822184391}
+  _popUpAllReactions: {fileID: 8542177965822184391}
   _scrollRect: {fileID: 959950731169273863}
   _userContent: {fileID: 7215285588370245146}
   _userData: {fileID: 8844569307860996610, guid: d9e96f8283e71824cadeec334b0a267e,
     type: 3}
   _userInfo: []
-  ReactionAmounText: {fileID: 1480503946665984614}
+  _reactionAmounText: {fileID: 1480503946665984614}
   _reactionList:
   - Sprite: {fileID: 21300000, guid: 97d495bb5e2207e47b120d397738ae7f, type: 3}
     Mood: 1
@@ -6278,7 +6278,7 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 21300000, guid: a12221f1d2fd7194dbb2e0620c4fe9b8, type: 3}
   _image: {fileID: 4777644748716934985}
-  _OrderButtonText: {fileID: 4953989987484460405}
+  _orderButtonText: {fileID: 4953989987484460405}
 --- !u!114 &7249710220094630189
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6311,7 +6311,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8941222625236737338
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7167,8 +7167,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 386.8, y: -785.74414}
-  m_SizeDelta: {x: 700, y: 650}
+  m_AnchoredPosition: {x: 388.8, y: -772.5839}
+  m_SizeDelta: {x: 700, y: 600}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2828838990348605202
 MonoBehaviour:
@@ -7216,7 +7216,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 400
-  m_PreferredHeight: 300
+  m_PreferredHeight: 600
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -8038,8 +8038,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 386.8, y: -145.74414}
-  m_SizeDelta: {x: 700, y: 100}
+  m_AnchoredPosition: {x: 388.8, y: -150.60892}
+  m_SizeDelta: {x: 700, y: 113.95}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1685783836498216917
 CanvasRenderer:
@@ -8097,7 +8097,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 78.95
+  m_fontSize: 90
   m_fontSizeBase: 36
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -10109,7 +10109,7 @@ PrefabInstance:
     - target: {fileID: 2641932565321544379, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.9491228
+      value: 0.9542763
       objectReference: {fileID: 0}
     - target: {fileID: 2664587007262820359, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -10195,7 +10195,7 @@ PrefabInstance:
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.85312283
+      value: 0.8582763
       objectReference: {fileID: 0}
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -12324,12 +12324,12 @@ PrefabInstance:
     - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.9491228
+      value: 0.9542763
       objectReference: {fileID: 0}
     - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.85312283
+      value: 0.8582763
       objectReference: {fileID: 0}
     - target: {fileID: 9011883256918754321, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index d21db94321..2b2e02cf29 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -18,8 +18,8 @@ public class ChatShowUsersPopUpData : MonoBehaviour
 
     [Header("For Copied Reactions")]
     [SerializeField] private Transform _reactionFieldLocation;
-    private GameObject CopiedReactionField;
-    [SerializeField] private Transform PopUpAllReactions;
+    private GameObject _copiedReactionField;
+    [SerializeField] private Transform _popUpAllReactions;
     [SerializeField] private ScrollRect _scrollRect;
 
     [Header("User Info")]
@@ -29,7 +29,7 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     [SerializeField] private List<UserReactionInfo> _userInfo;
 
     [Header("Reactions")]
-    [SerializeField] private TextMeshProUGUI ReactionAmounText;
+    [SerializeField] private TextMeshProUGUI _reactionAmounText;
     [SerializeField] private List<ReactionObject> _reactionList;
     [SerializeField] private GameObject _allReactions;
     [SerializeField] private GameObject _selectedReaction;
@@ -38,16 +38,16 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     [Header("List Order")]
     [SerializeField] private Sprite[] _sprites;
     [SerializeField] private Image _image;
-    [SerializeField] private TextMeshProUGUI _OrderButtonText;
+    [SerializeField] private TextMeshProUGUI _orderButtonText;
 
-    private string CurrentMessage;
-    private int LineOrder = 0;    //Whats the newest and the oldest reaction set
-    private int currentOrder = 1; //What type of order we are on the list
+    private string _currentMessage;
+    private int _lineOrder = 0;    //Whats the newest and the oldest reaction set
+    private int _currentOrder = 1; //What type of order we are on the list
 
     private void Start()
     {
         _closeAllReactionButton.onClick.AddListener(LayoutButton);
-        _listOrderButton.onClick.AddListener(() => {currentOrder++; ListOrderSystem(currentOrder);});
+        _listOrderButton.onClick.AddListener(() => {_currentOrder++; ListOrderSystem(_currentOrder);});
         reactiontext();
         foreach (Button button in _closeButtons)
         {
@@ -65,19 +65,19 @@ private void ClosePopup()
 
         _userInfo.Clear();
 
-        Destroy(CopiedReactionField);
-        CopiedReactionField = null;
+        Destroy(_copiedReactionField);
+        _copiedReactionField = null;
         _scrollRect.content = null;
-        CurrentMessage = null;
+        _currentMessage = null;
         gameObject.SetActive(false);
-        LineOrder = 0; 
-        currentOrder = 1; 
+        _lineOrder = 0; 
+        _currentOrder = 1; 
     }
 
     void OnEnable()
     {
         reactiontext();
-        ListOrderSystem(currentOrder);
+        ListOrderSystem(_currentOrder);
     }
 
 
@@ -100,7 +100,7 @@ private void reactiontext()
 
         }
 
-        ReactionAmounText.text = $"{activeChildren} reaktiota";
+        _reactionAmounText.text = $"{activeChildren} reaktiota";
 
         //_reactionAmount.SetText(SettingsCarrier.Instance.Language, new string[1] { activeChildren.ToString() });
     }
@@ -110,32 +110,32 @@ private void reactiontext()
     public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
     {
         //Checks if it's on a correct Message section
-        if (CurrentMessage != null)
+        if (_currentMessage != null)
         {
-            if (CurrentMessage != message.Id)
+            if (_currentMessage != message.Id)
                 return;
         }
         else
         {
-            CurrentMessage = message.Id;
+            _currentMessage = message.Id;
         }
 
-                Mood mood = (Mood)Enum.Parse(typeof(Mood), Emoji.emoji);
+        Mood mood = (Mood)Enum.Parse(typeof(Mood), Emoji.emoji);
 
-        LineOrder++;
+        _lineOrder++;
             //Gets sprite
         Sprite reactionSprite = _reactionList.FirstOrDefault(x => x.Mood == mood)?.Sprite;
 
         //Sets up the Data
         GameObject newUserData = Instantiate(_userData, _userContent.transform);
-        _userInfo.Add(new UserReactionInfo { _avatar = message.Avatar, _id = Emoji.sender_id, _name = Emoji.playerName, Emoji = reactionSprite, UserDataObj = newUserData, _mood = mood, _order = LineOrder});
+        _userInfo.Add(new UserReactionInfo { _avatar = message.Avatar, _id = Emoji.sender_id, _name = Emoji.playerName, Emoji = reactionSprite, UserDataObj = newUserData, _mood = mood, _order = _lineOrder});
         UsersReactionData userData = newUserData.GetComponent<UsersReactionData>();
        userData.SetReactionInfo(_userInfo[_userInfo.Count - 1]._avatar, _userInfo[_userInfo.Count - 1]._name, _userInfo[_userInfo.Count - 1]._id, _userInfo[_userInfo.Count - 1].Emoji);
         _usersReactionData.Add(userData);
         reactiontext();
-        ListOrderSystem(currentOrder);
+        ListOrderSystem(_currentOrder);
 
-        if (CopiedReactionField.transform.childCount > 0)
+        if (_copiedReactionField.transform.childCount > 0)
         {
             _noReactions.SetActive(false);
         }
@@ -146,9 +146,9 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
     public void RemoveUserReaction(string Userid, ChatMessage message)
     {
         //Checks if it's on a correct Message section
-        if (CurrentMessage != null)
+        if (_currentMessage != null)
         {
-            if (CurrentMessage != message.Id)
+            if (_currentMessage != message.Id)
                 return;
         }
 
@@ -160,13 +160,15 @@ public void RemoveUserReaction(string Userid, ChatMessage message)
                 _userInfo[i].UserDataObj.transform.SetParent(null);
                 Destroy(_userInfo[i].UserDataObj);
                 _userInfo.RemoveAt(i);
-                LineOrder--;
+                _lineOrder--;
                 }
 
 
             }
-                reactiontext();
-        if(CopiedReactionField.transform.childCount == 0)
+
+        reactiontext();
+
+        if(_copiedReactionField.transform.childCount == 0)
         {
             _noReactions.SetActive(true);
         }
@@ -181,28 +183,27 @@ void LayoutButton()
         _selectedReaction.SetActive(true);
         }
     }
-    //Sets the List in certain order
 
     //Copies the Reaction
     public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHandler ReactionHandler, ChatMessage message)
     {
 
         //Checks if it's on a correct Message section
-        if (CurrentMessage != null)
+        if (_currentMessage != null)
         {
-            if (CurrentMessage != message.Id)
+            if (_currentMessage != message.Id)
                 return;
         }
 
 
-        Destroy(CopiedReactionField);
+        Destroy(_copiedReactionField);
 
-            CopiedReactionField = Instantiate(ReactionField, _reactionFieldLocation);
+        _copiedReactionField = Instantiate(ReactionField, _reactionFieldLocation);
 
-            _scrollRect.content = CopiedReactionField.GetComponent<RectTransform>();
+        _scrollRect.content = _copiedReactionField.GetComponent<RectTransform>();
 
         //Changes the reactions object sizes
-        foreach (RectTransform child in CopiedReactionField.transform)
+        foreach (RectTransform child in _copiedReactionField.transform)
         {
             ContentSizeFitter childFitter = child.GetComponent<ContentSizeFitter>();
             childFitter.enabled = false;
@@ -210,7 +211,7 @@ public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHa
             child.sizeDelta = new Vector2(150, 110);
         }
 
-        ReactionHandler.GenarateReactionObjects(PopUpAllReactions);
+        ReactionHandler.GenarateReactionObjects(_popUpAllReactions);
 
     }
 
@@ -219,8 +220,8 @@ void ListOrderSystem(int order)
     {
         if (order >= 6)
         {
-            currentOrder = 1;
-            order = currentOrder;
+            _currentOrder = 1;
+            order = _currentOrder;
         }
         switch (order)
         {
@@ -230,35 +231,35 @@ void ListOrderSystem(int order)
             case 1:
                 
                 _userInfo = _userInfo.OrderBy(m => m._order).ToList();
-                _OrderButtonText.text = "Old";
+                _orderButtonText.text = "Old";
                 _image.sprite = null;
                 break;
 
             //Newest => Oldest
             case 2:
                 _userInfo = _userInfo.OrderByDescending(m => m._order).ToList();
-                _OrderButtonText.text = "New";
+                _orderButtonText.text = "New";
                 _image.sprite = null;
                 break;
 
             // A => Z By Username
             case 3:
                 _userInfo = _userInfo.OrderBy(m => m._name.ToLower().Trim()).ToList();
-                _OrderButtonText.text = "A-Z";
+                _orderButtonText.text = "A-Z";
                 _image.sprite = null;
                 break;
 
             // Z => A By Username
             case 4:
                 _userInfo = _userInfo.OrderByDescending(m => m._name.ToLower().Trim()).ToList();
-                _OrderButtonText.text = "Z-A";
+                _orderButtonText.text = "Z-A";
                 _image.sprite = null;
                 break;
 
             //Sadness => Love by Reactions
             case 5:
                 _userInfo = _userInfo.OrderBy(m => m._mood).ToList();
-                _OrderButtonText.text = "";
+                _orderButtonText.text = "";
                 if (_sprites[4] != null)
                 _image.sprite = _sprites[4];
                 break;
diff --git a/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
index d8013efc5d..b63f248f8c 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
@@ -161,7 +161,7 @@ public void ReactionChatCall(ServerReactions EmojiId, ChatMessage message)
         ChildsScript.AddReaction(EmojiId, (Mood)Enum.Parse(typeof(Mood), EmojiId.emoji), _id, ReactionsPanel, message);
 
         //Used for ChatShowUsersPopUpData
-        ChildsScript.ReactionData.Add(EmojiId);
+        ChildsScript._reactionData.Add(EmojiId);
     }
 
     private void UpdateReactions(ChatChannelType chatChannelType, ChatMessage message)
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index 900cf1a048..1ba537184c 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -36,7 +36,7 @@ public class MessageReactionsHandler : AltMonoBehaviour
     private bool _longClick = false;
     private ChatShowUsersPopUpData _reactionPopup = Chat.instance?.ChatShowUsersPopUpData;
 
-    [SerializeField] public List<ServerReactions> ReactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
+    [SerializeField] public List<ServerReactions> _reactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
 
 
     void Start()
@@ -318,7 +318,7 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
         //Changes the reactions object sizes
         _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this, message);
 
-        foreach (var reactionData in ReactionData)
+        foreach (var reactionData in _reactionData)
         {
             _reactionPopup.AddUsersReaction(message, reactionData);
         }
@@ -335,26 +335,26 @@ private void UpdateReactionData(List<ServerReactions> reactions, ChatMessage mes
         //Empties the data
         if (_reactionPopup.gameObject.activeSelf)
         {
-            foreach (var i in ReactionData)
+            foreach (var i in _reactionData)
             {
                 _reactionPopup.RemoveUserReaction(i.sender_id, message);
             }
         }
 
-        ReactionData.Clear();
+        _reactionData.Clear();
 
 
         //Adds the data
         foreach (ServerReactions reaction in reactions)
         {
-            ReactionData.Add(reaction);
+            _reactionData.Add(reaction);
 
         }
 
         if (_reactionPopup.gameObject.activeSelf)
         {
 
-            foreach (var reactionData in ReactionData)
+            foreach (var reactionData in _reactionData)
             {
                 _reactionPopup.AddUsersReaction(message, reactionData);
 
@@ -400,9 +400,9 @@ private void RemoveReaction(ChatReactionHandler reaction, ChatMessage message)
     private void ClearList(ServerReactions _reaction)
     {
 
-        for (int i = 0; i < ReactionData.Count; i++)
+        for (int i = 0; i < _reactionData.Count; i++)
         {
-            if (ReactionData[i].sender_id == _reaction.sender_id)
+            if (_reactionData[i].sender_id == _reaction.sender_id)
             {
                 foreach (var j in _reactionList)
                 {

From 46ee3ffc70c2a9a33688fb55262923cbeca3bed0 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Tue, 30 Jun 2026 15:58:10 +0300
Subject: [PATCH 12/13] ShowUserPopUp 2.1

- Added Language system to the popup
- more code cleaning
---
 Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab | 15 +++++
 .../Windows/GlobalWindows/ChatView.prefab     | 32 +++++++---
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    | 51 ++++++++++++---
 .../Scripts/Chat/MessageReactionsHandler.cs   | 63 ++++++++-----------
 4 files changed, 108 insertions(+), 53 deletions(-)

diff --git a/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab b/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab
index 97c6a79039..f54e249d4d 100644
--- a/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab
+++ b/Assets/MenuUi/Prefabs/Chat/BaseMessage.prefab
@@ -2551,16 +2551,31 @@ PrefabInstance:
       propertyPath: _messageObjectHandler
       value: 
       objectReference: {fileID: 5786829121231365026}
+    - target: {fileID: 8509604158101261262, guid: 76aa8b7d736fa8e44955cce276908e74,
+        type: 3}
+      propertyPath: _reactionData.Array.size
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8509604158101261262, guid: 76aa8b7d736fa8e44955cce276908e74,
         type: 3}
       propertyPath: _reactionPaneldata.Array.size
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8509604158101261262, guid: 76aa8b7d736fa8e44955cce276908e74,
+        type: 3}
+      propertyPath: _reactionPaneldata.ReactionField
+      value: 
+      objectReference: {fileID: 7999296891796925201}
     - target: {fileID: 8509604158101261262, guid: 76aa8b7d736fa8e44955cce276908e74,
         type: 3}
       propertyPath: _reactionPaneldata._reactionField
       value: 
       objectReference: {fileID: 7999296891796925201}
+    - target: {fileID: 8509604158101261262, guid: 76aa8b7d736fa8e44955cce276908e74,
+        type: 3}
+      propertyPath: _reactionPaneldata.ReactionsContent
+      value: 
+      objectReference: {fileID: 7044005991725015127}
     - target: {fileID: 8509604158101261262, guid: 76aa8b7d736fa8e44955cce276908e74,
         type: 3}
       propertyPath: _reactionPaneldata._reactionsContent
diff --git a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
index fa6fc865a8..b1bf7b38c4 100644
--- a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
+++ b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab
@@ -340,7 +340,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 388.8, y: -312.58392}
+  m_AnchoredPosition: {x: 388.8, y: -235.24913}
   m_SizeDelta: {x: 700, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8012900771599692130
@@ -3417,7 +3417,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -71.85737}
+  m_AnchoredPosition: {x: 50, y: -60.7899}
   m_SizeDelta: {x: 100, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7696485582972512613
@@ -3754,7 +3754,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 388.8, y: -420.08392}
+  m_AnchoredPosition: {x: 388.8, y: -342.74915}
   m_SizeDelta: {x: 700, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7912668250702345692
@@ -6279,6 +6279,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: a12221f1d2fd7194dbb2e0620c4fe9b8, type: 3}
   _image: {fileID: 4777644748716934985}
   _orderButtonText: {fileID: 4953989987484460405}
+  _textLanguageSelectorCaller: {fileID: 5692628913879568637}
 --- !u!114 &7249710220094630189
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7167,7 +7168,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 388.8, y: -772.5839}
+  m_AnchoredPosition: {x: 388.8, y: -695.24915}
   m_SizeDelta: {x: 700, y: 600}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2828838990348605202
@@ -8015,8 +8016,9 @@ GameObject:
   - component: {fileID: 1685783836498216917}
   - component: {fileID: 1480503946665984614}
   - component: {fileID: 7680331713395706728}
+  - component: {fileID: 5692628913879568637}
   m_Layer: 5
-  m_Name: ReactionAmounText
+  m_Name: ReactionAmountText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8038,7 +8040,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 388.8, y: -150.60892}
+  m_AnchoredPosition: {x: 388.8, y: -73.27413}
   m_SizeDelta: {x: 700, y: 113.95}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1685783836498216917
@@ -8161,6 +8163,20 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!114 &5692628913879568637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8292671902318602454}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 99bef45c2704bb147a99ddcb380f3986, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _finnishText: 
+  _englishText: 
 --- !u!1 &8465531718494878061
 GameObject:
   m_ObjectHideFlags: 0
@@ -10200,7 +10216,7 @@ PrefabInstance:
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.1005
+      value: 0.201
       objectReference: {fileID: 0}
     - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
@@ -12089,7 +12105,7 @@ PrefabInstance:
     - target: {fileID: 7827142668286818857, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.1005
+      value: 0.201
       objectReference: {fileID: 0}
     - target: {fileID: 7887861368517116277, guid: 57890b7dbec8a984abb7d8148eefe9f6,
         type: 3}
diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index 2b2e02cf29..778e21d835 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -8,6 +8,7 @@
 using Altzone.Scripts.Model.Poco.Player;
 using static ServerChatMessage;
 using System.Linq;
+using Altzone.Scripts.Language;
 
 public class ChatShowUsersPopUpData : MonoBehaviour
 {
@@ -40,6 +41,9 @@ public class ChatShowUsersPopUpData : MonoBehaviour
     [SerializeField] private Image _image;
     [SerializeField] private TextMeshProUGUI _orderButtonText;
 
+
+    [SerializeField] private TextLanguageSelectorCaller _textLanguageSelectorCaller;
+
     private string _currentMessage;
     private int _lineOrder = 0;    //Whats the newest and the oldest reaction set
     private int _currentOrder = 1; //What type of order we are on the list
@@ -48,7 +52,7 @@ private void Start()
     {
         _closeAllReactionButton.onClick.AddListener(LayoutButton);
         _listOrderButton.onClick.AddListener(() => {_currentOrder++; ListOrderSystem(_currentOrder);});
-        reactiontext();
+        Reactiontext();
         foreach (Button button in _closeButtons)
         {
             button.onClick.AddListener(ClosePopup);
@@ -76,7 +80,7 @@ private void ClosePopup()
 
     void OnEnable()
     {
-        reactiontext();
+        Reactiontext();
         ListOrderSystem(_currentOrder);
     }
 
@@ -88,7 +92,7 @@ private void OnDisable()
     }
 
 
-    private void reactiontext()
+    private void Reactiontext()
     {
         int activeChildren = 0;
         foreach (Transform container in _userContent.transform)
@@ -100,9 +104,18 @@ private void reactiontext()
 
         }
 
-        _reactionAmounText.text = $"{activeChildren} reaktiota";
+        //Language System
+        if (SettingsCarrier.Instance.Language is SettingsCarrier.LanguageType.Finnish)
+        {
+            _textLanguageSelectorCaller.SetText("{} reaktiota");
+        }
+        else if (SettingsCarrier.Instance.Language is SettingsCarrier.LanguageType.English)
+        {
+            _textLanguageSelectorCaller.SetText("{} reactions");
+        }
+
+        _reactionAmounText.text = _reactionAmounText.text.Replace("{}", $"{activeChildren}");
 
-        //_reactionAmount.SetText(SettingsCarrier.Instance.Language, new string[1] { activeChildren.ToString() });
     }
 
 
@@ -132,7 +145,7 @@ public void AddUsersReaction(ChatMessage message, ServerReactions Emoji)
         UsersReactionData userData = newUserData.GetComponent<UsersReactionData>();
        userData.SetReactionInfo(_userInfo[_userInfo.Count - 1]._avatar, _userInfo[_userInfo.Count - 1]._name, _userInfo[_userInfo.Count - 1]._id, _userInfo[_userInfo.Count - 1].Emoji);
         _usersReactionData.Add(userData);
-        reactiontext();
+        Reactiontext();
         ListOrderSystem(_currentOrder);
 
         if (_copiedReactionField.transform.childCount > 0)
@@ -166,7 +179,7 @@ public void RemoveUserReaction(string Userid, ChatMessage message)
 
             }
 
-        reactiontext();
+        Reactiontext();
 
         if(_copiedReactionField.transform.childCount == 0)
         {
@@ -231,14 +244,34 @@ void ListOrderSystem(int order)
             case 1:
                 
                 _userInfo = _userInfo.OrderBy(m => m._order).ToList();
-                _orderButtonText.text = "Old";
+
+                //Language System
+                if (SettingsCarrier.Instance.Language is SettingsCarrier.LanguageType.Finnish)
+                {
+                    _orderButtonText.text = "Vanha";
+                }
+                else if (SettingsCarrier.Instance.Language is SettingsCarrier.LanguageType.English)
+                {
+                    _orderButtonText.text =  "Old";
+                }
+
                 _image.sprite = null;
                 break;
 
             //Newest => Oldest
             case 2:
                 _userInfo = _userInfo.OrderByDescending(m => m._order).ToList();
-                _orderButtonText.text = "New";
+
+                //Language System
+                if (SettingsCarrier.Instance.Language is SettingsCarrier.LanguageType.Finnish)
+                {
+                    _orderButtonText.text = "Uusi";
+                }
+                else if (SettingsCarrier.Instance.Language is SettingsCarrier.LanguageType.English)
+                {
+                    _orderButtonText.text = "New";
+                }
+
                 _image.sprite = null;
                 break;
 
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index 1ba537184c..14817269bd 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -54,7 +54,7 @@ void Start()
             //ReactionObjectHandler.OnReactionPressed += AddReaction;
 
 
-            GenarateReactionObjects(_reactionPaneldata._reactionsContent);
+            GenarateReactionObjects(_reactionPaneldata.ReactionsContent);
 
         PickCommonReactions();
     }
@@ -169,11 +169,9 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
         }
         foreach (ServerReactions reaction in reactions)
         {
-
-            
-            AddReaction(reaction, (Mood)Enum.Parse(typeof(Mood), reaction.emoji), messageid, _reactionPaneldata._reactionField, message);
-
+            AddReaction(reaction, (Mood)Enum.Parse(typeof(Mood), reaction.emoji), messageid, _reactionPaneldata.ReactionField, message);
         }
+
         List<ChatReactionHandler> removableReactions = new();
         foreach (ChatReactionHandler addedReaction in _reactionHandlers)
         {
@@ -184,7 +182,7 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
         }
         for (int i = removableReactions.Count - 1; i >= 0; i--)
         {
-            RemoveReaction(removableReactions[i], message);
+            RemoveReaction(removableReactions[i]);
         }
 
             UpdateReactionData(reactions, message);
@@ -193,14 +191,15 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
             //Used for "ChatShowUserPopUpData"
             if (_reactionPopup.gameObject.activeSelf)
         {
-            _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this, message);
+            _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata.ReactionField, this, message);
         }
 
     }
+
     /// <summary>
     /// Adds the chosen reaction to the selected message.
     /// </summary>
-    public void AddReaction(ServerReactions _reaction, Mood mood, string message_id, GameObject ReactionPanel = null, ChatMessage message = null)
+    public void AddReaction(ServerReactions reaction, Mood mood, string message_id, GameObject ReactionPanel, ChatMessage message)
     {
         if (_selectedMessage != null)
         {
@@ -218,16 +217,16 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
             {
                 if (addedReaction.Mood == mood)
                 {
-                    addedReaction.AddReaction(_reaction);
+                    addedReaction.AddReaction(reaction);
                     StartCoroutine(GetPlayerData(player =>
                     {
                         if (player != null)
 
-                            if (player.Id == _reaction.sender_id)
+                            if (player.Id == reaction.sender_id)
                             {
                                 
                                 //Refreshes the reaction selection
-                                ClearList(_reaction);
+                                ListReset(reaction);
 
                                 _reactionList[i].Selected = true;
 
@@ -235,7 +234,7 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
                             }
                     }));
-                    GenarateReactionObjects(_reactionPaneldata._reactionsContent);
+                    GenarateReactionObjects(_reactionPaneldata.ReactionsContent);
                     _selectedMessage.SetMessageInactive();
                     return;
 
@@ -246,27 +245,27 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
 
             ChatReactionHandler chatReactionHandler = newReaction.GetComponentInChildren<ChatReactionHandler>();
             chatReactionHandler.SetReactionInfo(reactionSprite, messageID, mood);
-            chatReactionHandler.AddReaction(_reaction);
+            chatReactionHandler.AddReaction(reaction);
             _reactionHandlers.Add(chatReactionHandler);
-            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, _reaction, message));
-            chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(chatReactionHandler, message));
+            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, reaction));
+            chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(message));
 
             StartCoroutine(GetPlayerData(player =>
             {
                 if (player != null)
-                    if (player.Id == _reaction.sender_id)
+                    if (player.Id == reaction.sender_id)
                     {
 
                         chatReactionHandler.Select();
 
                         //Refreshes the reaction selection
-                        ClearList(_reaction);
+                        ListReset(reaction);
                         _reactionList[i].Selected = true;
 
                     } 
             }));
 
-            GenarateReactionObjects(_reactionPaneldata._reactionsContent);
+            GenarateReactionObjects(_reactionPaneldata.ReactionsContent);
 
             PickCommonReactions();
 
@@ -284,14 +283,14 @@ public void AddReaction(ServerReactions _reaction, Mood mood, string message_id,
     /// Toggles the added reactions as selected and unselected.
     /// </summary>
     /// <param name="reactionHandler"></param>
-    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions _reaction, ChatMessage message)
+    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions reaction)
     {
 
 
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
         {
-            ClearList(_reaction);
+            ListReset(reaction);
             
 
             if (reactionHandler.Selected)
@@ -302,11 +301,11 @@ public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions
             {
                 reactionHandler.Select();
             }
-            GenarateReactionObjects(_reactionPaneldata._reactionsContent);
+            GenarateReactionObjects(_reactionPaneldata.ReactionsContent);
         }
     }
 
-    private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
+    private void ShowUsers(ChatMessage message)
     {
 
         if (_reactionPopup.gameObject.activeSelf)
@@ -316,7 +315,7 @@ private void ShowUsers(ChatReactionHandler reactionHandler, ChatMessage message)
         _reactionPopup.gameObject.SetActive(true);
 
         //Changes the reactions object sizes
-        _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata._reactionField, this, message);
+        _reactionPopup.ReactionFieldCopyUpdate(_reactionPaneldata.ReactionField, this, message);
 
         foreach (var reactionData in _reactionData)
         {
@@ -367,14 +366,11 @@ private void ResetLongClick()
         _longClick = false;
     }
 
-    private void RemoveReaction(ChatReactionHandler reaction, ChatMessage message)
+    private void RemoveReaction(ChatReactionHandler reaction)
     {
-        //Checks if the set gameObject is on or not
-        HorizontalLayoutGroup reactionsField = _reactionPaneldata._reactionField.GetComponent<HorizontalLayoutGroup>();
         reaction.transform.SetParent(null);
         _reactionHandlers.Remove(reaction);
 
-
         foreach (var i in _reactionList)
         {
             if (i.Mood == reaction.Mood)
@@ -386,18 +382,13 @@ private void RemoveReaction(ChatReactionHandler reaction, ChatMessage message)
         }
         Destroy(reaction.gameObject);
 
-        GenarateReactionObjects(_reactionPaneldata._reactionsContent);
-
-
         PickCommonReactions();
         _selectedMessage.SizeCall();
-
-        LayoutRebuilder.ForceRebuildLayoutImmediate(reactionsField.GetComponent<RectTransform>());
     }
 
 
-    //Clearns the list empty (with those what has players ID) so that new data can be added
-    private void ClearList(ServerReactions _reaction)
+    //Restart the reaction selection back to Zero
+    private void ListReset(ServerReactions _reaction)
     {
 
         for (int i = 0; i < _reactionData.Count; i++)
@@ -437,7 +428,7 @@ public class ReactionObject
     [Serializable]
     public class reactionPanelGroup
     {
-        public Transform _reactionsContent; //Imports the reaction
-        public GameObject _reactionField; //holds  the received reactions
+        public Transform ReactionsContent; //Imports the reaction
+        public GameObject ReactionField; //holds  the received reactions
     }
 

From 16f97d77cebc081929d278e4dc0d62d78de9de11 Mon Sep 17 00:00:00 2001
From: Rastub <rastub10@gmail.com>
Date: Fri, 3 Jul 2026 13:49:02 +0300
Subject: [PATCH 13/13] ShowUserPopUp 2.2

- Reaction Pop up now finally has a working toggle system that adds and removes when pressed

- cleared/updated some code (again)
---
 .../Scripts/Chat/ChatReactionHandler.cs       |  2 +-
 .../Scripts/Chat/ChatShowUsersPopUpData.cs    | 13 +++-
 .../Scripts/Chat/MessageObjectHandler.cs      |  2 -
 .../Scripts/Chat/MessageReactionsHandler.cs   | 61 +++++++++----------
 4 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/Assets/MenuUi/Scripts/Chat/ChatReactionHandler.cs b/Assets/MenuUi/Scripts/Chat/ChatReactionHandler.cs
index 308dc0959a..b614cec1e2 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatReactionHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatReactionHandler.cs
@@ -22,7 +22,7 @@ public class ChatReactionHandler : MonoBehaviour
     public int Count => _count;
     public bool Selected => _selected;
 
-    private Mood _mood;
+    [SerializeField] private Mood _mood;
     private string _messageID;
     private int _count = 0;
     private bool _selected;
diff --git a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
index 778e21d835..86ceae4356 100644
--- a/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
+++ b/Assets/MenuUi/Scripts/Chat/ChatShowUsersPopUpData.cs
@@ -222,8 +222,19 @@ public void ReactionFieldCopyUpdate(GameObject ReactionField, MessageReactionsHa
             childFitter.enabled = false;
 
             child.sizeDelta = new Vector2(150, 110);
-        }
 
+            ChatReactionHandler Childhandler = child.GetComponent<ChatReactionHandler>();
+
+            //Adds the toggle system to the copied button to direct the data to its original place
+            foreach (ChatReactionHandler i in ReactionHandler.ReactionHandlers)
+            {
+                if(Childhandler.Mood == i.Mood)
+                {
+                    Childhandler.Button.onClick.AddListener(() => ReactionHandler.ToggleReaction(i));
+                }
+            }
+
+        }
         ReactionHandler.GenarateReactionObjects(_popUpAllReactions);
 
     }
diff --git a/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
index b63f248f8c..461cf8dcf8 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageObjectHandler.cs
@@ -160,8 +160,6 @@ public void ReactionChatCall(ServerReactions EmojiId, ChatMessage message)
         MessageReactionsHandler ChildsScript = ReactionObject.GetComponent<MessageReactionsHandler>();
         ChildsScript.AddReaction(EmojiId, (Mood)Enum.Parse(typeof(Mood), EmojiId.emoji), _id, ReactionsPanel, message);
 
-        //Used for ChatShowUsersPopUpData
-        ChildsScript._reactionData.Add(EmojiId);
     }
 
     private void UpdateReactions(ChatChannelType chatChannelType, ChatMessage message)
diff --git a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
index 14817269bd..64adcea059 100644
--- a/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
+++ b/Assets/MenuUi/Scripts/Chat/MessageReactionsHandler.cs
@@ -32,12 +32,15 @@ public class MessageReactionsHandler : AltMonoBehaviour
 
     private List<ReactionObjectHandler> _reactions = new();
     private List<ChatReactionHandler> _reactionHandlers = new();
+    public List<ChatReactionHandler> ReactionHandlers { get => _reactionHandlers; }
+
     private List<int> _commonReactions = new();
     private bool _longClick = false;
     private ChatShowUsersPopUpData _reactionPopup = Chat.instance?.ChatShowUsersPopUpData;
 
     [SerializeField] public List<ServerReactions> _reactionData = new List<ServerReactions>(); //Used for addings data to ChatShowUserPopUpData
 
+    private string _pLayerId; ///Used for <see cref="ListReset"/>
 
     void Start()
     {
@@ -50,7 +53,10 @@ void Start()
             GetComponent<MessageReactionResize>().UpdateSize();
         }));
 
-
+        StartCoroutine(GetPlayerData(player =>
+        {
+            _pLayerId = player.Id;
+        }));
             //ReactionObjectHandler.OnReactionPressed += AddReaction;
 
 
@@ -163,6 +169,8 @@ private void PickCommonReactions()
     /// </summary>
     public void UpdateReactions(List<ServerReactions> reactions, string messageid, ChatMessage message)
     {
+        ResetReactionPopUpData(message);
+
         foreach (ChatReactionHandler addedReaction in _reactionHandlers)
         {
             addedReaction.ResetReactions();
@@ -185,9 +193,6 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
             RemoveReaction(removableReactions[i]);
         }
 
-            UpdateReactionData(reactions, message);
-
-
             //Used for "ChatShowUserPopUpData"
             if (_reactionPopup.gameObject.activeSelf)
         {
@@ -201,12 +206,21 @@ public void UpdateReactions(List<ServerReactions> reactions, string messageid, C
     /// </summary>
     public void AddReaction(ServerReactions reaction, Mood mood, string message_id, GameObject ReactionPanel, ChatMessage message)
     {
+
         if (_selectedMessage != null)
         {
             string messageID = _selectedMessage.Id;
             if (messageID != message_id)
                 return;
 
+            //Adds the data for reaction popup
+            _reactionData.Add(reaction);
+
+            if (_reactionPopup.gameObject.activeSelf)
+            {
+                _reactionPopup.AddUsersReaction(message, reaction); 
+            }
+
             HorizontalLayoutGroup reactionsFields = ReactionPanel.GetComponent<HorizontalLayoutGroup>();
 
             Sprite reactionSprite = _reactionList.FirstOrDefault(x => x.Mood == mood)?.Sprite;
@@ -226,7 +240,7 @@ public void AddReaction(ServerReactions reaction, Mood mood, string message_id,
                             {
                                 
                                 //Refreshes the reaction selection
-                                ListReset(reaction);
+                                ListReset();
 
                                 _reactionList[i].Selected = true;
 
@@ -247,7 +261,7 @@ public void AddReaction(ServerReactions reaction, Mood mood, string message_id,
             chatReactionHandler.SetReactionInfo(reactionSprite, messageID, mood);
             chatReactionHandler.AddReaction(reaction);
             _reactionHandlers.Add(chatReactionHandler);
-            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler, reaction));
+            chatReactionHandler.Button.onClick.AddListener(() => ToggleReaction(chatReactionHandler));
             chatReactionHandler.LongClickButton.onLongClick.AddListener(() => ShowUsers(message));
 
             StartCoroutine(GetPlayerData(player =>
@@ -259,7 +273,7 @@ public void AddReaction(ServerReactions reaction, Mood mood, string message_id,
                         chatReactionHandler.Select();
 
                         //Refreshes the reaction selection
-                        ListReset(reaction);
+                        ListReset();
                         _reactionList[i].Selected = true;
 
                     } 
@@ -283,15 +297,15 @@ public void AddReaction(ServerReactions reaction, Mood mood, string message_id,
     /// Toggles the added reactions as selected and unselected.
     /// </summary>
     /// <param name="reactionHandler"></param>
-    public void ToggleReaction(ChatReactionHandler reactionHandler, ServerReactions reaction)
+    public void ToggleReaction(ChatReactionHandler reactionHandler)
     {
 
 
         ChatListener.Instance.SendReaction(!reactionHandler.Selected ? reactionHandler.Mood.ToString() : string.Empty, reactionHandler.MessageID, ChatListener.Instance.ActiveChatChannel);
         if (!_longClick)
         {
-            ListReset(reaction);
-            
+
+                ListReset();
 
             if (reactionHandler.Selected)
             {
@@ -324,12 +338,12 @@ private void ShowUsers(ChatMessage message)
 
         _longClick = true;
 
-        Invoke("ResetLongClick", 2);
+        Invoke(nameof(ResetLongClick), 2);
 
     }
 
-    //Used for ChatShowUsersPopUpData to update the data
-    private void UpdateReactionData(List<ServerReactions> reactions, ChatMessage message)
+    //Used for ChatShowUsersPopUpData
+    private void ResetReactionPopUpData(ChatMessage message)
     {
         //Empties the data
         if (_reactionPopup.gameObject.activeSelf)
@@ -342,23 +356,6 @@ private void UpdateReactionData(List<ServerReactions> reactions, ChatMessage mes
 
         _reactionData.Clear();
 
-
-        //Adds the data
-        foreach (ServerReactions reaction in reactions)
-        {
-            _reactionData.Add(reaction);
-
-        }
-
-        if (_reactionPopup.gameObject.activeSelf)
-        {
-
-            foreach (var reactionData in _reactionData)
-            {
-                _reactionPopup.AddUsersReaction(message, reactionData);
-
-            }
-        }
     }
 
     private void ResetLongClick()
@@ -388,12 +385,12 @@ private void RemoveReaction(ChatReactionHandler reaction)
 
 
     //Restart the reaction selection back to Zero
-    private void ListReset(ServerReactions _reaction)
+    private void ListReset()
     {
 
         for (int i = 0; i < _reactionData.Count; i++)
         {
-            if (_reactionData[i].sender_id == _reaction.sender_id)
+            if (_reactionData[i].sender_id == _pLayerId)
             {
                 foreach (var j in _reactionList)
                 {