Add suggested follow-up skeleton by gijoe0295 · Pull Request #90363 · Expensify/App

gijoe0295 · 2026-05-12T18:01:50Z

Explanation of Change

We should show skeleton loading state for Concierge suggested follow-up actionable buttons while they're being generated in the backend.

Fixed Issues

$ #89686
PROPOSAL:

Tests

Sign up a new account
Complete onboarding with "Manage my team's expenses" purpose and Xero as accounting integration
Tap any actionable button in #admins chat
Verify after the response completes trickling, actionable buttons skeleton appears
Verify the skeleton disappears when the actual buttons with data shows

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-05-26.at.00.14.28.mov

Android: mWeb Chrome

Screen.Recording.2026-05-20.at.03.15.14.mov

iOS: Native

Screen.Recording.2026-05-20.at.01.53.53.mov

iOS: mWeb Safari

Screen.Recording.2026-05-20.at.01.58.48.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-20.at.01.51.31.mov

melvin-bot · 2026-05-13T19:21:50Z

@dubielzyk-expensify @Krishna2323 One of you needs to 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]

gijoe0295 · 2026-05-13T19:22:48Z

@marcochavezf Responses on dev seem to be throttled. I kept waiting forever for the follow-up buttons. We might need to test on adhoc builds.

codecov · 2026-05-13T19:22:55Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/hooks/useShouldSuppressConciergeIndicators.tsx	`92.85% <100.00%> (+1.94%)`	⬆️
src/libs/actions/Report/SuggestedFollowup.ts	`96.66% <100.00%> (+0.51%)`	⬆️
...inbox/report/actionContents/ChatMessageContent.tsx	`100.00% <100.00%> (ø)`
src/styles/index.ts	`59.06% <ø> (ø)`
src/hooks/usePendingConciergeResponse.ts	`89.65% <96.42%> (+2.15%)`	⬆️
...ox/report/actionContents/ChatActionableButtons.tsx	`78.94% <66.66%> (-0.79%)`	⬇️
...mponents/ReportActionItem/FollowupListSkeleton.tsx	`25.00% <25.00%> (ø)`
... and 9 files with indirect coverage changes

Krishna2323 · 2026-05-13T19:35:32Z

I can review this.

dubielzyk-expensify · 2026-05-18T02:24:18Z

I've seen this in the issue, but would still be good to upload videos for the platforms here 👍

gijoe0295 · 2026-05-18T04:00:46Z

Oh I was waiting for design confirmation before uploading the videos

dubielzyk-expensify · 2026-05-18T04:17:38Z

Sure. I think the videos over here looks good, but let's wait for @Expensify/design to chime in too

shawnborton · 2026-05-18T06:58:30Z

Commented over there. They look great to me, just ever so slightly on the slow side but no strong feelings there.

gijoe0295 · 2026-05-18T15:27:47Z

Thanks for the thorough review. Will check them first thing tomorrow morning.

gijoe0295 · 2026-05-19T18:48:34Z

When the skeleton is replaced by the actual buttons, there's a brief visual glitch:

Fixed in c4f080c by removing the exiting animation:

Screen.Recording.2026-05-20.at.01.45.30.mov

If the TTL fires first, the skeleton disappears and the buttons pop in without any loading indicator. We could consider either:

bumping this to match the 120s processing indicator cap, or

tying it to the agentZeroProcessingIndicator NVP so the skeleton stays visible as long as the server signals it’s still processing.

I went with bumping this to match the 120s processing indicator cap.

gijoe0295 · 2026-05-19T19:12:02Z

Added screenshots for iOS and Web. Haven't done on Android yet because backend is down.

gijoe0295 · 2026-05-19T20:19:09Z

Added Android mWeb screenshot. I never received a response on Android native. Not sure why. @shawnborton Mind triggering another adhoc build for the latest changes?

gijoe0295 · 2026-05-21T15:31:25Z

@Krishna2323 David is eager to get this released soon so could you re-review when you had time? Thanks.

@Expensify/design Mind running another adhoc build for the latest changes? I already added screenshots for all platforms for your reference.

Krishna2323 · 2026-05-21T16:35:18Z

Reviewing...

github-actions · 2026-05-21T16:59:58Z

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

Krishna2323 · 2026-05-21T18:38:26Z

@gijoe0295 saw the "searching documentation..." indicator flash for one frame when followup buttons arrived. Likely a race between the followup-list rendering and the processing indicator clearing.

android_hybrid.mp4

gijoe0295 · 2026-05-25T17:18:30Z

saw the "searching documentation..." indicator flash for one frame when followup buttons arrived. Likely a race between the followup-list rendering and the processing indicator clearing.

Fixed in fd63838

Krishna2323 · 2026-05-26T21:33:54Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

android_hybrid.mp4

Android: mWeb Chrome

android_mWeb.mp4

iOS: HybridApp

ios_hybrid.mp4

iOS: mWeb Safari

ios_mWeb.mp4

MacOS: Chrome / Safari

web_chrome.mp4

Krishna2323 · 2026-05-26T21:34:01Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fd638389dd

ℹ️ 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".

chatgpt-codex-connector · 2026-05-26T21:40:40Z

+            clearAgentZeroProcessingIndicator(reportID);
+            clearPendingFollowupList(reportID);


Guard indicator clear by request context

