Merge remote-tracking branch 'origin/main' into app-1310/base
* origin/main: tweak case of labels in SearchResults.tsx (#8759) Make proper extension of `Button` more clearly defined (#8753) Nightly source-language update build fix echoprom config Fix bad substitution (#8752)
This commit is contained in:
Eric Bailey
@@ -3,6 +3,7 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- echoprom_fix
|
||||
|
||||
env:
|
||||
REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -19,6 +19,18 @@ import {atoms as a, flatten, select, 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<ButtonProps, UninheritableButtonProps> & {...}
|
||||
*/
|
||||
export type UninheritableButtonProps = 'variant' | 'color' | 'size' | 'shape'
|
||||
|
||||
export type ButtonVariant = 'solid' | 'outline' | 'ghost'
|
||||
export type ButtonColor =
|
||||
| 'primary'
|
||||
|
||||
Vendored
+4
-3
@@ -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.
|
||||
|
||||
@@ -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 ""
|
||||
|
||||
|
||||
@@ -255,7 +255,7 @@ let SearchScreenPostResults = ({
|
||||
<Trans>
|
||||
<InlineLinkText
|
||||
style={[pal.link]}
|
||||
label={_(msg`sign in`)}
|
||||
label={_(msg`Sign in`)}
|
||||
to={'#'}
|
||||
onPress={showSignIn}>
|
||||
Sign in
|
||||
@@ -263,7 +263,7 @@ let SearchScreenPostResults = ({
|
||||
<Text style={t.atoms.text_contrast_medium}> or </Text>
|
||||
<InlineLinkText
|
||||
style={[pal.link]}
|
||||
label={_(msg`create an account`)}
|
||||
label={_(msg`Create an account`)}
|
||||
to={'#'}
|
||||
onPress={showCreateAccount}>
|
||||
create an account
|
||||
|
||||
@@ -124,7 +124,7 @@ export function LinkItem({
|
||||
contentContainerStyle,
|
||||
chevronColor,
|
||||
...props
|
||||
}: LinkProps & {
|
||||
}: Omit<LinkProps, Button.UninheritableButtonProps> & {
|
||||
contentContainerStyle?: StyleProp<ViewStyle>
|
||||
destructive?: boolean
|
||||
chevronColor?: string
|
||||
@@ -132,7 +132,7 @@ export function LinkItem({
|
||||
const t = useTheme()
|
||||
|
||||
return (
|
||||
<Link color="secondary" {...props}>
|
||||
<Link {...props}>
|
||||
{args => (
|
||||
<Item
|
||||
destructive={destructive}
|
||||
@@ -154,7 +154,7 @@ export function PressableItem({
|
||||
contentContainerStyle,
|
||||
hoverStyle,
|
||||
...props
|
||||
}: Button.ButtonProps & {
|
||||
}: Omit<Button.ButtonProps, Button.UninheritableButtonProps> & {
|
||||
contentContainerStyle?: StyleProp<ViewStyle>
|
||||
destructive?: boolean
|
||||
}) {
|
||||
|
||||
Reference in New Issue
Block a user