Move Leave button into a row of the Report Details page #40979

ZhenjaHorbach · 2024-04-25T13:22:41Z

Details

Move the "Share" row into the ChatDetailsQuickActionsBar

Move the "Leave" button out of this component and into it's own row here.

Fixed Issues

$ #40256
PROPOSAL: #40256 (comment)

Tests

Open App
Open any GroupChat or Room
Press on header and open details
Verify that Pin and Share buttons are in ActionBar and leave button is in Menu list at the end

Verify that no errors appear in the JS console

Offline tests

Open App
Open any GroupChat or Room
Press on header and open details
Verify that Pin and Share buttons are in ActionBar and leave button is in Menu list at the end

QA Steps

Open App
Open any GroupChat or Room
Press on header and open details
Verify that Pin and Share buttons are in ActionBar and leave button is in Menu list at the end

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_w5JoDfzq.mp4

Android: mWeb Chrome

android_w5JoDfzq.mp4

iOS: Native

ios_C82AYGGZ.mp4

iOS: mWeb Safari

ios-web_D4Z5n1mS.mp4

MacOS: Chrome / Safari

web_YDYEn9BO.mp4

MacOS: Desktop

desktop_7RFrq62O.mp4

melvin-bot · 2024-04-25T13:22:46Z

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

ZhenjaHorbach · 2024-04-25T13:27:31Z

@DylanDylann
Hello )
PR is ready

The only thing is that I did not update the avatar size
Or should we make it in this PR?

DylanDylann · 2024-04-25T15:10:15Z

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

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

DylanDylann · 2024-04-25T15:28:24Z

src/pages/ReportDetailsPage.tsx

@@ -312,6 +333,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                            )}
                        </View>
                    </View>
+                    {(isGroupChat || isChatRoom) && <ChatDetailsQuickActionsBar report={report} />}


@ZhenjaHorbach Why we move the position of ChatDetailsQuickActionsBar to above description

Actually it's optional

Here we have action bar and then description

But I just noticed that in the latest designs we don't need to do this
So give me one minute to return changes

DylanDylann · 2024-04-25T16:08:26Z

Screen.Recording.2024-04-25.at.23.07.50.mov

@ZhenjaHorbach Bug: The leave button still appears after user leave room

ZhenjaHorbach · 2024-04-25T17:17:42Z

Screen.Recording.2024-04-25.at.23.07.50.mov
@ZhenjaHorbach Bug: The leave button still appears after user leave room

Good catch)
I have fixed

DylanDylann · 2024-04-27T10:12:08Z

@ZhenjaHorbach Could you merge the latest main?

…ails-page

ZhenjaHorbach · 2024-04-27T11:30:38Z

@ZhenjaHorbach Could you merge the latest main?

Hello )
Done )

DylanDylann · 2024-04-28T16:21:24Z

src/pages/ReportDetailsPage.tsx

    const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;

    const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
+    const canJoinOrLeave = !isSelfDM && !isGroupChat && (isChatThread || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat);
+    const canJoin = report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;


canJoinOrLeave is only used once. I think we should remove this variable

DylanDylann · 2024-04-28T16:23:08Z

src/pages/ReportDetailsPage.tsx

@@ -194,21 +200,42 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
            });
        }

