diff options
author | Eric Bailey <git@esb.lol> | 2024-03-22 11:32:49 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-22 11:32:49 -0500 |
commit | f04932140a77881ec64870f87d9b5ffffb22e784 (patch) | |
tree | 6fb9d129db80470ac006feb691026f2b904de3c1 | |
parent | b27a0b8c97c1b82cc8a5f4318735d14a2358e979 (diff) | |
download | voidsky-f04932140a77881ec64870f87d9b5ffffb22e784.tar.zst |
Fix crash during onboarding (#3338)
* Fix crash during onboarding * Fix other usage
-rw-r--r-- | src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx | 14 | ||||
-rw-r--r-- | src/screens/Profile/Header/ProfileHeaderLabeler.tsx | 48 |
2 files changed, 30 insertions, 32 deletions
diff --git a/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx b/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx index aaacaea0a..9e59c1db6 100644 --- a/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx +++ b/src/screens/Onboarding/StepModeration/AdultContentEnabledPref.tsx @@ -1,18 +1,18 @@ import React from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react' import {msg, Trans} from '@lingui/macro' +import {useLingui} from '@lingui/react' import {UseMutateFunction} from '@tanstack/react-query' +import {logger} from '#/logger' +import {isIOS} from '#/platform/detection' +import {usePreferencesQuery} from '#/state/queries/preferences' import * as Toast from '#/view/com/util/Toast' import {atoms as a, useTheme} from '#/alf' -import {usePreferencesQuery} from '#/state/queries/preferences' -import {logger} from '#/logger' -import {Text} from '#/components/Typography' import * as Toggle from '#/components/forms/Toggle' import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo' import * as Prompt from '#/components/Prompt' -import {isIOS} from '#/platform/detection' +import {Text} from '#/components/Typography' function Card({children}: React.PropsWithChildren<{}>) { const t = useTheme() @@ -123,9 +123,7 @@ export function AdultContentEnabledPref({ </Trans> </Prompt.Description> <Prompt.Actions> - <Prompt.Action onPress={() => prompt.close()}> - <Trans>OK</Trans> - </Prompt.Action> + <Prompt.Action onPress={() => prompt.close()} cta={_(msg`OK`)} /> </Prompt.Actions> </Prompt.Outer> </> diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx index 6722ed09b..a93cda134 100644 --- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx +++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx @@ -3,43 +3,42 @@ import {View} from 'react-native' import { AppBskyActorDefs, AppBskyLabelerDefs, - ModerationOpts, moderateProfile, + ModerationOpts, RichText as RichTextAPI, } from '@atproto/api' -import {Trans, msg} from '@lingui/macro' +import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {RichText} from '#/components/RichText' +import {Haptics} from '#/lib/haptics' +import {isAppLabeler} from '#/lib/moderation' +import {pluralize} from '#/lib/strings/helpers' +import {logger} from '#/logger' +import {Shadow} from '#/state/cache/types' import {useModalControls} from '#/state/modals' +import {useLabelerSubscriptionMutation} from '#/state/queries/labeler' +import {useLikeMutation, useUnlikeMutation} from '#/state/queries/like' import {usePreferencesQuery} from '#/state/queries/preferences' -import {useAnalytics} from 'lib/analytics/analytics' import {useSession} from '#/state/session' -import {Shadow} from '#/state/cache/types' +import {useAnalytics} from 'lib/analytics/analytics' import {useProfileShadow} from 'state/cache/profile-shadow' -import {useLabelerSubscriptionMutation} from '#/state/queries/labeler' -import {useLikeMutation, useUnlikeMutation} from '#/state/queries/like' -import {logger} from '#/logger' -import {Haptics} from '#/lib/haptics' -import {pluralize} from '#/lib/strings/helpers' -import {isAppLabeler} from '#/lib/moderation' - -import {atoms as a, useTheme, tokens} from '#/alf' -import {Button, ButtonText} from '#/components/Button' -import {Text} from '#/components/Typography' -import * as Toast from '#/view/com/util/Toast' -import {ProfileHeaderShell} from './Shell' import {ProfileMenu} from '#/view/com/profile/ProfileMenu' -import {ProfileHeaderDisplayName} from './DisplayName' -import {ProfileHeaderHandle} from './Handle' -import {ProfileHeaderMetrics} from './Metrics' +import * as Toast from '#/view/com/util/Toast' +import {atoms as a, tokens, useTheme} from '#/alf' +import {Button, ButtonText} from '#/components/Button' +import {DialogOuterProps} from '#/components/Dialog' import { - Heart2_Stroke2_Corner0_Rounded as Heart, Heart2_Filled_Stroke2_Corner0_Rounded as HeartFilled, + Heart2_Stroke2_Corner0_Rounded as Heart, } from '#/components/icons/Heart2' -import {DialogOuterProps} from '#/components/Dialog' -import * as Prompt from '#/components/Prompt' import {Link} from '#/components/Link' +import * as Prompt from '#/components/Prompt' +import {RichText} from '#/components/RichText' +import {Text} from '#/components/Typography' +import {ProfileHeaderDisplayName} from './DisplayName' +import {ProfileHeaderHandle} from './Handle' +import {ProfileHeaderMetrics} from './Metrics' +import {ProfileHeaderShell} from './Shell' interface Props { profile: AppBskyActorDefs.ProfileViewDetailed @@ -312,6 +311,7 @@ function CantSubscribePrompt({ }: { control: DialogOuterProps['control'] }) { + const {_} = useLingui() return ( <Prompt.Outer control={control}> <Prompt.Title>Unable to subscribe</Prompt.Title> @@ -322,7 +322,7 @@ function CantSubscribePrompt({ </Trans> </Prompt.Description> <Prompt.Actions> - <Prompt.Action onPress={control.close}>OK</Prompt.Action> + <Prompt.Action onPress={control.close} cta={_(msg`OK`)} /> </Prompt.Actions> </Prompt.Outer> ) |