stasgm · sunnycreature · Jul 5, 2023 · Jul 5, 2023 · Jul 6, 2023 · Jul 14, 2023
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,8 +1,7 @@
 {
   "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+  "source.fixAll.eslint": "explicit"
     },
-  "eslint.packageManager": "yarn",
   "npm.packageManager": "yarn",
 }
diff --git a/apps/app-bc-movement/App.tsx b/apps/app-bc-movement/App.tsx
@@ -24,7 +24,7 @@ import {
   AppFallback,
 } from '@lib/mobile-ui';
 
-import { ActivityIndicator, Caption, useTheme } from 'react-native-paper';
+import { ActivityIndicator, Caption, useTheme, MD2Theme } from 'react-native-paper';
 
 import { sleep } from '@lib/mobile-hooks';
 
@@ -50,7 +50,7 @@ const Root = () => {
   );
 
   const dispatch = useDispatch();
-  const { colors } = useTheme();
+  const { colors } = useTheme<MD2Theme>();
 
   const isInit = useSelector((state) => state.settings.isInit);
   const authLoading = useSelector((state) => state.auth.loadingData);

diff --git a/apps/app-bc-movement/app.json b/apps/app-bc-movement/app.json
@@ -27,6 +27,18 @@
     },
     "web": {
       "favicon": "./assets/favicon.png"
-    }
+    },
+    "plugins": [
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "compileSdkVersion": 33,
+            "targetSdkVersion": 33,
+            "buildToolsVersion": "33.0.0"
+          }
+        }
+      ]
+    ]
   }
 }
diff --git a/apps/app-bc-movement/eas.json b/apps/app-bc-movement/eas.json
@@ -10,6 +10,6 @@
         "buildType": "apk"
       }
     },
-    "production": {"node": "16.14.0"}
+    "production": {"node": "18.14.0"}
   }
 }
diff --git a/apps/app-bc-movement/package.json b/apps/app-bc-movement/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@expo/react-native-action-sheet": "^4.0.1",
     "@expo/vector-icons": "^13.0.0",
-    "@gorhom/bottom-sheet": "^4.4.5",
+    "@gorhom/bottom-sheet": "^4.5.1",
     "@lib/client-types": "*",
     "@lib/mobile-app": "*",
     "@lib/mobile-auth": "*",
@@ -35,56 +35,63 @@
     "@lib/mobile-ui": "*",
     "@lib/store": "*",
     "@lib/types": "*",
-    "@react-native-community/datetimepicker": "6.5.2",
-    "@react-native-community/masked-view": "0.1.11",
-    "@react-native-community/netinfo": "9.3.5",
-    "@react-navigation/bottom-tabs": "^6.5.4",
-    "@react-navigation/drawer": "^6.5.8",
-    "@react-navigation/material-bottom-tabs": "^6.2.12",
-    "@react-navigation/native": "^6.1.3",
-    "@react-navigation/stack": "^6.3.12",
-    "@types/react-test-renderer": "^18.0.0",
-    "expo": "^47.0.13",
-    "expo-asset": "~8.7.0",
-    "expo-barcode-scanner": "~12.1.0",
-    "expo-camera": "~13.1.0",
-    "expo-constants": "~14.0.2",
-    "expo-font": "~11.0.1",
-    "expo-status-bar": "~1.4.2",
-    "expo-updates": "~0.15.6",
-    "react": "18.1.0",
-    "react-dom": "18.1.0",
-    "react-native": "0.70.8",
+    "@react-native-community/datetimepicker": "7.2.0",
+    "@react-native-community/netinfo": "9.3.10",
+    "@react-native-masked-view/masked-view": "0.2.9",
+    "@react-navigation/bottom-tabs": "^6.5.11",
+    "@react-navigation/drawer": "^6.6.6",
+    "@react-navigation/material-bottom-tabs": "^6.2.19",
+    "@react-navigation/native": "^6.1.9",
+    "@react-navigation/stack": "^6.3.20",
+    "@types/react-test-renderer": "^18.0.7",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
+    "expo": "^49.0.21",
+    "expo-asset": "~8.10.1",
+    "expo-barcode-scanner": "~12.5.3",
+    "expo-build-properties": "^0.8.3",
+    "expo-camera": "~13.4.4",
+    "expo-constants": "~14.4.2",
+    "expo-font": "~11.4.0",
+    "expo-status-bar": "~1.6.0",
+    "expo-updates": "~0.18.19",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-native": "0.72.10",
     "react-native-error-boundary": "^1.2.1",
