diff --git a/src/containers/FinancialStatements/Journal/Journal.js b/src/containers/FinancialStatements/Journal/Journal.js index 27edff2c8..c51dba0f3 100644 --- a/src/containers/FinancialStatements/Journal/Journal.js +++ b/src/containers/FinancialStatements/Journal/Journal.js @@ -1,4 +1,4 @@ -import React, { useState, useCallback, useEffect } from 'react'; +import React, { useCallback, useEffect } from 'react'; import moment from 'moment'; import { FinancialStatement, DashboardPageContent } from 'components'; @@ -12,7 +12,7 @@ import { JournalBody } from './JournalBody'; import withDashboardActions from 'containers/Dashboard/withDashboardActions'; import withJournalActions from './withJournalActions'; -import { getDefaultJournalQuery } from './utils'; +import { useJournalQuery } from './utils'; import { compose } from 'utils'; /** @@ -22,9 +22,8 @@ function Journal({ // #withJournalActions toggleJournalSheetFilter, }) { - const [filter, setFilter] = useState({ - ...getDefaultJournalQuery(), - }); + const {query, setLocationQuery} = useJournalQuery(); + // Handle financial statement filter change. const handleFilterSubmit = useCallback( (filter) => { @@ -33,9 +32,9 @@ function Journal({ fromDate: moment(filter.fromDate).format('YYYY-MM-DD'), toDate: moment(filter.toDate).format('YYYY-MM-DD'), }; - setFilter(_filter); + setLocationQuery(_filter); }, - [setFilter], + [setLocationQuery], ); // Hide the journal sheet filter drawer once the page unmount. useEffect( @@ -46,14 +45,14 @@ function Journal({ ); return ( - + diff --git a/src/containers/FinancialStatements/Journal/JournalHeader.js b/src/containers/FinancialStatements/Journal/JournalHeader.js index 909c49709..edbe81fc8 100644 --- a/src/containers/FinancialStatements/Journal/JournalHeader.js +++ b/src/containers/FinancialStatements/Journal/JournalHeader.js @@ -14,7 +14,6 @@ import withJournal from './withJournal'; import withJournalActions from './withJournalActions'; import { compose } from 'utils'; -import JournalSheetHeaderDimension from './JournalSheetHeaderDimensions'; /** * Journal sheet header. @@ -45,16 +44,16 @@ function JournalHeader({ const handleSubmit = (values, { setSubmitting }) => { onSubmitFilter(values); setSubmitting(false); - toggleJournalSheetFilter(); + toggleJournalSheetFilter(false); }; // Handle cancel journal drawer header. const handleCancelClick = () => { - toggleJournalSheetFilter(); + toggleJournalSheetFilter(false); }; const handleDrawerClose = () => { - toggleJournalSheetFilter(); + toggleJournalSheetFilter(false); }; return ( @@ -74,11 +73,6 @@ function JournalHeader({ title={} panel={} /> - } - panel={} - />