@eohjsc/react-native-smart-city 0.7.38 → 0.7.40

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.38",
+  "version": "0.7.40",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -221,5 +221,8 @@
     "*.{js, ts}": [
       "yarn lint"
     ]
+  },
+  "devDependencies": {
+    "@react-native/babel-preset": "0.76.5"
   }
 }

package/src/screens/Automate/AddNewAction/ChooseAction.js

@@ -17,6 +17,7 @@ const ChooseAction = ({ route }) => {
     unitId,
     device,
     automateId,
+    closeScreen,
     scriptItems,
     numberActionCanAdd,
     multiUnit = {},
@@ -43,11 +44,16 @@ const ChooseAction = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf(), automate: { id: automateId } },
+        params: {
+          saveAt: moment().valueOf(),
+          automate: { id: automateId },
+          closeScreen,
+        },
       });
   }, [
     numberActionCanAdd,
     automateId,
+    closeScreen,
     saveActions.length,
     unitId,
     multiUnit.id,

package/src/screens/Automate/AddNewAction/NewActionWrapper.js

@@ -22,6 +22,7 @@ const NewActionWrapper = ({
     canNext !== undefined || onNext !== undefined || nextTitle !== undefined;
   const { navigate } = useNavigation();
   const { params = {} } = useRoute();
+
   const { closeScreen } = params;
 
   const handleClose = useCallback(() => {

package/src/screens/Automate/AddNewAction/SetupScriptDelay.js

@@ -17,7 +17,7 @@ import moment from 'moment';
 const SetupScriptDelay = ({ route }) => {
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
-  const { automate = {} } = route?.params || {};
+  const { automate = {}, closeScreen } = route?.params || {};
   const { id: automateId } = automate;
   const [delay, setDelay] = useState();
 
@@ -37,12 +37,12 @@ const SetupScriptDelay = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf(), automate },
+        params: { saveAt: moment().valueOf(), automate, closeScreen },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automateId, navigate, delay, t, automate]);
+  }, [automateId, navigate, delay, t, automate, closeScreen]);
 
   const canSave = useMemo(() => {
     const value = parseInt(delay, 10);

package/src/screens/Automate/AddNewAction/SetupScriptEmail.js

@@ -13,7 +13,7 @@ import Routes from '../../../utils/Route';
 const SetupScriptEmail = ({ route }) => {
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
-  const { automate, unitId, multiUnit } = route.params || {};
+  const { automate, closeScreen, unitId, multiUnit } = route.params || {};
   const initialUnitId = useMemo(
     () => unitId || multiUnit.id,
     [unitId, multiUnit?.id]
@@ -36,10 +36,11 @@ const SetupScriptEmail = ({ route }) => {
   const onNext = useCallback(async () => {
     navigate(Routes.SetupScriptReceiverEmail, {
       automate,
+      closeScreen,
       unitId: initialUnitId,
       formData,
     });
-  }, [navigate, automate, initialUnitId, formData]);
+  }, [navigate, automate, closeScreen, initialUnitId, formData]);
 
   const canSave = useMemo(() => {
     const { title, message } = formData;

package/src/screens/Automate/AddNewAction/SetupScriptNotify.js

@@ -13,7 +13,7 @@ import Routes from '../../../utils/Route';
 const SetupScriptNotify = ({ route }) => {
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
-  const { automate, unitId, multiUnit } = route.params || {};
+  const { automate, closeScreen, unitId, multiUnit } = route.params || {};
   const initialUnitId = useMemo(
     () => unitId || multiUnit.id,
     [unitId, multiUnit?.id]
@@ -36,10 +36,11 @@ const SetupScriptNotify = ({ route }) => {
   const onNext = useCallback(async () => {
     navigate(Routes.SetupScriptReceiverNotify, {
       automate,
+      closeScreen,
       unitId: initialUnitId,
       formData,
     });
-  }, [navigate, automate, initialUnitId, formData]);
+  }, [navigate, automate, closeScreen, initialUnitId, formData]);
 
   const canSave = useMemo(() => {
     const { title, message } = formData;

package/src/screens/Automate/AddNewAction/SetupScriptReceiverEmail.js

@@ -12,7 +12,7 @@ import moment from 'moment';
 const SetupScriptReceiverEmail = ({ route }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
-  const { automate = {}, unitId, formData } = route.params;
+  const { automate = {}, closeScreen, unitId, formData } = route.params;
   const { id: automateId } = automate;
   const [listUser, setListUser] = useState([]);
 
@@ -27,12 +27,12 @@ const SetupScriptReceiverEmail = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf(), automate },
+        params: { saveAt: moment().valueOf(), automate, closeScreen },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automate, automateId, formData, listUser, navigate, t]);
+  }, [automate, automateId, closeScreen, formData, listUser, navigate, t]);
 
   const onLoadOption = useCallback(
     (item) => {

package/src/screens/Automate/AddNewAction/SetupScriptReceiverNotify.js

@@ -12,7 +12,7 @@ import moment from 'moment';
 const SetupScriptReceiverNotify = ({ route }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
-  const { automate = {}, unitId, formData } = route.params;
+  const { automate = {}, closeScreen, unitId, formData } = route.params;
   const { id: automateId } = automate;
   const [listUser, setListUser] = useState([]);
 
@@ -27,12 +27,12 @@ const SetupScriptReceiverNotify = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf(), automate },
+        params: { saveAt: moment().valueOf(), automate, closeScreen },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automate, automateId, formData, listUser, navigate, t]);
+  }, [automate, automateId, closeScreen, formData, listUser, navigate, t]);
 
   const onLoadOption = useCallback(
     (item) => {

package/src/screens/Automate/AddNewAction/SetupScriptReceiverSms.js

@@ -12,7 +12,7 @@ import moment from 'moment';
 const SetupScriptReceiverSms = ({ route }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
-  const { automate = {}, unitId, formData } = route.params;
+  const { automate = {}, closeScreen, unitId, formData } = route.params;
   const { id: automateId } = automate;
   const [listUser, setListUser] = useState([]);
 
@@ -27,12 +27,12 @@ const SetupScriptReceiverSms = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf(), automate },
+        params: { saveAt: moment().valueOf(), automate, closeScreen },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automate, automateId, formData, listUser, navigate, t]);
+  }, [automate, automateId, closeScreen, formData, listUser, navigate, t]);
 
   const onLoadOption = useCallback(
     (item) => {

package/src/screens/Automate/AddNewAction/SetupScriptSms.js

@@ -14,7 +14,7 @@ import { Colors } from '../../../configs';
 const SetupScriptSms = ({ route }) => {
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
-  const { automate, unitId, multiUnit } = route.params || {};
+  const { automate, closeScreen, unitId, multiUnit } = route.params || {};
   const initialUnitId = useMemo(
     () => unitId || multiUnit.id,
     [unitId, multiUnit?.id]
@@ -31,10 +31,11 @@ const SetupScriptSms = ({ route }) => {
   const onNext = useCallback(async () => {
     navigate(Routes.SetupScriptReceiverSms, {
       automate,
+      closeScreen,
       unitId: initialUnitId,
       formData,
     });
-  }, [navigate, automate, initialUnitId, formData]);
+  }, [navigate, automate, closeScreen, initialUnitId, formData]);
 
   const canSave = useMemo(() => {
     const { message } = formData;

package/src/screens/Automate/AddNewAction/__test__/SetupScriptEmail.test.js

@@ -69,6 +69,7 @@ describe('Test SetupScriptEmail', () => {
       {
         automate: route.params.automate,
         unitId: 1,
+        closeScreen: 'ScriptDetail',
         formData: { message: 'Message', title: 'Title', unit: 1 },
       }
     );

package/src/screens/Automate/AddNewAction/__test__/SetupScriptNotify.test.js

@@ -63,6 +63,7 @@ describe('Test SetupScriptNotify', () => {
       {
         automate: route.params.automate,
         unitId: 1,
+        closeScreen: 'ScriptDetail',
         formData: { message: 'Message', title: 'Title', unit: 1 },
       }
     );
@@ -97,6 +98,7 @@ describe('Test SetupScriptNotify', () => {
       {
         automate: route.params.automate,
         unitId: 1,
+        closeScreen: 'ScriptDetail',
         formData: { message: 'Message', title: 'Title', unit: 1 },
       }
     );

package/src/screens/Automate/AddNewAction/__test__/SetupScriptSms.test.js

@@ -64,6 +64,7 @@ describe('Test SetupScriptSms', () => {
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.SetupScriptReceiverSms, {
       automate: route.params.automate,
       unitId: 1,
+      closeScreen: 'ScriptDetail',
       formData: { message: 'Message', unit: 1 },
     });
   });

package/src/screens/Automate/ScriptDetail/Components/AddActionScript.js

@@ -20,7 +20,15 @@ import AccessibilityLabel from '../../../../configs/AccessibilityLabel';
 import { AUTOMATE_TYPE } from '../../../../configs/Constants';
 
 const AddActionScript = memo(
-  ({ automate, isVisible, setIsVisible, scriptItems, type, navigate }) => {
+  ({
+    automate,
+    closeScreen,
+    isVisible,
+    setIsVisible,
+    scriptItems,
+    type,
+    navigate,
+  }) => {
     const t = useTranslations();
     const { id, unit } = automate;
 
@@ -29,6 +37,7 @@ const AddActionScript = memo(
     const { max_actions_per_automation } = permissions || {};
 
     const listItem = useMemo(() => {
+      const finalCloseScreen = closeScreen || currentScreenName;
       return [
         {
           id: 'control_device',
@@ -40,7 +49,7 @@ const AddActionScript = memo(
               unitId: unit,
               automateId: id,
               scriptItems: scriptItems,
-              closeScreen: currentScreenName,
+              closeScreen: finalCloseScreen,
               numberActionCanAdd:
                 max_actions_per_automation - scriptItems.length,
               routeName: unit ? null : Routes.SelectControlDevices,
@@ -62,11 +71,13 @@ const AddActionScript = memo(
               navigate(Routes.SetupScriptNotify, {
                 automate,
                 unitId: unit,
+                closeScreen: finalCloseScreen,
               });
             } else {
               navigate(Routes.SelectUnit, {
                 automate,
                 routeName: Routes.SetupScriptNotify,
+                closeScreen: finalCloseScreen,
               });
             }
           },
@@ -79,6 +90,7 @@ const AddActionScript = memo(
             setIsVisible(false);
             navigate(Routes.SetupScriptDelay, {
               automate,
+              closeScreen: finalCloseScreen,
             });
           },
         },
@@ -92,11 +104,13 @@ const AddActionScript = memo(
               navigate(Routes.SetupScriptEmail, {
                 automate,
                 unitId: unit,
+                closeScreen: finalCloseScreen,
               });
             } else {
               navigate(Routes.SelectUnit, {
                 automate,
                 routeName: Routes.SetupScriptEmail,
+                closeScreen: finalCloseScreen,
               });
             }
           },
@@ -112,11 +126,13 @@ const AddActionScript = memo(
               navigate(Routes.SetupScriptSms, {
                 automate,
                 unitId: unit,
+                closeScreen: finalCloseScreen,
               });
             } else {
               navigate(Routes.SelectUnit, {
                 automate,
                 routeName: Routes.SetupScriptSms,
+                closeScreen: finalCloseScreen,
               });
             }
           },
@@ -124,6 +140,7 @@ const AddActionScript = memo(
       ];
     }, [
       automate,
+      closeScreen,
       currentScreenName,
       id,
       max_actions_per_automation,

package/src/screens/Automate/ScriptDetail/Components/ModalAddCondition.js

@@ -17,7 +17,14 @@ import { SCContext } from '../../../../context';
 import { Action } from '../../../../context/actionType';
 
 const ModalAddCondition = memo(
-  ({ automate, isVisible, setIsVisible, numberActionAdded, navigate }) => {
+  ({
+    automate,
+    closeScreen,
+    isVisible,
+    setIsVisible,
+    numberActionAdded,
+    navigate,
+  }) => {
     const t = useTranslations();
     const { setAction } = useContext(SCContext);
     const { unit } = automate;
@@ -26,6 +33,7 @@ const ModalAddCondition = memo(
     const { max_actions_per_automation } = permissions || {};
 
     const listItem = useMemo(() => {
+      const finalCloseScreen = closeScreen || currentScreenName;
       return [
         {
           id: 'time_frame',
@@ -36,7 +44,7 @@ const ModalAddCondition = memo(
             setIsVisible(false);
             navigate(Routes.AddEditConditionSchedule, {
               automate: automate,
-              closeScreen: Routes.ScriptDetail,
+              closeScreen: finalCloseScreen,
             });
           },
         },
@@ -49,7 +57,7 @@ const ModalAddCondition = memo(
             setIsVisible(false);
             const navParams = {
               automate: automate,
-              closeScreen: currentScreenName,
+              closeScreen: finalCloseScreen,
               numberActionCanAdd:
                 max_actions_per_automation - numberActionAdded,
               routeName: unit ? null : Routes.SelectControlDevices,
@@ -70,6 +78,7 @@ const ModalAddCondition = memo(
       ];
     }, [
       automate,
+      closeScreen,
       currentScreenName,
       max_actions_per_automation,
       navigate,

package/src/screens/Automate/ScriptDetail/__test__/index.test.js

@@ -902,9 +902,9 @@ describe('Test ScriptDetail', () => {
             params: {
               unitId: route.params.preAutomate.unit,
               automateId: route.params.preAutomate.id,
+              closeScreen: 'UnitDetail',
               numberActionCanAdd: 2,
               scriptItems: [],
-              closeScreen: undefined,
               routeName: null,
             },
           },

package/src/screens/Automate/ScriptDetail/index.js

@@ -59,7 +59,8 @@ import { Action } from '../../../context/actionType';
 const PreventDoubleTouch = withPreventDoubleClick(TouchableOpacity);
 
 const ScriptDetail = ({ route }) => {
-  const { dispatch, navigate, goBack, getState } = useNavigation();
+  const { dispatch, navigate, goBack, getState, popToTop, reset } =
+    useNavigation();
   const { params = {} } = route;
   const refMenuAction = useRef();
   const { setAction } = useContext(SCContext);
@@ -96,10 +97,11 @@ const ScriptDetail = ({ route }) => {
     name,
     unit,
     can_edit,
-    id: automateId,
     is_need_all_conditions,
     conditions = [{}],
   } = automate;
+  // Create const automateId Fix error navigation from handleClose NewActionWrapper to ScriptDetail
+  const automateId = automate.id || params.automateId;
   const [needAllCondition, setNeedAllCondition] = useState(
     is_need_all_conditions
   );
@@ -147,16 +149,12 @@ const ScriptDetail = ({ route }) => {
       } else if (index >= 0) {
         routes = state.routes.slice(0, index + 1);
       }
-      const hasScriptDetail = routes.some(
-        (r) => r.name === Routes.ScriptDetail
-      );
+      routes = routes.filter((r) => r.name !== Routes.ScriptDetail);
 
-      if (!hasScriptDetail) {
-        routes.push({
-          name: Routes.ScriptDetail,
-          params: route.params,
-        });
-      }
+      routes.push({
+        name: Routes.ScriptDetail,
+        params: route.params,
+      });
 
       routes.push({
         name: screen,
@@ -317,23 +315,77 @@ const ScriptDetail = ({ route }) => {
     }
   }, [automateId, t]);
 
-  const handleGoBack = useCallback(async () => {
-    if (closeScreen === Routes.UnitDetail) {
-      navigate(closeScreen, { unitId: unit });
-    } else if (
-      closeScreen === Routes.MultiUnits ||
-      closeScreen === Routes.Automate
-    ) {
-      navigate({
-        name: closeScreen,
-        merge: true,
+  const customNavigate = useCallback(
+    (screen, screenParams = {}) => {
+      const state = getState();
+      const index = state.routes.findIndex((r) => r.name === screen);
+
+      if (index > 0) {
+        const existingRoute = state.routes[index];
+
+        reset({
+          routes: [
+            ...state.routes.slice(0, index),
+            {
+              name: screen,
+              params: {
+                ...existingRoute.params,
+                ...screenParams,
+              },
+            },
+          ],
+          index,
+        });
+      } else if (index === 0) {
+        popToTop();
+      } else {
+        navigate(screen, screenParams);
+      }
+    },
+    [navigate, getState, popToTop, reset]
+  );
+
+  const customGoOtherStack = useCallback(
+    (stack, screen) => {
+      const state = getState();
+      if (state.routes.length > 1) {
+        navigate(Routes.Main, {
+          screen: Routes.DrawerMain,
+          params: { screen: stack, params: { screen: screen } },
+        });
+      } else {
+        goBack();
+      }
+    },
+    [navigate, getState, goBack]
+  );
+
+  const customGoBack = useCallback(() => {
+    const state = getState();
+    const index = state.routes.findIndex((r) => r.name === Routes.ScriptDetail);
+    if (index > 0) {
+      reset({
+        routes: state.routes.slice(0, index),
+        index: index - 1,
       });
-    } else if (closeScreen === Routes.ScriptDetail) {
-      navigate(Routes.UnitDetail, { unitId: unit });
     } else {
       goBack();
     }
-  }, [closeScreen, goBack, navigate, unit]);
+  }, [getState, goBack, reset]);
+
+  const handleGoBack = useCallback(async () => {
+    if (closeScreen === Routes.UnitDetail) {
+      customNavigate(Routes.UnitDetail, { unitId: unit });
+    } else if (closeScreen === Routes.MultiUnits) {
+      customNavigate(Routes.MultiUnits);
+    } else if (closeScreen === Routes.Automate) {
+      customGoOtherStack(Routes.AutomateStack, Routes.Automate);
+    } else if (closeScreen === Routes.Notification) {
+      customGoOtherStack(Routes.NotificationStack, Routes.Notification);
+    } else {
+      customGoBack();
+    }
+  }, [closeScreen, customNavigate, customGoOtherStack, customGoBack, unit]);
 
   const onChangeSwitch = useCallback(
     async (checked) => {
@@ -810,6 +862,7 @@ const ScriptDetail = ({ route }) => {
       />
       <AddActionScript
         automate={automate}
+        closeScreen={closeScreen}
         scriptItems={data}
         isVisible={isShowAddAction}
         setIsVisible={setIsShowAddAction}
@@ -818,6 +871,7 @@ const ScriptDetail = ({ route }) => {
       />
       <ModalAddCondition
         automate={automate}
+        closeScreen={closeScreen}
         numberActionAdded={data.length}
         isVisible={isShowAddCondition}
         setIsVisible={setIsShowAddCondition}

package/src/screens/Automate/SetSchedule/AddEditConditionSchedule.js

@@ -6,7 +6,7 @@ import { axiosPost, axiosPut } from '../../../utils/Apis/axios';
 import { API } from '../../../configs';
 
 const AddEditConditionSchedule = ({ route }) => {
-  const { automate, condition, isUpdateCondition } = route.params;
+  const { automate, condition, isUpdateCondition, closeScreen } = route.params;
   const { navigate } = useNavigation();
 
   const handleOnSave = useCallback(
@@ -27,11 +27,11 @@ const AddEditConditionSchedule = ({ route }) => {
       if (success) {
         navigate({
           name: Routes.ScriptDetail,
-          params: { preAutomate: automate },
+          params: { preAutomate: automate, closeScreen },
         });
       }
     },
-    [isUpdateCondition, automate, condition?.id, navigate]
+    [isUpdateCondition, automate, closeScreen, condition?.id, navigate]
   );
 
   return <EditSchedule condition={condition} onSave={handleOnSave} />;

package/src/screens/Automate/SetSchedule/__test__/AddEditConditionSchedule.test.js

@@ -182,7 +182,10 @@ describe('Test AddEditConditionSchedule', () => {
     });
     expect(global.mockedNavigate).toHaveBeenCalledWith({
       name: 'ScriptDetail',
-      params: { preAutomate: { id: 1, type: 'schedule', unit: 1 } },
+      params: {
+        preAutomate: { id: 1, type: 'schedule', unit: 1 },
+        closeScreen: 'ScriptDetail',
+      },
     });
   });
 
@@ -234,7 +237,7 @@ describe('Test AddEditConditionSchedule', () => {
     );
     expect(global.mockedNavigate).toHaveBeenCalledWith({
       name: 'ScriptDetail',
-      params: { preAutomate: { id: 1 } },
+      params: { preAutomate: { id: 1 }, closeScreen: 'ScriptDetail' },
     });
   });
 
@@ -332,7 +335,7 @@ describe('Test AddEditConditionSchedule', () => {
     );
     expect(global.mockedNavigate).toHaveBeenCalledWith({
       name: 'ScriptDetail',
-      params: { preAutomate: { id: 1 } },
+      params: { preAutomate: { id: 1 }, closeScreen: 'ScriptDetail' },
     });
   });
 
@@ -447,7 +450,7 @@ describe('Test AddEditConditionSchedule', () => {
     );
     expect(global.mockedNavigate).toHaveBeenCalledWith({
       name: 'ScriptDetail',
-      params: { preAutomate: { id: 1 } },
+      params: { preAutomate: { id: 1 }, closeScreen: 'ScriptDetail' },
     });
   });
 
@@ -510,7 +513,7 @@ describe('Test AddEditConditionSchedule', () => {
     );
     expect(global.mockedNavigate).toHaveBeenCalledWith({
       name: 'ScriptDetail',
-      params: { preAutomate: { id: 1 } },
+      params: { preAutomate: { id: 1 }, closeScreen: 'ScriptDetail' },
     });
   });
 });

package/src/screens/HanetCamera/CaptureFaceID.js

@@ -63,6 +63,7 @@ const CaptureFaceID = ({ route }) => {
         setCapturing(false);
         setIsCameraActive(false);
       } catch (error) {
+        // eslint-disable-next-line no-console
         console.error('Failed to take photo:', error);
       }
     }
@@ -143,14 +144,7 @@ const CaptureFaceID = ({ route }) => {
           </View>
         )}
         {!isCameraActive && imageUri && (
-          <Image
-            source={{ uri: imageUri }}
-            style={{
-              position: 'absolute',
-              height: Constants.height,
-              width: Constants.width,
-            }}
-          />
+          <Image source={{ uri: imageUri }} style={styles.imageStyle} />
         )}
       </>
     );
@@ -160,9 +154,7 @@ const CaptureFaceID = ({ route }) => {
     <View style={styles.container}>
       <HeaderCustom title={title} isShowSeparator />
       {openCamera && (
-        <View style={styles.wrapCamera}>
-          {renderCameraContent()}
-        </View>
+        <View style={styles.wrapCamera}>{renderCameraContent()}</View>
       )}
       {!openCamera && (
         <View style={styles.center}>

package/src/screens/HanetCamera/__test__/CaptureFaceID.test.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { create, act } from 'react-test-renderer';
 import MockAdapter from 'axios-mock-adapter';

package/src/screens/HanetCamera/styles/captureFaceIDStyles.js

@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native';
-import { Colors } from '../../../configs';
+import { Colors, Constants } from '../../../configs';
 
 export default StyleSheet.create({
   container: {
@@ -47,4 +47,9 @@ export default StyleSheet.create({
     backgroundColor: Colors.White,
     marginTop: 8,
   },
+  imageStyle: {
+    position: 'absolute',
+    height: Constants.height,
+    width: Constants.width,
+  },
 });

package/src/screens/Notification/components/NotificationItem.js

@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useRoute } from '@react-navigation/native';
 import moment from 'moment';
 import React, { memo, useCallback, useState } from 'react';
 import { Image, TouchableOpacity, View } from 'react-native';
@@ -21,6 +21,7 @@ import styles from '../styles/NotificationItemStyles';
 const NotificationItem = memo(({ item }) => {
   const t = useTranslations();
   const navigation = useNavigation();
+  const { name: currentScreen } = useRoute();
   const language = useSCContextSelector((state) => state.language);
   const { id, icon, created_at, is_read, params, content_code } = item;
   const [isRead, setIsRead] = useState(is_read);
@@ -438,6 +439,7 @@ const NotificationItem = memo(({ item }) => {
             navigation.navigate(Routes.UnitStack, {
               screen: Routes.ScriptDetail,
               params: {
+                closeScreen: currentScreen,
                 preAutomate: { id: automate_id },
               },
             });
@@ -450,6 +452,7 @@ const NotificationItem = memo(({ item }) => {
   }, [
     params,
     content_code,
+    currentScreen,
     customColorText,
     t,
     logo,

package/src/screens/ScanChipQR/components/QRScan/__test__/QRScan.test.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { act, create } from 'react-test-renderer';
 
 import { SCProvider } from '../../../../../context';

package/src/screens/ScanChipQR/components/QRScan/index.js

@@ -102,11 +102,7 @@ const QRScan = ({ isScanReady = true, onScan }) => {
       />
       <View style={styles.maskOuter}>
         <View
-          style={[
-            { flex: maskRowHeight },
-            styles.maskRow,
-            styles.maskFrame,
-          ]}
+          style={[{ flex: maskRowHeight }, styles.maskRow, styles.maskFrame]}
         />
         <View style={styles.maskCenter}>
           <View style={[{ width: maskColWidth }, styles.maskFrame]} />
@@ -119,11 +115,7 @@ const QRScan = ({ isScanReady = true, onScan }) => {
           </Text>
         </View>
         <View
-          style={[
-            { flex: maskRowHeight },
-            styles.maskRow,
-            styles.maskFrame,
-          ]}
+          style={[{ flex: maskRowHeight }, styles.maskRow, styles.maskFrame]}
         />
         <CircleButton
           onPress={onPressClose}
@@ -147,11 +139,6 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
-  preview: {
-    flex: 1,
-    justifyContent: 'flex-end',
-    alignItems: 'center',
-  },
   maskOuter: {
     position: 'absolute',
     top: 0,

package/src/screens/Unit/__test__/Detail.test.js

@@ -23,7 +23,6 @@ import PreventAccess from '../../../commons/PreventAccess';
 import Routes from '../../../utils/Route';
 import { storeData } from '../../../utils/Storage';
 
-jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
 const wrapComponent = (route, account) => (
   <SCProvider initState={mockSCStore({})}>
     <UnitDetail route={route} account={account} />

package/src/utils/Route/index.js

@@ -153,10 +153,12 @@ const Routes = {
   SelectUnit: 'SelectUnit',
   AddNewScriptAction: 'AddNewScriptAction',
   Automate: 'Automate',
+  AutomateStack: 'AutomateStack',
   MultiUnits: 'MultiUnits',
   EditDevice: 'EditDevice',
   SetSchedule: 'SetSchedule',
   Notification: 'Notification',
+  NotificationStack: 'NotificationStack',
   AddEditConditionSchedule: 'AddEditConditionSchedule',
   PersonalHealthStack: 'PersonalHealthStack',
   ListSmartAccount: 'ListSmartAccount',