-    "react-native-gesture-handler": "~2.8.0",
-    "react-native-paper": "4.12.5",
-    "react-native-reanimated": "~2.12.0",
-    "react-native-safe-area-context": "^4.4.1",
-    "react-native-screens": "~3.18.2",
-    "react-native-web": "~0.18.12",
-    "react-navigation-stack": "^2.10.4",
-    "react-redux": "^8.0.5",
+    "react-native-gesture-handler": "~2.12.1",
+    "react-native-paper": "5.10.6",
+    "react-native-reanimated": "~3.3.0",
+    "react-native-safe-area-context": "4.6.3",
+    "react-native-screens": "~3.22.0",
+    "react-native-vector-icons": "^10.0.0",
+    "react-native-web": "~0.19.9",
+    "react-redux": "^8.1.3",
     "react-test-renderer": "^18.2.0",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
     "reselect": "~4.1.7",
     "typesafe-actions": "^5.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.22.17",
+    "@babel/plugin-transform-arrow-functions": "^7.23.3",
+    "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+    "@babel/plugin-transform-template-literals": "^7.23.3",
+    "@babel/preset-env": "^7.22.15",
     "@config/eslint-config": "*",
     "@config/eslint-config-react": "*",
     "@config/eslint-config-react-native": "*",
     "@config/prettier-config": "*",
-    "@expo/webpack-config": "^0.17.3",
-    "@types/node": "^18.11.19",
-    "@types/react": "~18.0.25",
-    "@types/react-native": "0.70.8",
-    "babel-preset-expo": "~9.2.2",
-    "metro-react-native-babel-preset": "^0.73.3",
+    "@expo/webpack-config": "^19.0.0",
+    "@types/node": "^20.8.4",
+    "@types/react": "~18.2.43",
+    "babel-preset-expo": "~9.5.2",
+    "metro-react-native-babel-preset": "^0.76.0",
     "reactotron-react-native": "^5.0.3",
+    "reactotron-core-client": "^2.8.11",
     "reactotron-redux": "^3.1.3",
     "redux-logger": "^3.0.6",
-    "typescript": "~4.8.4"
+    "typescript": "^5.2.2"
   }
 }
diff --git a/apps/app-bc-movement/src/components/MovementItem.tsx b/apps/app-bc-movement/src/components/MovementItem.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, Text } from 'react-native';
-import { useTheme } from 'react-native-paper';
+import { MD2Theme, useTheme } from 'react-native-paper';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 
 import { globalStyles as styles } from '@lib/mobile-ui';
