+15 -12

src/App.native.tsx

··· 29 29 import {Provider as AgeAssuranceProvider} from '#/state/ageAssurance' 30 30 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes' 31 31 import {Provider as DialogStateProvider} from '#/state/dialogs' 32 32 + import {Provider as EmailVerificationProvider} from '#/state/email-verification' 32 33 import {listenSessionDropped} from '#/state/events' 33 34 import { 34 35 beginResolveGeolocation, ··· 155 156 <MutedThreadsProvider> 156 157 <ProgressGuideProvider> 157 158 <ServiceAccountManager> 158 158 - <HideBottomBarBorderProvider> 159 159 - <GestureHandlerRootView 160 160 - style={s.h100pct}> 161 161 - <GlobalGestureEventsProvider> 162 162 - <IntentDialogProvider> 163 163 - <TestCtrls /> 164 164 - <Shell /> 165 165 - <NuxDialogs /> 166 166 - </IntentDialogProvider> 167 167 - </GlobalGestureEventsProvider> 168 168 - </GestureHandlerRootView> 169 169 - </HideBottomBarBorderProvider> 159 159 + <EmailVerificationProvider> 160 160 + <HideBottomBarBorderProvider> 161 161 + <GestureHandlerRootView 162 162 + style={s.h100pct}> 163 163 + <GlobalGestureEventsProvider> 164 164 + <IntentDialogProvider> 165 165 + <TestCtrls /> 166 166 + <Shell /> 167 167 + <NuxDialogs /> 168 168 + </IntentDialogProvider> 169 169 + </GlobalGestureEventsProvider> 170 170 + </GestureHandlerRootView> 171 171 + </HideBottomBarBorderProvider> 172 172 + </EmailVerificationProvider> 170 173 </ServiceAccountManager> 171 174 </ProgressGuideProvider> 172 175 </MutedThreadsProvider>

+9 -6

src/App.web.tsx

··· 18 18 import {Provider as AgeAssuranceProvider} from '#/state/ageAssurance' 19 19 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes' 20 20 import {Provider as DialogStateProvider} from '#/state/dialogs' 21 21 + import {Provider as EmailVerificationProvider} from '#/state/email-verification' 21 22 import {listenSessionDropped} from '#/state/events' 22 23 import { 23 24 beginResolveGeolocation, ··· 136 137 <SafeAreaProvider> 137 138 <ProgressGuideProvider> 138 139 <ServiceConfigProvider> 139 139 - <HideBottomBarBorderProvider> 140 140 - <IntentDialogProvider> 141 141 - <Shell /> 142 142 - <NuxDialogs /> 143 143 - </IntentDialogProvider> 144 144 - </HideBottomBarBorderProvider> 140 140 + <EmailVerificationProvider> 141 141 + <HideBottomBarBorderProvider> 142 142 + <IntentDialogProvider> 143 143 + <Shell /> 144 144 + <NuxDialogs /> 145 145 + </IntentDialogProvider> 146 146 + </HideBottomBarBorderProvider> 147 147 + </EmailVerificationProvider> 145 148 </ServiceConfigProvider> 146 149 </ProgressGuideProvider> 147 150 </SafeAreaProvider>

+5 -1

src/components/dialogs/nuxs/index.tsx

