Skip to content

[Payment due @truph01] Rillet follow ups - fixing bugs - #96444

Merged
lakchote merged 12 commits into
Expensify:mainfrom
s77rt:rillet-follow-ups
Jul 21, 2026
Merged

lakchote merged 12 commits into
Expensify:mainfrom
s77rt:rillet-follow-ups

Conversation

@s77rt

@s77rt s77rt commented Jul 18, 2026

Copy link
Copy Markdown
Member

Explanation of Change

  • The per-card and per-feed account selection show be displayed only if user has active cards
  • Added missing backTo paths
  • Added missing cardID param (it was only sent internally and on refresh the url didn't had that so it was lost, now it's part of the url)

Fixed Issues

$ #96413
$ #96414
$ #96417
PROPOSAL:

Tests

Test 1:

  1. Have a workspace with a feed and no assigned card
  2. Connect Rillet
  3. Go to Accounting > Export
  4. Verify the per-card/per-feed options are not displayed
  5. Assign a card
  6. Verify the per-card/per-feed options are displayed
Screen.Recording.2026-07-18.at.12.44.40.PM.mov

Test 2:

  1. Have a workspace with a feed and and an assigned card
  2. Connect Rillet
  3. Go to Accounting > Export > Per-card account
  4. Refresh page
  5. Click on back button
  6. Verify you are taken back to the Export page
Screen.Recording.2026-07-18.at.12.56.35.PM.mov

Test 3:

  1. Have a workspace with a feed and and an assigned card
  2. Connect Rillet
  3. Go to Accounting > Export > Per-card account
  4. Click on any feed then select any card
  5. Update the account to any non-default account
  6. Refresh the page
  7. Verify the selection is correct

(Note: the background may look different, this is expected for now)

Screen.Recording.2026-07-18.at.3.56.26.PM.mov
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

  • 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 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 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)
  • 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)
  • 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.
  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@codecov

codecov Bot commented Jul 18, 2026

Copy link
Copy Markdown

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/libs/CardFeedUtils.ts 72.38% <ø> (ø)
...nyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx 0.00% <ø> (ø)
src/ROUTES.ts 21.54% <0.00%> (-0.02%) ⬇️
src/components/ConnectionLayout.tsx 0.00% <0.00%> (ø)
...pace/accounting/rillet/export/RilletExportPage.tsx 0.00% <0.00%> (ø)
...rillet/export/RilletCardProgramAccountSelector.tsx 0.00% <0.00%> (ø)
...unting/rillet/export/RilletCardAccountCardList.tsx 0.00% <0.00%> (ø)
...ounting/rillet/export/RilletCardProgramAccount.tsx 0.00% <0.00%> (ø)
...ace/accounting/rillet/export/RilletCardAccount.tsx 0.00% <0.00%> (ø)
... and 15 files with indirect coverage changes

@s77rt
s77rt marked this pull request as ready for review July 18, 2026 16:13
@s77rt
s77rt requested review from a team as code owners July 18, 2026 16:13
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and truph01 and removed request for a team July 18, 2026 16:13
@melvin-bot

melvin-bot Bot commented Jul 18, 2026

Copy link
Copy Markdown

@truph01 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]

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

All LGTM

Comment thread src/pages/workspace/accounting/rillet/export/RilletExportPage.tsx Outdated
Comment thread src/pages/workspace/accounting/rillet/export/RilletExportPage.tsx
Comment thread src/pages/workspace/accounting/rillet/export/RilletExportPage.tsx
@lakchote
lakchote self-requested a review July 20, 2026 13:30
@s77rt
s77rt requested a review from truph01 July 20, 2026 15:49
@truph01

truph01 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

@codex review

@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: 4c182f54ed

ℹ️ 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/pages/workspace/accounting/rillet/export/RilletExportPage.tsx
@truph01

truph01 commented Jul 21, 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 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)
  • 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)
  • 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.
  • 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
Screen.Recording.2026-07-21.at.10.29.33.mov
Android: mWeb Chrome
Screen.Recording.2026-07-21.at.10.33.00.mov
iOS: HybridApp
Screen.Recording.2026-07-21.at.10.35.42.mov
iOS: mWeb Safari
Screen.Recording.2026-07-21.at.10.37.02.mov
MacOS: Chrome / Safari
Screen.Recording.2026-07-21.at.10.21.02.mov
Screen.Recording.2026-07-21.at.10.22.44.mov

@melvin-bot melvin-bot Bot changed the title Rillet follow ups - fixing bugs [Payment due @truph01] Rillet follow ups - fixing bugs Jul 21, 2026
@melvin-bot

melvin-bot Bot commented Jul 21, 2026

Copy link
Copy Markdown

🎯 @truph01, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - no internal issue.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@lakchote lakchote left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@lakchote
lakchote merged commit 8854316 into Expensify:main Jul 21, 2026
36 of 41 checks passed
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/lakchote in version: 9.4.42-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no changes required.

I reviewed the changes in this PR against the help site content under docs/articles. No help site updates are needed, so I have not created a draft docs PR.

Why:

  • This PR is a set of internal bug fixes to the Rillet accounting export flow:
    • Show the per-card / per-feed account selection only when the feed has active (assigned) cards.
    • Fix missing back-navigation paths so the back button returns to the correct screen.
    • Persist the cardID in the URL so a per-card selection survives a page refresh.
  • These are navigation and conditional-display fixes. They don't add, remove, or change any documented, user-facing feature or step.
  • Rillet has no public help-site article. The only reference in docs/articles is the internal AgentZero page Upcoming-Integrations-And-Accounting.md, which is noindex/sitemap: false (not user-facing) and simply lists Rillet as an upcoming native accounting integration. Nothing in that one-line description is affected by these fixes.

@s77rt, please confirm this assessment matches the current behavior. If you believe a user-facing help article should exist or be updated for the Rillet export configuration flow, let me know and I'll draft one.

@melvin-bot

melvin-bot Bot commented Jul 22, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #96787

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.4.42-1 🚀

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

Bundle Size Analysis (Sentry):

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