Merge pull request #3713 from JoinColony/feat/3478-multi-sig-manage-permissions-should-allow-mod

Feat: Mutli-sig manage permissions should allow mod role

Author: iamsamgibbs

src/components/v5/common/ActionSidebar/partials/forms/ManagePermissionsForm/ManagePermissionsForm.tsx

@@ -46,7 +46,6 @@ const ManagePermissionsForm: FC<ActionFormBaseProps> = ({ getFormOptions }) => {
     isSubmitting,
     formValues: {
       team,
-      authority,
       role,
       member,
       permissions,
@@ -66,7 +65,6 @@ const ManagePermissionsForm: FC<ActionFormBaseProps> = ({ getFormOptions }) => {
     },
   ] = useToggle();
 
-  const isModRoleSelected = role === UserRole.Mod;
   const hasNoDecisionMethods = useHasNoDecisionMethods();
   const createdInFilterFn = useFilterCreatedInField('team');
 
@@ -100,9 +98,6 @@ const ManagePermissionsForm: FC<ActionFormBaseProps> = ({ getFormOptions }) => {
         if (value === UserRole.Owner) {
           return team === undefined || Number(team) === Id.RootDomain;
         }
-        if (value === UserRole.Mod) {
-          return authority !== Authority.ViaMultiSig;
-        }
         return true;
       }),
     }),
@@ -173,26 +168,12 @@ const ManagePermissionsForm: FC<ActionFormBaseProps> = ({ getFormOptions }) => {
               id: 'actionSidebar.tooltip.authority',
             }),
           },
-          content: isModRoleSelected
-            ? {
-                tooltipContent: formatText({
-                  id: 'actionSidebar.managePermissions.authority.disbaledTooltip',
-                }),
-                selectTriggerRef: (triggerRef) => {
-                  if (!triggerRef) {
-                    return null;
-                  }
-
-                  return triggerRef.querySelector('span');
-                },
-              }
-            : undefined,
         }}
         title={formatText({ id: 'actionSidebar.authority' })}
         isDisabled={hasNoDecisionMethods}
       >
         <FormCardSelect
-          disabled={isModRoleSelected || hasNoDecisionMethods}
+          disabled={hasNoDecisionMethods}
           name="authority"
           options={AUTHORITY_OPTIONS}
           title={formatText({

src/i18n/en.json

@@ -1626,11 +1626,10 @@
     "actionSidebar.managePermissions.permissionsModal.description.expand": "Read more",
     "actionSidebar.managePermissions.permissionsModal.custom.title": "Custom Permissions",
     "actionSidebar.managePermissions.permissionsModal.custom.heading": "Specific permissions that can be assigned:",
-    "actionSidebar.managePermissions.permissionsModal.mod.heading": "Only available with individual permissions. Actions that can be performed:",
+    "actionSidebar.managePermissions.permissionsModal.mod.heading": "Actions that can be performed:",
     "actionSidebar.managePermissions.permissionsModal.admin.heading": "All of the actions within Payer, plus:",
     "actionSidebar.managePermissions.permissionsModal.payer.heading": "All of the actions within Mod, plus:",
     "actionSidebar.managePermissions.permissionsModal.owner.heading": "All of the actions within Admin, plus:",
-    "actionSidebar.managePermissions.authority.disbaledTooltip": "The Mod permission does not support multi-sig authority.",
     "actionSidebar.manageTokens.table.title": "Approved tokens",
     "colonyAvatar.colonyImage.alt": "Colony logo",
     "colonyAvatar.chainImage.alt": "Chain logo",