Merge pull request #29447 from Pujan92/fix/29432

[CP Staging] Fix: Workspace money request preview containing a receipt is misaligned
Expensify · Oct 12, 2023 · 814345a · 814345a
2 parents 1bd4c97 + 90733da
commit 814345a
Showing 1 changed file with 1 addition and 8 deletions.
diff --git 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)}