refactor

ita-social-projects · Dec 16, 2024 · 9748840 · 9748840
1 parent 1540836
commit 9748840
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/components/message/Message.styles.ts b/src/components/message/Message.styles.ts
@@ -25,13 +25,12 @@ export const styles = {
     p: '8px 16px'
   }),
   findMessageCard: (isMyMessage: boolean, isFiltered: boolean) => {
-    let backgroundColor
+    const basicShade = isMyMessage ? 'turquoiseDark' : 'turquoiseChat'
+    const primaryShade = isMyMessage ? 500 : 100
 
-    if (isFiltered) {
-      backgroundColor = `basic.${isMyMessage ? 'turquoiseDark' : 'turquoiseChat'}`
-    } else {
-      backgroundColor = `primary.${isMyMessage ? 500 : 100}`
-    }
+    const backgroundColor = isFiltered
+      ? `basic.${basicShade}`
+      : `primary.${primaryShade}`
 
     return { backgroundColor }
   },

diff --git a/src/containers/find-offer/offer-filter-block/offer-filter-list/OfferFilterList.tsx b/src/containers/find-offer/offer-filter-block/offer-filter-list/OfferFilterList.tsx
@@ -60,12 +60,14 @@ const OfferFilterList: FC<OfferFilterListProps> = ({
   const handleFilterChange = (key: keyof FindOffersFilters) => () =>
     updateFilterByKey(key)
 
+  const getOptionLabelForLanguage = (option: LanguageFilter | null): string => {
+    return option?.trim() ? option : t('common.languages.allLanguages')
+  }
+
   const languagesFilter = (
     <Box>
       <AppAutoComplete
-        getOptionLabel={(option: LanguageFilter) =>
-          option?.trim() ? option : t('common.languages.allLanguages')
-        }
+        getOptionLabel={getOptionLabelForLanguage}
         onChange={handleLanguagesChange}
         options={languageValues}
         value={filters.language}

diff --git a/src/pages/find-offers/FindOffers.tsx b/src/pages/find-offers/FindOffers.tsx
@@ -144,7 +144,7 @@ const FindOffers = () => {
     })
   }
 
-  const renderOffersContent = () => {
+  const offersContent = useMemo(() => {
     if (offersLoading) {
       return <Loader pageLoad />
     }
@@ -165,7 +165,7 @@ const FindOffers = () => {
         viewMode={cardsView}
       />
     )
-  }
+  }, [offersLoading, items, updateInfo, cardsView, t])
 
   return (
     <PageWrapper>
@@ -215,7 +215,7 @@ const FindOffers = () => {
             price={price}
           />
         </AppDrawer>
-        {renderOffersContent()}
+        {offersContent}
       </Box>
       <AppPagination
         onChange={handlePageChange}