update

src/screens/status/ui/Status.tsx

@@ -1,8 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 import packetsApi from 'api/packets';
+import Layout from 'components/Layout';
 import LoadingScreen from 'components/LoadingScreen';
-import Navbar from 'components/Navbar';
-import Navigation from 'components/Navigation';
 import NoResult from 'components/NoResult';
 import Pagination from 'components/Pagination';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
@@ -15,7 +14,6 @@ import {
   View,
   useWindowDimensions,
 } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
 import Serach from 'svg/Serach';
 import { DataInfo } from '../lib/data';
 import Filter from './Filter';
@@ -140,61 +138,43 @@ const Status = () => {
 
   if (isLoading || isFetching) {
     return (
-      <SafeAreaView style={{ flex: 1 }}>
-        <View style={styles.container}>
-          <Navbar />
-          <LoadingScreen message={loadingMessage} progress={progress} />
-          <Navigation />
-        </View>
-      </SafeAreaView>
+      <Layout>
+        <LoadingScreen message={loadingMessage} progress={progress} />
+      </Layout>
     );
   }
 
   if (statusData?.data.length === 0) {
     return (
-      <SafeAreaView style={{ flex: 1 }}>
-        <View style={styles.container}>
-          <Navbar />
-          <Tabs filter={filter} setFilter={setFilter} />
-          <View style={styles.controls}>
-            {/* <View style={styles.searchContainer}>
-              <TextInput
-                placeholder={t('ID orqali izlash')}
-                placeholderTextColor="#D8DADC"
-                style={styles.search}
-              />
-              <View style={styles.searchIcon}>{searchIcon}</View>
-            </View> */}
-            <View style={{ position: 'relative' }}>
-              <Filter
-                transportTypes={transportTypes}
-                setTransportTypes={setTransportTypes}
-                reys={reys}
-                setReys={setReys}
-                data={statusData!}
-                setSelectedData={setSelectedData}
-              />
-            </View>
+      <Layout>
+        <Tabs filter={filter} setFilter={setFilter} />
+        <View style={styles.controls}>
+          <View style={{ position: 'relative' }}>
+            <Filter
+              transportTypes={transportTypes}
+              setTransportTypes={setTransportTypes}
+              reys={reys}
+              setReys={setReys}
+              data={statusData!}
+              setSelectedData={setSelectedData}
+            />
           </View>
-          <NoResult message={t("Hech qanday ma'lumot topilmadi")} />
-          <Navigation />
         </View>
-      </SafeAreaView>
+        <NoResult message={t("Hech qanday ma'lumot topilmadi")} />
+      </Layout>
     );
   }
 
   return (
-    <SafeAreaView style={{ flex: 1 }}>
-      <View style={styles.container}>
-        <Navbar />
-        <ScrollView
-          keyboardShouldPersistTaps="handled"
-          refreshControl={refreshControl}
-          removeClippedSubviews={true}
-        >
-          <Tabs filter={filter} setFilter={setFilter} />
-          <View style={styles.controls}>
-            {/* <View style={styles.searchContainer}>
+    <Layout>
+      <ScrollView
+        keyboardShouldPersistTaps="handled"
+        refreshControl={refreshControl}
+        removeClippedSubviews={true}
+      >
+        <Tabs filter={filter} setFilter={setFilter} />
+        <View style={styles.controls}>
+          {/* <View style={styles.searchContainer}>
               <TextInput
                 placeholder={t('ID orqali izlash')}
                 placeholderTextColor="#D8DADC"
@@ -202,47 +182,45 @@ const Status = () => {
               />
               <View style={styles.searchIcon}>{searchIcon}</View>
             </View> */}
-            <View style={{ position: 'relative' }}>
-              <Filter
-                transportTypes={transportTypes}
-                setTransportTypes={setTransportTypes}
-                reys={reys}
-                setReys={setReys}
-                data={statusData!}
-                setSelectedData={setSelectedData}
-              />
-            </View>
+          <View style={{ position: 'relative' }}>
+            <Filter
+              transportTypes={transportTypes}
+              setTransportTypes={setTransportTypes}
+              reys={reys}
+              setReys={setReys}
+              data={statusData!}
+              setSelectedData={setSelectedData}
+            />
           </View>
-          <Order
-            data={statusData!}
-            openModal={openModal}
-            selectedData={selectedData}
-          />
-        </ScrollView>
-        <OrderDetailModal
-          visible={modalVisible}
-          setVisible={setModalVisible}
-          selectedOrder={selectedOrder}
-        />
-        <View
-          style={{
-            flexDirection: 'row',
-            justifyContent: 'flex-end',
-            width: '95%',
-            alignSelf: 'center',
-            paddingRight: 20,
-            paddingVertical: 10,
-          }}
-        >
-          <Pagination
-            page={page}
-            totalPages={statusData?.totalPages ?? 1}
-            setPage={setPage}
-          />
         </View>
-        <Navigation />
+        <Order
+          data={statusData!}
+          openModal={openModal}
+          selectedData={selectedData}
+        />
+      </ScrollView>
+      <OrderDetailModal
+        visible={modalVisible}
+        setVisible={setModalVisible}
+        selectedOrder={selectedOrder}
+      />
+      <View
+        style={{
+          flexDirection: 'row',
+          justifyContent: 'flex-end',
+          width: '95%',
+          alignSelf: 'center',
+          paddingRight: 20,
+          paddingVertical: 10,
+        }}
+      >
+        <Pagination
+          page={page}
+          totalPages={statusData?.totalPages ?? 1}
+          setPage={setPage}
+        />
       </View>
-    </SafeAreaView>
+    </Layout>
   );
 };