Restructured lib directory

babel.config.js

@@ -9,24 +9,11 @@ module.exports = {
         alias: {
           app: './src/app',
           screens: './src/screens',
-          pages: './src/pages',
           widgets: './src/widgets',
           features: './src/features',
           entities: './src/entities',
           shared: './src/shared',
           assets: './src/assets',
-          components: './src/components',
-          configs: './src/configs',
-          constants: './src/constants',
-          consts: './src/consts',
-          helpers: './src/helpers',
-          hooks: './src/hooks',
-          json: './src/json',
-          services: './src/services',
-          slices: './src/slices',
-          thunks: './src/thunks',
-          utils: './src/utils',
-          validations: './src/validations',
         },
       },
     ],

index.js

@@ -1,14 +1,18 @@
+import notifee from '@notifee/react-native';
 import messaging from '@react-native-firebase/messaging';
 import { GoogleSignin } from '@react-native-google-signin/google-signin';
 import 'moment/min/locales';
 import { AppRegistry, LogBox } from 'react-native';
 import TrackPlayer from 'react-native-track-player';
 import { googleSigninConfig } from 'shared/config/google';
 import 'shared/config/i18n';
-import { onMessageReceived } from 'shared/utils/messageReceived';
 import App from './src/app';
 import { audioPlaybackService } from './src/entities/audio';
 
+const onMessageReceived = async message => {
+  notifee.displayNotification(JSON.parse(message.data.notifee));
+};
+
 messaging().onMessage(onMessageReceived);
 messaging().setBackgroundMessageHandler(onMessageReceived);
 

src/app/navigation/ui/Navigation.tsx

@@ -46,7 +46,7 @@ import { TrackerScreen } from 'screens/tracker';
 import { WelcomeScreen } from 'screens/welcome';
 import { WelcomeInfoScreen } from 'screens/welcome-info';
 import { AppNavigation, NavigationStackLists } from 'shared/config/navigation';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { TabNavigation } from 'widgets/tab-navigation';
 

src/app/providers/InitializedProvider/InitializedProvider.tsx

