this repo has no description
Don't show chat notification if viewer is age gated (#10042)
+27
-11
+4
-2
src/ageAssurance/index.tsx
+4
-2
src/ageAssurance/index.tsx
···
2
2
3
3
import {useGetAndRegisterPushToken} from '#/lib/notifications/notifications'
4
4
import {Provider as RedirectOverlayProvider} from '#/ageAssurance/components/RedirectOverlay'
5
-
import {AgeAssuranceDataProvider} from '#/ageAssurance/data'
6
-
import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
5
+
import {
6
+
AgeAssuranceDataProvider,
7
+
useAgeAssuranceDataContext,
8
+
} from '#/ageAssurance/data'
7
9
import {logger} from '#/ageAssurance/logger'
8
10
import {
9
11
useAgeAssuranceState,
+7
-3
src/view/shell/bottom-bar/BottomBar.tsx
+7
-3
src/view/shell/bottom-bar/BottomBar.tsx
···
49
49
Message_Stroke2_Corner0_Rounded_Filled as MessageFilled,
50
50
} from '#/components/icons/Message'
51
51
import {Text} from '#/components/Typography'
52
+
import {useAgeAssurance} from '#/ageAssurance'
52
53
import {useActorStatus} from '#/features/liveNow'
53
54
import {useDemoMode} from '#/storage/hooks/demo-mode'
54
55
import {styles} from './BottomBarStyles'
···
65
66
useNavigationTabState()
66
67
const numUnreadNotifications = useUnreadNotifications()
67
68
const numUnreadMessages = useUnreadMessageCount()
69
+
const aa = useAgeAssurance()
68
70
const footerMinimalShellTransform = useMinimalShellFooterTransform()
69
71
const {data: profile} = useProfileQuery({did: currentAccount?.did})
70
72
const {requestSwitchToAccount} = useLoggedOutViewControls()
···
213
215
)
214
216
}
215
217
onPress={onPressMessages}
216
-
notificationCount={numUnreadMessages.numUnread}
217
-
hasNew={numUnreadMessages.hasNew}
218
+
notificationCount={
219
+
aa.flags.chatDisabled ? undefined : numUnreadMessages.numUnread
220
+
}
221
+
hasNew={aa.flags.chatDisabled ? false : numUnreadMessages.hasNew}
218
222
accessible={true}
219
223
accessibilityRole="tab"
220
224
accessibilityLabel={_(msg`Chat`)}
221
225
accessibilityHint={
222
-
numUnreadMessages.count > 0
226
+
!aa.flags.chatDisabled && numUnreadMessages.count > 0
223
227
? _(
224
228
plural(numUnreadMessages.numUnread ?? 0, {
225
229
one: '# unread item',
+10
-2
src/view/shell/bottom-bar/BottomBarWeb.tsx
+10
-2
src/view/shell/bottom-bar/BottomBarWeb.tsx
···
43
43
Message_Stroke2_Corner0_Rounded_Filled as MessageFilled,
44
44
} from '#/components/icons/Message'
45
45
import {Text} from '#/components/Typography'
46
+
import {useAgeAssurance} from '#/ageAssurance'
46
47
import {styles} from './BottomBarStyles'
47
48
48
49
export function BottomBarWeb() {
···
60
61
61
62
const unreadMessageCount = useUnreadMessageCount()
62
63
const notificationCountStr = useUnreadNotifications()
64
+
const aa = useAgeAssurance()
63
65
64
66
const showSignIn = useCallback(() => {
65
67
closeAllActiveElements()
···
124
126
<NavItem
125
127
routeName="Messages"
126
128
href="/messages"
127
-
notificationCount={unreadMessageCount.numUnread}
128
-
hasNew={unreadMessageCount.hasNew}>
129
+
notificationCount={
130
+
aa.flags.chatDisabled
131
+
? undefined
132
+
: unreadMessageCount.numUnread
133
+
}
134
+
hasNew={
135
+
aa.flags.chatDisabled ? false : unreadMessageCount.hasNew
136
+
}>
129
137
{({isActive}) => {
130
138
const Icon = isActive ? MessageFilled : Message
131
139
return (