diff --git a/package-lock.json b/package-lock.json index 66510f3a1..e82054aef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "decentraland": "^3.3.0", "decentraland-builder-scripts": "^0.24.0", "decentraland-crypto-fetch": "^2.0.1", - "decentraland-dapps": "^16.21.5", + "decentraland-dapps": "^16.27.0", "decentraland-ecs": "^6.6.1-20201020183014.commit-bdc29ef-hotfix", "decentraland-experiments": "^1.0.2", "decentraland-transactions": "^1.47.0", @@ -12599,9 +12599,9 @@ } }, "node_modules/decentraland-dapps": { - "version": "16.21.5", - "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.21.5.tgz", - "integrity": "sha512-HcM6sKuMje0Q2bwECCqAmMkvZxG/BKbzSVjH+OdYGSQ7Zaud6W2tgadliM0F6l15LaqCXuDyaD8FyrPtgvAbDw==", + "version": "16.27.0", + "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.27.0.tgz", + "integrity": "sha512-HXlo9A5Q0CxTzBuQGaMwKz+y2/7xkS1lpEkQSdyyy5ABlrF8QBgQBXC6iP510vzlEGHsLVkETXIc+qEjzNf1cw==", "dependencies": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", @@ -12617,7 +12617,7 @@ "decentraland-connect": "^5.2.4", "decentraland-crypto-fetch": "^2.0.1", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.31.0", + "decentraland-ui": "^4.33.2", "ethers": "^5.6.8", "events": "^3.3.0", "flat": "^5.0.2", @@ -12915,9 +12915,9 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "node_modules/decentraland-ui": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.31.0.tgz", - "integrity": "sha512-RHopGNBmsBCaFiVJ58WID1is0L0dnItN0Bc9QOsuvTK19O95TMP1W0I8enHh2dJ5O4nIcSEuCF/50nrcakoh5w==", + "version": "4.34.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.34.0.tgz", + "integrity": "sha512-o0g+4ZYZBIUDcN7EVfMjxg21M0CmTq1YJeF4o+snKjkcowvmnpgD0R8Yw3j5n/CiRGWGJFRgzbIP2owfo+u48Q==", "dependencies": { "@dcl/schemas": "^9.10.0", "@dcl/ui-env": "^1.4.0", @@ -43047,9 +43047,9 @@ } }, "decentraland-dapps": { - "version": "16.21.5", - "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.21.5.tgz", - "integrity": "sha512-HcM6sKuMje0Q2bwECCqAmMkvZxG/BKbzSVjH+OdYGSQ7Zaud6W2tgadliM0F6l15LaqCXuDyaD8FyrPtgvAbDw==", + "version": "16.27.0", + "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.27.0.tgz", + "integrity": "sha512-HXlo9A5Q0CxTzBuQGaMwKz+y2/7xkS1lpEkQSdyyy5ABlrF8QBgQBXC6iP510vzlEGHsLVkETXIc+qEjzNf1cw==", "requires": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", @@ -43065,7 +43065,7 @@ "decentraland-connect": "^5.2.4", "decentraland-crypto-fetch": "^2.0.1", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.31.0", + "decentraland-ui": "^4.33.2", "ethers": "^5.6.8", "events": "^3.3.0", "flat": "^5.0.2", @@ -43286,9 +43286,9 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "decentraland-ui": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.31.0.tgz", - "integrity": "sha512-RHopGNBmsBCaFiVJ58WID1is0L0dnItN0Bc9QOsuvTK19O95TMP1W0I8enHh2dJ5O4nIcSEuCF/50nrcakoh5w==", + "version": "4.34.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.34.0.tgz", + "integrity": "sha512-o0g+4ZYZBIUDcN7EVfMjxg21M0CmTq1YJeF4o+snKjkcowvmnpgD0R8Yw3j5n/CiRGWGJFRgzbIP2owfo+u48Q==", "requires": { "@dcl/schemas": "^9.10.0", "@dcl/ui-env": "^1.4.0", diff --git a/package.json b/package.json index 05b156d2b..fcabb23d3 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "decentraland": "^3.3.0", "decentraland-builder-scripts": "^0.24.0", "decentraland-crypto-fetch": "^2.0.1", - "decentraland-dapps": "^16.21.5", + "decentraland-dapps": "^16.27.0", "decentraland-ecs": "^6.6.1-20201020183014.commit-bdc29ef-hotfix", "decentraland-experiments": "^1.0.2", "decentraland-transactions": "^1.47.0", diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx index 535c1e39e..ac975ee2a 100644 --- a/src/components/Navbar/Navbar.tsx +++ b/src/components/Navbar/Navbar.tsx @@ -1,19 +1,10 @@ import * as React from 'react' import { Navbar as BaseNavbar } from 'decentraland-dapps/dist/containers' import UserInformation from 'components/UserInformation' -import UserMenu from 'components/UserMenu' import { Props } from './Navbar.types' export default class Navbar extends React.PureComponent { render() { - let props = this.props - - if (props.isConnected) { - props = { ...props, rightMenu: } - } - if (props.isNewNavbarEnabled) { - props = { ...props, rightMenu: } - } - return + return } /> } } diff --git a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.tsx b/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.tsx index f437be636..1a926e520 100644 --- a/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.tsx +++ b/src/components/SceneViewPage/SceneViewMenu/SceneViewMenu.tsx @@ -2,7 +2,7 @@ import * as React from 'react' import { Button, Responsive } from 'decentraland-ui' import { t } from 'decentraland-dapps/dist/modules/translation/utils' -import UserMenu from 'components/UserMenu' +import UserInformation from 'components/UserInformation' import { Props } from './SceneViewMenu.types' import './SceneViewMenu.css' @@ -16,7 +16,7 @@ export default class SceneViewMenu extends React.PureComponent { const { isLoggedIn } = this.props if (isLoggedIn) { - return + return } return ( diff --git a/src/components/UserMenu/UserMenu.container.ts b/src/components/UserMenu/UserMenu.container.ts deleted file mode 100644 index 65ceb086f..000000000 --- a/src/components/UserMenu/UserMenu.container.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { connect } from 'react-redux' -import { getLocation, push } from 'connected-react-router' -import { isPending } from 'decentraland-dapps/dist/modules/transaction/utils' -import { UserMenu } from 'decentraland-dapps/dist/containers' -import { isConnected, isConnecting } from 'decentraland-dapps/dist/modules/wallet/selectors' -import { getTransactions } from '../../modules/transaction/selectors' -import { RootState } from '../../modules/common/types' -import { logout } from '../../modules/identity/actions' -import { locations } from '../../routing/locations' -import { MapStateProps, MapDispatch, MapDispatchProps } from './UserMenu.types' - -const mapState = (state: RootState): MapStateProps => { - return { - isSignedIn: isConnected(state), - isSigningIn: isConnecting(state), - isActivity: getLocation(state).pathname === locations.activity(), - hasActivity: getTransactions(state).some(tx => isPending(tx.status)) - } -} - -const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({ - onClickActivity: () => dispatch(push(locations.activity())), - onClickSettings: () => dispatch(push(locations.settings())), - onSignOut: () => dispatch(logout()) -}) - -export default connect(mapState, mapDispatch)(UserMenu) diff --git a/src/components/UserMenu/UserMenu.types.ts b/src/components/UserMenu/UserMenu.types.ts deleted file mode 100644 index cec44256d..000000000 --- a/src/components/UserMenu/UserMenu.types.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Dispatch } from 'redux' -import { CallHistoryMethodAction } from 'connected-react-router' -import { UserMenuProps } from 'decentraland-ui' -import { LogoutAction } from 'modules/identity/actions' - -export type Props = Partial - -export type MapStateProps = Pick -export type MapDispatchProps = Pick -export type MapDispatch = Dispatch diff --git a/src/components/UserMenu/index.ts b/src/components/UserMenu/index.ts deleted file mode 100644 index 0be815561..000000000 --- a/src/components/UserMenu/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import UserMenu from './UserMenu.container' - -export default UserMenu