From ecdbb43c243f4dbc1582476405f9588977f06d59 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 4 Mar 2022 09:00:52 -0800
Subject: [PATCH 1/3] Merge pull request #8012 from
 Expensify/version-BUILD-d64f8c52cc87054c6c1f7304f18bda05b3b86920

(cherry picked from commit 2837a6a82a2fed1f3b25dcf088896b6b32817556)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 2 +-
 package.json                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index ceffb22d925b..a0eb8f91377b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001014104
-        versionName "1.1.41-4"
+        versionCode 1001014105
+        versionName "1.1.41-5"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3dd3332841bd..d9417eeef5bd 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.41.4</string>
+	<string>1.1.41.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index bc426ca6ccec..39941183c1eb 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.41.4</string>
+	<string>1.1.41.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 8041f01b545f..1cf63a01c9bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.41-4",
+  "version": "1.1.41-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 41cdf2530ea8..34ee1315eb84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.41-4",
+  "version": "1.1.41-5",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 8aa50283f90d79583cc734a46bba5a7ae2b20280 Mon Sep 17 00:00:00 2001
From: Daniel Doglas <danieldoglas@users.noreply.github.com>
Date: Fri, 4 Mar 2022 11:49:58 -0500
Subject: [PATCH 2/3] Merge pull request #8011 from
 Expensify/amal-fix-reportdetails-icons

Fix reportDetails icons for chatrooms

(cherry picked from commit d64f8c52cc87054c6c1f7304f18bda05b3b86920)
---
 src/pages/ReportDetailsPage.js | 12 +++++++++++-
 src/styles/styles.js           | 10 +---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js
index 90e2061f3cb2..732981fd7c7e 100644
--- a/src/pages/ReportDetailsPage.js
+++ b/src/pages/ReportDetailsPage.js
@@ -5,7 +5,7 @@ import Str from 'expensify-common/lib/str';
 import _ from 'underscore';
 import {View, ScrollView} from 'react-native';
 import lodashGet from 'lodash/get';
-import Avatar from '../components/Avatar';
+import RoomHeaderAvatars from '../components/RoomHeaderAvatars';
 import compose from '../libs/compose';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import ONYXKEYS from '../ONYXKEYS';
@@ -103,6 +103,7 @@ class ReportDetailsPage extends Component {
     }
 
     render() {
+        const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(this.props.report);
         const isChatRoom = ReportUtils.isChatRoom(this.props.report);
         const chatRoomSubtitle = ReportUtils.getChatRoomSubtitle(this.props.report, this.props.policies);
         const participants = lodashGet(this.props.report, 'participants', []);
@@ -131,6 +132,7 @@ class ReportDetailsPage extends Component {
                         <View
                             style={styles.reportDetailsTitleContainer}
                         >
+<<<<<<< HEAD
                             <Avatar
                                 isChatRoom={isChatRoom}
                                 isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
@@ -138,6 +140,14 @@ class ReportDetailsPage extends Component {
                                 imageStyles={[styles.singleAvatarLarge]}
                                 source={this.props.report.icons[0]}
                             />
+=======
+                            <View style={styles.mb4}>
+                                <RoomHeaderAvatars
+                                    avatarIcons={OptionsListUtils.getAvatarSources(this.props.report)}
+                                    shouldShowLargeAvatars={isPolicyExpenseChat}
+                                />
+                            </View>
+>>>>>>> d64f8c52c (Merge pull request #8011 from Expensify/amal-fix-reportdetails-icons)
                             <View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
                                 <View style={[styles.alignSelfCenter, styles.w100]}>
                                     <DisplayNames
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 2edbe8d6ea88..0093ab414c98 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1495,14 +1495,6 @@ const styles = {
         borderRadius: 18,
     },
 
-    singleAvatarLarge: {
-        height: 64,
-        width: 64,
-        backgroundColor: themeColors.icon,
-        borderRadius: 64,
-        overflow: 'hidden',
-    },
-
     secondAvatar: {
         position: 'absolute',
         right: -18,
@@ -1752,7 +1744,7 @@ const styles = {
         ...flex.flexColumn,
         ...flex.alignItemsCenter,
         ...spacing.mt4,
-        height: 150,
+        height: 170,
     },
 
     reportDetailsRoomInfo: {

From 04d28cbf9f72803f716ff6ff174fc5ab5e87f167 Mon Sep 17 00:00:00 2001
From: Daniel Silva <dsilva@expensify.com>
Date: Fri, 4 Mar 2022 14:22:58 -0300
Subject: [PATCH 3/3] fixing merge conflict

---
 src/pages/ReportDetailsPage.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js
index 732981fd7c7e..70323fe03b04 100644
--- a/src/pages/ReportDetailsPage.js
+++ b/src/pages/ReportDetailsPage.js
@@ -132,22 +132,12 @@ class ReportDetailsPage extends Component {
                         <View
                             style={styles.reportDetailsTitleContainer}
                         >
-<<<<<<< HEAD
-                            <Avatar
-                                isChatRoom={isChatRoom}
-                                isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
-                                containerStyles={[styles.singleAvatarLarge, styles.mb4]}
-                                imageStyles={[styles.singleAvatarLarge]}
-                                source={this.props.report.icons[0]}
-                            />
-=======
                             <View style={styles.mb4}>
                                 <RoomHeaderAvatars
                                     avatarIcons={OptionsListUtils.getAvatarSources(this.props.report)}
                                     shouldShowLargeAvatars={isPolicyExpenseChat}
                                 />
                             </View>
->>>>>>> d64f8c52c (Merge pull request #8011 from Expensify/amal-fix-reportdetails-icons)
                             <View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
                                 <View style={[styles.alignSelfCenter, styles.w100]}>
                                     <DisplayNames