@eohjsc/react-native-smart-city 0.2.82 → 0.2.85

package/src/commons/ConnectingProcess/index.js

@@ -0,0 +1,202 @@
+import React, { useEffect, useCallback, useState } from 'react';
+import { SafeAreaView, View, TouchableOpacity } from 'react-native';
+import { useTranslations } from '../../hooks/Common/useTranslations';
+import Routes from '../../utils/Route';
+import { useNavigation } from '@react-navigation/native';
+import * as Progress from 'react-native-progress';
+import ImageSuccessfully from '../../Images/Common/SuccessfullyConnected.svg';
+
+import Text from '../Text';
+import { axiosPost } from '../../utils/Apis/axios';
+import { API, Colors, Constants } from '../../configs';
+import styles from './styles';
+import DeviceItem from './DeviceItem/DeviceItem';
+import { useSCContextSelector } from '../../context';
+
+const ConnectingProcess = ({ route }) => {
+  const { navigate, goBack } = useNavigation();
+  const t = useTranslations();
+
+  const {
+    scan_sensor_data,
+    gateway,
+    station,
+    unit,
+    unit_id,
+    devicePrefixName,
+    wifi_ssid,
+    wifi_pass,
+    chip_id,
+  } = route.params;
+  const [percent, setPercent] = useState(0);
+  const [isLoading, setIsLoading] = useState(true);
+  const [sensor, setSensor] = useState(null);
+  const user = useSCContextSelector((state) => state?.auth?.account?.user);
+  useEffect(() => {
+    processLoading();
+  }, [processLoading]);
+
+  const processLoading = useCallback(() => {
+    let interval;
+    if (isLoading) {
+      interval = setInterval(() => {
+        setPercent((prev) => {
+          if (prev === 1) {
+            clearInterval(interval);
+            return 1;
+          } else {
+            return prev + 0.2;
+          }
+        });
+      }, 180);
+    } else {
+      clearInterval(interval);
+    }
+  }, [isLoading]);
+
+  const ConnectingDevice = useCallback(async () => {
+    setIsLoading(true);
+    switch (devicePrefixName) {
+      case 'SENSOR':
+        {
+          const body = { imei: scan_sensor_data?.imei, chip: gateway?.id };
+          const { success, data } = await axiosPost(
+            API.SUB_UNIT.SENSOR_SCAN(station.id),
+            body
+          );
+          if (success) {
+            setSensor(data);
+          } else {
+            goBack();
+          }
+        }
+        break;
+      case 'ROBOT': {
+        const { success, data } = await axiosPost(API.UNIT.CHIP_SCAN(unit.id), {
+          imei: gateway?.imei,
+          qr_code: scan_sensor_data?.imei,
+          name: gateway?.model,
+          station: station?.id,
+          wifi_ssid: wifi_ssid,
+          wifi_pass: wifi_pass,
+          phone: user?.phone_number,
+        });
+        if (success) {
+          setSensor(data);
+        } else {
+          goBack();
+        }
+        break;
+      }
+      case 'LITE': {
+        const { success } = await axiosPost(API.UNIT.ADD_GATEWAY(unit_id), {
+          chip: chip_id,
+          imei: gateway?.imei,
+          chip_name: gateway?.model,
+        });
+        if (success) {
+          setSensor({ name: gateway?.model });
+        } else {
+          goBack();
+        }
+        break;
+      }
+    }
+    setIsLoading(false);
+  }, [
+    devicePrefixName,
+    scan_sensor_data?.imei,
+    gateway?.id,
+    gateway?.imei,
+    gateway?.model,
+    station,
+    goBack,
+    unit,
+    wifi_ssid,
+    wifi_pass,
+    user?.phone_number,
+    unit_id,
+    chip_id,
+  ]);
+
+  const Connecting = useCallback(() => {
+    return (
+      <>
+        <View style={styles.progressBar}>
+          <View style={styles.connecting}>
+            <Text type="H4" bold>
+              {t('connecting')}
+            </Text>
+          </View>
+        </View>
+        <View style={styles.percentLoad}>
+          <Progress.Bar
+            progress={percent}
+            animated={true}
+            color={Colors.Primary}
+            indeterminateAnimationDuration={1000}
+            height={7}
+            width={Constants.width - 80}
+            useNativeDriver={true}
+          />
+          <Text style={styles.textPercentLoad}>{`${parseInt(
+            percent * 100,
+            10
+          )}%`}</Text>
+        </View>
+      </>
+    );
+  }, [percent, t]);
+
+  const ConnectingSuccess = useCallback(() => {
+    return (
+      <View style={styles.ConnectingSuccess}>
+        <ImageSuccessfully />
+        <Text bold style={styles.connectingText}>
+          {t('successfully_connected')}
+        </Text>
+        <Text size={14} style={styles.textHome}>
+          Home - {station?.name}
+        </Text>
+        <DeviceItem icon={sensor?.icon_kit} name={sensor?.name} />
+      </View>
+    );
+  }, [sensor?.icon_kit, sensor?.name, station?.name, t]);
+
+  const handleDone = useCallback(() => {
+    navigate(Routes.UnitStack, {
+      screen: Routes.UnitDetail,
+      params: {
+        unitId: unit?.id || unit_id,
+        unitData: unit,
+        routeName: 'DashboardStack',
+        stationId: station?.id,
+      },
+    });
+  }, [navigate, station?.id, unit, unit_id]);
+
+  useEffect(() => {
+    ConnectingDevice();
+  }, [ConnectingDevice]);
+
+  return (
+    <SafeAreaView style={styles.wrap}>
+      <View style={styles.boxText}>
+        <Text bold style={styles.connectingText}>
+          {t('connect_device')}
+        </Text>
+        {!!isLoading && <Connecting />}
+        {!isLoading && <ConnectingSuccess />}
+      </View>
+      {!isLoading && (
+        <TouchableOpacity style={styles.buttonDone} onPress={handleDone}>
+          <Text color={Colors.Primary} type={'H4'}>
+            {t('done')}
+          </Text>
+        </TouchableOpacity>
+      )}
+    </SafeAreaView>
+  );
+};
+
+export default ConnectingProcess;

