feat: use Navbar new component

decentraland · Jan 17, 2024 · 132d140 · 132d140
1 parent fa169d8
commit 132d140
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 125 deletions.
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -20,9 +20,8 @@
     "dcl-catalyst-commons": "^9.0.1",
     "decentraland-connect": "^5.2.4",
     "decentraland-crypto-fetch": "^1.0.3",
-    "decentraland-dapps": "^16.34.2",
+    "decentraland-dapps": "^17.0.0",
     "decentraland-transactions": "^1.50.0",
-    "decentraland-ui": "^4.35.3",
     "dotenv": "^10.0.0",
     "ethers": "^5.6.8",
     "graphql": "^14.7.0",

diff --git a/webapp/src/components/Navbar/Navbar.container.ts b/webapp/src/components/Navbar/Navbar.container.ts
@@ -6,20 +6,19 @@ import { RootState } from '../../modules/reducer'
 import { getTransactions } from '../../modules/transaction/selectors'
 import {
   getIsAuthDappEnabled,
-  getIsNavbarV2Enabled
 } from '../../modules/features/selectors'
 import { MapStateProps, MapDispatch, MapDispatchProps } from './Navbar.types'
 import Navbar from './Navbar'
 import { getCurrentIdentity } from '../../modules/identity/selectors'
+import { TransactionStatus } from 'decentraland-dapps/dist/modules/transaction/types'
 
 const mapState = (state: RootState): MapStateProps => ({
   location: getLocation(state),
-  hasPendingTransactions: getTransactions(state).some(tx =>
+  hasPendingTransactions: getTransactions(state).some((tx: { status: TransactionStatus | null }) =>
     isPending(tx.status)
   ),
   identity: getCurrentIdentity(state) || undefined,
   isAuthDappEnabled: getIsAuthDappEnabled(state),
-  isNavbarV2Enabled: getIsNavbarV2Enabled(state)
 })
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({

diff --git a/webapp/src/components/Navbar/Navbar.tsx b/webapp/src/components/Navbar/Navbar.tsx
@@ -1,15 +1,13 @@
 import React, { useCallback } from 'react'
 import { Navbar as BaseNavbar } from 'decentraland-dapps/dist/containers'
-import { Navbar2 as BaseNavbar2 } from 'decentraland-dapps/dist/containers'
-import { Navbar2Pages } from 'decentraland-ui/dist/components/Navbar2/Navbar2.types'
+import { NavbarPages } from 'decentraland-ui/dist/components/Navbar/Navbar.types'
 import { config } from '../../config'
 import { locations } from '../../modules/routing/locations'
-import UserInformation from '../UserInformation'
 import { Props } from './Navbar.types'
 import './Navbar.css'
 
 const Navbar = (props: Props) => {
-  const { location, onNavigate, isAuthDappEnabled, isNavbarV2Enabled } = props
+  const { location, onNavigate, isAuthDappEnabled } = props
   const { pathname, search } = location
 
   const handleOnSignIn = useCallback(() => {
@@ -36,29 +34,16 @@ const Navbar = (props: Props) => {
     onNavigate(locations.settings())
   }, [onNavigate])
 
-  return isNavbarV2Enabled ? (
-    <BaseNavbar2
+  return (
+    <BaseNavbar
       {...props}
       withNotifications
-      activePage={Navbar2Pages.MARKETPLACE}
+      activePage={NavbarPages.MARKETPLACE}
       hasActivity={props.hasPendingTransactions}
       identity={props.identity}
       onSignIn={handleOnSignIn}
       onClickAccountSettings={handleOnClickAccount}
     />
-  ) : (
-    <BaseNavbar
-      {...props}
-      withNotifications
-      activePage="marketplace"
-      isFullscreen={props.isFullscreen}
-      isSignIn={pathname === locations.signIn()}
-      onSignIn={handleOnSignIn}
-      onClickAccount={handleOnClickAccount}
-      rightMenu={
-        <UserInformation identity={props.identity} withNotifications />
-      }
-    />
   )
 }
 

diff --git a/webapp/src/components/Navbar/Navbar.types.ts b/webapp/src/components/Navbar/Navbar.types.ts
@@ -1,6 +1,6 @@
 import { Dispatch } from 'redux'
 import { CallHistoryMethodAction, RouterLocation } from 'connected-react-router'
-import { NavbarProps } from 'decentraland-ui'
+import { NavbarProps } from 'decentraland-ui/dist/components/Navbar/Navbar.types'
 import { AuthIdentity } from '@dcl/crypto'
 
 export type Props = Partial<NavbarProps> & {
@@ -10,7 +10,6 @@ export type Props = Partial<NavbarProps> & {
   onNavigate: (path: string) => void
   identity?: AuthIdentity
   isAuthDappEnabled: boolean
-  isNavbarV2Enabled: boolean
 }
 
 export type OwnProps = Pick<Props, 'enablePartialSupportAlert'>
@@ -21,7 +20,6 @@ export type MapStateProps = Pick<
   | 'hasPendingTransactions'
   | 'identity'
   | 'isAuthDappEnabled'
-  | 'isNavbarV2Enabled'
 >
 export type MapDispatchProps = Pick<Props, 'onNavigate'>
 export type MapDispatch = Dispatch<CallHistoryMethodAction>
diff --git a/webapp/src/modules/features/selectors.spec.ts b/webapp/src/modules/features/selectors.spec.ts
@@ -26,7 +26,6 @@ import {
   isLoadingFeatureFlags,
   getIsBuyCrossChainEnabled,
   getIsAuthDappEnabled,
-  getIsNavbarV2Enabled
 } from './selectors'
 import { FeatureName } from './types'
 
@@ -224,12 +223,6 @@ const waitForInitialLoadingSelectors = [
     selector: getIsAuthDappEnabled,
     applicationName: ApplicationName.DAPPS
   },
-  {
-    name: 'navbar-v2',
-    feature: FeatureName.NAVBAR_V2,
-    selector: getIsNavbarV2Enabled,
-    applicationName: ApplicationName.DAPPS
-  }
 ]
 
 waitForInitialLoadingSelectors.forEach(

diff --git a/webapp/src/modules/features/selectors.ts b/webapp/src/modules/features/selectors.ts
@@ -228,14 +228,3 @@ export const getIsAuthDappEnabled = (state: RootState) => {
   }
   return false
 }
-
-export const getIsNavbarV2Enabled = (state: RootState) => {
-  if (hasLoadedInitialFlags(state)) {
-    return getIsFeatureEnabled(
-      state,
-      ApplicationName.DAPPS,
-      FeatureName.NAVBAR_V2
-    )
-  }
-  return false
-}
diff --git a/webapp/src/modules/features/types.ts b/webapp/src/modules/features/types.ts
@@ -20,5 +20,4 @@ export enum FeatureName {
   MARKETPLACE_SERVER = 'marketplace-server',
   BUY_CROSS_CHAIN = 'buy-cross-chain',
   AUTH_DAPP = 'auth-dapp',
-  NAVBAR_V2 = 'navbar2_variant'
 }