From 1117bd74817f6a09d74f583d943c26ba7f6fe60c Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 15 Jul 2025 13:14:16 -0500 Subject: [PATCH] Reorg --- src/App.native.tsx | 2 +- src/App.web.tsx | 2 +- src/components/ageAssurance/AgeAssuranceAccountCard.tsx | 2 +- src/components/ageAssurance/AgeAssuranceAdmonition.tsx | 2 +- src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx | 2 +- src/components/ageAssurance/AgeAssuranceInitDialog.tsx | 4 ++-- src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx | 2 +- src/components/ageAssurance/AgeRestrictedScreen.tsx | 2 +- src/lib/notifications/notifications.ts | 2 +- src/screens/Moderation/index.tsx | 4 ++-- src/state/{age-assurance => ageAssurance}/const.ts | 0 src/state/{age-assurance => ageAssurance}/index.tsx | 2 +- src/state/{age-assurance => ageAssurance}/types.ts | 0 src/state/{age-assurance => ageAssurance}/useAgeInfo.ts | 2 +- .../{age-assurance => ageAssurance}/useInitAgeAssurance.ts | 2 +- .../useMaybeApplyAgeRestrictedModerationPrefs.ts | 4 ++-- src/state/queries/post-feed.ts | 2 +- src/state/queries/preferences/index.ts | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) rename src/state/{age-assurance => ageAssurance}/const.ts (100%) rename src/state/{age-assurance => ageAssurance}/index.tsx (99%) rename src/state/{age-assurance => ageAssurance}/types.ts (100%) rename src/state/{age-assurance => ageAssurance}/useAgeInfo.ts (92%) rename src/state/{age-assurance => ageAssurance}/useInitAgeAssurance.ts (97%) rename src/state/{age-assurance => ageAssurance}/useMaybeApplyAgeRestrictedModerationPrefs.ts (79%) diff --git a/src/App.native.tsx b/src/App.native.tsx index 79994b7ef5..87429d8458 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -26,7 +26,7 @@ import I18nProvider from '#/locale/i18nProvider' import {logger} from '#/logger' import {isAndroid, isIOS} from '#/platform/detection' import {Provider as A11yProvider} from '#/state/a11y' -import {Provider as AgeAssuranceProvider} from '#/state/age-assurance' +import {Provider as AgeAssuranceProvider} from '#/state/ageAssurance' import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes' import {Provider as DialogStateProvider} from '#/state/dialogs' import {listenSessionDropped} from '#/state/events' diff --git a/src/App.web.tsx b/src/App.web.tsx index ebff97e6d7..04de8529ff 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -15,7 +15,7 @@ import {ThemeProvider} from '#/lib/ThemeContext' import I18nProvider from '#/locale/i18nProvider' import {logger} from '#/logger' import {Provider as A11yProvider} from '#/state/a11y' -import {Provider as AgeAssuranceProvider} from '#/state/age-assurance' +import {Provider as AgeAssuranceProvider} from '#/state/ageAssurance' import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes' import {Provider as DialogStateProvider} from '#/state/dialogs' import {listenSessionDropped} from '#/state/events' diff --git a/src/components/ageAssurance/AgeAssuranceAccountCard.tsx b/src/components/ageAssurance/AgeAssuranceAccountCard.tsx index 2140d5c2b5..5e83b09383 100644 --- a/src/components/ageAssurance/AgeAssuranceAccountCard.tsx +++ b/src/components/ageAssurance/AgeAssuranceAccountCard.tsx @@ -3,7 +3,7 @@ import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo' -import {useAgeInfo} from '#/state/age-assurance/useAgeInfo' +import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' import {atoms as a, useBreakpoints, useTheme, type ViewStyleProp} from '#/alf' import {Admonition} from '#/components/Admonition' import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog' diff --git a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx index cd510bf4c7..122da430fb 100644 --- a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx +++ b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx @@ -2,7 +2,7 @@ import {View} from 'react-native' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgeInfo} from '#/state/age-assurance/useAgeInfo' +import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf' import {useDialogControl} from '#/components/ageAssurance/AgeAssuranceInitDialog' import type * as Dialog from '#/components/Dialog' diff --git a/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx b/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx index 609f7d5779..fe052a380a 100644 --- a/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx +++ b/src/components/ageAssurance/AgeAssuranceDismissableNotice.tsx @@ -2,7 +2,7 @@ import {View} from 'react-native' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgeInfo} from '#/state/age-assurance/useAgeInfo' +import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs' import {atoms as a, type ViewStyleProp} from '#/alf' import {AgeAssuranceAdmonition} from '#/components/ageAssurance/AgeAssuranceAdmonition' diff --git a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx index f1eef2257f..655c6e20a3 100644 --- a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx +++ b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx @@ -8,8 +8,8 @@ import {useCleanError} from '#/lib/hooks/useCleanError' import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo' import {useTLDs} from '#/lib/hooks/useTLDs' import {isEmailMaybeInvalid} from '#/lib/strings/email' -import {useAgeAssuranceContext} from '#/state/age-assurance' -import {useInitAgeAssurance} from '#/state/age-assurance/useInitAgeAssurance' +import {useAgeAssuranceContext} from '#/state/ageAssurance' +import {useInitAgeAssurance} from '#/state/ageAssurance/useInitAgeAssurance' import {useLanguagePrefs} from '#/state/preferences' import {useSession} from '#/state/session' import {atoms as a, useTheme, web} from '#/alf' diff --git a/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx b/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx index 747ab20dd4..717fe9ef83 100644 --- a/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx +++ b/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx @@ -6,7 +6,7 @@ import {useLingui} from '@lingui/react' import {retry} from '#/lib/async/retry' import {wait} from '#/lib/async/wait' import {isNative} from '#/platform/detection' -import {useAgeAssuranceAPIContext} from '#/state/age-assurance' +import {useAgeAssuranceAPIContext} from '#/state/ageAssurance' import {useAgent} from '#/state/session' import {atoms as a, useTheme, web} from '#/alf' import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge' diff --git a/src/components/ageAssurance/AgeRestrictedScreen.tsx b/src/components/ageAssurance/AgeRestrictedScreen.tsx index 6f8209f715..a8afd01fb8 100644 --- a/src/components/ageAssurance/AgeRestrictedScreen.tsx +++ b/src/components/ageAssurance/AgeRestrictedScreen.tsx @@ -2,7 +2,7 @@ import {View} from 'react-native' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgeInfo} from '#/state/age-assurance/useAgeInfo' +import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' import {atoms as a} from '#/alf' import {Admonition} from '#/components/Admonition' import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge' diff --git a/src/lib/notifications/notifications.ts b/src/lib/notifications/notifications.ts index e23337a8c1..ee0dbed9ac 100644 --- a/src/lib/notifications/notifications.ts +++ b/src/lib/notifications/notifications.ts @@ -8,7 +8,7 @@ import debounce from 'lodash.debounce' import {PUBLIC_APPVIEW_DID, PUBLIC_STAGING_APPVIEW_DID} from '#/lib/constants' import {logger as notyLogger} from '#/lib/notifications/util' import {isNative} from '#/platform/detection' -import {useAgeAssuranceContext} from '#/state/age-assurance' +import {useAgeAssuranceContext} from '#/state/ageAssurance' import {type SessionAccount, useAgent, useSession} from '#/state/session' import BackgroundNotificationHandler from '#/../modules/expo-background-notification-handler' diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx index 4231ebb794..ce12d44f23 100644 --- a/src/screens/Moderation/index.tsx +++ b/src/screens/Moderation/index.tsx @@ -12,8 +12,8 @@ import { } from '#/lib/routes/types' import {logger} from '#/logger' import {isIOS} from '#/platform/detection' -import {useAgeAssuranceContext} from '#/state/age-assurance' -import {useAgeInfo} from '#/state/age-assurance/useAgeInfo' +import {useAgeAssuranceContext} from '#/state/ageAssurance' +import {useAgeInfo} from '#/state/ageAssurance/useAgeInfo' import { useMyLabelersQuery, usePreferencesQuery, diff --git a/src/state/age-assurance/const.ts b/src/state/ageAssurance/const.ts similarity index 100% rename from src/state/age-assurance/const.ts rename to src/state/ageAssurance/const.ts diff --git a/src/state/age-assurance/index.tsx b/src/state/ageAssurance/index.tsx similarity index 99% rename from src/state/age-assurance/index.tsx rename to src/state/ageAssurance/index.tsx index 68c4dff295..5a5d69101b 100644 --- a/src/state/age-assurance/index.tsx +++ b/src/state/ageAssurance/index.tsx @@ -11,7 +11,7 @@ import {Logger} from '#/logger' import { type AgeAssuranceAPIContextType, type AgeAssuranceContextType, -} from '#/state/age-assurance/types' +} from '#/state/ageAssurance/types' import {useGeolocation} from '#/state/geolocation' import {STALE} from '#/state/queries' import {useAgent} from '#/state/session' diff --git a/src/state/age-assurance/types.ts b/src/state/ageAssurance/types.ts similarity index 100% rename from src/state/age-assurance/types.ts rename to src/state/ageAssurance/types.ts diff --git a/src/state/age-assurance/useAgeInfo.ts b/src/state/ageAssurance/useAgeInfo.ts similarity index 92% rename from src/state/age-assurance/useAgeInfo.ts rename to src/state/ageAssurance/useAgeInfo.ts index 3123dae9f9..8825b63819 100644 --- a/src/state/age-assurance/useAgeInfo.ts +++ b/src/state/ageAssurance/useAgeInfo.ts @@ -1,6 +1,6 @@ import {useMemo} from 'react' -import {useAgeAssuranceContext} from '#/state/age-assurance' +import {useAgeAssuranceContext} from '#/state/ageAssurance' import {usePreferencesQuery} from '#/state/queries/preferences' /** diff --git a/src/state/age-assurance/useInitAgeAssurance.ts b/src/state/ageAssurance/useInitAgeAssurance.ts similarity index 97% rename from src/state/age-assurance/useInitAgeAssurance.ts rename to src/state/ageAssurance/useInitAgeAssurance.ts index f4134405d7..6210e37e0d 100644 --- a/src/state/age-assurance/useInitAgeAssurance.ts +++ b/src/state/ageAssurance/useInitAgeAssurance.ts @@ -14,7 +14,7 @@ import { } from '#/lib/constants' import {isNetworkError} from '#/lib/hooks/useCleanError' import {logger} from '#/logger' -import {createAgeAssuranceQueryKey} from '#/state/age-assurance' +import {createAgeAssuranceQueryKey} from '#/state/ageAssurance' import {useGeolocation} from '#/state/geolocation' import {useAgent} from '#/state/session' diff --git a/src/state/age-assurance/useMaybeApplyAgeRestrictedModerationPrefs.ts b/src/state/ageAssurance/useMaybeApplyAgeRestrictedModerationPrefs.ts similarity index 79% rename from src/state/age-assurance/useMaybeApplyAgeRestrictedModerationPrefs.ts rename to src/state/ageAssurance/useMaybeApplyAgeRestrictedModerationPrefs.ts index be2fca31dd..a90b39b897 100644 --- a/src/state/age-assurance/useMaybeApplyAgeRestrictedModerationPrefs.ts +++ b/src/state/ageAssurance/useMaybeApplyAgeRestrictedModerationPrefs.ts @@ -1,8 +1,8 @@ import {useCallback} from 'react' import {type ModerationPrefs} from '@atproto/api' -import {useAgeAssuranceContext} from '#/state/age-assurance' -import {AGE_RESTRICTED_MODERATION_PREFS} from '#/state/age-assurance/const' +import {useAgeAssuranceContext} from '#/state/ageAssurance' +import {AGE_RESTRICTED_MODERATION_PREFS} from '#/state/ageAssurance/const' /** * Hook to conditionally apply age-restricted moderation preferences, if diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts index 5f2ac9f4c5..076543444c 100644 --- a/src/state/queries/post-feed.ts +++ b/src/state/queries/post-feed.ts @@ -32,7 +32,7 @@ import {FeedTuner, type FeedTunerFn} from '#/lib/api/feed-manip' import {DISCOVER_FEED_URI} from '#/lib/constants' import {BSKY_FEED_OWNER_DIDS} from '#/lib/constants' import {logger} from '#/logger' -import {useAgeAssuranceContext} from '#/state/age-assurance' +import {useAgeAssuranceContext} from '#/state/ageAssurance' import {STALE} from '#/state/queries' import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const' import {useAgent} from '#/state/session' diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts index fa1f734c41..f08155226c 100644 --- a/src/state/queries/preferences/index.ts +++ b/src/state/queries/preferences/index.ts @@ -10,7 +10,7 @@ import {PROD_DEFAULT_FEED} from '#/lib/constants' import {replaceEqualDeep} from '#/lib/functions' import {getAge} from '#/lib/strings/time' import {logger} from '#/logger' -import {useMaybeApplyAgeRestrictedModerationPrefs} from '#/state/age-assurance/useMaybeApplyAgeRestrictedModerationPrefs' +import {useMaybeApplyAgeRestrictedModerationPrefs} from '#/state/ageAssurance/useMaybeApplyAgeRestrictedModerationPrefs' import {STALE} from '#/state/queries' import { DEFAULT_HOME_FEED_PREFS,