fix: Add Type column to workspace feeds #51946

nkdengineer · 2024-11-04T11:09:03Z

Explanation of Change

Fixed Issues

$ #51847
PROPOSAL: #51847 (comment)

Tests

Go to workspace with Expensify card enabled
Create a card
Verify that: we have Type column

Verify that no errors appear in the JS console

Offline tests

same as above

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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 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 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 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

nkdengineer · 2024-11-04T11:13:07Z

I am a little stuck on the Android builds, will add the screenshots later @DylanDylann

melvin-bot · 2024-11-04T11:13:14Z

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

mountiny · 2024-11-04T23:12:05Z

@DylanDylann what is your eta for this checklist? thanks!

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx

src/pages/workspace/expensifyCard/WorkspaceCardListRow.tsx

DylanDylann · 2024-11-05T03:41:41Z

src/pages/workspace/expensifyCard/WorkspaceCardListRow.tsx

                    </Text>
                </View>
            </View>
+            {!shouldUseNarrowLayout && (
+                <View style={[styles.flexRow, styles.gap2, shouldUseNarrowLayout ? styles.flex2 : styles.flex1, styles.alignItemsCenter, styles.justifyContentEnd]}>
+                    <Text style={[styles.textLabelSupporting, styles.lh16]}>{cardType}</Text>


please add numberOfLines={1} as other places

DylanDylann · 2024-11-05T03:42:21Z

@nkdengineer Minor comment. The rest looks fine

DylanDylann · 2024-11-05T05:16:23Z

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

mountiny · 2024-11-05T07:49:10Z

@JmillsExpensify @Expensify/design would like to get your input on this one. On smaller screens the plan was to use the dot operator in the card name, but it ends up not visible based on the screenshots. Curious for your take on how to handle the small screens. Even if we add more room to the name column it might be cut off

shawnborton · 2024-11-05T09:16:00Z

We could play with the text styles and try something like this:

The idea above is basically:

on desktop, just use normal text styles for the table data except the card holder/card name
on mobile, reuse this same idea but make the card name use micro size, and then put the virtual/physical type under the limit and use micro for that too

cc @Expensify/design for thoughts too

mountiny · 2024-11-05T09:28:51Z

I love that, goes well with the assignee name and card name

DylanDylann · 2024-11-05T10:50:13Z

Kindly bump @Expensify/design

dannymcclain · 2024-11-05T13:32:27Z

Very into Shawn's idea!

mountiny · 2024-11-05T14:00:58Z

Should we wait for @dubielzyk-expensify too? I feel like @nkdengineer could start working on the proposed design there

dannymcclain · 2024-11-05T14:16:48Z

I think Jon will agree, but if we want to wait just in case that's fine.

mountiny · 2024-11-06T02:24:30Z

@nkdengineer feel free to implement the change from Shawn

nkdengineer · 2024-11-06T03:38:31Z

I'll update soon

DylanDylann · 2024-11-06T05:04:12Z

@nkdengineer Could you give an ETA for the next update?

nkdengineer · 2024-11-06T08:53:43Z

Working on it

nkdengineer · 2024-11-06T09:26:51Z

@DylanDylann i updated, please check again

shawnborton · 2024-11-06T09:54:58Z

Close! But I think we need to update some of the text styles. These selected items here should use our normal font style (15px, regular) and default font color:

DylanDylann · 2024-11-06T13:03:32Z

@nkdengineer Bump on the new design update

nkdengineer · 2024-11-07T08:07:23Z

@DylanDylann @shawnborton i updated

shawnborton · 2024-11-07T08:10:20Z

Close. In this screenshot here:

The word "Physical" should match the styling of "Hidden's Card"

Please check the mocks again for reference!

nkdengineer · 2024-11-07T09:14:44Z

@shawnborton i updated

shawnborton · 2024-11-07T10:58:14Z

That feels better, thanks!

mountiny

Thanks for updating the design, seems like we are on a same page now. @nkdengineer before merging, can you also please confirm how it looks like on the wide view to ensure we did not break that when fixing the narrow view? thanks

DylanDylann · 2024-11-07T13:58:06Z

@nkdengineer Please also fix text style on the wide screen

nkdengineer · 2024-11-07T14:04:05Z

@DylanDylann I think it is expected as designed here

mountiny · 2024-11-07T14:10:14Z

Yeah that is expected, thanks guys!

mountiny · 2024-11-07T14:10:28Z

Yeah that is expected, thanks guys!

mountiny · 2024-11-07T14:10:52Z

Yeah that is expected, thanks guys!

DylanDylann · 2024-11-07T14:11:26Z

All good now. Ready to merge

cc @mountiny

OSBotify · 2024-11-07T14:21:58Z

✋ 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-11-11T18:39:50Z

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

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

github-actions · 2024-11-13T00:43:19Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.60-3 🚀

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

fix: Add Type column to workspace feeds

5814bd5

nkdengineer marked this pull request as ready for review November 4, 2024 11:13

nkdengineer requested a review from a team as a code owner November 4, 2024 11:13

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

mountiny assigned nkdengineer Nov 4, 2024

mountiny self-requested a review November 4, 2024 23:11

DylanDylann reviewed Nov 5, 2024

View reviewed changes

fix some minor change

ba62e27

DylanDylann approved these changes Nov 5, 2024

View reviewed changes

mountiny requested a review from a team November 5, 2024 07:47

nkdengineer added 2 commits November 6, 2024 16:04

Merge branch 'main' into fix/51847

7c88169

fix: change style expensify card list

6ed1390

fix: style of workspace card list

6ce8d22

fix style in small screen

c46834a

mountiny approved these changes Nov 7, 2024

View reviewed changes

DylanDylann approved these changes Nov 7, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny November 7, 2024 14:06

mountiny merged commit eff7bff into Expensify:main Nov 7, 2024
17 checks passed

github-actions bot mentioned this pull request Nov 11, 2024

[HOLD for payment 2024-11-21] Deploy Checklist: New Expensify 2024-11-11 #52320

Closed

95 tasks

melvin-bot bot mentioned this pull request Nov 13, 2024

[HOLD for payment 2024-11-20] [$125] Add Type column to Expensify Card workspace feeds #51847

Closed

daledah mentioned this pull request Nov 18, 2024

Card - In mweb and hybrid app, display of virtual card number &amount behavior is inconsistent #51041

Closed

8 tasks

nkdengineer mentioned this pull request Nov 26, 2024

[HOLD for payment 2024-11-26] Card - In issue card page, no outline box is shown around amount #52370

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Add Type column to workspace feeds #51946

fix: Add Type column to workspace feeds #51946

nkdengineer commented Nov 4, 2024 •

edited

Loading

nkdengineer commented Nov 4, 2024

melvin-bot bot commented Nov 4, 2024

mountiny commented Nov 4, 2024

DylanDylann Nov 5, 2024

DylanDylann commented Nov 5, 2024

DylanDylann commented Nov 5, 2024

mountiny commented Nov 5, 2024

shawnborton commented Nov 5, 2024

mountiny commented Nov 5, 2024

DylanDylann commented Nov 5, 2024

dannymcclain commented Nov 5, 2024

mountiny commented Nov 5, 2024

dannymcclain commented Nov 5, 2024

mountiny commented Nov 6, 2024

nkdengineer commented Nov 6, 2024

DylanDylann commented Nov 6, 2024

nkdengineer commented Nov 6, 2024

nkdengineer commented Nov 6, 2024

shawnborton commented Nov 6, 2024

DylanDylann commented Nov 6, 2024

nkdengineer commented Nov 7, 2024

shawnborton commented Nov 7, 2024

nkdengineer commented Nov 7, 2024

shawnborton commented Nov 7, 2024

mountiny left a comment

DylanDylann commented Nov 7, 2024

nkdengineer commented Nov 7, 2024

mountiny commented Nov 7, 2024

mountiny commented Nov 7, 2024

mountiny commented Nov 7, 2024

DylanDylann commented Nov 7, 2024

OSBotify commented Nov 7, 2024

github-actions bot commented Nov 11, 2024

github-actions bot commented Nov 13, 2024

fix: Add Type column to workspace feeds #51946

fix: Add Type column to workspace feeds #51946

Conversation

nkdengineer commented Nov 4, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

nkdengineer commented Nov 4, 2024

melvin-bot bot commented Nov 4, 2024

mountiny commented Nov 4, 2024

DylanDylann Nov 5, 2024

Choose a reason for hiding this comment

DylanDylann commented Nov 5, 2024

DylanDylann commented Nov 5, 2024

Reviewer Checklist

Screenshots/Videos

mountiny commented Nov 5, 2024

shawnborton commented Nov 5, 2024

mountiny commented Nov 5, 2024

DylanDylann commented Nov 5, 2024

dannymcclain commented Nov 5, 2024

mountiny commented Nov 5, 2024

dannymcclain commented Nov 5, 2024

mountiny commented Nov 6, 2024

nkdengineer commented Nov 6, 2024

DylanDylann commented Nov 6, 2024

nkdengineer commented Nov 6, 2024

nkdengineer commented Nov 6, 2024

shawnborton commented Nov 6, 2024

DylanDylann commented Nov 6, 2024

nkdengineer commented Nov 7, 2024

shawnborton commented Nov 7, 2024

nkdengineer commented Nov 7, 2024

shawnborton commented Nov 7, 2024

mountiny left a comment

Choose a reason for hiding this comment

DylanDylann commented Nov 7, 2024

nkdengineer commented Nov 7, 2024

mountiny commented Nov 7, 2024

mountiny commented Nov 7, 2024

mountiny commented Nov 7, 2024

DylanDylann commented Nov 7, 2024

OSBotify commented Nov 7, 2024

github-actions bot commented Nov 11, 2024

github-actions bot commented Nov 13, 2024

nkdengineer commented Nov 4, 2024 •

edited

Loading