fixed styling

glific · Nov 30, 2020 · ec2422f · ec2422f
1 parent 9c89a68
commit ec2422f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/components/UI/Form/Checkbox/Checkbox.module.css b/src/components/UI/Form/Checkbox/Checkbox.module.css
@@ -1,6 +1,9 @@
-.Checkbox {
+.CheckboxColor {
+  color: #073f24 !important;
 }
 
-.CheckboxColor {
-  color: green;
+.Label {
+  font-weight: 500 !important;
+  color: #073f24;
+  font-size: 16px;
 }
diff --git a/src/components/UI/Form/Checkbox/Checkbox.tsx b/src/components/UI/Form/Checkbox/Checkbox.tsx
@@ -23,7 +23,7 @@ export const Checkbox: React.SFC<CheckboxProps> = (props) => {
         control={
           <CheckboxElement
             data-testid="checkboxLabel"
-            className={styles.CheckboxColor}
+            classes={{ colorPrimary: styles.CheckboxColor }}
             {...field}
             color="primary"
             checked={field.value ? field.value : false}
@@ -32,6 +32,9 @@ export const Checkbox: React.SFC<CheckboxProps> = (props) => {
         }
         labelPlacement="end"
         label={title}
+        classes={{
+          label: styles.Label,
+        }}
       />
     </div>
   );

diff --git a/src/containers/StaffManagement/StaffManagement.tsx b/src/containers/StaffManagement/StaffManagement.tsx
@@ -144,7 +144,7 @@ export const StaffManagement: React.SFC<StaffManagementProps> = ({ match }) => {
   let formFields: any = [];
 
   const handleRolesChange = (value: any) => {
-    const hasStaffRole = value.map((role: any) => role.label).includes('Staff');
+    const hasStaffRole = value.label === 'Staff';
     if (hasStaffRole) {
       setStaffRole(true);
     } else {
@@ -205,7 +205,7 @@ export const StaffManagement: React.SFC<StaffManagementProps> = ({ match }) => {
       {
         component: Checkbox,
         name: 'isRestricted',
-        title: 'Can chat with group contacts only',
+        title: 'Can chat with contacts from assigned group only',
       },
     ];
   }