+        if (isGroupChat || (isChatRoom && canJoinOrLeave && !canJoin)) {


Suggested change

if (isGroupChat || (isChatRoom && canJoinOrLeave && !canJoin)) {

if (isGroupChat || (isChatRoom && canLeave)) {

ZhenjaHorbach · 2024-04-29T08:52:22Z

@DylanDylann
Hello )
I fixed comments
And also I made a few changes for HeaderView
Because i noticed that we didn't have leave button for threeDotMenu when it's groupChat
So I added this button for consistency with ReportDetailsPage

shawnborton · 2024-04-29T15:02:38Z

Because i noticed that we didn't have leave button for threeDotMenu when it's groupChat

@JmillsExpensify should we just be getting rid of this menu here, and make it so that the three dots just takes you to the details view? Or are we saving that for a different project?

DylanDylann · 2024-04-30T08:35:03Z

And also I made a few changes for HeaderView
Because i noticed that we didn't have leave button for threeDotMenu when it's groupChat
So I added this button for consistency with ReportDetailsPage

@ZhenjaHorbach About this point, I think it is out of scope here. But let's hear a thought from @marcaaron and @JmillsExpensify

ZhenjaHorbach · 2024-04-30T08:43:34Z

And also I made a few changes for HeaderView
Because i noticed that we didn't have leave button for threeDotMenu when it's groupChat
So I added this button for consistency with ReportDetailsPage

@ZhenjaHorbach About this point, I think it is out of scope here. But let's hear a thought from @marcaaron and @JmillsExpensify

Maybe you're right )
But it looks like a regression
But I agree that it is better to wait for a decision

marcaaron · 2024-04-30T21:46:44Z

i noticed that we didn't have leave button for threeDotMenu when it's groupChat

Gonna defer to @shawnborton and @JmillsExpensify on this one. My understanding is that we want people to use the Leave chat row inside the report details and not the three dots menu. But can't really see much of a problem with having it in both places for now from a pure consistency perspective if we aren't gonna make that change right now.

shawnborton · 2024-05-01T11:53:58Z

I think we're planning to make that change with Jason's Details revamp project though, right @JmillsExpensify ? Not sure if we should just wait or do it here.

DylanDylann · 2024-05-03T08:09:45Z

Still no update, I think we should revert the unrelated change to avoid blocking this PR

cc @ZhenjaHorbach

ZhenjaHorbach · 2024-05-03T08:14:30Z

Still no update, I think we should revert the unrelated change to avoid blocking this PR

cc @ZhenjaHorbach

I thought we are waiting for @JmillsExpensify decision )
But I don't mind revert the changes)
Give me a minute

…ails-page

ZhenjaHorbach · 2024-05-03T08:33:49Z

Still no update, I think we should revert the unrelated change to avoid blocking this PR

cc @ZhenjaHorbach

@DylanDylann
I reverted the changes )

DylanDylann · 2024-05-03T09:30:29Z

@marcaaron As for this comment, are we good to move forward?

marcaaron

LGTM

marcaaron · 2024-05-07T20:50:29Z

src/pages/ReportDetailsPage.tsx

-                isAnonymousAction: true,
-                action: () => Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? '')),
-            });
-        }


Yeah so - in removing this for all chats we need to show the ChatDetailsQuickActionsBar to more than just (isGroupChat || isChatRoom)

OSBotify · 2024-05-09T02:10:37Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

ZhenjaHorbach added 2 commits April 25, 2024 14:45

Move Leave button into a row of the Report Details page

5762ea4

Update conditions for ReportDetailsPage

468e2ed

ZhenjaHorbach requested a review from a team as a code owner April 25, 2024 13:22

melvin-bot bot requested review from DylanDylann and removed request for a team April 25, 2024 13:22

DylanDylann reviewed Apr 25, 2024

View reviewed changes

Move ChatDetailsQuickActionsBar and update styles

6984db6

ZhenjaHorbach added 2 commits April 25, 2024 18:59

Fix bug with ability leave chatRoom

ab6a28a

Update condition for canJoin

cb50951

Update branch

5c0982b

ZhenjaHorbach requested a review from a team as a code owner April 27, 2024 11:22

Merge branch 'main' into move-leave-button-into-row-of-the-report-det…

c0be6a1

…ails-page

DylanDylann reviewed Apr 28, 2024

View reviewed changes

ZhenjaHorbach added 2 commits April 29, 2024 10:42

Fix comments and update HeaderView for GroupChat

6a8908a

Fix conflicts

eee05d6

ZhenjaHorbach added 2 commits May 3, 2024 10:26

Revert changes

8c5f825

Merge branch 'main' into move-leave-button-into-row-of-the-report-det…

f02a4d4

