Skip to content

Commit

Permalink
Merge 05b42d8 into 84c8b43
Browse files Browse the repository at this point in the history
  • Loading branch information
lauti7 committed Dec 5, 2023
2 parents 84c8b43 + 05b42d8 commit 9c58582
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 39 deletions.
12 changes: 12 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 17 additions & 36 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"dcl-catalyst-commons": "^9.0.1",
"decentraland-connect": "^5.1.0",
"decentraland-crypto-fetch": "^1.0.3",
"decentraland-dapps": "^16.18.0",
"decentraland-dapps": "^16.19.0",
"decentraland-transactions": "^1.50.0",
"decentraland-ui": "^4.29.0",
"decentraland-ui": "^4.30.0",
"dotenv": "^10.0.0",
"ethers": "^5.6.8",
"graphql": "^14.7.0",
Expand Down
4 changes: 3 additions & 1 deletion webapp/src/components/Navbar/Navbar.container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ import { isConnected } from '../../modules/wallet/selectors'
import { getIsNewNavbarDropdownEnabled } from '../../modules/features/selectors'
import { MapStateProps, MapDispatch, MapDispatchProps } from './Navbar.types'
import Navbar from './Navbar'
import { getCurrentIdentity } from '../../modules/identity/selectors'

const mapState = (state: RootState): MapStateProps => ({
isConnected: isConnected(state),
location: getLocation(state),
hasPendingTransactions: getTransactions(state).some(tx =>
isPending(tx.status)
),
isNewNavbarDropdownEnabled: getIsNewNavbarDropdownEnabled(state)
isNewNavbarDropdownEnabled: getIsNewNavbarDropdownEnabled(state),
identity: getCurrentIdentity(state)
})

const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
Expand Down
1 change: 1 addition & 0 deletions webapp/src/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const Navbar = (props: Props) => {
return (
<BaseNavbar
{...props}
withNotifications
activePage="marketplace"
isFullscreen={props.isFullscreen}
isSignIn={pathname === locations.signIn()}
Expand Down
3 changes: 3 additions & 0 deletions webapp/src/components/Navbar/Navbar.types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Dispatch } from 'redux'
import { CallHistoryMethodAction, RouterLocation } from 'connected-react-router'
import { NavbarProps } from 'decentraland-ui'
import { AuthIdentity } from '@dcl/crypto'

export type Props = Partial<NavbarProps> & {
location: RouterLocation<unknown>
Expand All @@ -9,6 +10,7 @@ export type Props = Partial<NavbarProps> & {
enablePartialSupportAlert?: boolean
onNavigate: (path: string) => void
isNewNavbarDropdownEnabled: boolean
identity: AuthIdentity | null
}

export type OwnProps = Pick<Props, 'enablePartialSupportAlert'>
Expand All @@ -19,6 +21,7 @@ export type MapStateProps = Pick<
| 'hasPendingTransactions'
| 'isConnected'
| 'isNewNavbarDropdownEnabled'
| 'identity'
>
export type MapDispatchProps = Pick<Props, 'onNavigate'>
export type MapDispatch = Dispatch<CallHistoryMethodAction>

0 comments on commit 9c58582

Please sign in to comment.