[NO QA][CardSettings] replace corporateCardList with cardList by grgia · Pull Request #25939 · Expensify/App

grgia · 2023-08-25T14:08:02Z

Details

cardList was split into fundList and corporateCardList [PR] in the initial design of Expensify Card Settings, but we decided to keep the name cardList.

fundList stores cards from the funds table
cardList stores cards from the cards table

Fixed Issues

$ #25940

Tests

Verify that no errors appear in the JS console
NO QA, key not yet used

Offline tests

QA Steps

Verify that no errors appear in the JS console
NO QA, key not yet used

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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-08-25T14:12:35Z

@rushatgabhane @ One of you needs to 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]

grgia · 2023-08-25T14:16:36Z

Removing C+ as there's no QA

melvin-bot · 2023-08-25T20:26:40Z

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

rushatgabhane · 2023-08-25T20:27:33Z

sorry, i approved by mistake. i thought this was a TS migration PR because it had a similar title

src/ONYXKEYS.ts

MonilBhavsar · 2023-08-28T06:50:10Z

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 / Chrome
- iOS / native
- iOS / 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 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 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(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 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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

src/ONYXKEYS.ts

Co-authored-by: Florent De'Neve <florent@expensify.com>

…y/App into georgia-removeCorporateCardList

grgia · 2023-08-30T10:18:10Z

I don't know why there's conflicts I just pulled and merged main

src/types/onyx/Fund.ts

grgia · 2023-08-30T10:22:03Z

@flodnv @MonilBhavsar ready for review!

src/types/onyx/index.ts

grgia · 2023-08-30T10:58:28Z

Needed to swap the Fund/Card types. Now ready for review

src/ONYXKEYS.ts

src/types/onyx/Card.ts

src/types/onyx/Fund.ts

flodnv · 2023-08-30T13:45:13Z

src/types/onyx/Fund.ts

+    addressName?: string;
+    addressState?: string;
+    addressStreet?: string;
+    addressZip?: number;


Here too, I feel like most of these aren't optional...

I didn't modify these , just moved what was in the old Card.ts file into Fund.ts

I get that, but that's not really a good reason to not fix issues with code 😄

flodnv

Approving as I'm about to go ooo and this seems fine, but it would be nice to fix my comment about the Fund type

MonilBhavsar · 2023-08-31T06:43:28Z

src/types/onyx/Card.ts

+    cardholderFirstName: string;
+    cardholderLastName: string;


Would this be optional, or always available?

right now always available

grgia · 2023-08-31T09:12:16Z

@MonilBhavsar bump on review, I'd like to merge this today if possible

OSBotify · 2023-08-31T09:45:49Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-08-31T23:17:52Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 1.3.61-0 🚀

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

OSBotify · 2023-09-01T23:10:26Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.61-3 🚀

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

replace corporateCardList with cardList

167f5ef

grgia requested review from MonilBhavsar and flodnv August 25, 2023 14:08

grgia self-assigned this Aug 25, 2023

grgia marked this pull request as ready for review August 25, 2023 14:12

grgia requested a review from a team as a code owner August 25, 2023 14:12

melvin-bot bot removed the request for review from a team August 25, 2023 14:12

melvin-bot bot requested a review from rushatgabhane August 25, 2023 14:12

grgia removed the request for review from rushatgabhane August 25, 2023 14:16

rushatgabhane approved these changes Aug 25, 2023

View reviewed changes

MonilBhavsar reviewed Aug 28, 2023

View reviewed changes

src/ONYXKEYS.ts Show resolved Hide resolved

flodnv requested changes Aug 28, 2023

View reviewed changes

src/ONYXKEYS.ts Outdated Show resolved Hide resolved

src/ONYXKEYS.ts Show resolved Hide resolved

src/ONYXKEYS.ts Show resolved Hide resolved

grgia and others added 4 commits August 28, 2023 10:41

Update src/ONYXKEYS.ts

6874aba

Co-authored-by: Florent De'Neve <florent@expensify.com>

Add Fund TS type

9f3d591

Merge branch 'georgia-removeCorporateCardList' of github.com:Expensif…

7ae5bc3

…y/App into georgia-removeCorporateCardList

prettier

667f6d3

grgia requested review from MonilBhavsar, flodnv and rushatgabhane August 30, 2023 10:16

Merge branch 'main' into georgia-removeCorporateCardList

6985a2d

grgia commented Aug 30, 2023

View reviewed changes

src/types/onyx/Fund.ts Show resolved Hide resolved

grgia commented Aug 30, 2023

View reviewed changes

src/types/onyx/index.ts Show resolved Hide resolved

use Fund for fundList, Card for cardList

a290a6f

flodnv requested changes Aug 30, 2023

View reviewed changes

fix key comments, remove optional

a8011b7

grgia requested a review from flodnv August 30, 2023 13:48

flodnv approved these changes Aug 30, 2023

View reviewed changes

MonilBhavsar reviewed Aug 31, 2023

View reviewed changes

flodnv mentioned this pull request Aug 31, 2023

[No QA] Add type for Card #26356

Merged

59 tasks

grgia requested a review from MonilBhavsar August 31, 2023 09:03

MonilBhavsar approved these changes Aug 31, 2023

View reviewed changes

MonilBhavsar merged commit 4237dd3 into main Aug 31, 2023

MonilBhavsar deleted the georgia-removeCorporateCardList branch August 31, 2023 09:40

OSBotify mentioned this pull request Aug 31, 2023

Deploy Checklist: New Expensify 2023-08-31 #26444

Closed

36 tasks

melvin-bot bot mentioned this pull request Sep 1, 2023

[HOLD for payment 2023-09-08] [ECard Settings] Rename corporateCardList to cardList #25940

Closed

Conversation

grgia commented Aug 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Aug 25, 2023

Uh oh!

grgia commented Aug 25, 2023

Uh oh!

melvin-bot bot commented Aug 25, 2023

Uh oh!

rushatgabhane commented Aug 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

MonilBhavsar commented Aug 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

grgia commented Aug 30, 2023

Uh oh!

Uh oh!

grgia commented Aug 30, 2023

Uh oh!

Uh oh!

grgia commented Aug 30, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

flodnv Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

grgia Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

flodnv Aug 30, 2023

Choose a reason for hiding this comment

Uh oh!

flodnv left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar Aug 31, 2023

Choose a reason for hiding this comment

Uh oh!

grgia Aug 31, 2023

Choose a reason for hiding this comment

Uh oh!

grgia commented Aug 31, 2023

Uh oh!

OSBotify commented Aug 31, 2023

Uh oh!

OSBotify commented Aug 31, 2023

Uh oh!

OSBotify commented Sep 1, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

grgia commented Aug 25, 2023 •

edited

Loading

rushatgabhane commented Aug 25, 2023 •

edited

Loading

MonilBhavsar commented Aug 28, 2023 •

edited

Loading