LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

make sure notifications aren't hidden

Browse source
This commit is contained in:
Sean Yesmunt 2020-08-26 17:47:43 -04:00
parent 14355ed966
commit 3f32f5a0ca
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ui/page/notifications/view.jsx
View file

@ -7,7 +7,6 @@ import Spinner from 'component/spinner';
import Notification from 'component/notification'; import Notification from 'component/notification';
import Button from 'component/button'; import Button from 'component/button';
import Yrbl from 'component/yrbl'; import Yrbl from 'component/yrbl';
import usePrevious from 'effects/use-previous';
type Props = { type Props = {
notifications: Array<Notification>, notifications: Array<Notification>,
@ -20,8 +19,6 @@ type Props = {
export default function NotificationsPage(props: Props) { export default function NotificationsPage(props: Props) {
const { notifications, fetching, unreadCount, unseenCount, doSeeAllNotifications, doReadNotifications } = props; const { notifications, fetching, unreadCount, unseenCount, doSeeAllNotifications, doReadNotifications } = props;
const [hasFetched, setHasFetched] = React.useState(false);
const previousFetching = usePrevious(fetching);
const hasNotifications = notifications.length > 0; const hasNotifications = notifications.length > 0;
React.useEffect(() => { React.useEffect(() => {
@ -30,12 +27,6 @@ export default function NotificationsPage(props: Props) {
} }
}, [unreadCount, doReadNotifications]); }, [unreadCount, doReadNotifications]);
React.useEffect(() => {
if ((fetching === false && previousFetching === true) || hasNotifications) {
setHasFetched(true);
}
}, [fetching, previousFetching, setHasFetched, hasNotifications]);
return ( return (
<Page> <Page>
{fetching && !hasNotifications && ( {fetching && !hasNotifications && (
@ -43,7 +34,7 @@ export default function NotificationsPage(props: Props) {
<Spinner delayed /> <Spinner delayed />
</div> </div>
)} )}
{hasFetched && ( {!fetching && (
<> <>
{notifications && notifications.length > 0 ? ( {notifications && notifications.length > 0 ? (
<Card <Card