Merge branch 'v3.2.4' of https://github.com/LiteFarmOrg/LiteFarm into…

… v3.2.4
LiteFarmOrg · Jul 28, 2022 · 4e6c103 · 4e6c103
2 parents d70f31e + 6258765
commit 4e6c103
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/webapp/src/components/Profile/EditUser/index.jsx b/packages/webapp/src/components/Profile/EditUser/index.jsx
@@ -143,7 +143,7 @@ export default function PureEditUser({
                 return true;
               } else {
                 return (
-                  (value && !userFarmEmails.includes(value)) ||
+                  (value && !userFarmEmails.includes(value.toLowerCase())) ||
                   t('INVITE_USER.ALREADY_EXISTING_EMAIL_ERROR')
                 );
               }

diff --git a/packages/webapp/src/containers/Profile/EditUser.jsx b/packages/webapp/src/containers/Profile/EditUser.jsx
@@ -11,7 +11,9 @@ export default function EditUser({ history, match }) {
   const userFarmsEntities = useSelector(userFarmEntitiesSelector);
   const { user_id } = match.params;
   const userFarm = userFarmsEntities[farm_id]?.[user_id];
-  const userFarmEmails = Object.values(userFarmsEntities[farm_id]).map((user) => user.email);
+  const userFarmEmails = Object.values(userFarmsEntities[farm_id]).map((user) =>
+    user.email.toLowerCase(),
+  );
 
   const isCurrentUser = useMemo(() => {
     return user_id === currentUserId;