fix crash, fix select

Author: alexjs-dev

components/Input/Select.js

@@ -10,10 +10,12 @@ import {
   filter,
   find,
   isNil,
+  some,
   isEmpty as lodashEmpty,
   includes,
 } from 'lodash'
 import classNames from 'classnames'
+import useDebounce from '~hooks/useDebounce'
 import { FiX as CloseIcon } from 'react-icons/fi'
 import { BaseButton, Loader } from '~components'
 import useOutsideClick from '~hooks/useOutsideClick'
@@ -73,7 +75,13 @@ const Content = React.memo(
           className={styles.searchInput}
           onChange={(e) => setSearchValue(e.target.value)}
           onBlur={() => {
-            if (value === '') {
+            if (
+              value === '' ||
+              some(
+                map(options, (option) => option.label),
+                (label) => label !== searchValue
+              )
+            ) {
               setSearchValue('')
             }
           }}

components/User/Avatar.module.scss

@@ -4,7 +4,9 @@
   display: flex;
   flex-direction: column;
   .user {
-    display: flex;
+    display: grid;
+    grid-template-columns: 34px 1fr;
+    grid-gap: spacing(1);
     align-items: center;
     img {
       width: 44px;
@@ -14,7 +16,7 @@
     }
   }
   a {
-    margin-left: spacing(1);
+    // margin-left: spacing(1);
     color: $color-primary;
     font-size: $font-size-p;
     font-family: $font-family-secondary;
@@ -27,3 +29,7 @@
     margin-bottom: spacing(0.5);
   }
 }
+
+.link {
+  color: $color-complimentary;
+}

pages/messages/components/ChatList.tsx

@@ -14,7 +14,7 @@ import { BaseButton, Loader, Button } from '../../../components'
 import { getUsername } from '../../../utils/helpers'
 import styles from './ChatList.module.scss'
 import ChatAvatar from './ChatAvatar'
-import { getMessage } from './chatUtils'
+import { getMessage } from '../../../utils/chatUtils'
 
 type Props = {
   onPaginate: () => void

pages/messages/components/MessagesList.tsx

@@ -6,7 +6,7 @@ import map from 'lodash/map'
 import { scrollToBottom } from '../../../utils/helpers'
 import styles from './MessagesList.module.scss'
 import useUser from '../../../hooks/useUser'
-import { getMessage } from './chatUtils'
+import { getMessage } from '../../../utils/chatUtils'
 
 type Props = {
   messages: any