From 804d0c8405b1d642f9bb94081f38246a52083f23 Mon Sep 17 00:00:00 2001
From: Lautaro Petaccio <1120791+LautaroPetaccio@users.noreply.github.com>
Date: Mon, 4 Mar 2024 14:29:11 -0300
Subject: [PATCH] fix: Remove has new navbar ff (#3053)

* fix: Remove has new navbar enabled FF

* fix: Remove features from enum type
---
 src/components/Navbar/Navbar.container.ts | 4 +---
 src/components/Navbar/Navbar.types.ts     | 4 ++--
 src/modules/features/selectors.ts         | 8 --------
 src/modules/features/types.ts             | 7 -------
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/components/Navbar/Navbar.container.ts b/src/components/Navbar/Navbar.container.ts
index a6ca53ea4..02597db9f 100644
--- a/src/components/Navbar/Navbar.container.ts
+++ b/src/components/Navbar/Navbar.container.ts
@@ -3,7 +3,6 @@ import { push } from 'connected-react-router'
 import { isPending } from 'decentraland-dapps/dist/modules/transaction/utils'
 import { isLoggedIn } from 'modules/identity/selectors'
 import { RootState } from 'modules/common/types'
-import { getIsNewNavbarDropdownEnabled } from 'modules/features/selectors'
 import { getTransactions } from 'modules/transaction/selectors'
 import { locations } from 'routing/locations'
 import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './Navbar.types'
@@ -11,8 +10,7 @@ import Navbar from './Navbar'
 
 const mapState = (state: RootState): MapStateProps => ({
   hasPendingTransactions: getTransactions(state).some(tx => isPending(tx.status)),
-  isSignedIn: isLoggedIn(state),
-  isNewNavbarEnabled: getIsNewNavbarDropdownEnabled(state)
+  isSignedIn: isLoggedIn(state)
 })
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
diff --git a/src/components/Navbar/Navbar.types.ts b/src/components/Navbar/Navbar.types.ts
index b11fdb54c..1be3c88b4 100644
--- a/src/components/Navbar/Navbar.types.ts
+++ b/src/components/Navbar/Navbar.types.ts
@@ -1,9 +1,9 @@
 import { NavbarProps } from 'decentraland-dapps/dist/containers/Navbar/Navbar.types'
 import { Dispatch } from 'redux'
 
-export type Props = Partial<NavbarProps> & { isNewNavbarEnabled: boolean; hasPendingTransactions: boolean }
+export type Props = Partial<NavbarProps> & { hasPendingTransactions: boolean }
 
-export type MapStateProps = Pick<Props, 'hasPendingTransactions' | 'isSignedIn' | 'isNewNavbarEnabled'>
+export type MapStateProps = Pick<Props, 'hasPendingTransactions' | 'isSignedIn'>
 export type MapDispatchProps = Pick<Props, 'onSignIn'>
 export type MapDispatch = Dispatch
 export type OwnProps = Partial<Props>
diff --git a/src/modules/features/selectors.ts b/src/modules/features/selectors.ts
index 518a7e766..cfa2cd61d 100644
--- a/src/modules/features/selectors.ts
+++ b/src/modules/features/selectors.ts
@@ -22,14 +22,6 @@ export const getIsCampaignEnabled = (state: RootState) => {
   }
 }
 
-export const getIsNewNavbarDropdownEnabled = (state: RootState) => {
-  try {
-    return getIsFeatureEnabled(state, ApplicationName.BUILDER, FeatureName.NEW_NAVBAR_DROPDOWN)
-  } catch (e) {
-    return false
-  }
-}
-
 export const getIsSDK7TemplatesEnabled = (state: RootState) => {
   try {
     return getIsFeatureEnabled(state, ApplicationName.BUILDER, FeatureName.SDK7_TEMPLATES)
diff --git a/src/modules/features/types.ts b/src/modules/features/types.ts
index 37fecf034..87e16f7a0 100644
--- a/src/modules/features/types.ts
+++ b/src/modules/features/types.ts
@@ -1,14 +1,7 @@
 export enum FeatureName {
   MAINTENANCE = 'maintenance',
-  RENTALS = 'rentals',
   CAMPAIGN = 'campaign',
-  DCL_CONTROLLER_V2 = 'dcl-controller-v2',
-  NEW_NAVBAR_DROPDOWN = 'new-navbar-dropdown',
-  EMOTES_V2 = 'emotes-2.0',
-  SMART_ITEMS = 'smart-items',
-  WORLDS_FOR_ENS_OWNERS = 'worlds-for-ens-owners',
   SDK7_TEMPLATES = 'sdk7-templates',
   CREATE_SCENE_ONLY_SDK7 = 'create-scene-only-sdk7',
-  AUTH_DAPP = 'auth-dapp',
   ENS_ADDRESS = 'ens-address'
 }