@eohjsc/react-native-smart-city 0.7.43 → 0.7.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.43",
+  "version": "0.7.44",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/Dashboard/MyDashboardDevice/index.js

@@ -201,6 +201,7 @@ const MyDashboardDevice = ({ refreshing }) => {
               {item.name}
             </Text>
             <TouchableOpacity
+              hitSlop={12}
               onPress={goToUnitDetail(item)}
               style={styles.arrowRightButton}
               accessibilityLabel={`${AccessibilityLabel.UNIT_GO_TO_DETAIL}-${index}`}

package/src/commons/Dashboard/MyUnit/index.js

@@ -253,6 +253,7 @@ const MyUnit = ({ refreshing }) => {
             {t('text_my_units')}
           </Text>
           <TouchableOpacity
+            hitSlop={12}
             onPress={goToSelectUnit}
             style={styles.searchMenuButton}
             accessibilityLabel={AccessibilityLabel.SELECT_UNIT}

package/src/screens/AddNewGateway/RenameNewDevices.js

@@ -80,7 +80,7 @@ const RenameNewDevices = memo(({ route }) => {
               unitId: unit?.id,
               stationId: subUnit?.id,
               isSuccessfullyConnected: true,
-              routeName: Routes.DashboardStack,
+              routeName: Routes.Main,
             },
           },
         },

package/src/screens/AddNewGateway/__test__/RenameNewDevices.test.js

@@ -89,7 +89,7 @@ describe('Test rename new devices', () => {
             params: {
               params: {
                 isSuccessfullyConnected: true,
-                routeName: 'DashboardStack',
+                routeName: 'Main',
                 stationId: undefined,
                 unitId: undefined,
               },

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

@@ -8,6 +8,7 @@ import { FullLoading, HeaderCustom } from '../../../commons';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import { Colors } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
+import Routes from '../../../utils/Route';
 import styles from './Styles/SelectActionStyles';
 
 const NewActionWrapper = ({
@@ -20,14 +21,33 @@ const NewActionWrapper = ({
 }) => {
   const hasNext =
     canNext !== undefined || onNext !== undefined || nextTitle !== undefined;
-  const { navigate } = useNavigation();
+  const { navigate, getState, pop } = useNavigation();
   const { params = {} } = useRoute();
 
-  const { closeScreen } = params;
+  const { closeScreen, closeStack } = params;
 
   const handleClose = useCallback(() => {
-    navigate(closeScreen, params);
-  }, [closeScreen, navigate, params]);
+    const state = getState();
+    const targetIndex = state.routes.findIndex((r) => r.name === closeScreen);
+
+    if (targetIndex >= 0) {
+      const popCount = state.index - targetIndex;
+      pop(popCount);
+    } else if (closeStack) {
+      navigate(Routes.Main, {
+        screen: Routes.DrawerMain,
+        params: {
+          screen: closeStack,
+          params: {
+            screen: closeScreen,
+            params: params,
+          },
+        },
+      });
+    } else {
+      navigate(closeScreen, params);
+    }
+  }, [closeScreen, closeStack, navigate, getState, params, pop]);
 
   const rightComponent = useMemo(
     () => (

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

@@ -23,19 +23,10 @@ const wrapComponent = (route) => (
 
 describe('Test SelectMonitorDevices', () => {
   const mockedNavigate = useNavigation().navigate;
+  const mockedGetState = useNavigation().getState;
 
   let tree;
-  const route = {
-    params: {
-      unitId: 1,
-      automateId: 1,
-      scriptName: 'scriptName test',
-      automate: {
-        sensor_id: 1,
-      },
-      closeScreen: Routes.ScriptDetail,
-    },
-  };
+  let route;
   const response = [
     {
       id: 1,
@@ -48,7 +39,21 @@ describe('Test SelectMonitorDevices', () => {
   ];
 
   beforeEach(() => {
+    route = {
+      params: {
+        unitId: 1,
+        automateId: 1,
+        scriptName: 'scriptName test',
+        automate: {
+          sensor_id: 1,
+        },
+        closeScreen: Routes.ScriptDetail,
+      },
+    };
     mockedNavigate.mockClear();
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }],
+    });
     useRoute.mockImplementation(() => route);
   });
 
@@ -116,4 +121,63 @@ describe('Test SelectMonitorDevices', () => {
       unitId: 1,
     });
   });
+
+  it('test onPressClose when routes has closeScreen', async () => {
+    mockedGetState.mockReturnValue({
+      index: 2,
+      routes: [{ name: 'Home' }, { name: Routes.ScriptDetail, params: {} }],
+    });
+    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const iconClose = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.ICON_CLOSE &&
+        el.type === TouchableOpacity
+    );
+    expect(iconClose).toHaveLength(1);
+
+    await act(async () => {
+      iconClose[0].props.onPress();
+    });
+    expect(global.mockedPop).toHaveBeenCalledWith(1);
+  });
+
+  it('test onPressClose when routes has closeStack', async () => {
+    route.params.closeStack = Routes.AutomateStack;
+    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const iconClose = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.ICON_CLOSE &&
+        el.type === TouchableOpacity
+    );
+    expect(iconClose).toHaveLength(1);
+
+    await act(async () => {
+      iconClose[0].props.onPress();
+    });
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main, {
+      screen: Routes.DrawerMain,
+      params: {
+        screen: Routes.AutomateStack,
+        params: {
+          screen: Routes.ScriptDetail,
+          params: {
+            automate: { sensor_id: 1 },
+            automateId: 1,
+            closeScreen: Routes.ScriptDetail,
+            closeStack: Routes.AutomateStack,
+            scriptName: 'scriptName test',
+            unitId: 1,
+          },
+        },
+      },
+    });
+  });
 });

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

@@ -2,7 +2,7 @@ import MockAdapter from 'axios-mock-adapter';
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 
-import { useRoute } from '@react-navigation/native';
+import { useNavigation, useRoute } from '@react-navigation/native';
 import { TouchableOpacity } from 'react-native';
 import API from '../../../../configs/API';
 import { AccessibilityLabel } from '../../../../configs/Constants';
@@ -41,9 +41,13 @@ describe('Test SelectMonitorDevices', () => {
       ],
     },
   ];
+  const mockedGetState = useNavigation().getState;
 
   beforeEach(() => {
     useRoute.mockImplementation(() => route);
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }],
+    });
   });
 
   it('test onPressClose', async () => {

package/src/screens/Automate/AddNewAutoSmart/AddTypeSmart.js

@@ -15,7 +15,7 @@ const AddTypeSmart = ({ smartTypes, route }) => {
   const t = useTranslations();
   const { setAction } = useContext(SCContext);
   const { navigate, goBack } = useNavigation();
-  const { automate = {}, closeScreen } = route?.params || {};
+  const { automate = {}, closeScreen, closeStack } = route?.params || {};
   const { id, unit, type } = automate;
 
   const [selectedIndex, setSelectedIndex] = useState(
@@ -37,6 +37,7 @@ const AddTypeSmart = ({ smartTypes, route }) => {
         },
         unitId: unit,
         closeScreen: closeScreen,
+        closeStack: closeStack,
       };
       setAction(Action.IS_CREATE_CONDITION, false);
       setAction(Action.IS_UPDATE_CONDITION, false);
@@ -47,7 +48,7 @@ const AddTypeSmart = ({ smartTypes, route }) => {
 
       navigate(dataAutomate.route, params);
     },
-    [smartTypes, automate, unit, closeScreen, setAction, navigate]
+    [smartTypes, automate, unit, closeScreen, closeStack, setAction, navigate]
   );
 
   const onSelectType = (index) => {

package/src/screens/Automate/EditActionsList/__tests__/index.test.js

@@ -30,6 +30,8 @@ jest.mock('react-native-parsed-text', () => () => []);
 describe('EditActionsList', () => {
   let tree;
   const mockedNavigate = useNavigation().navigate;
+  const mockedGetState = useNavigation().getState;
+
   let actionsList = [
     {
       id: 1,
@@ -80,6 +82,9 @@ describe('EditActionsList', () => {
       },
     });
     mockedNavigate.mockClear();
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }, { name: Routes.ScriptDetail, params: {} }],
+    });
   });
 
   it('EditActionsList reorder actions', async () => {
@@ -110,7 +115,21 @@ describe('EditActionsList', () => {
     await act(async () => {
       headerCustom[0].props.onGoBack();
     });
-    expect(global.mockedNavigate).toHaveBeenCalled();
+    expect(global.mockedReset).toHaveBeenCalledWith({
+      index: 1,
+      routes: [
+        { name: 'Home' },
+        {
+          name: Routes.ScriptDetail,
+          params: {
+            automate: {
+              id: 1,
+            },
+            newActionsList: actionsList,
+          },
+        },
+      ],
+    });
   });
 
   it('EditActionsList onPress remove action', async () => {

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

@@ -30,7 +30,7 @@ import UpdateSmsScript from './UpdateSmsScript';
 
 const EditActionsList = () => {
   const t = useTranslations();
-  const { navigate } = useNavigation();
+  const { navigate, getState, reset } = useNavigation();
   const { params = {} } = useRoute() || {};
   const { data, id, unitId } = params;
   const [itemRemove, setItemRemove] = useState({});
@@ -59,15 +59,24 @@ const EditActionsList = () => {
   );
 
   const onGoBack = useCallback(() => {
-    navigate({
-      name: Routes.ScriptDetail,
-      merge: true,
-      params: {
-        newActionsList: actionsList,
-        automate: { id: id },
-      },
+    const state = getState();
+    const index = state.routes.findIndex((r) => r.name === Routes.ScriptDetail);
+    const route = state.routes[index];
+    reset({
+      routes: [
+        ...state.routes.slice(0, index),
+        {
+          name: Routes.ScriptDetail,
+          params: {
+            ...route.params,
+            newActionsList: actionsList,
+            automate: { id: id },
+          },
+        },
+      ],
+      index,
     });
-  }, [actionsList, navigate, id]);
+  }, [actionsList, getState, id, reset]);
 
   const onPressRemove = (item) => {
     setIsVisible(true);

package/src/screens/Automate/MultiUnits.js

@@ -107,6 +107,7 @@ const MultiUnits = () => {
             unit: unitId,
           },
           closeScreen: currentRouteName,
+          closeStack: Routes.AutomateStack,
         },
       });
       return;
@@ -117,6 +118,7 @@ const MultiUnits = () => {
       params: {
         automate: { unit: unitId },
         closeScreen: currentRouteName,
+        closeStack: Routes.AutomateStack,
       },
     });
   }, [

package/src/screens/Automate/OneTap/__test__/AddNewOneTap.test.js

@@ -38,8 +38,13 @@ let tree;
 
 describe('test OneTap', () => {
   const mockedNavigate = useNavigation().navigate;
+  const mockedGetState = useNavigation().getState;
+
   beforeEach(() => {
     mockedNavigate.mockClear();
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }],
+    });
     mockAllowInAppReview.mockClear();
     mockAskReview.mockClear();
   });

