watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 06:07:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' into jajaja

Browse source
This commit is contained in:
Mike Cao 2025-03-08 07:25:40 -08:00
commit b331da193f
27 changed files with 217 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/common/ConfirmationForm.tsx
View file

@ -28,7 +28,7 @@ export function ConfirmationForm({
<Row marginY="4">{message}</Row>
<FormButtons>
<Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>
<FormSubmitButton isLoading={isLoading} variant={buttonVariant}>
<FormSubmitButton data-test="button-confirm" isLoading={isLoading} variant={buttonVariant}>
{buttonLabel || formatMessage(labels.ok)}
</FormSubmitButton>
</FormButtons>

2
src/components/common/TypeConfirmationForm.tsx
View file

@ -35,7 +35,7 @@ export function TypeConfirmationForm({
<Form onSubmit={onConfirm} error={error}>
<p>
{formatMessage(messages.actionConfirmation, {
confirmation: <b key="value">{confirmationValue}</b>,
confirmation: <b key={messages.actionConfirmation.id}>{confirmationValue}</b>,
})}
</p>
<FormField