Merge pull request #637 from eaglesemanation/fix/unassign_user

Fix/unassign user

CHANGELOG.md

@@ -25,6 +25,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Fix updating product that has no variants - #649 by @dominik-zeglen
 - Update checkbox design - #651 by @dominik-zeglen
 - Add warehouse choice - #646 by @dominik-zeglen
+- Fix user management modal actions - #637 by @eaglesemanation
 
 ## 2.10.1
 

src/components/ActionDialog/ActionDialog.tsx

@@ -33,7 +33,7 @@ interface ActionDialogProps extends DialogProps {
   confirmButtonState: ConfirmButtonTransitionState;
   maxWidth?: "xs" | "sm" | "md" | "lg" | "xl" | false;
   title: string;
-  variant?: "default" | "delete";
+  variant?: "default" | "delete" | "info";
   onConfirm();
 }
 
@@ -61,20 +61,22 @@ const ActionDialog: React.FC<ActionDialogProps> = props => {
         <Button onClick={onClose}>
           <FormattedMessage {...buttonMessages.back} />
         </Button>
-        <ConfirmButton
+        {variant !== "info" && (
-          transitionState={confirmButtonState}
+          <ConfirmButton
-          color="primary"
+            transitionState={confirmButtonState}
-          variant="contained"
+            color="primary"
-          onClick={onConfirm}
+            variant="contained"
-          className={classNames({
+            onClick={onConfirm}
-            [classes.deleteButton]: variant === "delete"
+            className={classNames({
-          })}
+              [classes.deleteButton]: variant === "delete"
-        >
+            })}
-          {confirmButtonLabel ||
+          >
-            (variant === "delete"
+            {confirmButtonLabel ||
-              ? intl.formatMessage(buttonMessages.delete)
+              (variant === "delete"
-              : intl.formatMessage(buttonMessages.confirm))}
+                ? intl.formatMessage(buttonMessages.delete)
-        </ConfirmButton>
+                : intl.formatMessage(buttonMessages.confirm))}
+          </ConfirmButton>
+        )}
       </DialogActions>
     </Dialog>
   );

src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx

@@ -29,7 +29,7 @@ const MembersErrorDialog: React.FC<MembersErrorDialogProps> = ({
         defaultMessage: "Unassign users",
         description: "dialog title"
       })}
-      variant="default"
+      variant="info"
     >
       <DialogContentText>
         <FormattedMessage