Ott 214 combobox countries t9ns (#29)

src/features/LexicsStore/helpers/index.tsx

@@ -24,7 +24,7 @@ export const readLang = () => {
 }
 
 export const getSuffix = (lang: string) => (
-  lang === 'rus' ? 'rus' : 'eng'
+  lang === 'ru' ? 'rus' : 'eng'
 )
 
 export const getLexicIds = (ids: Array<LexicsId> | LexicsConfig) => (

src/features/LexicsStore/hooks/index.tsx

@@ -7,6 +7,7 @@ import { getLexics } from 'requests'
 import {
   getLexicIds,
   mapTranslationsToLocalKeys,
+  getSuffix,
 } from 'features/LexicsStore/helpers'
 
 import { useLang } from './useLang'
@@ -45,6 +46,7 @@ export const useLexics = () => {
     addLexicsConfig,
     changeLang,
     lang,
+    suffix: getSuffix(lang),
     translate,
   }
 }

src/features/Register/components/RegistrationStep/hooks/useCountries.tsx

@@ -9,13 +9,15 @@ import map from 'lodash/map'
 
 import type { Countries } from 'requests'
 import { getCountries } from 'requests'
-import { useCurrentLang } from 'hooks'
+import { useLexicsStore } from 'features/LexicsStore'
 
 type Country = {
   id: number,
   name: string,
 }
 
+type Names = 'name_eng' | 'name_rus'
+
 const useCountriesList = () => {
   const [countries, setCountries] = useState<Countries>([])
 
@@ -28,10 +30,10 @@ const useCountriesList = () => {
 
 export const useCountries = () => {
   const countries = useCountriesList()
-  const lang = useCurrentLang()
+  const { suffix } = useLexicsStore()
   const [selectedCountry, setSelectedCountry] = useState<Country | null>(null)
 
-  const nameField = `name_${lang}` as 'name_eng'
+  const nameField = `name_${suffix}` as Names
 
   const transformedCountries = useMemo(
     () => orderBy(

src/hooks/index.tsx

@@ -1,3 +1,2 @@
 export * from './usePageId'
-export * from './useCurrentLang'
 export * from './useToggle'

src/hooks/useCurrentLang.tsx

@@ -1,2 +0,0 @@
-// временно, будем считывать из стора(контекста) лексики
-export const useCurrentLang = () => 'eng'

src/hooks/usePageId.tsx

@@ -1 +1,13 @@
-export const usePageId = () => {}
+import { useParams } from 'react-router-dom'
+
+type Params = {
+  pageId: string,
+}
+
+/**
+ * Хук возвращает id страницы
+ */
+export const usePageId = () => {
+  const { pageId } = useParams<Params>()
+  return Number(pageId)
+}