Merge branch 'master' of github.com:decentraland/builder into fix/rem…

…ove-feature-flags

package.json

@@ -34,13 +34,13 @@
     "dcl-catalyst-client": "^21.5.5",
     "dcl-scene-writer": "^1.1.2",
     "decentraland": "^3.3.0",
+    "decentraland-ui": "^5.2.0",
     "decentraland-builder-scripts": "^0.24.0",
     "decentraland-crypto-fetch": "^2.0.1",
-    "decentraland-dapps": "^16.34.2",
+    "decentraland-dapps": "^17.0.0",
     "decentraland-ecs": "^6.6.1-20201020183014.commit-bdc29ef-hotfix",
     "decentraland-experiments": "^1.0.2",
     "decentraland-transactions": "^1.47.0",
-    "decentraland-ui": "^4.35.3",
     "ethers": "^5.6.8",
     "file-saver": "^2.0.1",
     "graphql": "^15.8.0",

src/components/ActivityPage/ActivityPage.tsx

@@ -54,7 +54,7 @@ const ActivityPage = (props: Props) => {
 
   return (
     <>
-      <Navbar isFullscreen />
+      <Navbar />
       <Navigation />
       <Page className="ActivityPage">{content}</Page>
       <Modal size="tiny" open={showConfirmation}>

src/components/ErrorPage/ErrorPage.tsx

@@ -38,7 +38,7 @@ export default class ErrorPage extends React.PureComponent<Props> {
     const { stackTrace } = this.props
     return (
       <>
-        <Navbar isFullscreen />
+        <Navbar />
         <Page isFullscreen>
           <div className="ErrorPage">
             <h1 className="title">{t('error_page.title')}</h1>

src/components/HomePage/HomePage.tsx

@@ -70,7 +70,7 @@ export const HomePage: React.FC<Props> = props => {
 
   return (
     <>
-      <Navbar isFullscreen />
+      <Navbar />
       <Page isFullscreen className="HomePage">
         <Navigation activeTab={NavigationTab.OVERVIEW}>
           <SyncToast />

src/components/LandProviderPage/LandProviderPage.tsx

@@ -28,7 +28,7 @@ export default class LandProviderPage extends React.PureComponent<Props> {
     }
     return (
       <>
-        <Navbar isFullscreen />
+        <Navbar />
         <Page className={classes.join(' ')}>
           <LandProvider>
             {(id, land, isLoading, { deployments, rental }) => (

src/components/LoadingPage/LoadingPage.tsx

@@ -10,7 +10,7 @@ export default class LoadingPage extends React.PureComponent {
     return (
       <>
         {/* <Ad slot="BUILDER_TOP_BANNER" type="full" /> */}
-        <Navbar isFullscreen />
+        <Navbar />
         <Page isFullscreen>
           <Loader active size="huge" />
         </Page>

src/components/LoggedInDetailPage/LoggedInDetailPage.tsx

@@ -55,7 +55,7 @@ export default class LoggedInDetailPage extends React.PureComponent<Props> {
 
     return (
       <>
-        <Navbar isFullscreen />
+        <Navbar />
         {hasNavigation ? <Navigation activeTab={activeTab} isFullscreen={isNavigationFullscreen} /> : null}
         <Page className={classNames('LoggedInDetailPage', className)} isFullscreen={isPageFullscreen}>
           {isLoading ? this.renderLoading() : null}

src/components/MobilePage/MobilePage.tsx

@@ -19,7 +19,7 @@ export default class MobilePage extends React.PureComponent<Props, State> {
   render() {
     return (
       <>
-        <Navbar isFullscreen isOverlay />
+        <Navbar />
         <Page isFullscreen className="MobilePage">
           <Container>
             <div className="slot-image" />

src/components/Navbar/Navbar.container.ts

@@ -3,17 +3,16 @@ 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 { getIsNavbarV2Enabled, getIsNewNavbarDropdownEnabled } from 'modules/features/selectors'
+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)),
-  isConnected: isLoggedIn(state),
-  isNewNavbarEnabled: getIsNewNavbarDropdownEnabled(state),
-  isNavbarV2Enabled: getIsNavbarV2Enabled(state)
+  isSignedIn: isLoggedIn(state),
+  isNewNavbarEnabled: getIsNewNavbarDropdownEnabled(state)
 })
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({

src/components/Navbar/Navbar.css

@@ -1,3 +1,3 @@
-.dui-navbar2 > .dui-submenu-container:not(.unselected) > .item.submenu {
+.dui-navbar > .dui-submenu-container:not(.unselected) > .item.submenu {
   width: 100%;
 }

src/components/Navbar/Navbar.tsx

@@ -1,18 +1,12 @@
 import React from 'react'
-import { Navbar2 as BaseNavbar2 } from 'decentraland-dapps/dist/containers'
-import { Navbar as BaseNavbar } from 'decentraland-dapps/dist/containers'
-import { Navbar2Pages } from 'decentraland-ui/dist/components/Navbar2/Navbar2.types'
-import UserInformation from 'components/UserInformation'
+import { Navbar as BaseNavbar } from 'decentraland-dapps/dist/containers/'
+import { NavbarPages } from 'decentraland-ui/dist/components/Navbar/Navbar.types'
 import { Props } from './Navbar.types'
 
 import './Navbar.css'
 
-const Navbar: React.FC<Props> = ({ hasPendingTransactions, isNavbarV2Enabled, ...props }: Props) => {
-  return isNavbarV2Enabled ? (
-    <BaseNavbar2 activePage={Navbar2Pages.CREATE} {...props} hasActivity={hasPendingTransactions} />
-  ) : (
-    <BaseNavbar activePage="builder" {...props} rightMenu={<UserInformation />} />
-  )
+const Navbar: React.FC<Props> = ({ hasPendingTransactions, ...props }: Props) => {
+  return <BaseNavbar activePage={NavbarPages.CREATE} {...props} hasActivity={hasPendingTransactions} />
 }
 
 export default React.memo(Navbar)

src/components/Navbar/Navbar.types.ts

@@ -1,9 +1,9 @@
-import { NavbarProps } from 'decentraland-ui'
+import { NavbarProps } from 'decentraland-dapps/dist/containers/Navbar/Navbar.types'
 import { Dispatch } from 'redux'
 
-export type Props = Partial<NavbarProps> & { isNewNavbarEnabled: boolean; isNavbarV2Enabled: boolean; hasPendingTransactions: boolean }
+export type Props = Partial<NavbarProps> & { isNewNavbarEnabled: boolean; hasPendingTransactions: boolean }
 
-export type MapStateProps = Pick<Props, 'hasPendingTransactions' | 'isConnected' | 'isNewNavbarEnabled' | 'isNavbarV2Enabled'>
+export type MapStateProps = Pick<Props, 'hasPendingTransactions' | 'isSignedIn' | 'isNewNavbarEnabled'>
 export type MapDispatchProps = Pick<Props, 'onSignIn'>
 export type MapDispatch = Dispatch
 export type OwnProps = Partial<Props>

src/components/NotFoundPage/NotFoundPage.tsx

@@ -30,7 +30,7 @@ export default function NotFoundPage(props: Props) {
 
   return (
     <div className="notfound-body">
-      <Navbar isFullscreen />
+      <Navbar />
       <Page isFullscreen />
       <div className="NotFoundPage">
         <h1 className="title">{t('not_found_page.title')}</h1>

src/components/SceneDetailPage/SceneDetailPage.tsx

@@ -159,7 +159,7 @@ const SceneDetailPage: React.FC<Props> = props => {
 
   return (
     <>
-      <Navbar isFullscreen />
+      <Navbar />
       <Page className="SceneDetailPage" isFullscreen>
         {isLoading && !project ? renderLoading() : null}
         {!isLoading && !project ? renderNotFound() : null}

src/components/SceneListPage/SceneListPage.tsx

@@ -114,7 +114,7 @@ export default class SceneListPage extends React.PureComponent<Props> {
 
     return (
       <>
-        <Navbar isFullscreen />
+        <Navbar />
         <Page isFullscreen>
           <div className="SceneListPage">
             <Container>