fix: change the condition to render Expensify card page content correctly #56331

koko57 · 2025-02-04T11:48:26Z

Explanation of Change

Fixed Issues

$ #56195
PROPOSAL:

Tests

Log out from the account if you're logged in
Log in again
Go to Workspaces -> select the workspace with Expensify Cards
Open Expensify Cards
Verify that you see a loader for a split of a second NOT THE START PAGE, after that you should see the card list correctly
Switch to another feature page, go back to the Expensify Card Page - the list should be rendered immediately (without the loader)
If you have Company Cards (enabled and some issued) for your workspace you can compare the rendering of Company Cards page - should look the same (see attached recording)

Copilot Test

Switch to the Copilot Account
Repeat steps 3-7

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]."

Same as above

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

Screen.Recording.2025-02-04.at.12.59.14.mp4

Screen.Recording.2025-02-04.at.12.58.17.mp4

MacOS: Desktop

…ctly

allgandalf · 2025-02-04T12:17:47Z

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx

@@ -19,39 +19,39 @@ import WorkspaceExpensifyCardPageEmptyState from './WorkspaceExpensifyCardPageEm
 type WorkspaceExpensifyCardPageProps = PlatformStackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD>;

 function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
-    const policyID = route.params.policyID ?? '-1';
-    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+    const policyID = route.params.policyID ?? CONST.DEFAULT_NUMBER_ID;


@koko57 policyID is a string , i am not sure about assigning it an integer value 😕

koko57 · 2025-02-04T12:20:02Z

@allgandalf thanks 😃 not ready for review yet 😅

allgandalf · 2025-02-04T12:22:48Z

oops , just a habit 😬

melvin-bot · 2025-02-04T13:10:51Z

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

mountiny · 2025-02-06T02:52:28Z

@koko57 wont this show the spinner everytime user opens the page when the cards are not setup?

koko57 · 2025-02-06T08:05:48Z

@mountiny no - you can check out the recordings for the Web - as long as you have cardList + cardSettings with paymentAccountID the loader should not show.

mountiny · 2025-02-06T18:57:58Z

cardSettings

But if you never set this up, you wont have cardSettings, right

mountiny · 2025-02-06T20:24:07Z

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 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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

mountiny · 2025-02-06T20:25:45Z

@koko57 if you do not have it setup the spinner is there always

Screen.Recording.2025-02-06.at.12.23.24.mp4

koko57 · 2025-02-07T08:07:34Z

@mountiny so a follow-up to remove the spinner?

koko57 added 2 commits February 4, 2025 12:47

fix: change the condition to render expensify card page content corre…

2152bc7

…ctly

fix: eslint

96a69ad

allgandalf reviewed Feb 4, 2025

View reviewed changes

fix: remove fallback number

4f05bb9

koko57 marked this pull request as ready for review February 4, 2025 13:10

koko57 requested a review from a team as a code owner February 4, 2025 13:10

melvin-bot bot requested a review from Pujan92 February 4, 2025 13:10

melvin-bot bot removed the request for review from a team February 4, 2025 13:10

koko57 mentioned this pull request Feb 4, 2025

Expensify card - Expensify Card setup page blinks the first time the Copilot user visits it #56195

Open

8 tasks

mountiny assigned koko57 Feb 6, 2025

mountiny approved these changes Feb 6, 2025

View reviewed changes

mountiny merged commit 9d0d2ed into Expensify:main Feb 6, 2025
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: change the condition to render Expensify card page content correctly #56331

fix: change the condition to render Expensify card page content correctly #56331

koko57 commented Feb 4, 2025 •

edited

Loading

allgandalf Feb 4, 2025

koko57 commented Feb 4, 2025

allgandalf commented Feb 4, 2025

melvin-bot bot commented Feb 4, 2025

mountiny commented Feb 6, 2025

koko57 commented Feb 6, 2025

mountiny commented Feb 6, 2025

mountiny commented Feb 6, 2025 •

edited

Loading

mountiny commented Feb 6, 2025

koko57 commented Feb 7, 2025

fix: change the condition to render Expensify card page content correctly #56331

fix: change the condition to render Expensify card page content correctly #56331

Conversation

koko57 commented Feb 4, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

allgandalf Feb 4, 2025

Choose a reason for hiding this comment

koko57 commented Feb 4, 2025

allgandalf commented Feb 4, 2025

melvin-bot bot commented Feb 4, 2025

mountiny commented Feb 6, 2025

koko57 commented Feb 6, 2025

mountiny commented Feb 6, 2025

mountiny commented Feb 6, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

mountiny commented Feb 6, 2025

koko57 commented Feb 7, 2025

koko57 commented Feb 4, 2025 •

edited

Loading

mountiny commented Feb 6, 2025 •

edited

Loading