package/src/screens/Automate/Scenario/__test__/AddNewOneTap.test.js

@@ -26,8 +26,13 @@ let tree;
 
 describe('test OneTap', () => {
   const mockedNavigate = useNavigation().navigate;
+  const mockedGetState = useNavigation().getState;
+
   beforeEach(() => {
     mockedNavigate.mockClear();
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }],
+    });
   });
 
   it('create OneTap success', async () => {

package/src/screens/Automate/ScriptDetail/Styles/indexStyles.js

@@ -216,6 +216,9 @@ export default StyleSheet.create({
     maxWidth: 210,
     marginRight: 5,
   },
+  disabledEdit: {
+    opacity: 0.5,
+  },
   card: {
     marginRight: 0,
     padding: 10,

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

@@ -290,11 +290,14 @@ describe('Test ScriptDetail', () => {
       menuActionMore.props.listMenuItem[0].doAction();
     });
 
-    expect(global.mockedNavigate).toBeCalledWith(Routes.SelectMonitorDevices, {
-      automate: route.params.preAutomate,
-      closeScreen: Routes.ScriptDetail,
-      routeName: null,
-    });
+    expect(global.mockedNavigate).toHaveBeenCalledWith(
+      Routes.SelectMonitorDevices,
+      {
+        automate: route.params.preAutomate,
+        closeScreen: Routes.ScriptDetail,
+        routeName: null,
+      }
+    );
   });
 
   it('test edit condition value change multi unit', async () => {
@@ -322,7 +325,7 @@ describe('Test ScriptDetail', () => {
       menuActionMore.props.listMenuItem[0].doAction();
     });
 
-    expect(global.mockedNavigate).toBeCalledWith(Routes.SelectUnit, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.SelectUnit, {
       automate: route.params.preAutomate,
       routeName: Routes.SelectMonitorDevices,
     });
@@ -354,7 +357,7 @@ describe('Test ScriptDetail', () => {
       menuActionMore.props.listMenuItem[0].doAction();
     });
 
-    expect(global.mockedNavigate).toBeCalledWith(
+    expect(global.mockedNavigate).toHaveBeenCalledWith(
       Routes.AddEditConditionSchedule,
       {
         automate: route.params.preAutomate,
@@ -467,7 +470,7 @@ describe('Test ScriptDetail', () => {
       await buttonEditScript.props.onPress();
     });
 
-    expect(global.mockedNavigate).toBeCalledWith(Routes.EditActionsList, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.EditActionsList, {
       data: data.script_items,
       id: 1,
       unitId: 2,
@@ -503,6 +506,7 @@ describe('Test ScriptDetail', () => {
       (el) =>
         el.props.accessibilityLabel === AccessibilityLabel.AUTOMATE_CONDITION
     );
+    expect(showPopup.props.disabled).toBeFalsy();
     await act(async () => {
       await showPopup.props.onPress();
     });
@@ -538,6 +542,31 @@ describe('Test ScriptDetail', () => {
     );
   });
 
+  it('test disable update need all condition', async () => {
+    route.params.preAutomate.can_edit = false;
+    await act(async () => {
+      tree = await create(
+        wrapComponent(route, {
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  max_conditions_per_automation: 1,
+                },
+              },
+            },
+          },
+        })
+      );
+    });
+    const instance = tree.root;
+    const showPopup = instance.find(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.AUTOMATE_CONDITION
+    );
+    expect(showPopup.props.disabled).toBeTruthy();
+  });
+
   it('test cannot edit condition because not owner', async () => {
     route.params.preAutomate.can_edit = false;
     const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
@@ -597,7 +626,7 @@ describe('Test ScriptDetail', () => {
       menuActionMore.props.listMenuItem[0].doAction();
     });
 
-    expect(spyToastError).toBeCalledWith(
+    expect(spyToastError).toHaveBeenCalledWith(
       getTranslate('en', 'this_script_has_been_disabled')
     );
   });
@@ -902,7 +931,7 @@ describe('Test ScriptDetail', () => {
             params: {
               unitId: route.params.preAutomate.unit,
               automateId: route.params.preAutomate.id,
-              closeScreen: 'UnitDetail',
+              closeScreen: undefined,
               numberActionCanAdd: 2,
               scriptItems: [],
               routeName: null,
@@ -1213,7 +1242,7 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       menuActionMore.props.listMenuItem[0].doAction();
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.DeviceDetail, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.DeviceDetail, {
       sensorId: 1,
       unitId: 1,
     });
@@ -1222,7 +1251,7 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       menuActionMore.props.listMenuItem[1].doAction();
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.UnitDetail, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitDetail, {
       unitId: 1,
     });
   });

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

@@ -672,7 +672,8 @@ const ScriptDetail = ({ route }) => {
           </Text>
           <Card style={styles.card}>
             <TouchableOpacity
-              style={styles.boxCondition}
+              style={[styles.boxCondition, !can_edit && styles.disabledEdit]}
+              disabled={!can_edit}
               onPress={onShowSelectCondition}
               accessibilityLabel={AccessibilityLabel.AUTOMATE_CONDITION}
             >
@@ -697,6 +698,7 @@ const ScriptDetail = ({ route }) => {
       </>
     );
   }, [
+    can_edit,
     max_conditions_per_automation,
     needAllCondition,
     numberConditionsUsed,
@@ -870,7 +872,6 @@ const ScriptDetail = ({ route }) => {
       />
       <AddActionScript
         automate={automate}
-        closeScreen={closeScreen}
         scriptItems={data}
         isVisible={isShowAddAction}
         setIsVisible={setIsShowAddAction}
@@ -879,7 +880,6 @@ const ScriptDetail = ({ route }) => {
       />
       <ModalAddCondition
         automate={automate}
-        closeScreen={closeScreen}
         numberActionAdded={data.length}
         isVisible={isShowAddCondition}
         setIsVisible={setIsShowAddCondition}

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

@@ -51,10 +51,14 @@ describe('Test AddEditConditionSchedule', () => {
   };
 
   const mockedNavigate = useNavigation().navigate;
+  const mockedGetState = useNavigation().getState;
 
   beforeEach(() => {
     mock.reset();
     mockedNavigate.mockClear();
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }],
+    });
     Date.now = jest.fn(() => new Date('2025-01-01T19:00:00.000Z'));
   });
 

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

@@ -35,9 +35,13 @@ describe('Test SetSchedule', () => {
   };
 
   const mockedNavigate = useNavigation().navigate;
+  const mockedGetState = useNavigation().getState;
 
   beforeEach(() => {
     mockedNavigate.mockClear();
+    mockedGetState.mockReturnValue({
+      routes: [{ name: 'Home' }],
+    });
     Date.now = jest.fn(() => new Date('2021-01-24T12:00:00.000Z'));
   });
 

package/src/screens/Automate/__test__/MultiUnits.test.js

@@ -107,7 +107,7 @@ describe('Test MultiUnits', () => {
     await act(async () => {
       ItemOneTaps[0].props.onPressItem();
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.UnitStack, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
       screen: Routes.ScriptDetail,
       params: {
         preAutomate: response[1],
@@ -117,11 +117,12 @@ describe('Test MultiUnits', () => {
     await act(async () => {
       ItemAddNews[0].props.onAddNew();
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.UnitStack, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
       screen: Routes.AddAutomationTypeSmart,
       params: {
         automate: { unit: undefined },
         closeScreen: undefined,
+        closeStack: Routes.AutomateStack,
       },
     });
   });
@@ -203,6 +204,7 @@ describe('Test MultiUnits', () => {
           unit: undefined,
         },
         closeScreen: undefined,
+        closeStack: Routes.AutomateStack,
       },
     });
   });
@@ -254,7 +256,7 @@ describe('Test MultiUnits', () => {
       itemAddNews[0].props.onAddNew();
     });
     expect(global.mockedNavigate).not.toBeCalled();
-    expect(spyToastError).toBeCalledWith(
+    expect(spyToastError).toHaveBeenCalledWith(
       getTranslate('en', 'reach_max_automations_per_unit', { length: 0 }),
       '',
       7000
@@ -291,7 +293,7 @@ describe('Test MultiUnits', () => {
       itemAddNews[0].props.onAddNew();
     });
     expect(global.mockedNavigate).not.toBeCalled();
-    expect(spyToastError).toBeCalledWith(
+    expect(spyToastError).toHaveBeenCalledWith(
       getTranslate('en', 'no_permission_smart_script_for_multi_unit'),
       '',
       7000

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

@@ -84,6 +84,7 @@ describe('Test Automate', () => {
       screen: Routes.AddUnknownTypeSmart,
       params: {
         closeScreen: undefined,
+        closeStack: Routes.AutomateStack,
         automate: { unit: undefined },
       },
     });

package/src/screens/Automate/index.js

@@ -110,6 +110,7 @@ const Automate = () => {
         params: {
           automate: { unit: id },
           closeScreen: currentRouteName,
+          closeStack: Routes.AutomateStack,
         },
       });
     },

package/src/screens/ConfirmUnitDeletion/__test__/ConfirmUnitDeletion.test.js

@@ -71,7 +71,7 @@ describe('Test ConfirmUnitDeletion', () => {
       touchableOpacity.props.onPress();
     });
     expect(spyToast).toHaveBeenLastCalledWith('Unit was deleted successfully.');
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('Onpress button ConfirmUnitDeletion response error', async () => {

package/src/screens/ConfirmUnitDeletion/index.js

@@ -34,7 +34,7 @@ const ConfirmUnitDeletion = ({ route }) => {
       if (success) {
         setAction(Action.DELETE_UNIT_SUCCESSFULLY);
         ToastBottomHelper.success(t('unit_deleted_successfully'));
-        navigation.navigate(Routes.Dashboard);
+        navigation.navigate(Routes.Main);
       }
     } else {
       setErrorText(t('please_enter_correct'));

package/src/screens/CreatePassword/__test__/index.test.js

@@ -104,8 +104,17 @@ describe('test CreatePassword', () => {
     expect(spyToastSuccess).toHaveBeenCalledWith(
       t('create_password_successfully')
     );
-    expect(navigate).toHaveBeenCalledWith(Routes.Dashboard, {
-      needLogout: true,
+    expect(navigate).toHaveBeenCalledWith(Routes.Main, {
+      screen: Routes.DrawerMain,
+      params: {
+        screen: Routes.DashboardStack,
+        params: {
+          screen: Routes.Dashboard,
+          params: {
+            needLogout: true,
+          },
+        },
+      },
     });
   });
 

package/src/screens/CreatePassword/index.js

@@ -76,7 +76,18 @@ const CreatePassword = ({ route }) => {
 
     if (success) {
       ToastBottomHelper.success(t('create_password_successfully'));
-      navigate(Routes.Dashboard, { needLogout: true });
+      navigate(Routes.Main, {
+        screen: Routes.DrawerMain,
+        params: {
+          screen: Routes.DashboardStack,
+          params: {
+            screen: Routes.Dashboard,
+            params: {
+              needLogout: true,
+            },
+          },
+        },
+      });
     }
   }, [newPassword, confirmPassword, navigate, t]);
 

package/src/screens/EnterPassword/index.js

@@ -39,7 +39,7 @@ const EnterPassword = ({ route }) => {
             }
           );
           if (success) {
-            navigate(Routes.Dashboard);
+            navigate(Routes.Main);
           }
         }
         break;

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

@@ -1,4 +1,4 @@
-import { useNavigation, useRoute } from '@react-navigation/native';
+import { useNavigation } from '@react-navigation/native';
 import moment from 'moment';
 import React, { memo, useCallback, useState } from 'react';
 import { Image, TouchableOpacity, View } from 'react-native';
@@ -21,7 +21,6 @@ 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);
@@ -439,7 +438,6 @@ const NotificationItem = memo(({ item }) => {
             navigation.navigate(Routes.UnitStack, {
               screen: Routes.ScriptDetail,
               params: {
-                closeScreen: currentScreen,
                 preAutomate: { id: automate_id },
               },
             });
@@ -452,7 +450,6 @@ const NotificationItem = memo(({ item }) => {
   }, [
     params,
     content_code,
-    currentScreen,
     customColorText,
     t,
     logo,

package/src/screens/Sharing/__test__/UnitMemberList.test.js

@@ -154,7 +154,7 @@ describe('test MemberList', () => {
     await act(async () => {
       await rightHeaderButton.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.Main);
     expect(spyToastSuccess).toHaveBeenCalledTimes(1);
   });
 

package/src/screens/Sharing/hooks/__test__/index.test.js

@@ -34,7 +34,7 @@ describe('Test useDataMember', () => {
     await act(async () => {
       result.current.leaveUnit(1);
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('render useDataMember loadMembers', async () => {
@@ -65,6 +65,6 @@ describe('Test useDataMember', () => {
     await act(async () => {
       result.current.removeMember(1, 'json');
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 });

package/src/screens/Sharing/hooks/index.js

@@ -67,7 +67,7 @@ const useDataMember = (unitId, userUnitId = undefined) => {
       await axiosDelete(API.SHARE.UNITS_MEMBER_DETAIL(unitId, 'me'));
       ToastBottomHelper.success(t('sharing_you_left', { name: unitName }));
       setDataMembers([]);
-      navigate(Routes.Dashboard);
+      navigate(Routes.Main);
     },
     [navigate, t, unitId]
   );

package/src/screens/SmartAccount/ListDevice/index.js

@@ -123,7 +123,7 @@ const ListDeviceSmartAccount = ({ route }) => {
   return (
     <View style={styles.wrap}>
       <WrapHeaderScrollable
-        onLeft={() => (device_data ? navigate(Routes.Dashboard) : goBack())}
+        onLeft={() => (device_data ? navigate(Routes.Main) : goBack())}
         title={t('devices')}
         headerAniStyle={styles.headerAniStyle}
       >

package/src/screens/SubUnit/AddSubUnit.js

@@ -85,7 +85,7 @@ const AddSubUnit = ({ route }) => {
               screen: Routes.UnitDetail,
               params: {
                 unitId: data?.id,
-                routeName: Routes.DashboardStack,
+                routeName: Routes.Main,
               },
             })
           );
@@ -123,7 +123,7 @@ const AddSubUnit = ({ route }) => {
             unitData: unit,
             stationId: data.id,
             isAddSubUnit: true,
-            routeName: Routes.DashboardStack,
+            routeName: Routes.Main,
           };
           if (isInsideUnit) {
             navigate(Routes.UnitDetail, commonPrams);

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -247,7 +247,7 @@ describe('Test AddSubUnit', () => {
     });
     expect(global.mockedNavigate).toHaveBeenCalledWith('UnitDetail', {
       isAddSubUnit: true,
-      routeName: 'DashboardStack',
+      routeName: 'Main',
       stationId: undefined,
       unitData: {
         id: 1,

package/src/screens/SyncLGDevice/AddLGDevice.js

@@ -47,7 +47,7 @@ const AddLGDevice = memo(({ route }) => {
     );
     if (!success || !data.access_token) {
       ToastBottomHelper.error(t('lg_sync_failed'));
-      navigate(Routes.Dashboard);
+      navigate(Routes.Main);
       return;
     }
 
@@ -63,12 +63,12 @@ const AddLGDevice = memo(({ route }) => {
     );
     if (!successSync) {
       ToastBottomHelper.error(t('lg_sync_failed'));
-      navigate(Routes.Dashboard);
+      navigate(Routes.Main);
       return;
     }
 
     ToastBottomHelper.success(t('lg_sync_success'));
-    navigate(Routes.Dashboard);
+    navigate(Routes.Main);
   }, [backend_url, code, navigate, stationId, t]);
 
   const stations =

package/src/screens/SyncLGDevice/__test__/AddLGDevice.test.js

@@ -188,7 +188,7 @@ describe('Test Add LG Device', () => {
       text1: getTranslate('en', 'lg_sync_success'),
       visibilityTime: 1000,
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('ViewButtonBottom onRightClick with case sync device fail', async () => {
@@ -240,7 +240,7 @@ describe('Test Add LG Device', () => {
       text1: getTranslate('en', 'lg_sync_failed'),
       visibilityTime: 1000,
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('ViewButtonBottom onRightClick with stationId but sync failed', async () => {
@@ -286,7 +286,7 @@ describe('Test Add LG Device', () => {
       text1: getTranslate('en', 'lg_sync_failed'),
       visibilityTime: 1000,
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('ViewButtonBottom onRightClick with stationId but get token failed, wrong data', async () => {
@@ -329,7 +329,7 @@ describe('Test Add LG Device', () => {
 
     expect(spyToastSuccess).not.toBeCalled();
     expect(spyToastError).toBeCalled();
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
 
     spyToastSuccess.mockReset();
     spyToastSuccess.mockRestore();
@@ -365,7 +365,7 @@ describe('Test Add LG Device', () => {
 
     expect(spyToastSuccess).not.toBeCalled();
     expect(spyToastError).toBeCalled();
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
 
     spyToastSuccess.mockReset();
     spyToastSuccess.mockRestore();

package/src/screens/Unit/Detail.js

@@ -205,9 +205,7 @@ const UnitDetail = ({ route }) => {
     [navigate]
   );
 
-  useBlockBack(
-    isSuccessfullyConnected ? RouterHardware(Routes.Dashboard) : goBack
-  );
+  useBlockBack(isSuccessfullyConnected ? RouterHardware(Routes.Main) : goBack);
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const { isFirstOpenCamera, appState } = useSCContextSelector(
     (state) => state.app

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

@@ -497,7 +497,7 @@ describe('Test UnitDetail', () => {
 
   it('test get automate onPress goBack', async () => {
     Platform.OS = 'ios';
-    route.params.routeName = Routes.Dashboard;
+    route.params.routeName = Routes.Main;
     jest.useFakeTimers();
 
     mock.onGet(getAutomates).reply(200, [{}]);
@@ -515,11 +515,11 @@ describe('Test UnitDetail', () => {
     await act(async () => {
       await touchableOpacities[0].props.onPress();
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('test onPress goBack with routeName', async () => {
-    useRoute.mockReturnValue({ params: { routeName: Routes.Dashboard } });
+    useRoute.mockReturnValue({ params: { routeName: Routes.Main } });
     await act(async () => {
       tree = await renderer.create(wrapComponent(route, account));
     });
@@ -528,6 +528,6 @@ describe('Test UnitDetail', () => {
     await act(async () => {
       await touchableOpacities[0].props.onPress();
     });
-    expect(global.mockedNavigate).toBeCalled();
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 });