ebanutsya

src/screens/CommonPage/CommonPage.tsx

@@ -12,11 +12,11 @@ import Toast from "react-native-toast-message";
 import toastConfig from "../../components/Toast/Toast";
 import ScanModal from "../../components/SearchBar/ScanModal";
 import {closeScanModal, setScannedData} from "../../features/scanModal/scanModalSlice";
+import LoadingModal from "../../components/Modals/LoadingModal/LoadingModal";
 
 function CommonPage() {
     const dim = useSelector((state: RootState) => state.interface.dim);
     const isAuthorized = useSelector((state: RootState) => state.auth.isAuthorized);
-    const isScanModalVisible = useSelector((state: RootState) => state.scanModal.isVisible);
 
     const dispatch = useDispatch();
 
@@ -35,15 +35,9 @@ function CommonPage() {
         <View style={styles.main}>
             {isAuthorized ? <MainScreen/> : <LoginScreen/>}
             <View style={[styles.overlay, {display: dim ? 'flex' : 'none'}]}/>
+            <LoadingModal/>
+            <ScanModal/>
             <Toast config={toastConfig}/>
-            <ScanModal visible={isScanModalVisible}
-                       onCancelButtonPress={() => {
-                           dispatch(closeScanModal());
-                       }}
-                       onChanged={text => {
-                           dispatch(setScannedData(text));
-                           dispatch(closeScanModal());
-                       }}/>
         </View>
 
     )