Clearing agentZeroProcessingRequestIndicator here is unconditional at report scope, so one request can clear another request’s in-progress state. If a user triggers a second Concierge/AgentZero request before the first pending followup-list resolves, the first request’s reconciliation path will call clearAgentZeroProcessingIndicator(reportID) and hide the thinking/typing state (and reasoning history) for the newer request even though it is still running.

Useful? React with 👍 / 👎.

@gijoe0295 this one also seems to be a valid concern.

chatgpt-codex-connector · 2026-05-26T21:40:40Z

+    const {isOffline} = useNetwork();
+    const [pendingFollowupList] = useOnyx(`${ONYXKEYS.COLLECTION.CONCIERGE_PENDING_FOLLOWUP_LIST}${reportID}`);
+    const hasPendingFollowupListSkeleton = !isOffline && pendingFollowupList?.reportActionID === action.reportActionID;


Hoist report-level subscriptions out of each message row

This adds useNetwork() and a report-level useOnyx() subscription inside every ChatMessageContent row, so a single network flip or pending-followup key update fans out re-renders across all rendered messages in the thread. In large chats this creates avoidable O(n) row updates for state that only affects one action, which can introduce visible UI jank.

Useful? React with 👍 / 👎.

@gijoe0295 seems valid.

feat: add suggested follow-up skeleton

6a2b31d

melvin-bot Bot assigned gijoe0295 May 12, 2026

gijoe0295 added 3 commits May 14, 2026 01:24

Merge branch 'main' of github.com:gijoe0295/App into App-89686

7f25f5f

add sentry useSkeletonSpan

c4ecb41

update skeleton design and animation

a084d43

gijoe0295 marked this pull request as ready for review May 13, 2026 19:21

gijoe0295 requested review from a team as code owners May 13, 2026 19:21

melvin-bot Bot requested review from JmillsExpensify, Krishna2323 and dubielzyk-expensify and removed request for a team May 13, 2026 19:21

fix lint

2b5a6ad

github-actions Bot reviewed May 13, 2026

View reviewed changes

Comment thread src/pages/inbox/report/actionContents/ChatMessageContent.tsx

gijoe0295 added 2 commits May 14, 2026 03:23

update skeleton style

7eefb90

add tests

9f5b01e

gijoe0295 requested a review from a team as a code owner May 13, 2026 20:23

gijoe0295 added 2 commits May 15, 2026 21:46

update skeleton UI

28fb65d

remove minor test

763836c

gijoe0295 added 2 commits May 18, 2026 16:51

Merge branch 'main' of github.com:gijoe0295/App into App-89686

7267127

adjust skeleton speed

c249a2d

gijoe0295 added 6 commits May 20, 2026 00:35

Merge branch 'main' of github.com:gijoe0295/App into App-89686

d5cc567

fix lint

50db2ab

increase skeleton threshold

9e542a1

remove redundant displayName

f3b1320

fix failed tests

5f01d11

fix visual glitch

c4f080c

fix prettier

6ef726a

gijoe0295 requested a review from Krishna2323 May 19, 2026 20:19

Krishna2323 reviewed May 21, 2026

View reviewed changes

Comment thread src/hooks/usePendingConciergeResponse.ts Outdated

marcochavezf self-requested a review May 22, 2026 05:26

gijoe0295 added 7 commits May 25, 2026 23:37

pause TTL timer when offline

e7993ac

do not show skeleton when offline

15ba3cc

pass computed prop from parent component

3c787ed

Merge branch 'main' of github.com:gijoe0295/App into App-89686

5bdb968

Merge branch 'main' of github.com:gijoe0295/App into App-89686

50c415e

fix ts

c10ce4a

fix thinking indicator flashes

fd63838

gijoe0295 requested a review from Krishna2323 May 25, 2026 17:18

chatgpt-codex-connector Bot reviewed May 26, 2026

View reviewed changes

		clearAgentZeroProcessingIndicator(reportID);
		clearPendingFollowupList(reportID);

Conversation

gijoe0295 commented May 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 13, 2026

Uh oh!

gijoe0295 commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented May 13, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Krishna2323 commented May 13, 2026

Uh oh!

dubielzyk-expensify commented May 18, 2026

Uh oh!

gijoe0295 commented May 18, 2026

Uh oh!

dubielzyk-expensify commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shawnborton commented May 18, 2026

Uh oh!

gijoe0295 commented May 18, 2026

Uh oh!

gijoe0295 commented May 19, 2026

Uh oh!

gijoe0295 commented May 19, 2026

Uh oh!

gijoe0295 commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gijoe0295 commented May 21, 2026

Uh oh!

Krishna2323 commented May 21, 2026

Uh oh!

github-actions Bot commented May 21, 2026

Uh oh!

Uh oh!

Krishna2323 commented May 21, 2026

Uh oh!

gijoe0295 commented May 25, 2026

Uh oh!

Krishna2323 commented May 26, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Krishna2323 commented May 26, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 26, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 May 26, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot May 26, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 May 26, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

gijoe0295 commented May 12, 2026 •

edited

Loading

gijoe0295 commented May 13, 2026 •

edited

Loading

codecov Bot commented May 13, 2026 •

edited by github-actions Bot

Loading

dubielzyk-expensify commented May 18, 2026 •

edited

Loading

gijoe0295 commented May 19, 2026 •

edited

Loading