[NO QA] Feat: Pending state with no feed by waterim · Pull Request #48489 · Expensify/App

waterim · 2024-09-03T15:47:45Z

Details

Fixed Issues

$ #47376
PROPOSAL: N/A

Tests

Test with collect Plan:

Open any workspace in which you are an admin
Go to More Features
Verify that user sees a new item "Company Cards"
Switch on - verify that upgrade plan right panel will be shown
Upgrade to a new plan
Switch on -> verify that a new row appears in left menu item
Verify that the new menu item is highlighted
Click in Company Cards - Verify that a new screen is opened
Click "Add company cards" or just navigate to 'policyID//company-cards/add-card-feed'
Go through the flow (NOTE: API is not ready yet)

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

None

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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

…no-feed

melvin-bot · 2024-09-03T15:48:26Z

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

dubielzyk-expensify · 2024-09-03T23:54:31Z

What's the size of the illustration in the card? It looks a bit small on mobile especially

shawnborton · 2024-09-04T09:47:51Z

Agree, it does feel small. I see it as 233x162 in Figma.

dannymcclain · 2024-09-04T14:16:44Z

🖥️ 🐜

Pujan92 · 2024-09-04T20:34:51Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

src/languages/en.ts

src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedNoFeedPendingPage.tsx

Pujan92 · 2024-09-05T07:01:15Z

Loader position is incorrect as it shifts the header down.

Pujan92 · 2024-09-05T07:05:29Z

Aren't we going to support the following points in this PR?

…no-feed

waterim · 2024-09-09T12:20:52Z

@Pujan92 Only the first one from the bullet points Im not doing, because we will generate the default name in the creation flow when APi will be available

Pujan92 · 2024-09-10T05:58:04Z

Agree, it does feel small. I see it as 233x162 in Figma.

@waterim We need to make this change to update the size of illustration based on figma.

src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

shawnborton · 2024-09-16T13:23:28Z

cc @Expensify/design on that - I am using these from our brand guidelines:

shawnborton · 2024-09-16T13:24:09Z

And just to confirm, are the latest screenshots in the orignal post above? They look good to me besides these card image updates we need to do.

…no-feed

shawnborton · 2024-09-17T05:27:47Z

Can we see some updated screenshots? Then I think this will be good to merge. Thanks!

waterim · 2024-09-17T12:22:35Z

@shawnborton

…no-feed

waterim · 2024-09-17T12:30:00Z

@Pujan92 @iwiznia I need to update "'getParentReportAction' is deprecated. Use Onyx.connect() or withOnyx() instead deprecation/deprecation" here, right?

Pujan92 · 2024-09-17T12:52:56Z

@Pujan92 @iwiznia I need to update "'getParentReportAction' is deprecated. Use Onyx.connect() or withOnyx() instead deprecation/deprecation" here, right?

I think it is better if that's updated in the separate PR, the way it is in this PR

shawnborton · 2024-09-17T14:35:39Z

Were all of the card images updated? I think we updated everything to use the upper right area of the card image for the brand's respective logo.

waterim · 2024-09-17T14:52:40Z

@shawnborton oh get it, updated

shawnborton · 2024-09-17T16:42:27Z

Much better, thanks! Going to approve this from a design perspective. @iwiznia anything else needed?

iwiznia · 2024-09-17T16:53:29Z

Ah yes, seems like there's an ESLint error. @waterim can you fix it please?

waterim · 2024-09-17T18:49:18Z

@iwiznia Updated here this deprecated lint error

iwiznia · 2024-09-18T10:08:56Z

src/libs/actions/Policy/Policy.ts

+    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {


How can this be null/falsy?

That is the way how we are getting reportActions through the whole application to prevent issues

Hmmm you are right. I wonder why...

But agree that your statement makes sense here, maybe to prevent any issues when undefined can come, not a Record for some reason

OSBotify · 2024-09-18T13:58:24Z

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

Pujan92 · 2024-09-18T19:28:54Z

src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

+        Policy.openPolicyCompanyCardsPage(policyID, workspaceAccountID);
+    }, [policyID, workspaceAccountID]);
+
+    useFocusEffect(fetchCompanyCards);


@waterim do we really need to call this api on focus, shouldn't it only call on the mount of the component? Bcoz I think other onyx data will be updated with the WRITE api responses.

OSBotify · 2024-09-18T22:52:55Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.0.38-0 🚀

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

OSBotify · 2024-09-19T23:33:21Z

🚀 Deployed to production by https://github.com/grgia in version: 9.0.38-4 🚀

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

