Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ahmed Bouhuolia
2020-11-17 11:36:03 +02:00
11 changed files with 226 additions and 141 deletions

View File

@@ -26,7 +26,6 @@ import {
import withDialogActions from 'containers/Dialog/withDialogActions';
import withCurrencies from 'containers/Currencies/withCurrencies';
import withSettings from 'containers/Settings/withSettings';
import { compose } from 'utils';
@@ -41,9 +40,6 @@ function MakeJournalEntriesHeader({
manualJournal,
onJournalNumberChanged,
// #withSettings
baseCurrency,
// #withCurrencies
currenciesList,
@@ -225,7 +221,7 @@ function MakeJournalEntriesHeader({
currenciesList={currenciesList}
selectedCurrencyCode={values.currency_code}
onCurrencySelected={onItemsSelect('currency_code')}
defaultSelectText={baseCurrency}
defaultSelectText={values.currency_code}
/>
</FormGroup>
</Col>
@@ -236,9 +232,6 @@ function MakeJournalEntriesHeader({
export default compose(
withDialogActions,
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
withCurrencies(({ currenciesList }) => ({
currenciesList,
})),