From 90733da000272a30ec9bb5323d318a58ef67a394 Mon Sep 17 00:00:00 2001
From: Pujan <shahpujan1992@gmail.com>
Date: Thu, 12 Oct 2023 18:53:06 +0530
Subject: [PATCH] margin fix for subscriptAvatar

---
 src/components/SubscriptAvatar.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/SubscriptAvatar.js b/src/components/SubscriptAvatar.js
index b34251aacd1a..66d9812d994e 100644
--- a/src/components/SubscriptAvatar.js
+++ b/src/components/SubscriptAvatar.js
@@ -44,16 +44,9 @@ function SubscriptAvatar({size, backgroundColor, mainAvatar, secondaryAvatar, no
     const isSmall = size === CONST.AVATAR_SIZE.SMALL;
     const subscriptStyle = size === CONST.AVATAR_SIZE.SMALL_NORMAL ? styles.secondAvatarSubscriptSmallNormal : styles.secondAvatarSubscript;
     const containerStyle = StyleUtils.getContainerStyles(size);
-    // Default the margin style to what is normal for small or normal sized avatars
-    let marginStyle = isSmall ? styles.emptyAvatarMarginSmall : styles.emptyAvatarMargin;
-
-    // Some views like the chat view require that there be no margins
-    if (noMargin) {
-        marginStyle = {};
-    }
 
     return (
-        <View style={[containerStyle, marginStyle]}>
+        <View style={[containerStyle, noMargin ? styles.mr0 : {}]}>
             <UserDetailsTooltip
                 shouldRender={showTooltip}
                 accountID={lodashGet(mainAvatar, 'id', -1)}