Merge branch 'master' into fix/remove-ens-resolver-ffs

src/components/Navbar/Navbar.container.ts

@@ -3,16 +3,14 @@ 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'
 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 => ({

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>

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)

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'
 }