From 04280351ab31fdf0c02130c55e64a18a6389c240 Mon Sep 17 00:00:00 2001
From: Clement Mwimo <clement.mwimo@mx.com>
Date: Thu, 16 Jul 2026 17:56:54 -0600
Subject: [PATCH 1/2] feat: use MXUI Select component for property type manual
 account

---
 src/components/Select.tsx                     | 73 +++++++++++++++++++
 src/privacy/input.ts                          |  3 +
 src/views/manualAccount/ManualAccountForm.tsx |  7 +-
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Select.tsx

diff --git a/src/components/Select.tsx b/src/components/Select.tsx
new file mode 100644
index 0000000000..da3e153de1
--- /dev/null
+++ b/src/components/Select.tsx
@@ -0,0 +1,73 @@
+import React from 'react'
+import FormControl from '@mui/material/FormControl'
+import FormHelperText from '@mui/material/FormHelperText'
+import InputLabel from '@mui/material/InputLabel'
+import MenuItem from '@mui/material/MenuItem'
+import MuiSelect, { SelectChangeEvent } from '@mui/material/Select'
+
+export interface SelectOption {
+  label: string
+  value: string
+}
+
+export interface SelectProps {
+  'data-test'?: string
+  error?: boolean
+  fullWidth?: boolean
+  helperText?: string
+  label: string
+  name: string
+  onChange: (e: { target: { name: string; value: string } }) => void
+  options?: SelectOption[]
+  placeholder?: string
+  value: string
+}
+
+export const Select = ({
+  'data-test': dataTest,
+  error,
+  fullWidth = true,
+  helperText,
+  label,
+  name,
+  onChange,
+  options = [],
+  placeholder = 'Select a value',
+  value,
+}: SelectProps) => {
+  const handleChange = (e: SelectChangeEvent) => {
+    onChange({ target: { name, value: e.target.value as string } })
+  }
+
+  return (
+    <FormControl error={error} fullWidth={fullWidth}>
+      <InputLabel id={`${name}-label`}>{label}</InputLabel>
+      <MuiSelect
+        displayEmpty={true}
+        inputProps={{ 'data-test': dataTest }}
+        label={label}
+        labelId={`${name}-label`}
+        name={name}
+        onChange={handleChange}
+        renderValue={(selected) => {
+          if (selected === '') {
+            return placeholder
+          }
+          const option = options.find((opt) => opt.value === selected)
+          return option ? option.label : selected
+        }}
+        value={value}
+      >
+        <MenuItem disabled={true} value="">
+          {placeholder}
+        </MenuItem>
+        {options.map((option) => (
+          <MenuItem key={option.value} value={option.value}>
+            {option.label}
+          </MenuItem>
+        ))}
+      </MuiSelect>
+      {helperText && <FormHelperText>{helperText}</FormHelperText>}
+    </FormControl>
+  )
+}
diff --git a/src/privacy/input.ts b/src/privacy/input.ts
index 687b07b5d9..6b9729046a 100644
--- a/src/privacy/input.ts
+++ b/src/privacy/input.ts
@@ -2,6 +2,7 @@
 // This is the ONLY file that @kyper related inputs should be directly imported
 
 import { Radio, PASSWORD_VALIDATIONS } from '@kyper/input'
+import { Select } from 'src/components/Select'
 import { SelectionBox } from '@mxenabled/mxui'
 import { UserFeedback } from '@kyper/userfeedback'
 import { withProtection } from 'src/privacy/withProtection'
@@ -20,12 +21,14 @@ import { TextField } from '@mxenabled/mxui'
 
 const ProtectedTextField = withProtection(TextField)
 const ProtectedRadio = withProtection(Radio)
+const ProtectedSelect = withProtection(Select)
 const ProtectedSelectionBox = withProtection(SelectionBox)
 const ProtectedUserFeedback = withProtection(UserFeedback)
 
 export {
   ProtectedTextField as TextField,
   ProtectedRadio as Radio,
+  ProtectedSelect as Select,
   ProtectedSelectionBox as SelectionBox,
   ProtectedUserFeedback as UserFeedback,
   PASSWORD_VALIDATIONS as PasswordValidations,
diff --git a/src/views/manualAccount/ManualAccountForm.tsx b/src/views/manualAccount/ManualAccountForm.tsx
index 645cc31f77..11772c2b32 100644
--- a/src/views/manualAccount/ManualAccountForm.tsx
+++ b/src/views/manualAccount/ManualAccountForm.tsx
@@ -309,12 +309,13 @@ export const ManualAccountForm = React.forwardRef<HTMLInputElement, ManualAccoun
                 <div key={i} style={styles.selectInput}>
                   <Select
                     data-test="select-input"
-                    errorText={errors[field.name]}
-                    items={field.options}
+                    error={!!errors[field.name]}
+                    helperText={errors[field.name]}
                     label={field.label}
                     name={field.name}
                     onChange={handleTextInputChange}
-                    placeholder={__('Select a value')}
+                    options={field.options}
+                    value={values[field.name]}
                   />
                 </div>
               )

From 7209cffec2e07d9ba2a8f69935f16c08aecb4776 Mon Sep 17 00:00:00 2001
From: Clement Mwimo <clement.mwimo@mx.com>
Date: Thu, 16 Jul 2026 18:22:33 -0600
Subject: [PATCH 2/2] added the test

---
 src/components/Select-test.tsx | 43 ++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/components/Select-test.tsx

diff --git a/src/components/Select-test.tsx b/src/components/Select-test.tsx
new file mode 100644
index 0000000000..732e86b266
--- /dev/null
+++ b/src/components/Select-test.tsx
@@ -0,0 +1,43 @@
+import React from 'react'
+import { describe, it, expect, vi } from 'vitest'
+import { render, screen, waitFor } from 'src/utilities/testingLibrary'
+import userEvent from '@testing-library/user-event'
+import { Select } from 'src/components/Select'
+
+const options = [
+  { label: 'Checking', value: 'checking' },
+  { label: 'Savings', value: 'savings' },
+]
+
+const defaultProps = {
+  label: 'Account type',
+  name: 'account_type',
+  onChange: vi.fn(),
+  options,
+  value: '',
+}
+
+describe('Select', () => {
+  it('renders with default props', () => {
+    render(<Select {...defaultProps} />)
+
+    expect(screen.getByLabelText('Account type')).toBeInTheDocument()
+    expect(screen.getByText('Select a value')).toBeInTheDocument()
+  })
+
+  it('calls onChange with the selected value', async () => {
+    const user = userEvent.setup()
+    const handleChange = vi.fn()
+
+    render(<Select {...defaultProps} onChange={handleChange} />)
+
+    await user.click(screen.getByRole('combobox'))
+    await user.click(screen.getByRole('option', { name: 'Savings' }))
+
+    await waitFor(() =>
+      expect(handleChange).toHaveBeenCalledWith({
+        target: { name: 'account_type', value: 'savings' },
+      }),
+    )
+  })
+})