only show the button with the current card state by nkdengineer · Pull Request #60782 · Expensify/App

nkdengineer · 2025-04-24T05:20:41Z

Explanation of Change

only show the button with the current card state

Fixed Issues

Tests

Login to an account with the Expensify Card as owner of the workspace.
Issue two physical cards to yourself
On ExpensifyCardPage add this useEffect if you can't confirm address to get physical cards, cardID is the first card

useEffect(() => {
    Onyx.merge("cardList", {
        "{cardID}": {
            "state": 4
        }
    })
}, [])

Open Wallet page
Open the first card detail and verify that only activate card button is displayed
Open the second card detail and verify that only get physical card button is displayed

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Login to an account with the Expensify Card (needs to be able to issue actual physical cards).
Issue an account a physical card.
Enter your info to order the card.
Issue the account a second physical card.
Open Wallet page
Open the first card detail and verify that only activate card button is displayed
Open the second card detail and verify that only get physical card button is displayed

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-04-24.at.12.09.46.mov

Android: mWeb Chrome

Screen.Recording.2025-04-24.at.12.04.38.mov

iOS: Native

Screen.Recording.2025-04-24.at.12.08.35.mov

iOS: mWeb Safari

Screen.Recording.2025-04-24.at.12.07.08.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-24.at.12.01.20.mov

MacOS: Desktop

Screen.Recording.2025-04-24.at.12.12.13.mov

melvin-bot · 2025-04-24T05:28:36Z

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

hungvu193 · 2025-04-24T07:56:11Z

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

Screen.Recording.2025-04-24.at.15.04.02.mov

Android: mWeb Chrome

Screen.Recording.2025-04-24.at.15.08.26.mov

iOS: Native

Screen.Recording.2025-04-24.at.15.01.51.mov

iOS: mWeb Safari

Screen.Recording.2025-04-24.at.14.52.36.mov

MacOS: Chrome / Safari

Chrome2.mov

Chrome1.mov

Chrome3.mov

MacOS: Desktop

Screen.Recording.2025-04-24.at.14.42.05.mov

hungvu193 · 2025-04-24T07:57:55Z

Hmm, Get Physical Card validation step never seems to work, even though the API returned successfully. I need to update Onyx manually to test

Screen.Recording.2025-04-24.at.14.55.51.mov

hungvu193 · 2025-04-24T07:58:17Z

Is that somethings we noticed before @mountiny ?

mountiny · 2025-04-24T10:41:16Z

@hungvu193 that is on the testing feed right? I think that might be because we do not allow you to ship the card with the testing bank account actually

hungvu193 · 2025-04-24T10:42:33Z

@hungvu193 that is on the testing feed right? I think that might be because we do not allow you to ship the card with the testing bank account actually

I see, yeah I was using testing feed.

mountiny · 2025-04-24T10:46:55Z

@nkdengineer @hungvu193 this page is really confusing to me, this is used to show a detail of a single card, but we iterate over all physical cards, that just feels wrong

App/src/pages/settings/Wallet/ExpensifyCardPage.tsx

Lines 301 to 321 in 941fc1e

    
           {physicalCards.map((card) => { 
        
               if (card.state !== CONST.EXPENSIFY_CARD.STATE.OPEN) { 
        
                   return null; 
        
               } 
        
               return ( 
        
                   <> 
        
                       <MenuItemWithTopDescription 
        
                           description={translate('cardPage.physicalCardNumber')} 
        
                           title={maskCard(card?.lastFourPAN)} 
        
                           interactive={false} 
        
                           titleStyle={styles.walletCardNumber} 
        
                       /> 
        
                       <MenuItem 
        
                           title={translate('reportCardLostOrDamaged.report')} 
        
                           icon={Expensicons.Flag} 
        
                           shouldShowRightIcon 
        
                           onPress={() => Navigation.navigate(ROUTES.SETTINGS_WALLET_REPORT_CARD_LOST_OR_DAMAGED.getRoute(String(card.cardID)))} 
        
                       /> 
        
                   </> 
        
               ); 
        
           })}

I assume this is because before workspace feeds, there was option to have only one physical card

Can you update this section to also only render per the physical card you are seeing because its possible user has multiple physical expensify cards now

