From 6ab3907d0e83dc5a8b6260085e53ffb973d23f5c Mon Sep 17 00:00:00 2001 From: Francois Laithier Date: Fri, 11 Apr 2025 10:23:56 -0700 Subject: [PATCH] Remove beta `newDotHelpSidePanel`, show help button only based on Onyx key Revert "Merge pull request #59221 from software-mansion-labs/side-pane-feature-flag" This reverts commit 5f1a1216c993a0a0d668f1e9425d539e40ea2608, reversing changes made to b8b68afb8b7d0df57b7abce403e75af6a7d2f970. --- src/CONST.ts | 1 - src/hooks/useSidePanel.ts | 10 ++++------ src/libs/Permissions.ts | 5 ----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 643a7d4dca61..5e58817f3b50 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -771,7 +771,6 @@ const CONST = { NEW_DOT_TALK_TO_AI_SALES: 'newDotTalkToAISales', CUSTOM_RULES: 'customRules', TABLE_REPORT_VIEW: 'tableReportView', - HELP_SIDE_PANEL: 'newDotHelpSidePanel', RECEIPT_LINE_ITEMS: 'receiptLineItems', LEFT_HAND_BAR: 'leftHandBar', WALLET: 'newdotWallet', diff --git a/src/hooks/useSidePanel.ts b/src/hooks/useSidePanel.ts index fb69fedb6453..1a55f308f401 100644 --- a/src/hooks/useSidePanel.ts +++ b/src/hooks/useSidePanel.ts @@ -5,7 +5,6 @@ import {Animated} from 'react-native'; import {useOnyx} from 'react-native-onyx'; import {triggerSidePanel} from '@libs/actions/SidePanel'; import focusComposerWithDelay from '@libs/focusComposerWithDelay'; -import Permissions from '@libs/Permissions'; import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager'; import variables from '@styles/variables'; import CONST from '@src/CONST'; @@ -21,7 +20,6 @@ function useSidePanelDisplayStatus() { const {isExtraLargeScreenWidth, shouldUseNarrowLayout} = useResponsiveLayout(); const [sidePanelNVP] = useOnyx(ONYXKEYS.NVP_SIDE_PANEL); const [language] = useOnyx(ONYXKEYS.NVP_PREFERRED_LOCALE); - const [canUseHelpSidePanel = false] = useOnyx(ONYXKEYS.BETAS, {selector: Permissions.canUseHelpSidePanel}); const [isModalCenteredVisible = false] = useOnyx(ONYXKEYS.MODAL, { selector: (modal) => modal?.type === CONST.MODAL.MODAL_TYPE.CENTERED_SWIPABLE_TO_RIGHT || @@ -37,14 +35,14 @@ function useSidePanelDisplayStatus() { // - NVP is not set or it is false // - language is unsupported // - modal centered is visible - const shouldHideSidePanel = !isSidePanelVisible || isLanguageUnsupported || isModalCenteredVisible || !canUseHelpSidePanel; - const isSidePanelHiddenOrLargeScreen = !isSidePanelVisible || isLanguageUnsupported || isExtraLargeScreenWidth || !canUseHelpSidePanel; + const shouldHideSidePanel = !isSidePanelVisible || isLanguageUnsupported || isModalCenteredVisible || !sidePanelNVP; + const isSidePanelHiddenOrLargeScreen = !isSidePanelVisible || isLanguageUnsupported || isExtraLargeScreenWidth || !sidePanelNVP; // The help button is hidden when: - // - the user is not part of the corresponding beta + // - side pane nvp is not set // - Side Panel is displayed currently // - language is unsupported - const shouldHideHelpButton = !canUseHelpSidePanel || !shouldHideSidePanel || isLanguageUnsupported; + const shouldHideHelpButton = !sidePanelNVP || !shouldHideSidePanel || isLanguageUnsupported; const shouldHideSidePanelBackdrop = shouldHideSidePanel || isExtraLargeScreenWidth || shouldUseNarrowLayout; return { diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index d8bafd610963..8698ed2c7e17 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -50,10 +50,6 @@ function canUseTableReportView(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.TABLE_REPORT_VIEW) || canUseAllBetas(betas); } -function canUseHelpSidePanel(betas: OnyxEntry): boolean { - return !!betas?.includes(CONST.BETAS.HELP_SIDE_PANEL) || canUseAllBetas(betas); -} - function canUseTalkToAISales(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.NEW_DOT_TALK_TO_AI_SALES) || canUseAllBetas(betas); } @@ -81,7 +77,6 @@ export default { canUseManagerMcTest, canUseCustomRules, canUseTableReportView, - canUseHelpSidePanel, canUseTalkToAISales, canUseProhibitedExpenses, canUseLeftHandBar,