From f96726add91b01bf40dc7a963869667428704d8c Mon Sep 17 00:00:00 2001
From: Paulo Vale <paulo@expensify.com>
Date: Wed, 2 Aug 2023 17:57:34 -0300
Subject: [PATCH 1/3] Revert "remove color style"

This reverts commit ede6ee7a6eaf13e74aab1c3677fdc89424f4b7fd.
---
 src/components/SubscriptAvatar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SubscriptAvatar.js b/src/components/SubscriptAvatar.js
index 05202e720bd4..1c6f0a38c3d0 100644
--- a/src/components/SubscriptAvatar.js
+++ b/src/components/SubscriptAvatar.js
@@ -55,7 +55,7 @@ function SubscriptAvatar(props) {
             >
                 <View>
                     <Avatar
-                        containerStyles={StyleUtils.getWidthAndHeightStyle(StyleUtils.getAvatarSize(props.size || CONST.AVATAR_SIZE.DEFAULT))}
+                        containerStyles={StyleUtils.getAvatarStyle(props.size || CONST.AVATAR_SIZE.DEFAULT)}
                         source={props.mainAvatar.source}
                         size={props.size || CONST.AVATAR_SIZE.DEFAULT}
                         name={props.mainAvatar.name}

From bc8a3ede1a4cb55d0427d1bd5ebb2481fd356ae3 Mon Sep 17 00:00:00 2001
From: Paulo Vale <paulo@expensify.com>
Date: Mon, 14 Aug 2023 09:53:00 -0300
Subject: [PATCH 2/3] Fix SidebarFilterTests by specifiying
 IS_LOADING_REPORT_DATA as false gs

---
 tests/unit/SidebarFilterTest.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/unit/SidebarFilterTest.js b/tests/unit/SidebarFilterTest.js
index edf33e19ed9e..bcc8d2f8765c 100644
--- a/tests/unit/SidebarFilterTest.js
+++ b/tests/unit/SidebarFilterTest.js
@@ -85,6 +85,7 @@ describe('Sidebar', () => {
                     .then(() =>
                         Onyx.multiSet({
                             [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
+                            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                         }),
                     )
 
@@ -100,7 +101,7 @@ describe('Sidebar', () => {
         it('includes an empty chat report if it has a draft', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks();
 
-            // Given a new report
+            // Given a new report with a draft text
             const report = {
                 ...LHNTestUtils.getFakeReport([1, 2], 0),
                 hasDraft: true,
@@ -113,10 +114,11 @@ describe('Sidebar', () => {
                         Onyx.multiSet({
                             [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
                             [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+                            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                         }),
                     )
 
-                    // Then no reports are rendered in the LHN
+                    // Then the report should be rendered in the LHN since it has a draft
                     .then(() => {
                         const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames');
                         const displayNames = screen.queryAllByLabelText(hintText);

From dca0af7ad1697f1c9f2f2900d69e1d35f5d2edf0 Mon Sep 17 00:00:00 2001
From: Paulo Vale <paulo@expensify.com>
Date: Mon, 14 Aug 2023 09:55:22 -0300
Subject: [PATCH 3/3] Unrevert "remove color style" since it was reverted by
 accident

---
 src/components/SubscriptAvatar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SubscriptAvatar.js b/src/components/SubscriptAvatar.js
index 1c6f0a38c3d0..05202e720bd4 100644
--- a/src/components/SubscriptAvatar.js
+++ b/src/components/SubscriptAvatar.js
@@ -55,7 +55,7 @@ function SubscriptAvatar(props) {
             >
                 <View>
                     <Avatar
-                        containerStyles={StyleUtils.getAvatarStyle(props.size || CONST.AVATAR_SIZE.DEFAULT)}
+                        containerStyles={StyleUtils.getWidthAndHeightStyle(StyleUtils.getAvatarSize(props.size || CONST.AVATAR_SIZE.DEFAULT))}
                         source={props.mainAvatar.source}
                         size={props.size || CONST.AVATAR_SIZE.DEFAULT}
                         name={props.mainAvatar.name}