@@ -12,7 +12,7 @@ interface IProps {
 }
 
 export const MovementItem = ({ item }: IProps) => {
-  const { colors } = useTheme();
+  const { colors } = useTheme<MD2Theme>();
 
   return (
     <View style={styles.item}>

diff --git a/apps/app-bc-movement/src/components/ScanBarcode/ScanBarcode.tsx b/apps/app-bc-movement/src/components/ScanBarcode/ScanBarcode.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { View, TouchableOpacity, Vibration, Text } from 'react-native';
 import { IconButton } from 'react-native-paper';
 import { BarCodeScanner } from 'expo-barcode-scanner';
-import { Camera } from 'expo-camera';
+import { AutoFocus, Camera, FlashMode } from 'expo-camera';
 
 import { useIsFocused, useTheme } from '@react-navigation/native';
 
@@ -76,25 +76,24 @@ const ScanBarcode = ({ onSave, getScannedObject }: IProps) => {
   return isFocused ? (
     <View style={[styles.content]}>
       <Camera
-        flashMode={flashMode ? Camera.Constants.FlashMode.torch : Camera.Constants.FlashMode.off}
+        flashMode={flashMode ? FlashMode.torch : FlashMode.off}
         barCodeScannerSettings={{
           barCodeTypes: [BarCodeScanner.Constants.BarCodeType.ean13, BarCodeScanner.Constants.BarCodeType.ean8],
         }}
-        autoFocus="on"
-        whiteBalance="auto"
+        autoFocus={AutoFocus.on}
         onBarCodeScanned={({ data }: { data: string }) => !scanned && handleBarCodeScanned(data)}
         style={[styles.camera, { backgroundColor: colors.card }]}
       >
         <View style={styles.header}>
           <IconButton
             icon={flashMode ? 'flash' : 'flash-off'}
-            color={'#FFF'}
+            iconColor={'#FFF'}
             style={styles.transparent}
             onPress={() => setFlashMode(!flashMode)}
           />
           <IconButton
             icon={vibroMode ? 'vibrate' : 'vibrate-off'}
-            color={'#FFF'}
+            iconColor={'#FFF'}
             style={styles.transparent}
             onPress={() => setVibroMode(!vibroMode)}
           />
@@ -122,14 +121,14 @@ const ScanBarcode = ({ onSave, getScannedObject }: IProps) => {
                   setItemLine(undefined);
                 }}
               >
-                <IconButton icon="barcode-scan" color={'#FFF'} size={30} />
+                <IconButton icon="barcode-scan" iconColor={'#FFF'} size={30} />
                 <Text style={styles.text}>Пересканировать</Text>
               </TouchableOpacity>
             </View>
             {scanned && itemLine?.barcode === '-1' && (
               <View style={styles.infoContainer}>
                 <View style={[styles.buttons, styles.btnNotFind]}>
-                  <IconButton icon={'information-outline'} color={'#FFF'} size={30} />
+                  <IconButton icon={'information-outline'} iconColor={'#FFF'} size={30} />
                   <View>
                     <Text style={styles.error}>{'Данный штрихкод уже существует'}</Text>
                   </View>
@@ -146,7 +145,7 @@ const ScanBarcode = ({ onSave, getScannedObject }: IProps) => {
                     setItemLine(undefined);
                   }}
                 >
-                  <IconButton icon={'checkbox-marked-circle-outline'} color={'#FFF'} size={30} />
+                  <IconButton icon={'checkbox-marked-circle-outline'} iconColor={'#FFF'} size={30} />
                   <View>
                     <Text style={styles.text}>{barcode}</Text>
                   </View>
@@ -158,7 +157,7 @@ const ScanBarcode = ({ onSave, getScannedObject }: IProps) => {
         {!scanned && (
           <View style={styles.footer}>
             <>
-              <IconButton icon={'barcode-scan'} color={'#FFF'} size={40} />
+              <IconButton icon={'barcode-scan'} iconColor={'#FFF'} size={40} />
               <Text style={styles.text}>Наведите рамку на штрихкод</Text>
             </>
           </View>

diff --git a/apps/app-bc-movement/src/components/ScanBarcodeReader/ScanBarcodeReader.tsx b/apps/app-bc-movement/src/components/ScanBarcodeReader/ScanBarcodeReader.tsx
@@ -117,14 +117,14 @@ export const ScanBarcodeReader = ({ onSave, getScannedObject }: IProps) => {
                   setItemLine(undefined);
                 }}
               >
-                <IconButton icon="barcode-scan" color={'#FFF'} size={30} />
+                <IconButton icon="barcode-scan" iconColor={'#FFF'} size={30} />
                 <Text style={styles.text}>Пересканировать</Text>
               </TouchableOpacity>
             </View>
             {scanned && itemLine?.barcode === '-1' && (
               <View style={styles.infoContainer}>
                 <View style={[styles.buttons, styles.btnNotFind]}>
-                  <IconButton icon={'information-outline'} color={'#FFF'} size={30} />
+                  <IconButton icon={'information-outline'} iconColor={'#FFF'} size={30} />
                   <View>
                     <Text style={styles.error}>{'Данный штрихкод уже существует'}</Text>
                   </View>
@@ -141,7 +141,7 @@ export const ScanBarcodeReader = ({ onSave, getScannedObject }: IProps) => {
                     setItemLine(undefined);
                   }}
                 >
-                  <IconButton icon={'checkbox-marked-circle-outline'} color={'#FFF'} size={30} />
+                  <IconButton icon={'checkbox-marked-circle-outline'} iconColor={'#FFF'} size={30} />
                   <View>
                     <Text style={styles.text}>{barcode}</Text>
                   </View>
@@ -153,7 +153,7 @@ export const ScanBarcodeReader = ({ onSave, getScannedObject }: IProps) => {
         {!scanned && (
           <View style={styles.footer}>
             <>
-              <IconButton icon={'barcode-scan'} color={'#FFF'} size={40} />
+              <IconButton icon={'barcode-scan'} iconColor={'#FFF'} size={40} />
               <Text style={styles.text}>Отсканируйте штрихкод</Text>
             </>
           </View>

diff --git a/apps/app-bc-movement/src/components/SelectRefItemScreen.tsx b/apps/app-bc-movement/src/components/SelectRefItemScreen.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback, useLayoutEffect, useMemo } from 'react';
 import { View, FlatList, Alert, TouchableOpacity, Text } from 'react-native';
-import { Searchbar, Divider, useTheme, Checkbox } from 'react-native-paper';
+import { Searchbar, Divider, useTheme, Checkbox, MD2Theme } from 'react-native-paper';
 import { RouteProp, useNavigation, useRoute, useScrollToTop } from '@react-navigation/native';
 import { INamedEntity } from '@lib/types';
 import { appActions, IFormParam, refSelectors, useSelector } from '@lib/store';
@@ -157,7 +157,7 @@ export const SelectRefItemScreen = () => {
 
 const LineItem = React.memo(
   ({ item, isChecked, onCheck }: { item: INamedEntity; isChecked: boolean; onCheck: (id: INamedEntity) => void }) => {
-    const { colors } = useTheme();
+    const { colors } = useTheme<MD2Theme>();
 
     return (
       <TouchableOpacity onPress={() => onCheck(item)}>

diff --git a/apps/app-bc-movement/src/screens/movement/MovementEditScreen.tsx b/apps/app-bc-movement/src/screens/movement/MovementEditScreen.tsx
@@ -100,7 +100,7 @@ export const MovementEditScreen = () => {
 
   const handleSave = useCallback(() => {
     if (!docType) {
-      return Alert.alert('Ошибка!', 'Тип документа "Инвентаризация" не найден', [{ text: 'OK' }]);
+      return Alert.alert('Ошибка!', 'Тип документа "Инвентаризация" не найден.', [{ text: 'OK' }]);
     }
     if (!(docNumber && docFromPlace && docToPlace && docDate)) {
       return Alert.alert('Ошибка!', 'Не все поля заполнены.', [{ text: 'OK' }]);

diff --git a/apps/app-bc-movement/src/screens/movement/MovementListScreen.tsx b/apps/app-bc-movement/src/screens/movement/MovementListScreen.tsx
@@ -50,10 +50,10 @@ export const MovementListScreen = () => {
       status === 'all'
         ? list
         : status === 'active'
-        ? list.filter((e) => e.status !== 'PROCESSED')
-        : status === 'archive'
-        ? list.filter((e) => e.status === 'PROCESSED')
-        : [];
+          ? list.filter((e) => e.status !== 'PROCESSED')
+          : status === 'archive'
+            ? list.filter((e) => e.status === 'PROCESSED')
+            : [];
 
     return res.map(
       (i) =>
@@ -66,7 +66,7 @@ export const MovementListScreen = () => {
           isFromRoute: !!i.head.route,
           lineCount: i.lines.length,
           errorMessage: i.errorMessage,
-        } as IListItemProps),
+        }) as IListItemProps,
     );
   }, [status, list]);
 

diff --git a/apps/app-fp-movement/.eslintrc.js b/apps/app-fp-movement/.eslintrc.js
@@ -8,4 +8,5 @@ module.exports = {
     project: ['./tsconfig.eslint.json'],
     tsconfigRootDir: __dirname,
   },
+  ignorePatterns: ['node_modules/'],
 };
diff --git a/apps/app-fp-movement/App.tsx b/apps/app-fp-movement/App.tsx
@@ -17,6 +17,7 @@ import {
   useDocThunkDispatch,
   useRefThunkDispatch,
   useSelector,
+  useSettingsThunkDispatch,
 } from '@lib/store';
 import {
   AppScreen,
@@ -37,8 +38,6 @@ import { TouchableOpacity, Linking, ScrollView, View } from 'react-native';
 
 import Constants from 'expo-constants';
 
-import { useSettingsThunkDispatch } from '@lib/store/src/settings/actions.async';
-
 import { MoveNavigator } from './src/navigation/MoveNavigator';
 
 import { store, useSelector as useFpSelector, fpMovementActions, useDispatch as useFpDispatch } from './src/store';
@@ -233,10 +232,10 @@ const Root = () => {
               component: RemainsNavigator,
             },
             {
-              name: 'Return',
-              title: 'Возврат',
-              icon: 'file-restore-outline',
-              component: ReturnNavigator,
+              name: 'Receipt',
+              title: 'Приход',
+              icon: 'file-document-outline',
+              component: ReceiptNavigator,
               showInDashboard: true,
               sortNumber: 60,
             },
@@ -448,7 +447,7 @@ const Root = () => {
       ) : infoWindow === 3 ? (
         <AppScreen>
           <Text style={styles.textInfo}>{'Подробную информацию об использовании приложения вы найдете в '}</Text>
-          <TouchableOpacity onPress={() => Linking.openURL(Constants.manifest?.extra?.documentationUrl)}>
+          <TouchableOpacity onPress={() => Linking.openURL(Constants.expoConfig?.extra?.documentationUrl)}>
             <Text style={[styles.textInfo, styles.textDecorationLine]}>{'документации.'}</Text>
           </TouchableOpacity>
           <Text style={styles.textInfo}>