From 5e6adffd9edfa045e5ed80ab140400dd43ec1e00 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 17 Nov 2023 17:39:22 +0530
Subject: [PATCH 1/3] Use index as key

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

diff --git a/src/components/MultipleAvatars.tsx b/src/components/MultipleAvatars.tsx
index e867de7ddb97..e4e9d201ab1f 100644
--- a/src/components/MultipleAvatars.tsx
+++ b/src/components/MultipleAvatars.tsx
@@ -174,7 +174,7 @@ function MultipleAvatars({
                     >
                         {[...avatars].splice(0, maxAvatarsInRow).map((icon, index) => (
                             <UserDetailsTooltip
-                                key={`stackedAvatars-${icon.id}`}
+                                key={`stackedAvatars-${index}`}
                                 accountID={icon.id}
                                 icon={icon}
                                 fallbackUserDetails={{

From ceb53ee14e7a075ebfeaa8291a0d6d000f4b20ad Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 17 Nov 2023 17:48:08 +0530
Subject: [PATCH 2/3] Suppress lint error

---
 src/components/MultipleAvatars.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/MultipleAvatars.tsx b/src/components/MultipleAvatars.tsx
index e4e9d201ab1f..93e292ce76db 100644
--- a/src/components/MultipleAvatars.tsx
+++ b/src/components/MultipleAvatars.tsx
@@ -174,6 +174,7 @@ function MultipleAvatars({
                     >
                         {[...avatars].splice(0, maxAvatarsInRow).map((icon, index) => (
                             <UserDetailsTooltip
+                                /* eslint-disable-next-line react/no-array-index-key */
                                 key={`stackedAvatars-${index}`}
                                 accountID={icon.id}
                                 icon={icon}

From f0a8415df5c5708c41d54b9e24ff6414f9078300 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 17 Nov 2023 17:53:33 +0530
Subject: [PATCH 3/3] Pass policyID for workspace avatar

---
 src/components/MultipleAvatars.tsx        | 3 +--
 src/pages/settings/InitialSettingsPage.js | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MultipleAvatars.tsx b/src/components/MultipleAvatars.tsx
index 93e292ce76db..e867de7ddb97 100644
--- a/src/components/MultipleAvatars.tsx
+++ b/src/components/MultipleAvatars.tsx
@@ -174,8 +174,7 @@ function MultipleAvatars({
                     >
                         {[...avatars].splice(0, maxAvatarsInRow).map((icon, index) => (
                             <UserDetailsTooltip
-                                /* eslint-disable-next-line react/no-array-index-key */
-                                key={`stackedAvatars-${index}`}
+                                key={`stackedAvatars-${icon.id}`}
                                 accountID={icon.id}
                                 icon={icon}
                                 fallbackUserDetails={{
diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index 18d540923a30..d88105b31360 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -173,6 +173,7 @@ function InitialSettingsPage(props) {
             .filter((policy) => PolicyUtils.shouldShowPolicy(policy, props.network.isOffline))
             .sortBy((policy) => policy.name.toLowerCase())
             .map((policy) => ({
+                id: policy.id,
                 source: policy.avatar || ReportUtils.getDefaultWorkspaceAvatar(policy.name),
                 name: policy.name,
                 type: CONST.ICON_TYPE_WORKSPACE,