[No QA] [Workspace Feeds] Clean up for workspace feeds by VickyStash · Pull Request #48323 · Expensify/App

VickyStash · 2024-08-30T10:44:31Z

Details

Integrate the isMonthlySettlementAllowed property that is now returned in the OpenPolicyExpensifyCardsPage as part of the card settings isMonthlySettlementAllowed
Go back to the workspace member details page if the card creation from was initiated from there

Fixed Issues

$ #47308
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Pre-steps:

Have all betas/workspaceFeed beta enabled

Part 1

Go to the workspace where Expensify Card feature is enabled and several cards are added.
Open Expensify Card screen from the workspace navigation menu.
Go to Settings.

In case isMonthlySettlementAllowed flag in card settings is true for you make sure you can see Monthly option in Settlement frequency.
In case isMonthlySettlementAllowed flag is false Settlement frequency should be not interactive for you.

Part 2

Go to the Workspace Members list and open any member details.
Issue a new card from the member details screen.
Make sure after issuing a new card, you navigated back to the member details screen.
Issue a new card from the Card list page, make sure that you navigated back to the Card list after that.

Offline tests

Same as in the Tests section

QA Steps

Verify that no errors appear in the JS console

Same as in the Tests section

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

2.mp4

…m was initiated from there

melvin-bot · 2024-08-30T12:00:52Z

@allgandalf 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-08-30T12:47:25Z

@allgandalf are you on this or @DylanDylann should take over?

allgandalf · 2024-08-30T12:48:52Z

based on this comment on slack, i guess they are taking this one, but if they are busy i have no problem reviewing this

DylanDylann · 2024-08-30T15:25:13Z

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

Screen.Recording.2024-08-30.at.22.44.49.mov

iOS: Native

Screen.Recording.2024-08-30.at.23.03.14.mov

iOS: mWeb Safari

Screen.Recording.2024-08-30.at.22.43.38.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-30.at.22.31.40.mov

MacOS: Desktop

Screen.Recording.2024-08-30.at.22.38.20.mov

DylanDylann · 2024-08-30T15:29:10Z

src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx

                                title={translate(`workspace.expensifyCard.frequency.${settlementFrequency}`)}
                                shouldShowRightIcon={settlementFrequency !== CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY}
-                                // interactive={!isSettlementFrequencyBlocked}
+                                interactive={!isSettlementFrequencyBlocked}


NAB: Maybe add disabled props

Suggested change

interactive={!isSettlementFrequencyBlocked}

interactive={!isSettlementFrequencyBlocked}

disabled={isSettlementFrequencyBlocked}

@DylanDylann It adds the opacity, I'm not sure that it's the expected behaviour

Yeah, It's only my suggestion and also be a minor thing

I don't think the disabled prop is necessary in this case

DylanDylann · 2024-08-30T15:31:01Z

App/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx

Line 65 in fa8fa1a

featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}

Adding shouldBeBlocked={isSettlementFrequencyBlocked} to prevent user from using deep link to acess

…ncyPage if monthly option isn't allowed

mountiny

Fee small comments

src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx

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

mountiny · 2024-09-01T20:40:36Z

@dubielzyk-expensify since the rest of the team will most likely be out for the labour day, can you confirm checking the screenshots in the checklist look good? Specifically the padding on the page with settlement frequency being disabled (user cant change it)

Thanks!

dubielzyk-expensify

Looks good to me!

VickyStash · 2024-09-02T08:22:25Z

@mountiny I've applied your feedback, please take another look

MariaHCD

LGTM!

MariaHCD · 2024-09-02T09:47:49Z

src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx

                                title={translate(`workspace.expensifyCard.frequency.${settlementFrequency}`)}
                                shouldShowRightIcon={settlementFrequency !== CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY}
-                                // interactive={!isSettlementFrequencyBlocked}
+                                interactive={!isSettlementFrequencyBlocked}


I don't think the disabled prop is necessary in this case

OSBotify · 2024-09-02T10:17:41Z

✋ 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 · 2024-09-02T23:45:44Z

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

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

OSBotify · 2024-09-03T23:26:20Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.28-3 🚀

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

