From 13a33cf7df108bd0751b47412289b8a0a95856ff Mon Sep 17 00:00:00 2001
From: Ben Limpich <blimpich@expensify.com>
Date: Tue, 30 Jan 2024 12:52:10 -0800
Subject: [PATCH 1/3] remove unnecessary concierge check

---
 src/libs/ReportUtils.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 58b0489314a0..853c306d1cec 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1561,14 +1561,6 @@ function getPersonalDetailsForAccountID(accountID: number): Partial<PersonalDeta
     if (!accountID) {
         return {};
     }
-    if (Number(accountID) === CONST.ACCOUNT_ID.CONCIERGE) {
-        return {
-            accountID,
-            displayName: 'Concierge',
-            login: CONST.EMAIL.CONCIERGE,
-            avatar: UserUtils.getDefaultAvatar(accountID),
-        };
-    }
     return (
         allPersonalDetails?.[accountID] ?? {
             avatar: UserUtils.getDefaultAvatar(accountID),

From ca612f4eafca811600ddefd2857fd0c50cf8e97d Mon Sep 17 00:00:00 2001
From: Ben Limpich <blimpich@expensify.com>
Date: Wed, 21 Feb 2024 14:15:01 -0800
Subject: [PATCH 2/3] get rid of unnecessary check

---
 src/pages/DetailsPage.tsx | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/pages/DetailsPage.tsx b/src/pages/DetailsPage.tsx
index d4438d3141bf..a9adb5310e58 100755
--- a/src/pages/DetailsPage.tsx
+++ b/src/pages/DetailsPage.tsx
@@ -64,22 +64,13 @@ function DetailsPage({personalDetails, route, session}: DetailsPageProps) {
     let details = Object.values(personalDetails ?? {}).find((personalDetail) => personalDetail?.login === login.toLowerCase());
 
     if (!details) {
-        if (login === CONST.EMAIL.CONCIERGE) {
-            details = {
-                accountID: CONST.ACCOUNT_ID.CONCIERGE,
-                login,
-                displayName: 'Concierge',
-                avatar: UserUtils.getDefaultAvatar(CONST.ACCOUNT_ID.CONCIERGE),
-            };
-        } else {
-            const optimisticAccountID = UserUtils.generateAccountID(login);
-            details = {
-                accountID: optimisticAccountID,
-                login,
-                displayName: login,
-                avatar: UserUtils.getDefaultAvatar(optimisticAccountID),
-            };
-        }
+        const optimisticAccountID = UserUtils.generateAccountID(login);
+        details = {
+            accountID: optimisticAccountID,
+            login,
+            displayName: login,
+            avatar: UserUtils.getDefaultAvatar(optimisticAccountID),
+        };
     }
 
     const isSMSLogin = details.login ? Str.isSMSLogin(details.login) : false;

From 12834bb7898186f59549aaa6189e2bf66a3fe820 Mon Sep 17 00:00:00 2001
From: Ben Limpich <blimpich@expensify.com>
Date: Wed, 21 Feb 2024 14:19:44 -0800
Subject: [PATCH 3/3] fix bad merge conflict resolution

---
 src/libs/ReportUtils.ts | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a493c51eaa52..b0e2513a3018 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1618,25 +1618,6 @@ function getPersonalDetailsForAccountID(accountID: number): Partial<PersonalDeta
     if (!accountID) {
         return {};
     }
-<<<<<<< HEAD
-=======
-    if (Number(accountID) === CONST.ACCOUNT_ID.CONCIERGE) {
-        return {
-            accountID,
-            displayName: 'Concierge',
-            login: CONST.EMAIL.CONCIERGE,
-            avatar: UserUtils.getDefaultAvatar(accountID),
-        };
-    }
-    if (Number(accountID) === CONST.ACCOUNT_ID.NOTIFICATIONS) {
-        return {
-            accountID,
-            displayName: 'Expensify',
-            login: CONST.EMAIL.NOTIFICATIONS,
-            avatar: UserUtils.getDefaultAvatar(accountID),
-        };
-    }
->>>>>>> main
     return (
         allPersonalDetails?.[accountID] ?? {
             avatar: UserUtils.getDefaultAvatar(accountID),