Merge branch 'issue-17' of github.com:topcoder-platform/u-bahn-app into issue-17

Author: narekcat

client/src/components/AddToGroupModal/index.jsx

@@ -193,6 +193,12 @@ export default function AddToGroupModal({ onCancel, updateUser, user }) {
                 />
               ))}
         </div>
+        {myGroups.filter((g) =>
+          g.name.toLowerCase().includes(filter.toLowerCase())
+        ).length === 0 &&
+          !loadingGroups && (
+            <div className={style.message}>No results found</div>
+          )}
         <h3 className={style.subTitle}>
           Other Groups{loadingGroups && " (Loading...)"}
         </h3>
@@ -211,11 +217,13 @@ export default function AddToGroupModal({ onCancel, updateUser, user }) {
                 />
               ))}
         </div>
+        {otherGroups.filter((g) =>
+          g.name.toLowerCase().includes(filter.toLowerCase())
+        ).length === 0 &&
+          !loadingGroups && (
+            <div className={style.message}>No results found</div>
+          )}
       </div>
-      {otherGroups.filter((g) =>
-        g.name.toLowerCase().includes(filter.toLowerCase())
-      ).length === 0 &&
-        !loadingGroups && <div className={style.message}>No results found</div>}
       <div className={style.buttons}>
         <Button onClick={onCancel} disabled={updatingGroups || creatingGroup}>
           Cancel

client/src/components/AddToGroupModal/style.module.scss

@@ -90,4 +90,5 @@
 .message {
   color: $textColor2;
   font: 400 12pt/1.25 Inter;
+  margin-left: 30px;
 }

client/src/components/GroupsSideMenu/filters.js

@@ -118,7 +118,13 @@ GroupTabFilters.propTypes = {
   onCreateNewGroup: PT.func,
 };
 
-function GroupsSection({ title, items, onItemClicked, selectedItemId, loadingGroups }) {
+function GroupsSection({
+  title,
+  items,
+  onItemClicked,
+  selectedItemId,
+  loadingGroups,
+}) {
   return (
     <>
       <div className={styles.sectionTitle}>{title}</div>
@@ -137,7 +143,9 @@ function GroupsSection({ title, items, onItemClicked, selectedItemId, loadingGro
           );
         })}
       </div>
-      {items.length === 0 && !loadingGroups && <div className={styles.message}>No results found</div>}
+      {items.length === 0 && !loadingGroups && (
+        <div className={styles.message}>No results found</div>
+      )}
     </>
   );
 }