[Internal QA] Expensify Card feed selector by koko57 · Pull Request #59887 · Expensify/App

koko57 · 2025-04-09T08:43:31Z

Explanation of Change

Fixed Issues

$ #59364
PROPOSAL:

Tests

PREREQUISITES: an account with a domain card set up in the OD, ideally with 2 workspaces in the ND - one with Expensify Card set up, one with no Expensify Card setup

Has an Expensify Card set up

In the OD set this workspace as preferred policy in the domain cards settings
Go to the ND to the workspace that was set as a preferred policy
Verify that the workspace cards are displayed
Verify that you see the feed selector
Verify that after clicking the feed selector the selection page is opened
Verify that you see both workspace and domain options - the workspace cards would have workspace name
After clicking the domain feed, the selector page should close and the domain feed cards should be displayed.
Verify that the settings button is displayed and changing the settings work like for the workspace Expensify Card

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

n/a

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

https://github.com/user-attachments/assets/80d5f64f-5e14-4f3b-ac25-858f1cd54ce4

MacOS: Desktop

melvin-bot · 2025-04-09T10:58:59Z

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

DylanDylann · 2025-04-14T04:15:24Z

@koko57 Please align the vertical center two buttons

DylanDylann · 2025-04-14T04:21:03Z

+                    <CaretWrapper style={styles.flex1}>
+                        <Text style={[styles.textStrong, styles.flexShrink1]}>{feedName}</Text>
+                    </CaretWrapper>
+                    {children}


For displaying RBR, let's introduce a new prop called shouldShowRBR. And at this time I think we can remove children element

DylanDylann · 2025-04-14T07:20:55Z

Should we initialize COLLECTION.LAST_SELECTED_EXPENSIFY_FEED value? Currently, this value will be null until users select another Expensify Feed. I think we need to set a default value for LAST_SELECTED_EXPENSIFY_FEED to workspaceAccountID

koko57 · 2025-04-14T07:24:11Z

@DylanDylann

Should we initialize COLLECTION.LAST_SELECTED_EXPENSIFY_FEED value? Currently, this value will be null until users select another Expensify Feed. I think we need to set a default value for LAST_SELECTED_EXPENSIFY_FEED to workspaceAccountID

no, I don't think it's necessary - we always fallback to the workspaceID or fundID when available

DylanDylann · 2025-04-14T07:30:00Z

 }

