Expensify Card promotion banner conditional display by ikevin127 · Pull Request #57218 · Expensify/App

ikevin127 · 2025-02-21T03:30:21Z

Explanation of Change

New feature PR: #56561

♻️ Add-on follow-up functionaloty for the new feature PR mentioned above, requested by @mountiny in this Slack thread.

🗒️ The PR implements logic which checks whether there's an Expensify Card already issued for a workspace and if true we won't be showing the Expensify Card promotion banner in workspace > Company cards page anymore. For this we added a new function to CardUtils: hasIssuedExpensifyCard

🧪 All other changes are due to eslint named imports rule since there were changes in those files.

@c3024 should be reviewing this PR since it's a follow-up of the initial PR.

Fixed Issues

$ #56485
PROPOSAL:

Tests

Precondition: Have a workspace with bank account added in order to be allowed to add physical / virtual Expensify Cards.

Open app and navigate to workspace settings > More features.
Enable Company cards and verify that the Expensify Card promotion banner is visible.
Click Learn more on the Expensify Card promotion banner and verify that the Expensify Card feature was enabled.
In the Expensify Card page add a Virtual card and confirm it.
Once the virtual Expensify Card was added, navigate to the Company cards page and verify that the Expensify Card promotion banner is no longer displayed because the user already has an Expensify Card added.

Verify that no errors appear in the JS console

Offline tests

N/A.

QA Steps

Same as Tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

web.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-02-21T03:30:26Z

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

c3024 · 2025-02-21T06:29:00Z

src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx

-
    const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.delegatedAccess?.delegate});
    const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
+    const shouldShowExpensifyCardPromotionBanner = !hasIssuedExpensifyCard(policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID);


Suggested change

const shouldShowExpensifyCardPromotionBanner = !hasIssuedExpensifyCard(policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID);

const [allWorkspaceCards] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST);

const shouldShowExpensifyCardPromotionBanner = !hasIssuedExpensifyCard(policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID, allWorkspaceCards);

Ideally, we should subscribe to the key ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST in this component and pass the cards to the function. Without that, React does not know this component needs to be re-rendered when workspace cards change.

This is not a problem in our present case because the user should switch back to Company Cards after adding an Expensify Card → the Company Cards page rerenders → it works fine.

Since we added an argument for hasIssuedExpensifyCard for testing purposes anyway, we can implement this suggestion.

This issue is clear when we add a card in a different tab and check back on the initial tab’s Company Cards page.

With the present code:

OnyxConnect.mov

Subscribing to the workspace cards key and passing the workspace cards to the function:

useOnyx.mov

Couple of previous discussions of this issue: (1), (2).

c3024 · 2025-02-21T06:36:45Z

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

expAndroid.mov

Android: mWeb Chrome

iOS: Native

expiOS.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

expChrome.mov

MacOS: Desktop

expDesktop.mov

c3024 · 2025-02-21T06:39:25Z

Everything looks good, but adding a parameter to the function specifically for testing looks a bit odd to me. I have a suggestion here to pass the workspace cards to the function to ensure proper reactivity, which also removes this oddity.

ikevin127 · 2025-02-21T07:29:32Z

Got it, will let you know once I applied the changes 👍

c3024

LGTM apart for this small change suggested!

…7-expensifyCardBannerDisplay

ikevin127 · 2025-02-21T23:00:28Z

@c3024 Changes mentioned in #57218 (comment) make total sense, thank you for the thorough review 🚀

🟢 Applied the suggested changes, this is ready for final review & merge (cc @mountiny).

…7-expensifyCardBannerDisplay

OSBotify · 2025-02-25T08:52:57Z

✋ 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-02-26T00:23:28Z

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

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

github-actions · 2025-02-26T10:43:48Z

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

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

github-actions · 2025-02-26T22:41:07Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.6-1 🚀

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

Expensify Card promotion banner conditional display

4f37a30

ikevin127 requested a review from a team as a code owner February 21, 2025 03:30

melvin-bot bot requested review from c3024 and removed request for a team February 21, 2025 03:30

c3024 suggested changes Feb 21, 2025

View reviewed changes

mountiny assigned ikevin127 Feb 21, 2025

c3024 approved these changes Feb 21, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny February 21, 2025 17:10

ikevin127 added 2 commits February 21, 2025 14:47

Merge branch 'main' of https://github.com/Expensify/App into ikevin12…

9080e06

…7-expensifyCardBannerDisplay

code review adjustments and sync w/ main

5a81405

c3024 approved these changes Feb 22, 2025

View reviewed changes

mountiny previously approved these changes Feb 24, 2025

View reviewed changes

Merge branch 'main' of https://github.com/Expensify/App into ikevin12…

085633d

…7-expensifyCardBannerDisplay

ikevin127 dismissed mountiny’s stale review via 085633d February 24, 2025 23:21

ikevin127 mentioned this pull request Feb 25, 2025

[Due for payment 2025-03-05] [Due for payment 2025-02-25] [$250] Add Expensify Promoting banner to the Company cards page #56485

Closed

mountiny approved these changes Feb 25, 2025

View reviewed changes

mountiny merged commit d97f1b4 into Expensify:main Feb 25, 2025
17 checks passed

github-actions bot mentioned this pull request Feb 25, 2025

Deploy Checklist: New Expensify 2025-02-25 #57435

Closed

49 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Expensify Card promotion banner conditional display#57218

Expensify Card promotion banner conditional display#57218
mountiny merged 4 commits intoExpensify:mainfrom
ikevin127:ikevin127-expensifyCardBannerDisplay

ikevin127 commented Feb 21, 2025

Uh oh!

melvin-bot bot commented Feb 21, 2025

Uh oh!

c3024 Feb 21, 2025 •

edited

Loading

Uh oh!

c3024 commented Feb 21, 2025

Uh oh!

c3024 commented Feb 21, 2025

Uh oh!

ikevin127 commented Feb 21, 2025

Uh oh!

c3024 left a comment

Uh oh!

ikevin127 commented Feb 21, 2025

Uh oh!

Uh oh!

OSBotify commented Feb 25, 2025

Uh oh!

github-actions bot commented Feb 26, 2025

Uh oh!

github-actions bot commented Feb 26, 2025

Uh oh!

github-actions bot commented Feb 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	const shouldShowExpensifyCardPromotionBanner = !hasIssuedExpensifyCard(policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID);
	const [allWorkspaceCards] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST);
	const shouldShowExpensifyCardPromotionBanner = !hasIssuedExpensifyCard(policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID, allWorkspaceCards);

Conversation

ikevin127 commented Feb 21, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 21, 2025

Uh oh!

c3024 Feb 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

c3024 commented Feb 21, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

c3024 commented Feb 21, 2025

Uh oh!

ikevin127 commented Feb 21, 2025

Uh oh!

c3024 left a comment

Choose a reason for hiding this comment

Uh oh!

ikevin127 commented Feb 21, 2025

Uh oh!

Uh oh!

OSBotify commented Feb 25, 2025

Uh oh!

github-actions bot commented Feb 26, 2025

Uh oh!

github-actions bot commented Feb 26, 2025

Uh oh!

github-actions bot commented Feb 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

c3024 Feb 21, 2025 •

edited

Loading