bugfix #37757: admin badge on members list not greyed out when added offline #37892

burczu · 2024-03-07T12:52:15Z

Details

This PR fixes the bug where admin badge added while being offline was not greyed out.

Fixed Issues

$ #37757
PROPOSAL: n/a

Tests

Log in to the App
Open any workspace
Open members page
Go offline
Try to make one of the members admin
Check if the admin badge that was added is greyed out

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

Screenshots/Videos

Android: Native

Screen.Recording.2024-03-07.at.14.19.50.mov

Android: mWeb Chrome

Screen.Recording.2024-03-07.at.14.15.05.mov

iOS: Native

Screen.Recording.2024-03-07.at.14.09.33.mov

iOS: mWeb Safari

Screen.Recording.2024-03-07.at.14.12.15.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-07.at.13.43.32.mov

MacOS: Desktop

Screen.Recording.2024-03-07.at.14.02.36.mov

melvin-bot · 2024-03-07T13:20:51Z

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

luacmartins · 2024-03-07T15:25:58Z

@burczu lint is failing

aimane-chnaif · 2024-03-07T18:02:30Z

src/libs/actions/Policy.ts

@@ -749,9 +749,9 @@ function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newR
            onyxMethod: Onyx.METHOD.MERGE,
            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
            value: {
-                ...memberRoles.reduce((member: Record<number, {role: string}>, current) => {
+                ...memberRoles.reduce((member: Record<number, {role: string; pendingAction: string | null}>, current) => {


Suggested change

...memberRoles.reduce((member: Record<number, {role: string; pendingAction: string | null}>, current) => {

...memberRoles.reduce((member: Record<number, {role: string; pendingAction: PendingAction}>, current) => {

thanks for pointing this out - I'll fix it in one of the upcoming PR's

aimane-chnaif · 2024-03-07T18:03:15Z

src/libs/actions/Policy.ts

@@ -764,6 +764,11 @@ function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newR
            onyxMethod: Onyx.METHOD.MERGE,
            key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
            value: {
+                ...memberRoles.reduce((member: Record<number, {role: string; pendingAction: string | null}>, current) => {


Suggested change

...memberRoles.reduce((member: Record<number, {role: string; pendingAction: string | null}>, current) => {

...memberRoles.reduce((member: Record<number, {role: string; pendingAction: PendingAction}>, current) => {

Nvm. This was already fixed by Carlos as follow-up

Yep, this is fixed!

aimane-chnaif · 2024-03-07T18:52:08Z

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

aimane-chnaif

Left TS improvement feedback. Otherwise looks good.

melvin-bot · 2024-03-07T21:05:32Z

@luacmartins looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

luacmartins · 2024-03-07T21:05:51Z

Tests were passing!

OSBotify · 2024-03-07T21:10:37Z

✋ 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-03-08T00:04:05Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.49-0 🚀

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

OSBotify · 2024-03-12T18:39:09Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.50-5 🚀

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

missing pendingAction added

a4bda40

burczu marked this pull request as ready for review March 7, 2024 13:20

burczu requested a review from a team as a code owner March 7, 2024 13:20

melvin-bot bot removed the request for review from a team March 7, 2024 13:20

melvin-bot bot requested a review from aimane-chnaif March 7, 2024 13:20

luacmartins self-requested a review March 7, 2024 13:27

prettier

fc04a8a

aimane-chnaif suggested changes Mar 7, 2024

View reviewed changes

aimane-chnaif approved these changes Mar 7, 2024

View reviewed changes

melvin-bot bot requested a review from grgia March 7, 2024 19:11

luacmartins approved these changes Mar 7, 2024

View reviewed changes

luacmartins merged commit fc91f3f into Expensify:main Mar 7, 2024
16 of 18 checks passed

melvin-bot bot added the Emergency label Mar 7, 2024

luacmartins removed the Emergency label Mar 7, 2024

luacmartins mentioned this pull request Mar 7, 2024

[No QA] Use correct TS types #37932

Merged

50 tasks

github-actions bot mentioned this pull request Mar 7, 2024

Deploy Checklist: New Expensify 2024-03-07 #37938

Closed

43 tasks

aimane-chnaif mentioned this pull request Mar 8, 2024

fix: Closing receipt view using device navigation redirects user to expense report #35497

Merged

50 tasks

melvin-bot bot mentioned this pull request Mar 11, 2024

[HOLD for payment 2024-03-18] [$500] [Simplified Collect][Members] - admin badge is not grayed out when making user admin in offline mode #37757

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix #37757: admin badge on members list not greyed out when added offline #37892

bugfix #37757: admin badge on members list not greyed out when added offline #37892

burczu commented Mar 7, 2024 •

edited

Loading

melvin-bot bot commented Mar 7, 2024

luacmartins commented Mar 7, 2024

aimane-chnaif Mar 7, 2024

burczu Mar 8, 2024

aimane-chnaif Mar 7, 2024

burczu Mar 8, 2024

aimane-chnaif Mar 8, 2024

luacmartins Mar 8, 2024

aimane-chnaif commented Mar 7, 2024

aimane-chnaif left a comment

melvin-bot bot commented Mar 7, 2024

luacmartins commented Mar 7, 2024

OSBotify commented Mar 7, 2024

OSBotify commented Mar 8, 2024

OSBotify commented Mar 12, 2024

	...memberRoles.reduce((member: Record<number, {role: string; pendingAction: string \| null}>, current) => {
	...memberRoles.reduce((member: Record<number, {role: string; pendingAction: PendingAction}>, current) => {

bugfix #37757: admin badge on members list not greyed out when added offline #37892

bugfix #37757: admin badge on members list not greyed out when added offline #37892

Conversation

burczu commented Mar 7, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 7, 2024

luacmartins commented Mar 7, 2024

aimane-chnaif Mar 7, 2024

Choose a reason for hiding this comment

burczu Mar 8, 2024

Choose a reason for hiding this comment

aimane-chnaif Mar 7, 2024

Choose a reason for hiding this comment

burczu Mar 8, 2024

Choose a reason for hiding this comment

aimane-chnaif Mar 8, 2024

Choose a reason for hiding this comment

luacmartins Mar 8, 2024

Choose a reason for hiding this comment

aimane-chnaif commented Mar 7, 2024

Reviewer Checklist

Screenshots/Videos

aimane-chnaif left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Mar 7, 2024

luacmartins commented Mar 7, 2024

OSBotify commented Mar 7, 2024

OSBotify commented Mar 8, 2024

OSBotify commented Mar 12, 2024

burczu commented Mar 7, 2024 •

edited

Loading