update correct field #54501

DylanDylann · 2024-12-24T09:14:16Z

Explanation of Change

Fixed Issues

$ #54493
#54495

PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Create a workspace and invite a member
Make the member to be an admin
Sign in with the secondary admin account on a different window
As the secondary admin go to Workspace > Profile > Plan (Keep the RHP open)
As the owner change the plan type
As the secondary admin, verify that the selected option is updated

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-12-20.at.15.58.13.mov

Android: mWeb Chrome

Screen.Recording.2024-12-20.at.16.20.42.mov

iOS: Native

Screen.Recording.2024-12-20.at.16.05.10.mov

iOS: mWeb Safari

Screen.Recording.2024-12-19.at.17.31.41.mov

MacOS: Chrome / Safari

Screen.Recording.2024-12-19.at.17.30.07.mov

MacOS: Desktop

Screen.Recording.2024-12-19.at.17.33.24.mov

melvin-bot · 2024-12-24T09:14:23Z

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

DylanDylann · 2024-12-24T09:14:38Z

@jayeshmangwani Could you review this PR?

jayeshmangwani · 2024-12-24T09:15:55Z

@DylanDylann I'll

DylanDylann · 2024-12-24T09:18:17Z

You already saw that in the original PR but I missed committing the suggestion for the failure data :(

jayeshmangwani · 2024-12-24T09:20:57Z

Haha, we sometimes miss things. I’m reviewing PR in 5 minutes.

jayeshmangwani · 2024-12-24T09:43:29Z

@DylanDylann Upon pressing downgrade, nothing happens for me—it just reloads the page. Are you facing the same issue?

downgrade-flickers.mov

DylanDylann · 2024-12-24T09:45:15Z

As mentioned here, It is a BE bug. currently, the BE only allows the owner of policy downgrade

jayeshmangwani · 2024-12-24T09:47:33Z

@DylanDylann , it seems we need to adjust the permissions here. We should display the Plan Type if the user is the owner of the workspace, rather than the Admin.

App/src/pages/workspace/WorkspaceProfilePage.tsx

Lines 331 to 334 in 8b7096f

    
           {!readOnly && !!policy?.type && ( 
        
               <OfflineWithFeedback pendingAction={policy?.pendingFields?.type}> 
        
                   <View> 
        
                       <MenuItemWithTopDescription

DylanDylann · 2024-12-24T09:48:31Z

I think admin should have permission to downgrade and upgrade the workspace as design docs

jayeshmangwani · 2024-12-24T09:49:11Z

Okay then BE needs to be adjusted as I am getting BE error

{
    "code": 666,
    "jsonCode": 666,
    "type": "Expensify\\Libs\\Error\\ExpError",
    "UUID": "4d7b2da5-d585-403a-aee7-793621b49e49",
    "message": "Only policy owner can downgrade",
    "title": "",
    "data": [],
    "htmlMessage": "",
    "onyxData": [],
    "requestID": "8f6fa64f085df29a-BOM"
}

DylanDylann · 2024-12-24T09:52:13Z

@jayeshmangwani I have added a new commit to solve this bug too

jayeshmangwani · 2024-12-24T09:52:57Z

Thanks, testing that issue too

DylanDylann · 2024-12-24T10:00:19Z

@jayeshmangwani There is a minor problem. The App already updated the selected option when another device updated it. But the background focus still be outdated see the below video

Screen.Recording.2024-12-24.at.16.53.52.mov

But this is a bug in SelectionList that will happen to all places where we use SelectionList. Now, we already have a PR to address it separately. I think we can ignore it here

jayeshmangwani · 2024-12-24T10:01:28Z

I think we can ignore it here

Sounds good to me

jayeshmangwani · 2024-12-24T10:04:13Z

@DylanDylann PR changes looks good, but can we please update the QA Steps to include the testing steps instead of doc link? It seems the tester doesn’t have access to the document , as they’ve commented on this PR #54356 (comment). Please update that PR with QA Steps as well.

DylanDylann · 2024-12-24T10:12:16Z

@jayeshmangwani Done. I updated test step for #54495 only

DylanDylann · 2024-12-24T10:12:41Z

To test #54493, I think we need to wait for the BE change

jayeshmangwani · 2024-12-24T10:14:52Z

I think we need to wait for the BE change

Yes we can wait, I think we can update this steps once BE will be fixed

src/pages/workspace/WorkspaceProfilePlanTypePage.tsx

jayeshmangwani · 2024-12-24T10:37:17Z

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

Android.mov

Android: mWeb Chrome

mweb-chrome.mov

iOS: Native

iOS.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

OSBotify · 2024-12-24T11:56:05Z

✋ 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-12-26T20:55:13Z

🚀 Deployed to staging by https://github.com/techievivek in version: 9.0.79-0 🚀

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

github-actions · 2024-12-31T21:52:32Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.79-5 🚀

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

update correct field

b8441be

DylanDylann requested a review from a team as a code owner December 24, 2024 09:14

melvin-bot bot requested a review from mananjadhav December 24, 2024 09:14

melvin-bot bot removed the request for review from a team December 24, 2024 09:14

update selected option

0d792b5

DylanDylann mentioned this pull request Dec 24, 2024

Preselected marker on RHP doesn't change dynamically for the secondary admin #54495

Closed

8 tasks

jayeshmangwani reviewed Dec 24, 2024

View reviewed changes

src/pages/workspace/WorkspaceProfilePlanTypePage.tsx Show resolved Hide resolved

jayeshmangwani approved these changes Dec 24, 2024

View reviewed changes

melvin-bot bot requested a review from techievivek December 24, 2024 10:37

techievivek assigned DylanDylann Dec 24, 2024

techievivek approved these changes Dec 24, 2024

View reviewed changes

techievivek merged commit dc784de into Expensify:main Dec 24, 2024
19 of 22 checks passed

github-actions bot mentioned this pull request Dec 26, 2024

Deploy Checklist: New Expensify 2024-12-26 #54591

Closed

42 tasks

melvin-bot bot mentioned this pull request Dec 31, 2024

[HOLD for payment 2025-01-07] Infinite loading on downgrade button if a secondary admin tries to downgrade plan #54493

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update correct field #54501

update correct field #54501

DylanDylann commented Dec 24, 2024 •

edited

Loading

melvin-bot bot commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024 •

edited

Loading

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

OSBotify commented Dec 24, 2024

github-actions bot commented Dec 26, 2024

github-actions bot commented Dec 31, 2024

update correct field #54501

update correct field #54501

Conversation

DylanDylann commented Dec 24, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024 • edited Loading

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

DylanDylann commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

jayeshmangwani commented Dec 24, 2024

Reviewer Checklist

Screenshots/Videos

OSBotify commented Dec 24, 2024

github-actions bot commented Dec 26, 2024

github-actions bot commented Dec 31, 2024

DylanDylann commented Dec 24, 2024 •

edited

Loading

DylanDylann commented Dec 24, 2024 •

edited

Loading