[CP Staging] Fix workspace change logic by luacmartins · Pull Request #61667 · Expensify/App

luacmartins · 2025-05-08T08:23:53Z

Explanation of Change

Adds a condition to prevent showing the Change workspace option to non-admins if the report is not open or processing. Mirroring this check in the API.

Fixed Issues

$ #61649

Tests

Pre-conditions:

An employee account
An approver account
An admin account
Workspace with all members above
Workflow is configured to Add approvals and approver set to approver account
Only use Expensifail accounts
Employee and approver are members of at least 2 workspaces [Just create a workspace for every user, (the employee and the approver)]

Go to staging.new.expensify.com
Log in with the employee account
Submit an expense to the workspace
[Approver] Approve the report
[Employee] Verify that you don't see the Change workspace option
[Approver] Verify that you don't see the Change workspace option
[Admin] Verify that you don't see the Change workspace option
[Admin] Invite the employee to another workspace
[Admin] Navigate back to the report
[Admin] Verify that now you see the Change workspace option

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Screen.Recording.2025-05-08.at.8.21.25.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-05-08T19:20:10Z

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

marcochavezf

Code LGTM

srikarparsi · 2025-05-08T20:49:32Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

rushatgabhane · 2025-05-08T20:59:14Z

@luacmartins we shouldn't be seeing change workspace when a report is approved, right?
This is an admin user

luacmartins · 2025-05-08T21:19:50Z

Yea, admins can see it until the report is exported

srikarparsi · 2025-05-08T21:21:08Z

Admin:

Approver:

Employee:

srikarparsi · 2025-05-08T21:22:12Z

Yea, admins can see it until the report is exported

Should we edit step 7 in the tests to reflect this? Or maybe I'm misinterpreting something?

luacmartins · 2025-05-08T21:39:48Z

Admins should only see the option if the submitter is also a member of the other workspace you wanna change the report to. So step 7 is still correct, since the submitter shouldn't be a member of the other workspace at that point

rushatgabhane

LGTM

Admin

Employee

Approver

melvin-bot · 2025-05-08T22:04:51Z

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

OSBotify · 2025-05-08T22:17:32Z

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

…ogic [CP Staging] Fix workspace change logic (cherry picked from commit 3db7396) (cherry-picked to staging by yuwenmemon)

github-actions · 2025-05-08T23:38:43Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 9.1.43-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

mitarachim · 2025-05-09T05:05:56Z

Hello @luacmartins @srikarparsi based on step 7, as Admin are we shouldn't be seeing change workspace menu when a report is approved with condition employee NOT a member of the other workspace(in Admin) ?

Screen.Recording.2025-05-09.at.11.44.24.AM.mp4

github-actions · 2025-05-09T09:28:20Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 9.1.43-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-05-13T17:54:03Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.44-8 🚀

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

luacmartins added 2 commits May 8, 2025 10:22

prevent changing workspace if report is not open/submitted

a306b5f

update comment

e3ce743

luacmartins self-assigned this May 8, 2025

rm redudant check

ad89146

luacmartins changed the title ~~Fix workpsace change logic~~ Fix workspace change logic May 8, 2025

luacmartins added 6 commits May 8, 2025 17:32

update condition

6630b94

update logic and add test

daf69f4

update logic

db6a38a

disable workflow if user is not member

d1fb007

fix test

c779d9f

fix another test

e6222a2

luacmartins changed the title ~~Fix workspace change logic~~ [CP Staging] Fix workspace change logic May 8, 2025

luacmartins marked this pull request as ready for review May 8, 2025 19:20

luacmartins requested a review from a team as a code owner May 8, 2025 19:20

melvin-bot bot requested review from mananjadhav and removed request for a team May 8, 2025 19:20

luacmartins requested review from marcochavezf, rayane-d, rushatgabhane and srikarparsi and removed request for mananjadhav May 8, 2025 19:20

marcochavezf approved these changes May 8, 2025

View reviewed changes

srikarparsi approved these changes May 8, 2025

View reviewed changes

rushatgabhane approved these changes May 8, 2025

View reviewed changes

melvin-bot bot requested a review from arosiclair May 8, 2025 22:04

luacmartins merged commit 3db7396 into main May 8, 2025
22 of 23 checks passed

luacmartins deleted the cmartins-fixWorkpsaceChangeLogic branch May 8, 2025 22:07

OSBotify pushed a commit that referenced this pull request May 8, 2025

Merge pull request #61667 from Expensify/cmartins-fixWorkpsaceChangeL…

3d59622

…ogic [CP Staging] Fix workspace change logic (cherry picked from commit 3db7396) (cherry-picked to staging by yuwenmemon)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label May 8, 2025

github-actions bot mentioned this pull request May 8, 2025

Deploy Checklist: New Expensify 2025-05-07 #61626

Closed

90 tasks

melvin-bot bot mentioned this pull request May 13, 2025

[Due for payment 2025-05-22] [Due for payment 2025-05-20] Expense-The Change workspace option is available to the employee and the approver #61649

Closed

8 tasks

mountiny mentioned this pull request May 14, 2025

Deploy Checklist: New Expensify 2025-05-13 #61917

Closed

Conversation

luacmartins commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented May 8, 2025

Uh oh!

marcochavezf left a comment

Choose a reason for hiding this comment

Uh oh!

srikarparsi commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

rushatgabhane commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins commented May 8, 2025

Uh oh!

srikarparsi commented May 8, 2025

Uh oh!

srikarparsi commented May 8, 2025

Uh oh!

luacmartins commented May 8, 2025

Uh oh!

rushatgabhane left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented May 8, 2025

Uh oh!

Uh oh!

OSBotify commented May 8, 2025

Uh oh!

github-actions bot commented May 8, 2025

Uh oh!

mitarachim commented May 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 9, 2025

Uh oh!

github-actions bot commented May 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

luacmartins commented May 8, 2025 •

edited

Loading

srikarparsi commented May 8, 2025 •

edited

Loading

rushatgabhane commented May 8, 2025 •

edited

Loading

mitarachim commented May 9, 2025 •

edited

Loading