Skip to content

Onboarding - Setup specialist has the onboarded user's email and a fallback avatar - #91112

Merged
JS00001 merged 4 commits into
Expensify:mainfrom
David-2002065:fix/90693-setup-specialist-qa-guide
May 22, 2026
Merged

JS00001 merged 4 commits into
Expensify:mainfrom
David-2002065:fix/90693-setup-specialist-qa-guide

Conversation

@David-2002065

Copy link
Copy Markdown
Contributor

Explanation of Change

During onboarding, the setup specialist row in the #admins room was showing the just-onboarded user's email and a fallback avatar instead of qa.guide@team.expensify.com with the correct guide avatar.

This happened because prepareOnboardingOnyxData in src/libs/ReportUtils.ts used generateAccountID(assignedGuideEmail) as the optimistic account ID for the QA guide. The generated ID did not match the real QA guide accountID, so personal details and the avatar could not be resolved and the row fell back to the current user's data.

This PR:

  • Uses CONST.EMAIL.QA_GUIDE as the fallback email (instead of the existing CONST.SETUP_SPECIALIST_LOGIN constant) so the lookup is consistent with the rest of the app.
  • When the resolved email is the QA guide, uses the known CONST.ACCOUNT_ID.QA_GUIDE instead of generating a random optimistic ID, so the correct personal details / avatar are matched.
  • Skips creating an optimistic personal detail for the QA guide, since the real account already exists.

Fixed Issues

$ #90693
PROPOSAL: #90693 (comment)