waterim added 7 commits September 3, 2024 17:42

new asset

eb1a18d

add support for reactNode for the subtitle

d08cfcb

new translations

de98cdc

add openPolicyCompanyCardsPage API

99d0bde

new pending page

5920205

update main page

498cf13

Merge remote-tracking branch 'upstream/main' into feat-47376-pending-…

a681ef4

…no-feed

waterim marked this pull request as ready for review September 3, 2024 15:48

waterim requested review from a team as code owners September 3, 2024 15:48

melvin-bot bot requested a review from Pujan92 September 3, 2024 15:48

melvin-bot bot removed the request for review from a team September 3, 2024 15:48

Pujan92 suggested changes Sep 5, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedNoFeedPendingPage.tsx Outdated Show resolved Hide resolved

waterim added 4 commits September 9, 2024 13:49

Merge remote-tracking branch 'upstream/main' into feat-47376-pending-…

f62e749

…no-feed

change translations

9074672

change name to WorkspaceCompanyCardsFeedPendingPage

3cb9aa6

update company card page and header buttons

59f098c

fix lint

8f3d136

Pujan92 reviewed Sep 10, 2024

View reviewed changes

src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx Outdated Show resolved Hide resolved

waterim added 2 commits September 10, 2024 18:26

update stylings

529343a

fix for selected feeds

15846c0

add new amex image

a462c69

waterim dismissed iwiznia’s stale review via a462c69 September 16, 2024 21:55

waterim added 3 commits September 16, 2024 23:59

update all other icons

32e9733

remove amexBlue and update icon in the cardType component

886d2e5

Merge remote-tracking branch 'upstream/main' into feat-47376-pending-…

3980236

…no-feed

Merge remote-tracking branch 'upstream/main' into feat-47376-pending-…

bcc3b4b

…no-feed

update images

84228b4

shawnborton previously approved these changes Sep 17, 2024

View reviewed changes

fix deprecated getParentReportAction

72693cd

waterim dismissed shawnborton’s stale review via 72693cd September 17, 2024 18:48

iwiznia reviewed Sep 18, 2024

View reviewed changes

iwiznia approved these changes Sep 18, 2024

View reviewed changes

iwiznia merged commit 0c865d4 into Expensify:main Sep 18, 2024

Pujan92 reviewed Sep 18, 2024

View reviewed changes

github-actions bot mentioned this pull request Sep 18, 2024

Deploy Checklist: New Expensify 2024-09-18 #49427

Closed

43 tasks

dubielzyk-expensify mentioned this pull request Sep 20, 2024

[No QA] Feat/47377 multiple card feeds #49148

Merged

61 tasks

Conversation

waterim commented Sep 3, 2024 • 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 Sep 3, 2024

Uh oh!

dubielzyk-expensify commented Sep 3, 2024

Uh oh!

shawnborton commented Sep 4, 2024

Uh oh!

dannymcclain commented Sep 4, 2024

Uh oh!

Pujan92 commented Sep 4, 2024 • 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!

Pujan92 commented Sep 5, 2024

Uh oh!

Pujan92 commented Sep 5, 2024

Uh oh!

waterim commented Sep 9, 2024

Uh oh!

Pujan92 commented Sep 10, 2024

Uh oh!

Uh oh!

shawnborton commented Sep 16, 2024

Uh oh!

shawnborton commented Sep 16, 2024

Uh oh!

shawnborton commented Sep 17, 2024

Uh oh!

waterim commented Sep 17, 2024

Uh oh!

waterim commented Sep 17, 2024

Uh oh!

Pujan92 commented Sep 17, 2024

Uh oh!

shawnborton commented Sep 17, 2024

Uh oh!

waterim commented Sep 17, 2024

Uh oh!

shawnborton commented Sep 17, 2024

Uh oh!

iwiznia commented Sep 17, 2024

Uh oh!

waterim commented Sep 17, 2024

Uh oh!

iwiznia Sep 18, 2024

Choose a reason for hiding this comment

Uh oh!

waterim Sep 18, 2024 • 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!

iwiznia Sep 18, 2024

Choose a reason for hiding this comment

Uh oh!

waterim Sep 18, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Sep 18, 2024

Uh oh!

Pujan92 Sep 18, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Sep 18, 2024

Uh oh!

OSBotify commented Sep 19, 2024

Uh oh!

Reviewers

waterim commented Sep 3, 2024 •

edited

Loading

Pujan92 commented Sep 4, 2024 •

edited

Loading

waterim Sep 18, 2024 •

edited

Loading