Merge pull request #2106 from Civolilah/cleanup/1202-payments-quotes

[Cleanup] Changing Selectors For Payments And Quotes
invoiceninja · Oct 21, 2024 · 3cf422c · 3cf422c
2 parents 1652443 + 6a7171f
commit 3cf422c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/components/forms/SelectField.tsx b/src/components/forms/SelectField.tsx
@@ -157,8 +157,8 @@ export function SelectField(props: SelectProps) {
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
           styles={customStyles}
-          isSearchable={false}
-          isClearable={dismissable}
+          isSearchable
+          isClearable={Boolean(dismissable && selectedEntry?.value)}
           data-cy={cypressRef}
         />
       )}

diff --git a/src/pages/payments/create/Create.tsx b/src/pages/payments/create/Create.tsx
@@ -520,11 +520,11 @@ export default function Create() {
 
           <Element leftSide={t('payment_type')}>
             <SelectField
-              id="type_id"
               value={payment?.type_id}
               onValueChange={(value) => handleChange('type_id', value)}
               errorMessage={errors?.errors.type_id}
               withBlank
+              customSelector
             >
               {paymentTypes.map(([key, value], index) => (
                 <option value={key} key={index}>

diff --git a/src/pages/payments/edit/Edit.tsx b/src/pages/payments/edit/Edit.tsx
@@ -91,12 +91,12 @@ export default function Edit() {
 
       <Element leftSide={t('payment_type')}>
         <SelectField
-          style={{ color: colors.$3, colorScheme: colors.$0 }}
-          id="type_id"
           value={payment?.type_id}
           onValueChange={(value) => handleChange('type_id', value)}
           errorMessage={errors?.errors.type_id}
           withBlank
+          customSelector
+          style={{ color: colors.$3, colorScheme: colors.$0 }}
         >
           {paymentTypes.map(([key, value], index) => (
             <option value={key} key={index}>

diff --git a/src/pages/quotes/common/components/QuoteDetails.tsx b/src/pages/quotes/common/components/QuoteDetails.tsx
@@ -130,11 +130,13 @@ export function QuoteDetails(props: Props) {
 
             <div className="w-full lg:w-1/2">
               <SelectField
+                value={quote?.is_amount_discount.toString()}
                 onValueChange={(value) =>
                   handleChange('is_amount_discount', JSON.parse(value))
                 }
-                value={quote?.is_amount_discount.toString()}
                 errorMessage={errors?.errors.is_amount_discount}
+                customSelector
+                dismissable={false}
               >
                 <option value="false">{t('percent')}</option>
                 <option value="true">{t('amount')}</option>