··· 3 3 4 4 import {useGate} from '#/lib/statsig/statsig' 5 5 import {logger} from '#/logger' 6 6 + import {STALE} from '#/state/queries' 6 7 import {Nux, useNuxs, useResetNuxs, useSaveNux} from '#/state/queries/nuxs' 7 8 import { 8 9 usePreferencesQuery, ··· 56 57 export function NuxDialogs() { 57 58 const {currentAccount} = useSession() 58 59 const {data: preferences} = usePreferencesQuery() 59 59 - const {data: profile} = useProfileQuery({did: currentAccount?.did}) 60 60 + const {data: profile} = useProfileQuery({ 61 61 + did: currentAccount?.did, 62 62 + staleTime: STALE.INFINITY, // createdAt isn't gonna change 63 63 + }) 60 64 const onboardingActive = useOnboardingState().isActive 61 65 62 66 const isLoading =

-36

src/lib/hooks/useEmail.ts

··· 1 1 - import {STALE} from '#/state/queries' 2 2 - import {useServiceConfigQuery} from '#/state/queries/email-verification-required' 3 3 - import {useProfileQuery} from '#/state/queries/profile' 4 4 - import {useSession} from '#/state/session' 5 5 - import {BSKY_SERVICE} from '../constants' 6 6 - import {getHostnameFromUrl} from '../strings/url-helpers' 7 7 - 8 8 - export function useEmail() { 9 9 - const {currentAccount} = useSession() 10 10 - 11 11 - const {data: serviceConfig} = useServiceConfigQuery() 12 12 - const {data: profile} = useProfileQuery({ 13 13 - did: currentAccount?.did, 14 14 - staleTime: STALE.INFINITY, 15 15 - }) 16 16 - 17 17 - const checkEmailConfirmed = !!serviceConfig?.checkEmailConfirmed 18 18 - 19 19 - // Date set for 11 AM PST on the 18th of November 20 20 - const isNewEnough = 21 21 - !!profile?.createdAt && 22 22 - Date.parse(profile.createdAt) >= Date.parse('2024-11-18T19:00:00.000Z') 23 23 - 24 24 - const isSelfHost = 25 25 - currentAccount && 26 26 - getHostnameFromUrl(currentAccount.service) !== 27 27 - getHostnameFromUrl(BSKY_SERVICE) 28 28 - 29 29 - const needsEmailVerification = 30 30 - !isSelfHost && 31 31 - checkEmailConfirmed && 32 32 - !currentAccount?.emailConfirmed && 33 33 - isNewEnough 34 34 - 35 35 - return {needsEmailVerification} 36 36 - }

+2 -2

src/lib/hooks/useOpenComposer.tsx

··· 2 2 import {Trans} from '@lingui/macro' 3 3 4 4 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification' 5 5 - import {useOpenComposer as rootUseOpenComposer} from '#/state/shell/composer' 5 5 + import {useOpenComposer as useRootOpenComposer} from '#/state/shell/composer' 6 6 7 7 export function useOpenComposer() { 8 8 - const {openComposer} = rootUseOpenComposer() 8 8 + const {openComposer} = useRootOpenComposer() 9 9 const requireEmailVerification = useRequireEmailVerification() 10 10 return useMemo(() => { 11 11 return {

+1 -1

src/lib/hooks/useRequireEmailVerification.tsx

··· 1 1 import {useCallback} from 'react' 2 2 import {Keyboard} from 'react-native' 3 3 4 4 - import {useEmail} from '#/lib/hooks/useEmail' 4 4 + import {useEmail} from '#/state/email-verification' 5 5 import {useRequireAuth, useSession} from '#/state/session' 6 6 import {useCloseAllActiveElements} from '#/state/util' 7 7 import {

+1 -1

src/screens/Messages/Conversation.tsx

··· 15 15 } from '@react-navigation/native' 16 16 import {type NativeStackScreenProps} from '@react-navigation/native-stack' 17 17 18 18 - import {useEmail} from '#/lib/hooks/useEmail' 19 18 import {useEnableKeyboardControllerScreen} from '#/lib/hooks/useEnableKeyboardController' 20 19 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback' 21 20 import { ··· 24 23 } from '#/lib/routes/types' 25 24 import {isWeb} from '#/platform/detection' 26 25 import {type Shadow, useMaybeProfileShadow} from '#/state/cache/profile-shadow' 26 26 + import {useEmail} from '#/state/email-verification' 27 27 import {ConvoProvider, isConvoActive, useConvo} from '#/state/messages/convo' 28 28 import {ConvoStatus} from '#/state/messages/convo/types' 29 29 import {useCurrentConvoId} from '#/state/messages/current-convo-id'

+1 -1

src/screens/Messages/components/MessageInput.tsx

··· 18 18 19 19 import {HITSLOP_10, MAX_DM_GRAPHEME_LENGTH} from '#/lib/constants' 20 20 import {useHaptics} from '#/lib/haptics' 21 21 - import {useEmail} from '#/lib/hooks/useEmail' 22 21 import {isIOS, isWeb} from '#/platform/detection' 22 22 + import {useEmail} from '#/state/email-verification' 23 23 import { 24 24 useMessageDraft, 25 25 useSaveMessageDraft,

+1 -1

src/screens/Messages/components/RequestButtons.tsx

··· 5 5 import {StackActions, useNavigation} from '@react-navigation/native' 6 6 import {useQueryClient} from '@tanstack/react-query' 7 7 8 8 - import {useEmail} from '#/lib/hooks/useEmail' 9 8 import {type NavigationProp} from '#/lib/routes/types' 10 9 import {useProfileShadow} from '#/state/cache/profile-shadow' 10 10 + import {useEmail} from '#/state/email-verification' 11 11 import {useAcceptConversation} from '#/state/queries/messages/accept-conversation' 12 12 import {precacheConvoQuery} from '#/state/queries/messages/conversation' 13 13 import {useLeaveConvo} from '#/state/queries/messages/leave-conversation'

+64

src/state/email-verification.tsx

··· 1 1 + import {createContext, useContext, useMemo} from 'react' 2 2 + 3 3 + import {BSKY_SERVICE} from '#/lib/constants' 4 4 + import {getHostnameFromUrl} from '#/lib/strings/url-helpers' 5 5 + import {STALE} from '#/state/queries' 6 6 + import {useProfileQuery} from '#/state/queries/profile' 7 7 + import {useCheckEmailConfirmed} from '#/state/service-config' 8 8 + import {useSession} from '#/state/session' 9 9 + 10 10 + type EmailVerificationContext = { 11 11 + needsEmailVerification: boolean 12 12 + } 13 13 + 14 14 + const EmailVerificationContext = createContext<EmailVerificationContext | null>( 15 15 + null, 16 16 + ) 17 17 + EmailVerificationContext.displayName = 'EmailVerificationContext' 18 18 + 19 19 + export function Provider({children}: {children: React.ReactNode}) { 20 20 + const {currentAccount} = useSession() 21 21 + 22 22 + const {data: profile} = useProfileQuery({ 23 23 + did: currentAccount?.did, 24 24 + staleTime: STALE.INFINITY, 25 25 + }) 26 26 + 27 27 + const checkEmailConfirmed = useCheckEmailConfirmed() 28 28 + 29 29 + // Date set for 11 AM PST on the 18th of November 30 30 + const isNewEnough = 31 31 + !!profile?.createdAt && 32 32 + Date.parse(profile.createdAt) >= Date.parse('2024-11-18T19:00:00.000Z') 33 33 + 34 34 + const isSelfHost = 35 35 + currentAccount && 36 36 + getHostnameFromUrl(currentAccount.service) !== 37 37 + getHostnameFromUrl(BSKY_SERVICE) 38 38 + 39 39 + const needsEmailVerification = 40 40 + !isSelfHost && 41 41 + checkEmailConfirmed && 42 42 + !currentAccount?.emailConfirmed && 43 43 + isNewEnough 44 44 + 45 45 + const value = useMemo( 46 46 + () => ({needsEmailVerification}), 47 47 + [needsEmailVerification], 48 48 + ) 49 49 + 50 50 + return ( 51 51 + <EmailVerificationContext.Provider value={value}> 52 52 + {children} 53 53 + </EmailVerificationContext.Provider> 54 54 + ) 55 55 + } 56 56 + Provider.displayName = 'EmailVerificationProvider' 57 57 + 58 58 + export function useEmail() { 59 59 + const ctx = useContext(EmailVerificationContext) 60 60 + if (!ctx) { 61 61 + throw new Error('useEmail must be used within a EmailVerificationProvider') 62 62 + } 63 63 + return ctx 64 64 + }

-25

src/state/queries/email-verification-required.ts

··· 1 1 - import {useQuery} from '@tanstack/react-query' 2 2 - 3 3 - interface ServiceConfig { 4 4 - checkEmailConfirmed: boolean 5 5 - } 6 6 - 7 7 - export function useServiceConfigQuery() { 8 8 - return useQuery({ 9 9 - queryKey: ['service-config'], 10 10 - queryFn: async () => { 11 11 - const res = await fetch( 12 12 - 'https://api.bsky.app/xrpc/app.bsky.unspecced.getConfig', 13 13 - ) 14 14 - if (!res.ok) { 15 15 - return { 16 16 - checkEmailConfirmed: false, 17 17 - } 18 18 - } 19 19 - 20 20 - const json = await res.json() 21 21 - return json as ServiceConfig 22 22 - }, 23 23 - staleTime: 5 * 60 * 1000, 24 24 - }) 25 25 - }

+20 -2

src/state/service-config.tsx

··· 21 21 const LiveNowContext = createContext<LiveNowContext | null>(null) 22 22 LiveNowContext.displayName = 'LiveNowContext' 23 23 24 24 + const CheckEmailConfirmedContext = createContext<boolean | null>(null) 25 25 + 24 26 export function Provider({children}: {children: React.ReactNode}) { 25 27 const langPrefs = useLanguagePrefs() 26 28 const {data: config, isLoading: isInitialLoad} = useServiceConfigQuery() ··· 61 63 62 64 const liveNow = useMemo<LiveNowContext>(() => config?.liveNow ?? [], [config]) 63 65 66 66 + // probably true, so default to true when loading 67 67 + // if the call fails, the query will set it to false for us 68 68 + const checkEmailConfirmed = config?.checkEmailConfirmed ?? true 69 69 + 64 70 return ( 65 71 <TrendingContext.Provider value={trending}> 66 72 <LiveNowContext.Provider value={liveNow}> 67 67 - {children} 73 73 + <CheckEmailConfirmedContext.Provider value={checkEmailConfirmed}> 74 74 + {children} 75 75 + </CheckEmailConfirmedContext.Provider> 68 76 </LiveNowContext.Provider> 69 77 </TrendingContext.Provider> 70 78 ) ··· 78 86 const ctx = useContext(LiveNowContext) 79 87 if (!ctx) { 80 88 throw new Error( 81 81 - 'useLiveNowConfig must be used within a LiveNowConfigProvider', 89 89 + 'useLiveNowConfig must be used within a ServiceConfigManager', 82 90 ) 83 91 } 84 92 return ctx ··· 88 96 const config = useLiveNowConfig() 89 97 return !!config.find(cfg => cfg.did === did) 90 98 } 99 99 + 100 100 + export function useCheckEmailConfirmed() { 101 101 + const ctx = useContext(CheckEmailConfirmedContext) 102 102 + if (ctx === null) { 103 103 + throw new Error( 104 104 + 'useCheckEmailConfirmed must be used within a ServiceConfigManager', 105 105 + ) 106 106 + } 107 107 + return ctx 108 108 + }