diff --git a/package-lock.json b/package-lock.json index 305cde010..2ff856efe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,11 +42,11 @@ "decentraland": "^3.3.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", + "decentraland-ui": "^5.2.0", "ethers": "^5.6.8", "file-saver": "^2.0.1", "graphql": "^15.8.0", @@ -2502,9 +2502,9 @@ } }, "node_modules/@dcl/schemas": { - "version": "9.10.0", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.10.0.tgz", - "integrity": "sha512-rpKa+2dAlz56+g/QSKbVaIDQFm1gF9YkZ4UWGwHkAYpcHW6ss1Fk2fBiAW3ONDIvUh6V8Arl6Iitcn3GzOmFzg==", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.12.0.tgz", + "integrity": "sha512-CQjajLNZZCHdL8+c0wujbQ1DEmg4WBfwtQTAHgWEQenujQv4FLaEwFeZ5HOlBU6g7K0OU0qfotl8ArbtiTpfgw==", "dependencies": { "ajv": "^8.11.0", "ajv-errors": "^3.0.0", @@ -12444,9 +12444,9 @@ } }, "node_modules/decentraland-dapps": { - "version": "16.34.2", - "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.34.2.tgz", - "integrity": "sha512-Ik7s8s3joN6kAIT26CX2R836Pv8zyyS1P+eviGHb60ueOr4T51v7s/A6O3mGns6FQ2vcrg3eMymNJKwbhEVhsQ==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-17.0.0.tgz", + "integrity": "sha512-tHy/KzBVMmARUqFqIT8B7bvd9ahPaobUNgQ+8WelfBqhmAFOxvtr4fPDjCQxm6uksPNUhGBZsmbRaFofjjQJhQ==", "dependencies": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", @@ -12462,7 +12462,7 @@ "decentraland-connect": "^5.5.0", "decentraland-crypto-fetch": "^2.0.1", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.35.5", + "decentraland-ui": "^5.0.0", "ethers": "^5.6.8", "events": "^3.3.0", "flat": "^5.0.2", @@ -12760,11 +12760,11 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "node_modules/decentraland-ui": { - "version": "4.35.5", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.35.5.tgz", - "integrity": "sha512-HgflsY3+xym/y99ast2txbdhBCdZQGLeC2YfyqGKKrR+JanLQDiWG6ugAnSbXFd/CuY01TnGNgAFs+8L6qVolA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-5.2.0.tgz", + "integrity": "sha512-sj6fsQldXjJ35OHG4acxHzSp8NUyNCFTjMqBfAS8jCqtPhnsTPfPLsZj8A3aBTdbaoh4Nndx0qvNVnS3uAvoRA==", "dependencies": { - "@dcl/schemas": "^9.10.0", + "@dcl/schemas": "^9.12.0", "@dcl/ui-env": "^1.4.0", "balloon-css": "^0.5.0", "classnames": "^2.3.2", @@ -26007,12 +26007,12 @@ } }, "node_modules/react-virtualized-auto-sizer": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.20.tgz", - "integrity": "sha512-OdIyHwj4S4wyhbKHOKM1wLSj/UDXm839Z3Cvfg2a9j+He6yDa6i5p0qQvEiCnyQlGO/HyfSnigQwuxvYalaAXA==", + "version": "1.0.21", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.21.tgz", + "integrity": "sha512-RedZxj452+ITLfqIrR02BjvCaXV63YVIcVrvmruDZXFpJGazg4gHNs1AShPGVLvEuLGZdZ9AtkGKhWvzEujL8g==", "peerDependencies": { - "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc", - "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc" + "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0", + "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0" } }, "node_modules/read-pkg": { @@ -26121,9 +26121,9 @@ } }, "node_modules/recharts": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.10.3.tgz", - "integrity": "sha512-G4J96fKTZdfFQd6aQnZjo2nVNdXhp+uuLb00+cBTGLo85pChvm1+E67K3wBOHDE/77spcYb2Cy9gYWVqiZvQCg==", + "version": "2.10.4", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.10.4.tgz", + "integrity": "sha512-/Q7/wdf8bW91lN3NEeCjL9RWfaiXQViJFgdnas4Eix/I8B9HAI3tHHK/CW/zDfgRMh4fzW1zlfjoz1IAapLO1Q==", "dependencies": { "clsx": "^2.0.0", "eventemitter3": "^4.0.1", @@ -26152,9 +26152,9 @@ } }, "node_modules/recharts/node_modules/clsx": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", - "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", + "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==", "engines": { "node": ">=6" } @@ -30853,9 +30853,9 @@ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" }, "node_modules/victory-vendor": { - "version": "36.7.0", - "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.7.0.tgz", - "integrity": "sha512-nqYuTkLSdTTeACyXcCLbL7rl0y6jpzLPtTNGOtSnajdR+xxMxBdjMxDjfNJNlhR+ZU8vbXz+QejntcbY7h9/ZA==", + "version": "36.8.2", + "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.8.2.tgz", + "integrity": "sha512-NfSQi7ISCdBbDpn3b6rg+8RpFZmWIM9mcks48BbogHE2F6h1XKdA34oiCKP5hP1OGvTotDRzsexiJKzrK4Exuw==", "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-ease": "^3.0.0", @@ -35012,9 +35012,9 @@ } }, "@dcl/schemas": { - "version": "9.10.0", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.10.0.tgz", - "integrity": "sha512-rpKa+2dAlz56+g/QSKbVaIDQFm1gF9YkZ4UWGwHkAYpcHW6ss1Fk2fBiAW3ONDIvUh6V8Arl6Iitcn3GzOmFzg==", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.12.0.tgz", + "integrity": "sha512-CQjajLNZZCHdL8+c0wujbQ1DEmg4WBfwtQTAHgWEQenujQv4FLaEwFeZ5HOlBU6g7K0OU0qfotl8ArbtiTpfgw==", "requires": { "ajv": "^8.11.0", "ajv-errors": "^3.0.0", @@ -42691,9 +42691,9 @@ } }, "decentraland-dapps": { - "version": "16.34.2", - "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.34.2.tgz", - "integrity": "sha512-Ik7s8s3joN6kAIT26CX2R836Pv8zyyS1P+eviGHb60ueOr4T51v7s/A6O3mGns6FQ2vcrg3eMymNJKwbhEVhsQ==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-17.0.0.tgz", + "integrity": "sha512-tHy/KzBVMmARUqFqIT8B7bvd9ahPaobUNgQ+8WelfBqhmAFOxvtr4fPDjCQxm6uksPNUhGBZsmbRaFofjjQJhQ==", "requires": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", @@ -42709,7 +42709,7 @@ "decentraland-connect": "^5.5.0", "decentraland-crypto-fetch": "^2.0.1", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.35.5", + "decentraland-ui": "^5.0.0", "ethers": "^5.6.8", "events": "^3.3.0", "flat": "^5.0.2", @@ -42930,11 +42930,11 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "decentraland-ui": { - "version": "4.35.5", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.35.5.tgz", - "integrity": "sha512-HgflsY3+xym/y99ast2txbdhBCdZQGLeC2YfyqGKKrR+JanLQDiWG6ugAnSbXFd/CuY01TnGNgAFs+8L6qVolA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-5.2.0.tgz", + "integrity": "sha512-sj6fsQldXjJ35OHG4acxHzSp8NUyNCFTjMqBfAS8jCqtPhnsTPfPLsZj8A3aBTdbaoh4Nndx0qvNVnS3uAvoRA==", "requires": { - "@dcl/schemas": "^9.10.0", + "@dcl/schemas": "^9.12.0", "@dcl/ui-env": "^1.4.0", "balloon-css": "^0.5.0", "classnames": "^2.3.2", @@ -53453,9 +53453,9 @@ } }, "react-virtualized-auto-sizer": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.20.tgz", - "integrity": "sha512-OdIyHwj4S4wyhbKHOKM1wLSj/UDXm839Z3Cvfg2a9j+He6yDa6i5p0qQvEiCnyQlGO/HyfSnigQwuxvYalaAXA==", + "version": "1.0.21", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.21.tgz", + "integrity": "sha512-RedZxj452+ITLfqIrR02BjvCaXV63YVIcVrvmruDZXFpJGazg4gHNs1AShPGVLvEuLGZdZ9AtkGKhWvzEujL8g==", "requires": {} }, "read-pkg": { @@ -53543,9 +53543,9 @@ "integrity": "sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==" }, "recharts": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.10.3.tgz", - "integrity": "sha512-G4J96fKTZdfFQd6aQnZjo2nVNdXhp+uuLb00+cBTGLo85pChvm1+E67K3wBOHDE/77spcYb2Cy9gYWVqiZvQCg==", + "version": "2.10.4", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.10.4.tgz", + "integrity": "sha512-/Q7/wdf8bW91lN3NEeCjL9RWfaiXQViJFgdnas4Eix/I8B9HAI3tHHK/CW/zDfgRMh4fzW1zlfjoz1IAapLO1Q==", "requires": { "clsx": "^2.0.0", "eventemitter3": "^4.0.1", @@ -53558,9 +53558,9 @@ }, "dependencies": { "clsx": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", - "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", + "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==" }, "react-is": { "version": "16.13.1", @@ -57337,9 +57337,9 @@ } }, "victory-vendor": { - "version": "36.7.0", - "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.7.0.tgz", - "integrity": "sha512-nqYuTkLSdTTeACyXcCLbL7rl0y6jpzLPtTNGOtSnajdR+xxMxBdjMxDjfNJNlhR+ZU8vbXz+QejntcbY7h9/ZA==", + "version": "36.8.2", + "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.8.2.tgz", + "integrity": "sha512-NfSQi7ISCdBbDpn3b6rg+8RpFZmWIM9mcks48BbogHE2F6h1XKdA34oiCKP5hP1OGvTotDRzsexiJKzrK4Exuw==", "requires": { "@types/d3-array": "^3.0.3", "@types/d3-ease": "^3.0.0", diff --git a/package.json b/package.json index e2d780dba..891fd5c64 100644 --- a/package.json +++ b/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", diff --git a/src/components/ActivityPage/ActivityPage.tsx b/src/components/ActivityPage/ActivityPage.tsx index 04240661b..7c78478f0 100644 --- a/src/components/ActivityPage/ActivityPage.tsx +++ b/src/components/ActivityPage/ActivityPage.tsx @@ -54,7 +54,7 @@ const ActivityPage = (props: Props) => { return ( <> - + {content} diff --git a/src/components/ErrorPage/ErrorPage.tsx b/src/components/ErrorPage/ErrorPage.tsx index d47e55eca..3c18dc57c 100644 --- a/src/components/ErrorPage/ErrorPage.tsx +++ b/src/components/ErrorPage/ErrorPage.tsx @@ -38,7 +38,7 @@ export default class ErrorPage extends React.PureComponent { const { stackTrace } = this.props return ( <> - +

{t('error_page.title')}

diff --git a/src/components/HomePage/HomePage.tsx b/src/components/HomePage/HomePage.tsx index 4fadcb21f..3cc599cd4 100644 --- a/src/components/HomePage/HomePage.tsx +++ b/src/components/HomePage/HomePage.tsx @@ -70,7 +70,7 @@ export const HomePage: React.FC = props => { return ( <> - + diff --git a/src/components/LandProviderPage/LandProviderPage.tsx b/src/components/LandProviderPage/LandProviderPage.tsx index 07f385705..5723c7b3f 100644 --- a/src/components/LandProviderPage/LandProviderPage.tsx +++ b/src/components/LandProviderPage/LandProviderPage.tsx @@ -28,7 +28,7 @@ export default class LandProviderPage extends React.PureComponent { } return ( <> - + {(id, land, isLoading, { deployments, rental }) => ( diff --git a/src/components/LoadingPage/LoadingPage.tsx b/src/components/LoadingPage/LoadingPage.tsx index 9a041bc35..f2779e423 100644 --- a/src/components/LoadingPage/LoadingPage.tsx +++ b/src/components/LoadingPage/LoadingPage.tsx @@ -10,7 +10,7 @@ export default class LoadingPage extends React.PureComponent { return ( <> {/* */} - + diff --git a/src/components/LoggedInDetailPage/LoggedInDetailPage.tsx b/src/components/LoggedInDetailPage/LoggedInDetailPage.tsx index fcd98a7e7..f13a151a5 100644 --- a/src/components/LoggedInDetailPage/LoggedInDetailPage.tsx +++ b/src/components/LoggedInDetailPage/LoggedInDetailPage.tsx @@ -55,7 +55,7 @@ export default class LoggedInDetailPage extends React.PureComponent { return ( <> - + {hasNavigation ? : null} {isLoading ? this.renderLoading() : null} diff --git a/src/components/MobilePage/MobilePage.tsx b/src/components/MobilePage/MobilePage.tsx index 2f8609061..000c1b2b9 100644 --- a/src/components/MobilePage/MobilePage.tsx +++ b/src/components/MobilePage/MobilePage.tsx @@ -19,7 +19,7 @@ export default class MobilePage extends React.PureComponent { render() { return ( <> - +
diff --git a/src/components/Navbar/Navbar.container.ts b/src/components/Navbar/Navbar.container.ts index d09504c3b..a6ca53ea4 100644 --- a/src/components/Navbar/Navbar.container.ts +++ b/src/components/Navbar/Navbar.container.ts @@ -3,7 +3,7 @@ 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' @@ -11,9 +11,8 @@ 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 => ({ diff --git a/src/components/Navbar/Navbar.css b/src/components/Navbar/Navbar.css index 7c464657d..895b0df1d 100644 --- a/src/components/Navbar/Navbar.css +++ b/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%; } diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx index d5ce0b7ea..e2dcb0594 100644 --- a/src/components/Navbar/Navbar.tsx +++ b/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 = ({ hasPendingTransactions, isNavbarV2Enabled, ...props }: Props) => { - return isNavbarV2Enabled ? ( - - ) : ( - } /> - ) +const Navbar: React.FC = ({ hasPendingTransactions, ...props }: Props) => { + return } export default React.memo(Navbar) diff --git a/src/components/Navbar/Navbar.types.ts b/src/components/Navbar/Navbar.types.ts index 09d380831..b11fdb54c 100644 --- a/src/components/Navbar/Navbar.types.ts +++ b/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 & { isNewNavbarEnabled: boolean; isNavbarV2Enabled: boolean; hasPendingTransactions: boolean } +export type Props = Partial & { isNewNavbarEnabled: boolean; hasPendingTransactions: boolean } -export type MapStateProps = Pick +export type MapStateProps = Pick export type MapDispatchProps = Pick export type MapDispatch = Dispatch export type OwnProps = Partial diff --git a/src/components/NotFoundPage/NotFoundPage.tsx b/src/components/NotFoundPage/NotFoundPage.tsx index 9d55152be..5c5f9b309 100644 --- a/src/components/NotFoundPage/NotFoundPage.tsx +++ b/src/components/NotFoundPage/NotFoundPage.tsx @@ -30,7 +30,7 @@ export default function NotFoundPage(props: Props) { return (
- +

{t('not_found_page.title')}

diff --git a/src/components/SceneDetailPage/SceneDetailPage.tsx b/src/components/SceneDetailPage/SceneDetailPage.tsx index efd14ac28..6f81317b1 100644 --- a/src/components/SceneDetailPage/SceneDetailPage.tsx +++ b/src/components/SceneDetailPage/SceneDetailPage.tsx @@ -159,7 +159,7 @@ const SceneDetailPage: React.FC = props => { return ( <> - + {isLoading && !project ? renderLoading() : null} {!isLoading && !project ? renderNotFound() : null} diff --git a/src/components/SceneListPage/SceneListPage.tsx b/src/components/SceneListPage/SceneListPage.tsx index a81a8717c..a440e60ce 100644 --- a/src/components/SceneListPage/SceneListPage.tsx +++ b/src/components/SceneListPage/SceneListPage.tsx @@ -114,7 +114,7 @@ export default class SceneListPage extends React.PureComponent { return ( <> - +
diff --git a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.container.ts b/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.container.ts deleted file mode 100644 index b95f88a57..000000000 --- a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.container.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { connect } from 'react-redux' -import { push } from 'connected-react-router' - -import { locations } from 'routing/locations' -import { RootState } from 'modules/common/types' -import { isLoggedIn } from 'modules/identity/selectors' -import { MapStateProps, MapDispatch, MapDispatchProps } from './SceneViewMenu.types' -import SceneViewMenu from './SceneViewMenu' - -const mapState = (state: RootState): MapStateProps => ({ - isLoggedIn: isLoggedIn(state) -}) - -const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({ - onTryItOut: () => dispatch(push(locations.root())) -}) - -export default connect(mapState, mapDispatch)(SceneViewMenu) diff --git a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.css b/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.css deleted file mode 100644 index ae677b2af..000000000 --- a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.css +++ /dev/null @@ -1,10 +0,0 @@ -.SceneViewMenu .made-with { - margin: 1em; -} - -.SceneViewMenu .ui.button { - font-size: 12px; - line-height: 18px; - padding: 9px 14px; - min-width: 0; -} diff --git a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.tsx b/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.tsx deleted file mode 100644 index 1a926e520..000000000 --- a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import * as React from 'react' -import { Button, Responsive } from 'decentraland-ui' - -import { t } from 'decentraland-dapps/dist/modules/translation/utils' -import UserInformation from 'components/UserInformation' -import { Props } from './SceneViewMenu.types' - -import './SceneViewMenu.css' - -export default class SceneViewMenu extends React.PureComponent { - handleTryItOut = () => { - this.props.onTryItOut() - } - - render() { - const { isLoggedIn } = this.props - - if (isLoggedIn) { - return - } - - return ( -
- - {t('public_page.made_with')} - - -
- ) - } -} diff --git a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.types.ts b/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.types.ts deleted file mode 100644 index d27c79639..000000000 --- a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.types.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Dispatch } from 'redux' - -export type Props = { - isLoggedIn: boolean - onTryItOut: () => void -} - -export type MapStateProps = Pick -export type MapDispatchProps = Pick -export type MapDispatch = Dispatch diff --git a/src/components/SceneViewPage/SceneViewMenu/index.ts b/src/components/SceneViewPage/SceneViewMenu/index.ts deleted file mode 100644 index bc0560d2e..000000000 --- a/src/components/SceneViewPage/SceneViewMenu/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import SceneViewMenu from './SceneViewMenu.container' - -export default SceneViewMenu diff --git a/src/components/SceneViewPage/SceneViewPage.tsx b/src/components/SceneViewPage/SceneViewPage.tsx index a8fe1b7f0..279c1aa25 100644 --- a/src/components/SceneViewPage/SceneViewPage.tsx +++ b/src/components/SceneViewPage/SceneViewPage.tsx @@ -123,7 +123,7 @@ export default class SceneViewPage extends React.PureComponent { renderLoading() { return ( <> - + @@ -173,7 +173,7 @@ export default class SceneViewPage extends React.PureComponent { <> {!isPreviewing && ( <> - +