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/2] 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 9222c38b41b0d8f171f591cf2f48f2d4c47d756b Mon Sep 17 00:00:00 2001
From: Paulo Vale <paulo@expensify.com>
Date: Mon, 14 Aug 2023 09:45:22 -0300
Subject: [PATCH 2/2] Add IS_LOADING_REPORT_DATA as false to existing
 SideBarFilterTest to fix them

---
 tests/unit/SidebarFilterTest.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/unit/SidebarFilterTest.js b/tests/unit/SidebarFilterTest.js
index edf33e19ed9e..f0bddf27cc05 100644
--- a/tests/unit/SidebarFilterTest.js
+++ b/tests/unit/SidebarFilterTest.js
@@ -84,6 +84,7 @@ describe('Sidebar', () => {
                     // When Onyx is updated to contain that report
                     .then(() =>
                         Onyx.multiSet({
+                            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                             [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
                         }),
                     )
@@ -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,
@@ -111,12 +112,13 @@ describe('Sidebar', () => {
                     // When Onyx is updated to contain that report
                     .then(() =>
                         Onyx.multiSet({
-                            [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
+                            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                             [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+                            [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
                         }),
                     )
 
-                    // 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);