-function updateSettlementAccount(workspaceAccountID: number, policyID: string, settlementBankAccountID?: number, currentSettlementBankAccountID?: number) {
+function updateSettlementAccount(domainName: string, workspaceAccountID: number, policyID: string, settlementBankAccountID?: number, currentSettlementBankAccountID?: number) {


Why do we need to change this function?

because prevously we generated the domainName inside function from the policy - now we cannot get it from the policyID like previously

DylanDylann · 2025-04-14T07:32:28Z

                onBackButtonPress={() => Navigation.goBack()}
            >
-                {!shouldUseNarrowLayout && isBankAccountVerified && getHeaderButtons()}
+                {!shouldShowSelector && !shouldUseNarrowLayout && isBankAccountVerified && getHeaderButtons()}


Let's move isBankAccountVerified check to getHeaderButtons function to avoid duplicated code

no, if we move it this View wrapper will be displayed <View style={styles.ph5}>{getHeaderButtons()}</View>

DylanDylann · 2025-04-14T07:37:51Z

no, I don't think it's necessary - we always fallback to the workspaceID or fundID when available

@koko57

Let's clear the cache
Going to Expensify Feed selector page
Notice that there are no tick to indicate the selected option

koko57 · 2025-04-14T08:01:10Z

@DylanDylann we don't initiate the laste selected feed with value for company feeds - we fallback to the default feed instead, so I did it similarly for Exfy Card feed

DylanDylann · 2025-04-14T08:20:22Z

@koko57 Prettier check failed

DylanDylann · 2025-04-14T08:29:12Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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: Native

Screen.Recording.2025-04-14.at.15.39.31.mov

Android: mWeb Chrome

Screen.Recording.2025-04-14.at.15.25.04.mov

iOS: Native

Screen.Recording.2025-04-14.at.15.27.44.mov

iOS: mWeb Safari

Screen.Recording.2025-04-14.at.15.24.48.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-14.at.15.22.05.mov

MacOS: Desktop

Screen.Recording.2025-04-14.at.15.23.09.mov

koko57 · 2025-04-14T08:43:48Z

@DylanDylann prettier fixed

puneetlath

Mainly some minor comments from me. Should we add some UI tests for this functionality?

Also, does this selector show up if there is a workspace feed and a domain feed? Or only if there are domain feeds? I was trying to test locally

koko57 · 2025-04-15T08:00:12Z

@puneetlath All changes applied! What UI tests do you mean?

The feed selector is always shown when is more than one feed - no matter if there are 2+ domain feeds or a workspace and a domain feed

puneetlath

One small comment.

puneetlath · 2025-04-15T13:57:12Z

What UI tests do you mean?

I didn't have anything specific in mind. Just wondering if there is anything here that we can add tests for. All good if not.

Co-authored-by: Puneet Lath <puneet@expensify.com>

koko57 · 2025-04-15T14:07:25Z

I didn't have anything specific in mind. Just wondering if there is anything here that we can add tests for. All good if not.

@puneetlath no, I don't think they are necessary here
commited the change you requested

OSBotify · 2025-04-15T14:34:33Z

✋ 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 · 2025-04-16T21:39:41Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.1.29-0 🚀

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

github-actions · 2025-04-18T20:31:36Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.29-10 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

QichenZhu · 2025-07-30T13:52:26Z


    const getHeaderButtons = () => (
-        <View style={[styles.w100, styles.flexRow, styles.gap2, shouldUseNarrowLayout && styles.mb3]}>
+        <View style={[styles.flexRow, styles.gap2, shouldChangeLayout && styles.mb3, shouldShowSelector && shouldChangeLayout && styles.mt3]}>


shouldChangeLayout && styles.mb3 caused the button to misalign on medium screens (issue #65652).

Fixed in PR #66250 by adding the margin only on narrow layouts.

Pujan92 · 2025-08-11T06:32:57Z

+        },
+    });
+
+    if (lastSelectedExpensifyCardFeed) {


I think we should also consider lastSelectedCardSettings availability here because if the lastSelectedExpensifyCardFeed value workspace is deleted then it doesn't make sense to return that feed number. Issue #65592

hoangzinh · 2025-09-20T23:02:56Z


    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
-    const [cardsList, cardsListResult] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${fundID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards});
+    const [cardsList, cardsListResult] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards});


Coming from #67491, this change will introduce an issue where App displays the "Not here" page when opening a card from another feed. More details on RC & solution: #67491 (comment)

ZhenjaHorbach · 2025-12-02T17:34:07Z

+            <View style={styles.flex1}>
+                <View style={[styles.flexRow, styles.gap1]}>
+                    <CaretWrapper style={styles.flex1}>
+                        <Text style={[styles.textStrong, styles.flexShrink1]}>{feedName}</Text>


Came from this issue
We had an issue where the Card feed name is displayed partially with a blank space on Android 16
More context here

koko57 added 12 commits April 7, 2025 18:07

feat: add route for the selector page

7517dbc

feat: add a new onyx key for the last selected feed

5b36e01

feat: make useDomainFundID return several keys

b7217c8

feat: get lat selected feed from Onyx

4ea87c4

feat: create feed selector component

1b065bc

feat: style selector and buttons

5f5771f

feat: render feeds in the feed selector page

adc5267

fix: show selector only when more than one feed

7aeac08

fix: eslint, prettier

c2533e5

feat: update account settlement flow

d9eedab

chore: code cleanup

ef99915

fix: eslint

c374673

koko57 marked this pull request as ready for review April 9, 2025 10:58