Tests

  1. Open the app on dev (https://dev.new.expensify.com:8082/) in an incognito window.
  2. From the landing page, sign up with a fresh email of the form anything@tstsg.com.
  3. Choose "Manage my company's expenses (10+)" and complete signup.
  4. On the onboarding screen, select 51-100 - QBO and finish onboarding.
  5. After being redirected to NewDot, open the #admins room for the newly created workspace.
  6. Verify the setup specialist message shows:
    • Email/display name: qa.guide@team.expensify.com (not the just-onboarded user's email).
    • Avatar: the correct QA guide avatar (not the generic fallback initials avatar).
  7. Reload the app and re-open the #admins room — the setup specialist details still render correctly.
  • Verify that no errors appear in the JS console

Offline tests

  1. Sign in to a fresh test account on dev and start onboarding while online up to the workspace-size selection step.
  2. Toggle the network OFF (Chrome DevTools → Network → Offline) before submitting the onboarding flow.
  3. Submit the onboarding selection.
  4. Verify that the optimistic #admins room still shows the setup specialist as qa.guide@team.expensify.com with the correct avatar.
  5. Toggle the network back ON and confirm the data persists (no flicker, no fallback avatar).

QA Steps

  1. Go to staging.expensify.com and pick "Manage my company's expenses (10+)".
  2. Sign up with a new account using the format [anything]@tstsg.com, click "Get Started" and complete signup.
  3. When redirected to NewDot, choose 51-100 - QBO and finish onboarding.
  4. Open the #admins room of the newly created workspace.
  5. Verify the setup specialist appears as qa.guide@team.expensify.com with the correct (non-fallback) avatar.
  6. Repeat the flow on each platform listed below and confirm the same outcome.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message: N/A — no copy was added or modified in this PR.
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android.mp4
Android: mWeb Chrome
androidmWebChrome.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
iosmWebSafari.mp4
MacOS: Chrome / Safari
macOS-chrome.mp4
macOS-safari.mp4

@David-2002065
David-2002065 requested review from a team as code owners May 19, 2026 18:56
@melvin-bot
melvin-bot Bot requested review from ZhenjaHorbach and heyjennahay and removed request for a team May 19, 2026 18:56
@melvin-bot

melvin-bot Bot commented May 19, 2026

Copy link
Copy Markdown

@ZhenjaHorbach Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot removed the request for review from a team May 19, 2026 18:56
@github-actions

github-actions Bot commented May 19, 2026 •

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@David-2002065

Copy link
Copy Markdown
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: aff157c230

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/libs/ReportUtils.ts
assignedGuideAccountID = generateAccountID(assignedGuideEmail);
isOptimisticAssignedGuide = !assignedGuidePersonalDetail;
assignedGuideAccountID = assignedGuideEmail === CONST.EMAIL.QA_GUIDE ? CONST.ACCOUNT_ID.QA_GUIDE : generateAccountID(assignedGuideEmail);
isOptimisticAssignedGuide = !assignedGuidePersonalDetail && assignedGuideEmail !== CONST.EMAIL.QA_GUIDE;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Mark QA guide placeholder as optimistic when merged

When assignedGuideEmail is CONST.EMAIL.QA_GUIDE and that user is not yet in the local personal-details cache (e.g., fresh session or offline onboarding), this sets isOptimisticAssignedGuide to false even though the same else branch still merges a fallback personal detail entry. The cleanup block later in prepareOnboardingOnyxData() only runs when isOptimisticAssignedGuide is true, so the fallback QA-guide record can persist under the real QA guide account ID and continue showing placeholder name/avatar instead of the canonical guide details until another sync overwrites it.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch — there was a real inconsistency here. The merged personal detail record was flagged isOptimisticPersonalDetail: true while isOptimisticAssignedGuide was false, so the placeholder under ACCOUNT_ID.QA_GUIDE was never cleaned up.

I didn't take the suggested cleanup path, because the QA guide is a real account with a fixed ACCOUNT_ID.QA_GUIDE — running the success/failure cleanup would null out the record and drop the avatar (the exact issue this PR fixes). Instead I made the merged record consistent with isOptimisticAssignedGuide:

-            isOptimisticPersonalDetail: !assignedGuidePersonalDetail,
+            isOptimisticPersonalDetail: isOptimisticAssignedGuide,

Now the QA guide record is correctly treated as non-optimistic, the placeholder flag no longer lingers, and the avatar stays visible. Tested locally via the onboarding flow — works as expected.

@ZhenjaHorbach

ZhenjaHorbach commented May 20, 2026 •

Copy link
Copy Markdown
Contributor

Commits should be verified
And don't use different accounts, please

@David-2002065
David-2002065 force-pushed the fix/90693-setup-specialist-qa-guide branch from 5fb5bd2 to 8f8cb8d Compare May 20, 2026 13:42
exfy-clabot Bot added a commit to Expensify/CLA that referenced this pull request May 20, 2026
@David-2002065

Copy link
Copy Markdown
Contributor Author

Commits should be verified And don't use different accounts, please

Thanks for flagging this! I've re-signed both commits and re-authored them under a single account (@dilshodmackbook-sketch) — they now show as Verified. Apologies for the
mix-up, it won't happen again. 🙏

@David-2002065

Copy link
Copy Markdown
Contributor Author

@ZhenjaHorbach this is resolved 🙏

Both commits are signed and show as Verified ✅, and both are authored under a single account (@dilshodmackbook-sketch).

Ready for your re-review whenever you get a chance!

@ZhenjaHorbach

ZhenjaHorbach commented May 22, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
2026-05-22.15.58.33.mov
Android: mWeb Chrome
2026-05-22.15.58.33.mov
iOS: HybridApp
2026-05-22.16.00.43.mov
iOS: mWeb Safari
2026-05-22.15.54.52.mov
MacOS: Chrome / Safari
2026-05-22.15.47.48.mov

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

Looks like the wrong avatar is used

2026-05-22.14.57.00.mov

The QA guide row used getDefaultAvatarURL with only the accountID, which
hashes ACCOUNT_ID.QA_GUIDE into a different default-avatar bucket than the
backend assigns. The backend hashes the account's email, so the optimistic
avatar did not match the canonical guide avatar.

Pass accountEmail so the optimistic avatar matches the backend-assigned one.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@David-2002065

Copy link
Copy Markdown
Contributor Author

Looks like the wrong avatar is used

Good catch — fixed in the latest commit.

The QA guide row was calling getDefaultAvatarURL({accountID: assignedGuideAccountID}) with only the account ID. That hashes ACCOUNT_ID.QA_GUIDE via accountID % 24 into default-avatar bucket 11, but the backend computes the avatar from the account's email (md5(qa.guide@team.expensify.com)), which resolves to bucket 21. So the optimistic avatar never matched the canonical guide avatar.

Fix — pass accountEmail so the optimistic avatar is computed the same way as the backend:

- avatar: getDefaultAvatarURL({accountID: assignedGuideAccountID}),
+ avatar: getDefaultAvatarURL({accountID: assignedGuideAccountID, accountEmail: assignedGuideEmail}),

This is consistent with existing usages of getDefaultAvatarURL in ReportUtils.ts that already pass accountEmail. The QA guide row now shows the correct guide avatar. Re-tested via the onboarding flow — works as expected.

@David-2002065

Copy link
Copy Markdown
Contributor Author

After fix video

Screen.Recording.2026-05-22.at.18.18.07.mp4

@melvin-bot
melvin-bot Bot requested a review from JS00001 May 22, 2026 14:02
JS00001
JS00001 previously approved these changes May 22, 2026
@JS00001

JS00001 commented May 22, 2026

Copy link
Copy Markdown
Contributor

@dilshodmackbook-sketch jest tests are failing

The hardcoded 515109196 fails in CI because CONST.ACCOUNT_ID.QA_GUIDE
resolves to the env-configured value (default 14365522).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@David-2002065

Copy link
Copy Markdown
Contributor Author

Fixed the failing Jest test. The test in ReportUtilsTest.ts was asserting a hardcoded account ID (515109196), but the implementation uses CONST.ACCOUNT_ID.QA_GUIDE, which
resolves to the env-configured value (default 14365522 in CI). Updated the assertion to use CONST.ACCOUNT_ID.QA_GUIDE so it's environment-agnostic. Test passes locally now —
pushed in 29b5570.

@JS00001
JS00001 merged commit 5a49365 into Expensify:main May 22, 2026
37 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 @JS00001 has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify OSBotify mentioned this pull request May 22, 2026
71 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.3.80-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

This PR fixes an internal code bug in ReportUtils.ts where the setup specialist's avatar and email weren't resolving correctly during onboarding (using a generated optimistic account ID instead of the known QA guide account ID). No user-facing features, UI labels, settings, or workflows were added or changed.

The existing help site articles already correctly describe the Setup Specialist at a high level — this fix just ensures it renders as documented.

@mountiny

Copy link
Copy Markdown
Contributor

This was not QAed properly because of #91384 (comment) @JS00001 @ZhenjaHorbach @dilshodmackbook-sketch Can you please make sure to QA this change? I wont block the deploy on it but lets make sure to follow up

@David-2002065

Copy link
Copy Markdown
Contributor Author

Following up on QA as requested.

✅ Verified on dev (https://dev.new.expensify.com:8082/) using the exact QA steps from the PR description:

  1. Signed up with a fresh xxx@tstsg.com account
  2. Selected "Manage my company's expenses (10+)" → 51-100 - QBO
  3. Opened the #admins room of the newly created workspace
  4. Setup specialist row correctly shows qa.guide@team.expensify.com with the proper QA guide avatar (not the fallback initials avatar)
  5. Reloaded the page — details persist correctly

Screenshot attached.

image

Since the staging QA flow is currently blocked by #91384 (onboarding tasks not rendering for MANAGE_TEAM users), I'll re-run the full staging QA across all platforms (Web, iOS
native, Android native, mWeb) once that issue is resolved and post results back here.


Demo:

Screen.Recording.2026-05-25.at.15.30.35.mp4

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.81-2 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants