Merge remote-tracking branch 'origin/feature/breadcrumb/fix_localize'

This commit is contained in:
Ahmed Bouhuolia
2020-05-20 07:06:15 +02:00
78 changed files with 833 additions and 538 deletions

View File

@@ -1,12 +1,12 @@
import React, {useCallback} from 'react';
import {Row, Col} from 'react-grid-system';
import React, { useCallback } from 'react';
import { Row, Col } from 'react-grid-system';
import {
Button,
Intent,
} from '@blueprintjs/core';
import moment from 'moment';
import { useFormik } from 'formik';
import { useIntl } from 'react-intl';
import { FormattedMessage as T, useIntl } from 'react-intl';
import * as Yup from 'yup';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
@@ -17,7 +17,7 @@ export default function JournalHeader({
pageFilter,
onSubmitFilter,
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const formik = useFormik({
enableReinitialize: true,
initialValues: {
@@ -38,18 +38,18 @@ export default function JournalHeader({
const handleSubmitClick = useCallback(() => {
formik.submitForm();
}, [formik]);
return (
<FinancialStatementHeader>
<FinancialStatementDateRange formik={formik} />
<Row>
<Col sm={3}>
<Button
type="submit"
onClick={handleSubmitClick}
className={'button--submit-filter'}>
{ 'Run Report' }
<T id={'run_report'} />
</Button>
</Col>
</Row>