From 7f8f3443c379e980644e5f050cd9e945d96d8eeb Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Mon, 31 Jul 2023 11:46:49 -0700
Subject: [PATCH 1/3] dedupe optimistic data for newly added workspace members

---
 src/libs/actions/Policy.js | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 4a58f52eff0a..41e2a19f2241 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -360,24 +360,6 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs, welcomeNote, policyID,
     // create onyx data for policy expense chats for each new member
     const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs, betas);
 
-    // Optimistic personal details for the new accounts invited
-    const optimisticPersonalDetails = _.chain(invitedEmailsToAccountIDs)
-        .map(
-            (accountID, memberLogin) =>
-                !_.has(allPersonalDetails, accountID) && [
-                    accountID,
-                    {
-                        accountID,
-                        avatar: UserUtils.getDefaultAvatarURL(accountID),
-                        displayName: LocalePhoneNumber.formatPhoneNumber(memberLogin),
-                        login: OptionsListUtils.addSMSDomainIfPhoneNumber(memberLogin),
-                    },
-                ],
-        )
-        .compact()
-        .object()
-        .value();
-
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -388,11 +370,6 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs, welcomeNote, policyID,
         },
         ...newPersonalDetailsOnyxData.optimisticData,
         ...membersChats.onyxOptimisticData,
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-            value: optimisticPersonalDetails,
-        },
     ];
 
     const successData = [
@@ -406,11 +383,6 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs, welcomeNote, policyID,
         },
         ...newPersonalDetailsOnyxData.successData,
         ...membersChats.onyxSuccessData,
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-            value: _.object(_.keys(optimisticPersonalDetails), Array(_.size(optimisticPersonalDetails)).fill(null)),
-        },
     ];
 
     const failureData = [

From 6fcf5ce7e42505f467549bbc895956251498b42e Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Mon, 31 Jul 2023 11:47:09 -0700
Subject: [PATCH 2/3] persist optimsitic data if call fails

---
 src/libs/PersonalDetailsUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/PersonalDetailsUtils.js b/src/libs/PersonalDetailsUtils.js
index 4d2cf389dae3..1d4966826492 100644
--- a/src/libs/PersonalDetailsUtils.js
+++ b/src/libs/PersonalDetailsUtils.js
@@ -123,7 +123,6 @@ function getNewPersonalDetailsOnyxData(logins, accountIDs) {
              * This is done to prevent duplicate entries (upon success) since the BE will return other personal details with the correct account IDs.
              */
             successData[accountID] = null;
-            failureData[accountID] = null;
         }
     });
 

From ffab9162da0b10157290face92431271b306e639 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Mon, 31 Jul 2023 12:45:07 -0700
Subject: [PATCH 3/3] remove unused imports

---
 src/libs/actions/Policy.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 41e2a19f2241..6c780dfe6dc4 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -7,14 +7,12 @@ import {escapeRegExp} from 'lodash';
 import * as API from '../API';
 import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
-import * as LocalePhoneNumber from '../LocalePhoneNumber';
 import * as OptionsListUtils from '../OptionsListUtils';
 import * as ErrorUtils from '../ErrorUtils';
 import * as ReportUtils from '../ReportUtils';
 import * as PersonalDetailsUtils from '../PersonalDetailsUtils';
 import Log from '../Log';
 import Permissions from '../Permissions';
-import * as UserUtils from '../UserUtils';
 
 const allPolicies = {};
 Onyx.connect({