From e03643cd2cbeddaeb9467d8960a6196fb2b09a20 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Wed, 30 Jun 2021 15:16:03 -0700 Subject: [PATCH] Merge pull request #3840 from Expensify/yuwen-sidebarOptionsBetas Start including betas in the call to getSidebarOptions (cherry picked from commit d627947ae5a8d6cbfeab1b7be11453f60dd68b4c) --- src/libs/OptionsListUtils.js | 11 ++++++++++- src/pages/home/sidebar/SidebarLinks.js | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 1b3666d56c64..66c1d76e024e 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -551,9 +551,17 @@ function getNewGroupOptions( * @param {Object} draftComments * @param {Number} activeReportID * @param {String} priorityMode + * @param {Array} betas * @returns {Object} */ -function getSidebarOptions(reports, personalDetails, draftComments, activeReportID, priorityMode) { +function getSidebarOptions( + reports, + personalDetails, + draftComments, + activeReportID, + priorityMode, + betas, +) { let sideBarOptions = { prioritizePinnedReports: true, }; @@ -565,6 +573,7 @@ function getSidebarOptions(reports, personalDetails, draftComments, activeReport } return getOptions(reports, personalDetails, draftComments, activeReportID, { + betas, includeRecentReports: true, includeMultipleParticipantReports: true, maxRecentReportsToShow: 0, // Unlimited diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js index 7fa678b444cd..48a9c30b842e 100644 --- a/src/pages/home/sidebar/SidebarLinks.js +++ b/src/pages/home/sidebar/SidebarLinks.js @@ -112,6 +112,7 @@ class SidebarLinks extends React.Component { this.props.draftComments, activeReportID, this.props.priorityMode, + this.props.betas, ); const sections = [{ @@ -218,5 +219,8 @@ export default compose( isSyncingData: { key: ONYXKEYS.IS_LOADING_AFTER_RECONNECT, }, + betas: { + key: ONYXKEYS.BETAS, + }, }), )(SidebarLinks);