Revert "Add href links to notification menu entries (#1699)" (#1700)

This reverts commit 268130a913.
This commit is contained in:
mayeaux 2022-06-16 15:22:45 +02:00 committed by GitHub
parent 268130a913
commit 4d849a4821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,7 +21,6 @@ import UriIndicator from 'component/uriIndicator';
import { generateNotificationTitle } from '../notification/helpers/title'; import { generateNotificationTitle } from '../notification/helpers/title';
import { generateNotificationText } from '../notification/helpers/text'; import { generateNotificationText } from '../notification/helpers/text';
import { parseURI } from 'util/lbryURI'; import { parseURI } from 'util/lbryURI';
import { NavLink } from 'react-router-dom';
type Props = { type Props = {
notifications: Array<Notification>, notifications: Array<Notification>,
@ -116,15 +115,6 @@ export default function NotificationHeaderButton(props: Props) {
push(notificationLink); push(notificationLink);
} }
function getWebUri(notification) {
const { notification_parameters } = notification;
let notificationLink = formatLbryUrlForWeb(notification_parameters.device.target);
if (notification_parameters.dynamic.hash) {
notificationLink += '?lc=' + notification_parameters.dynamic.hash + '&view=discussion';
}
return notificationLink;
}
function menuEntry(notification) { function menuEntry(notification) {
const { id, active_at, notification_rule, notification_parameters, is_read, type } = notification; const { id, active_at, notification_rule, notification_parameters, is_read, type } = notification;
@ -173,7 +163,7 @@ export default function NotificationHeaderButton(props: Props) {
} }
return ( return (
<NavLink onClick={() => handleNotificationClick(notification)} key={id} to={getWebUri(notification)}> <a onClick={() => handleNotificationClick(notification)} key={id}>
<div <div
className={is_read ? 'menu__list--notification' : 'menu__list--notification menu__list--notification-unread'} className={is_read ? 'menu__list--notification' : 'menu__list--notification menu__list--notification-unread'}
key={id} key={id}
@ -197,7 +187,7 @@ export default function NotificationHeaderButton(props: Props) {
<Icon icon={ICONS.DELETE} sectionIcon /> <Icon icon={ICONS.DELETE} sectionIcon />
</div> </div>
</div> </div>
</NavLink> </a>
); );
} }
@ -228,9 +218,9 @@ export default function NotificationHeaderButton(props: Props) {
)} )}
</div> </div>
<NavLink onClick={handleMenuClick} to={`/$/${PAGES.NOTIFICATIONS}`}> <a onClick={handleMenuClick}>
<div className="menu__list--notifications-more">{__('View all')}</div> <div className="menu__list--notifications-more">{__('View all')}</div>
</NavLink> </a>
</MuiMenu> </MuiMenu>
</ClickAwayListener> </ClickAwayListener>
</> </>