forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Fix crash during onboarding (#3338)
* Fix crash during onboarding
* Fix other usage
authored by
Eric Bailey
and committed by
GitHub
f0493214
b27a0b8c
+30
-32
+6
-8
src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx
+6
-8
src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx
···
1
1
import React from 'react'
2
2
import {View} from 'react-native'
3
-
import {useLingui} from '@lingui/react'
4
3
import {msg, Trans} from '@lingui/macro'
4
+
import {useLingui} from '@lingui/react'
5
5
import {UseMutateFunction} from '@tanstack/react-query'
6
6
7
+
import {logger} from '#/logger'
8
+
import {isIOS} from '#/platform/detection'
9
+
import {usePreferencesQuery} from '#/state/queries/preferences'
7
10
import * as Toast from '#/view/com/util/Toast'
8
11
import {atoms as a, useTheme} from '#/alf'
9
-
import {usePreferencesQuery} from '#/state/queries/preferences'
10
-
import {logger} from '#/logger'
11
-
import {Text} from '#/components/Typography'
12
12
import * as Toggle from '#/components/forms/Toggle'
13
13
import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo'
14
14
import * as Prompt from '#/components/Prompt'
15
-
import {isIOS} from '#/platform/detection'
15
+
import {Text} from '#/components/Typography'
16
16
17
17
function Card({children}: React.PropsWithChildren<{}>) {
18
18
const t = useTheme()
···
123
123
</Trans>
124
124
</Prompt.Description>
125
125
<Prompt.Actions>
126
-
<Prompt.Action onPress={() => prompt.close()}>
127
-
<Trans>OK</Trans>
128
-
</Prompt.Action>
126
+
<Prompt.Action onPress={() => prompt.close()} cta={_(msg`OK`)} />
129
127
</Prompt.Actions>
130
128
</Prompt.Outer>
131
129
</>
+24
-24
src/screens/Profile/Header/ProfileHeaderLabeler.tsx
+24
-24
src/screens/Profile/Header/ProfileHeaderLabeler.tsx
···
3
3
import {
4
4
AppBskyActorDefs,
5
5
AppBskyLabelerDefs,
6
-
ModerationOpts,
7
6
moderateProfile,
7
+
ModerationOpts,
8
8
RichText as RichTextAPI,
9
9
} from '@atproto/api'
10
-
import {Trans, msg} from '@lingui/macro'
10
+
import {msg, Trans} from '@lingui/macro'
11
11
import {useLingui} from '@lingui/react'
12
12
13
-
import {RichText} from '#/components/RichText'
13
+
import {Haptics} from '#/lib/haptics'
14
+
import {isAppLabeler} from '#/lib/moderation'
15
+
import {pluralize} from '#/lib/strings/helpers'
16
+
import {logger} from '#/logger'
17
+
import {Shadow} from '#/state/cache/types'
14
18
import {useModalControls} from '#/state/modals'
19
+
import {useLabelerSubscriptionMutation} from '#/state/queries/labeler'
20
+
import {useLikeMutation, useUnlikeMutation} from '#/state/queries/like'
15
21
import {usePreferencesQuery} from '#/state/queries/preferences'
16
-
import {useAnalytics} from 'lib/analytics/analytics'
17
22
import {useSession} from '#/state/session'
18
-
import {Shadow} from '#/state/cache/types'
23
+
import {useAnalytics} from 'lib/analytics/analytics'
19
24
import {useProfileShadow} from 'state/cache/profile-shadow'
20
-
import {useLabelerSubscriptionMutation} from '#/state/queries/labeler'
21
-
import {useLikeMutation, useUnlikeMutation} from '#/state/queries/like'
22
-
import {logger} from '#/logger'
23
-
import {Haptics} from '#/lib/haptics'
24
-
import {pluralize} from '#/lib/strings/helpers'
25
-
import {isAppLabeler} from '#/lib/moderation'
26
-
27
-
import {atoms as a, useTheme, tokens} from '#/alf'
25
+
import {ProfileMenu} from '#/view/com/profile/ProfileMenu'
26
+
import * as Toast from '#/view/com/util/Toast'
27
+
import {atoms as a, tokens, useTheme} from '#/alf'
28
28
import {Button, ButtonText} from '#/components/Button'
29
-
import {Text} from '#/components/Typography'
30
-
import * as Toast from '#/view/com/util/Toast'
31
-
import {ProfileHeaderShell} from './Shell'
32
-
import {ProfileMenu} from '#/view/com/profile/ProfileMenu'
33
-
import {ProfileHeaderDisplayName} from './DisplayName'
34
-
import {ProfileHeaderHandle} from './Handle'
35
-
import {ProfileHeaderMetrics} from './Metrics'
29
+
import {DialogOuterProps} from '#/components/Dialog'
36
30
import {
37
-
Heart2_Stroke2_Corner0_Rounded as Heart,
38
31
Heart2_Filled_Stroke2_Corner0_Rounded as HeartFilled,
32
+
Heart2_Stroke2_Corner0_Rounded as Heart,
39
33
} from '#/components/icons/Heart2'
40
-
import {DialogOuterProps} from '#/components/Dialog'
34
+
import {Link} from '#/components/Link'
41
35
import * as Prompt from '#/components/Prompt'
42
-
import {Link} from '#/components/Link'
36
+
import {RichText} from '#/components/RichText'
37
+
import {Text} from '#/components/Typography'
38
+
import {ProfileHeaderDisplayName} from './DisplayName'
39
+
import {ProfileHeaderHandle} from './Handle'
40
+
import {ProfileHeaderMetrics} from './Metrics'
41
+
import {ProfileHeaderShell} from './Shell'
43
42
44
43
interface Props {
45
44
profile: AppBskyActorDefs.ProfileViewDetailed
···
312
311
}: {
313
312
control: DialogOuterProps['control']
314
313
}) {
314
+
const {_} = useLingui()
315
315
return (
316
316
<Prompt.Outer control={control}>
317
317
<Prompt.Title>Unable to subscribe</Prompt.Title>
···
322
322
</Trans>
323
323
</Prompt.Description>
324
324
<Prompt.Actions>
325
-
<Prompt.Action onPress={control.close}>OK</Prompt.Action>
325
+
<Prompt.Action onPress={control.close} cta={_(msg`OK`)} />
326
326
</Prompt.Actions>
327
327
</Prompt.Outer>
328
328
)