diff --git a/src/app/components/error-label.tsx b/src/app/components/error-label.tsx
index 3c8f6d34f34..a0c05ad5d29 100644
--- a/src/app/components/error-label.tsx
+++ b/src/app/components/error-label.tsx
@@ -1,24 +1,31 @@
import { FiAlertCircle } from 'react-icons/fi';
-import { Box, Stack, StackProps, color } from '@stacks/ui';
+import { css } from 'leather-styles/css';
+import { Box, HStack, HstackProps } from 'leather-styles/jsx';
-export function ErrorLabel({ children, ...rest }: StackProps) {
+interface ErrorLabelProps extends HstackProps {
+ dataTestId?: string;
+}
+
+export function ErrorLabel({ children, dataTestId }: ErrorLabelProps) {
return (
-
-
- {children}
-
+
+ {children}
+
);
}
diff --git a/src/app/components/field-error.tsx b/src/app/components/field-error.tsx
index 7e5fa190071..4c0dac8aa8e 100644
--- a/src/app/components/field-error.tsx
+++ b/src/app/components/field-error.tsx
@@ -31,7 +31,7 @@ export function TextInputFieldError(props: { name: string }) {
-
+
{meta.error}
diff --git a/src/app/components/request-password.tsx b/src/app/components/request-password.tsx
index d1e36ed7031..4556c3bf76e 100644
--- a/src/app/components/request-password.tsx
+++ b/src/app/components/request-password.tsx
@@ -79,13 +79,7 @@ export function RequestPassword({ title, caption, onSuccess }: RequestPasswordPr
value={password}
width="100%"
/>
- {error && (
-
-
- {error}
-
-
- )}
+ {error && {error}}
{error ? (
-
- {error}
-
+ {error}
) : null}
{
value={field.value}
width="100%"
/>
- {meta.error && (
-
- {meta.error}
-
- )}
+ {meta.error && {meta.error}}
);
});
diff --git a/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx b/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx
index d73019f7ef0..1478c3dd4cb 100644
--- a/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx
+++ b/src/app/features/increase-fee-drawer/components/increase-fee-field.tsx
@@ -2,6 +2,7 @@ import { useCallback, useMemo, useState } from 'react';
import { Input, InputGroup, Stack, Text } from '@stacks/ui';
import { useField } from 'formik';
+import { styled } from 'leather-styles/jsx';
import { microStxToStx, stxToMicroStx } from '@app/common/money/unit-conversion';
import { ErrorLabel } from '@app/components/error-label';
@@ -61,13 +62,7 @@ export function IncreaseFeeField(props: IncreaseFeeFieldProps): React.JSX.Elemen
/>
- {meta.error && (
-
-
- {meta.error}
-
-
- )}
+ {meta.error && {meta.error}}
>
);
}
diff --git a/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx b/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx
index f6a528b48c4..8f9ba8bb680 100644
--- a/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx
+++ b/src/app/features/ledger/generic-steps/connect-device/connect-ledger-error.layout.tsx
@@ -50,9 +50,7 @@ export function ConnectLedgerErrorLayout(props: ConnectLedgerErrorLayoutProps) {
{warningText}
) : (
-
- Unable to connect
-
+ Unable to connect
)}
diff --git a/src/app/pages/onboarding/sign-in/mnemonic-form.tsx b/src/app/pages/onboarding/sign-in/mnemonic-form.tsx
index 84463dc68b1..0f258137b13 100644
--- a/src/app/pages/onboarding/sign-in/mnemonic-form.tsx
+++ b/src/app/pages/onboarding/sign-in/mnemonic-form.tsx
@@ -1,6 +1,5 @@
import { OnboardingSelectors } from '@tests/selectors/onboarding.selectors';
import { Form, Formik } from 'formik';
-import { css } from 'leather-styles/css';
import { Flex, styled } from 'leather-styles/jsx';
import { isEmpty } from '@shared/utils';
@@ -89,18 +88,10 @@ export function MnemonicForm({ mnemonic, setMnemonic, twentyFourWordMode }: Mnem
{(showMnemonicErrors || error) && (
- // #4274 TODO migrate ErrorLabel
-
-
+
+
{showMnemonicErrors ? mnemonicErrorMessage : error}
-
+
)}
diff --git a/src/app/pages/send/ordinal-inscription/send-inscription-form.tsx b/src/app/pages/send/ordinal-inscription/send-inscription-form.tsx
index 6179b075e16..3bb5746d8a3 100644
--- a/src/app/pages/send/ordinal-inscription/send-inscription-form.tsx
+++ b/src/app/pages/send/ordinal-inscription/send-inscription-form.tsx
@@ -55,11 +55,7 @@ export function SendInscriptionForm() {
/>
- {currentError && (
-
- {currentError}
-
- )}
+ {currentError && {currentError}}
Continue
diff --git a/src/app/pages/send/send-crypto-asset-form/components/amount-field.tsx b/src/app/pages/send/send-crypto-asset-form/components/amount-field.tsx
index 7d7d3b0df50..f6c0df08bff 100644
--- a/src/app/pages/send/send-crypto-asset-form/components/amount-field.tsx
+++ b/src/app/pages/send/send-crypto-asset-form/components/amount-field.tsx
@@ -4,6 +4,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
import { Box, Flex, Input, Stack, Text, color } from '@stacks/ui';
import { SendCryptoAssetSelectors } from '@tests/selectors/send.selectors';
import { useField } from 'formik';
+import { styled } from 'leather-styles/jsx';
import { token } from 'leather-styles/tokens';
import { STX_DECIMALS, TOKEN_NAME_LENGTH } from '@shared/constants';