…ails-page

DylanDylann approved these changes May 3, 2024

View reviewed changes

melvin-bot bot requested a review from marcaaron May 3, 2024 09:29

marcaaron approved these changes May 3, 2024

View reviewed changes

marcaaron merged commit 6a46b6a into Expensify:main May 3, 2024
16 checks passed

marcaaron assigned ZhenjaHorbach May 3, 2024

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

Deploy Checklist: New Expensify 2024-05-07 #41716

Closed

marcaaron mentioned this pull request May 7, 2024

Expense - Share code option is missing in expense report and transaction thread #41799

Closed

6 tasks

marcaaron reviewed May 7, 2024

View reviewed changes

marcaaron mentioned this pull request May 7, 2024

[CP Staging] Revert "Move Leave button into a row of the Report Details page" #41818

Merged

48 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move Leave button into a row of the Report Details page #40979

Move Leave button into a row of the Report Details page #40979

ZhenjaHorbach commented Apr 25, 2024 •

edited

Loading

melvin-bot bot commented Apr 25, 2024

ZhenjaHorbach commented Apr 25, 2024

DylanDylann commented Apr 25, 2024 •

edited

Loading

DylanDylann Apr 25, 2024

ZhenjaHorbach Apr 25, 2024

DylanDylann commented Apr 25, 2024

ZhenjaHorbach commented Apr 25, 2024 •

edited

Loading

DylanDylann commented Apr 27, 2024

ZhenjaHorbach commented Apr 27, 2024

DylanDylann Apr 28, 2024

DylanDylann Apr 28, 2024

ZhenjaHorbach commented Apr 29, 2024

shawnborton commented Apr 29, 2024

DylanDylann commented Apr 30, 2024

ZhenjaHorbach commented Apr 30, 2024

marcaaron commented Apr 30, 2024 •

edited

Loading

shawnborton commented May 1, 2024

DylanDylann commented May 3, 2024

ZhenjaHorbach commented May 3, 2024

ZhenjaHorbach commented May 3, 2024

DylanDylann commented May 3, 2024

marcaaron left a comment

marcaaron May 7, 2024

OSBotify commented May 9, 2024

	if (isGroupChat \|\| (isChatRoom && canJoinOrLeave && !canJoin)) {
	if (isGroupChat \|\| (isChatRoom && canLeave)) {

Move Leave button into a row of the Report Details page #40979

Move Leave button into a row of the Report Details page #40979

Conversation

ZhenjaHorbach commented Apr 25, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 25, 2024

ZhenjaHorbach commented Apr 25, 2024

DylanDylann commented Apr 25, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann Apr 25, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Apr 25, 2024

Choose a reason for hiding this comment

DylanDylann commented Apr 25, 2024

ZhenjaHorbach commented Apr 25, 2024 • edited Loading

DylanDylann commented Apr 27, 2024

ZhenjaHorbach commented Apr 27, 2024

DylanDylann Apr 28, 2024

Choose a reason for hiding this comment

DylanDylann Apr 28, 2024

Choose a reason for hiding this comment

ZhenjaHorbach commented Apr 29, 2024

shawnborton commented Apr 29, 2024

DylanDylann commented Apr 30, 2024

ZhenjaHorbach commented Apr 30, 2024

marcaaron commented Apr 30, 2024 • edited Loading

shawnborton commented May 1, 2024

DylanDylann commented May 3, 2024

ZhenjaHorbach commented May 3, 2024

ZhenjaHorbach commented May 3, 2024

DylanDylann commented May 3, 2024

marcaaron left a comment

Choose a reason for hiding this comment

marcaaron May 7, 2024

Choose a reason for hiding this comment

OSBotify commented May 9, 2024

ZhenjaHorbach commented Apr 25, 2024 •

edited

Loading

DylanDylann commented Apr 25, 2024 •

edited

Loading

ZhenjaHorbach commented Apr 25, 2024 •

edited

Loading

marcaaron commented Apr 30, 2024 •

edited

Loading