acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Migrate tricky spot, fix types

Browse Source
This commit is contained in:
Eric Bailey
2026-01-21 17:09:09 -06:00
parent bf096977fe
commit 139b5ed2c8
7 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/analytics/index.tsx
+2 -2
View File
@@ -38,7 +38,7 @@ type LoggerType = {
useContext: (context: Exclude<Logger['context'], undefined>) => LoggerType
Context: typeof Logger.Context
}
type AnalyticsContextType = {
export type AnalyticsContextType = {
metadata: Metadata
logger: LoggerType
metric: <E extends keyof Metrics>(
@@ -49,7 +49,7 @@ type AnalyticsContextType = {
feature: (feature: Features) => boolean
Features: typeof Features
}
type AnalyticsBaseContextType = Omit<
export type AnalyticsBaseContextType = Omit<
AnalyticsContextType,
'feature' | 'Features'
>
src/components/moderation/ReportDialog/index.tsx
+5 -8
View File
@@ -234,15 +234,12 @@ function Inner(props: ReportDialogProps) {
}
}, [_, submitReport, state, dispatch, props, setPending, setSuccess])
// TODO once
React.useEffect(() => {
ax.metric(
'reportDialog:open',
{
subjectType: props.subject.type,
},
{statsig: false},
)
}, [props.subject])
ax.metric('reportDialog:open', {
subjectType: props.subject.type,
})
}, [ax, props.subject])
return (
<Dialog.ScrollableInner
src/components/verification/VerifierDialog.tsx
+3 -7
View File
@@ -127,13 +127,9 @@ function Inner({
color="primary"
style={[a.justify_center]}
onPress={() => {
ax.metric(
'verification:learn-more',
{
location: 'verifierDialog',
},
{statsig: true},
)
ax.metric('verification:learn-more', {
location: 'verifierDialog',
})
}}>
<ButtonText>
<Trans context="english-only-resource">Learn more</Trans>
src/screens/Settings/FindContactsSettings.tsx
+1
View File
@@ -171,6 +171,7 @@ function SyncStatus({
info: AppBskyContactDefs.SyncStatus
refetchStatus: () => Promise<any>
}) {
const ax = useAnalytics()
const agent = useAgent()
const queryClient = useQueryClient()
const {_} = useLingui()
src/screens/Signup/index.tsx
+14 -3
View File
@@ -29,17 +29,28 @@ import {LinearGradientBackground} from '#/components/LinearGradientBackground'
import {InlineLinkText} from '#/components/Link'
import {ScreenTransition} from '#/components/ScreenTransition'
import {Text} from '#/components/Typography'
import {IS_ANDROID} from '#/env'
import {GCP_PROJECT_ID} from '#/env'
import {useAnalytics} from '#/analytics'
import {GCP_PROJECT_ID, IS_ANDROID} from '#/env'
import * as bsky from '#/types/bsky'
export function Signup({onPressBack}: {onPressBack: () => void}) {
const ax = useAnalytics()
const {_} = useLingui()
const t = useTheme()
const [state, dispatch] = useReducer(reducer, initialState)
const [state, dispatch] = useReducer(reducer, {
...initialState,
analytics: ax,
})
const {gtMobile} = useBreakpoints()
const submit = useSubmitSignup()
useEffect(() => {
dispatch({
type: 'setAnalytics',
value: ax,
})
}, [ax])
const activeStarterPack = useActiveStarterPack()
const {
data: starterPack,
src/screens/Signup/state.ts
+27 -23
View File
@@ -12,9 +12,9 @@ import {DEFAULT_SERVICE} from '#/lib/constants'
import {cleanError} from '#/lib/strings/errors'
import {createFullHandle} from '#/lib/strings/handles'
import {getAge} from '#/lib/strings/time'
import {logger} from '#/logger'
import {useSessionApi} from '#/state/session'
import {useOnboardingDispatch} from '#/state/shell'
import {type AnalyticsContextType, useAnalytics} from '#/analytics'
export type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema
@@ -39,6 +39,8 @@ type ErrorField =
| 'date-of-birth'
export type SignupState = {
analytics?: AnalyticsContextType
hasPrev: boolean
activeStep: SignupStep
screenTransitionDirection: 'Forward' | 'Backward'
@@ -65,6 +67,7 @@ export type SignupState = {
}
export type SignupAction =
| {type: 'setAnalytics'; value: AnalyticsContextType}
| {type: 'prev'}
| {type: 'next'}
| {type: 'finish'}
@@ -83,6 +86,8 @@ export type SignupAction =
| {type: 'incrementBackgroundCount'}
export const initialState: SignupState = {
analytics: undefined,
hasPrev: false,
activeStep: SignupStep.INFO,
screenTransitionDirection: 'Forward',
@@ -126,6 +131,10 @@ export function reducer(s: SignupState, a: SignupAction): SignupState {
let next = {...s}
switch (a.type) {
case 'setAnalytics': {
next.analytics = a.value
break
}
case 'prev': {
if (s.activeStep !== SignupStep.INFO) {
next.screenTransitionDirection = 'Backward'
@@ -194,16 +203,12 @@ export function reducer(s: SignupState, a: SignupAction): SignupState {
next.fieldErrors[a.field] = (next.fieldErrors[a.field] || 0) + 1
// Log the field error
logger.metric(
'signup:fieldError',
{
field: a.field,
errorCount: next.fieldErrors[a.field],
errorMessage: a.value,
activeStep: next.activeStep,
},
{statsig: true},
)
s.analytics?.metric('signup:fieldError', {
field: a.field,
errorCount: next.fieldErrors[a.field],
errorMessage: a.value,
activeStep: next.activeStep,
})
}
break
}
@@ -220,24 +225,22 @@ export function reducer(s: SignupState, a: SignupAction): SignupState {
next.backgroundCount = s.backgroundCount + 1
// Log background/foreground event during signup
logger.metric(
'signup:backgrounded',
{
activeStep: next.activeStep,
backgroundCount: next.backgroundCount,
},
{statsig: true},
)
s.analytics?.metric('signup:backgrounded', {
activeStep: next.activeStep,
backgroundCount: next.backgroundCount,
})
break
}
}
next.hasPrev = next.activeStep !== SignupStep.INFO
logger.debug('signup', next)
s.analytics?.logger.debug('signup', next)
if (s.activeStep !== next.activeStep) {
logger.debug('signup: step changed', {activeStep: next.activeStep})
s.analytics?.logger.debug('signup: step changed', {
activeStep: next.activeStep,
})
}
return next
@@ -252,6 +255,7 @@ SignupContext.displayName = 'SignupContext'
export const useSignupContext = () => React.useContext(SignupContext)
export function useSubmitSignup() {
const ax = useAnalytics()
const {_} = useLingui()
const {createAccount} = useSessionApi()
const onboardingDispatch = useOnboardingDispatch()
@@ -295,7 +299,7 @@ export function useSubmitSignup() {
!state.pendingSubmit?.verificationCode
) {
dispatch({type: 'setStep', value: SignupStep.CAPTCHA})
logger.error('Signup Flow Error', {
ax.logger.error('Signup Flow Error', {
errorMessage: 'Verification captcha code was not set.',
registrationHandle: state.handle,
})
@@ -358,7 +362,7 @@ export function useSubmitSignup() {
})
dispatch({type: 'setStep', value: isHandleError ? 2 : 1})
logger.error('Signup Flow Error', {
ax.logger.error('Signup Flow Error', {
errorMessage: error,
registrationHandle: state.handle,
})
src/state/queries/handle-availability.ts
+9 -10
View File
@@ -7,8 +7,8 @@ import {
PUBLIC_BSKY_SERVICE,
} from '#/lib/constants'
import {createFullHandle} from '#/lib/strings/handles'
import {logger} from '#/logger'
import {useDebouncedValue} from '#/components/live/utils'
import {useAnalytics} from '#/analytics'
import * as bsky from '#/types/bsky'
import {Agent} from '../session/agent'
@@ -36,6 +36,7 @@ export function useHandleAvailabilityQuery(
},
debounceDelayMs = 500,
) {
const ax = useAnalytics()
const name = username.trim()
const debouncedHandle = useDebouncedValue(name, debounceDelayMs)
@@ -51,11 +52,16 @@ export function useHandleAvailabilityQuery(
),
queryFn: async () => {
const handle = createFullHandle(name, serviceDomain)
return await checkHandleAvailability(handle, serviceDid, {
const res = await checkHandleAvailability(handle, serviceDid, {
email,
birthDate,
typeahead: true,
})
if (res.available) {
ax.metric('signup:handleAvailable', {typeahead: true})
} else {
ax.metric('signup:handleTaken', {typeahead: true})
}
return res
},
}),
}
@@ -67,11 +73,9 @@ export async function checkHandleAvailability(
{
email,
birthDate,
typeahead,
}: {
email?: string
birthDate?: string
typeahead?: boolean
},
) {
if (serviceDid === BSKY_SERVICE_DID) {
@@ -89,8 +93,6 @@ export async function checkHandleAvailability(
ComAtprotoTempCheckHandleAvailability.isResultAvailable,
)
) {
logger.metric('signup:handleAvailable', {typeahead}, {statsig: true})
return {available: true} as const
} else if (
bsky.dangerousIsType<ComAtprotoTempCheckHandleAvailability.ResultUnavailable>(
@@ -98,7 +100,6 @@ export async function checkHandleAvailability(
ComAtprotoTempCheckHandleAvailability.isResultUnavailable,
)
) {
logger.metric('signup:handleTaken', {typeahead}, {statsig: true})
return {
available: false,
suggestions: data.result.suggestions,
@@ -117,11 +118,9 @@ export async function checkHandleAvailability(
})
if (res.data.did) {
logger.metric('signup:handleTaken', {typeahead}, {statsig: true})
return {available: false} as const
}
} catch {}
logger.metric('signup:handleAvailable', {typeahead}, {statsig: true})
return {available: true} as const
}
}