package/src/commons/ConnectingProcess/styles.js

@@ -0,0 +1,69 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../configs';
+import {
+  getStatusBarHeight,
+  getBottomSpace,
+} from 'react-native-iphone-x-helper';
+
+export default StyleSheet.create({
+  wrap: {
+    paddingTop: getStatusBarHeight(true),
+    backgroundColor: Colors.White,
+    width: '100%',
+    height: '100%',
+    justifyContent: 'space-between',
+  },
+  connectingText: {
+    marginLeft: 30,
+    marginTop: 16,
+    fontSize: 20,
+    color: Colors.Gray9,
+  },
+  animatedEllipsis: {
+    fontSize: 25,
+    color: Colors.Gray9,
+    marginTop: 14,
+  },
+  warningText: {
+    marginHorizontal: 30,
+    marginTop: 16,
+    fontSize: 14,
+    color: Colors.Gray8,
+  },
+  boxText: {
+    flex: 1,
+  },
+  progressBar: {
+    flexDirection: 'column',
+    marginTop: 180,
+    marginHorizontal: 30,
+  },
+  connecting: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    marginBottom: 10,
+  },
+  percentLoad: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  textPercentLoad: {
+    marginLeft: 10,
+  },
+  ConnectingSuccess: {
+    marginTop: 180,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  textHome: {
+    paddingTop: 16,
+    paddingBottom: 8,
+  },
+  buttonDone: {
+    width: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
+    paddingBottom: getBottomSpace() + 24,
+  },
+});

package/src/commons/Device/HorizontalBarChart.js

