Merge remote-tracking branch 'origin/fix_connectors'

client/src/containers/ExchangeRates/ExchangeRate.js

@@ -14,7 +14,7 @@ import DashboardInsider from 'components/Dashboard/DashboardInsider';
 import ExchangeRateTable from './ExchangeRateTable';
 import ExchangeRateActionsBar from './ExchangeRateActionsBar';
 
-import withDialog from 'connectors/Dialog.connector';
+import withDialogActions from 'containers/Dialog/withDialogActions';
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withResourceActions from 'containers/Resources/withResourcesActions';
 import withExchangeRatesActions from 'containers/ExchangeRates/withExchangeRatesActions';
@@ -200,5 +200,5 @@ export default compose(
   withExchangeRatesActions,
   withResourceActions,
   withDashboardActions,
-  withDialog,
+  withDialogActions,
 )(ExchangeRate);

client/src/containers/ExchangeRates/ExchangeRateActionsBar.js

@@ -11,16 +11,15 @@ import {
 } from '@blueprintjs/core';
 import classNames from 'classnames';
 import { FormattedMessage as T, useIntl } from 'react-intl';
-
 import { connect } from 'react-redux';
 
 import { If } from 'components';
 import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
 import Icon from 'components/Icon';
-
 import FilterDropdown from 'components/FilterDropdown';
+
+import withDialogActions from 'containers/Dialog/withDialogActions';
 import withResourceDetail from 'containers/Resources/withResourceDetails';
-import withDialog from 'connectors/Dialog.connector';
 
 import { compose } from 'utils';
 
@@ -28,7 +27,7 @@ import { compose } from 'utils';
  * Exchange rate actions bar.
  */
 function ExchangeRateActionsBar({
-  // #withDialog.
+  // #withDialogActions.
   openDialog,
 
   // #withResourceDetail
@@ -125,7 +124,7 @@ const withExchangeRateActionBar = connect(mapStateToProps);
 
 export default compose(
   withExchangeRateActionBar,
-  withDialog,
+  withDialogActions,
   withResourceDetail(({ resourceFields }) => ({
     resourceFields,
   })),

client/src/containers/ExchangeRates/ExchangeRateTable.js

@@ -1,10 +1,12 @@
 import React, { useCallback, useMemo, useState, useEffect } from 'react';
-import Icon from 'components/Icon';
-import DialogConnect from 'connectors/Dialog.connector';
-import DataTable from 'components/DataTable';
 import { Button, Popover, Menu, MenuItem, Position,Intent } from '@blueprintjs/core';
 import { FormattedMessage as T, useIntl } from 'react-intl';
+
+import Icon from 'components/Icon';
+import DataTable from 'components/DataTable';
 import LoadingIndicator from 'components/LoadingIndicator';
+
+import withDialogActions from 'containers/Dialog/withDialogActions';
 import withExchangeRatesActions from 'containers/ExchangeRates/withExchangeRatesActions';
 import withExchangeRates from 'containers/ExchangeRates/withExchangeRates';
 
@@ -14,7 +16,8 @@ function ExchangeRateTable({
   // #withExchangeRates
   exchangeRatesList,
   exchangeRatesLoading,
-  // #withDialog.
+
+  // #withDialogActions.
   openDialog,
 
   // own properties
@@ -134,7 +137,7 @@ function ExchangeRateTable({
 }
 
 export default compose(
-  DialogConnect,
+  withDialogActions,
   withExchangeRatesActions,
   withExchangeRates(({ exchangeRatesList, exchangeRatesLoading }) => ({
     exchangeRatesList,