diff options
Diffstat (limited to 'src/view/screens')
| -rw-r--r-- | src/view/screens/Home.tsx | 9 | ||||
| -rw-r--r-- | src/view/screens/Notifications.tsx | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index bd800590d..2c03f1930 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -246,6 +246,7 @@ const FeedPage = observer( feed.refresh() }, [feed, scrollToTop]) + const hasNew = feed.hasNewLatest && !feed.isRefreshing return ( <View testID={testID} style={s.h100pct}> <Feed @@ -260,8 +261,12 @@ const FeedPage = observer( renderEmptyState={renderEmptyState} headerOffset={HEADER_OFFSET} /> - {isScrolledDown && ( - <LoadLatestBtn onPress={onPressLoadLatest} label="Load new posts" /> + {(isScrolledDown || hasNew) && ( + <LoadLatestBtn + onPress={onPressLoadLatest} + label="Load new posts" + showIndicator={hasNew} + /> )} <FAB testID="composeFAB" diff --git a/src/view/screens/Notifications.tsx b/src/view/screens/Notifications.tsx index 02a4618c3..64dcb3a1a 100644 --- a/src/view/screens/Notifications.tsx +++ b/src/view/screens/Notifications.tsx @@ -88,6 +88,9 @@ export const NotificationsScreen = withAuthRequired( ), ) + const hasNew = + store.me.notifications.hasNewLatest && + !store.me.notifications.isRefreshing return ( <View testID="notificationsScreen" style={s.hContentRegion}> <ViewHeader title="Notifications" canGoBack={false} /> @@ -98,10 +101,11 @@ export const NotificationsScreen = withAuthRequired( onScroll={onMainScroll} scrollElRef={scrollElRef} /> - {isScrolledDown && ( + {(isScrolledDown || hasNew) && ( <LoadLatestBtn onPress={onPressLoadLatest} label="Load new notifications" + showIndicator={hasNew} /> )} </View> |