s77rt · 2025-05-31T22:55:16Z

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

    const submit = () => {
        Card.issueExpensifyCard(policyID, CONST.COUNTRY.US, data);
-        Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID ?? '-1'));
+        Navigation.navigate(backTo ?? ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID ?? '-1'));


We shouldn't navigate to the backTo param if we started issuing the card from the member's details page but changed the card holder. After changing the card holder it does not make sense to return to the previous card holder details page.

Coming from #56009

allroundexperts · 2025-08-14T12:28:25Z

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx

+    const issueCard = () => {
+        const activeRoute = Navigation.getActiveRoute();
+        Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, activeRoute));
+    };


We should have cleared the ISSUE_NEW_EXPENSIFY_CARD_FORM data when issuing a card. Not doing so caused #66841

VickyStash added 2 commits August 30, 2024 12:07

Uncomment isMonthlySettlementAllowed related code

e53f0bf

Go back to the workspace member details page if the card creation fro…

881bc10

…m was initiated from there

VickyStash changed the title ~~[Workspace Feeds] Clean up for workspace feeds~~ [No QA] [Workspace Feeds] Clean up for workspace feeds Aug 30, 2024

VickyStash marked this pull request as ready for review August 30, 2024 12:00

VickyStash requested a review from a team as a code owner August 30, 2024 12:00

melvin-bot bot requested review from allgandalf and removed request for a team August 30, 2024 12:00

VickyStash mentioned this pull request Aug 30, 2024

[Workspace Feeds] Clean up tasks for workspace feeds #47308

Closed

8 tasks

mountiny requested a review from DylanDylann August 30, 2024 13:01

DylanDylann reviewed Aug 30, 2024

View reviewed changes

DylanDylann approved these changes Aug 30, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny August 30, 2024 15:48

Prevent user from using deep link to access WorkspaceSettlementFreque…

d2c093b

…ncyPage if monthly option isn't allowed

mountiny reviewed Sep 1, 2024

View reviewed changes

mountiny requested a review from a team September 1, 2024 20:37

dubielzyk-expensify previously approved these changes Sep 2, 2024

View reviewed changes

Code improvements

2e293ac

VickyStash dismissed dubielzyk-expensify’s stale review via 2e293ac September 2, 2024 07:53

Merge branch 'refs/heads/main' into feature/47308-feeds-follow-ups

f34d40b

MariaHCD approved these changes Sep 2, 2024

View reviewed changes

mountiny approved these changes Sep 2, 2024

View reviewed changes

mountiny merged commit e31e093 into Expensify:main Sep 2, 2024

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

Deploy Checklist: New Expensify 2024-09-02 #48438

Closed

46 tasks

s77rt reviewed May 31, 2025

View reviewed changes

s77rt mentioned this pull request May 31, 2025

[Due for payment 2025-06-05] [$250] Web - Company cards - User stays on member profile tab instead Company cards page #56009

Closed

8 tasks

allroundexperts reviewed Aug 14, 2025

View reviewed changes

Conversation

VickyStash commented Aug 30, 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 Aug 30, 2024

Uh oh!

mountiny commented Aug 30, 2024

Uh oh!

allgandalf commented Aug 30, 2024

Uh oh!

DylanDylann commented Aug 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann Aug 30, 2024

Choose a reason for hiding this comment

Uh oh!

VickyStash Aug 30, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann Aug 30, 2024

Choose a reason for hiding this comment

Uh oh!

MariaHCD Sep 2, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Aug 30, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mountiny commented Sep 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dubielzyk-expensify left a comment

Choose a reason for hiding this comment

Uh oh!

VickyStash commented Sep 2, 2024

Uh oh!

MariaHCD left a comment

Choose a reason for hiding this comment

Uh oh!

MariaHCD Sep 2, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Sep 2, 2024

Uh oh!

OSBotify commented Sep 2, 2024

Uh oh!

OSBotify commented Sep 3, 2024

Uh oh!

s77rt May 31, 2025

Choose a reason for hiding this comment

Uh oh!

allroundexperts Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

VickyStash commented Aug 30, 2024 •

edited

Loading

DylanDylann commented Aug 30, 2024 •

edited

Loading

mountiny commented Sep 1, 2024 •

edited

Loading