From 3ff42f1595727a40807a0d6876a133c65d6863f2 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 30 Jul 2025 13:56:27 -0500 Subject: [PATCH 1/6] Fix bad substitution (#8752) --- src/env/common.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/env/common.ts b/src/env/common.ts index e68e9fab80..5b902622bc 100644 --- a/src/env/common.ts +++ b/src/env/common.ts @@ -43,9 +43,10 @@ export const BUNDLE_IDENTIFIER: string = * for each build. This should only be used for StatSig reporting and shouldn't * be used to identify a specific bundle. */ -export const BUNDLE_DATE: number = !process.env.EXPO_PUBLIC_BUNDLE_DATE - ? 0 - : Number(process.env.EXPO_PUBLIC_BUNDLE_DATE) +export const BUNDLE_DATE: number = + process.env.EXPO_PUBLIC_BUNDLE_DATE === undefined + ? 0 + : Number(process.env.EXPO_PUBLIC_BUNDLE_DATE) /** * The log level for the app. From 4393a275ae72e535aec41cc5af6f84e8d1e153c3 Mon Sep 17 00:00:00 2001 From: Jaz Volpert Date: Wed, 30 Jul 2025 21:42:26 +0000 Subject: [PATCH 2/6] fix echoprom config --- bskyweb/cmd/embedr/server.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bskyweb/cmd/embedr/server.go b/bskyweb/cmd/embedr/server.go index d8df4276f2..62427e70e7 100644 --- a/bskyweb/cmd/embedr/server.go +++ b/bskyweb/cmd/embedr/server.go @@ -154,7 +154,13 @@ func serve(cctx *cli.Context) error { RedirectCode: http.StatusFound, })) - e.Use(echoprometheus.NewMiddleware("")) + echoprom := echoprometheus.NewMiddlewareWithConfig( + echoprometheus.MiddlewareConfig{ + DoNotUseRequestPathFor404: true, + }, + ) + + e.Use(echoprom) // // configure routes From b25677eb7f30263471f8a4a6a692d48bc6dc51dd Mon Sep 17 00:00:00 2001 From: Jaz Volpert Date: Wed, 30 Jul 2025 21:42:56 +0000 Subject: [PATCH 3/6] build --- .github/workflows/build-and-push-embedr-aws.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-push-embedr-aws.yaml b/.github/workflows/build-and-push-embedr-aws.yaml index 23d1538fe5..a6b2d9c3e0 100644 --- a/.github/workflows/build-and-push-embedr-aws.yaml +++ b/.github/workflows/build-and-push-embedr-aws.yaml @@ -3,6 +3,7 @@ on: push: branches: - main + - echoprom_fix env: REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }} From 85981deb31f5fc4e114c13b8fe6402c003e4c01a Mon Sep 17 00:00:00 2001 From: pfrazee <1270099+pfrazee@users.noreply.github.com> Date: Thu, 31 Jul 2025 02:51:14 +0000 Subject: [PATCH 4/6] Nightly source-language update --- src/locale/locales/en/messages.po | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po index 3a5480a5cd..91699294d3 100644 --- a/src/locale/locales/en/messages.po +++ b/src/locale/locales/en/messages.po @@ -1239,7 +1239,7 @@ msgstr "" #: src/components/dms/dialogs/NewChatDialog.tsx:54 #: src/components/dms/MessageProfileButton.tsx:58 -#: src/screens/Messages/ChatList.tsx:362 +#: src/screens/Messages/ChatList.tsx:358 #: src/screens/Messages/Conversation.tsx:228 msgid "Before you can message another user, you must first verify your email." msgstr "" @@ -1663,11 +1663,11 @@ msgid "Chat muted" msgstr "" #: src/Navigation.tsx:558 -#: src/screens/Messages/components/InboxPreview.tsx:24 +#: src/screens/Messages/components/InboxPreview.tsx:22 msgid "Chat request inbox" msgstr "" -#: src/screens/Messages/components/InboxPreview.tsx:64 +#: src/screens/Messages/components/InboxPreview.tsx:62 #: src/screens/Messages/Inbox.tsx:56 #: src/screens/Messages/Inbox.tsx:98 msgid "Chat requests" @@ -1675,7 +1675,7 @@ msgstr "" #: src/components/dms/ConvoMenu.tsx:75 #: src/Navigation.tsx:553 -#: src/screens/Messages/ChatList.tsx:371 +#: src/screens/Messages/ChatList.tsx:367 msgid "Chat settings" msgstr "" @@ -1690,8 +1690,8 @@ msgid "Chat unmuted" msgstr "" #: src/screens/Messages/ChatList.tsx:76 -#: src/screens/Messages/ChatList.tsx:387 -#: src/screens/Messages/ChatList.tsx:411 +#: src/screens/Messages/ChatList.tsx:383 +#: src/screens/Messages/ChatList.tsx:407 msgid "Chats" msgstr "" @@ -3339,7 +3339,7 @@ msgstr "" msgid "Failed to delete starter pack" msgstr "" -#: src/screens/Messages/ChatList.tsx:274 +#: src/screens/Messages/ChatList.tsx:270 #: src/screens/Messages/Inbox.tsx:208 msgid "Failed to load conversations" msgstr "" @@ -5300,8 +5300,8 @@ msgid "New {postsCount, plural, one {post} other {posts}} from {firstAuthorName} msgstr "" #: src/components/dms/dialogs/NewChatDialog.tsx:67 -#: src/screens/Messages/ChatList.tsx:394 -#: src/screens/Messages/ChatList.tsx:401 +#: src/screens/Messages/ChatList.tsx:390 +#: src/screens/Messages/ChatList.tsx:397 msgid "New chat" msgstr "" @@ -5592,7 +5592,7 @@ msgstr "" msgid "Note: This post is only visible to logged-in users." msgstr "" -#: src/screens/Messages/ChatList.tsx:295 +#: src/screens/Messages/ChatList.tsx:291 msgid "Nothing here" msgstr "" @@ -5834,7 +5834,7 @@ msgstr "" msgid "Open system log" msgstr "" -#: src/view/com/util/forms/DropdownButton.tsx:162 +#: src/view/com/util/forms/DropdownButton.tsx:167 msgid "Opens {numItems} options" msgstr "" @@ -6688,7 +6688,7 @@ msgstr "" msgid "Reject chat request" msgstr "" -#: src/screens/Messages/ChatList.tsx:278 +#: src/screens/Messages/ChatList.tsx:274 #: src/screens/Messages/Inbox.tsx:212 msgid "Reload conversations" msgstr "" @@ -7158,7 +7158,7 @@ msgstr "" #: src/components/StarterPack/ProfileStarterPacks.tsx:346 #: src/screens/Login/LoginForm.tsx:323 #: src/screens/Login/LoginForm.tsx:330 -#: src/screens/Messages/ChatList.tsx:284 +#: src/screens/Messages/ChatList.tsx:280 #: src/screens/Messages/components/MessageListError.tsx:25 #: src/screens/Messages/Inbox.tsx:218 #: src/screens/Onboarding/StepInterests/index.tsx:217 @@ -7538,7 +7538,7 @@ msgstr "" msgid "Select your preferred notification channels" msgstr "" -#: src/view/com/util/forms/DropdownButton.tsx:297 +#: src/view/com/util/forms/DropdownButton.tsx:302 msgid "Selects option {0} of {numItems}" msgstr "" @@ -8933,7 +8933,7 @@ msgstr "" msgid "Today" msgstr "" -#: src/view/com/util/forms/DropdownButton.tsx:258 +#: src/view/com/util/forms/DropdownButton.tsx:263 msgid "Toggle dropdown" msgstr "" @@ -9517,7 +9517,7 @@ msgstr "" #: src/screens/Settings/AboutSettings.tsx:126 #: src/screens/Settings/AboutSettings.tsx:155 -msgid "Version {appVersion}" +msgid "Version {0}" msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx:83 @@ -9901,7 +9901,7 @@ msgid "Who can verify?" msgstr "" #: src/screens/Home/NoFeedsPinned.tsx:79 -#: src/screens/Messages/ChatList.tsx:262 +#: src/screens/Messages/ChatList.tsx:258 #: src/screens/Messages/Inbox.tsx:197 msgid "Whoops!" msgstr "" @@ -10173,7 +10173,7 @@ msgstr "" msgid "You have muted this user" msgstr "" -#: src/screens/Messages/ChatList.tsx:305 +#: src/screens/Messages/ChatList.tsx:301 msgid "You have no conversations yet. Start one!" msgstr "" From b3d207c7b9578314ae0e67ef6f3b8186585156ad Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 31 Jul 2025 07:41:10 -0500 Subject: [PATCH 5/6] Make proper extension of `Button` more clearly defined (#8753) * Remove unecessary color prop from SettingsList LinkItem * Add UninheritableButtonProps to avoid misuse --- src/components/Button.tsx | 12 ++++++++++++ src/screens/Settings/components/SettingsList.tsx | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/Button.tsx b/src/components/Button.tsx index 42eb648443..22c9ab96d0 100644 --- a/src/components/Button.tsx +++ b/src/components/Button.tsx @@ -20,6 +20,18 @@ import {atoms as a, flatten, select, tokens, useTheme} from '#/alf' import {type Props as SVGIconProps} from '#/components/icons/common' import {Text} from '#/components/Typography' +/** + * The `Button` component, and some extensions of it like `Link` are intended + * to be generic and therefore apply no styles by default. These `VariantProps` + * are what control the `Button`'s presentation, and are intended only use cases where the buttons appear as, well, buttons. + * + * If `Button` or an extension of it are used for other compound components, use this property to avoid misuse of these variant props further down the line. + * + * @example + * type MyComponentProps = Omit & {...} + */ +export type UninheritableButtonProps = 'variant' | 'color' | 'size' | 'shape' + export type ButtonVariant = 'solid' | 'outline' | 'ghost' | 'gradient' export type ButtonColor = | 'primary' diff --git a/src/screens/Settings/components/SettingsList.tsx b/src/screens/Settings/components/SettingsList.tsx index 6d17990478..5720849723 100644 --- a/src/screens/Settings/components/SettingsList.tsx +++ b/src/screens/Settings/components/SettingsList.tsx @@ -124,7 +124,7 @@ export function LinkItem({ contentContainerStyle, chevronColor, ...props -}: LinkProps & { +}: Omit & { contentContainerStyle?: StyleProp destructive?: boolean chevronColor?: string @@ -132,7 +132,7 @@ export function LinkItem({ const t = useTheme() return ( - + {args => ( & { contentContainerStyle?: StyleProp destructive?: boolean }) { From 33e071494881b13696e24b334857e594f29a4b1d Mon Sep 17 00:00:00 2001 From: surfdude29 <149612116+surfdude29@users.noreply.github.com> Date: Thu, 31 Jul 2025 14:40:39 +0100 Subject: [PATCH 6/6] tweak case of labels in SearchResults.tsx (#8759) --- src/screens/Search/SearchResults.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/screens/Search/SearchResults.tsx b/src/screens/Search/SearchResults.tsx index b626c93295..4c40684176 100644 --- a/src/screens/Search/SearchResults.tsx +++ b/src/screens/Search/SearchResults.tsx @@ -255,7 +255,7 @@ let SearchScreenPostResults = ({ Sign in @@ -263,7 +263,7 @@ let SearchScreenPostResults = ({ or create an account