Merge pull request #56370 from ishpaul777/fix-db-56351

[fix] Setup specialist appears in member list and throws error when invited
Expensify · Feb 4, 2025 · 6486b1d · 6486b1d
2 parents 1e4ff8a + e1bf1f9
commit 6486b1d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -6570,6 +6570,7 @@ const CONST = {
         },
     },
     SKIPPABLE_COLLECTION_MEMBER_IDS: [String(DEFAULT_NUMBER_ID), '-1', 'undefined', 'null', 'NaN'] as string[],
+    SETUP_SPECIALIST_LOGIN: 'Setup Specialist',
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
@@ -1481,7 +1481,14 @@ function getValidOptions(
         for (let i = 0; i < options.personalDetails.length; i++) {
             // eslint-disable-next-line rulesdir/prefer-at
             const detail = options.personalDetails[i];
-            if (!detail?.login || !detail.accountID || !!detail?.isOptimisticPersonalDetail || (!includeDomainEmail && Str.isDomainEmail(detail.login))) {
+            if (
+                !detail?.login ||
+                !detail.accountID ||
+                !!detail?.isOptimisticPersonalDetail ||
+                (!includeDomainEmail && Str.isDomainEmail(detail.login)) ||
+                // Exclude the setup specialist from the list of personal details as it's a fallback if guide is not assigned
+                detail?.login === CONST.SETUP_SPECIALIST_LOGIN
+            ) {
                 continue;
             }
 

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -3664,6 +3664,7 @@ function prepareOnboardingOnyxData(
         assignedGuideAccountID = generateAccountID(assignedGuideEmail);
         Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
             [assignedGuideAccountID]: {
+                isOptimisticPersonalDetail: assignedGuideEmail === CONST.SETUP_SPECIALIST_LOGIN,
                 login: assignedGuideEmail,
                 displayName: assignedGuideEmail,
             },