Merge remote-tracking branch 'origin/master'

client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js

@@ -16,7 +16,7 @@ import { CLASSES } from 'common/classes';
 import { momentFormatter, compose, tansformDateValue } from 'utils';
 import {
   AccountsSelectList,
-  ListSelect,
+  ContactSelecetList,
   ErrorMessage,
   FieldRequiredHint,
   Money,
@@ -60,39 +60,14 @@ function PaymentMadeFormHeader({
     },
     [setFieldValue],
   );
-
-  const handleVenderRenderer = useCallback(
-    (vender, { handleClick }) => (
-      <MenuItem
-        key={vender.id}
-        text={vender.display_name}
-        onClick={handleClick}
-      />
-    ),
-    [],
-  );
-
   const triggerFullAmountChanged = (value) => {
     onFullAmountChanged && onFullAmountChanged(value);
-  }
+  };
 
   const handleFullAmountBlur = (event) => {
     triggerFullAmountChanged(event.currentTarget.value);
   };
 
-  const handleFilterVender = (query, vender, index, exactMatch) => {
-    const normalizedTitle = vender.display_name.toLowerCase();
-    const normalizedQuery = query.toLowerCase();
-    if (exactMatch) {
-      return normalizedTitle === normalizedQuery;
-    } else {
-      return (
-        `${vender.display_name} ${normalizedTitle}`.indexOf(normalizedQuery) >=
-        0
-      );
-    }
-  };
-
   const onChangeSelect = useCallback(
     (filedName) => {
       return (item) => {
@@ -131,18 +106,11 @@ function PaymentMadeFormHeader({
               <ErrorMessage name={'vendor_id'} {...{ errors, touched }} />
             }
           >
-            <ListSelect
-              items={vendorItems}
-              noResults={<MenuItem disabled={true} text="No results." />}
-              itemRenderer={handleVenderRenderer}
-              itemPredicate={handleFilterVender}
-              popoverProps={{ minimal: true }}
-              onItemSelect={onChangeSelect('vendor_id')}
-              selectedItem={values.vendor_id}
-              selectedItemProp={'id'}
-              defaultText={<T id={'select_vender_account'} />}
-              labelProp={'display_name'}
-              buttonProps={{ disabled: !isNewMode }}
+            <ContactSelecetList
+              contactsList={vendorItems}
+              selectedContactId={values.vendor_id}
+              defaultSelectText={ <T id={'select_vender_account'} /> }
+              onContactSelected={onChangeSelect('vendor_id')}
               disabled={!isNewMode}
             />
           </FormGroup>