@@ -8,9 +8,9 @@ import {
 } from 'entities/subscription';
 import { FC, ReactNode, useEffect } from 'react';
 import { getTrackingStatus } from 'react-native-tracking-transparency';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
 import { delay } from 'shared/lib/delay';
 import { isIos } from 'shared/lib/isIos';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 
 interface InitializedProviderProps {
   children: ReactNode;

src/app/providers/LanguageProvider/LanguageProvider.tsx

@@ -3,7 +3,7 @@ import moment from 'moment';
 import { FC, ReactNode, useEffect } from 'react';
 import Tts from 'react-native-tts';
 import i18n, { languageVoice } from 'shared/config/i18n';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 
 interface LanguageProviderProps {
   children: ReactNode;

src/app/providers/ThemeProvider/ui/ThemeProvider.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useEffect } from 'react';
 import { Appearance } from 'react-native';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { getColorScheme } from './../model/selectors/getColorScheme/getColorScheme';
 import { getTheme } from './../model/selectors/getTheme/getTheme';
 import { setTheme } from './../model/slice/themeSlice';

src/entities/auth/ui/AuthProvider/AuthProvider.tsx

@@ -1,8 +1,8 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { authLogout, getIsAuth } from 'entities/auth';
 import React, { useEffect } from 'react';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 
 type AuthProviderProps = {
   children: React.ReactNode;

src/entities/feed/model/api/FeedApi.ts

@@ -1,5 +1,5 @@
 import { authInstance } from 'shared/api';
-import { getLocalize } from 'shared/utils/statistics/getLocalize';
+import { getLocalize } from 'shared/lib/intl/getLocalize';
 import { FeedEventTypes, FeedType } from './../types/feeds';
 
 export const FeedApi = {

src/entities/feed/model/lib/hooks/useFeeds.ts

@@ -1,6 +1,6 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 import { getLanguage } from 'features/language-picker';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { FeedApi } from './../../api/FeedApi';
 import { QUERY_KEY_FEED_ALL, QUERY_KEY_FEED_ME } from './../../const/query-key';
 

src/entities/friend/ui/FriendMotivationItem/FriendMotivationItem.tsx

@@ -1,9 +1,9 @@
 import { memo } from 'react';
 import { Image, ImageSourcePropType, View } from 'react-native';
 import { moderateScale } from 'shared/config/dimensions';
+import { abbreviateNumber } from 'shared/lib/format/abbreviateNumber';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText, TextWeight } from 'shared/ui/CustomText';
-import { abbrNum } from 'shared/utils/abbrNum';
 import { styles } from './FriendMotivationItemStyle';
 
 interface FriendMotivationItemProps {
@@ -33,7 +33,7 @@ export const FriendMotivationItem = memo((props: FriendMotivationItemProps) => {
       <CustomText
         weight={TextWeight.MEDIUM}
         style={{ color: cn('white', 'slate.700') }}>
-        {abbrNum(value, 0)}
+        {abbreviateNumber(value, 0)}
       </CustomText>
     </View>
   );

src/entities/friend/ui/ToasterAuth/ToasterAuth.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { View } from 'react-native';
 import * as Anims from 'shared/assets/anims';
 import { AppNavigation } from 'shared/config/navigation';
-import { useAppNavigation } from 'shared/hooks/useAppNavigation';
+import { useAppNavigation } from 'shared/lib/navigation/useAppNavigation';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText, TextSize } from 'shared/ui/CustomText';
 import { styles } from './ToasterAuthStyle';

src/entities/message/model/services/useChatMessage/useChatMessage.ts

@@ -5,7 +5,7 @@ import { useFocusEffect } from '@react-navigation/native';
 import { getIsAuth } from 'entities/auth';
 import { getUserEmail, getUserIsBanned } from 'entities/user';
 import React, { useState } from 'react';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 
 type Message = {
   id: string;

src/entities/message/ui/MessageItem/MessageItem.tsx

@@ -4,10 +4,10 @@ import { View } from 'react-native';
 import Tooltip from 'rn-tooltip';
 import * as Icons from 'shared/assets/icons';
 import { moderateScale } from 'shared/config/dimensions';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { abbreviateNumber } from 'shared/lib/format/abbreviateNumber';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText, TextSize, TextWeight } from 'shared/ui/CustomText';
-import { abbrNum } from 'shared/utils/abbrNum';
 import { MessageTail } from './../MessageTail/MessageTail';
 import { MessageTooltip } from './../MessageTooltip/MessageTooltip';
 import { styles } from './MessageItemStyle';
@@ -78,7 +78,7 @@ export const MessageItem = React.memo((props: MessageType) => {
                 size={TextSize.S_XL}
                 weight={TextWeight.BOLD}
                 style={{ color: cn('indigo.300', 'indigo.400') }}>
-                {abbrNum(props.rating || 0, 0)}
+                {abbreviateNumber(props.rating || 0, 0)}
               </CustomText>
             </View>
           </View>

src/features/auth/auth-by-apple/AuthByApple.tsx

@@ -7,7 +7,7 @@ import { ColorValue, StyleSheet, View } from 'react-native';
 import * as Icons from 'shared/assets/icons';
 import { moderateScale } from 'shared/config/dimensions';
 import { AppNavigation, RootStackParamList } from 'shared/config/navigation';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { PressableOpacity } from 'shared/ui/PressableOpacity';
 import { AuthApi } from './../../../entities/auth/model/api/authApi';
 

src/features/auth/auth-by-email/ui/Login/ui/Login.tsx

@@ -7,7 +7,7 @@ import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { ActivityIndicator, View } from 'react-native';
 import { AppNavigation, RootStackParamList } from 'shared/config/navigation';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { CustomButton } from 'shared/ui/CustomButton';
 import { InputText } from 'shared/ui/InputText';
 import { RowGroup } from 'shared/ui/RowGroup';

src/features/auth/auth-by-email/ui/Registration/ui/Registration.tsx

@@ -6,7 +6,7 @@ import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { ActivityIndicator, View } from 'react-native';
 import { AppNavigation, RootStackParamList } from 'shared/config/navigation';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { CustomButton } from 'shared/ui/CustomButton';
 import { InputText } from 'shared/ui/InputText';
 import { RowGroup } from 'shared/ui/RowGroup';

src/features/auth/auth-by-google/ui/AuthByGoogle.tsx

@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { ColorValue, Platform, View } from 'react-native';
 import * as Icons from 'shared/assets/icons';
 import { AppNavigation, RootStackParamList } from 'shared/config/navigation';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { CustomText } from 'shared/ui/CustomText';
 import { PressableOpacity } from 'shared/ui/PressableOpacity';
 import { styles } from './AuthByGoogleStyle';

src/features/auth/email-activation/model/lib/hooks/useIssueAccept/useIssueAccept.ts

@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 import { setUserEmailIsActivate } from 'entities/user';
 import { useTranslation } from 'react-i18next';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { DisplayMessage } from 'shared/ui/DisplayMessage';
 import { activationApi } from './../../../api/activationApi';
 

src/features/clear-statistic/ui/СlearStatistics.tsx

@@ -3,7 +3,7 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Alert } from 'react-native';
 import * as Icons from 'shared/assets/icons';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { useTheme } from 'shared/lib/theme';
 import { LinkRow } from 'shared/ui/LinkRow';
 

src/features/currency-picker/model/slices/currencySlice.ts

@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { getAppCurrencies } from 'shared/utils/getAppCurrencies';
+import { getAppCurrencies } from 'shared/lib/intl/getAppCurrencies';
 import { CurrencySchema } from './../types/currency';
 
 export const initialState: CurrencySchema = {

src/features/currency-picker/model/util/getCurrenciesLabels/getCurrenciesLabels.ts

@@ -1,4 +1,4 @@
-import { currencies } from 'shared/utils/getCurrencySymbol/model/const/currency';
+import { currencies } from 'shared/lib/intl/getCurrencySymbol/model/const/currency';
 
 export const getCurrenciesLabels = (first: string) => {
   const currencyValues = Object.values(currencies);

src/features/currency-picker/model/util/getCurrenciesValues/getCurrenciesValues.ts

@@ -1,4 +1,4 @@
-import { currencies } from 'shared/utils/getCurrencySymbol/model/const/currency';
+import { currencies } from 'shared/lib/intl/getCurrencySymbol/model/const/currency';
 
 export const getCurrenciesValues = () => {
   return ['system', ...Object.keys(currencies)];

src/features/currency-picker/ui/CurrencyPicker.tsx

@@ -1,11 +1,11 @@
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import * as Icons from 'shared/assets/icons';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { getAppCurrencies } from 'shared/lib/intl/getAppCurrencies';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { LinkPicker } from 'shared/ui/LinkPicker';
-import { getAppCurrencies } from 'shared/utils/getAppCurrencies';
 import { getCurrency } from './../model/selectors/getCurrency/getCurrency';
 import { setCurrency } from './../model/slices/currencySlice';
 import { getCurrenciesLabels } from './../model/util/getCurrenciesLabels/getCurrenciesLabels';

src/features/feed/feed-create-comment/ui/FeedCreateComment.tsx

@@ -7,9 +7,9 @@ import { Keyboard, TextInput, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import * as Icons from 'shared/assets/icons';
 import { moderateScale } from 'shared/config/dimensions';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
 import { isIos } from 'shared/lib/isIos';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText } from 'shared/ui/CustomText';
 import { DisplayMessage } from 'shared/ui/DisplayMessage';

src/features/feed/feed-create-post/ui/FeedCreatePost.tsx

@@ -7,9 +7,9 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 import * as Icons from 'shared/assets/icons';
 import { moderateScale } from 'shared/config/dimensions';
 import { AppNavigation, AppTabNavigation } from 'shared/config/navigation';
-import { useAppNavigation } from 'shared/hooks/useAppNavigation';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
 import { isIos } from 'shared/lib/isIos';
+import { useAppNavigation } from 'shared/lib/navigation/useAppNavigation';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText } from 'shared/ui/CustomText';
 import { PressableOpacity } from 'shared/ui/PressableOpacity';

src/features/feed/feed-liked/ui/FeedLiked/FeedLiked.tsx

@@ -12,7 +12,7 @@ import { Animated, View } from 'react-native';
 import Tooltip from 'rn-tooltip';
 import * as Icons from 'shared/assets/icons';
 import { moderateScale } from 'shared/config/dimensions';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText } from 'shared/ui/CustomText';
 import { DisplayMessage } from 'shared/ui/DisplayMessage';

src/features/feed/feed-pressing/ui/FeedPressing.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { ColorValue, StyleSheet, View } from 'react-native';
 import Tooltip from 'rn-tooltip';
 import { AppNavigation, AppTabNavigation } from 'shared/config/navigation';
-import { useAppNavigation } from 'shared/hooks/useAppNavigation';
+import { useAppNavigation } from 'shared/lib/navigation/useAppNavigation';
 import { CustomText } from 'shared/ui/CustomText';
 import { DisplayMessage } from 'shared/ui/DisplayMessage';
 import { PressableOpacity } from 'shared/ui/PressableOpacity';

src/features/language-picker/model/slices/languageSlice.ts

@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { LanguageType } from 'shared/config/i18n';
-import { getLocalize } from 'shared/utils/statistics/getLocalize';
+import { getLocalize } from 'shared/lib/intl/getLocalize';
 
 export interface LanguageState {
   localize: LanguageType;

src/features/language-picker/ui/LanguagePicker.tsx

@@ -2,11 +2,11 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import * as Icons from 'shared/assets/icons';
 import { LanguageType } from 'shared/config/i18n';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { getLocalize } from 'shared/lib/intl/getLocalize';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { LinkPicker } from 'shared/ui/LinkPicker';
-import { getLocalize } from 'shared/utils/statistics/getLocalize';
 import { languageValues } from './../model/const/value';
 import { languageLabel } from './../model/lib/languageLabel';
 import { getLanguage } from './../model/selectors/getLanguage';

src/features/open-card-progres/ui/OpenCardProgress.tsx

@@ -2,8 +2,8 @@ import { AppSheet, SheetCreateContext } from 'app/providers/SheetProvider';
 import { ReactNode, memo, useContext } from 'react';
 import { View } from 'react-native';
 import { AppNavigation } from 'shared/config/navigation';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppNavigation } from 'shared/hooks/useAppNavigation';
+import { useAppNavigation } from 'shared/lib/navigation/useAppNavigation';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText, TextSize, TextWeight } from 'shared/ui/CustomText';
 import { PressableOpacity } from 'shared/ui/PressableOpacity';

src/features/player/player-control/ui/PlayerControl.tsx

@@ -8,9 +8,9 @@ import { View } from 'react-native';
 import * as Icons from 'shared/assets/icons';
 import { moderateScale } from 'shared/config/dimensions';
 import { AppNavigation } from 'shared/config/navigation';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppNavigation } from 'shared/hooks/useAppNavigation';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppNavigation } from 'shared/lib/navigation/useAppNavigation';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { DisplayMessage } from 'shared/ui/DisplayMessage';
 import { PressableOpacity } from 'shared/ui/PressableOpacity';

src/features/remove-account/ui/RemoveAccount.tsx

@@ -3,7 +3,7 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Alert } from 'react-native';
 import * as Icons from 'shared/assets/icons';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
 import { useTheme } from 'shared/lib/theme';
 import { LinkRow } from 'shared/ui/LinkRow';
 

src/features/send-message-chat/model/lib/hooks/useChatOnline/useChatOnline.ts

@@ -2,7 +2,7 @@ import database from '@react-native-firebase/database';
 import { useFocusEffect } from '@react-navigation/native';
 import { getLanguage } from 'features/language-picker';
 import React, { useState } from 'react';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { getMessageUuid } from './../../../selectors/getMessageUuid/getMessageUuid';
 
 export const useChatOnline = () => {

src/features/send-message-chat/model/lib/hooks/useSendMessage/useSendMessage.ts

@@ -8,8 +8,8 @@ import {
 } from 'entities/user';
 import { getLanguage } from 'features/language-picker';
 import { useState } from 'react';
-import { useAppDispatch } from 'shared/hooks/useAppDispatch';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { useAppDispatch } from 'shared/lib/state/dispatch/useAppDispatch';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { setMessageDelay } from './../../../slices/chatSlice';
 
 type useSendMessageProps = {

src/features/send-message-chat/ui/SendMessageChat.tsx

@@ -6,12 +6,12 @@ import { Keyboard, TextInput, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import * as Icons from 'shared/assets/icons';
 import { moderateScale } from 'shared/config/dimensions';
-import { useAppSelector } from 'shared/hooks/useAppSelector';
+import { clockify } from 'shared/lib/dates/clockify';
 import { isIos } from 'shared/lib/isIos';
+import { useAppSelector } from 'shared/lib/state/selector/useAppSelector';
 import { useTheme } from 'shared/lib/theme';
 import { CustomText } from 'shared/ui/CustomText';
 import { PressableOpacity } from 'shared/ui/PressableOpacity';
-import { clockify } from 'shared/utils/clockify';
 import { useSendMessage } from './../model/lib/hooks/useSendMessage/useSendMessage';
 import { getMessageDelay } from './../model/selectors/getMessageDelay/getMessageDelay';
 import { getSecondsToDate } from './../model/utils/getSecondsToDate/getSecondsToDate';

src/features/setting/set-cigarette-count/model/const/cigarette-count.ts

@@ -1,3 +1,3 @@
-import { arrayMinMax } from 'shared/utils/arrayMinMax';
+import { generateRangeArray } from 'shared/lib/generate/generateRangeArray';
 
-export const cigaretteCount = arrayMinMax(10, 80);
+export const cigaretteCount = generateRangeArray(10, 80);