BC-4: feat: base currency withCurrentOrganization

client/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js

@@ -20,6 +20,7 @@ import InvoiceFormDialogs from './InvoiceFormDialogs';
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withMediaActions from 'containers/Media/withMediaActions';
 import withSettings from 'containers/Settings/withSettings';
+import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
 
 import { AppToaster } from 'components';
 import { compose, orderingLinesIndexes, transactionNumber } from 'utils';
@@ -34,7 +35,9 @@ function InvoiceForm({
   invoiceNextNumber,
   invoiceNumberPrefix,
   invoiceIncrementMode,
-  baseCurrency,
+
+  // #withCurrentOrganization
+  organization: { base_currency },
 }) {
   const history = useHistory();
 
@@ -58,7 +61,7 @@ function InvoiceForm({
   const initialValues = useMemo(
     () => ({
       ...(!isEmpty(invoice)
-        ? { ...transformToEditForm(invoice), currency_code: baseCurrency }
+        ? { ...transformToEditForm(invoice), currency_code: base_currency }
         : {
             ...defaultInvoice,
             ...(invoiceIncrementMode && {
@@ -66,7 +69,7 @@ function InvoiceForm({
             }),
             entries: orderingLinesIndexes(defaultInvoice.entries),
             ...newInvoice,
-            currency_code: baseCurrency,
+            currency_code: base_currency,
           }),
     }),
     [invoice, newInvoice, invoiceNumber, invoiceIncrementMode],
@@ -171,10 +174,10 @@ function InvoiceForm({
 export default compose(
   withDashboardActions,
   withMediaActions,
-  withSettings(({ invoiceSettings, organizationSettings }) => ({
+  withSettings(({ invoiceSettings }) => ({
     invoiceNextNumber: invoiceSettings?.nextNumber,
     invoiceNumberPrefix: invoiceSettings?.numberPrefix,
     invoiceIncrementMode: invoiceSettings?.incrementMode,
-    baseCurrency: organizationSettings?.baseCurrency,
   })),
+  withCurrentOrganization(),
 )(InvoiceForm);

client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeader.js

@@ -9,7 +9,7 @@ import InvoiceFormHeaderFields from './InvoiceFormHeaderFields';
 import { getEntriesTotal } from 'containers/Entries/utils';
 import { PageFormBigNumber } from 'components';
 
-import withSettings from 'containers/Settings/withSettings';
+import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
 
 import { compose } from 'redux';
 
@@ -17,8 +17,8 @@ import { compose } from 'redux';
  * Invoice form header section.
  */
 function InvoiceFormHeader({
-  // #withSettings
-  baseCurrency,
+  // #withCurrentOrganization
+  organization: { base_currency },
 }) {
   const { values } = useFormikContext();
 
@@ -34,13 +34,9 @@ function InvoiceFormHeader({
       <PageFormBigNumber
         label={intl.get('due_amount')}
         amount={totalDueAmount}
-        currencyCode={baseCurrency}
+        currencyCode={base_currency}
       />
     </div>
   );
 }
-export default compose(
-  withSettings(({ organizationSettings }) => ({
-    baseCurrency: organizationSettings?.baseCurrency,
-  })),
-)(InvoiceFormHeader);
+export default compose(withCurrentOrganization())(InvoiceFormHeader);

client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js

@@ -11,7 +11,6 @@ import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withInvoices from './withInvoices';
 import withInvoiceActions from './withInvoiceActions';
-import withSettings from 'containers/Settings/withSettings';
 import withAlertsActions from 'containers/Alert/withAlertActions';
 import withDrawerActions from 'containers/Drawer/withDrawerActions';
 import withDialogActions from 'containers/Dialog/withDialogActions';
@@ -29,9 +28,6 @@ function InvoicesDataTable({
   // #withInvoices
   invoicesTableState,
 
-  // #withSettings
-  baseCurrency,
-
   // #withAlertsActions
   openAlert,
 
@@ -136,7 +132,6 @@ function InvoicesDataTable({
         onQuick: handleQuickPaymentReceive,
         onViewDetails: handleViewDetailInvoice,
         onPrint: handlePrintInvoice,
-        baseCurrency,
       }}
     />
   );
@@ -149,7 +144,4 @@ export default compose(
   withDrawerActions,
   withDialogActions,
   withInvoices(({ invoicesTableState }) => ({ invoicesTableState })),
-  withSettings(({ organizationSettings }) => ({
-    baseCurrency: organizationSettings?.baseCurrency,
-  })),
 )(InvoicesDataTable);