mountiny · 2025-04-24T10:47:12Z

Lets do that in another PR to deliver this faster though

nkdengineer · 2025-04-24T10:49:18Z

@nkdengineer @hungvu193 this page is really confusing to me, this is used to show a detail of a single card, but we iterate over all physical cards, that just feels wrong

@mountiny This logic was added here. I think we should ask the author to verify the behavior.

nkdengineer · 2025-04-24T10:50:02Z

@mountiny Wait a bit I just checked we need to change the logic a bit.

nkdengineer · 2025-04-24T10:51:23Z

@mountiny Updated logic to navigate to activate with the current card.

Signed-off-by: nkdengineer <nkdengineer@outlook.com>

mountiny

Thanks!

OSBotify · 2025-04-24T12:21:52Z

✋ 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-28T20:23:37Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.33-0 🚀

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

joekaufmanexpensify · 2025-04-29T14:03:29Z

Tested and works as expected. Thank you!

joekaufmanexpensify · 2025-04-29T14:08:50Z

Hm, actually some weirdness i noticed when also testing #60866. When I initially issued the second card, it had the Get physical card button, even though the first had already been ordered (meaning we had my personal info on file). When I activated the first card, the button for the second switched to Activate physical card without me doing anything.

Which is expected? Should you have to order additional physical cards issued once we have your address on file, or should we just ship them? @mountiny mentioned the latter to me in Slack, but I see the former above in the QA section.

github-actions · 2025-04-29T19:57:31Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.35-1 🚀

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

github-actions · 2025-04-29T20:52:33Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.36-3 🚀

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

github-actions · 2025-04-29T22:18:34Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.37-1 🚀

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

github-actions · 2025-04-30T00:46:37Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.37-3 🚀

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

only show the button with the current card state

941fc1e

nkdengineer marked this pull request as ready for review April 24, 2025 05:28

nkdengineer requested a review from a team as a code owner April 24, 2025 05:28

melvin-bot bot requested review from hungvu193 and removed request for a team April 24, 2025 05:28

hungvu193 approved these changes Apr 24, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny April 24, 2025 08:10

mountiny assigned nkdengineer Apr 24, 2025

mountiny previously approved these changes Apr 24, 2025

View reviewed changes

activate current card

18bb5df

nkdengineer dismissed mountiny’s stale review via 18bb5df April 24, 2025 10:50

run prettier

60ace45

Signed-off-by: nkdengineer <nkdengineer@outlook.com>

mountiny approved these changes Apr 24, 2025

View reviewed changes

mountiny added the InternalQA This pull request required internal QA label Apr 24, 2025

mountiny merged commit 9a3d57e into Expensify:main Apr 24, 2025
16 checks passed

github-actions bot mentioned this pull request Apr 28, 2025

Deploy Checklist: New Expensify 2025-04-28 #60971

Closed

garrettmknight mentioned this pull request May 12, 2025

[HOLD for payment 2025-05-13] [$250] Showing get physical card and activate physical card buttons at same time #60717

Closed

18 tasks

Conversation

nkdengineer commented Apr 24, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 24, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hungvu193 commented Apr 24, 2025

Uh oh!

hungvu193 commented Apr 24, 2025

Uh oh!

mountiny commented Apr 24, 2025

Uh oh!

hungvu193 commented Apr 24, 2025

Uh oh!

mountiny commented Apr 24, 2025

Uh oh!

mountiny commented Apr 24, 2025

Uh oh!

nkdengineer commented Apr 24, 2025

Uh oh!

nkdengineer commented Apr 24, 2025

Uh oh!

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

Uh oh!

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 24, 2025

Uh oh!

github-actions bot commented Apr 28, 2025

Uh oh!

joekaufmanexpensify commented Apr 29, 2025

Uh oh!

joekaufmanexpensify commented Apr 29, 2025

Uh oh!

github-actions bot commented Apr 29, 2025

Uh oh!

github-actions bot commented Apr 29, 2025

Uh oh!

github-actions bot commented Apr 29, 2025

Uh oh!

github-actions bot commented Apr 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hungvu193 commented Apr 24, 2025 •

edited

Loading

nkdengineer commented Apr 24, 2025 •

edited

Loading