diff --git a/assets/images/activity_notifications_announcement.png b/assets/images/activity_notifications_announcement.png deleted file mode 100644 index 221297faac..0000000000 Binary files a/assets/images/activity_notifications_announcement.png and /dev/null differ diff --git a/assets/images/notification_settings_announcement.png b/assets/images/notification_settings_announcement.png new file mode 100644 index 0000000000..8e6763d3c6 Binary files /dev/null and b/assets/images/notification_settings_announcement.png differ diff --git a/src/components/dialogs/nuxs/ActivityNotificationsAnnouncement.tsx b/src/components/dialogs/nuxs/GranularNotificationsSettings.tsx similarity index 58% rename from src/components/dialogs/nuxs/ActivityNotificationsAnnouncement.tsx rename to src/components/dialogs/nuxs/GranularNotificationsSettings.tsx index b955e9622a..ae2a596071 100644 --- a/src/components/dialogs/nuxs/ActivityNotificationsAnnouncement.tsx +++ b/src/components/dialogs/nuxs/GranularNotificationsSettings.tsx @@ -6,6 +6,7 @@ import {useLingui} from '@lingui/react' import {useNavigation} from '@react-navigation/native' import {type NavigationProp} from '#/lib/routes/types' +import {isWeb} from '#/platform/detection' import {atoms as a, useBreakpoints, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' @@ -13,7 +14,7 @@ import {useNuxDialogContext} from '#/components/dialogs/nuxs' import {Sparkle_Stroke2_Corner0_Rounded as SparkleIcon} from '#/components/icons/Sparkle' import {Text} from '#/components/Typography' -export function ActivityNotificationsAnnouncement() { +export function GranularNotificationsSettings() { const t = useTheme() const {_} = useLingui() const {gtMobile} = useBreakpoints() @@ -32,7 +33,7 @@ export function ActivityNotificationsAnnouncement() { - + {_( - - - - Get notified when someone posts + + + + More control over your notifications - + - You can now choose to receive notifications for when specific - people make new posts. If there’s someone you want timely - updates from, go to their profile and find the new bell icon - near the follow button. - - - - - By default, only people you follow can subscribe to you. You can - change this in Settings. + Now you can choose exactly what you want to be notified about. + Visit your notification settings to fine-tune your preferences. - + + {!isWeb && ( + + )} - diff --git a/src/components/dialogs/nuxs/index.tsx b/src/components/dialogs/nuxs/index.tsx index 278272bf24..994a13ac08 100644 --- a/src/components/dialogs/nuxs/index.tsx +++ b/src/components/dialogs/nuxs/index.tsx @@ -11,8 +11,7 @@ import { import {useProfileQuery} from '#/state/queries/profile' import {type SessionAccount, useSession} from '#/state/session' import {useOnboardingState} from '#/state/shell' -import {ActivityNotificationsAnnouncement} from '#/components/dialogs/nuxs/ActivityNotificationsAnnouncement' -import {InitialVerificationAnnouncement} from '#/components/dialogs/nuxs/InitialVerificationAnnouncement' +import {GranularNotificationsSettings} from '#/components/dialogs/nuxs/GranularNotificationsSettings' /* * NUXs */ @@ -34,7 +33,7 @@ const queuedNuxs: { }) => boolean }[] = [ { - id: Nux.ActivityNotificationsAnnouncement, + id: Nux.GranularNotificationsSettings, enabled: ({currentProfile}) => { // TODO just filler rn return isExistingUserAsOf( @@ -116,7 +115,7 @@ function Inner({ } React.useEffect(() => { - if (snoozed) return + // if (snoozed) return if (!nuxs) return for (const {id, enabled} of queuedNuxs) { @@ -124,7 +123,7 @@ function Inner({ // check if completed first if (nux && nux.completed) { - continue + // continue } // then check gate (track exposure) @@ -177,11 +176,8 @@ function Inner({ return ( {/*For example, activeNux === Nux.NeueTypography && */} - {activeNux === Nux.InitialVerificationAnnouncement && ( - - )} - {activeNux === Nux.ActivityNotificationsAnnouncement && ( - + {activeNux === Nux.GranularNotificationsSettings && ( + )} ) diff --git a/src/state/queries/nuxs/definitions.ts b/src/state/queries/nuxs/definitions.ts index fbc240a7a6..8265607e30 100644 --- a/src/state/queries/nuxs/definitions.ts +++ b/src/state/queries/nuxs/definitions.ts @@ -6,7 +6,7 @@ export enum Nux { NeueTypography = 'NeueTypography', ExploreInterestsCard = 'ExploreInterestsCard', InitialVerificationAnnouncement = 'InitialVerificationAnnouncement', - ActivityNotificationsAnnouncement = 'ActivityNotificationsAnnouncement', + GranularNotificationsSettings = 'GranularNotificationsSettings', } export const nuxNames = new Set(Object.values(Nux)) @@ -25,7 +25,7 @@ export type AppNux = BaseNux< data: undefined } | { - id: Nux.ActivityNotificationsAnnouncement + id: Nux.GranularNotificationsSettings data: undefined } > @@ -34,5 +34,5 @@ export const NuxSchemas: Record | undefined> = { [Nux.NeueTypography]: undefined, [Nux.ExploreInterestsCard]: undefined, [Nux.InitialVerificationAnnouncement]: undefined, - [Nux.ActivityNotificationsAnnouncement]: undefined, + [Nux.GranularNotificationsSettings]: undefined, }