fix: separate pending fields in workspace general settings #47312

dominictb · 2024-08-13T12:26:56Z

Details

Fixed Issues

$ #46997
PROPOSAL: #46997 (comment)

Tests

Go to a Workspace - Profile
Go offline
Change the workspace name

Verify that: Only workspace name is grey out. Currency field shouldn't be grey out when changing the workspace name

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to a Workspace - Profile
Go offline
Change the workspace name

Verify that: Only workspace name is grey out. Currency field shouldn't be grey out when changing the workspace name

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

compressed_android.webm.mp4

Android: mWeb Chrome

compressed_aweb.webm.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

compressed_iosweb.mp4.mp4

MacOS: Chrome / Safari

compressed_web2.mov.mp4

MacOS: Desktop

compressed_web2.mov.mp4

melvin-bot · 2024-08-13T12:27:02Z

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

DylanDylann · 2024-08-14T09:58:31Z

src/libs/actions/Policy/Policy.ts

@@ -1074,6 +1077,7 @@ function updateGeneralSettings(policyID: string, name: string, currencyValue?: s
                pendingFields: {
                    ...policy.pendingFields,
                    generalSettings: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,


Let's update generalSettings to workspaceName or policyName

we also update generalSettings in other places. Let's create a new workspace offline, you will see that currency and address aren't greyed out

@DylanDylann I think we also need to update the errorFields. And maybe a BE change is needed to return the correct errorFields if it's returning generalSettings error field when we update the WS name failure

And maybe a BE change is needed to return the correct errorFields if it's returning generalSettings error field when we update the WS name failure

cc @aldo-expensify Can you please let me know my concern above? Everything works well if BE returns nothing when we update the WS name failure because we also generate the error in FE. If not, we need a BE change to return the correct errorFields.

I don't see generalSettings in the backend, so I think the backend is not creating this error ever. Did you see it happening?

@dominictb Is this ready for review? I still see this bug

@DylanDylann couldn't reproduce your issue. Can you try to fetch the latest commit?

src/libs/actions/Policy/Policy.ts

src/pages/workspace/WorkspaceInitialPage.tsx

DylanDylann · 2024-08-19T09:41:02Z

src/types/onyx/Policy.ts

@@ -1555,7 +1555,7 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
        /** Workspace account ID configured for Expensify Card */
        workspaceAccountID?: number;
    } & Partial<PendingJoinRequestPolicy>,
-    'generalSettings' | 'addWorkspaceRoom' | 'employeeList' | keyof ACHAccount | keyof Attributes
+    'addWorkspaceRoom' | 'employeeList' | keyof ACHAccount | keyof Attributes


Should we add name, outputCurrency, address here?

@DylanDylann we don't need as name, outputCurrency and address is part of the Policy type

Ahh see 😄

DylanDylann · 2024-08-19T09:42:09Z

@dominictb Some minor comments

DylanDylann · 2024-08-19T09:46:35Z

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

Screen.Recording.2024-08-21.at.16.06.48.mov

Android: mWeb Chrome

Screen.Recording.2024-08-21.at.15.58.15.mov

iOS: Native

Screen.Recording.2024-08-21.at.16.08.24.mov

iOS: mWeb Safari

Screen.Recording.2024-08-21.at.16.00.27.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-21.at.15.56.11.mov

MacOS: Desktop

Screen.Recording.2024-08-21.at.15.58.54.mov

DylanDylann · 2024-08-21T09:05:41Z

src/libs/actions/Policy/Policy.ts

@@ -1038,6 +1038,9 @@ function updateGeneralSettings(policyID: string, name: string, currencyValue?: s
    const customUnitID = distanceUnit?.customUnitID;
    const currency = currencyValue ?? policy?.outputCurrency ?? CONST.CURRENCY.USD;

+    const currencyPendingAction = currency !== policy?.outputCurrency ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : null;
+    const namePendingAction = name !== policy?.name ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : null;


@dominictb

Go offline

Change name

Change the currency
--> Both the name and the currency should be greyed out

In this case, the pendingFields.name is overwritten with null value. We can use undefined to avoid overwriting

Screen.Recording.2024-08-21.at.16.00.27.mov

dominictb · 2024-08-22T09:43:13Z

updated!

OSBotify · 2024-08-22T18:44:11Z

✋ 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-08-26T23:18:24Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.0.25-0 🚀

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

OSBotify · 2024-08-27T00:08:46Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.0.25-0 🚀

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

aldo-expensify · 2024-09-10T19:15:45Z

Tested this in production and I see that the changes are there even if the Deployed to production message is missing:

fix: separate pending fields in workspace general settings

18f1683

dominictb requested a review from a team as a code owner August 13, 2024 12:26

melvin-bot bot requested review from DylanDylann and removed request for a team August 13, 2024 12:27

DylanDylann reviewed Aug 14, 2024

View reviewed changes

dominictb mentioned this pull request Aug 14, 2024

[HOLD for payment 2024-09-12] [$250] Workspace - Workspace profile page becomes grayed out when go offline #47260

Closed

6 tasks

dominictb added 4 commits August 16, 2024 11:44

fix: remove generalSettings field in policy onyx

1eecd00

Merge remote-tracking branch 'origin/main' into fix/46997-ws-profile

0572f18

fix: remove pendingFields if success

c973f4f

fix: lint and prettier

dd278e8

DylanDylann reviewed Aug 19, 2024

View reviewed changes

dominictb added 3 commits August 20, 2024 20:05

Merge remote-tracking branch 'origin/main' into fix/46997-ws-profile

ac47c28

fix: also check policy address error field

f32d9ce

fix: prettier

abf704d

DylanDylann reviewed Aug 21, 2024

View reviewed changes

fix: keep pending action as undefined for unchanged fields

eac95a0

DylanDylann approved these changes Aug 22, 2024

View reviewed changes

melvin-bot bot requested a review from aldo-expensify August 22, 2024 10:24

aldo-expensify approved these changes Aug 22, 2024

View reviewed changes

aldo-expensify merged commit 4508c58 into Expensify:main Aug 22, 2024
16 checks passed

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

Deploy Checklist: New Expensify 2024-08-26 #48035

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: separate pending fields in workspace general settings #47312

fix: separate pending fields in workspace general settings #47312

dominictb commented Aug 13, 2024

melvin-bot bot commented Aug 13, 2024

DylanDylann Aug 14, 2024

DylanDylann Aug 14, 2024

dominictb Aug 15, 2024

aldo-expensify Aug 15, 2024

DylanDylann Aug 19, 2024

dominictb Aug 20, 2024

DylanDylann Aug 19, 2024

dominictb Aug 20, 2024

DylanDylann Aug 21, 2024

DylanDylann commented Aug 19, 2024

DylanDylann commented Aug 19, 2024 •

edited

Loading

DylanDylann Aug 21, 2024 •

edited

Loading

dominictb commented Aug 22, 2024

OSBotify commented Aug 22, 2024

OSBotify commented Aug 26, 2024

OSBotify commented Aug 27, 2024

aldo-expensify commented Sep 10, 2024

fix: separate pending fields in workspace general settings #47312

fix: separate pending fields in workspace general settings #47312

Conversation

dominictb commented Aug 13, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DylanDylann commented Aug 19, 2024

DylanDylann commented Aug 19, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann Aug 21, 2024 • edited Loading

Choose a reason for hiding this comment

dominictb commented Aug 22, 2024

OSBotify commented Aug 22, 2024

OSBotify commented Aug 26, 2024

OSBotify commented Aug 27, 2024

aldo-expensify commented Sep 10, 2024

DylanDylann commented Aug 19, 2024 •

edited

Loading

DylanDylann Aug 21, 2024 •

edited

Loading