feat: update

decentraland · Dec 7, 2023 · 636ccb3 · 636ccb3
1 parent 0488dac
commit 636ccb3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 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,9 @@
     "dcl-catalyst-commons": "^9.0.1",
     "decentraland-connect": "^5.1.0",
     "decentraland-crypto-fetch": "^1.0.3",
-    "decentraland-dapps": "^16.19.0",
+    "decentraland-dapps": "^16.19.1",
     "decentraland-transactions": "^1.50.0",
-    "decentraland-ui": "^4.30.0",
+    "decentraland-ui": "^4.30.2",
     "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
@@ -17,7 +17,7 @@ const mapState = (state: RootState): MapStateProps => ({
     isPending(tx.status)
   ),
   isNewNavbarDropdownEnabled: getIsNewNavbarDropdownEnabled(state),
-  identity: getCurrentIdentity(state)
+  identity: getCurrentIdentity(state) || undefined
 })
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({

diff --git a/webapp/src/components/Navbar/Navbar.tsx b/webapp/src/components/Navbar/Navbar.tsx
@@ -25,7 +25,7 @@ const Navbar = (props: Props) => {
   if (isNewNavbarDropdownEnabled) {
     props = {
       ...props,
-      rightMenu: <UserInformation />
+      rightMenu: <UserInformation identity={props.identity} withNotifications />
     }
   }
 

diff --git a/webapp/src/components/Navbar/Navbar.types.ts b/webapp/src/components/Navbar/Navbar.types.ts
@@ -10,7 +10,7 @@ export type Props = Partial<NavbarProps> & {
   enablePartialSupportAlert?: boolean
   onNavigate: (path: string) => void
   isNewNavbarDropdownEnabled: boolean
-  identity: AuthIdentity | null
+  identity?: AuthIdentity
 }
 
 export type OwnProps = Pick<Props, 'enablePartialSupportAlert'>

diff --git a/webapp/src/components/UserInformation/UserInformation.types.ts b/webapp/src/components/UserInformation/UserInformation.types.ts
@@ -1,9 +1,9 @@
 import { Dispatch } from 'redux'
 import { CallHistoryMethodAction } from 'connected-react-router'
-import { UserInformationComponentProps } from 'decentraland-ui'
+import { UserInformationProps } from 'decentraland-dapps/dist/containers/UserInformation/UserInformation.types'
 import { OpenLoginAction } from '../../modules/login/actions'
 
-export type Props = Partial<UserInformationComponentProps> & {
+export type Props = Partial<UserInformationProps> & {
   onClickMyAssets: () => void
   onClickMyLists: () => void
 }