Merge branch 'dev' into jajaja
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -69,11 +69,10 @@ export function ReferrersTable({ allowFilter, ...props }: ReferrersTableProps) {
|
||||
if (!groups[domain]) {
|
||||
groups[domain] = 0;
|
||||
}
|
||||
groups[domain] += y;
|
||||
} else {
|
||||
groups._other += y;
|
||||
groups[domain] += +y;
|
||||
}
|
||||
}
|
||||
groups._other += +y;
|
||||
}
|
||||
|
||||
return Object.keys(groups)
|
||||
|
||||
Reference in New Issue
Block a user