Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dont show hidden notif pref in profile page #33387

Merged
merged 3 commits into from
Jan 8, 2024
Merged

Dont show hidden notif pref in profile page #33387

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0446d42
Dont show hidden notif pref in profile page
srikarparsi Dec 21, 2023
bc1e9dd
Merge branch 'main' into srikar-dontShowHiddenPref
srikarparsi Dec 28, 2023
ffbf5da
Merge branch 'main' into srikar-dontShowHiddenPref
srikarparsi Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/pages/ProfilePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ function ProfilePage(props) {

const navigateBackTo = lodashGet(props.route, 'params.backTo', ROUTES.HOME);

const notificationPreference = !_.isEmpty(props.report) ? props.translate(`notificationPreferencesPage.notificationPreferences.${props.report.notificationPreference}`) : '';
const shouldShowNotificationPreference = !_.isEmpty(props.report) && props.report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
const notificationPreference = shouldShowNotificationPreference ? props.translate(`notificationPreferencesPage.notificationPreferences.${props.report.notificationPreference}`) : '';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like a redundant condition here. The only place notificationPreference is used is in the title={notificationPreference} and the only way that will show is if shouldShowNotificationPreference is true anyway. So, defaulting to an empty string is not needed.

Copy link
Contributor Author

@srikarparsi srikarparsi Dec 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hidden doesn't currently have a translation since it doesn't show up anywhere on the app. So I wanted to add the conditional so that props.translate doesn't have a warning since hidden doesn't exist.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm ok I think I see what you are saying now. But what does it show instead? Do we need some fallback?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe so, I wrote similar code to here which is in the report settings page. Since hidden is more of a tool to hide reports than an actual notification preference, I think we should treat hidden reports as reports that the user does not yet have access too. And in that case they would see nothing in the notification preferences section.


// eslint-disable-next-line rulesdir/prefer-early-return
useEffect(() => {
Expand Down Expand Up @@ -226,7 +227,7 @@ function ProfilePage(props) {
) : null}
{shouldShowLocalTime && <AutoUpdateTime timezone={timezone} />}
</View>
{!_.isEmpty(props.report) && notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN && (
{shouldShowNotificationPreference && (
<MenuItemWithTopDescription
shouldShowRightIcon
title={notificationPreference}
Expand Down
Loading