diff --git a/src/containers/Accounts/AccountsActionsBar.js b/src/containers/Accounts/AccountsActionsBar.js
index e96d69c8a..001fb64bf 100644
--- a/src/containers/Accounts/AccountsActionsBar.js
+++ b/src/containers/Accounts/AccountsActionsBar.js
@@ -15,6 +15,7 @@ import { FormattedMessage as T } from 'components';
import {
AdvancedFilterPopover,
If,
+ Can,
DashboardActionViewsList,
DashboardFilterButton,
DashboardRowsHeightButton,
@@ -30,6 +31,8 @@ import withAlertActions from 'containers/Alert/withAlertActions';
import withAccountsTableActions from './withAccountsTableActions';
import withSettings from '../Settings/withSettings';
import withSettingsActions from '../Settings/withSettingsActions';
+import { Account_Abilities, AbilitySubject } from '../../common/abilityOption';
+
import { compose } from 'utils';
/**
@@ -116,13 +119,14 @@ function AccountsActionsBar({
onChange={handleTabChange}
/>
-
- }
- text={}
- onClick={onClickNewAccount}
- />
+
+ }
+ text={}
+ onClick={onClickNewAccount}
+ />
+
- }
- defaultChecked={accountsInactiveMode}
- onChange={handleInactiveSwitchChange}
- />
+
+ }
+ defaultChecked={accountsInactiveMode}
+ onChange={handleInactiveSwitchChange}
+ />
+
-
- }
- text={intl.get('edit_account')}
- onClick={safeCallback(onEdit, original)}
- />
- }
- text={intl.get('new_child_account')}
- onClick={safeCallback(onNewChild, original)}
- />
-
-
+
+
}
- onClick={safeCallback(onInactivate, original)}
+ icon={}
+ text={intl.get('edit_account')}
+ onClick={safeCallback(onEdit, original)}
/>
-
-
+
}
- onClick={safeCallback(onActivate, original)}
+ icon={}
+ text={intl.get('new_child_account')}
+ onClick={safeCallback(onNewChild, original)}
/>
-
- }
- intent={Intent.DANGER}
- onClick={safeCallback(onDelete, original)}
- />
+
+
+
+
+ }
+ onClick={safeCallback(onInactivate, original)}
+ />
+
+
+ }
+ onClick={safeCallback(onActivate, original)}
+ />
+
+
+
+ }
+ intent={Intent.DANGER}
+ onClick={safeCallback(onDelete, original)}
+ />
+
);
}
diff --git a/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.js b/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.js
index cd4f11d90..9e18120b3 100644
--- a/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.js
+++ b/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.js
@@ -7,13 +7,17 @@ import {
Intent,
NavbarDivider,
} from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
+import { Can, FormattedMessage as T } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import { safeCallback } from 'utils';
+import {
+ Account_Abilities,
+ AbilitySubject,
+} from '../../../common/abilityOption';
import { compose } from 'utils';
import { useAccountDrawerContext } from './AccountDrawerProvider';
@@ -53,26 +57,31 @@ function AccountDrawerActionBar({
return (
- }
- text={}
- onClick={safeCallback(onEditAccount)}
- />
- }
- text={}
- onClick={safeCallback(onNewChildAccount)}
- />
-
- }
- text={}
- intent={Intent.DANGER}
- onClick={safeCallback(onDeleteAccount)}
- />
+
+ }
+ text={}
+ onClick={safeCallback(onEditAccount)}
+ />
+
+ }
+ text={}
+ onClick={safeCallback(onNewChildAccount)}
+ />
+
+
+
+ }
+ text={}
+ intent={Intent.DANGER}
+ onClick={safeCallback(onDeleteAccount)}
+ />
+
);