[370] [CodeInput, InputField and TextArea] Replace errorMsg with error

src/components/CodeInput/CodeInput.tsx

@@ -5,7 +5,7 @@ import { ThemeMode } from '../../types';
 import { getThemedColor } from '../../utils/colorUtils';
 import Typography, { TypographySize } from '../Typography';
 
-import { CodeInputProps, CodeInputType } from './CodeInput.constants';
+import { CodeInputProps, CodeInputType } from './CodeInput.types';
 import { isValid, padEnd } from './CodeInput.utils';
 
 const CodeInputContainer = styled.div`
@@ -60,7 +60,7 @@ const CodeInputField = styled.input<{
 const CodeInput: React.FC<CodeInputProps> = ({
   codeLength,
   dataTest,
-  errorMsg,
+  error,
   isSubmitting,
   value,
   onChange,
@@ -163,18 +163,16 @@ const CodeInput: React.FC<CodeInputProps> = ({
             disabled={isSubmitting}
             $active={index === focusedFieldIndex}
             $codeLength={codeLength}
-            $error={!!errorMsg}
+            $error={!!error}
             $forceTheme={forceTheme}
             $type={type}
           />
         ))}
       </CodeInputContainer>
-      {errorMsg && (
-        <div style={{ minHeight: 4 }}>
+      {!!error && typeof error === 'string' && (
           <Typography forceTheme={forceTheme} color='destructive' size={TypographySize.SMALL} wrap>
-            {errorMsg}
+            {error}
           </Typography>
-        </div>
       )}
     </>
   );

src/components/CodeInput/CodeInput.constants.ts → src/components/CodeInput/CodeInput.types.ts

@@ -16,11 +16,8 @@ export type CodeInputProps = {
   onSubmit: () => Promise<void> | void;
   /** Indicator for e2e tests */
   dataTest?: string;
-  /**
-   * Submit error message
-   * Undefined indicates that there is no error
-   */
-  errorMsg?: string;
+  /** Error state / message */
+  error?: boolean | string;
   /** Forced theme mode */
   forceTheme?: ThemeMode;
   /** Controlled loading value */

src/components/CodeInput/CodeInput.utils.ts

@@ -1,4 +1,4 @@
-import { CodeInputType } from './CodeInput.constants';
+import { CodeInputType } from './CodeInput.types';
 
 /** Checks that the input is valid
  * @param {CodeInputType} type - The input type

src/components/CodeInput/index.ts

@@ -1,2 +1,2 @@
 export { default } from './CodeInput';
-export { CodeInputType } from './CodeInput.constants';
+export { CodeInputType } from './CodeInput.types';

src/components/InputField/Input/Input.tsx

@@ -74,7 +74,6 @@ const InputField = (
     disabled = false,
     endAdornment,
     error,
-    errorMsg,
     forceTheme,
     ghost = false,
     helperText,
@@ -139,7 +138,7 @@ const InputField = (
           $paddingRight={paddingRight}
           readOnly={readOnly}
           $active={!!active}
-          $error={!!error || !!errorMsg}
+          $error={!!error}
           $size={size}
           $ghost={ghost}
           $forceTheme={forceTheme}
@@ -156,7 +155,9 @@ const InputField = (
           </EndAdornment>
         )}
       </InputFieldContainer>
-      <SubText errorMsg={errorMsg} helperText={helperText} size={size} forceTheme={forceTheme} />
+      {typeof error === 'string' && (
+        <SubText errorMsg={error} helperText={helperText} size={size} forceTheme={forceTheme} />
+      )}
     </Wrapper>
   );
 };

src/components/InputField/InputField.types.ts

@@ -19,10 +19,8 @@ export interface InputFieldProps {
   dataTest?: string;
   /** Disable editing */
   disabled?: boolean;
-  /** Error state */
-  error?: boolean;
-  /** Error message */
-  errorMsg?: string;
+  /** Error state / message */
+  error?: boolean | string;
   /** Override theme */
   forceTheme?: ThemeMode;
   /**

src/components/InputField/TextArea/TextArea.tsx

@@ -53,7 +53,6 @@ const TextArea = (
     dataTest,
     disabled = false,
     error,
-    errorMsg,
     forceTheme,
     ghost = false,
     helperText,
@@ -118,7 +117,7 @@ const TextArea = (
           readOnly={readOnly}
           $active={!!active}
           $dynamicHeight={dynamicHeight}
-          $error={!!error || !!errorMsg}
+          $error={!!error}
           $size={size}
           $startIconExists={!!icon}
           $ghost={ghost}
@@ -128,7 +127,9 @@ const TextArea = (
           $borderRadius={borderRadius}
         />
       </TextAreaContainer>
-      <SubText errorMsg={errorMsg} helperText={helperText} size={size} forceTheme={forceTheme} />
+      {typeof error === 'string' && (
+        <SubText errorMsg={error} helperText={helperText} size={size} forceTheme={forceTheme} />
+      )}
     </Wrapper>
   );
 };