{
+ const nearScreen = useContext(NearScreenContext)
+
+ return nearScreen ? children : null
+}
+
function VideoError({error, retry}: {error: unknown; retry: () => void}) {
const {_} = useLingui()
diff --git a/src/components/ProfileHoverCard/index.tsx b/src/components/ProfileHoverCard/index.tsx
index 980336ee4a..b33fdec2d6 100644
--- a/src/components/ProfileHoverCard/index.tsx
+++ b/src/components/ProfileHoverCard/index.tsx
@@ -1,4 +1,4 @@
-import {ProfileHoverCardProps} from './types'
+import {type ProfileHoverCardProps} from './types'
export function ProfileHoverCard({children}: ProfileHoverCardProps) {
return children
diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx
index eb6efa4c97..5aa57cde1e 100644
--- a/src/components/ProfileHoverCard/index.web.tsx
+++ b/src/components/ProfileHoverCard/index.web.tsx
@@ -74,7 +74,9 @@ export function ProfileHoverCard(props: ProfileHoverCardProps) {
return props.children
} else {
return (
-
+
)
@@ -326,7 +328,7 @@ export function ProfileHoverCardInner(props: ProfileHoverCardProps) {
onPointerLeave={onPointerLeaveTarget}
// @ts-ignore web only prop
onMouseUp={onPress}
- style={{flexShrink: 1}}>
+ style={[a.flex_shrink, props.inline && a.inline]}>
{props.children}
{isVisible && (
diff --git a/src/components/ProfileHoverCard/types.ts b/src/components/ProfileHoverCard/types.ts
index 7d9e19ac5b..f99254e401 100644
--- a/src/components/ProfileHoverCard/types.ts
+++ b/src/components/ProfileHoverCard/types.ts
@@ -6,4 +6,5 @@ export type ProfileHoverCardProps = ViewStyleProp & {
children: React.ReactNode
did: string
disable?: boolean
+ inline?: boolean
}
diff --git a/src/components/Select/index.web.tsx b/src/components/Select/index.web.tsx
index a4d3fb80b6..cfb401f97d 100644
--- a/src/components/Select/index.web.tsx
+++ b/src/components/Select/index.web.tsx
@@ -190,6 +190,7 @@ export function Content({items, renderItem}: ContentProps) {
a.border,
t.atoms.border_contrast_low,
a.rounded_sm,
+ a.overflow_hidden,
]}>
diff --git a/src/components/Toast/Toast.tsx b/src/components/Toast/Toast.tsx
index 0dc9d4b079..2d1ea4261e 100644
--- a/src/components/Toast/Toast.tsx
+++ b/src/components/Toast/Toast.tsx
@@ -1,21 +1,21 @@
import {createContext, useContext, useMemo} from 'react'
import {View} from 'react-native'
-import {atoms as a, select, useTheme} from '#/alf'
-import {Check_Stroke2_Corner0_Rounded as SuccessIcon} from '#/components/icons/Check'
+import {atoms as a, select, useAlf, useTheme} from '#/alf'
import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo'
import {CircleInfo_Stroke2_Corner0_Rounded as ErrorIcon} from '#/components/icons/CircleInfo'
import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons/Warning'
import {type ToastType} from '#/components/Toast/types'
import {Text} from '#/components/Typography'
+import {CircleCheck_Stroke2_Corner0_Rounded as CircleCheck} from '../icons/CircleCheck'
type ContextType = {
type: ToastType
}
export const ICONS = {
- default: SuccessIcon,
- success: SuccessIcon,
+ default: CircleCheck,
+ success: CircleCheck,
error: ErrorIcon,
warning: WarningIcon,
info: CircleInfo,
@@ -32,9 +32,19 @@ export function Toast({
type: ToastType
content: React.ReactNode
}) {
+ const {fonts} = useAlf()
const t = useTheme()
const styles = useToastStyles({type})
const Icon = ICONS[type]
+ /**
+ * Vibes-based number, adjusts `top` of `View` that wraps the text to
+ * compensate for different type sizes and keep the first line of text
+ * aligned with the icon. - esb
+ */
+ const fontScaleCompensation = useMemo(
+ () => parseInt(fonts.scale) * -1 * 0.65,
+ [fonts.scale],
+ )
return (
({type}), [type])}>
@@ -56,7 +66,13 @@ export function Toast({
]}>
-
+
{typeof content === 'string' ? (
{content}
) : (
@@ -91,114 +107,58 @@ function useToastStyles({type}: {type: ToastType}) {
return useMemo(() => {
return {
default: {
- backgroundColor: select(t.name, {
- light: t.atoms.bg_contrast_25.backgroundColor,
- dim: t.atoms.bg_contrast_100.backgroundColor,
- dark: t.atoms.bg_contrast_100.backgroundColor,
- }),
- borderColor: select(t.name, {
- light: t.atoms.border_contrast_low.borderColor,
- dim: t.atoms.border_contrast_high.borderColor,
- dark: t.atoms.border_contrast_high.borderColor,
- }),
- iconColor: select(t.name, {
- light: t.atoms.text_contrast_medium.color,
- dim: t.atoms.text_contrast_medium.color,
- dark: t.atoms.text_contrast_medium.color,
- }),
- textColor: select(t.name, {
- light: t.atoms.text_contrast_medium.color,
- dim: t.atoms.text_contrast_medium.color,
- dark: t.atoms.text_contrast_medium.color,
- }),
+ backgroundColor: t.atoms.bg_contrast_25.backgroundColor,
+ borderColor: t.atoms.border_contrast_low.borderColor,
+ iconColor: t.atoms.text.color,
+ textColor: t.atoms.text.color,
},
success: {
- backgroundColor: select(t.name, {
- light: t.palette.primary_100,
- dim: t.palette.primary_100,
- dark: t.palette.primary_50,
- }),
+ backgroundColor: t.palette.primary_25,
borderColor: select(t.name, {
- light: t.palette.primary_500,
- dim: t.palette.primary_500,
- dark: t.palette.primary_500,
+ light: t.palette.primary_300,
+ dim: t.palette.primary_200,
+ dark: t.palette.primary_100,
}),
iconColor: select(t.name, {
- light: t.palette.primary_500,
- dim: t.palette.primary_600,
- dark: t.palette.primary_600,
+ light: t.palette.primary_600,
+ dim: t.palette.primary_700,
+ dark: t.palette.primary_700,
}),
textColor: select(t.name, {
- light: t.palette.primary_500,
- dim: t.palette.primary_600,
- dark: t.palette.primary_600,
+ light: t.palette.primary_600,
+ dim: t.palette.primary_700,
+ dark: t.palette.primary_700,
}),
},
error: {
- backgroundColor: select(t.name, {
- light: t.palette.negative_200,
- dim: t.palette.negative_25,
- dark: t.palette.negative_25,
- }),
+ backgroundColor: t.palette.negative_25,
borderColor: select(t.name, {
- light: t.palette.negative_300,
- dim: t.palette.negative_300,
- dark: t.palette.negative_300,
+ light: t.palette.negative_200,
+ dim: t.palette.negative_200,
+ dark: t.palette.negative_100,
}),
iconColor: select(t.name, {
- light: t.palette.negative_600,
- dim: t.palette.negative_600,
- dark: t.palette.negative_600,
+ light: t.palette.negative_700,
+ dim: t.palette.negative_900,
+ dark: t.palette.negative_900,
}),
textColor: select(t.name, {
- light: t.palette.negative_600,
- dim: t.palette.negative_600,
- dark: t.palette.negative_600,
+ light: t.palette.negative_700,
+ dim: t.palette.negative_900,
+ dark: t.palette.negative_900,
}),
},
warning: {
- backgroundColor: select(t.name, {
- light: t.atoms.bg_contrast_25.backgroundColor,
- dim: t.atoms.bg_contrast_100.backgroundColor,
- dark: t.atoms.bg_contrast_100.backgroundColor,
- }),
- borderColor: select(t.name, {
- light: t.atoms.border_contrast_low.borderColor,
- dim: t.atoms.border_contrast_high.borderColor,
- dark: t.atoms.border_contrast_high.borderColor,
- }),
- iconColor: select(t.name, {
- light: t.atoms.text_contrast_medium.color,
- dim: t.atoms.text_contrast_medium.color,
- dark: t.atoms.text_contrast_medium.color,
- }),
- textColor: select(t.name, {
- light: t.atoms.text_contrast_medium.color,
- dim: t.atoms.text_contrast_medium.color,
- dark: t.atoms.text_contrast_medium.color,
- }),
+ backgroundColor: t.atoms.bg_contrast_25.backgroundColor,
+ borderColor: t.atoms.border_contrast_low.borderColor,
+ iconColor: t.atoms.text.color,
+ textColor: t.atoms.text.color,
},
info: {
- backgroundColor: select(t.name, {
- light: t.atoms.bg_contrast_25.backgroundColor,
- dim: t.atoms.bg_contrast_100.backgroundColor,
- dark: t.atoms.bg_contrast_100.backgroundColor,
- }),
- borderColor: select(t.name, {
- light: t.atoms.border_contrast_low.borderColor,
- dim: t.atoms.border_contrast_high.borderColor,
- dark: t.atoms.border_contrast_high.borderColor,
- }),
- iconColor: select(t.name, {
- light: t.atoms.text_contrast_medium.color,
- dim: t.atoms.text_contrast_medium.color,
- dark: t.atoms.text_contrast_medium.color,
- }),
- textColor: select(t.name, {
- light: t.atoms.text_contrast_medium.color,
- dim: t.atoms.text_contrast_medium.color,
- dark: t.atoms.text_contrast_medium.color,
- }),
+ backgroundColor: t.atoms.bg_contrast_25.backgroundColor,
+ borderColor: t.atoms.border_contrast_low.borderColor,
+ iconColor: t.atoms.text.color,
+ textColor: t.atoms.text.color,
},
}[type]
}, [t, type])
diff --git a/src/components/Toast/index.e2e.tsx b/src/components/Toast/index.e2e.tsx
index 57daf5bf0d..64072d88d0 100644
--- a/src/components/Toast/index.e2e.tsx
+++ b/src/components/Toast/index.e2e.tsx
@@ -1,5 +1,9 @@
+import {type ToastApi} from '#/components/Toast/types'
+
export function ToastContainer() {
return null
}
-export function show() {}
+export const toast: ToastApi = {
+ show() {},
+}
diff --git a/src/components/Toast/index.web.tsx b/src/components/Toast/index.web.tsx
index f6ceda568e..f2517e28da 100644
--- a/src/components/Toast/index.web.tsx
+++ b/src/components/Toast/index.web.tsx
@@ -78,7 +78,12 @@ export const ToastContainer: React.FC = ({}) => {
setActiveToast(undefined)}
/>
diff --git a/src/components/live/EditLiveDialog.tsx b/src/components/live/EditLiveDialog.tsx
index cdffb3286e..63fe664e55 100644
--- a/src/components/live/EditLiveDialog.tsx
+++ b/src/components/live/EditLiveDialog.tsx
@@ -240,7 +240,7 @@ function DialogInner({
label={_(msg`Remove live status`)}
onPress={() => removeLiveStatus()}
size={platform({native: 'large', web: 'small'})}
- color="negative_secondary"
+ color="negative_subtle"
variant="solid"
disabled={isRemovingLiveStatus || isGoingLive}>
diff --git a/src/env/common.ts b/src/env/common.ts
index 5b902622bc..dd2df7b17a 100644
--- a/src/env/common.ts
+++ b/src/env/common.ts
@@ -78,3 +78,10 @@ export const SENTRY_DSN: string | undefined = process.env.EXPO_PUBLIC_SENTRY_DSN
*/
export const BITDRIFT_API_KEY: string | undefined =
process.env.EXPO_PUBLIC_BITDRIFT_API_KEY
+
+/**
+ * GCP project ID which is required for device attestation
+ */
+export const GCP_PROJECT_ID: number = Number(
+ process.env.EXPO_PUBLIC_GCP_PROJECT_ID,
+)
diff --git a/src/lib/api/feed-manip.ts b/src/lib/api/feed-manip.ts
index 3309191f34..335bf28c84 100644
--- a/src/lib/api/feed-manip.ts
+++ b/src/lib/api/feed-manip.ts
@@ -41,6 +41,7 @@ export class FeedViewPostsSlice {
isIncompleteThread: boolean
isFallbackMarker: boolean
isOrphan: boolean
+ isThreadMuted: boolean
rootUri: string
feedPostUri: string
@@ -50,6 +51,7 @@ export class FeedViewPostsSlice {
this.isIncompleteThread = false
this.isFallbackMarker = false
this.isOrphan = false
+ this.isThreadMuted = post.viewer?.threadMuted ?? false
this.feedPostUri = post.uri
if (AppBskyFeedDefs.isPostView(reply?.root)) {
this.rootUri = reply.root.uri
@@ -361,6 +363,20 @@ export class FeedTuner {
return slices
}
+ static removeMutedThreads(
+ tuner: FeedTuner,
+ slices: FeedViewPostsSlice[],
+ _dryRun: boolean,
+ ) {
+ for (let i = 0; i < slices.length; i++) {
+ if (slices[i].isThreadMuted) {
+ slices.splice(i, 1)
+ i--
+ }
+ }
+ return slices
+ }
+
static dedupThreads(
tuner: FeedTuner,
slices: FeedViewPostsSlice[],
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 15785d2610..21f0ab870e 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -208,3 +208,10 @@ export const PUBLIC_APPVIEW_DID = 'did:web:api.bsky.app'
export const PUBLIC_STAGING_APPVIEW_DID = 'did:web:api.staging.bsky.dev'
export const DEV_ENV_APPVIEW = `http://localhost:2584` // always the same
+
+export const webLinks = {
+ tos: `https://bsky.social/about/support/tos`,
+ privacy: `https://bsky.social/about/support/privacy-policy`,
+ community: `https://bsky.social/about/support/community-guidelines`,
+ communityDeprecated: `https://bsky.social/about/support/community-guidelines-deprecated`,
+}
diff --git a/src/lib/hooks/useNotificationHandler.ts b/src/lib/hooks/useNotificationHandler.ts
index ddee11fb5d..7db48f4324 100644
--- a/src/lib/hooks/useNotificationHandler.ts
+++ b/src/lib/hooks/useNotificationHandler.ts
@@ -301,17 +301,6 @@ export function useNotificationsHandler() {
const payload = getNotificationPayload(e.notification)
if (payload) {
- if (!payload.reason) {
- notyLogger.error(
- 'useNotificationsHandler: received unknown payload',
- {
- payload,
- identifier: e.notification.request.identifier,
- },
- )
- return
- }
-
notyLogger.debug(
'User pressed a notification, opening notifications tab',
{},
@@ -393,16 +382,20 @@ export function getNotificationPayload(
isIOS ? e.request.trigger.payload : e.request.content.data
) as NotificationPayload
- if (payload) {
+ if (payload && payload.reason) {
return payload
} else {
+ if (payload) {
+ notyLogger.warn('getNotificationPayload: received unknown payload', {
+ payload,
+ identifier: e.request.identifier,
+ })
+ }
return null
}
}
-export function notificationToURL(
- payload: NotificationPayload,
-): string | undefined {
+export function notificationToURL(payload: NotificationPayload): string | null {
switch (payload?.reason) {
case 'like':
case 'repost':
@@ -433,10 +426,12 @@ export function notificationToURL(
}
case 'chat-message':
// should be handled separately
- return undefined
+ return null
case 'verified':
case 'unverified':
- default:
return '/notifications'
+ default:
+ // do nothing if we don't know what to do with it
+ return null
}
}
diff --git a/src/lib/statsig/gates.ts b/src/lib/statsig/gates.ts
index bdcdf06cb8..66134a4629 100644
--- a/src/lib/statsig/gates.ts
+++ b/src/lib/statsig/gates.ts
@@ -3,6 +3,7 @@ export type Gate =
| 'alt_share_icon'
| 'debug_show_feedcontext'
| 'debug_subscriptions'
+ | 'disable_onboarding_policy_update_notice'
| 'explore_show_suggested_feeds'
| 'handle_suggestions'
| 'old_postonboarding'
diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po
index f5faf1e5e0..6e6b8fa755 100644
--- a/src/locale/locales/en/messages.po
+++ b/src/locale/locales/en/messages.po
@@ -518,8 +518,8 @@ msgstr ""
#: src/Navigation.tsx:523
#: src/screens/Settings/AboutSettings.tsx:75
-#: src/screens/Settings/Settings.tsx:240
-#: src/screens/Settings/Settings.tsx:243
+#: src/screens/Settings/Settings.tsx:244
+#: src/screens/Settings/Settings.tsx:247
msgid "About"
msgstr ""
@@ -538,8 +538,8 @@ msgid "Accept Request"
msgstr ""
#: src/screens/Settings/AccessibilitySettings.tsx:44
-#: src/screens/Settings/Settings.tsx:216
-#: src/screens/Settings/Settings.tsx:219
+#: src/screens/Settings/Settings.tsx:220
+#: src/screens/Settings/Settings.tsx:223
msgid "Accessibility"
msgstr ""
@@ -550,8 +550,8 @@ msgstr ""
#: src/Navigation.tsx:398
#: src/screens/Login/LoginForm.tsx:194
#: src/screens/Settings/AccountSettings.tsx:49
-#: src/screens/Settings/Settings.tsx:170
-#: src/screens/Settings/Settings.tsx:173
+#: src/screens/Settings/Settings.tsx:174
+#: src/screens/Settings/Settings.tsx:177
msgid "Account"
msgstr ""
@@ -582,11 +582,11 @@ msgstr ""
msgid "Account Muted by List"
msgstr ""
-#: src/screens/Settings/Settings.tsx:582
+#: src/screens/Settings/Settings.tsx:624
msgid "Account options"
msgstr ""
-#: src/screens/Settings/Settings.tsx:618
+#: src/screens/Settings/Settings.tsx:660
msgid "Account removed from quick access"
msgstr ""
@@ -668,8 +668,8 @@ msgstr ""
msgid "Add alt text (optional)"
msgstr ""
-#: src/screens/Settings/Settings.tsx:522
-#: src/screens/Settings/Settings.tsx:525
+#: src/screens/Settings/Settings.tsx:564
+#: src/screens/Settings/Settings.tsx:567
#: src/view/shell/desktop/LeftNav.tsx:259
#: src/view/shell/desktop/LeftNav.tsx:263
msgid "Add another account"
@@ -921,11 +921,11 @@ msgstr ""
msgid "An error occurred while generating your starter pack. Want to try again?"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/index.tsx:160
+#: src/components/Post/Embed/VideoEmbed/index.tsx:157
msgid "An error occurred while loading the video. Please try again later."
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/index.web.tsx:199
+#: src/components/Post/Embed/VideoEmbed/index.web.tsx:226
msgid "An error occurred while loading the video. Please try again."
msgstr ""
@@ -999,6 +999,10 @@ msgstr ""
msgid "Animated GIF"
msgstr ""
+#: src/components/PolicyUpdateOverlay/Badge.tsx:33
+msgid "Announcement"
+msgstr ""
+
#: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37
msgid "Announcing verification on Bluesky"
msgstr ""
@@ -1093,8 +1097,8 @@ msgstr ""
#: src/Navigation.tsx:390
#: src/screens/Settings/AppearanceSettings.tsx:88
-#: src/screens/Settings/Settings.tsx:208
-#: src/screens/Settings/Settings.tsx:211
+#: src/screens/Settings/Settings.tsx:212
+#: src/screens/Settings/Settings.tsx:215
msgid "Appearance"
msgstr ""
@@ -1103,8 +1107,8 @@ msgstr ""
msgid "Apply default recommended feeds"
msgstr ""
-#: src/screens/Settings/Settings.tsx:490
-#: src/screens/Settings/Settings.tsx:492
+#: src/screens/Settings/Settings.tsx:498
+#: src/screens/Settings/Settings.tsx:500
msgid "Apply Pull Request"
msgstr ""
@@ -1402,6 +1406,14 @@ msgstr ""
msgid "Bluesky will proactively verify notable and authentic accounts."
msgstr ""
+#: src/screens/Signup/StepInfo/Policies.tsx:26
+msgid "Bluesky's Community Guidelines"
+msgstr ""
+
+#: src/screens/Signup/StepInfo/Policies.tsx:32
+msgid "Bluesky's Updated Community Guidelines"
+msgstr ""
+
#: src/screens/Settings/AppIconSettings/index.tsx:99
msgid "Bluesky+"
msgstr ""
@@ -1480,19 +1492,23 @@ msgstr ""
msgid "By <0>{0}"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:181
+msgid "By clicking \"Continue\" you acknowledge that you understand and agree to these updates."
+msgstr ""
+
#: src/components/ageAssurance/AgeAssuranceInitDialog.tsx:329
msgid "By continuing, you agree to the <0>KWS Terms of Use and acknowledge that KWS will store your verified status with your hashed email address in accordance with the <1>KWS Privacy Policy. This means you won’t need to verify again the next time you use this email for other apps, games, and services powered by KWS technology."
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:81
+#: src/screens/Signup/StepInfo/Policies.tsx:111
msgid "By creating an account you agree to the <0>Privacy Policy."
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:48
+#: src/screens/Signup/StepInfo/Policies.tsx:78
msgid "By creating an account you agree to the <0>Terms of Service and <1>Privacy Policy."
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:68
+#: src/screens/Signup/StepInfo/Policies.tsx:98
msgid "By creating an account you agree to the <0>Terms of Service."
msgstr ""
@@ -1525,7 +1541,7 @@ msgstr ""
#: src/screens/Settings/AppIconSettings/index.tsx:225
#: src/screens/Settings/components/ChangeHandleDialog.tsx:78
#: src/screens/Settings/components/ChangeHandleDialog.tsx:85
-#: src/screens/Settings/Settings.tsx:285
+#: src/screens/Settings/Settings.tsx:289
#: src/screens/Takendown.tsx:99
#: src/screens/Takendown.tsx:102
#: src/view/com/composer/Composer.tsx:965
@@ -1748,11 +1764,11 @@ msgstr ""
msgid "Choose your username"
msgstr ""
-#: src/screens/Settings/Settings.tsx:482
+#: src/screens/Settings/Settings.tsx:490
msgid "Clear all storage data"
msgstr ""
-#: src/screens/Settings/Settings.tsx:484
+#: src/screens/Settings/Settings.tsx:492
msgid "Clear all storage data (restart after this)"
msgstr ""
@@ -1858,7 +1874,7 @@ msgstr ""
msgid "Close dialog"
msgstr ""
-#: src/view/shell/index.web.tsx:89
+#: src/view/shell/index.web.tsx:100
msgid "Close drawer menu"
msgstr ""
@@ -1933,6 +1949,7 @@ msgstr ""
msgid "Comics"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:45
#: src/Navigation.tsx:340
#: src/view/screens/CommunityGuidelines.tsx:34
msgid "Community Guidelines"
@@ -2029,8 +2046,8 @@ msgstr ""
msgid "Content & Media"
msgstr ""
-#: src/screens/Settings/Settings.tsx:200
-#: src/screens/Settings/Settings.tsx:203
+#: src/screens/Settings/Settings.tsx:204
+#: src/screens/Settings/Settings.tsx:207
msgid "Content and media"
msgstr ""
@@ -2076,6 +2093,8 @@ msgstr ""
msgid "Context menu backdrop, click to close the menu."
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:162
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:170
#: src/screens/Onboarding/StepInterests/index.tsx:244
#: src/screens/Onboarding/StepProfile/index.tsx:276
msgid "Continue"
@@ -2230,6 +2249,8 @@ msgstr ""
msgid "Copy TXT record value"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:40
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:107
#: src/Navigation.tsx:345
#: src/view/screens/CopyrightPolicy.tsx:31
msgid "Copyright Policy"
@@ -2398,7 +2419,7 @@ msgstr ""
msgid "Deactivate account"
msgstr ""
-#: src/screens/Settings/Settings.tsx:447
+#: src/screens/Settings/Settings.tsx:455
msgid "Debug Moderation"
msgstr ""
@@ -2447,7 +2468,7 @@ msgstr ""
msgid "Delete chat"
msgstr ""
-#: src/screens/Settings/Settings.tsx:454
+#: src/screens/Settings/Settings.tsx:462
msgid "Delete chat declaration record"
msgstr ""
@@ -2563,8 +2584,8 @@ msgctxt "toast"
msgid "Developer mode enabled"
msgstr ""
-#: src/screens/Settings/Settings.tsx:267
-#: src/screens/Settings/Settings.tsx:270
+#: src/screens/Settings/Settings.tsx:271
+#: src/screens/Settings/Settings.tsx:274
msgid "Developer options"
msgstr ""
@@ -2659,12 +2680,13 @@ msgstr ""
msgid "Dismiss interests"
msgstr ""
-#: src/components/interstitials/TrendingVideos.tsx:89
-msgid "Dismiss this section"
+#. Accessibility label for dismissing a toast notification
+#: src/components/Toast/index.web.tsx:82
+msgid "Dismiss message"
msgstr ""
-#: src/components/Toast/index.web.tsx:81
-msgid "Dismiss toast"
+#: src/components/interstitials/TrendingVideos.tsx:89
+msgid "Dismiss this section"
msgstr ""
#: src/screens/Settings/AccessibilitySettings.tsx:69
@@ -3101,7 +3123,7 @@ msgstr ""
msgid "Enter your username and password"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:135
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:132
msgid "Enters full screen"
msgstr ""
@@ -4033,8 +4055,8 @@ msgstr ""
msgid "Having trouble?"
msgstr ""
-#: src/screens/Settings/Settings.tsx:232
#: src/screens/Settings/Settings.tsx:236
+#: src/screens/Settings/Settings.tsx:240
#: src/view/shell/desktop/RightNav.tsx:120
#: src/view/shell/desktop/RightNav.tsx:121
#: src/view/shell/Drawer.tsx:370
@@ -4049,6 +4071,11 @@ msgstr ""
msgid "Here is your app password!"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:73
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:119
+msgid "Hey there 👋"
+msgstr ""
+
#: src/components/VideoPostCard.tsx:178
#: src/components/VideoPostCard.tsx:460
msgid "Hidden"
@@ -4225,7 +4252,7 @@ msgstr ""
msgid "If alt text is long, toggles alt text expanded state"
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:112
+#: src/screens/Signup/StepInfo/Policies.tsx:142
msgid "If you are not yet an adult according to the laws of your country, your parent or legal guardian must read these Terms on your behalf."
msgstr ""
@@ -4404,7 +4431,7 @@ msgstr ""
msgid "Invite code"
msgstr ""
-#: src/screens/Signup/state.ts:339
+#: src/screens/Signup/state.ts:348
msgid "Invite code not accepted. Check that you input it correctly and try again."
msgstr ""
@@ -4516,8 +4543,8 @@ msgid "Language Settings"
msgstr ""
#: src/screens/Settings/LanguageSettings.tsx:78
-#: src/screens/Settings/Settings.tsx:224
-#: src/screens/Settings/Settings.tsx:227
+#: src/screens/Settings/Settings.tsx:228
+#: src/screens/Settings/Settings.tsx:231
msgid "Languages"
msgstr ""
@@ -4575,6 +4602,14 @@ msgstr ""
msgid "Learn more about the moderation applied to this content."
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:149
+msgid "Learn more about these changes and how to share your thoughts with us by <0>reading our blog post."
+msgstr ""
+
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:89
+msgid "Learn more about these changes and how to share your thoughts with us by reading our blog post."
+msgstr ""
+
#: src/components/moderation/PostHider.tsx:110
#: src/components/moderation/ScreenHider.tsx:127
msgid "Learn more about this warning"
@@ -5023,8 +5058,8 @@ msgstr ""
#: src/Navigation.tsx:176
#: src/screens/Moderation/index.tsx:99
-#: src/screens/Settings/Settings.tsx:184
-#: src/screens/Settings/Settings.tsx:187
+#: src/screens/Settings/Settings.tsx:188
+#: src/screens/Settings/Settings.tsx:191
msgid "Moderation"
msgstr ""
@@ -5115,7 +5150,7 @@ msgstr ""
msgid "Music"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:156
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:153
#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx:96
msgctxt "video"
msgid "Mute"
@@ -5625,8 +5660,8 @@ msgstr ""
#: src/screens/Settings/NotificationSettings/ReplyNotificationSettings.tsx:30
#: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:30
#: src/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings.tsx:30
-#: src/screens/Settings/Settings.tsx:192
-#: src/screens/Settings/Settings.tsx:195
+#: src/screens/Settings/Settings.tsx:196
+#: src/screens/Settings/Settings.tsx:199
#: src/view/screens/Notifications.tsx:130
#: src/view/shell/bottom-bar/BottomBar.tsx:252
#: src/view/shell/desktop/LeftNav.tsx:655
@@ -5699,7 +5734,7 @@ msgstr ""
msgid "on<0><1/><2><3/>"
msgstr ""
-#: src/screens/Settings/Settings.tsx:380
+#: src/screens/Settings/Settings.tsx:388
msgid "Onboarding reset"
msgstr ""
@@ -5797,7 +5832,7 @@ msgstr ""
msgid "Open message options"
msgstr ""
-#: src/screens/Settings/Settings.tsx:445
+#: src/screens/Settings/Settings.tsx:453
msgid "Open moderation debug page"
msgstr ""
@@ -5826,12 +5861,12 @@ msgstr ""
msgid "Open starter pack menu"
msgstr ""
-#: src/screens/Settings/Settings.tsx:438
-#: src/screens/Settings/Settings.tsx:452
+#: src/screens/Settings/Settings.tsx:446
+#: src/screens/Settings/Settings.tsx:460
msgid "Open storybook page"
msgstr ""
-#: src/screens/Settings/Settings.tsx:431
+#: src/screens/Settings/Settings.tsx:439
msgid "Open system log"
msgstr ""
@@ -5893,7 +5928,7 @@ msgstr ""
msgid "Opens GIF select dialog"
msgstr ""
-#: src/screens/Settings/Settings.tsx:233
+#: src/screens/Settings/Settings.tsx:237
msgid "Opens helpdesk in browser"
msgstr ""
@@ -5973,6 +6008,10 @@ msgstr ""
msgid "Other..."
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50
+msgid "Our blog post"
+msgstr ""
+
#: src/components/dms/ReportDialog.tsx:348
msgid "Our moderation team has received your report."
msgstr ""
@@ -6016,7 +6055,7 @@ msgid "Password updated!"
msgstr ""
#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:43
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:140
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:137
#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:369
msgid "Pause"
msgstr ""
@@ -6105,7 +6144,7 @@ msgid "Pinned to your feeds"
msgstr ""
#: src/components/Post/Embed/ExternalEmbed/Gif.tsx:43
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:140
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:137
#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:370
msgid "Play"
msgstr ""
@@ -6114,7 +6153,7 @@ msgstr ""
msgid "Play {0}"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/index.tsx:134
+#: src/components/Post/Embed/VideoEmbed/index.tsx:132
#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:321
msgid "Play video"
msgstr ""
@@ -6127,7 +6166,7 @@ msgstr ""
msgid "Plays or pauses the GIF"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:141
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:138
msgid "Plays or pauses the video"
msgstr ""
@@ -6147,11 +6186,11 @@ msgstr ""
msgid "Please check your email inbox for further instructions. It may take a minute or two to arrive."
msgstr ""
-#: src/screens/Signup/state.ts:286
+#: src/screens/Signup/state.ts:289
msgid "Please choose your handle."
msgstr ""
-#: src/screens/Signup/state.ts:278
+#: src/screens/Signup/state.ts:281
#: src/screens/Signup/StepInfo/index.tsx:120
msgid "Please choose your password."
msgstr ""
@@ -6160,7 +6199,7 @@ msgstr ""
msgid "Please click on the link in the email we just sent you to verify your new email address. This is an important step to allow you to continue enjoying all the features of Bluesky."
msgstr ""
-#: src/screens/Signup/state.ts:301
+#: src/screens/Signup/state.ts:304
msgid "Please complete the verification captcha."
msgstr ""
@@ -6208,7 +6247,7 @@ msgstr ""
msgid "Please enter the security code we sent to your previous email address."
msgstr ""
-#: src/screens/Signup/state.ts:262
+#: src/screens/Signup/state.ts:265
#: src/screens/Signup/StepInfo/index.tsx:91
msgid "Please enter your email."
msgstr ""
@@ -6241,6 +6280,11 @@ msgstr ""
msgid "Please explain why you think your chats were incorrectly disabled"
msgstr ""
+#: src/components/FocusScope/index.tsx:93
+#: src/components/FocusScope/index.tsx:117
+msgid "Please go back, or activate this element to return to the start of the active content."
+msgstr ""
+
#: src/components/ageAssurance/AgeAssuranceAppealDialog.tsx:98
msgid "Please provide any additional details you feel moderators may need in order to properly assess your Age Assurance status."
msgstr ""
@@ -6439,8 +6483,8 @@ msgstr ""
msgid "Privacy"
msgstr ""
-#: src/screens/Settings/Settings.tsx:178
-#: src/screens/Settings/Settings.tsx:181
+#: src/screens/Settings/Settings.tsx:182
+#: src/screens/Settings/Settings.tsx:185
msgid "Privacy and security"
msgstr ""
@@ -6455,6 +6499,8 @@ msgstr ""
msgid "Privacy and Security settings"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:35
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:102
#: src/Navigation.tsx:330
#: src/screens/Settings/AboutSettings.tsx:92
#: src/screens/Settings/AboutSettings.tsx:95
@@ -6637,17 +6683,21 @@ msgstr ""
msgid "Read more replies"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:112
+msgid "Read our blog post"
+msgstr ""
+
#: src/view/com/auth/SplashScreen.web.tsx:173
msgid "Read the Bluesky blog"
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:58
-#: src/screens/Signup/StepInfo/Policies.tsx:84
+#: src/screens/Signup/StepInfo/Policies.tsx:88
+#: src/screens/Signup/StepInfo/Policies.tsx:114
msgid "Read the Bluesky Privacy Policy"
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:51
-#: src/screens/Signup/StepInfo/Policies.tsx:71
+#: src/screens/Signup/StepInfo/Policies.tsx:81
+#: src/screens/Signup/StepInfo/Policies.tsx:101
msgid "Read the Bluesky Terms of Service"
msgstr ""
@@ -6699,7 +6749,7 @@ msgstr ""
#: src/components/FeedCard.tsx:343
#: src/components/StarterPack/Wizard/WizardListCard.tsx:102
#: src/components/StarterPack/Wizard/WizardListCard.tsx:109
-#: src/screens/Settings/Settings.tsx:620
+#: src/screens/Settings/Settings.tsx:662
#: src/view/com/modals/UserAddRemoveLists.tsx:235
#: src/view/com/posts/PostFeedErrorMessage.tsx:217
msgid "Remove"
@@ -6713,8 +6763,8 @@ msgstr ""
msgid "Remove {historyItem}"
msgstr ""
-#: src/screens/Settings/Settings.tsx:599
-#: src/screens/Settings/Settings.tsx:602
+#: src/screens/Settings/Settings.tsx:641
+#: src/screens/Settings/Settings.tsx:644
msgid "Remove account"
msgstr ""
@@ -6753,7 +6803,7 @@ msgstr ""
msgid "Remove from my feeds"
msgstr ""
-#: src/screens/Settings/Settings.tsx:612
+#: src/screens/Settings/Settings.tsx:654
msgid "Remove from quick access?"
msgstr ""
@@ -7118,8 +7168,8 @@ msgstr ""
msgid "Resend Verification Email"
msgstr ""
-#: src/screens/Settings/Settings.tsx:474
-#: src/screens/Settings/Settings.tsx:476
+#: src/screens/Settings/Settings.tsx:482
+#: src/screens/Settings/Settings.tsx:484
msgid "Reset activity subscription nudge"
msgstr ""
@@ -7132,8 +7182,8 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#: src/screens/Settings/Settings.tsx:459
-#: src/screens/Settings/Settings.tsx:461
+#: src/screens/Settings/Settings.tsx:467
+#: src/screens/Settings/Settings.tsx:469
msgid "Reset onboarding state"
msgstr ""
@@ -7633,7 +7683,7 @@ msgid "Sets email for password reset"
msgstr ""
#: src/Navigation.tsx:212
-#: src/screens/Settings/Settings.tsx:95
+#: src/screens/Settings/Settings.tsx:99
#: src/view/shell/desktop/LeftNav.tsx:728
#: src/view/shell/Drawer.tsx:572
msgid "Settings"
@@ -7893,7 +7943,7 @@ msgstr ""
msgid "Shows information about when this post was created"
msgstr ""
-#: src/screens/Settings/Settings.tsx:121
+#: src/screens/Settings/Settings.tsx:125
msgid "Shows other accounts you can switch to"
msgstr ""
@@ -7951,9 +8001,9 @@ msgstr ""
msgid "Sign in to view post"
msgstr ""
-#: src/screens/Settings/Settings.tsx:250
-#: src/screens/Settings/Settings.tsx:252
-#: src/screens/Settings/Settings.tsx:284
+#: src/screens/Settings/Settings.tsx:254
+#: src/screens/Settings/Settings.tsx:256
+#: src/screens/Settings/Settings.tsx:288
#: src/screens/SignupQueued.tsx:93
#: src/screens/SignupQueued.tsx:96
#: src/screens/Takendown.tsx:85
@@ -7967,7 +8017,7 @@ msgstr ""
msgid "Sign Out"
msgstr ""
-#: src/screens/Settings/Settings.tsx:281
+#: src/screens/Settings/Settings.tsx:285
#: src/view/shell/desktop/LeftNav.tsx:208
msgid "Sign out?"
msgstr ""
@@ -8065,8 +8115,8 @@ msgstr ""
msgid "Something wrong? Let us know."
msgstr ""
-#: src/App.native.tsx:123
-#: src/App.web.tsx:100
+#: src/App.native.tsx:124
+#: src/App.web.tsx:101
msgid "Sorry! Your session expired. Please sign in again."
msgstr ""
@@ -8171,12 +8221,12 @@ msgstr ""
msgid "Step {0} of {1}"
msgstr ""
-#: src/screens/Settings/Settings.tsx:385
+#: src/screens/Settings/Settings.tsx:393
msgid "Storage cleared, you need to restart the app now."
msgstr ""
#: src/Navigation.tsx:305
-#: src/screens/Settings/Settings.tsx:440
+#: src/screens/Settings/Settings.tsx:448
msgid "Storybook"
msgstr ""
@@ -8269,9 +8319,9 @@ msgstr ""
msgid "Support"
msgstr ""
-#: src/screens/Settings/Settings.tsx:119
-#: src/screens/Settings/Settings.tsx:133
-#: src/screens/Settings/Settings.tsx:562
+#: src/screens/Settings/Settings.tsx:123
+#: src/screens/Settings/Settings.tsx:137
+#: src/screens/Settings/Settings.tsx:604
#: src/view/shell/desktop/LeftNav.tsx:245
msgid "Switch account"
msgstr ""
@@ -8298,7 +8348,7 @@ msgstr ""
#: src/screens/Settings/AboutSettings.tsx:107
#: src/screens/Settings/AboutSettings.tsx:110
-#: src/screens/Settings/Settings.tsx:433
+#: src/screens/Settings/Settings.tsx:441
msgid "System log"
msgstr ""
@@ -8314,6 +8364,10 @@ msgstr ""
msgid "Tap for more information"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:164
+msgid "Tap to acknowledge that you understand and agree to these updates and continue using Bluesky"
+msgstr ""
+
#: src/components/ContextMenu/Backdrop.ios.tsx:54
#: src/components/ContextMenu/Backdrop.ios.tsx:80
#: src/components/ContextMenu/Backdrop.tsx:46
@@ -8358,6 +8412,8 @@ msgstr ""
msgid "Terms"
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:30
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:97
#: src/Navigation.tsx:335
#: src/screens/Settings/AboutSettings.tsx:84
#: src/screens/Settings/AboutSettings.tsx:87
@@ -8813,7 +8869,7 @@ msgstr ""
msgid "This reply will be sorted into a hidden section at the bottom of your thread and will mute notifications for subsequent replies - both for yourself and others."
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:37
+#: src/screens/Signup/StepInfo/Policies.tsx:66
msgid "This service has not provided terms of service or a privacy policy."
msgstr ""
@@ -8866,7 +8922,7 @@ msgstr ""
msgid "This will delete \"{0}\" from your muted words. You can always add it back later."
msgstr ""
-#: src/screens/Settings/Settings.tsx:614
+#: src/screens/Settings/Settings.tsx:656
msgid "This will remove @{0} from the quick access list."
msgstr ""
@@ -8939,7 +8995,7 @@ msgstr ""
msgid "Toggle to enable or disable adult content"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:158
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:155
msgid "Toggles the sound"
msgstr ""
@@ -9032,11 +9088,11 @@ msgstr ""
msgid "Unable to delete"
msgstr ""
-#: src/screens/Settings/Settings.tsx:499
+#: src/screens/Settings/Settings.tsx:507
msgid "Unapply Pull Request"
msgstr ""
-#: src/screens/Settings/Settings.tsx:501
+#: src/screens/Settings/Settings.tsx:509
msgid "Unapply Pull Request {currentChannel}"
msgstr ""
@@ -9125,7 +9181,7 @@ msgstr ""
msgid "Unlike ({0, plural, one {# like} other {# likes}})"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:155
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:152
#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx:95
msgctxt "video"
msgid "Unmute"
@@ -9199,8 +9255,8 @@ msgstr ""
msgid "Unpinned from your feeds"
msgstr ""
-#: src/screens/Settings/Settings.tsx:466
-#: src/screens/Settings/Settings.tsx:468
+#: src/screens/Settings/Settings.tsx:474
+#: src/screens/Settings/Settings.tsx:476
msgid "Unsnooze email reminder"
msgstr ""
@@ -9518,8 +9574,8 @@ msgstr ""
msgid "Version {0}"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:83
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:134
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:81
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:131
msgid "Video"
msgstr ""
@@ -9549,7 +9605,7 @@ msgstr ""
msgid "Video is playing"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/index.web.tsx:192
+#: src/components/Post/Embed/VideoEmbed/index.web.tsx:219
msgid "Video not found."
msgstr ""
@@ -9561,7 +9617,7 @@ msgstr ""
msgid "Video uploaded"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:83
+#: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:81
msgid "Video: {0}"
msgstr ""
@@ -9802,6 +9858,14 @@ msgstr ""
msgid "We'll use this to help customize your experience."
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:139
+msgid "We're also updating our <0>Community Guidelines, and we want your input! These new guidelines will take effect on October 13th, 2025."
+msgstr ""
+
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:82
+msgid "We're also updating our Community Guidelines, and we want your input! These new guidelines will take effect on October 13th, 2025."
+msgstr ""
+
#: src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx:227
msgid "We're confirming your age assurance status with our servers. This should only take a few seconds."
msgstr ""
@@ -9848,6 +9912,22 @@ msgstr ""
msgid "We're sorry! You can only subscribe to twenty labelers, and you've reached your limit of twenty."
msgstr ""
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:122
+msgid "We’re updating our <0>Terms of Service, <1>Privacy Policy, and <2>Copyright Policy, effective September 12th, 2025."
+msgstr ""
+
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:63
+msgid "We're updating our policies"
+msgstr ""
+
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:76
+msgid "We’re updating our Terms of Service, Privacy Policy, and Copyright Policy, effective September 12th, 2025."
+msgstr ""
+
+#: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:61
+msgid "We’re updating our Terms of Service, Privacy Policy, and Copyright Policy, effective September 12th, 2025. We're also updating our Community Guidelines, and we want your input! These new guidelines will take effect on October 13th, 2025. Learn more about these changes and how to share your thoughts with us by reading our blog post."
+msgstr ""
+
#: src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx:169
msgid "We've confirmed your age assurance status. You can now close this dialog."
msgstr ""
@@ -10008,6 +10088,10 @@ msgstr ""
msgid "You"
msgstr ""
+#: src/screens/Signup/StepInfo/Policies.tsx:23
+msgid "You also agree to <0>Bluesky’s Community Guidelines. An <1>updated version of our Community Guidelines will take effect on October 13th."
+msgstr ""
+
#: src/components/verification/VerifierDialog.tsx:59
msgid "You are a trusted verifier"
msgstr ""
@@ -10241,7 +10325,7 @@ msgstr ""
msgid "You may only select up to 4 images"
msgstr ""
-#: src/screens/Signup/StepInfo/Policies.tsx:106
+#: src/screens/Signup/StepInfo/Policies.tsx:136
msgid "You must be 13 years of age or older to create an account."
msgstr ""
@@ -10278,7 +10362,7 @@ msgstr ""
msgid "You previously deactivated @{0}."
msgstr ""
-#: src/screens/Settings/Settings.tsx:396
+#: src/screens/Settings/Settings.tsx:404
msgid "You probably want to restart the app now."
msgstr ""
@@ -10290,7 +10374,7 @@ msgstr ""
msgid "You reacted {0} to {1}"
msgstr ""
-#: src/screens/Settings/Settings.tsx:282
+#: src/screens/Settings/Settings.tsx:286
#: src/view/shell/desktop/LeftNav.tsx:209
msgid "You will be signed out of all your accounts."
msgstr ""
@@ -10369,6 +10453,10 @@ msgstr ""
msgid "You've found some people to follow"
msgstr ""
+#: src/components/FocusScope/index.tsx:114
+msgid "You've reached the end of the active content."
+msgstr ""
+
#: src/view/com/posts/FollowingEndOfFeed.tsx:44
msgid "You've reached the end of your feed! Find some more accounts to follow."
msgstr ""
@@ -10377,6 +10465,10 @@ msgstr ""
msgid "You've reached the maximum number of requests allowed. Please try again later."
msgstr ""
+#: src/components/FocusScope/index.tsx:90
+msgid "You've reached the start of the active content."
+msgstr ""
+
#: src/view/com/composer/state/video.ts:423
msgid "You've reached your daily limit for video uploads (too many bytes)"
msgstr ""
@@ -10421,7 +10513,7 @@ msgstr ""
msgid "Your birth date"
msgstr ""
-#: src/components/Post/Embed/VideoEmbed/index.web.tsx:196
+#: src/components/Post/Embed/VideoEmbed/index.web.tsx:223
msgid "Your browser does not support the video format. Please try a different browser."
msgstr ""
@@ -10444,7 +10536,7 @@ msgid "Your email"
msgstr ""
#: src/screens/Login/ForgotPasswordForm.tsx:51
-#: src/screens/Signup/state.ts:270
+#: src/screens/Signup/state.ts:273
#: src/screens/Signup/StepInfo/index.tsx:98
#: src/view/com/modals/ChangePassword.tsx:55
msgid "Your email appears to be invalid."
diff --git a/src/logger/types.ts b/src/logger/types.ts
index 4743e866c4..ee3069a083 100644
--- a/src/logger/types.ts
+++ b/src/logger/types.ts
@@ -13,6 +13,7 @@ export enum LogContext {
FeedFeedback = 'feed-feedback',
PostSource = 'post-source',
AgeAssurance = 'age-assurance',
+ PolicyUpdate = 'policy-update',
/**
* METRIC IS FOR INTERNAL USE ONLY, don't create any other loggers using this
diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
index 719bbf9a29..5023982eb1 100644
--- a/src/screens/Settings/Settings.tsx
+++ b/src/screens/Settings/Settings.tsx
@@ -25,6 +25,7 @@ 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 {useOnboardingDispatch} from '#/state/shell'
import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -35,6 +36,7 @@ import * as SettingsList from '#/screens/Settings/components/SettingsList'
import {atoms as a, platform, tokens, useBreakpoints, useTheme} from '#/alf'
import {AgeAssuranceDismissibleNotice} from '#/components/ageAssurance/AgeAssuranceDismissibleNotice'
import {AvatarStackWithFetch} from '#/components/AvatarStack'
+import {Button, ButtonText} from '#/components/Button'
import {useDialogControl} from '#/components/Dialog'
import {SwitchAccountDialog} from '#/components/dialogs/SwitchAccount'
import {Accessibility_Stroke2_Corner2_Rounded as AccessibilityIcon} from '#/components/icons/Accessibility'
@@ -58,6 +60,7 @@ import {Window_Stroke2_Corner2_Rounded as WindowIcon} from '#/components/icons/W
import * as Layout from '#/components/Layout'
import {Loader} from '#/components/Loader'
import * as Menu from '#/components/Menu'
+import {ID as PolicyUpdate202508} from '#/components/PolicyUpdateOverlay/updates/202508/config'
import * as Prompt from '#/components/Prompt'
import {Text} from '#/components/Typography'
import {useFullVerificationState} from '#/components/verification'
@@ -66,6 +69,7 @@ import {
VerificationCheckButton,
} from '#/components/verification/VerificationCheckButton'
import {IS_INTERNAL} from '#/env'
+import {device, useStorage} from '#/storage'
import {useActivitySubscriptionsNudged} from '#/storage/hooks/activity-subscriptions-nudged'
type Props = NativeStackScreenProps
@@ -363,6 +367,10 @@ function ProfilePreview({
function DevOptions() {
const {_} = useLingui()
+ const agent = useAgent()
+ const [override, setOverride] = useStorage(device, [
+ 'policyUpdateDebugOverride',
+ ])
const onboardingDispatch = useOnboardingDispatch()
const navigation = useNavigation()
const {mutate: deleteChatDeclarationRecord} = useDeleteActorDeclaration()
@@ -502,6 +510,40 @@ function DevOptions() {
) : null}
+
+
+
+ PolicyUpdate202508 Debug
+
+
+
+
+
+
+
+
)
}
diff --git a/src/screens/Signup/StepCaptcha/CaptchaWebView.tsx b/src/screens/Signup/StepCaptcha/CaptchaWebView.tsx
index caa0aa28a4..27951d4cc6 100644
--- a/src/screens/Signup/StepCaptcha/CaptchaWebView.tsx
+++ b/src/screens/Signup/StepCaptcha/CaptchaWebView.tsx
@@ -1,20 +1,22 @@
-import React from 'react'
-import {StyleSheet} from 'react-native'
-import {WebView, WebViewNavigation} from 'react-native-webview'
-import {ShouldStartLoadRequest} from 'react-native-webview/lib/WebViewTypes'
+import {useEffect, useMemo, useRef} from 'react'
+import {WebView, type WebViewNavigation} from 'react-native-webview'
+import {type ShouldStartLoadRequest} from 'react-native-webview/lib/WebViewTypes'
-import {SignupState} from '#/screens/Signup/state'
+import {type SignupState} from '#/screens/Signup/state'
const ALLOWED_HOSTS = [
'bsky.social',
'bsky.app',
'staging.bsky.app',
'staging.bsky.dev',
+ 'app.staging.bsky.dev',
'js.hcaptcha.com',
'newassets.hcaptcha.com',
'api2.hcaptcha.com',
]
+const MIN_DELAY = 3_500
+
export function CaptchaWebView({
url,
stateParam,
@@ -28,49 +30,67 @@ export function CaptchaWebView({
onSuccess: (code: string) => void
onError: (error: unknown) => void
}) {
- const redirectHost = React.useMemo(() => {
+ const startedAt = useRef(Date.now())
+ const successTo = useRef()
+
+ useEffect(() => {
+ return () => {
+ if (successTo.current) {
+ clearTimeout(successTo.current)
+ }
+ }
+ }, [])
+
+ const redirectHost = useMemo(() => {
if (!state?.serviceUrl) return 'bsky.app'
return state?.serviceUrl &&
new URL(state?.serviceUrl).host === 'staging.bsky.dev'
- ? 'staging.bsky.app'
+ ? 'app.staging.bsky.dev'
: 'bsky.app'
}, [state?.serviceUrl])
- const wasSuccessful = React.useRef(false)
+ const wasSuccessful = useRef(false)
- const onShouldStartLoadWithRequest = React.useCallback(
- (event: ShouldStartLoadRequest) => {
- const urlp = new URL(event.url)
- return ALLOWED_HOSTS.includes(urlp.host)
- },
- [],
- )
+ const onShouldStartLoadWithRequest = (event: ShouldStartLoadRequest) => {
+ const urlp = new URL(event.url)
+ return ALLOWED_HOSTS.includes(urlp.host)
+ }
- const onNavigationStateChange = React.useCallback(
- (e: WebViewNavigation) => {
- if (wasSuccessful.current) return
+ const onNavigationStateChange = (e: WebViewNavigation) => {
+ if (wasSuccessful.current) return
- const urlp = new URL(e.url)
- if (urlp.host !== redirectHost) return
+ const urlp = new URL(e.url)
+ if (urlp.host !== redirectHost || urlp.pathname === '/gate/signup') return
- const code = urlp.searchParams.get('code')
- if (urlp.searchParams.get('state') !== stateParam || !code) {
- onError({error: 'Invalid state or code'})
- return
- }
+ const code = urlp.searchParams.get('code')
+ if (urlp.searchParams.get('state') !== stateParam || !code) {
+ onError({error: 'Invalid state or code'})
+ return
+ }
- wasSuccessful.current = true
+ // We want to delay the completion of this screen ever so slightly so that it doesn't appear to be a glitch if it completes too fast
+ wasSuccessful.current = true
+ const now = Date.now()
+ const timeTaken = now - startedAt.current
+ if (timeTaken < MIN_DELAY) {
+ successTo.current = setTimeout(() => {
+ onSuccess(code)
+ }, MIN_DELAY - timeTaken)
+ } else {
onSuccess(code)
- },
- [redirectHost, stateParam, onSuccess, onError],
- )
+ }
+ }
return (
)
}
-
-const styles = StyleSheet.create({
- webview: {
- flex: 1,
- backgroundColor: 'transparent',
- borderRadius: 10,
- },
-})
diff --git a/src/screens/Signup/StepCaptcha/index.tsx b/src/screens/Signup/StepCaptcha/index.tsx
index e900b96c09..8ea893c4aa 100644
--- a/src/screens/Signup/StepCaptcha/index.tsx
+++ b/src/screens/Signup/StepCaptcha/index.tsx
@@ -1,21 +1,74 @@
-import React from 'react'
-import {ActivityIndicator, View} from 'react-native'
+import React, {useEffect, useState} from 'react'
+import {ActivityIndicator, Platform, View} from 'react-native'
+import ReactNativeDeviceAttest from 'react-native-device-attest'
import {msg} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {nanoid} from 'nanoid/non-secure'
import {createFullHandle} from '#/lib/strings/handles'
import {logger} from '#/logger'
+import {isAndroid, isIOS, isNative, isWeb} from '#/platform/detection'
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
import {useSignupContext} from '#/screens/Signup/state'
import {CaptchaWebView} from '#/screens/Signup/StepCaptcha/CaptchaWebView'
import {atoms as a, useTheme} from '#/alf'
import {FormError} from '#/components/forms/FormError'
+import {GCP_PROJECT_ID} from '#/env'
import {BackNextButtons} from '../BackNextButtons'
-const CAPTCHA_PATH = '/gate/signup'
+const CAPTCHA_PATH =
+ isWeb || GCP_PROJECT_ID === 0 ? '/gate/signup' : '/gate/signup/attempt-attest'
export function StepCaptcha() {
+ if (isWeb) {
+ return
+ } else {
+ return
+ }
+}
+
+export function StepCaptchaNative() {
+ const [token, setToken] = useState()
+ const [payload, setPayload] = useState()
+ const [ready, setReady] = useState(false)
+
+ useEffect(() => {
+ ;(async () => {
+ logger.debug('trying to generate attestation token...')
+ try {
+ if (isIOS) {
+ logger.debug('starting to generate devicecheck token...')
+ const token = await ReactNativeDeviceAttest.getDeviceCheckToken()
+ setToken(token)
+ logger.debug(`generated devicecheck token: ${token}`)
+ } else {
+ const {token, payload} =
+ await ReactNativeDeviceAttest.getIntegrityToken('signup')
+ setToken(token)
+ setPayload(base64UrlEncode(payload))
+ }
+ } catch (e: any) {
+ logger.error(e)
+ } finally {
+ setReady(true)
+ }
+ })()
+ }, [])
+
+ if (!ready) {
+ return
+ }
+
+ return
+}
+
+function StepCaptchaInner({
+ token,
+ payload,
+}: {
+ token?: string
+ payload?: string
+}) {
const {_} = useLingui()
const theme = useTheme()
const {state, dispatch} = useSignupContext()
@@ -33,8 +86,24 @@ export function StepCaptcha() {
newUrl.searchParams.set('state', stateParam)
newUrl.searchParams.set('colorScheme', theme.name)
+ if (isNative && token) {
+ newUrl.searchParams.set('platform', Platform.OS)
+ newUrl.searchParams.set('token', token)
+ if (isAndroid && payload) {
+ newUrl.searchParams.set('payload', payload)
+ }
+ }
+
return newUrl.href
- }, [state.serviceUrl, state.handle, state.userDomain, stateParam, theme.name])
+ }, [
+ state.serviceUrl,
+ state.handle,
+ state.userDomain,
+ stateParam,
+ theme.name,
+ token,
+ payload,
+ ])
const onSuccess = React.useCallback(
(code: string) => {
@@ -105,3 +174,13 @@ export function StepCaptcha() {
)
}
+
+function base64UrlEncode(data: string): string {
+ const encoder = new TextEncoder()
+ const bytes = encoder.encode(data)
+
+ const binaryString = String.fromCharCode(...bytes)
+ const base64 = btoa(binaryString)
+
+ return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/[=]/g, '')
+}
diff --git a/src/screens/Signup/StepInfo/Policies.tsx b/src/screens/Signup/StepInfo/Policies.tsx
index 17980172de..0bc14fa6ab 100644
--- a/src/screens/Signup/StepInfo/Policies.tsx
+++ b/src/screens/Signup/StepInfo/Policies.tsx
@@ -4,11 +4,42 @@ import {type ComAtprotoServerDescribeServer} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
+import {webLinks} from '#/lib/constants'
+import {useGate} from '#/lib/statsig/statsig'
import {atoms as a, useTheme} from '#/alf'
-import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo'
+import {Admonition} from '#/components/Admonition'
import {InlineLinkText} from '#/components/Link'
import {Text} from '#/components/Typography'
+function CommunityGuidelinesNotice({}: {}) {
+ const {_} = useLingui()
+ const gate = useGate()
+
+ if (gate('disable_onboarding_policy_update_notice')) return null
+
+ return (
+
+
+
+ You also agree to{' '}
+
+ Bluesky’s Community Guidelines
+
+ . An{' '}
+
+ updated version of our Community Guidelines
+ {' '}
+ will take effect on October 13th.
+
+
+
+ )
+}
+
export const Policies = ({
serviceDescription,
needsGuardian,
@@ -30,14 +61,13 @@ export const Policies = ({
if (!tos && !pp) {
return (
-
-
-
-
+
+
This service has not provided terms of service or a privacy policy.
-
+
+
)
}
@@ -102,19 +132,21 @@ export const Policies = ({
) : null}
{under13 ? (
-
+
You must be 13 years of age or older to create an account.
-
+
) : needsGuardian ? (
-
+
If you are not yet an adult according to the laws of your country,
your parent or legal guardian must read these Terms on your behalf.
-
+
) : undefined}
+
+
)
}
diff --git a/src/screens/Signup/index.tsx b/src/screens/Signup/index.tsx
index ecde3f71e2..807bbff4f9 100644
--- a/src/screens/Signup/index.tsx
+++ b/src/screens/Signup/index.tsx
@@ -1,11 +1,14 @@
import {useEffect, useReducer, useState} from 'react'
import {AppState, type AppStateStatus, View} from 'react-native'
+import ReactNativeDeviceAttest from 'react-native-device-attest'
import Animated, {FadeIn, LayoutAnimationConfig} from 'react-native-reanimated'
import {AppBskyGraphStarterpack} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {FEEDBACK_FORM_URL} from '#/lib/constants'
+import {logger} from '#/logger'
+import {isAndroid} from '#/platform/detection'
import {useServiceQuery} from '#/state/queries/service'
import {useStarterPackQuery} from '#/state/queries/starter-packs'
import {useActiveStarterPack} from '#/state/shell/starter-pack'
@@ -26,6 +29,7 @@ import {Divider} from '#/components/Divider'
import {LinearGradientBackground} from '#/components/LinearGradientBackground'
import {InlineLinkText} from '#/components/Link'
import {Text} from '#/components/Typography'
+import {GCP_PROJECT_ID} from '#/env'
import * as bsky from '#/types/bsky'
export function Signup({onPressBack}: {onPressBack: () => void}) {
@@ -101,6 +105,16 @@ export function Signup({onPressBack}: {onPressBack: () => void}) {
return () => subscription.remove()
}, [])
+ // On Android, warmup the Play Integrity API on the signup screen so it is ready by the time we get to the gate screen.
+ useEffect(() => {
+ if (!isAndroid) {
+ return
+ }
+ ReactNativeDeviceAttest.warmupIntegrity(GCP_PROJECT_ID).catch(err =>
+ logger.error(err),
+ )
+ }, [])
+
return (
void) => {
@@ -325,6 +328,12 @@ export function useSubmitSignup() {
},
)
+ /**
+ * Marks any active policy update as completed, since user just agreed
+ * to TOS/privacy during sign up
+ */
+ preemptivelyCompleteActivePolicyUpdate()
+
/*
* Must happen last so that if the user has multiple tabs open and
* createAccount fails, one tab is not stuck in onboarding — Eric
@@ -363,6 +372,11 @@ export function useSubmitSignup() {
dispatch({type: 'setIsLoading', value: false})
}
},
- [_, onboardingDispatch, createAccount],
+ [
+ _,
+ onboardingDispatch,
+ createAccount,
+ preemptivelyCompleteActivePolicyUpdate,
+ ],
)
}
diff --git a/src/state/persisted/index.ts b/src/state/persisted/index.ts
index 51d757ad8b..8c043a3420 100644
--- a/src/state/persisted/index.ts
+++ b/src/state/persisted/index.ts
@@ -3,11 +3,12 @@ import AsyncStorage from '@react-native-async-storage/async-storage'
import {logger} from '#/logger'
import {
defaults,
- Schema,
+ type Schema,
tryParse,
tryStringify,
} from '#/state/persisted/schema'
-import {PersistedApi} from './types'
+import {device} from '#/storage'
+import {type PersistedApi} from './types'
import {normalizeData} from './util'
export type {PersistedAccount, Schema} from '#/state/persisted/schema'
@@ -53,6 +54,7 @@ onUpdate satisfies PersistedApi['onUpdate']
export async function clearStorage() {
try {
await AsyncStorage.removeItem(BSKY_STORAGE)
+ device.removeAll()
} catch (e: any) {
logger.error(`persisted store: failed to clear`, {message: e.toString()})
}
diff --git a/src/state/preferences/feed-tuners.tsx b/src/state/preferences/feed-tuners.tsx
index 3ed60e5988..feeab6f9af 100644
--- a/src/state/preferences/feed-tuners.tsx
+++ b/src/state/preferences/feed-tuners.tsx
@@ -1,7 +1,7 @@
import {useMemo} from 'react'
import {FeedTuner} from '#/lib/api/feed-manip'
-import {FeedDescriptor} from '../queries/post-feed'
+import {type FeedDescriptor} from '../queries/post-feed'
import {usePreferencesQuery} from '../queries/preferences'
import {useSession} from '../session'
import {useLanguagePrefs} from './languages'
@@ -19,7 +19,10 @@ export function useFeedTuners(feedDesc: FeedDescriptor) {
}
}
if (feedDesc.startsWith('feedgen')) {
- return [FeedTuner.preferredLangOnly(langPrefs.contentLanguages)]
+ return [
+ FeedTuner.preferredLangOnly(langPrefs.contentLanguages),
+ FeedTuner.removeMutedThreads,
+ ]
}
if (feedDesc === 'following' || feedDesc.startsWith('list')) {
const feedTuners = [FeedTuner.removeOrphans]
@@ -40,6 +43,7 @@ export function useFeedTuners(feedDesc: FeedDescriptor) {
feedTuners.push(FeedTuner.removeQuotePosts)
}
feedTuners.push(FeedTuner.dedupThreads)
+ feedTuners.push(FeedTuner.removeMutedThreads)
return feedTuners
}
diff --git a/src/state/queries/nuxs/__mocks__/index.ts b/src/state/queries/nuxs/__mocks__/index.ts
new file mode 100644
index 0000000000..c718b15940
--- /dev/null
+++ b/src/state/queries/nuxs/__mocks__/index.ts
@@ -0,0 +1,25 @@
+import {jest} from '@jest/globals'
+
+export {Nux} from '#/state/queries/nuxs/definitions'
+
+export const useNuxs = jest.fn(() => {
+ return {
+ nuxs: undefined,
+ status: 'loading' as const,
+ }
+})
+
+export const useNux = jest.fn((id: string) => {
+ return {
+ nux: undefined,
+ status: 'loading' as const,
+ }
+})
+
+export const useSaveNux = jest.fn(() => {
+ return {}
+})
+
+export const useResetNuxs = jest.fn(() => {
+ return {}
+})
diff --git a/src/state/queries/nuxs/definitions.ts b/src/state/queries/nuxs/definitions.ts
index 3d5c132f26..7577d6b205 100644
--- a/src/state/queries/nuxs/definitions.ts
+++ b/src/state/queries/nuxs/definitions.ts
@@ -9,6 +9,11 @@ export enum Nux {
ActivitySubscriptions = 'ActivitySubscriptions',
AgeAssuranceDismissibleNotice = 'AgeAssuranceDismissibleNotice',
AgeAssuranceDismissibleFeedBanner = 'AgeAssuranceDismissibleFeedBanner',
+
+ /*
+ * Blocking announcements. New IDs are required for each new announcement.
+ */
+ PolicyUpdate202508 = 'PolicyUpdate202508',
}
export const nuxNames = new Set(Object.values(Nux))
@@ -38,6 +43,10 @@ export type AppNux = BaseNux<
id: Nux.AgeAssuranceDismissibleFeedBanner
data: undefined
}
+ | {
+ id: Nux.PolicyUpdate202508
+ data: undefined
+ }
>
export const NuxSchemas: Record | undefined> = {
@@ -47,4 +56,5 @@ export const NuxSchemas: Record | undefined> = {
[Nux.ActivitySubscriptions]: undefined,
[Nux.AgeAssuranceDismissibleNotice]: undefined,
[Nux.AgeAssuranceDismissibleFeedBanner]: undefined,
+ [Nux.PolicyUpdate202508]: undefined,
}
diff --git a/src/storage/index.ts b/src/storage/index.ts
index 4d45134e1b..4c42005104 100644
--- a/src/storage/index.ts
+++ b/src/storage/index.ts
@@ -66,6 +66,13 @@ export class Storage {
keys.forEach(key => this.remove([...scopes, key]))
}
+ /**
+ * For debugging purposes
+ */
+ removeAll() {
+ this.store.clearAll()
+ }
+
/**
* Fires a callback when the storage associated with a given key changes
*
diff --git a/src/storage/schema.ts b/src/storage/schema.ts
index c05a7531df..421264ac1e 100644
--- a/src/storage/schema.ts
+++ b/src/storage/schema.ts
@@ -1,3 +1,5 @@
+import {type ID as PolicyUpdate202508} from '#/components/PolicyUpdateOverlay/updates/202508/config'
+
/**
* Device data that's specific to the device and does not vary based account
*/
@@ -13,6 +15,12 @@ export type Device = {
devMode: boolean
demoMode: boolean
activitySubscriptionsNudged?: boolean
+
+ /**
+ * Policy update overlays. New IDs are required for each new announcement.
+ */
+ policyUpdateDebugOverride?: boolean
+ [PolicyUpdate202508]?: boolean
}
export type Account = {
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index 4de21e5985..d5aba86f7f 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -209,33 +209,35 @@ let NotificationFeedItem = ({
}
const firstAuthorLink = (
-
- {forceLTR(firstAuthorName)}
- {firstAuthorVerification.showBadge && (
-
-
-
- )}
-
+
+
+ {forceLTR(firstAuthorName)}
+ {firstAuthorVerification.showBadge && (
+
+
+
+ )}
+
+
)
const additionalAuthorsCount = authors.length - 1
const hasMultipleAuthors = additionalAuthorsCount > 0
diff --git a/src/view/screens/Storybook/Buttons.tsx b/src/view/screens/Storybook/Buttons.tsx
index eaf8bba7e3..0db0629135 100644
--- a/src/view/screens/Storybook/Buttons.tsx
+++ b/src/view/screens/Storybook/Buttons.tsx
@@ -1,3 +1,4 @@
+import {Fragment} from 'react'
import {View} from 'react-native'
import {atoms as a} from '#/alf'
@@ -5,159 +6,82 @@ import {
Button,
type ButtonColor,
ButtonIcon,
+ type ButtonSize,
ButtonText,
} from '#/components/Button'
import {ChevronLeft_Stroke2_Corner0_Rounded as ChevronLeft} from '#/components/icons/Chevron'
import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
-import {H1} from '#/components/Typography'
+import {Text} from '#/components/Typography'
export function Buttons() {
return (
- Buttons
+ Buttons
-
- {[
- 'primary',
- 'secondary',
- 'secondary_inverted',
- 'negative',
- 'negative_secondary',
- ].map(color => (
-
-
-
-
- ))}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {[
+ 'primary',
+ 'secondary',
+ 'secondary_inverted',
+ 'negative',
+ 'primary_subtle',
+ 'negative_subtle',
+ ].map(color => (
+
+ {['tiny', 'small', 'large'].map(size => (
+
+
+ color={color} size={size}
+
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+ ))}
)
}
diff --git a/src/view/screens/Storybook/index.tsx b/src/view/screens/Storybook/index.tsx
index 1151d5a3ce..8285b0d73b 100644
--- a/src/view/screens/Storybook/index.tsx
+++ b/src/view/screens/Storybook/index.tsx
@@ -87,6 +87,7 @@ function StorybookInner() {
+
+
@@ -160,8 +166,16 @@ function ShellInner() {
-
-
+
+ {/* Until policy update has been completed by the user, don't render anything that is portaled */}
+ {policyUpdateState.completed && (
+ <>
+
+
+
+ )}
+
+
)
}
diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx
index 77c3f45f62..3c2bc58abd 100644
--- a/src/view/shell/index.web.tsx
+++ b/src/view/shell/index.web.tsx
@@ -22,6 +22,10 @@ import {EmailDialog} from '#/components/dialogs/EmailDialog'
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
import {SigninDialog} from '#/components/dialogs/Signin'
+import {
+ Outlet as PolicyUpdateOverlayPortalOutlet,
+ usePolicyUpdateContext,
+} from '#/components/PolicyUpdateOverlay'
import {Outlet as PortalOutlet} from '#/components/Portal'
import {FlatNavigator, RoutesContainer} from '#/Navigation'
import {Composer} from './Composer.web'
@@ -37,6 +41,7 @@ function ShellInner() {
const {_} = useLingui()
const showDrawer = !isDesktop && isDrawerOpen
const [showDrawerDelayedExit, setShowDrawerDelayedExit] = useState(showDrawer)
+ const {state: policyUpdateState} = usePolicyUpdateContext()
useLayoutEffect(() => {
if (showDrawer !== showDrawerDelayedExit) {
@@ -74,7 +79,13 @@ function ShellInner() {
-
+
+ {/* Until policy update has been completed by the user, don't render anything that is portaled */}
+ {policyUpdateState.completed && (
+ <>
+
+
+ )}
{showDrawerDelayedExit && (
<>
@@ -113,6 +124,8 @@ function ShellInner() {
)}
+
+
)
}
diff --git a/yarn.lock b/yarn.lock
index 0cf8d2f731..af53d1677d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11302,10 +11302,10 @@ expo-image-picker@~16.1.4:
dependencies:
expo-image-loader "~5.1.0"
-expo-image@~2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/expo-image/-/expo-image-2.2.1.tgz#b4aa706a25f7e8902ac854a8da249caf4a90cd67"
- integrity sha512-5ZSggMi0X2G9AN0aM+sdkCyyZ6YcWvGs9KYLYrRBVUN3ph6RBiu6mKGpaNN1TAscySRnH1eHbUE1H+Qeq7qm1g==
+expo-image@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/expo-image/-/expo-image-2.4.0.tgz#02f7fd743387206914cd431a6367f5be53509e3e"
+ integrity sha512-TQ/LvrtJ9JBr+Tf198CAqflxcvdhuj7P24n0LQ1jHaWIVA7Z+zYKbYHnSMPSDMul/y0U46Z5bFLbiZiSidgcNw==
expo-json-utils@~0.15.0:
version "0.15.0"
@@ -16801,6 +16801,11 @@ react-native-date-picker@^5.0.12:
resolved "https://registry.yarnpkg.com/react-native-date-picker/-/react-native-date-picker-5.0.12.tgz#12540b6a58500811ee7e4fc0244e3accc7cca9c1"
integrity sha512-R/mUnCKhcuxbhKPFwYdBQCxQt9HHLqpM4ruRUqlcBjiUZ3N2wdnwOMyc888Ps8qp8e7v29PrDHtUlG8LPuFn9w==
+react-native-device-attest@^0.1.6:
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/react-native-device-attest/-/react-native-device-attest-0.1.6.tgz#51796a92d9199b1d231d4aa62d557019753b30c3"
+ integrity sha512-oTgBu6il+czHIMLs2IVWv2+WZ6a/vUtVLQ40q6/Dgns7NuG69mwmR8lS0e2Sl/yOtpD9YZXc8cYzBDKHAyV5MA==
+
react-native-dotenv@^3.4.11:
version "3.4.11"
resolved "https://registry.yarnpkg.com/react-native-dotenv/-/react-native-dotenv-3.4.11.tgz#2e6c4eabd55d5f1bf109b3dd9141dadf9c55cdd4"