@@ -33,6 +33,7 @@ const HorizontalBarChart = memo(({ datas, config }) => {
     },
     yAxis: {
       min: 0,
+      minRange: 0.5,
       title: {
         text: null,
       },
@@ -55,7 +56,12 @@ const HorizontalBarChart = memo(({ datas, config }) => {
           useHTML: true,
           formatter: function () {
             const { unit, price } = JSON.parse(this.series.name);
-            const textColor = this.color === '#00979D' ? '#FFFFFF' : '#262626';
+            const textColor =
+              this.color === '#00979D'
+                ? this.y === 0
+                  ? '#262626'
+                  : '#FFFFFF'
+                : '#262626';
             const valueStyle = `color:${textColor};font-weight:normal;font-size:12px;`;
             const costStyle = valueStyle + 'font-weight:bold;';
 

package/src/commons/Device/ItemDevice.js

@@ -30,6 +30,7 @@ const ItemDevice = memo(
     sensor,
     unit,
     station,
+    isNetworkConnected,
     isGGHomeConnected,
     status,
     wrapStyle,
@@ -39,9 +40,9 @@ const ItemDevice = memo(
 
     const goToSensorDisplay = useCallback(() => {
       navigation.navigate(Routes.DeviceDetail, {
-        unit,
+        unitData: unit,
         station,
-        sensor,
+        sensorData: sensor,
         title,
         isGGHomeConnected,
       });
@@ -56,13 +57,15 @@ const ItemDevice = memo(
       );
     };
 
-    const isNetworkConnected =
-      status === undefined ? sensor.is_connected : status.is_connected;
+    const isConnectedViaInternet =
+      status === undefined
+        ? isNetworkConnected && sensor.is_connected
+        : isNetworkConnected && status.is_connected;
     const isBLEConnected = isDeviceConnected(
       sensor?.remote_control_options?.bluetooth?.address
     );
     const isConnected =
-      isNetworkConnected || isGGHomeConnected || isBLEConnected;
+      isConnectedViaInternet || isGGHomeConnected || isBLEConnected;
     const borderColor = isConnected ? Colors.Gray4 : Colors.Red6;
     const textConnected = isConnected ? t('connected') : t('disconnected');
 

package/src/commons/Device/LinearChart.js

@@ -55,6 +55,7 @@ const chartOptions = {
       },
     },
     minRange: 3600 * 24 * 1000,
+    tickInterval: 24 * 3600 * 1000,
   },
   plotOptions: {
     series: {

package/src/commons/Device/WaterQualitySensor/ListQualityIndicator.js

@@ -37,7 +37,7 @@ export default ListQualityIndicator;
 const styles = StyleSheet.create({
   standard: {
     flexDirection: 'row',
-    marginTop: 16,
+    marginVertical: 16,
   },
   flatlistContent: {
     paddingHorizontal: 16,

package/src/commons/Device/WaterQualitySensor/QualityIndicatorsItem.js

@@ -68,7 +68,7 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderColor: Colors.Gray4,
     marginRight: 8,
-    width: (width / 375) * 120,
+    width: ((width - 32) / 375) * 120,
   },
   rowFlex: {
     flexDirection: 'row',

package/src/commons/EmergencyButton/AlertSendConfirm.js

@@ -44,9 +44,9 @@ const AlertSendConfirm = ({
         <Text
           type="Body"
           style={styles.textLocation}
-        >{`${unit.name} - ${station.name}`}</Text>
+        >{`${unit?.name} - ${station?.name}`}</Text>
         <Text type="Body" style={styles.textAddress}>
-          {unit.address}
+          {unit?.address}
         </Text>
       </View>
     </ButtonPopup>

package/src/commons/EmergencyButton/AlertSent.js

@@ -58,7 +58,7 @@ const AlertSent = ({
       <Text
         type="H5"
         style={styles.location}
-      >{`${unit.name} - ${station.name}`}</Text>
+      >{`${unit?.name} - ${station?.name}`}</Text>
       <IconFill name="alert" size={42} style={styles.alert} />
       <Text semibold style={styles.textAlertSent}>
         {data.title}
@@ -67,7 +67,7 @@ const AlertSent = ({
         {data.message}
         {isDashboard && (
           <Text type="H4" semibold>
-            {` ${unit.name}: ${station.name}.`}
+            {` ${unit?.name}: ${station?.name}.`}
           </Text>
         )}
       </Text>

package/src/commons/Form/TextInputPassword.js

@@ -111,7 +111,7 @@ const styles = StyleSheet.create({
   icons: {
     position: 'absolute',
     right: 0,
-    top: 7,
+    top: -5,
     bottom: 0,
     width: 40,
     justifyContent: 'center',

package/src/commons/FullLoading/index.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { View, ActivityIndicator, StyleSheet } from 'react-native';
+
+import { colorOpacity } from '../../utils/Converter/color';
+import { Colors } from '../../configs';
+
+const FullLoading = ({ wrapStyle, color = Colors.Primary, size = 'small' }) => (
+  <View style={[styles.wrap, wrapStyle]}>
+    <View style={styles.background}>
+      <ActivityIndicator color={color} size={size} />
+    </View>
+  </View>
+);
+
+const styles = StyleSheet.create({
+  wrap: {
+    position: 'absolute',
+    backgroundColor: colorOpacity(Colors.Black, 0.1),
+    alignItems: 'center',
+    justifyContent: 'center',
+    top: 0,
+    left: 0,
+    bottom: 0,
+    right: 0,
+    zIndex: 10,
+  },
+  background: {
+    backgroundColor: colorOpacity(Colors.White, 0.8),
+    borderRadius: 5,
+    paddingHorizontal: 32,
+    paddingVertical: 24,
+  },
+});
+
+export default FullLoading;

package/src/commons/SubUnit/Favorites/index.js

@@ -15,6 +15,7 @@ const SubUnitFavorites = ({
   unit,
   isOwner,
   favorites,
+  isNetworkConnected,
   isGGHomeConnected,
   wrapItemStyle,
 }) => {
@@ -71,6 +72,7 @@ const SubUnitFavorites = ({
               sensor={sensor}
               unit={unit}
               station={sensor.station}
+              isNetworkConnected={isNetworkConnected}
               isGGHomeConnected={isGGHomeConnected}
               status={sensorsStatus.find((s) => s.id === sensor.id)}
               wrapStyle={wrapItemStyle}

package/src/commons/SubUnit/OneTap/ItemOneTap.js

@@ -7,6 +7,7 @@ import { API, Colors } from '../../../configs';
 import OneTap from '../../../../assets/images/OneTap.svg';
 import ValueChange from '../../../../assets/images/ValueChange.svg';
 import Schedule from '../../../../assets/images/Schedule.svg';
+import Event from '../../../../assets/images/Event.svg';
 import CheckCircle from '../../../../assets/images/CheckCircle.svg';
 import FImage from '../../FImage';
 import { timeDifference } from '../../../utils/Converter/time';
@@ -92,6 +93,8 @@ const ItemOneTap = memo(
         return <OneTap />;
       } else if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
         return <ValueChange />;
+      } else if (type === AUTOMATE_TYPE.EVENT) {
+        return <Event />;
       } else {
         return <Schedule />;
       }

package/src/commons/SubUnit/ShortDetail.js

@@ -19,7 +19,12 @@ const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32
 );
 
-const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
+const ShortDetailSubUnit = ({
+  unit,
+  station,
+  isNetworkConnected,
+  isGGHomeConnected,
+}) => {
   const t = useTranslations();
   const isFocused = useIsFocused();
   const { navigate } = useNavigation();
@@ -146,6 +151,7 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
               sensor={sensor}
               unit={unit}
               station={station}
+              isNetworkConnected={isNetworkConnected}
               isGGHomeConnected={isGGHomeConnected}
               status={sensorsStatus.find((s) => s.id === sensor.id)}
             />

package/src/commons/index.js

@@ -15,6 +15,7 @@ import MenuActionList from './MenuActionList';
 import RadioCircle from './RadioCircle';
 import { CircleButton } from './CircleButton';
 import HorizontalPicker from './HorizontalPicker';
+import FullLoading from './FullLoading';
 
 export {
   ButtonPopup,
@@ -34,4 +35,5 @@ export {
   RadioCircle,
   CircleButton,
   HorizontalPicker,
+  FullLoading,
 };

package/src/configs/API.js

@@ -25,6 +25,8 @@ const API = {
     MANAGE_UNIT: (id) => SCConfig.apiRoot + `/property_manager/units/${id}/`,
     CHIP_SCAN: (id) =>
       SCConfig.apiRoot + `/property_manager/units/${id}/chip_scan/`,
+    CHIP_SCAN_GET_WIFI_INFO: () =>
+      SCConfig.apiRoot + '/property_manager/units/chip_scan_get_wifi_info/',
     MANAGE_ACCESS: (id) =>
       SCConfig.apiRoot + `/property_manager/manage_access/${id}/`,
     AUTOMATE: (id) =>
@@ -51,8 +53,12 @@ const API = {
   CHIP: {
     CHECK_FINALIZED: () =>
       SCConfig.apiRoot + '/property_manager/stations/check_chip_finalized/',
+    GET_CHIPS_FROM_UNIT: (id) =>
+      SCConfig.apiRoot + `/property_manager/get_chips/?unit_id=${id}`,
   },
   SENSOR: {
+    SENSOR_DETAIL: (id) =>
+      SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
     DISPLAY: (id) =>
       SCConfig.apiRoot + `/property_manager/sensors/${id}/display/`,
     DISPLAY_VALUES: (id) =>
@@ -82,10 +88,6 @@ const API = {
       `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/remove_from_favourites/`,
     DISPLAY_ACTIONS: (id) =>
       SCConfig.apiRoot + `/property_manager/sensors/${id}/display_actions/`,
-    RENAME_SENSOR: (id) =>
-      SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
-    REMOVE_SENSOR: (id) =>
-      SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
     CHANGE_SUB_UNIT: (unit_id, station_id, id) =>
       SCConfig.apiRoot +
       `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/change_sub_unit/`,

package/src/configs/Constants.js

@@ -3,6 +3,7 @@ import { RFValue } from 'react-native-responsive-fontsize';
 import OneTap from '../../assets/images/OneTap.svg';
 import ValueChange from '../../assets/images/ValueChange.svg';
 import Schedule from '../../assets/images/Schedule.svg';
+import Event from '../../assets/images/Event.svg';
 
 const X_WIDTH = 375;
 const X_HEIGHT = 812;
@@ -91,6 +92,7 @@ export const AUTOMATE_TYPE = {
   ONE_TAP: 'one_tap',
   VALUE_CHANGE: 'value_change',
   SCHEDULE: 'schedule',
+  EVENT: 'event',
   ONE_TAP_ONLY: 'one_tap_only',
   AUTOMATE: 'automate',
   AUTOMATION: 'automation',
@@ -128,6 +130,12 @@ export const AUTOMATES = {
     explanation: 'setup_the_schedule',
     icon: Schedule,
   },
+  event: {
+    value: AUTOMATE_TYPE.EVENT,
+    title: 'event',
+    explanation: 'setup_the_conditions',
+    icon: Event,
+  },
 };
 
 export const UNIT_TYPES = {
@@ -340,6 +348,7 @@ export const TESTID = {
 
   // ADD SUB UNIT
   ADD_SUB_UNIT_BUTTON_CHOOSE_PHOTO: 'ADD_SUB_UNIT_BUTTON_CHOOSE_PHOTO',
+  ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION: 'ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION',
 
   SCANNING_RESPONSE_TITLE: 'SCANNING_RESPONSE_TITLE',
   SCANNING_RESPONSE_DESCRIPTION: 'SCANNING_RESPONSE_DESCRIPTION',
@@ -478,6 +487,12 @@ export const TESTID = {
   TOUCH_SHARED_UNIT: 'TOUCH_SHARED_UNIT',
   SHARED_UNIT_OWN_BY: 'SHARED_UNIT_OWN_BY',
 
+  // Select subunit
+
+  SELECT_SUBUNIT_NAME: 'SELECT_SUBUNIT_NAME',
+  SELECT_SUBUNIT_RADIO_BUTTON: 'SELECT_SUBUNIT_RADIO_BUTTON',
+  SELECT_SUBUNIT_SELECT: 'SELECT_SUBUNIT_SELECT',
+
   // Select unit
   SELECT_UNIT_NAME: 'SELECT_UNIT_NAME',
   SELECT_UNIT_RADIO_BUTTON: 'SELECT_UNIT_RADIO_BUTTON',
@@ -552,6 +567,12 @@ export const TESTID = {
   ADD_NEW_GATEWAY_THEN_SELECT: 'ADD_NEW_GATEWAY_THEN_SELECT',
   ADD_NEW_GATEWAY_TEXT_IMEI: 'ADD_NEW_GATEWAY_TEXT_IMEI',
 
+  // Select Gateway
+
+  SELECT_GATEWAY_NAME: 'SELECT_GATEWAY_NAME',
+  SELECT_GATEWAY_RADIO_BUTTON: 'SELECT_GATEWAY_RADIO_BUTTON',
+  SELECT_GATEWAY_SELECT: 'SELECT_GATEWAY_SELECT',
+
   // Header
   HEADER_ANI_TITLE: 'HEADER_ANI_TITLE',
 
@@ -634,10 +655,14 @@ export const NOTIFICATION_TYPES = {
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
   REMINDER: 'REMINDER',
+  NOTIFY_INDICATOR: 'NOTIFY_INDICATOR',
   NOTIFY_REMOVE_UNIT: 'NOTIFY_REMOVE_UNIT',
   NOTIFY_REMOVE_MEMBER: 'NOTIFY_REMOVE_MEMBER',
   NOTIFY_MEMBER_LEAVE_UNIT: 'NOTIFY_MEMBER_LEAVE_UNIT',
   NOTIFY_RENAME_UNIT: 'NOTIFY_RENAME_UNIT',
+  NOTIFY_DEVICE_DISCONNECT: 'NOTIFY_DEVICE_DISCONNECT',
+  NOTIFY_RENAME_SUB_UNIT: 'NOTIFY_RENAME_SUB_UNIT',
+  NOTIFY_UPDATE_ADDRESS: 'NOTIFY_UPDATE_ADDRESS',
 };
 
 export const ACTIVITY_LOG_TYPES = {

package/src/configs/Images.js

@@ -11,4 +11,6 @@ export default {
   buttonLeftCurtain: require('../Images/Common/buttonLeftCurtain.png'),
   buttonRightCurtain: require('../Images/Common/buttonRightCurtain.png'),
   shadowButton: require('../Images/Common/shadowButton.png'),
+  eye: require('../Images/Common/eye.png'),
+  eyeClosed: require('../Images/Common/eye-closed.png'),
 };

package/src/context/actionType.ts

@@ -6,6 +6,7 @@ export const Action = {
   LIST_ACTION: 'LIST_ACTION',
   IS_FIRST_OPEN_CAMERA: 'IS_FIRST_OPEN_CAMERA',
   IS_LAVIDA_SOURCE: 'IS_LAVIDA_SOURCE',
+  IS_CONNECT_WIFI_GATEWAY: 'IS_CONNECT_WIFI_GATEWAY',
 };
 
 export type AuthData = {
@@ -50,4 +51,5 @@ export type ActionDataMap = {
 export type AppType = {
   isFirstOpenCamera: boolean;
   isLavidaSource: boolean;
+  isConnectWifiGateway: boolean;
 };

package/src/context/reducer.ts

@@ -40,6 +40,7 @@ export const initialState = {
   app: {
     isFirstOpenCamera: true,
     isLavidaSource: false,
+    isConnectWifiGateway: false,
   },
 };
 
@@ -107,6 +108,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
         },
       };
     }
+    case Action.IS_CONNECT_WIFI_GATEWAY: {
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isConnectWifiGateway: payload,
+        },
+      };
+    }
     default:
       return currentState;
   }

package/src/hooks/Common/useBlockBackAndroid.js

@@ -2,10 +2,12 @@ import { useIsFocused } from '@react-navigation/native';
 import { useCallback, useEffect } from 'react';
 import { BackHandler } from 'react-native';
 
-export const useBlockBackAndroid = () => {
+export const useBlockBackAndroid = (actionBack) => {
   const focused = useIsFocused();
   const blockBack = useCallback(() => {
+    actionBack && actionBack();
     return true;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   useEffect(() => {
     if (focused) {