diff --git a/static/app-strings.json b/static/app-strings.json
index 8aa9a27e5..94b0d12ac 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -1464,7 +1464,7 @@
"Your other content language": "Your other content language",
"Search only in this language by default": "Search only in this language by default",
"This link leads to an external website.": "This link leads to an external website.",
- "Hold on, we are setting up your account": "Hold on, we are setting up your account",
+ "Please wait a bit, we are still getting your account ready. on, we are setting up your account": "Hold on, we are setting up your account",
"No Content Found": "No Content Found",
"Publish Something": "Publish Something",
"Watch on lbry.tv": "Watch on lbry.tv",
diff --git a/ui/component/notification/index.js b/ui/component/notification/index.js
index 3ac1bbe26..f5750245b 100644
--- a/ui/component/notification/index.js
+++ b/ui/component/notification/index.js
@@ -1,7 +1,8 @@
import { connect } from 'react-redux';
-import { doSeeNotifications } from 'redux/actions/notifications';
+import { doSeeNotifications, doDeleteNotification } from 'redux/actions/notifications';
import Notification from './view';
export default connect(null, {
doSeeNotifications,
+ doDeleteNotification,
})(Notification);
diff --git a/ui/component/notification/view.jsx b/ui/component/notification/view.jsx
index 373e3f118..b6fa716ea 100644
--- a/ui/component/notification/view.jsx
+++ b/ui/component/notification/view.jsx
@@ -9,27 +9,31 @@ import Icon from 'component/common/icon';
import DateTime from 'component/dateTime';
import Button from 'component/button';
import ChannelThumbnail from 'component/channelThumbnail';
-import { MenuItem } from '@reach/menu-button';
import { formatLbryUrlForWeb } from 'util/url';
import { useHistory } from 'react-router';
import { parseURI } from 'lbry-redux';
import { PAGE_VIEW_QUERY, DISCUSSION_PAGE } from 'page/channel/view';
import FileThumbnail from 'component/fileThumbnail';
+import { Menu, MenuList, MenuButton, MenuItem } from '@reach/menu-button';
+import NotificationContentChannelMenu from 'component/notificationContentChannelMenu';
type Props = {
notification: WebNotification,
menuButton: boolean,
children: any,
doSeeNotifications: ([number]) => void,
+ doDeleteNotification: number => void,
};
export default function Notification(props: Props) {
- const { notification, menuButton = false, doSeeNotifications } = props;
+ const { notification, menuButton = false, doSeeNotifications, doDeleteNotification } = props;
const { push } = useHistory();
const { notification_rule, notification_parameters, is_seen, id } = notification;
const isCommentNotification =
notification_rule === NOTIFICATIONS.NOTIFICATION_COMMENT || notification_rule === NOTIFICATIONS.NOTIFICATION_REPLY;
const commentText = isCommentNotification && notification_parameters.dynamic.comment;
+ const channelUrl =
+ (notification_rule === NOTIFICATIONS.NEW_CONTENT && notification.notification_parameters.dynamic.channel_url) || '';
let notificationTarget;
switch (notification_rule) {
@@ -153,12 +157,29 @@ export default function Notification(props: Props) {