Merge branch 'master' of https://github.com/abouolia/Ratteb

client/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryActionsBar.js

@@ -39,7 +39,7 @@ function ARAgingSummaryActionsBar({
   const { isARAgingFetching, refetch } = useARAgingSummaryContext();
 
   const handleFilterToggleClick = () => {
-    toggleDisplayFilterDrawer(false);
+    toggleDisplayFilterDrawer();
   };
 
   // Handles re-calculate report button.

client/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeader.js

@@ -25,7 +25,7 @@ function ARAgingSummaryHeader({
   toggleARAgingSummaryFilterDrawer: toggleFilterDrawerDisplay,
 
   // #withARAgingSummary
-  isFilterDrawerOpen
+  isFilterDrawerOpen,
 }) {
   const validationSchema = Yup.object().shape({
     asDate: Yup.date().required().label('asDate'),
@@ -53,13 +53,22 @@ function ARAgingSummaryHeader({
     toggleFilterDrawerDisplay(false);
     setSubmitting(false);
   };
+
   // Handle cancel button click.
   const handleCancelClick = () => {
     toggleFilterDrawerDisplay(false);
   };
+ 
+  // Handle the drawer close.
+  const handleDrawerClose = () => {
+    toggleFilterDrawerDisplay(false);
+  };
 
   return (
-    <FinancialStatementHeader isOpen={isFilterDrawerOpen}>
+    <FinancialStatementHeader
+      isOpen={isFilterDrawerOpen}
+      drawerProps={{ onClose: handleDrawerClose }}
+    >
       <Formik
         initialValues={initialValues}
         validationSchema={validationSchema}

client/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeaderGeneral.js

@@ -10,7 +10,7 @@ import {
 } from '@blueprintjs/core';
 import { FormattedMessage as T } from 'react-intl';
 import classNames from 'classnames';
-import { CustomersMultiSelect, Row, Col, FieldHint } from 'components';
+import { ContactsMultiSelect, Row, Col, FieldHint } from 'components';
 import { momentFormatter } from 'utils';
 
 import { useARAgingSummaryContext } from './ARAgingSummaryProvider';
@@ -97,7 +97,7 @@ export default function ARAgingSummaryHeaderGeneral() {
             label={<T id={'specific_customers'} />}
             className={classNames('form-group--select-list', Classes.FILL)}
           >
-            <CustomersMultiSelect customers={customers} />
+            <ContactsMultiSelect contacts={customers} />
           </FormGroup>
         </Col>
       </Row>