From f6d9f324fed5d99d68d715ae3f2f57c0f68daee7 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Thu, 20 Jul 2023 16:12:08 +0200
Subject: [PATCH] Message: Fix shuffled order when sending messages (#3516)

---
 src/components/middle/composer/ComposerEmbeddedMessage.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/middle/composer/ComposerEmbeddedMessage.tsx b/src/components/middle/composer/ComposerEmbeddedMessage.tsx
index e0775221c..690c54f68 100644
--- a/src/components/middle/composer/ComposerEmbeddedMessage.tsx
+++ b/src/components/middle/composer/ComposerEmbeddedMessage.tsx
@@ -147,6 +147,10 @@ const ComposerEmbeddedMessage: FC<OwnProps & StateProps> = ({
     getMenuElement,
   );
 
+  useEffect(() => {
+    if (!shouldRender) handleContextMenuClose();
+  }, [handleContextMenuClose, shouldRender]);
+
   const className = buildClassName('ComposerEmbeddedMessage', transitionClassNames);
 
   const leftIcon = useMemo(() => {