chore(issuer): check delegates when adding, fix other flow issues

Author: Fahd

packages/polymath-issuer/src/actions/compliance.js

@@ -14,6 +14,7 @@ import { formName as addInvestorFormName } from '../pages/compliance/components/
 import { formName as editInvestorsFormName } from '../pages/compliance/components/EditInvestorsForm';
 import { parseWhitelistCsv } from '../utils/parsers';
 import { STAGE_OVERVIEW } from '../reducers/sto';
+import { PERM_TYPES } from '../constants';
 import Web3 from 'web3';
 
 import type { Investor, Address } from '@polymathnetwork/js/types';
@@ -99,8 +100,8 @@ export const fetchManagers = () => async (
       if (transferManager) {
         const delegates = await permissionManager.getAllDelegates(
           transferManager.address,
-          'ADMIN'
-        ); // put in const
+          PERM_TYPES.ADMIN
+        );
         let delegateDetails = [];
         for (const delegate of delegates) {
           let details = await permissionManager.getDelegateDetails(delegate);
@@ -122,22 +123,27 @@ export const addAddressToTransferManager = (
   delegate: Address,
   details: string
 ) => async (dispatch: Function, getState: GetState) => {
+  const st: SecurityToken = getState().token.token.contract;
+  const permissionManager = await st.getPermissionManager();
+  const titles = ['Adding New Whitelist Manager', 'Setting Permissions'];
+  const isDelegate = await permissionManager.checkDelegate(delegate);
+  if (isDelegate) {
+    titles.shift();
+  }
   dispatch(
     ui.tx(
-      ['Adding New Whitelist Manager', 'Setting Permissions'],
+      titles,
       async () => {
-        const st: SecurityToken = getState().token.token.contract;
-        const permissionManager = await st.getPermissionManager();
         if (permissionManager) {
           const transferManager = await st.getTransferManager();
           if (transferManager) {
-            console.log(delegate, details);
-            // TODO: Check if the delegate already exists
-            await permissionManager.addDelegate(delegate, details);
+            if (!isDelegate) {
+              await permissionManager.addDelegate(delegate, details);
+            }
             await permissionManager.changePermission(
               delegate,
               transferManager.address,
-              'ADMIN',
+              PERM_TYPES.ADMIN,
               true
             );
           }
@@ -161,31 +167,47 @@ export const removeAddressFromTransferManager = (delegate: Address) => async (
   getState: GetState
 ) => {
   dispatch(
-    ui.tx(
-      ['Removing Whitelist Manager'],
+    ui.confirm(
+      <div>
+        <p>
+          Once removed, the investor wallet will no longer have permission to
+          update the whitelist. Consult your legal team before removing a wallet
+          from the list.
+        </p>
+      </div>,
       async () => {
-        const st: SecurityToken = getState().token.token.contract;
-        const permissionManager = await st.getPermissionManager();
-        if (permissionManager) {
-          const transferManager = await st.getTransferManager();
-          if (transferManager) {
-            await permissionManager.changePermission(
-              delegate,
-              transferManager.address,
-              'ADMIN',
-              false
-            );
-          }
-        }
-      },
-      'Whitelist Manager Removed',
-      () => {
-        dispatch(removeManager(delegate));
+        dispatch(
+          ui.tx(
+            ['Removing Whitelist Manager'],
+            async () => {
+              const st: SecurityToken = getState().token.token.contract;
+              const permissionManager = await st.getPermissionManager();
+              if (permissionManager) {
+                const transferManager = await st.getTransferManager();
+                if (transferManager) {
+                  await permissionManager.changePermission(
+                    delegate,
+                    transferManager.address,
+                    PERM_TYPES.ADMIN,
+                    false
+                  );
+                }
+              }
+            },
+            'Whitelist Manager Removed',
+            () => {
+              dispatch(removeManager(delegate));
+            },
+            undefined,
+            undefined,
+            undefined,
+            true
+          )
+        );
       },
+      `Remove the Investor Wallet from the Whitelist Managers List?`,
       undefined,
-      undefined,
-      undefined,
-      true
+      'pui-large-confirm-modal'
     )
   );
 };
@@ -194,11 +216,15 @@ export const addGeneralPermissionModule = () => async (
   dispatch: Function,
   getState: GetState
 ) => {
+  const st: SecurityToken = getState().token.token.contract;
+  if (st.getPermissionManager()) {
+    dispatch(toggleWhitelistManagement(true));
+    return;
+  }
   dispatch(
     ui.tx(
       ['Enabling General Permissions Manager for General Transfer Manager'],
       async () => {
-        const st: SecurityToken = getState().token.token.contract;
         await st.setPermissionManager();
       },
       'General Permissions Manager for General Transfer Manager Enabled',

packages/polymath-issuer/src/constants.js

@@ -8,6 +8,10 @@ export const EVENT_TYPES = {
   TOKEN_PURCHASE: 'TokenPurchase',
 };
 
+export const PERM_TYPES = {
+  ADMIN: 'ADMIN',
+};
+
 export const MODULE_TYPES = {
   PERMISSION: 1,
   TRANSFER: 2,

packages/polymath-issuer/src/pages/compliance/CompliancePage.js

@@ -681,6 +681,22 @@ class CompliancePage extends Component<Props, State> {
                 Export Whitelist
               </Button>
             </Grid.Col>
+            <Grid.Col>
+              <OverflowMenu floatingMenu flipped style={{ float: 'right' }}>
+                <OverflowMenuItem
+                  itemText={
+                    this.props.isTokenFrozen
+                      ? 'Resume All Transfers'
+                      : 'Pause All Transfers'
+                  }
+                  onClick={
+                    this.props.isTokenFrozen
+                      ? this.handleUnFreezeModalOpen
+                      : this.handleFreezeModalOpen
+                  }
+                />
+              </OverflowMenu>
+            </Grid.Col>
           </Grid.Row>
           <Grid.Row>
             <Grid.Col gridSpan={[12, 12, 6, 6]}>
@@ -764,20 +780,6 @@ class CompliancePage extends Component<Props, State> {
               <div id="compliance">
                 <br />
                 <div className="pui-page-box compliance-form">
-                  {/* <OverflowMenu floatingMenu flipped style={{ float: 'right' }}>
-                    <OverflowMenuItem
-                      itemText={
-                        this.props.isTokenFrozen
-                          ? 'Resume All Transfers'
-                          : 'Pause All Transfers'
-                      }
-                      onClick={
-                        this.props.isTokenFrozen
-                          ? this.handleUnFreezeModalOpen
-                          : this.handleFreezeModalOpen
-                      }
-                    />
-                  </OverflowMenu> */}
                   <h1 className="pui-h1">Whitelist Management</h1>
                   <div className="whitelist-settings">
                     <div className="bx--form-item">

packages/polymath-issuer/src/pages/compliance/components/WhitelistModal.js

@@ -61,15 +61,26 @@ const formikEnhancer = withFormik({
   validationSchema: formSchema,
   displayName: 'ConfirmEmailForm',
   validateOnChange: false,
-  handleSubmit: (values, { props }) => {
-    const { dispatch } = props;
+  handleSubmit: (values, { setFieldError, props }) => {
+    const { dispatch, approvedManagers } = props;
+    const addressExists = approvedManagers.find(
+      i => i.address === values.address
+    );
+    if (addressExists) {
+      setFieldError('address', 'Address is already added to Whitelist Manager');
+      return;
+    }
     props.handleClose();
     dispatch(addAddressToTransferManager(values.address, values.details));
   },
 });
 
+const mapStateToProps = state => ({
+  approvedManagers: state.whitelist.approvedManagers,
+});
+
 const FormikEnhancedForm = formikEnhancer(ConfirmEmailFormComponent);
-const ConnectedForm = connect()(FormikEnhancedForm);
+const ConnectedForm = connect(mapStateToProps)(FormikEnhancedForm);
 
 class WhitelistModal extends Component<Props> {
   render() {

packages/polymath-issuer/src/pages/compliance/components/WhitelistTable.js

@@ -103,14 +103,16 @@ class WhitelistTable extends Component<Props, State> {
                         {row.cells.map(cell => (
                           <TableCell key={cell.id}>{cell.value}</TableCell>
                         ))}
-                        <TableCell onClick={() => this.handleDelete(row.id)}>
-                          <Icon
-                            name="delete"
-                            // fill="#E71D32"
-                            width="12"
-                            height="12"
-                          />
-                        </TableCell>
+                        {approvedManagers.length > 0 ? (
+                          <TableCell
+                            className="delete-icon"
+                            onClick={() => this.handleDelete(row.id)}
+                          >
+                            <Icon name="delete" width="12" height="12" />
+                          </TableCell>
+                        ) : (
+                          <TableCell />
+                        )}
                       </TableRow>
                     ))}
                   </TableBody>

packages/polymath-issuer/src/pages/compliance/style.scss

@@ -1,3 +1,7 @@
+.delete-icon {
+  cursor: pointer;
+}
+
 .compliance-form {
   width: 100%;
 

packages/polymath-js/src/contracts/PermissionManager.js

@@ -23,6 +23,10 @@ export default class PermissionManager extends Contract {
     return this._tx(this._methods.addDelegate(at, this._toBytes(details)));
   }
 
+  async checkDelegate(at: Address) {
+    return this._methods.checkDelegate(at).call();
+  }
+
   async getDelegateDetails(delegate: Address) {
     let details = await this._methods.delegateDetails(delegate).call();
     return this._toAscii(details);