Fix/50248 handle card failure data #50644

koko57 · 2024-10-11T13:09:21Z

Details

Fixed Issues

$ #50248
$ #50441
PROPOSAL:

Tests

Go to a workspace with Expensify Card enabled
Invite a new member to a workspace (a new mail, one that doesn't have an account in the app)
Go to this member's details
Click New card
Try to issue new Virtual card
Verify that on the confirmation step you get an error that the request is unsuccessful

Verify that no errors appear in the JS console

Offline tests

QA Steps

same as above

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 / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 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)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  - 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(themeColors.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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-10-11.at.19.57.37.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-10-11.at.19.08.02.mp4

MacOS: Desktop

melvin-bot · 2024-10-11T13:09:26Z

@DylanDylann 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 · 2024-10-11T14:16:17Z

ios/NewExpensify.xcodeproj/project.pbxproj

@@ -43,7 +43,7 @@
 		D27CE6B77196EF3EF450EEAC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */; };
 		DD79042B2792E76D004484B4 /* RCTBootSplash.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.mm */; };
 		DDCB2E57F334C143AC462B43 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */; };
-		E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+		E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };


@koko57 Why do we need to change this file?

I see it was changed the same way in 4f1224c, I wonder why this change isn't reflected here yet

DylanDylann · 2024-10-11T14:25:11Z

src/types/onyx/Card.ts

+    errors?: OnyxCommon.Errors;
+
+    /** Whether the request was successful */
+    success?: boolean;


This should beisSuccessful

@DylanDylann I saw "success" in a few places in the app like in

App/src/types/onyx/Account.ts

Line 105 in d77a4fd

success?: string;

maybe it'd be better to stick to "success"

We should follow our convention

App/contributingGuides/STYLE.md

Lines 605 to 622 in ce23fb5

### Boolean variables and props

- Boolean props or variables must be prefixed with `should` or `is` to make it clear that they are `Boolean`. Use `should` when we are enabling or disabling some features and `is` in most other cases.

```tsx

// Bad

<SomeComponent showIcon />

// Good

<SomeComponent shouldShowIcon />

// Bad

const valid = props.something && props.somethingElse;

// Good

const isValid = props.something && props.somethingElse;

```

@DylanDylann shouldShowSuccess would be acceptable? 😅 like here

App/src/types/onyx/WalletTransfer.ts

Line 17 in ce23fb5

/** Whether the success screen is shown to user. */

For me, I prefer isSuccessful because it's more generic

DylanDylann · 2024-10-14T10:25:32Z

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

@@ -206,6 +208,8 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
        return <NotFoundPage />;
    }

+    const shouldShowCardsSection = (policy?.areExpensifyCardsEnabled && paymentAccountID) ?? policy?.areCompanyCardsEnabled;


@koko57 while reviewing this PR, I see a bug here

"0" is displayed in the end of WorkspaceMemberDetailsPage

Suggested change

const shouldShowCardsSection = (policy?.areExpensifyCardsEnabled && paymentAccountID) ?? policy?.areCompanyCardsEnabled;

const shouldShowCardsSection = (policy?.areExpensifyCardsEnabled && !!paymentAccountID) ?? policy?.areCompanyCardsEnabled;

DylanDylann · 2024-10-14T10:50:15Z

src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx

@@ -30,6 +30,12 @@ function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
        Card.startIssueNewCardFlow(policyID);
    }, [policyID]);

