Migrate notification preference #47577
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,7 +103,7 @@ function getOrderedReportIDs( | |
| const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {}; | ||
| const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1'); | ||
| const doesReportHaveViolations = OptionsListUtils.shouldShowViolations(report, transactionViolations); | ||
| const isHidden = ReportUtils.getReportNotificationPreference(report) === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN; | ||
| const isFocused = report.reportID === currentReportId; | ||
| const allReportErrors = OptionsListUtils.getAllReportErrors(report, reportActions) ?? {}; | ||
| const transactionReportActions = ReportActionsUtils.getAllReportActions(report.reportID); | ||
|
|
@@ -340,7 +340,7 @@ function getOptionData({ | |
| result.hasOutstandingChildRequest = report.hasOutstandingChildRequest; | ||
| result.parentReportID = report.parentReportID ?? '-1'; | ||
| result.isWaitingOnBankAccount = report.isWaitingOnBankAccount; | ||
| result.notificationPreference = ReportUtils.getReportNotificationPreference(report); | ||
| result.isAllowedToComment = ReportUtils.canUserPerformWriteAction(report); | ||
| result.chatType = report.chatType; | ||
| result.isDeletedParentAction = report.isDeletedParentAction; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,9 @@ import type {Report} from '@src/types/onyx'; | |
| import updateUnread from './updateUnread'; | ||
|
|
||
| function getUnreadReportsForUnreadIndicator(reports: OnyxCollection<Report>, currentReportID: string) { | ||
| return Object.values(reports ?? {}).filter((report) => { | ||
| const notificationPreference = ReportUtils.getReportNotificationPreference(report); | ||
| return ( | ||
| ReportUtils.isUnread(report) && | ||
| ReportUtils.shouldReportBeInOptionList({ | ||
| report, | ||
|
|
@@ -29,9 +30,10 @@ function getUnreadReportsForUnreadIndicator(reports: OnyxCollection<Report>, cur | |
| * Furthermore, muted reports may or may not appear in the LHN depending on priority mode, | ||
| * but they should not be considered in the unread indicator count. | ||
| */ | ||
| notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN && | ||
| notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.MUTE | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| const memoizedGetUnreadReportsForUnreadIndicator = memoize(getUnreadReportsForUnreadIndicator, {maxArgs: 1}); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3851,7 +3851,7 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string, | |
| undefined, | ||
| undefined, | ||
| undefined, | ||
| CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, | ||
| ); | ||
| return {existingSplitChatReport: null, splitChatReport}; | ||
| } | ||
|
|
@@ -3951,11 +3951,6 @@ function createSplitsAndOnyxData( | |
| splitChatReport.lastActorAccountID = currentUserAccountID; | ||
| splitChatReport.lastVisibleActionCreated = splitIOUReportAction.created; | ||
|
|
||
| // If we have an existing splitChatReport (group chat or workspace) use it's pending fields, otherwise indicate that we are adding a chat | ||
| if (!existingSplitChatReport) { | ||
| splitChatReport.pendingFields = { | ||
|
|
@@ -3969,10 +3964,7 @@ function createSplitsAndOnyxData( | |
| // and we need the data to be available when we navigate to the chat page | ||
| onyxMethod: existingSplitChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT}${splitChatReport.reportID}`, | ||
| value: splitChatReport, | ||
| }, | ||
| { | ||
| onyxMethod: Onyx.METHOD.SET, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing the usage of the single source of truth i.e.
report.notificationPreferenceresulted in #51410There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, what do you mean by that? report.notificationPreference has been deprecated and shouldn't be used anymore.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@puneetlath Well! I am not aware of the context behind deprecating
report.notificationPreference. Let me know if I am missing something here. But, the reasoning for the decision is here i.e.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@puneetlath Its fine. It was a computed property for LHN.