diff options
Diffstat (limited to 'src/view/shell')
-rw-r--r-- | src/view/shell/Drawer.tsx | 12 | ||||
-rw-r--r-- | src/view/shell/bottom-bar/BottomBar.tsx | 6 | ||||
-rw-r--r-- | src/view/shell/desktop/LeftNav.tsx | 8 |
3 files changed, 10 insertions, 16 deletions
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index 74e10d6a1..7128d4213 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -203,9 +203,7 @@ export const DrawerContent = observer(() => { ) } label="Notifications" - count={ - store.me.notifications.unreadCount + store.invitedUsers.numNotifs - } + count={store.me.notifications.unreadCountLabel} bold={isAtNotifications} onPress={onPressNotifications} /> @@ -291,7 +289,7 @@ function MenuItem({ }: { icon: JSX.Element label: string - count?: number + count?: string bold?: boolean onPress: () => void }) { @@ -307,14 +305,14 @@ function MenuItem({ <View style={[ styles.menuItemCount, - count > 99 + count.length > 2 ? styles.menuItemCountHundreds - : count > 9 + : count.length > 1 ? styles.menuItemCountTens : undefined, ]}> <Text style={styles.menuItemCountLabel} numberOfLines={1}> - {count > 999 ? `${Math.round(count / 1000)}k` : count} + {count} </Text> </View> ) : undefined} diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx index 4dcaf3eb1..a7d11d81d 100644 --- a/src/view/shell/bottom-bar/BottomBar.tsx +++ b/src/view/shell/bottom-bar/BottomBar.tsx @@ -132,9 +132,7 @@ export const BottomBar = observer(({navigation}: BottomTabBarProps) => { ) } onPress={onPressNotifications} - notificationCount={ - store.me.notifications.unreadCount + store.invitedUsers.numNotifs - } + notificationCount={store.me.notifications.unreadCountLabel} /> <Btn testID="bottomBarProfileBtn" @@ -170,7 +168,7 @@ function Btn({ }: { testID?: string icon: JSX.Element - notificationCount?: number + notificationCount?: string onPress?: (event: GestureResponderEvent) => void onLongPress?: (event: GestureResponderEvent) => void }) { diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx index c5486a8fe..bcff844f1 100644 --- a/src/view/shell/desktop/LeftNav.tsx +++ b/src/view/shell/desktop/LeftNav.tsx @@ -70,7 +70,7 @@ function BackBtn() { } interface NavItemProps { - count?: number + count?: string href: string icon: JSX.Element iconFilled: JSX.Element @@ -95,7 +95,7 @@ const NavItem = observer( <Link href={href} style={styles.navItem}> <View style={[styles.navItemIconWrapper]}> {isCurrent ? iconFilled : icon} - {typeof count === 'number' && count > 0 && ( + {typeof count === 'string' && count && ( <Text type="button" style={styles.navItemCount}> {count} </Text> @@ -162,9 +162,7 @@ export const DesktopLeftNav = observer(function DesktopLeftNav() { /> <NavItem href="/notifications" - count={ - store.me.notifications.unreadCount + store.invitedUsers.numNotifs - } + count={store.me.notifications.unreadCountLabel} icon={<BellIcon strokeWidth={2} size={24} style={pal.text} />} iconFilled={ <BellIconSolid strokeWidth={1.5} size={24} style={pal.text} /> |