+    useEffect(() => {
+        return () => {
+            Card.clearIssueNewCardFlow();


Why do we need to clear data here? We already cleared data if the API failed

I noticed that when we close RHP during the flow and go to another workspace and start the flow for issuing the card we have the data from the previous flow. This may lead to an error when i.e. we have chosen an assignee that is not a member of the new workspace. To avoid such errors, I think it's better to clear the flow everytime it's closed.

cc @mountiny

src/libs/actions/Card.ts

mountiny · 2024-10-16T03:59:49Z

Welcome back @koko57 will you be able to get this one cleared up today? Thanks

koko57 · 2024-10-16T04:08:44Z

@mountiny yeah, on it right now! Should be ready shortly

koko57 · 2024-10-16T04:52:00Z

@DylanDylann changes applied

DylanDylann · 2024-10-16T09:17:31Z

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.2024-10-16.at.16.05.18.mov

Android: mWeb Chrome

Screen.Recording.2024-10-16.at.15.58.11.mov

iOS: Native

Screen.Recording.2024-10-16.at.16.02.38.mov

iOS: mWeb Safari

Screen.Recording.2024-10-16.at.15.54.57.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-16.at.15.52.10.mov

MacOS: Desktop

Screen.Recording.2024-10-16.at.15.55.42.mov

DylanDylann · 2024-10-16T10:38:54Z

@mountiny All yours

mountiny · 2024-10-17T17:04:11Z

@koko57 can you please merge with main, sorry for late review (please ping me in slack for quick actions just in case)

koko57 · 2024-10-18T08:50:57Z

@mountiny conflicts resolved

mountiny · 2024-10-21T04:11:44Z

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

@@ -80,6 +82,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
    const ownerDetails = personalDetails?.[policy?.ownerAccountID ?? -1] ?? ({} as PersonalDetails);
    const policyOwnerDisplayName = ownerDetails.displayName ?? policy?.owner ?? '';
    const hasMultipleFeeds = Object.values(cardFeeds?.settings?.companyCards ?? {}).filter((feed) => !feed.pending).length > 0;
+    const paymentAccountID = cardSettings?.paymentBankAccountID ?? 0;


Nab just to make it clearer

Suggested change

const paymentAccountID = cardSettings?.paymentBankAccountID ?? 0;

const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;

melvin-bot · 2024-10-21T04:12:21Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2024-10-21T04:22:17Z

✋ 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 · 2024-10-22T04:48:15Z

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

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

github-actions · 2024-10-23T16:25:42Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.52-5 🚀

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

koko57 added 2 commits October 10, 2024 18:33

fix: do not show cards section when the domain is not provisioned

f7ba709

fix: show an error when the card cannot be issued

e3fc12c

koko57 requested a review from a team as a code owner October 11, 2024 13:09

melvin-bot bot requested review from DylanDylann and removed request for a team October 11, 2024 13:09

fix: eslint

f23fde6

DylanDylann reviewed Oct 11, 2024

View reviewed changes

mountiny assigned koko57 Oct 11, 2024

mountiny self-requested a review October 11, 2024 20:31

DylanDylann reviewed Oct 14, 2024

View reviewed changes

koko57 added 2 commits October 16, 2024 11:18

Merge branch 'main' into fix/50248-handle-card-failure-data

293158d

fix: apply requested changes

3b444bf

koko57 requested a review from DylanDylann October 16, 2024 05:12

DylanDylann approved these changes Oct 16, 2024

View reviewed changes

fix: resolve conflicts

a80d894

mountiny approved these changes Oct 21, 2024

View reviewed changes

mountiny merged commit 13f41cb into Expensify:main Oct 21, 2024
16 checks passed

melvin-bot bot added the Emergency label Oct 21, 2024

github-actions bot mentioned this pull request Oct 22, 2024

Deploy Checklist: New Expensify 2024-10-22 #51219

Closed

74 tasks

hungvu193 mentioned this pull request Oct 29, 2024

fix: Add a step validate to the Issue New Card form #50864

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/50248 handle card failure data #50644

Fix/50248 handle card failure data #50644

koko57 commented Oct 11, 2024 •

edited by github-actions bot

Loading

melvin-bot bot commented Oct 11, 2024

DylanDylann Oct 11, 2024

koko57 Oct 16, 2024

DylanDylann Oct 11, 2024

koko57 Oct 16, 2024

DylanDylann Oct 16, 2024

koko57 Oct 16, 2024

DylanDylann Oct 16, 2024

DylanDylann Oct 14, 2024

DylanDylann Oct 14, 2024

koko57 Oct 16, 2024 •

edited

Loading

mountiny commented Oct 16, 2024

koko57 commented Oct 16, 2024

koko57 commented Oct 16, 2024

DylanDylann commented Oct 16, 2024 •

edited

Loading

DylanDylann commented Oct 16, 2024

mountiny commented Oct 17, 2024

koko57 commented Oct 18, 2024

mountiny Oct 21, 2024

melvin-bot bot commented Oct 21, 2024

OSBotify commented Oct 21, 2024

github-actions bot commented Oct 22, 2024

github-actions bot commented Oct 23, 2024

	### Boolean variables and props

	- Boolean props or variables must be prefixed with `should` or `is` to make it clear that they are `Boolean`. Use `should` when we are enabling or disabling some features and `is` in most other cases.

	```tsx
	// Bad
	<SomeComponent showIcon />

	// Good
	<SomeComponent shouldShowIcon />

	// Bad
	const valid = props.something && props.somethingElse;

	// Good
	const isValid = props.something && props.somethingElse;
	```

	const shouldShowCardsSection = (policy?.areExpensifyCardsEnabled && paymentAccountID) ?? policy?.areCompanyCardsEnabled;
	const shouldShowCardsSection = (policy?.areExpensifyCardsEnabled && !!paymentAccountID) ?? policy?.areCompanyCardsEnabled;

	const paymentAccountID = cardSettings?.paymentBankAccountID ?? 0;
	const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;

Fix/50248 handle card failure data #50644

Fix/50248 handle card failure data #50644

Conversation

koko57 commented Oct 11, 2024 • edited by github-actions bot Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

koko57 Oct 16, 2024 • edited Loading

Choose a reason for hiding this comment

mountiny commented Oct 16, 2024

koko57 commented Oct 16, 2024

koko57 commented Oct 16, 2024

DylanDylann commented Oct 16, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Oct 16, 2024

mountiny commented Oct 17, 2024

koko57 commented Oct 18, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Oct 21, 2024

OSBotify commented Oct 21, 2024

github-actions bot commented Oct 22, 2024

github-actions bot commented Oct 23, 2024

koko57 commented Oct 11, 2024 •

edited by github-actions bot

Loading

koko57 Oct 16, 2024 •

edited

Loading

DylanDylann commented Oct 16, 2024 •

edited

Loading