Merge branch 'tr/kfx5vnng' into 'master'

Double custom status emoji tooltip size if it does not expires See merge request kchat/webapp!839
Infomaniak · Jul 16, 2024 · 4b3f1d1 · 4b3f1d1
2 parents 305d630 + 035df97
commit 4b3f1d1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/webapp/channels/src/components/custom_status/custom_status_emoji.tsx b/webapp/channels/src/components/custom_status/custom_status_emoji.tsx
@@ -65,6 +65,11 @@ function CustomStatusEmoji({
         return statusEmoji;
     }
 
+    const expires = Boolean(
+        customStatus.expires_at &&
+        customStatus.duration !== CustomStatusDuration.DONT_CLEAR,
+    );
+
     return (
         <OverlayTrigger
             delayShow={Constants.OVERLAY_TIME_DELAY}
@@ -74,7 +79,7 @@ function CustomStatusEmoji({
                     <div className='custom-status'>
                         <RenderEmoji
                             emojiName={customStatus.emoji}
-                            size={14}
+                            size={expires ? 14 : 28}
                             emojiStyle={{
                                 marginTop: 2,
                             }}
@@ -88,7 +93,7 @@ function CustomStatusEmoji({
                             </span>
                         }
                     </div>
-                    {customStatus.expires_at && customStatus.duration !== CustomStatusDuration.DONT_CLEAR &&
+                    {expires &&
                         <div>
                             <ExpiryTime
                                 time={customStatus.expires_at}