koko57 requested a review from a team as a code owner April 9, 2025 10:58

melvin-bot Bot requested review from dominictb and removed request for a team April 9, 2025 10:58

koko57 mentioned this pull request Apr 9, 2025

[Due for payment 2025-04-25] Update Expensify Card page to potentially show domain feeds #59364

Closed

Merge branch 'main' into feat/59364-expensify-feed-selector

c95ff9c

koko57 mentioned this pull request Apr 10, 2025

[Due for payment 2025-04-28] [Due for payment 2025-04-25] Update CreateAdminIssuedVirtualCard and CreateExpensifyCard for domain cards #59945

Closed

DylanDylann reviewed Apr 14, 2025

View reviewed changes

fix: resolve conflicts

bce3979

fix: align buttons

90a8a4b

DylanDylann reviewed Apr 14, 2025

View reviewed changes

fix: apply requested change

58e7543

fix: show default feed as the last selected feed

61a4859

fix: prettier

6cd3129

koko57 requested a review from DylanDylann April 14, 2025 08:56

DylanDylann approved these changes Apr 14, 2025

View reviewed changes

melvin-bot Bot requested a review from puneetlath April 14, 2025 09:11

puneetlath requested changes Apr 14, 2025

View reviewed changes

Comment thread src/ONYXKEYS.ts Outdated

Comment thread src/ONYXKEYS.ts Outdated

Comment thread src/hooks/useDefaultFundID.ts

Comment thread src/types/onyx/ExpensifyCardSettings.ts Outdated

Comment thread src/libs/actions/Card.ts Outdated

koko57 added 2 commits April 15, 2025 09:48

Merge branch 'main' into feat/59364-expensify-feed-selector

b92f9cc

fix: apply requested changes

980bc83

puneetlath requested changes Apr 15, 2025

View reviewed changes

Comment thread src/hooks/useDefaultFundID.ts Outdated

fix: apply requested change

aca943d

Co-authored-by: Puneet Lath <puneet@expensify.com>

puneetlath approved these changes Apr 15, 2025

View reviewed changes

puneetlath merged commit ee9ae8b into Expensify:main Apr 15, 2025
16 checks passed

github-actions Bot mentioned this pull request Apr 16, 2025

Deploy Checklist: New Expensify 2025-04-16 #60369

Closed

87 tasks

techievivek mentioned this pull request Apr 17, 2025

Expensify card - The issue card flow error displays after issuing a card #60407

Closed

8 tasks

QichenZhu reviewed Jul 30, 2025

View reviewed changes

Pujan92 reviewed Aug 11, 2025

View reviewed changes

mukhrr mentioned this pull request Aug 24, 2025

Using all WS cards instead of last selected one's in member's card details #68848

Merged

51 tasks

hoangzinh reviewed Sep 20, 2025

View reviewed changes

ZhenjaHorbach reviewed Dec 2, 2025

View reviewed changes

koko57 deleted the feat/59364-expensify-feed-selector branch March 30, 2026 09:40

Conversation

koko57 commented Apr 9, 2025 • 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 Apr 9, 2025

Uh oh!

DylanDylann commented Apr 14, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Apr 14, 2025

Uh oh!

koko57 commented Apr 14, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Apr 14, 2025

Uh oh!

koko57 commented Apr 14, 2025

Uh oh!

DylanDylann commented Apr 14, 2025

Uh oh!

DylanDylann commented Apr 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

koko57 commented Apr 14, 2025

Uh oh!

puneetlath left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

koko57 commented Apr 15, 2025

Uh oh!

puneetlath left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

puneetlath commented Apr 15, 2025

Uh oh!

koko57 commented Apr 15, 2025

Uh oh!

Uh oh!

OSBotify commented Apr 15, 2025

Uh oh!

github-actions Bot commented Apr 16, 2025

Uh oh!

github-actions Bot commented Apr 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

koko57 commented Apr 9, 2025 •

edited

Loading

DylanDylann commented Apr 14, 2025 •

edited

Loading