From 39f024de1e6494b732fff78309fa9286522f0bd3 Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Fri, 24 Jul 2026 17:38:31 +0300 Subject: [PATCH] more autofix --- modules/expo-emoji-picker/src/EmojiPickerModule.ts | 2 +- src/components/AccountList.tsx | 3 +-- src/components/LabelingServiceCard/index.tsx | 3 +-- src/components/ListCard.tsx | 3 +-- src/components/NewskieDialog.tsx | 3 +-- src/components/Post/Embed/VideoEmbed/index.tsx | 3 +-- src/components/Post/Translated/index.tsx | 2 +- src/components/PostControls/BookmarkButton.tsx | 3 +-- src/components/PostControls/RepostButton.tsx | 3 +-- src/components/PostControls/ShareMenu/RecentChats.tsx | 3 +-- src/components/StarterPack/ProfileStarterPacks.tsx | 3 +-- src/components/StarterPack/QrCodeDialog.tsx | 3 +-- src/components/StarterPack/ShareDialog.tsx | 3 +-- .../StarterPack/Wizard/WizardEditListDialog.tsx | 6 ++---- src/components/StarterPack/Wizard/WizardListCard.tsx | 3 +-- src/components/WhoCanReply.tsx | 3 +-- src/components/ageAssurance/AgeAssuranceAdmonition.tsx | 3 +-- src/components/ageAssurance/AgeAssuranceAppealDialog.tsx | 3 +-- src/components/ageAssurance/AgeAssuranceErrors.tsx | 3 +-- src/components/ageAssurance/AgeAssuranceInitDialog.tsx | 3 +-- src/components/contacts/FindContactsBannerNUX.tsx | 3 +-- src/components/contacts/components/InviteInfo.tsx | 3 +-- src/components/contacts/screens/GetContacts.tsx | 3 +-- src/components/contacts/screens/PhoneInput.tsx | 3 +-- src/components/contacts/screens/VerifyNumber.tsx | 3 +-- src/components/contacts/screens/ViewMatches.tsx | 3 +-- src/components/dialogs/DeviceLocationRequestDialog.tsx | 3 +-- src/components/dialogs/Embed.tsx | 3 +-- src/components/dialogs/EmbedConsent.tsx | 3 +-- src/components/dialogs/InAppBrowserConsent.tsx | 3 +-- src/components/dialogs/LanguageSelectDialog.tsx | 3 +-- src/components/dialogs/LinkWarning.tsx | 3 +-- src/components/dialogs/PostInteractionSettingsDialog.tsx | 3 +-- src/components/dialogs/ServerInput.tsx | 3 +-- src/components/dialogs/Signin.tsx | 3 +-- src/components/dialogs/StarterPackDialog.tsx | 3 +-- .../dialogs/lists/CreateListFromStarterPackDialog.tsx | 3 +-- src/components/dialogs/lists/CreateOrEditListDialog.tsx | 3 +-- .../dialogs/lists/ListAddRemoveUsersDialog.tsx | 3 +-- src/components/dialogs/nuxs/ActivitySubscriptions.tsx | 3 +-- src/components/dialogs/nuxs/BookmarksAnnouncement.tsx | 3 +-- src/components/dialogs/nuxs/DraftsAnnouncement.tsx | 3 +-- src/components/dialogs/nuxs/FindContactsAnnouncement.tsx | 3 +-- .../dialogs/nuxs/InitialVerificationAnnouncement.tsx | 3 +-- src/components/dialogs/nuxs/LiveNowBetaDialog.tsx | 3 +-- src/components/dms/ConvoMenu.tsx | 3 +-- src/components/dms/EmojiPopup.android.tsx | 3 +-- src/components/dms/MessageProfileButton.tsx | 3 +-- src/components/forms/HostingProvider.tsx | 3 +-- src/components/images/AutoSizedImage.tsx | 3 +-- src/components/images/ImageLayoutGridItem.tsx | 3 +-- src/components/intents/VerifyEmailIntentDialog.tsx | 3 +-- src/components/moderation/LabelPreference.tsx | 3 +-- src/components/moderation/LabelsOnMe.tsx | 3 +-- src/components/moderation/PostHider.tsx | 3 +-- src/components/verification/VerificationCreatePrompt.tsx | 3 +-- src/features/liveNow/components/EditLiveDialog.tsx | 3 +-- src/features/liveNow/components/GoLiveDialog.tsx | 3 +-- src/features/liveNow/components/GoLiveDisabledDialog.tsx | 3 +-- src/lib/hooks/useDraggableScrollView.ts | 3 +-- src/platform/misc.web-check.d.ts | 6 +++--- src/screens/Bookmarks.tsx | 3 +-- src/screens/Feeds/NoFollowingFeed.tsx | 3 +-- src/screens/Feeds/NoSavedFeedsOfAnyType.tsx | 3 +-- src/screens/Home/NoFeedsPinned.tsx | 9 +++++---- src/screens/List/ListHiddenScreen.tsx | 3 +-- src/screens/Log.tsx | 3 +-- src/screens/Moderation/VerificationSettings.tsx | 5 ++--- src/screens/Moderation/index.tsx | 3 +-- src/screens/ModerationInteractionSettings/index.tsx | 3 +-- src/screens/Notifications/ActivityList.tsx | 3 +-- src/screens/Onboarding/StepFinished/index.tsx | 3 +-- src/screens/Onboarding/StepInterests/index.tsx | 3 +-- .../Onboarding/StepProfile/AvatarCreatorItems.tsx | 3 +-- src/screens/Onboarding/StepProfile/index.tsx | 3 +-- src/screens/Onboarding/StepSuggestedAccounts/index.tsx | 3 +-- .../Onboarding/StepSuggestedStarterpacks/index.tsx | 3 +-- src/screens/PostThread/components/HeaderDropdown.tsx | 3 +-- .../PostThread/components/ThreadComposePrompt.tsx | 3 +-- src/screens/PostThread/components/ThreadError.tsx | 3 +-- .../components/ThreadItemAnchorFollowButton.tsx | 3 +-- src/screens/PostThread/components/ThreadItemReadMore.tsx | 3 +-- .../PostThread/components/ThreadItemReadMoreUp.tsx | 3 +-- src/screens/Profile/ErrorState.tsx | 3 +-- src/screens/Profile/Header/EditProfileDialog.tsx | 3 +-- src/screens/Profile/Header/Handle.tsx | 3 +-- src/screens/Profile/Header/ProfileHeaderLabeler.tsx | 3 +-- src/screens/Profile/Header/ProfileHeaderStandard.tsx | 3 +-- src/screens/Profile/ProfileFeed/index.tsx | 7 +++++-- src/screens/Profile/Sections/Feed.tsx | 3 +-- src/screens/Profile/Sections/Labels.tsx | 3 +-- src/screens/Profile/components/GermButton.tsx | 3 +-- src/screens/ProfileList/AboutSection.tsx | 3 +-- src/screens/ProfileList/FeedSection.tsx | 3 +-- src/screens/ProfileList/components/ErrorScreen.tsx | 3 +-- src/screens/ProfileList/components/Header.tsx | 3 +-- src/screens/ProfileList/components/MoreOptionsMenu.tsx | 3 +-- src/screens/ProfileList/components/SubscribeMenu.tsx | 3 +-- src/screens/ProfileList/index.tsx | 3 +-- src/screens/SavedFeeds.tsx | 3 +-- src/screens/Search/modules/ExploreTrendingVideos.tsx | 3 +-- src/screens/Settings/AboutSettings.tsx | 3 +-- src/screens/Settings/AccessibilitySettings.tsx | 3 +-- src/screens/Settings/ActivityPrivacySettings.tsx | 3 +-- .../Settings/AppIconSettings/SettingsListItem.tsx | 3 +-- src/screens/Settings/AppIconSettings/index.tsx | 3 +-- src/screens/Settings/AppPasswords.tsx | 3 +-- src/screens/Settings/AppearanceSettings.tsx | 3 +-- src/screens/Settings/ContentAndMediaSettings.tsx | 3 +-- src/screens/Settings/FindContactsSettings.tsx | 3 +-- src/screens/Settings/FollowingFeedPreferences.tsx | 3 +-- src/screens/Settings/InterestsSettings.tsx | 3 +-- src/screens/Settings/LanguageSettings.tsx | 3 +-- src/screens/Settings/PrivacyAndSecuritySettings.tsx | 3 +-- src/screens/Settings/Settings.tsx | 8 ++++++-- src/screens/Settings/ThreadPreferences.tsx | 3 +-- src/screens/Settings/components/AddAppPasswordDialog.tsx | 3 +-- src/screens/Settings/components/ChangeHandleDialog.tsx | 3 +-- src/screens/Settings/components/ChangePasswordDialog.tsx | 3 +-- .../Settings/components/DeactivateAccountDialog.tsx | 3 +-- src/screens/Settings/components/DeleteAccountDialog.tsx | 3 +-- .../Settings/components/DisableEmail2FADialog.tsx | 3 +-- src/screens/Settings/components/OTAInfo.tsx | 3 +-- src/screens/Settings/components/PwiOptOut.tsx | 3 +-- src/screens/Signup/BackNextButtons.tsx | 3 +-- src/screens/Signup/StepHandle/index.tsx | 3 +-- src/screens/Signup/StepInfo/Policies.tsx | 3 +-- src/screens/StarterPack/StarterPackScreen.tsx | 3 +-- src/screens/StarterPack/Wizard/StepDetails.tsx | 3 +-- src/screens/StarterPack/Wizard/index.tsx | 3 +-- src/state/messages/convo/agent.ts | 2 +- src/view/com/auth/SplashScreen.web.tsx | 3 +-- src/view/com/composer/Composer.tsx | 7 +++++-- src/view/com/composer/ComposerReplyTo.tsx | 3 +-- src/view/com/composer/GifAltText.tsx | 3 +-- src/view/com/composer/drafts/DraftsButton.tsx | 3 +-- src/view/com/composer/drafts/DraftsListDialog.tsx | 3 +-- src/view/com/composer/labels/LabelsBtn.tsx | 3 +-- src/view/com/composer/photos/EditImageDialog.web.tsx | 3 +-- src/view/com/composer/photos/Gallery.tsx | 3 +-- src/view/com/composer/photos/ImageAltTextDialog.tsx | 3 +-- .../com/composer/select-language/PostLanguageSelect.tsx | 3 +-- src/view/com/composer/videos/SubtitleDialog.tsx | 3 +-- src/view/com/composer/videos/SubtitleFilePicker.tsx | 3 +-- src/view/com/feeds/ComposerPrompt.tsx | 3 +-- src/view/com/feeds/FeedSourceCard.tsx | 3 +-- src/view/com/feeds/MissingFeed.tsx | 3 +-- src/view/com/lists/ListMembers.tsx | 3 +-- src/view/com/notifications/NotificationFeedItem.tsx | 5 ++--- src/view/com/pager/PagerWithHeader.web.tsx | 3 +-- src/view/com/posts/FeedShutdownMsg.tsx | 3 +-- src/view/com/posts/PostFeedReason.tsx | 3 +-- src/view/com/profile/ProfileSubpageHeader.tsx | 3 +-- src/view/com/util/UserBanner.tsx | 3 +-- src/view/com/util/error/ErrorScreen.tsx | 3 +-- src/view/screens/CommunityGuidelines.tsx | 3 +-- src/view/screens/CopyrightPolicy.tsx | 3 +-- src/view/screens/Feeds.tsx | 3 +-- src/view/screens/Lists.tsx | 3 +-- src/view/screens/ModerationModlists.tsx | 3 +-- src/view/screens/Notifications.tsx | 3 +-- src/view/screens/PrivacyPolicy.tsx | 3 +-- src/view/screens/Profile.tsx | 3 +-- src/view/screens/Storybook/Admonitions.tsx | 3 +-- src/view/screens/Support.tsx | 3 +-- src/view/screens/TermsOfService.tsx | 3 +-- 166 files changed, 188 insertions(+), 336 deletions(-) diff --git a/modules/expo-emoji-picker/src/EmojiPickerModule.ts b/modules/expo-emoji-picker/src/EmojiPickerModule.ts index a5b04e662a..fa26252492 100644 --- a/modules/expo-emoji-picker/src/EmojiPickerModule.ts +++ b/modules/expo-emoji-picker/src/EmojiPickerModule.ts @@ -1,4 +1,4 @@ -import {NativeModule, requireNativeModule} from 'expo' +import {type NativeModule, requireNativeModule} from 'expo' declare class EmojiPickerModule extends NativeModule {} diff --git a/src/components/AccountList.tsx b/src/components/AccountList.tsx index 2b09428f0f..60985c452d 100644 --- a/src/components/AccountList.tsx +++ b/src/components/AccountList.tsx @@ -1,8 +1,7 @@ import {Fragment, useCallback} from 'react' import {View} from 'react-native' import {type AppBskyActorDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {isJwtExpired} from '#/lib/jwt' import {sanitizeDisplayName} from '#/lib/strings/display-names' diff --git a/src/components/LabelingServiceCard/index.tsx b/src/components/LabelingServiceCard/index.tsx index 788c642e02..b142953d1f 100644 --- a/src/components/LabelingServiceCard/index.tsx +++ b/src/components/LabelingServiceCard/index.tsx @@ -1,7 +1,6 @@ import {View} from 'react-native' import {type AppBskyLabelerDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {getLabelingServiceTitle} from '#/lib/moderation' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/components/ListCard.tsx b/src/components/ListCard.tsx index 57b269551d..7a20d37fd9 100644 --- a/src/components/ListCard.tsx +++ b/src/components/ListCard.tsx @@ -6,8 +6,7 @@ import { moderateUserList, type ModerationUI, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx index 1ccf90950f..4e136b4132 100644 --- a/src/components/NewskieDialog.tsx +++ b/src/components/NewskieDialog.tsx @@ -1,8 +1,7 @@ import {useMemo, useState} from 'react' import {View} from 'react-native' import {type AppBskyActorDefs, moderateProfile} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {differenceInSeconds} from 'date-fns' import {HITSLOP_10} from '#/lib/constants' diff --git a/src/components/Post/Embed/VideoEmbed/index.tsx b/src/components/Post/Embed/VideoEmbed/index.tsx index 593f303ce8..57b8724377 100644 --- a/src/components/Post/Embed/VideoEmbed/index.tsx +++ b/src/components/Post/Embed/VideoEmbed/index.tsx @@ -2,8 +2,7 @@ import {useCallback, useEffect, useRef, useState} from 'react' import {ActivityIndicator, View} from 'react-native' import {ImageBackground} from 'expo-image' import {type AppBskyEmbedVideo} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { createPlaybackTelemetry, diff --git a/src/components/Post/Translated/index.tsx b/src/components/Post/Translated/index.tsx index 94e0ea697a..aaf03d5462 100644 --- a/src/components/Post/Translated/index.tsx +++ b/src/components/Post/Translated/index.tsx @@ -4,10 +4,10 @@ import {type AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api' import {Trans, useLingui} from '@lingui/react/macro' import {HITSLOP_30} from '#/lib/constants' -import {useTranslate} from '#/lib/translation' import { type TranslationFunction, type TranslationFunctionParams, + useTranslate, } from '#/lib/translation' import { codeToLanguageName, diff --git a/src/components/PostControls/BookmarkButton.tsx b/src/components/PostControls/BookmarkButton.tsx index 9da1d589a5..e24c342771 100644 --- a/src/components/PostControls/BookmarkButton.tsx +++ b/src/components/PostControls/BookmarkButton.tsx @@ -1,8 +1,7 @@ import {memo} from 'react' import {type Insets} from 'react-native' import {type AppBskyFeedDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useCleanError} from '#/lib/hooks/useCleanError' import {type Shadow} from '#/state/cache/post-shadow' diff --git a/src/components/PostControls/RepostButton.tsx b/src/components/PostControls/RepostButton.tsx index 998ff2e38f..21ff3fb94b 100644 --- a/src/components/PostControls/RepostButton.tsx +++ b/src/components/PostControls/RepostButton.tsx @@ -1,8 +1,7 @@ import {memo, useCallback} from 'react' import {View} from 'react-native' import {plural} from '@lingui/core/macro' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useHaptics} from '#/lib/haptics' import {useRequireAuth} from '#/state/session' diff --git a/src/components/PostControls/ShareMenu/RecentChats.tsx b/src/components/PostControls/ShareMenu/RecentChats.tsx index 3ee63d4313..2e665b95dc 100644 --- a/src/components/PostControls/ShareMenu/RecentChats.tsx +++ b/src/components/PostControls/ShareMenu/RecentChats.tsx @@ -4,8 +4,7 @@ import { moderateProfile, type ModerationOpts, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {isBlockedOrBlocking, isMuted} from '#/lib/moderation/blocked-and-muted' diff --git a/src/components/StarterPack/ProfileStarterPacks.tsx b/src/components/StarterPack/ProfileStarterPacks.tsx index 9827495a0d..a1263b1704 100644 --- a/src/components/StarterPack/ProfileStarterPacks.tsx +++ b/src/components/StarterPack/ProfileStarterPacks.tsx @@ -7,8 +7,7 @@ import { type ViewStyle, } from 'react-native' import {type AppBskyGraphDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useGenerateStarterPackMutation} from '#/lib/generate-starterpack' diff --git a/src/components/StarterPack/QrCodeDialog.tsx b/src/components/StarterPack/QrCodeDialog.tsx index f965877f0b..f40d0ae21d 100644 --- a/src/components/StarterPack/QrCodeDialog.tsx +++ b/src/components/StarterPack/QrCodeDialog.tsx @@ -4,8 +4,7 @@ import type ViewShot from 'react-native-view-shot' import {requestPermissionsAsync, saveToLibraryAsync} from 'expo-media-library' import * as Sharing from 'expo-sharing' import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {logger} from '#/logger' import {atoms as a, useBreakpoints} from '#/alf' diff --git a/src/components/StarterPack/ShareDialog.tsx b/src/components/StarterPack/ShareDialog.tsx index 9fbd70000e..fbd2ead07a 100644 --- a/src/components/StarterPack/ShareDialog.tsx +++ b/src/components/StarterPack/ShareDialog.tsx @@ -1,8 +1,7 @@ import {View} from 'react-native' import {Image} from 'expo-image' import {type AppBskyGraphDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useSaveImageToMediaLibrary} from '#/lib/media/save-image' import {shareUrl} from '#/lib/sharing' diff --git a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx index a49fa1f97e..cefe1284e8 100644 --- a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx +++ b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx @@ -1,13 +1,11 @@ import {useRef} from 'react' -import {type ListRenderItemInfo} from 'react-native' -import {View} from 'react-native' +import {type ListRenderItemInfo, View} from 'react-native' import { type AppBskyActorDefs, type AppBskyFeedDefs, type ModerationOpts, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' import {type ListMethods} from '#/view/com/util/List' diff --git a/src/components/StarterPack/Wizard/WizardListCard.tsx b/src/components/StarterPack/Wizard/WizardListCard.tsx index b58ed0e519..3c635c9c79 100644 --- a/src/components/StarterPack/Wizard/WizardListCard.tsx +++ b/src/components/StarterPack/Wizard/WizardListCard.tsx @@ -7,8 +7,7 @@ import { type ModerationOpts, type ModerationUI, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {DISCOVER_FEED_URI, STARTER_PACK_MAX_SIZE} from '#/lib/constants' import {sanitizeDisplayName} from '#/lib/strings/display-names' diff --git a/src/components/WhoCanReply.tsx b/src/components/WhoCanReply.tsx index 6c8763e497..6b55105a7e 100644 --- a/src/components/WhoCanReply.tsx +++ b/src/components/WhoCanReply.tsx @@ -12,8 +12,7 @@ import { type AppBskyGraphDefs, AtUri, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {HITSLOP_10} from '#/lib/constants' import {makeListLink, makeProfileLink} from '#/lib/routes/links' diff --git a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx index 32d33d961e..6f9e0b2f64 100644 --- a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx +++ b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf' import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors' diff --git a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx index 5359b6457c..1225038933 100644 --- a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx +++ b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx @@ -1,8 +1,7 @@ import {useState} from 'react' import {View} from 'react-native' import {ToolsOzoneReportDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation} from '@tanstack/react-query' import {BLUESKY_MOD_SERVICE_HEADERS} from '#/lib/constants' diff --git a/src/components/ageAssurance/AgeAssuranceErrors.tsx b/src/components/ageAssurance/AgeAssuranceErrors.tsx index e1e373477d..e8cd802187 100644 --- a/src/components/ageAssurance/AgeAssuranceErrors.tsx +++ b/src/components/ageAssurance/AgeAssuranceErrors.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type ViewStyleProp} from '#/alf' import * as Admonition from '#/components/Admonition' diff --git a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx index 1cbec73d4f..259c560464 100644 --- a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx +++ b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx @@ -1,8 +1,7 @@ import {useState} from 'react' import {View} from 'react-native' import {XRPCError} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {validate as validateEmail} from 'email-validator' import {useCleanError} from '#/lib/hooks/useCleanError' diff --git a/src/components/contacts/FindContactsBannerNUX.tsx b/src/components/contacts/FindContactsBannerNUX.tsx index 4d1aa9c978..4bd2033365 100644 --- a/src/components/contacts/FindContactsBannerNUX.tsx +++ b/src/components/contacts/FindContactsBannerNUX.tsx @@ -2,8 +2,7 @@ import {useMemo} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {HITSLOP_10} from '#/lib/constants' import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs' diff --git a/src/components/contacts/components/InviteInfo.tsx b/src/components/contacts/components/InviteInfo.tsx index 81a5b1da16..dbeb2a06c5 100644 --- a/src/components/contacts/components/InviteInfo.tsx +++ b/src/components/contacts/components/InviteInfo.tsx @@ -1,6 +1,5 @@ import {type StyleProp, type TextStyle} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {HITSLOP_20} from '#/lib/constants' import {android, atoms as a} from '#/alf' diff --git a/src/components/contacts/screens/GetContacts.tsx b/src/components/contacts/screens/GetContacts.tsx index e4d6d3fe15..53eaedb713 100644 --- a/src/components/contacts/screens/GetContacts.tsx +++ b/src/components/contacts/screens/GetContacts.tsx @@ -9,8 +9,7 @@ import { type Un$Typed, } from '@atproto/api' import {t} from '@lingui/core/macro' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation, useQueryClient} from '@tanstack/react-query' import {uploadBlob} from '#/lib/api' diff --git a/src/components/contacts/screens/PhoneInput.tsx b/src/components/contacts/screens/PhoneInput.tsx index 7c9a09c195..bf7f8f502d 100644 --- a/src/components/contacts/screens/PhoneInput.tsx +++ b/src/components/contacts/screens/PhoneInput.tsx @@ -3,8 +3,7 @@ import {Keyboard, View} from 'react-native' import {KeyboardAvoidingView} from 'react-native-keyboard-controller' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {AppBskyContactStartPhoneVerification} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation} from '@tanstack/react-query' import {urls} from '#/lib/constants' diff --git a/src/components/contacts/screens/VerifyNumber.tsx b/src/components/contacts/screens/VerifyNumber.tsx index 767289c4fb..5de3393b64 100644 --- a/src/components/contacts/screens/VerifyNumber.tsx +++ b/src/components/contacts/screens/VerifyNumber.tsx @@ -4,8 +4,7 @@ import { AppBskyContactStartPhoneVerification, AppBskyContactVerifyPhone, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation} from '@tanstack/react-query' import {clamp} from '#/lib/numbers' diff --git a/src/components/contacts/screens/ViewMatches.tsx b/src/components/contacts/screens/ViewMatches.tsx index 15e065bce4..46496eb30e 100644 --- a/src/components/contacts/screens/ViewMatches.tsx +++ b/src/components/contacts/screens/ViewMatches.tsx @@ -3,8 +3,7 @@ import {View} from 'react-native' import {useSafeAreaInsets} from 'react-native-safe-area-context' import * as SMS from 'expo-sms' import {type ModerationOpts} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useMutation, useQueryClient} from '@tanstack/react-query' import {wait} from '#/lib/async/wait' diff --git a/src/components/dialogs/DeviceLocationRequestDialog.tsx b/src/components/dialogs/DeviceLocationRequestDialog.tsx index 0fad4f6991..18cc00753e 100644 --- a/src/components/dialogs/DeviceLocationRequestDialog.tsx +++ b/src/components/dialogs/DeviceLocationRequestDialog.tsx @@ -1,7 +1,6 @@ import {useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {wait} from '#/lib/async/wait' import {isNetworkError, useCleanError} from '#/lib/hooks/useCleanError' diff --git a/src/components/dialogs/Embed.tsx b/src/components/dialogs/Embed.tsx index a70d8f7809..1edb13da71 100644 --- a/src/components/dialogs/Embed.tsx +++ b/src/components/dialogs/Embed.tsx @@ -1,8 +1,7 @@ import {memo, useEffect, useMemo, useState} from 'react' import {View} from 'react-native' import {type AppBskyActorDefs, type AppBskyFeedPost, AtUri} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {EMBED_SCRIPT} from '#/lib/constants' import {niceDate} from '#/lib/strings/time' diff --git a/src/components/dialogs/EmbedConsent.tsx b/src/components/dialogs/EmbedConsent.tsx index 6f0f1a5839..528e55defd 100644 --- a/src/components/dialogs/EmbedConsent.tsx +++ b/src/components/dialogs/EmbedConsent.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { type EmbedPlayerSource, diff --git a/src/components/dialogs/InAppBrowserConsent.tsx b/src/components/dialogs/InAppBrowserConsent.tsx index 75343e2393..d6d40135d3 100644 --- a/src/components/dialogs/InAppBrowserConsent.tsx +++ b/src/components/dialogs/InAppBrowserConsent.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useOpenLink} from '#/lib/hooks/useOpenLink' import {useSetInAppBrowser} from '#/state/preferences/in-app-browser' diff --git a/src/components/dialogs/LanguageSelectDialog.tsx b/src/components/dialogs/LanguageSelectDialog.tsx index 8b9b05592f..51c94cd6ca 100644 --- a/src/components/dialogs/LanguageSelectDialog.tsx +++ b/src/components/dialogs/LanguageSelectDialog.tsx @@ -1,7 +1,6 @@ import {useCallback, useMemo, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {languageName} from '#/locale/helpers' import {type Language, LANGUAGES, LANGUAGES_MAP_CODE2} from '#/locale/languages' diff --git a/src/components/dialogs/LinkWarning.tsx b/src/components/dialogs/LinkWarning.tsx index 0285ee955d..68e53ab02f 100644 --- a/src/components/dialogs/LinkWarning.tsx +++ b/src/components/dialogs/LinkWarning.tsx @@ -1,7 +1,6 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useOpenLink} from '#/lib/hooks/useOpenLink' import {shareUrl} from '#/lib/sharing' diff --git a/src/components/dialogs/PostInteractionSettingsDialog.tsx b/src/components/dialogs/PostInteractionSettingsDialog.tsx index 984e655f38..5e7c156c5e 100644 --- a/src/components/dialogs/PostInteractionSettingsDialog.tsx +++ b/src/components/dialogs/PostInteractionSettingsDialog.tsx @@ -5,8 +5,7 @@ import { type AppBskyFeedPostgate, AtUri, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' import {useHaptics} from '#/lib/haptics' diff --git a/src/components/dialogs/ServerInput.tsx b/src/components/dialogs/ServerInput.tsx index 4e69e00bed..49505be8bc 100644 --- a/src/components/dialogs/ServerInput.tsx +++ b/src/components/dialogs/ServerInput.tsx @@ -1,7 +1,6 @@ import {useCallback, useImperativeHandle, useRef, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {BSKY_SERVICE} from '#/lib/constants' import * as persisted from '#/state/persisted' diff --git a/src/components/dialogs/Signin.tsx b/src/components/dialogs/Signin.tsx index 917a5965b2..057ff5b962 100644 --- a/src/components/dialogs/Signin.tsx +++ b/src/components/dialogs/Signin.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useLoggedOutViewControls} from '#/state/shell/logged-out' import {useCloseAllActiveElements} from '#/state/util' diff --git a/src/components/dialogs/StarterPackDialog.tsx b/src/components/dialogs/StarterPackDialog.tsx index 1c32bea374..138fba4bf4 100644 --- a/src/components/dialogs/StarterPackDialog.tsx +++ b/src/components/dialogs/StarterPackDialog.tsx @@ -4,8 +4,7 @@ import { type AppBskyGraphGetStarterPacksWithMembership, AppBskyGraphStarterpack, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification' diff --git a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx index 397a2a8b03..a0c6ea5fbc 100644 --- a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx +++ b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx @@ -8,8 +8,7 @@ import { type ComAtprotoRepoApplyWrites, } from '@atproto/api' import {TID} from '@atproto/common-web' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' import chunk from 'lodash.chunk' diff --git a/src/components/dialogs/lists/CreateOrEditListDialog.tsx b/src/components/dialogs/lists/CreateOrEditListDialog.tsx index e793d0ffa0..11273e1984 100644 --- a/src/components/dialogs/lists/CreateOrEditListDialog.tsx +++ b/src/components/dialogs/lists/CreateOrEditListDialog.tsx @@ -1,8 +1,7 @@ import {useCallback, useEffect, useMemo, useState} from 'react' import {View} from 'react-native' import {type AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {cleanError} from '#/lib/strings/errors' import {isOverMaxGraphemeCount} from '#/lib/strings/helpers' diff --git a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx index d12258c724..de15134fed 100644 --- a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx +++ b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx @@ -1,8 +1,7 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' import {type AppBskyGraphDefs, type ModerationOpts} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {cleanError} from '#/lib/strings/errors' import {useModerationOpts} from '#/state/preferences/moderation-opts' diff --git a/src/components/dialogs/nuxs/ActivitySubscriptions.tsx b/src/components/dialogs/nuxs/ActivitySubscriptions.tsx index f30643a29e..f45e125022 100644 --- a/src/components/dialogs/nuxs/ActivitySubscriptions.tsx +++ b/src/components/dialogs/nuxs/ActivitySubscriptions.tsx @@ -1,8 +1,7 @@ import {useCallback} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, useTheme, web} from '#/alf' import {Button, ButtonText} from '#/components/Button' diff --git a/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx b/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx index 45a39a791c..efea576574 100644 --- a/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx +++ b/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx @@ -2,8 +2,7 @@ import {useCallback} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, useTheme, web} from '#/alf' import {transparentifyColor} from '#/alf/util/colorGeneration' diff --git a/src/components/dialogs/nuxs/DraftsAnnouncement.tsx b/src/components/dialogs/nuxs/DraftsAnnouncement.tsx index cd05b8d758..c572cce3b9 100644 --- a/src/components/dialogs/nuxs/DraftsAnnouncement.tsx +++ b/src/components/dialogs/nuxs/DraftsAnnouncement.tsx @@ -2,8 +2,7 @@ import {useCallback} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, useTheme, web} from '#/alf' import {Button, ButtonText} from '#/components/Button' diff --git a/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx b/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx index 2b735e6b21..2f4672e752 100644 --- a/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx +++ b/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx @@ -2,8 +2,7 @@ import {useCallback} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, useTheme, web} from '#/alf' import {Button, ButtonText} from '#/components/Button' diff --git a/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx b/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx index 3083a939c6..b3d4a537b2 100644 --- a/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx +++ b/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx @@ -1,8 +1,7 @@ import {useCallback} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {urls} from '#/lib/constants' import {atoms as a, useBreakpoints, useTheme} from '#/alf' diff --git a/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx b/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx index f72946080d..b84d2d972a 100644 --- a/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx +++ b/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx @@ -2,8 +2,7 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, select, useTheme, utils, web} from '#/alf' import {Button, ButtonText} from '#/components/Button' diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx index 2eac8cdb3a..ef78f871e2 100644 --- a/src/components/dms/ConvoMenu.tsx +++ b/src/components/dms/ConvoMenu.tsx @@ -17,8 +17,7 @@ import { useProfileBlockMutationQueue, } from '#/state/queries/profile' import {useSession} from '#/state/session' -import {type ViewStyleProp} from '#/alf' -import {atoms as a} from '#/alf' +import {atoms as a, type ViewStyleProp} from '#/alf' import {Button, ButtonIcon} from '#/components/Button' import {AfterReportConversationDialog} from '#/components/dms/AfterReportConversationDialog' import {AfterReportDialog} from '#/components/dms/AfterReportDialog' diff --git a/src/components/dms/EmojiPopup.android.tsx b/src/components/dms/EmojiPopup.android.tsx index 62f296b3ce..e1eff71c25 100644 --- a/src/components/dms/EmojiPopup.android.tsx +++ b/src/components/dms/EmojiPopup.android.tsx @@ -1,8 +1,7 @@ import {useState} from 'react' import {Modal, Pressable, View} from 'react-native' import {SafeAreaView} from 'react-native-safe-area-context' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, useTheme} from '#/alf' import {Button, ButtonIcon} from '#/components/Button' diff --git a/src/components/dms/MessageProfileButton.tsx b/src/components/dms/MessageProfileButton.tsx index ca2e91d2b6..af06e82024 100644 --- a/src/components/dms/MessageProfileButton.tsx +++ b/src/components/dms/MessageProfileButton.tsx @@ -1,8 +1,7 @@ import {useCallback} from 'react' import {View} from 'react-native' import {type AppBskyActorDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification' diff --git a/src/components/forms/HostingProvider.tsx b/src/components/forms/HostingProvider.tsx index e8b6a154dd..fb1782297d 100644 --- a/src/components/forms/HostingProvider.tsx +++ b/src/components/forms/HostingProvider.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {Keyboard, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {toNiceDomain} from '#/lib/strings/url-helpers' import {atoms as a, tokens, useTheme} from '#/alf' diff --git a/src/components/images/AutoSizedImage.tsx b/src/components/images/AutoSizedImage.tsx index ef15c78d68..9b734d1fee 100644 --- a/src/components/images/AutoSizedImage.tsx +++ b/src/components/images/AutoSizedImage.tsx @@ -7,8 +7,7 @@ import Animated, { import {Image} from 'expo-image' import {type AppBskyEmbedImages} from '@atproto/api' import {utils} from '@bsky.app/alf' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type Dimensions} from '#/lib/media/types' import {useLargeAltBadgeEnabled} from '#/state/preferences/large-alt-badge' diff --git a/src/components/images/ImageLayoutGridItem.tsx b/src/components/images/ImageLayoutGridItem.tsx index aca4116f57..c649ce4729 100644 --- a/src/components/images/ImageLayoutGridItem.tsx +++ b/src/components/images/ImageLayoutGridItem.tsx @@ -3,8 +3,7 @@ import {type AnimatedRef} from 'react-native-reanimated' import {Image, type ImageStyle} from 'expo-image' import {type AppBskyEmbedImages} from '@atproto/api' import {utils} from '@bsky.app/alf' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type Dimensions} from '#/lib/media/types' import {useLargeAltBadgeEnabled} from '#/state/preferences/large-alt-badge' diff --git a/src/components/intents/VerifyEmailIntentDialog.tsx b/src/components/intents/VerifyEmailIntentDialog.tsx index fe7775fef5..bd0bb7c640 100644 --- a/src/components/intents/VerifyEmailIntentDialog.tsx +++ b/src/components/intents/VerifyEmailIntentDialog.tsx @@ -1,7 +1,6 @@ import {useEffect, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useAgent, useSession} from '#/state/session' import {atoms as a, useBreakpoints, useTheme} from '#/alf' diff --git a/src/components/moderation/LabelPreference.tsx b/src/components/moderation/LabelPreference.tsx index 42ffb0ea14..fea5db287e 100644 --- a/src/components/moderation/LabelPreference.tsx +++ b/src/components/moderation/LabelPreference.tsx @@ -3,8 +3,7 @@ import { type InterpretedLabelValueDefinition, type LabelPreference, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useGlobalLabelStrings} from '#/lib/moderation/useGlobalLabelStrings' import {useLabelBehaviorDescription} from '#/lib/moderation/useLabelBehaviorDescription' diff --git a/src/components/moderation/LabelsOnMe.tsx b/src/components/moderation/LabelsOnMe.tsx index dc4557469d..007f16094e 100644 --- a/src/components/moderation/LabelsOnMe.tsx +++ b/src/components/moderation/LabelsOnMe.tsx @@ -1,7 +1,6 @@ import {type StyleProp, View, type ViewStyle} from 'react-native' import {type ComAtprotoLabelDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural} from '@lingui/react/macro' +import {Plural, useLingui} from '@lingui/react/macro' import {filterUserFacingLabels} from '#/lib/moderation' import {useSession} from '#/state/session' diff --git a/src/components/moderation/PostHider.tsx b/src/components/moderation/PostHider.tsx index bc00a31331..6a2efa4c87 100644 --- a/src/components/moderation/PostHider.tsx +++ b/src/components/moderation/PostHider.tsx @@ -12,8 +12,7 @@ import { type ModerationCause, type ModerationUI, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription' diff --git a/src/components/verification/VerificationCreatePrompt.tsx b/src/components/verification/VerificationCreatePrompt.tsx index 6ade5d6ab7..f3d8bbd91c 100644 --- a/src/components/verification/VerificationCreatePrompt.tsx +++ b/src/components/verification/VerificationCreatePrompt.tsx @@ -1,7 +1,6 @@ import {useCallback, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {logger} from '#/logger' import {useModerationOpts} from '#/state/preferences/moderation-opts' diff --git a/src/features/liveNow/components/EditLiveDialog.tsx b/src/features/liveNow/components/EditLiveDialog.tsx index eeeb6d1bde..cb93816feb 100644 --- a/src/features/liveNow/components/EditLiveDialog.tsx +++ b/src/features/liveNow/components/EditLiveDialog.tsx @@ -1,8 +1,7 @@ import {useMemo, useState} from 'react' import {View} from 'react-native' import {type AppBskyActorDefs, type AppBskyEmbedExternal} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {differenceInMinutes} from 'date-fns' import {useDebouncedValue} from '#/lib/hooks/useDebouncedValue' diff --git a/src/features/liveNow/components/GoLiveDialog.tsx b/src/features/liveNow/components/GoLiveDialog.tsx index 73962b9126..1305f87f0d 100644 --- a/src/features/liveNow/components/GoLiveDialog.tsx +++ b/src/features/liveNow/components/GoLiveDialog.tsx @@ -1,7 +1,6 @@ import {useCallback, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useDebouncedValue} from '#/lib/hooks/useDebouncedValue' import {cleanError} from '#/lib/strings/errors' diff --git a/src/features/liveNow/components/GoLiveDisabledDialog.tsx b/src/features/liveNow/components/GoLiveDisabledDialog.tsx index b729e64ed4..349ac8169a 100644 --- a/src/features/liveNow/components/GoLiveDisabledDialog.tsx +++ b/src/features/liveNow/components/GoLiveDisabledDialog.tsx @@ -1,8 +1,7 @@ import {useCallback, useState} from 'react' import {View} from 'react-native' import {type AppBskyActorDefs, ToolsOzoneReportDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation} from '@tanstack/react-query' import {BLUESKY_MOD_SERVICE_HEADERS} from '#/lib/constants' diff --git a/src/lib/hooks/useDraggableScrollView.ts b/src/lib/hooks/useDraggableScrollView.ts index d4d35ccda4..2fe9d1a39a 100644 --- a/src/lib/hooks/useDraggableScrollView.ts +++ b/src/lib/hooks/useDraggableScrollView.ts @@ -1,6 +1,5 @@ import {type ForwardedRef, useEffect, useMemo, useRef} from 'react' -import {type ScrollView} from 'react-native' -import {Platform} from 'react-native' +import {Platform, type ScrollView} from 'react-native' import {mergeRefs} from '#/lib/merge-refs' diff --git a/src/platform/misc.web-check.d.ts b/src/platform/misc.web-check.d.ts index a592015d56..9b0ac4c856 100644 --- a/src/platform/misc.web-check.d.ts +++ b/src/platform/misc.web-check.d.ts @@ -23,8 +23,8 @@ declare module '*.css' */ declare module 'expo-file-system' { import { - Directory as ExpoFileSystemDirectory, - File as ExpoFileSystemFile, + type Directory as ExpoFileSystemDirectory, + type File as ExpoFileSystemFile, } from 'expo-file-system/build/ExpoFileSystem.types' export { type DirectoryCreateOptions, @@ -39,7 +39,7 @@ declare module 'expo-file-system' { type PathInfo, } from 'expo-file-system/build/ExpoFileSystem.types' import {type PathInfo as ExpoPathInfo} from 'expo-file-system/build/ExpoFileSystem.types' - import {PathUtilities} from 'expo-file-system/build/pathUtilities' + import {type PathUtilities} from 'expo-file-system/build/pathUtilities' export class Paths extends PathUtilities { static get cache(): Directory diff --git a/src/screens/Bookmarks.tsx b/src/screens/Bookmarks.tsx index 4bca1979ba..5c19ce4a27 100644 --- a/src/screens/Bookmarks.tsx +++ b/src/screens/Bookmarks.tsx @@ -5,8 +5,7 @@ import { type AppBskyBookmarkDefs, AppBskyFeedDefs, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { type NavigationProp, useFocusEffect, diff --git a/src/screens/Feeds/NoFollowingFeed.tsx b/src/screens/Feeds/NoFollowingFeed.tsx index 5f3c6dd08e..9ee0c60a6b 100644 --- a/src/screens/Feeds/NoFollowingFeed.tsx +++ b/src/screens/Feeds/NoFollowingFeed.tsx @@ -1,6 +1,5 @@ import {type GestureResponderEvent, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {TIMELINE_SAVED_FEED} from '#/lib/constants' import {useAddSavedFeedsMutation} from '#/state/queries/preferences' diff --git a/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx b/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx index 07fca27928..bf92a4e7cf 100644 --- a/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx +++ b/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx @@ -1,7 +1,6 @@ import {View} from 'react-native' import {TID} from '@atproto/common-web' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {RECOMMENDED_SAVED_FEEDS} from '#/lib/constants' import {useOverwriteSavedFeedsMutation} from '#/state/queries/preferences' diff --git a/src/screens/Home/NoFeedsPinned.tsx b/src/screens/Home/NoFeedsPinned.tsx index ff06b3669b..a2b8ee479b 100644 --- a/src/screens/Home/NoFeedsPinned.tsx +++ b/src/screens/Home/NoFeedsPinned.tsx @@ -1,12 +1,13 @@ import {useCallback} from 'react' import {View} from 'react-native' import {TID} from '@atproto/common-web' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {DISCOVER_SAVED_FEED, TIMELINE_SAVED_FEED} from '#/lib/constants' -import {useOverwriteSavedFeedsMutation} from '#/state/queries/preferences' -import {type UsePreferencesQueryResponse} from '#/state/queries/preferences' +import { + useOverwriteSavedFeedsMutation, + type UsePreferencesQueryResponse, +} from '#/state/queries/preferences' import {CenteredView} from '#/view/com/util/Views' import {atoms as a} from '#/alf' import {Button, ButtonIcon, ButtonText} from '#/components/Button' diff --git a/src/screens/List/ListHiddenScreen.tsx b/src/screens/List/ListHiddenScreen.tsx index a6f5fd2602..8a836ade85 100644 --- a/src/screens/List/ListHiddenScreen.tsx +++ b/src/screens/List/ListHiddenScreen.tsx @@ -1,8 +1,7 @@ import {useState} from 'react' import {View} from 'react-native' import {AppBskyGraphDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' import {useGoBack} from '#/lib/hooks/useGoBack' diff --git a/src/screens/Log.tsx b/src/screens/Log.tsx index 56be67c2af..58ec3385bd 100644 --- a/src/screens/Log.tsx +++ b/src/screens/Log.tsx @@ -1,7 +1,6 @@ import {useState} from 'react' import {LayoutAnimation, Pressable, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo' import { diff --git a/src/screens/Moderation/VerificationSettings.tsx b/src/screens/Moderation/VerificationSettings.tsx index 61fad60efc..838fa18fbc 100644 --- a/src/screens/Moderation/VerificationSettings.tsx +++ b/src/screens/Moderation/VerificationSettings.tsx @@ -1,13 +1,12 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {urls} from '#/lib/constants' import { usePreferencesQuery, type UsePreferencesQueryResponse, + useSetVerificationPrefsMutation, } from '#/state/queries/preferences' -import {useSetVerificationPrefsMutation} from '#/state/queries/preferences' import * as SettingsList from '#/screens/Settings/components/SettingsList' import {atoms as a, useGutters} from '#/alf' import {Admonition} from '#/components/Admonition' diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx index dca7447ece..92652a31f1 100644 --- a/src/screens/Moderation/index.tsx +++ b/src/screens/Moderation/index.tsx @@ -1,8 +1,7 @@ import {Fragment, useCallback} from 'react' import {Linking, View} from 'react-native' import {LABELS} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {getLabelingServiceTitle, isAppLabeler} from '#/lib/moderation' import { diff --git a/src/screens/ModerationInteractionSettings/index.tsx b/src/screens/ModerationInteractionSettings/index.tsx index 8328e367e2..478280de39 100644 --- a/src/screens/ModerationInteractionSettings/index.tsx +++ b/src/screens/ModerationInteractionSettings/index.tsx @@ -1,7 +1,6 @@ import {useCallback, useMemo, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import deepEqual from 'fast-deep-equal' import {logger} from '#/logger' diff --git a/src/screens/Notifications/ActivityList.tsx b/src/screens/Notifications/ActivityList.tsx index 8566271f25..3e6ca80b15 100644 --- a/src/screens/Notifications/ActivityList.tsx +++ b/src/screens/Notifications/ActivityList.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {type AllNavigatorParams} from '#/lib/routes/types' diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx index 13b36d98f3..5dd0fe931b 100644 --- a/src/screens/Onboarding/StepFinished/index.tsx +++ b/src/screens/Onboarding/StepFinished/index.tsx @@ -8,8 +8,7 @@ import { type Un$Typed, } from '@atproto/api' import {TID} from '@atproto/common-web' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' import {uploadBlob} from '#/lib/api' diff --git a/src/screens/Onboarding/StepInterests/index.tsx b/src/screens/Onboarding/StepInterests/index.tsx index 8681cc30a6..373dc6772e 100644 --- a/src/screens/Onboarding/StepInterests/index.tsx +++ b/src/screens/Onboarding/StepInterests/index.tsx @@ -1,7 +1,6 @@ import {useCallback, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {interests, useInterestsDisplayNames} from '#/lib/interests' import {capitalize} from '#/lib/strings/capitalize' diff --git a/src/screens/Onboarding/StepProfile/AvatarCreatorItems.tsx b/src/screens/Onboarding/StepProfile/AvatarCreatorItems.tsx index faced739bc..46f53cea6f 100644 --- a/src/screens/Onboarding/StepProfile/AvatarCreatorItems.tsx +++ b/src/screens/Onboarding/StepProfile/AvatarCreatorItems.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type Avatar} from '#/screens/Onboarding/StepProfile/index' import { diff --git a/src/screens/Onboarding/StepProfile/index.tsx b/src/screens/Onboarding/StepProfile/index.tsx index fdb93acab4..fb5ac979cd 100644 --- a/src/screens/Onboarding/StepProfile/index.tsx +++ b/src/screens/Onboarding/StepProfile/index.tsx @@ -15,8 +15,7 @@ import { launchImageLibraryAsync, UIImagePickerPreferredAssetRepresentationMode, } from 'expo-image-picker' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants' import {usePhotoLibraryPermission} from '#/lib/hooks/usePermissions' diff --git a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx index eefadb9201..206b3d2b62 100644 --- a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx +++ b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx @@ -1,8 +1,7 @@ import {useCallback, useEffect, useMemo, useRef, useState} from 'react' import {View} from 'react-native' import {type ModerationOpts} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation, useQueryClient} from '@tanstack/react-query' import * as bcp47Match from 'bcp-47-match' diff --git a/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx b/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx index e526e50baf..77de4fd44c 100644 --- a/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx +++ b/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useModerationOpts} from '#/state/preferences/moderation-opts' import {useOnboardingSuggestedStarterPacksQuery} from '#/state/queries/useOnboardingSuggestedStarterPacksQuery' diff --git a/src/screens/PostThread/components/HeaderDropdown.tsx b/src/screens/PostThread/components/HeaderDropdown.tsx index 9acf7b935a..deb8b412d6 100644 --- a/src/screens/PostThread/components/HeaderDropdown.tsx +++ b/src/screens/PostThread/components/HeaderDropdown.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {HITSLOP_10} from '#/lib/constants' import {type ThreadPreferences} from '#/state/queries/preferences/useThreadPreferences' diff --git a/src/screens/PostThread/components/ThreadComposePrompt.tsx b/src/screens/PostThread/components/ThreadComposePrompt.tsx index c5a389d497..5841e29b37 100644 --- a/src/screens/PostThread/components/ThreadComposePrompt.tsx +++ b/src/screens/PostThread/components/ThreadComposePrompt.tsx @@ -1,7 +1,6 @@ import {type StyleProp, View, type ViewStyle} from 'react-native' import {LinearGradient} from 'expo-linear-gradient' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {PressableScale} from '#/lib/custom-animations/PressableScale' import {useHaptics} from '#/lib/haptics' diff --git a/src/screens/PostThread/components/ThreadError.tsx b/src/screens/PostThread/components/ThreadError.tsx index 3f2fc80dd3..89a0d5f63f 100644 --- a/src/screens/PostThread/components/ThreadError.tsx +++ b/src/screens/PostThread/components/ThreadError.tsx @@ -1,7 +1,6 @@ import {useMemo} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useCleanError} from '#/lib/hooks/useCleanError' import {OUTER_SPACE} from '#/screens/PostThread/const' diff --git a/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx b/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx index 04d2d86aa0..8f392399b6 100644 --- a/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx +++ b/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx @@ -1,7 +1,6 @@ import {useCallback, useEffect, useMemo, useState} from 'react' import {type AppBskyActorDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {logger} from '#/logger' diff --git a/src/screens/PostThread/components/ThreadItemReadMore.tsx b/src/screens/PostThread/components/ThreadItemReadMore.tsx index c8a37d217d..3c11dd8fbb 100644 --- a/src/screens/PostThread/components/ThreadItemReadMore.tsx +++ b/src/screens/PostThread/components/ThreadItemReadMore.tsx @@ -1,7 +1,6 @@ import {memo} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import { type PostThreadParams, diff --git a/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx b/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx index 347b1184c8..f8eda683ca 100644 --- a/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx +++ b/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx @@ -1,7 +1,6 @@ import {memo} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type ThreadItem} from '#/state/queries/usePostThread' import { diff --git a/src/screens/Profile/ErrorState.tsx b/src/screens/Profile/ErrorState.tsx index 43ddb5cea3..2574fb98ff 100644 --- a/src/screens/Profile/ErrorState.tsx +++ b/src/screens/Profile/ErrorState.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {type NavigationProp} from '#/lib/routes/types' diff --git a/src/screens/Profile/Header/EditProfileDialog.tsx b/src/screens/Profile/Header/EditProfileDialog.tsx index 712568b70f..745e1ff344 100644 --- a/src/screens/Profile/Header/EditProfileDialog.tsx +++ b/src/screens/Profile/Header/EditProfileDialog.tsx @@ -1,8 +1,7 @@ import {useCallback, useEffect, useState} from 'react' import {View} from 'react-native' import {type AppBskyActorDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {MAX_DESCRIPTION, MAX_DISPLAY_NAME, urls} from '#/lib/constants' import {cleanError} from '#/lib/strings/errors' diff --git a/src/screens/Profile/Header/Handle.tsx b/src/screens/Profile/Header/Handle.tsx index 3657f70a05..98af1e5a4b 100644 --- a/src/screens/Profile/Header/Handle.tsx +++ b/src/screens/Profile/Header/Handle.tsx @@ -1,7 +1,6 @@ import {View} from 'react-native' import {type AppBskyActorDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles' import {type Shadow} from '#/state/cache/types' diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx index cb5f83febf..d3f8675ed1 100644 --- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx +++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx @@ -8,8 +8,7 @@ import { type RichText as RichTextAPI, } from '@atproto/api' import {plural} from '@lingui/core/macro' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' // eslint-disable-next-line @typescript-eslint/no-unused-vars import {MAX_LABELERS} from '#/lib/constants' diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx index 02ad2445f6..361c3a1dab 100644 --- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx +++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx @@ -7,8 +7,7 @@ import { type ModerationOpts, type RichText as RichTextAPI, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useHaptics} from '#/lib/haptics' import {sanitizeDisplayName} from '#/lib/strings/display-names' diff --git a/src/screens/Profile/ProfileFeed/index.tsx b/src/screens/Profile/ProfileFeed/index.tsx index 69f743c03a..a7e73b84a1 100644 --- a/src/screens/Profile/ProfileFeed/index.tsx +++ b/src/screens/Profile/ProfileFeed/index.tsx @@ -18,8 +18,11 @@ import { type FeedSourceFeedInfo, useFeedSourceInfoQuery, } from '#/state/queries/feed' -import {type FeedDescriptor, type FeedParams} from '#/state/queries/post-feed' -import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed' +import { + type FeedDescriptor, + type FeedParams, + RQKEY as FEED_RQKEY, +} from '#/state/queries/post-feed' import { usePreferencesQuery, type UsePreferencesQueryResponse, diff --git a/src/screens/Profile/Sections/Feed.tsx b/src/screens/Profile/Sections/Feed.tsx index c7ee5ac11b..05ebd05eae 100644 --- a/src/screens/Profile/Sections/Feed.tsx +++ b/src/screens/Profile/Sections/Feed.tsx @@ -1,7 +1,6 @@ import {useCallback, useEffect, useImperativeHandle, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' diff --git a/src/screens/Profile/Sections/Labels.tsx b/src/screens/Profile/Sections/Labels.tsx index 62578466f3..3f1a78f5b4 100644 --- a/src/screens/Profile/Sections/Labels.tsx +++ b/src/screens/Profile/Sections/Labels.tsx @@ -6,8 +6,7 @@ import { interpretLabelValueDefinitions, type ModerationOpts, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {isLabelerSubscribed, lookupLabelValueDefinition} from '#/lib/moderation' import {List, type ListRef} from '#/view/com/util/List' diff --git a/src/screens/Profile/components/GermButton.tsx b/src/screens/Profile/components/GermButton.tsx index 052e3159bf..a1f1883832 100644 --- a/src/screens/Profile/components/GermButton.tsx +++ b/src/screens/Profile/components/GermButton.tsx @@ -5,8 +5,7 @@ import { type AppBskyActorGetProfile, type AtpAgent, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation, useQueryClient} from '@tanstack/react-query' import {until} from '#/lib/async/until' diff --git a/src/screens/ProfileList/AboutSection.tsx b/src/screens/ProfileList/AboutSection.tsx index 0337d0f7b6..2726b82762 100644 --- a/src/screens/ProfileList/AboutSection.tsx +++ b/src/screens/ProfileList/AboutSection.tsx @@ -1,8 +1,7 @@ import {useCallback, useImperativeHandle, useState} from 'react' import {View} from 'react-native' import {type AppBskyGraphDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useSession} from '#/state/session' import {ListMembers} from '#/view/com/lists/ListMembers' diff --git a/src/screens/ProfileList/FeedSection.tsx b/src/screens/ProfileList/FeedSection.tsx index d933d1ec6e..a89bead710 100644 --- a/src/screens/ProfileList/FeedSection.tsx +++ b/src/screens/ProfileList/FeedSection.tsx @@ -1,7 +1,6 @@ import {useCallback, useEffect, useImperativeHandle, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useIsFocused} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/screens/ProfileList/components/ErrorScreen.tsx b/src/screens/ProfileList/components/ErrorScreen.tsx index 7bb7a92036..70a3b2c742 100644 --- a/src/screens/ProfileList/components/ErrorScreen.tsx +++ b/src/screens/ProfileList/components/ErrorScreen.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {type NavigationProp} from '#/lib/routes/types' diff --git a/src/screens/ProfileList/components/Header.tsx b/src/screens/ProfileList/components/Header.tsx index 8918eb5a2b..515c28e3ee 100644 --- a/src/screens/ProfileList/components/Header.tsx +++ b/src/screens/ProfileList/components/Header.tsx @@ -1,8 +1,7 @@ import {useMemo} from 'react' import {View} from 'react-native' import {AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useHaptics} from '#/lib/haptics' import {makeListLink} from '#/lib/routes/links' diff --git a/src/screens/ProfileList/components/MoreOptionsMenu.tsx b/src/screens/ProfileList/components/MoreOptionsMenu.tsx index 982098998d..12769c034a 100644 --- a/src/screens/ProfileList/components/MoreOptionsMenu.tsx +++ b/src/screens/ProfileList/components/MoreOptionsMenu.tsx @@ -1,6 +1,5 @@ import {type AppBskyActorDefs, AppBskyGraphDefs, AtUri} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {type NavigationProp} from '#/lib/routes/types' diff --git a/src/screens/ProfileList/components/SubscribeMenu.tsx b/src/screens/ProfileList/components/SubscribeMenu.tsx index fe9843d502..35c4a53e92 100644 --- a/src/screens/ProfileList/components/SubscribeMenu.tsx +++ b/src/screens/ProfileList/components/SubscribeMenu.tsx @@ -1,6 +1,5 @@ import {type AppBskyGraphDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useListBlockMutation, useListMuteMutation} from '#/state/queries/list' import {atoms as a} from '#/alf' diff --git a/src/screens/ProfileList/index.tsx b/src/screens/ProfileList/index.tsx index e981848b5d..99c0939b6f 100644 --- a/src/screens/ProfileList/index.tsx +++ b/src/screens/ProfileList/index.tsx @@ -7,8 +7,7 @@ import { moderateUserList, type ModerationOpts, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useIsFocused} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/screens/SavedFeeds.tsx b/src/screens/SavedFeeds.tsx index 4a3708f7d0..22840da71a 100644 --- a/src/screens/SavedFeeds.tsx +++ b/src/screens/SavedFeeds.tsx @@ -4,8 +4,7 @@ import type Animated from 'react-native-reanimated' import {useAnimatedRef, useScrollOffset} from 'react-native-reanimated' import {type AppBskyActorDefs} from '@atproto/api' import {TID} from '@atproto/common-web' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {type NativeStackScreenProps} from '@react-navigation/native-stack' diff --git a/src/screens/Search/modules/ExploreTrendingVideos.tsx b/src/screens/Search/modules/ExploreTrendingVideos.tsx index 40cfd454db..709d464285 100644 --- a/src/screens/Search/modules/ExploreTrendingVideos.tsx +++ b/src/screens/Search/modules/ExploreTrendingVideos.tsx @@ -1,8 +1,7 @@ import {useMemo} from 'react' import {ScrollView, View} from 'react-native' import {AppBskyEmbedVideo, AtUri} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useFocusEffect} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx index 07efca73fe..f724979eb9 100644 --- a/src/screens/Settings/AboutSettings.tsx +++ b/src/screens/Settings/AboutSettings.tsx @@ -2,8 +2,7 @@ import {Platform} from 'react-native' import {setStringAsync} from 'expo-clipboard' import * as FileSystem from 'expo-file-system/legacy' import {Image} from 'expo-image' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {useMutation} from '@tanstack/react-query' diff --git a/src/screens/Settings/AccessibilitySettings.tsx b/src/screens/Settings/AccessibilitySettings.tsx index ce37d555f7..a252764457 100644 --- a/src/screens/Settings/AccessibilitySettings.tsx +++ b/src/screens/Settings/AccessibilitySettings.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {type CommonNavigatorParams} from '#/lib/routes/types' diff --git a/src/screens/Settings/ActivityPrivacySettings.tsx b/src/screens/Settings/ActivityPrivacySettings.tsx index 3ddc05c067..2276a48322 100644 --- a/src/screens/Settings/ActivityPrivacySettings.tsx +++ b/src/screens/Settings/ActivityPrivacySettings.tsx @@ -1,7 +1,6 @@ import {View} from 'react-native' import {type AppBskyNotificationDeclaration} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { type AllNavigatorParams, diff --git a/src/screens/Settings/AppIconSettings/SettingsListItem.tsx b/src/screens/Settings/AppIconSettings/SettingsListItem.tsx index 4f585f7d90..61658d5075 100644 --- a/src/screens/Settings/AppIconSettings/SettingsListItem.tsx +++ b/src/screens/Settings/AppIconSettings/SettingsListItem.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {AppIconImage} from '#/screens/Settings/AppIconSettings/AppIconImage' import {useCurrentAppIcon} from '#/screens/Settings/AppIconSettings/useCurrentAppIcon' diff --git a/src/screens/Settings/AppIconSettings/index.tsx b/src/screens/Settings/AppIconSettings/index.tsx index 057ba9987c..534d2a2b6a 100644 --- a/src/screens/Settings/AppIconSettings/index.tsx +++ b/src/screens/Settings/AppIconSettings/index.tsx @@ -1,8 +1,7 @@ import {useState} from 'react' import {Alert, View} from 'react-native' import * as DynamicAppIcon from '@bsky.app/expo-dynamic-app-icon' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {PressableScale} from '#/lib/custom-animations/PressableScale' diff --git a/src/screens/Settings/AppPasswords.tsx b/src/screens/Settings/AppPasswords.tsx index 5bab415fc3..7a9ba991d3 100644 --- a/src/screens/Settings/AppPasswords.tsx +++ b/src/screens/Settings/AppPasswords.tsx @@ -7,8 +7,7 @@ import Animated, { LinearTransition, } from 'react-native-reanimated' import {type ComAtprotoServerListAppPasswords} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {type CommonNavigatorParams} from '#/lib/routes/types' diff --git a/src/screens/Settings/AppearanceSettings.tsx b/src/screens/Settings/AppearanceSettings.tsx index 4d198e1dba..8b7212b2ad 100644 --- a/src/screens/Settings/AppearanceSettings.tsx +++ b/src/screens/Settings/AppearanceSettings.tsx @@ -5,8 +5,7 @@ import Animated, { LayoutAnimationConfig, LinearTransition, } from 'react-native-reanimated' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { type CommonNavigatorParams, diff --git a/src/screens/Settings/ContentAndMediaSettings.tsx b/src/screens/Settings/ContentAndMediaSettings.tsx index 1239505325..a9415b4835 100644 --- a/src/screens/Settings/ContentAndMediaSettings.tsx +++ b/src/screens/Settings/ContentAndMediaSettings.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {type CommonNavigatorParams} from '#/lib/routes/types' diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx index df027eb010..c323f86629 100644 --- a/src/screens/Settings/FindContactsSettings.tsx +++ b/src/screens/Settings/FindContactsSettings.tsx @@ -6,8 +6,7 @@ import { type AppBskyContactGetSyncStatus, type ModerationOpts, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useIsFocused} from '@react-navigation/native' import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' diff --git a/src/screens/Settings/FollowingFeedPreferences.tsx b/src/screens/Settings/FollowingFeedPreferences.tsx index a3992d3809..37323bbca8 100644 --- a/src/screens/Settings/FollowingFeedPreferences.tsx +++ b/src/screens/Settings/FollowingFeedPreferences.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { type CommonNavigatorParams, diff --git a/src/screens/Settings/InterestsSettings.tsx b/src/screens/Settings/InterestsSettings.tsx index 1cadce573b..8df645600e 100644 --- a/src/screens/Settings/InterestsSettings.tsx +++ b/src/screens/Settings/InterestsSettings.tsx @@ -1,7 +1,6 @@ import {useMemo, useState} from 'react' import {type TextStyle, View, type ViewStyle} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {useQueryClient} from '@tanstack/react-query' import debounce from 'lodash.debounce' diff --git a/src/screens/Settings/LanguageSettings.tsx b/src/screens/Settings/LanguageSettings.tsx index ed805bd5e2..95694cf587 100644 --- a/src/screens/Settings/LanguageSettings.tsx +++ b/src/screens/Settings/LanguageSettings.tsx @@ -1,7 +1,6 @@ import {useCallback, useMemo, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { type CommonNavigatorParams, diff --git a/src/screens/Settings/PrivacyAndSecuritySettings.tsx b/src/screens/Settings/PrivacyAndSecuritySettings.tsx index 9e65ff2c97..54374118fe 100644 --- a/src/screens/Settings/PrivacyAndSecuritySettings.tsx +++ b/src/screens/Settings/PrivacyAndSecuritySettings.tsx @@ -1,6 +1,5 @@ import {type AppBskyNotificationDeclaration} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {type CommonNavigatorParams} from '#/lib/routes/types' diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx index a1234a27ec..838d692490 100644 --- a/src/screens/Settings/Settings.tsx +++ b/src/screens/Settings/Settings.tsx @@ -21,8 +21,12 @@ import {clearStorage} from '#/state/persisted' import {useModerationOpts} from '#/state/preferences/moderation-opts' import {useDeleteActorDeclaration} from '#/state/queries/messages/actor-declaration' import {useProfileQuery, useProfilesQuery} from '#/state/queries/profile' -import {useAgent} from '#/state/session' -import {type SessionAccount, useSession, useSessionApi} from '#/state/session' +import { + type SessionAccount, + useAgent, + useSession, + useSessionApi, +} from '#/state/session' import {useOnboardingDispatch} from '#/state/shell' import {useLoggedOutViewControls} from '#/state/shell/logged-out' import {useCloseAllActiveElements} from '#/state/util' diff --git a/src/screens/Settings/ThreadPreferences.tsx b/src/screens/Settings/ThreadPreferences.tsx index 4fd1260446..d5831188f5 100644 --- a/src/screens/Settings/ThreadPreferences.tsx +++ b/src/screens/Settings/ThreadPreferences.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { type CommonNavigatorParams, diff --git a/src/screens/Settings/components/AddAppPasswordDialog.tsx b/src/screens/Settings/components/AddAppPasswordDialog.tsx index 8eea653adb..badc0659fa 100644 --- a/src/screens/Settings/components/AddAppPasswordDialog.tsx +++ b/src/screens/Settings/components/AddAppPasswordDialog.tsx @@ -9,8 +9,7 @@ import Animated, { SlideOutLeft, } from 'react-native-reanimated' import {type ComAtprotoServerCreateAppPassword} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation} from '@tanstack/react-query' import {useAppPasswordCreateMutation} from '#/state/queries/app-passwords' diff --git a/src/screens/Settings/components/ChangeHandleDialog.tsx b/src/screens/Settings/components/ChangeHandleDialog.tsx index a220b86700..21c26dda2f 100644 --- a/src/screens/Settings/components/ChangeHandleDialog.tsx +++ b/src/screens/Settings/components/ChangeHandleDialog.tsx @@ -11,8 +11,7 @@ import Animated, { SlideOutRight, } from 'react-native-reanimated' import {type ComAtprotoServerDescribeServer} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation, useQueryClient} from '@tanstack/react-query' import {HITSLOP_10, urls} from '#/lib/constants' diff --git a/src/screens/Settings/components/ChangePasswordDialog.tsx b/src/screens/Settings/components/ChangePasswordDialog.tsx index d4e11bcdf1..3a70129ed0 100644 --- a/src/screens/Settings/components/ChangePasswordDialog.tsx +++ b/src/screens/Settings/components/ChangePasswordDialog.tsx @@ -1,7 +1,6 @@ import {useState} from 'react' import {useWindowDimensions, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import * as EmailValidator from 'email-validator' import {cleanError, isNetworkError} from '#/lib/strings/errors' diff --git a/src/screens/Settings/components/DeactivateAccountDialog.tsx b/src/screens/Settings/components/DeactivateAccountDialog.tsx index 39684d141b..ac5b9ddfd8 100644 --- a/src/screens/Settings/components/DeactivateAccountDialog.tsx +++ b/src/screens/Settings/components/DeactivateAccountDialog.tsx @@ -1,7 +1,6 @@ import {useCallback, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {logger} from '#/logger' import {useAgent, useSessionApi} from '#/state/session' diff --git a/src/screens/Settings/components/DeleteAccountDialog.tsx b/src/screens/Settings/components/DeleteAccountDialog.tsx index 83101af30d..338643dcc2 100644 --- a/src/screens/Settings/components/DeleteAccountDialog.tsx +++ b/src/screens/Settings/components/DeleteAccountDialog.tsx @@ -1,7 +1,6 @@ import {useCallback, useRef, useState} from 'react' import {type TextInput, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {DM_SERVICE_HEADERS} from '#/lib/constants' import {useCleanError} from '#/lib/hooks/useCleanError' diff --git a/src/screens/Settings/components/DisableEmail2FADialog.tsx b/src/screens/Settings/components/DisableEmail2FADialog.tsx index caba45f7d1..2d045fc990 100644 --- a/src/screens/Settings/components/DisableEmail2FADialog.tsx +++ b/src/screens/Settings/components/DisableEmail2FADialog.tsx @@ -1,7 +1,6 @@ import {useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {cleanError} from '#/lib/strings/errors' import {useAgent, useSession} from '#/state/session' diff --git a/src/screens/Settings/components/OTAInfo.tsx b/src/screens/Settings/components/OTAInfo.tsx index 0cadbf449f..ec1d73078b 100644 --- a/src/screens/Settings/components/OTAInfo.tsx +++ b/src/screens/Settings/components/OTAInfo.tsx @@ -1,6 +1,5 @@ import * as Updates from 'expo-updates' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useMutation, useQuery} from '@tanstack/react-query' import {Button, ButtonIcon, ButtonText} from '#/components/Button' diff --git a/src/screens/Settings/components/PwiOptOut.tsx b/src/screens/Settings/components/PwiOptOut.tsx index 1c000b4513..58ec5479ce 100644 --- a/src/screens/Settings/components/PwiOptOut.tsx +++ b/src/screens/Settings/components/PwiOptOut.tsx @@ -1,8 +1,7 @@ import {useCallback} from 'react' import {View} from 'react-native' import {type $Typed, ComAtprotoLabelDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { useProfileQuery, diff --git a/src/screens/Signup/BackNextButtons.tsx b/src/screens/Signup/BackNextButtons.tsx index 63502ae284..74c7af4cdc 100644 --- a/src/screens/Signup/BackNextButtons.tsx +++ b/src/screens/Signup/BackNextButtons.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a} from '#/alf' import {Button, ButtonIcon, ButtonText} from '#/components/Button' diff --git a/src/screens/Signup/StepHandle/index.tsx b/src/screens/Signup/StepHandle/index.tsx index 3382a203bc..e662e9b501 100644 --- a/src/screens/Signup/StepHandle/index.tsx +++ b/src/screens/Signup/StepHandle/index.tsx @@ -7,8 +7,7 @@ import Animated, { LinearTransition, } from 'react-native-reanimated' import {useSift} from '@bsky.app/sift' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import { createFullHandle, diff --git a/src/screens/Signup/StepInfo/Policies.tsx b/src/screens/Signup/StepInfo/Policies.tsx index 46ad93a82e..661e39fedd 100644 --- a/src/screens/Signup/StepInfo/Policies.tsx +++ b/src/screens/Signup/StepInfo/Policies.tsx @@ -1,8 +1,7 @@ import {type ReactElement} from 'react' import {View} from 'react-native' import {type ComAtprotoServerDescribeServer} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, useTheme} from '#/alf' import {Admonition} from '#/components/Admonition' diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx index 23dde0c6d8..a8559263fb 100644 --- a/src/screens/StarterPack/StarterPackScreen.tsx +++ b/src/screens/StarterPack/StarterPackScreen.tsx @@ -8,8 +8,7 @@ import { type ModerationOpts, RichText as RichTextAPI, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {type NativeStackScreenProps} from '@react-navigation/native-stack' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/screens/StarterPack/Wizard/StepDetails.tsx b/src/screens/StarterPack/Wizard/StepDetails.tsx index 587e7f5db8..0b1c2f8653 100644 --- a/src/screens/StarterPack/Wizard/StepDetails.tsx +++ b/src/screens/StarterPack/Wizard/StepDetails.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useProfileQuery} from '#/state/queries/profile' import {useSession} from '#/state/session' diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx index d2935eaa4a..ac44552e8a 100644 --- a/src/screens/StarterPack/Wizard/index.tsx +++ b/src/screens/StarterPack/Wizard/index.tsx @@ -10,8 +10,7 @@ import { AtUri, type ModerationOpts, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {type NativeStackScreenProps} from '@react-navigation/native-stack' diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts index b1dc348e79..c4c28a074f 100644 --- a/src/state/messages/convo/agent.ts +++ b/src/state/messages/convo/agent.ts @@ -8,8 +8,8 @@ import { type ChatBskyConvoSendMessage, type ChatBskyEmbedJoinLink, type ChatBskyGroupDefs, + XRPCError, } from '@atproto/api' -import {XRPCError} from '@atproto/api' import {EventEmitter} from 'eventemitter3' import {nanoid} from 'nanoid/non-secure' diff --git a/src/view/com/auth/SplashScreen.web.tsx b/src/view/com/auth/SplashScreen.web.tsx index 6681e16d11..78d31295d3 100644 --- a/src/view/com/auth/SplashScreen.web.tsx +++ b/src/view/com/auth/SplashScreen.web.tsx @@ -1,7 +1,6 @@ import {useEffect, useState} from 'react' import {Pressable, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries' import {ErrorBoundary} from '#/view/com/util/ErrorBoundary' diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 23df77e06c..7cab1f5ab2 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -99,8 +99,11 @@ import {usePreferencesQuery} from '#/state/queries/preferences' import {useProfileQuery} from '#/state/queries/profile' import {resolveLinkQueryOptions} from '#/state/queries/resolve-link' import {useAgent, useSession} from '#/state/session' -import {useComposerControls} from '#/state/shell/composer' -import {type ComposerOpts, type OnPostSuccessData} from '#/state/shell/composer' +import { + type ComposerOpts, + type OnPostSuccessData, + useComposerControls, +} from '#/state/shell/composer' import {CharProgress} from '#/view/com/composer/char-progress/CharProgress' import {ComposerReplyTo} from '#/view/com/composer/ComposerReplyTo' import {DraftsButton} from '#/view/com/composer/drafts/DraftsButton' diff --git a/src/view/com/composer/ComposerReplyTo.tsx b/src/view/com/composer/ComposerReplyTo.tsx index 44d908d67d..dc19b5291c 100644 --- a/src/view/com/composer/ComposerReplyTo.tsx +++ b/src/view/com/composer/ComposerReplyTo.tsx @@ -8,8 +8,7 @@ import { AppBskyEmbedRecordWithMedia, AppBskyFeedPost, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {sanitizeDisplayName} from '#/lib/strings/display-names' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/view/com/composer/GifAltText.tsx b/src/view/com/composer/GifAltText.tsx index 16e8bde8f5..1507792ba1 100644 --- a/src/view/com/composer/GifAltText.tsx +++ b/src/view/com/composer/GifAltText.tsx @@ -1,7 +1,6 @@ import {useState} from 'react' import {TouchableOpacity, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {HITSLOP_10, MAX_ALT_TEXT} from '#/lib/constants' import {parseAltFromGIFDescription} from '#/lib/gif-alt-text' diff --git a/src/view/com/composer/drafts/DraftsButton.tsx b/src/view/com/composer/drafts/DraftsButton.tsx index 1d1fb5789f..53ca591c3d 100644 --- a/src/view/com/composer/drafts/DraftsButton.tsx +++ b/src/view/com/composer/drafts/DraftsButton.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a} from '#/alf' import {Button, ButtonText} from '#/components/Button' diff --git a/src/view/com/composer/drafts/DraftsListDialog.tsx b/src/view/com/composer/drafts/DraftsListDialog.tsx index f5acfffa43..35c8f9f845 100644 --- a/src/view/com/composer/drafts/DraftsListDialog.tsx +++ b/src/view/com/composer/drafts/DraftsListDialog.tsx @@ -1,7 +1,6 @@ import {useCallback, useEffect, useMemo} from 'react' import {Keyboard, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useCallOnce} from '#/lib/once' import {EmptyState} from '#/view/com/util/EmptyState' diff --git a/src/view/com/composer/labels/LabelsBtn.tsx b/src/view/com/composer/labels/LabelsBtn.tsx index 6650b2bbd7..736f74da2e 100644 --- a/src/view/com/composer/labels/LabelsBtn.tsx +++ b/src/view/com/composer/labels/LabelsBtn.tsx @@ -1,6 +1,5 @@ import {Keyboard, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import { ADULT_CONTENT_LABELS, diff --git a/src/view/com/composer/photos/EditImageDialog.web.tsx b/src/view/com/composer/photos/EditImageDialog.web.tsx index f48d014a4f..8b121d4471 100644 --- a/src/view/com/composer/photos/EditImageDialog.web.tsx +++ b/src/view/com/composer/photos/EditImageDialog.web.tsx @@ -2,8 +2,7 @@ import 'react-image-crop/dist/ReactCrop.css' import {useCallback, useImperativeHandle, useRef, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import ReactCrop, {type PercentCrop} from 'react-image-crop' import { diff --git a/src/view/com/composer/photos/Gallery.tsx b/src/view/com/composer/photos/Gallery.tsx index 7341909745..01a77bfc25 100644 --- a/src/view/com/composer/photos/Gallery.tsx +++ b/src/view/com/composer/photos/Gallery.tsx @@ -11,8 +11,7 @@ import { type ViewStyle, } from 'react-native' import {Image} from 'expo-image' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries' import {type Dimensions} from '#/lib/media/types' diff --git a/src/view/com/composer/photos/ImageAltTextDialog.tsx b/src/view/com/composer/photos/ImageAltTextDialog.tsx index d82347807b..393a9c7e50 100644 --- a/src/view/com/composer/photos/ImageAltTextDialog.tsx +++ b/src/view/com/composer/photos/ImageAltTextDialog.tsx @@ -1,8 +1,7 @@ import {useMemo, useState} from 'react' import {type ImageStyle, useWindowDimensions, View} from 'react-native' import {Image} from 'expo-image' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {MAX_ALT_TEXT} from '#/lib/constants' import {enforceLen} from '#/lib/strings/helpers' diff --git a/src/view/com/composer/select-language/PostLanguageSelect.tsx b/src/view/com/composer/select-language/PostLanguageSelect.tsx index 84cb144123..822a7d7bd4 100644 --- a/src/view/com/composer/select-language/PostLanguageSelect.tsx +++ b/src/view/com/composer/select-language/PostLanguageSelect.tsx @@ -6,8 +6,7 @@ import Animated, { withSequence, withTiming, } from 'react-native-reanimated' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {LANG_DROPDOWN_HITSLOP} from '#/lib/constants' import {codeToLanguageName} from '#/locale/helpers' diff --git a/src/view/com/composer/videos/SubtitleDialog.tsx b/src/view/com/composer/videos/SubtitleDialog.tsx index 8994346883..12a8e8e49e 100644 --- a/src/view/com/composer/videos/SubtitleDialog.tsx +++ b/src/view/com/composer/videos/SubtitleDialog.tsx @@ -1,7 +1,6 @@ import {useCallback, useState} from 'react' import {Keyboard, type StyleProp, View, type ViewStyle} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {MAX_ALT_TEXT} from '#/lib/constants' import {isOverMaxGraphemeCount} from '#/lib/strings/helpers' diff --git a/src/view/com/composer/videos/SubtitleFilePicker.tsx b/src/view/com/composer/videos/SubtitleFilePicker.tsx index 893e637e10..e5107f37e5 100644 --- a/src/view/com/composer/videos/SubtitleFilePicker.tsx +++ b/src/view/com/composer/videos/SubtitleFilePicker.tsx @@ -1,7 +1,6 @@ import {useRef} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {logger} from '#/logger' import {atoms as a} from '#/alf' diff --git a/src/view/com/feeds/ComposerPrompt.tsx b/src/view/com/feeds/ComposerPrompt.tsx index 836e9e9cbd..9060dabbdd 100644 --- a/src/view/com/feeds/ComposerPrompt.tsx +++ b/src/view/com/feeds/ComposerPrompt.tsx @@ -1,7 +1,6 @@ import {useCallback, useState} from 'react' import {Keyboard, Pressable, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useOpenComposer} from '#/lib/hooks/useOpenComposer' import { diff --git a/src/view/com/feeds/FeedSourceCard.tsx b/src/view/com/feeds/FeedSourceCard.tsx index 4fa0144ffa..479929d3bd 100644 --- a/src/view/com/feeds/FeedSourceCard.tsx +++ b/src/view/com/feeds/FeedSourceCard.tsx @@ -5,8 +5,7 @@ import { type AppBskyGraphDefs, AtUri, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {sanitizeHandle} from '#/lib/strings/handles' import { diff --git a/src/view/com/feeds/MissingFeed.tsx b/src/view/com/feeds/MissingFeed.tsx index a57824d0fb..0d24442fb4 100644 --- a/src/view/com/feeds/MissingFeed.tsx +++ b/src/view/com/feeds/MissingFeed.tsx @@ -1,7 +1,6 @@ import {type StyleProp, View, type ViewStyle} from 'react-native' import {AtUri} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {cleanError} from '#/lib/strings/errors' import {useModerationOpts} from '#/state/preferences/moderation-opts' diff --git a/src/view/com/lists/ListMembers.tsx b/src/view/com/lists/ListMembers.tsx index 3e2025869f..b6cb4ab96d 100644 --- a/src/view/com/lists/ListMembers.tsx +++ b/src/view/com/lists/ListMembers.tsx @@ -7,8 +7,7 @@ import { type ViewStyle, } from 'react-native' import {type AppBskyGraphDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {cleanError} from '#/lib/strings/errors' import {logger} from '#/logger' diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx index 91137394ed..e66ef5ef6b 100644 --- a/src/view/com/notifications/NotificationFeedItem.tsx +++ b/src/view/com/notifications/NotificationFeedItem.tsx @@ -13,15 +13,14 @@ import { type AppBskyFeedDefs, AppBskyFeedPost, AppBskyGraphFollow, + AtUri, moderateProfile, type ModerationDecision, type ModerationOpts, } from '@atproto/api' -import {AtUri} from '@atproto/api' import {TID} from '@atproto/common-web' import {plural} from '@lingui/core/macro' -import {useLingui} from '@lingui/react/macro' -import {Plural, Trans} from '@lingui/react/macro' +import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/view/com/pager/PagerWithHeader.web.tsx b/src/view/com/pager/PagerWithHeader.web.tsx index 350f1e13ca..b0514b889f 100644 --- a/src/view/com/pager/PagerWithHeader.web.tsx +++ b/src/view/com/pager/PagerWithHeader.web.tsx @@ -1,5 +1,4 @@ -import {forwardRef, memo, useCallback, useState} from 'react' -import {type JSX} from 'react' +import {forwardRef, type JSX, memo, useCallback, useState} from 'react' import {type ScrollView, View} from 'react-native' import {useAnimatedRef} from 'react-native-reanimated' diff --git a/src/view/com/posts/FeedShutdownMsg.tsx b/src/view/com/posts/FeedShutdownMsg.tsx index 4cb8c7ba16..3a458167ec 100644 --- a/src/view/com/posts/FeedShutdownMsg.tsx +++ b/src/view/com/posts/FeedShutdownMsg.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {PROD_DEFAULT_FEED} from '#/lib/constants' import {logger} from '#/logger' diff --git a/src/view/com/posts/PostFeedReason.tsx b/src/view/com/posts/PostFeedReason.tsx index b6e29469c1..cd144bb236 100644 --- a/src/view/com/posts/PostFeedReason.tsx +++ b/src/view/com/posts/PostFeedReason.tsx @@ -1,7 +1,6 @@ import {StyleSheet, View} from 'react-native' import {AppBskyFeedDefs, type ModerationDecision} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {isReasonFeedSource, type ReasonFeedSource} from '#/lib/api/feed/types' import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' diff --git a/src/view/com/profile/ProfileSubpageHeader.tsx b/src/view/com/profile/ProfileSubpageHeader.tsx index a8db0cdce7..e1100ca362 100644 --- a/src/view/com/profile/ProfileSubpageHeader.tsx +++ b/src/view/com/profile/ProfileSubpageHeader.tsx @@ -2,8 +2,7 @@ import {useCallback} from 'react' import {Pressable, View} from 'react-native' import Animated, {useAnimatedRef} from 'react-native-reanimated' import {type AppBskyGraphDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {usePalette} from '#/lib/hooks/usePalette' diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx index 6b80c4b9c2..b7a323bcac 100644 --- a/src/view/com/util/UserBanner.tsx +++ b/src/view/com/util/UserBanner.tsx @@ -2,8 +2,7 @@ import {useCallback, useState} from 'react' import {Pressable, StyleSheet, View} from 'react-native' import {Image} from 'expo-image' import {type ModerationUI} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants' import { diff --git a/src/view/com/util/error/ErrorScreen.tsx b/src/view/com/util/error/ErrorScreen.tsx index 947bcf8ce1..6a233299a4 100644 --- a/src/view/com/util/error/ErrorScreen.tsx +++ b/src/view/com/util/error/ErrorScreen.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {usePalette} from '#/lib/hooks/usePalette' import {atoms as a, useTheme} from '#/alf' diff --git a/src/view/screens/CommunityGuidelines.tsx b/src/view/screens/CommunityGuidelines.tsx index a46e1de10c..a80b5f92ce 100644 --- a/src/view/screens/CommunityGuidelines.tsx +++ b/src/view/screens/CommunityGuidelines.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {usePalette} from '#/lib/hooks/usePalette' import { diff --git a/src/view/screens/CopyrightPolicy.tsx b/src/view/screens/CopyrightPolicy.tsx index 332fb2f197..3f395d43c1 100644 --- a/src/view/screens/CopyrightPolicy.tsx +++ b/src/view/screens/CopyrightPolicy.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {usePalette} from '#/lib/hooks/usePalette' import { diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx index 1ea41c153b..558e59e776 100644 --- a/src/view/screens/Feeds.tsx +++ b/src/view/screens/Feeds.tsx @@ -1,8 +1,7 @@ import {useCallback, useMemo, useRef, useState} from 'react' import {ActivityIndicator, StyleSheet, View} from 'react-native' import {type AppBskyFeedDefs} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import debounce from 'lodash.debounce' import {useOpenComposer} from '#/lib/hooks/useOpenComposer' diff --git a/src/view/screens/Lists.tsx b/src/view/screens/Lists.tsx index 4da3d86077..1c89cb46d0 100644 --- a/src/view/screens/Lists.tsx +++ b/src/view/screens/Lists.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {AtUri} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification' diff --git a/src/view/screens/ModerationModlists.tsx b/src/view/screens/ModerationModlists.tsx index 8fb32320f5..0d2ed812a2 100644 --- a/src/view/screens/ModerationModlists.tsx +++ b/src/view/screens/ModerationModlists.tsx @@ -1,7 +1,6 @@ import {useCallback} from 'react' import {AtUri} from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification' diff --git a/src/view/screens/Notifications.tsx b/src/view/screens/Notifications.tsx index 2f580e9115..01f0a79616 100644 --- a/src/view/screens/Notifications.tsx +++ b/src/view/screens/Notifications.tsx @@ -1,7 +1,6 @@ import {useCallback, useEffect, useMemo, useRef, useState} from 'react' import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useFocusEffect, useIsFocused} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx index e97502afb9..ee2b47371f 100644 --- a/src/view/screens/PrivacyPolicy.tsx +++ b/src/view/screens/PrivacyPolicy.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {usePalette} from '#/lib/hooks/usePalette' import { diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx index a1a0a3c092..7a7df681b9 100644 --- a/src/view/screens/Profile.tsx +++ b/src/view/screens/Profile.tsx @@ -8,8 +8,7 @@ import { type ModerationOpts, RichText as RichTextAPI, } from '@atproto/api' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {useFocusEffect, useNavigation} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/view/screens/Storybook/Admonitions.tsx b/src/view/screens/Storybook/Admonitions.tsx index 2116dbe30c..b4fdc24fbc 100644 --- a/src/view/screens/Storybook/Admonitions.tsx +++ b/src/view/screens/Storybook/Admonitions.tsx @@ -1,6 +1,5 @@ import {Text as RNText, View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {atoms as a, useTheme} from '#/alf' import { diff --git a/src/view/screens/Support.tsx b/src/view/screens/Support.tsx index e95c1a0746..5442e7144a 100644 --- a/src/view/screens/Support.tsx +++ b/src/view/screens/Support.tsx @@ -1,5 +1,4 @@ -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {HELP_DESK_URL} from '#/lib/constants' import {usePalette} from '#/lib/hooks/usePalette' diff --git a/src/view/screens/TermsOfService.tsx b/src/view/screens/TermsOfService.tsx index 2bc19af8de..7d3de24cc0 100644 --- a/src/view/screens/TermsOfService.tsx +++ b/src/view/screens/TermsOfService.tsx @@ -1,6 +1,5 @@ import {View} from 'react-native' -import {useLingui} from '@lingui/react/macro' -import {Trans} from '@lingui/react/macro' +import {Trans, useLingui} from '@lingui/react/macro' import {usePalette} from '#/lib/hooks/usePalette' import {