@eohjsc/react-native-smart-city 0.3.29 → 0.3.30

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -88,6 +88,7 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
   return (
     <TouchableOpacity
       testID={TESTID.ITEM_QUICK_ACTION_PRESS}
+      accessibilityLabel={`${TESTID.ITEM_QUICK_ACTION_PRESS}-${sensor?.id}`}
       onPress={onActionPress}
     >
       <View style={wrapperStyle}>

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback, useState, useMemo, useEffect } from 'react';
+import React, { memo, useCallback, useState, useEffect } from 'react';
 import { View } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import styles from './SliderRangeTemplateStyles';
@@ -13,30 +13,38 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { configuration } = actionGroup;
   const [valueBrightness, setValueBrightness] = useState(0);
   const [valueBrightnessTemp, setValueBrightnessTemp] = useState(0);
+  const [isFirstTime, setIsFirstTime] = useState(true);
+
   const [configValues] = useConfigGlobalState('configValues');
 
   const onChangeBrightness = useCallback(
-    (value) => {
-      doAction(
+    async (value) => {
+      await doAction(
         configuration?.action_brightness_data,
         JSON.stringify({ value_brness: value })
       );
+      await setValueBrightness(value);
+      await setValueBrightnessTemp(value);
     },
     [configuration?.action_brightness_data, doAction]
   );
 
-  const percentBrightness = useMemo(() => {
-    return valueBrightnessTemp || valueBrightness || 0;
-  }, [valueBrightness, valueBrightnessTemp]);
-
   useEffect(() => {
     const { config } = configuration;
     const configValue = configValues[config];
-    let valueBrness = configValue?.value;
-    if (valueBrness >= 0 && valueBrightness >= 0) {
-      setValueBrightness(valueBrness);
+    if (configValue?.value >= 0 && isFirstTime) {
+      setValueBrightness(configValue?.value);
+      setIsFirstTime(false);
+    } else if (configValue?.value === valueBrightnessTemp) {
+      setValueBrightness(valueBrightnessTemp);
     }
-  }, [configuration.config, configValues, configuration, valueBrightness]);
+  }, [
+    configuration.config,
+    configValues,
+    configuration,
+    isFirstTime,
+    valueBrightnessTemp,
+  ]);
 
   return (
     <View style={styles.viewBrightness}>
@@ -49,9 +57,9 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
       <View style={styles.RightBrightness}>
         <View style={styles.slider}>
           <SliderRange
-            value={valueBrightnessTemp}
+            value={valueBrightness}
             onSlidingComplete={onChangeBrightness}
-            onValueChange={setValueBrightnessTemp}
+            onValueChange={setValueBrightness}
             step={1}
             minimumValue={0}
             maximumValue={100}
@@ -64,7 +72,7 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
         </View>
         <View style={styles.valuePercent}>
           <Text type="Label" style={styles.textValuePercent}>
-            {`${percentBrightness}%`}
+            {`${valueBrightness}%`}
           </Text>
         </View>
       </View>

package/src/commons/BottomButtonView/index.js

@@ -42,6 +42,7 @@ const BottomButtonView = memo(
             textType={textTypeMain}
             style={rowButton && styleCustom.buttonMainRow}
             testID={`${testIDPrefix}${TESTID.BOTTOM_VIEW_MAIN}`}
+            accessibilityLabel={TESTID.BOTTOM_VIEW_MAIN}
           />
         )}
         {secondaryTitle && (

package/src/commons/Button/index.js

@@ -133,6 +133,7 @@ export default ({
   textSemiBold = true,
   style,
   testID,
+  accessibilityLabel,
 }) => {
   const styleButton = ButtonStyle[type];
   const textColor = TextColor[type];
@@ -158,6 +159,7 @@ export default ({
       onPress={onPress}
       disabled={isDisabled}
       activeOpacity={activeOpacity}
+      accessibilityLabel={accessibilityLabel}
     >
       <View style={styles.wrap}>
         {icon}

package/src/commons/Device/ItemAddNew/index.js

@@ -9,7 +9,11 @@ import { TESTID } from '../../../configs/Constants';
 
 const ItemAddNew = memo(({ title, onAddNew, wrapStyle }) => {
   return (
-    <TouchableWithoutFeedback onPress={onAddNew}>
+    <TouchableWithoutFeedback
+      onPress={onAddNew}
+      testID={TESTID.TOUCH_ADD_NEW_FAVORITES}
+      accessibilityLabel={TESTID.TOUCH_ADD_NEW_FAVORITES}
+    >
       <View style={[styles.container, wrapStyle]}>
         <View style={styles.boxIcon}>
           <TouchableOpacity

package/src/commons/Device/ItemDevice.js

@@ -61,17 +61,18 @@ const ItemDevice = memo(
 
     const borderColor = (() => {
       if (!!sensor && sensor?.is_managed_by_backend) {
+        if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+          return Colors.Gray4;
+        }
         if (isConnectedViaBLE) {
           return Colors.Gray4;
         }
         if (isFetchingStatus || isConnectedViaInternet) {
           return Colors.Gray4;
         }
+        return Colors.Red6;
       }
       // not managed by backend
-      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
-        return Colors.Gray4;
-      }
       if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
         if (isGGHomeConnecting || isGGHomeConnected) {
           return Colors.Gray4;
@@ -82,6 +83,9 @@ const ItemDevice = memo(
 
     const textConnected = (() => {
       if (!!sensor && sensor?.is_managed_by_backend) {
+        if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+          return t('connected');
+        }
         if (isConnectedViaBLE) {
           return t('connected');
         }
@@ -91,11 +95,9 @@ const ItemDevice = memo(
         if (isConnectedViaInternet) {
           return t('connected');
         }
+        return t('disconnected');
       }
       // not managed by backend
-      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
-        return t('connected');
-      }
       if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
         if (isGGHomeConnecting) {
           return t('connecting');
@@ -109,6 +111,9 @@ const ItemDevice = memo(
 
     const canRenderQuickAction = (() => {
       if (!!sensor && sensor?.is_managed_by_backend) {
+        if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+          return true;
+        }
         if (isConnectedViaBLE) {
           return true;
         }
@@ -118,9 +123,6 @@ const ItemDevice = memo(
         return true;
       }
       // not managed by backend
-      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
-        return true;
-      }
       if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
         return !isGGHomeConnecting;
       }

package/src/commons/MenuActionMore/index.js

@@ -67,7 +67,7 @@ const MenuActionMore = memo(
                 key={index}
                 testID={TESTID.TOUCHABLE_ACTION_ADD_MORE}
                 accessibilityLabel={`${idLabelItem}-${
-                  item?.route ? item?.id : item?.station?.id
+                  (item?.route ? item?.id : item?.station?.id) || index
                 }`}
                 disabled={isDisable}
               >

package/src/commons/NavBar/index.js

@@ -18,6 +18,7 @@ const NavBar = memo(
     style,
     idLabelScrollView,
     idLabelItem,
+    idLabelIconBars,
   }) => {
     const { childRef, showingPopover, showPopoverWithRef, hidePopover } =
       usePopover();
@@ -39,7 +40,7 @@ const NavBar = memo(
             onPress={handleShowMenuAction}
             ref={refMenuAction}
             testID={TESTID.NAVBAR_ICON_BARS}
-            accessibilityLabel={TESTID.NAVBAR_ICON_BARS}
+            accessibilityLabel={idLabelIconBars}
           >
             <Icon name={'bars'} size={19} color={Colors.Black} />
           </TouchableOpacity>

package/src/commons/Popover/index.js

@@ -3,22 +3,23 @@ import Popover from 'react-native-popover-view';
 import { SCContext } from '../../context';
 import { Action } from '../../context/actionType';
 
-const PopoverComponent = (props) => {
+const PopoverComponent = ({ onRequestClose, ...restProps }) => {
   const { setAction } = useContext(SCContext);
 
-  const onCloseStart = () => {
+  const _onRequestClose = () => {
     setAction(Action.SET_POPOVER_ANIMATING, true);
+    onRequestClose && onRequestClose();
   };
 
-  const onCloseComplete = () => {
+  const _onCloseComplete = () => {
     setAction(Action.SET_POPOVER_ANIMATING, false);
   };
 
   return (
     <Popover
-      onCloseStart={onCloseStart}
-      onCloseComplete={onCloseComplete}
-      {...props}
+      onRequestClose={_onRequestClose}
+      onCloseComplete={_onCloseComplete}
+      {...restProps}
     />
   );
 };

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

@@ -103,7 +103,10 @@ const ItemOneTap = memo(
       ? timeDifference(new Date(), moment(activate_at), true)
       : null;
     return (
-      <TouchableWithoutFeedback onPress={onPressItem || goToDetail}>
+      <TouchableWithoutFeedback
+        onPress={onPressItem || goToDetail}
+        accessibilityLabel={`${TESTID.AUTOMATE_SCRIPT_NAME}-${id}`}
+      >
         <View style={[styles.container, wrapSyles]}>
           <View style={styles.boxIcon}>
             {displayIcon()}

package/src/configs/Constants.js

@@ -313,11 +313,13 @@ export const TESTID = {
   SUB_UNIT_GO_DETAIL: 'SUB_UNIT_GO_DETAIL',
   VIEW_SUB_UNIT_AUTOMATE: 'VIEW_SUB_UNIT_AUTOMATE',
   SUB_UNIT_NAME: 'SUB_UNIT_NAME',
+  SUB_UNIT_FAVORITES: 'SUB_UNIT_FAVORITES',
   ANIMATED_SCROLL: 'ANIMATED_SCROLL',
   ADD_SUB_UNIT: 'ADD_SUB_UNIT',
 
   // NavBar
   NAVBAR_ICON_BARS: 'NAVBAR_ICON_BARS',
+  NAVBAR_ICON_BARS_ADD_FAVORITES: 'NAVBAR_ICON_BARS_ADD_FAVORITES',
   NAVBAR_MENU_ACTION_MORE: 'NAVBAR_MENU_ACTION_MORE',
   NAVBAR_ON_SNAP_ITEM: 'NAVBAR_ON_SNAP_ITEM',
 
@@ -427,6 +429,7 @@ export const TESTID = {
 
   // Automate
   AUTOMATE_SCRIPT_ACTION: 'AUTOMATE_SCRIPT_ACTION',
+  AUTOMATE_SCRIPT_NAME: 'AUTOMATE_SCRIPT_NAME',
   NAME_YOUR_BUTTON: 'NAME_YOUR_BUTTON',
   BUTTON_ACTIVATE_ONE_TAP: 'BUTTON_ACTIVATE_ONE_TAP',
   BUTTON_EDIT_SCRIPT_ACTION: 'BUTTON_EDIT_SCRIPT_ACTION',
@@ -444,6 +447,7 @@ export const TESTID = {
 
   // Header Device
   HEADER_DEVICE_BUTTON_STAR: 'HEADER_DEVICE_BUTTON_STAR',
+  HEADER_SCRIPT_DETAIL_BUTTON_STAR: 'HEADER_SCRIPT_DETAIL_BUTTON_STAR',
   HEADER_DEVICE_BUTTON_MORE: 'HEADER_DEVICE_BUTTON_MORE',
 
   // EMERGENCY BUTTON
@@ -666,6 +670,13 @@ export const TESTID = {
   ADD_NEW_DEVICE_ADD: 'ADD_NEW_DEVICE_ADD',
   ADD_NEW_DEVICE_THEN_SELECT: 'ADD_NEW_DEVICE_THEN_SELECT',
 
+  // Add Favorites
+  TOUCH_ADD_NEW_FAVORITES: 'TOUCH_ADD_NEW_FAVORITES',
+  LIST_FAVORITES: 'LIST_FAVORITES',
+  TOUCHABLE_ACTION_ADD_ITEM_FAVORITE: 'TOUCHABLE_ACTION_ADD_ITEM_FAVORITE',
+  TOUCHABLE_ACTION_ADD_ITEM_AUTOMATE_FAVORITE:
+    'TOUCHABLE_ACTION_ADD_ITEM_AUTOMATE_FAVORITE',
+
   // Setup gateway wifi
   SETUP_GATEWAY_WIFI_TITLE: 'SETUP_GATEWAY_WIFI_TITLE',
   SETUP_GATEWAY_WIFI_PLEASE_SELECT_A_WIFI: 'SETUP_GATEWAY_PLEASE_SELECT_A_WIFI',

package/src/hooks/Common/useDevicesStatus.js

@@ -27,7 +27,7 @@ const useDevicesStatus = (unit, devices) => {
     if (success) {
       setAction(Action.SET_DEVICES_STATUS, data);
     }
-    timeoutId = setTimeout(() => getDevicesStatus(_unit, _devices), 5000);
+    timeoutId = setTimeout(() => getDevicesStatus(_unit, _devices), 10000);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 

package/src/hooks/IoT/useValueEvaluation.js

@@ -1,4 +1,4 @@
-import { useCallback, useContext, useEffect, useState } from 'react';
+import { useCallback, useContext, useEffect } from 'react';
 import { API } from '../../configs';
 import { SCContext, useSCContextSelector } from '../../context';
 import { Action } from '../../context/actionType';
@@ -6,14 +6,15 @@ import { axiosGet } from '../../utils/Apis/axios';
 
 const useValueEvaluations = (unitId) => {
   const { setAction } = useContext(SCContext);
-  const [fetching, setFetching] = useState(false);
+  const fetchedValueEvaluationUnits = useSCContextSelector((state) => {
+    return state.fetchedValueEvaluationUnits || [];
+  });
 
   const fetchConfigValueEvaluations = useCallback(
     async (page = 1) => {
-      if (!unitId) {
+      if (!unitId || fetchedValueEvaluationUnits.indexOf(unitId) !== -1) {
         return;
       }
-      setFetching(true);
       const params = new URLSearchParams();
       params.append('config__end_device__station__unit', unitId);
       params.append('page', page);
@@ -34,25 +35,15 @@ const useValueEvaluations = (unitId) => {
           data: [],
         });
       }
-      setFetching(false);
     },
-    [unitId, setAction]
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [unitId, fetchedValueEvaluationUnits]
   );
 
-  const fetchedValueEvaluationUnits = useSCContextSelector((state) => {
-    return state.fetchedValueEvaluationUnits || [];
-  });
-
   useEffect(() => {
-    if (!fetching && !(fetchedValueEvaluationUnits.indexOf(unitId) !== -1)) {
-      fetchConfigValueEvaluations();
-    }
-  }, [
-    unitId,
-    fetching,
-    fetchConfigValueEvaluations,
-    fetchedValueEvaluationUnits,
-  ]);
+    fetchConfigValueEvaluations();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [unitId]);
 };
 
 export default useValueEvaluations;

package/src/iot/RemoteControl/GoogleHome.js

@@ -127,12 +127,6 @@ export const googleHomeConnect = async (
   for (let i = 0; i < options.length; i++) {
     const option = options[i];
 
-    if (option.chip_id in oldConnections && !!oldConnections[option.chip_id]) {
-      connections[option.chip_id] = oldConnections[option.chip_id];
-      continue;
-    }
-    connections[option.chip_id] = 0; // connecting
-
     option.config_maps.forEach((configMap) => {
       if (option.text_maps) {
         textMaps[configMap.entity_id] = option.text_maps;
@@ -156,6 +150,12 @@ export const googleHomeConnect = async (
       }
     });
 
+    if (option.chip_id in oldConnections && !!oldConnections[option.chip_id]) {
+      connections[option.chip_id] = oldConnections[option.chip_id];
+      continue;
+    }
+    connections[option.chip_id] = 0; // connecting
+
     try {
       let auth = new Auth(option.auth);
       const connection = await createConnection({ auth });

package/src/navigations/UnitStack.js

@@ -68,7 +68,7 @@ export const UnitStack = memo((props) => {
   const t = useTranslations();
   const { setAction } = useContext(SCContext);
   const { route } = props;
-  const { unitId, unitData } = route.params.params;
+  const { unitId, unitData, isSuccessfullyConnected } = route.params.params;
 
   useEffect(() => {
     const unsubscribe = NetInfo.addEventListener((state) => {
@@ -129,15 +129,12 @@ export const UnitStack = memo((props) => {
   }, []);
 
   useEffect(() => {
-    return () => {
-      const id = unitId || unitData?.id;
-      if (!id) {
-        return;
-      }
+    const id = unitId || unitData?.id;
+    if (id && isSuccessfullyConnected) {
       setAction(Action.NEED_UPDATE_VALUE_EVALUATIONS, id);
-    };
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [isSuccessfullyConnected]);
 
   return (
     <Stack.Navigator

package/src/screens/AddNewAction/Device/index.js

@@ -3,6 +3,7 @@ import { TouchableWithoutFeedback, View } from 'react-native';
 import { Colors } from '../../../configs';
 import Text from '../../../commons/Text';
 import IconComponent from '../../../commons/IconComponent';
+import { TESTID } from '../../../configs/Constants';
 import styles from './DeviceStyles';
 
 const Device = memo(({ svgMain, sensor, title, isSelectDevice, onPress }) => {
@@ -13,7 +14,10 @@ const Device = memo(({ svgMain, sensor, title, isSelectDevice, onPress }) => {
   };
 
   return (
-    <TouchableWithoutFeedback onPress={onPressDevice}>
+    <TouchableWithoutFeedback
+      onPress={onPressDevice}
+      accessibilityLabel={`${TESTID.TOUCHABLE_ACTION_ADD_ITEM_FAVORITE}-${sensor.id}`}
+    >
       <View style={[styles.container, isActive]}>
         <View style={styles.boxIcon}>
           <IconComponent

package/src/screens/AddNewAction/SelectAction.js

@@ -10,7 +10,7 @@ import ActionTemplate from '../../commons/ActionTemplate';
 import NumberUpDownActionTemplate from '../../commons/OneTapTemplate/NumberUpDownActionTemplate';
 import OptionsDropdownActionTemplate from '../../commons/OneTapTemplate/OptionsDropdownActionTemplate';
 import StatesGridActionTemplate from '../../commons/OneTapTemplate/StatesGridActionTemplate';
-import { axiosGet, axiosPost } from '../../utils/Apis/axios';
+import { axiosGet, axiosPost, axiosPut } from '../../utils/Apis/axios';
 import { API, Images } from '../../configs';
 import {
   CONDITION_TYPES,
@@ -159,19 +159,35 @@ const SelectAction = memo(({ route }) => {
       await checkConditionToContinue();
     } else {
       if (automateId) {
-        let list_action = [...actions];
-        list_action = list_action.map((item) => ({
-          action: item.action,
-          data: item.data,
-        }));
-        const { success } = await axiosPost(
-          API.AUTOMATE.ADD_SCRIPT_ACTION(automateId),
-          {
-            list_action,
-            unit: unit.id,
-          }
-        );
-        success &&
+        let result = false;
+        if (isCreateNewAction) {
+          let list_action = [...actions];
+          list_action = list_action.map((item) => ({
+            action: item.action,
+            data: item.data,
+          }));
+          const { success } = await axiosPost(
+            API.AUTOMATE.ADD_SCRIPT_ACTION(automateId),
+            {
+              list_action,
+              unit: unit.id,
+            }
+          );
+          result = success;
+        } else {
+          const params = {
+            unit: isMultiUnits ? null : unit.id,
+            type: type,
+            name: scriptName,
+            action: actions[0].action,
+          };
+          const { success } = await axiosPut(
+            API.AUTOMATE.UPDATE_AUTOMATE(automateId),
+            params
+          );
+          result = success;
+        }
+        result &&
           navigate(Routes.ScriptDetail, {
             id: automateId,
             name: scriptName,

package/src/screens/AddNewAction/__test__/SelectAction.test.js

@@ -44,6 +44,7 @@ describe('Test SelectAction', () => {
       stationName: 'stationName',
       automateId: 1,
       scriptName: 'scriptName test',
+      isCreateNewAction: true,
     },
   };
 

package/src/screens/AddNewAutoSmart/index.js

@@ -78,9 +78,11 @@ const AddNewAutoSmart = memo(({ route }) => {
       },
     ],
   };
+
   const [data] = useState(
     automate?.id ? typeAutoSmart[AUTOMATE_TYPE.AUTOMATE] : typeAutoSmart[type]
   );
+
   const [selectedIndex, setSelectedIndex] = useState(
     automate?.id ? data.findIndex((obj) => obj.type === type) : -1
   );

package/src/screens/AddNewGateway/PlugAndPlay/GatewayWifiList.js

@@ -4,6 +4,7 @@ import React, {
   useCallback,
   useContext,
   useEffect,
+  useRef,
 } from 'react';
 import {
   View,
@@ -45,6 +46,7 @@ const GatewayWifiList = memo(({ route }) => {
   const [password, setPassword] = useState('');
   const [selectedWifi, setSelectedWifi] = useState('');
   const [isSendWifi, setIsSendWifi] = useState(false);
+  const isCheckSocketOnOneTime = useRef(true);
   const { setAction } = useContext(SCContext);
 
   const isConnectWifiGateway = useSCContextSelector(
@@ -106,18 +108,26 @@ const GatewayWifiList = memo(({ route }) => {
               }
             },
             () => {
-              ToastBottomHelper.error('Cannot get current SSID!');
+              ToastBottomHelper.error(t('can_not_login_to_current_ssid'));
             }
           );
         }, 3000);
       }
+      if (isCheckSocketOnOneTime.current && data.status === 'error') {
+        isCheckSocketOnOneTime.current = false;
+        setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
+        setIsShowPopupPassword(false);
+        ToastBottomHelper.error(t('confirm_password_not_match'));
+      }
     },
     [
       chip_id,
       devicePrefixName,
+      isCheckSocketOnOneTime,
       navigate,
       scan_sensor_data,
       setAction,
+      t,
       unit_id,
       unit_name,
       wifi_pass,
@@ -160,6 +170,7 @@ const GatewayWifiList = memo(({ route }) => {
         goBack();
       });
 
+      isCheckSocketOnOneTime.current = true;
       sendConnect(0);
       setAction(Action.IS_CONNECT_WIFI_GATEWAY, true);
       setIsSendWifi(true);
@@ -168,6 +179,7 @@ const GatewayWifiList = memo(({ route }) => {
     goBack,
     handleSocketOnMsg,
     isConnectWifiGateway,
+    isCheckSocketOnOneTime,
     sendConnect,
     setAction,
     socket,

package/src/screens/Device/components/SensorConnectStatusViewHeader.js

@@ -18,9 +18,7 @@ export const SensorConnectStatusViewHeader = ({
     if (!!sensor && sensor?.is_managed_by_backend) {
       return false;
     } else {
-      if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
-        return false;
-      } else if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+      if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
         return isGGHomeConnecting;
       } else {
         return false;
@@ -33,6 +31,14 @@ export const SensorConnectStatusViewHeader = ({
   }
 
   if (!!sensor && sensor?.is_managed_by_backend) {
+    if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+      return (
+        <>
+          <ConnectedViewHeader lastUpdated={lastUpdated} />
+          {children}
+        </>
+      );
+    }
     if (connectedViaNetwork) {
       return (
         <>
@@ -63,14 +69,7 @@ export const SensorConnectStatusViewHeader = ({
     }
   } else {
     // not managed by backend
-    if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
-      return (
-        <>
-          <ConnectedViewHeader lastUpdated={lastUpdated} />
-          {children}
-        </>
-      );
-    } else if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+    if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
       if (connectedViaGGHome) {
         return (
           <>

package/src/screens/Device/detail.js

@@ -4,6 +4,7 @@ import React, {
   useMemo,
   useState,
   useRef,
+  useContext,
 } from 'react';
 import { View, TouchableOpacity } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -34,6 +35,8 @@ import BottomButtonView from '../../commons/BottomButtonView';
 import Text from '../../commons/Text';
 import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
 import { DEVICE_TYPE, TESTID } from '../../configs/Constants';
+import { SCContext } from '../../context';
+import { Action } from '../../context/actionType';
 
 import { usePopover } from '../../hooks/Common';
 import { useConfigGlobalState } from '../../iot/states';
@@ -60,14 +63,17 @@ const DeviceDetail = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
   const token = useSCContextSelector((state) => state.auth.account.token);
+  const { setAction } = useContext(SCContext);
   const [offsetTitle, setOffsetTitle] = useState(1);
   const [display, setDisplay] = useState({ items: [] });
-  const [displayValues, setDisplayValues] = useState([]);
+  const [displayValuesData, setDisplayValuesData] = useState({
+    configs: [],
+    isConnected: false,
+    lastUpdated: null,
+  });
   const [controlOptions, setControlOptions] = useState({
     internet: {},
   });
-  const [isConnected, setConnected] = useState(false);
-  const [lastUpdated, setLastUpdated] = useState(null);
   const [lastEvent, setLastEvent] = useState({ id: 0, reportedAt: 0 });
   const [maxValue, setMaxValue] = useState(60);
   // eslint-disable-next-line no-unused-vars
@@ -447,7 +453,9 @@ const DeviceDetail = ({ route }) => {
 
       const data = item.configuration.configs.map((config) => {
         const configValue = configValues[config.id]?.value;
-        const displayValue = displayValues.find((k) => k.id === config.id);
+        const displayValue = (displayValuesData.configs || []).find(
+          (k) => k.id === config.id
+        );
         if (
           (configValue === null || configValue === undefined) &&
           !displayValue
@@ -466,7 +474,7 @@ const DeviceDetail = ({ route }) => {
       });
       return data.filter((value) => value);
     },
-    [configValues, displayValues, evaluateValue]
+    [configValues, displayValuesData, evaluateValue]
   );
 
   useEffect(() => {
@@ -501,17 +509,23 @@ const DeviceDetail = ({ route }) => {
         }
       );
       if (success) {
-        setDisplayValues(data.configs);
-        setConnected(data.is_connected);
-        data.last_updated = data.last_updated
+        data.isConnected = data.is_connected;
+        data.lastUpdated = data.last_updated
           ? moment(data.last_updated)
           : data.last_updated;
-
-        setLastUpdated(data.last_updated);
+        setDisplayValuesData((prevState) => {
+          if (prevState.isConnected !== data.isConnected) {
+            setAction(Action.SET_DEVICES_STATUS, [
+              { id: sensor?.id, is_connected: data.is_connected },
+            ]);
+          }
+          return data;
+        });
       } else if (resp_status >= 500) {
         setServerDown(true);
       }
-      setLoading((preState) => ({ ...preState, isConnected: false }));
+      loading.isConnected &&
+        setLoading((preState) => ({ ...preState, isConnected: false }));
     };
     if (
       sensor?.is_managed_by_backend &&
@@ -524,7 +538,8 @@ const DeviceDetail = ({ route }) => {
       Object.keys(sensor).length > 1 &&
         setLoading((preState) => ({ ...preState, isConnected: false }));
     }
-  }, [sensor, display]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [sensor, display, loading.isConnected]);
 
   const isShowEmergencyResolve =
     display.items.filter(
@@ -563,14 +578,17 @@ const DeviceDetail = ({ route }) => {
     return (
       <SensorConnectStatusViewHeader
         sensor={sensor}
-        connectedViaNetwork={isNetworkConnected && isConnected}
+        connectedViaNetwork={
+          isNetworkConnected && displayValuesData.isConnected
+        }
         connectedViaBle={
-          (!isNetworkConnected || (isNetworkConnected && !isConnected)) &&
+          (!isNetworkConnected ||
+            (isNetworkConnected && !displayValuesData.isConnected)) &&
           isDeviceConnectedViaBle
         }
         connectedViaGGHome={isGGHomeConnected}
         isGGHomeConnecting={isGGHomeConnecting}
-        lastUpdated={lastUpdated}
+        lastUpdated={displayValuesData.lastUpdated}
         isDisplayTime={isShowSetupEmergencyContact ? false : isDisplayTime}
         showWindDirection={showWindDirection}
         isGGHomeConnected={isGGHomeConnected}
@@ -676,6 +694,7 @@ const DeviceDetail = ({ route }) => {
           style={styles.buttonStar}
           onPress={isFavorite ? removeFromFavorites : addToFavorites}
           testID={TESTID.HEADER_DEVICE_BUTTON_STAR}
+          accessibilityLabel={TESTID.HEADER_DEVICE_BUTTON_STAR}
         >
           {isFavorite ? (
             <IconFill name="star" size={25} color={Colors.Yellow6} />
@@ -725,7 +744,7 @@ const DeviceDetail = ({ route }) => {
             renderSensorConnected()}
         </View>
         {isNetworkConnected &&
-          isConnected &&
+          displayValuesData?.isConnected &&
           isShowSetupEmergencyContact &&
           canManageSubUnit && (
             <BottomButtonView

package/src/screens/Device/hooks/useFavoriteDevice.js

@@ -17,14 +17,16 @@ export const useFavoriteDevice = (device) => {
       API.DEVICE.ADD_TO_FAVOURITES(device?.id)
     );
     success && setAction(Action.ADD_DEVICES_TO_FAVORITES, [device.id]);
-  }, [device, setAction]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [device]);
 
   const removeFromFavorites = useCallback(async () => {
     const { success } = await axiosPost(
       API.DEVICE.REMOVE_FROM_FAVOURITES(device?.id)
     );
     success && setAction(Action.REMOVE_DEVICES_FROM_FAVORITES, [device.id]);
-  }, [device, setAction]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [device]);
 
   return {
     isFavorite,

package/src/screens/EmergencyContacts/EmergencyContactsAddNew.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { SafeAreaView, StyleSheet, TextInput, View } from 'react-native';
+import { StyleSheet, TextInput, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { Section, ViewButtonBottom } from '../../commons';
@@ -53,7 +53,7 @@ export const EmergencyContactsAddNew = ({ route }) => {
   }, [goBack, group.id, t, textName, textPhone]);
 
   return (
-    <SafeAreaView style={styles.wrap}>
+    <View style={styles.wrap}>
       <WrapHeaderScrollable title={t('create_contact')}>
         <Section type={'border'}>
           <TextInput
@@ -87,7 +87,7 @@ export const EmergencyContactsAddNew = ({ route }) => {
           onRightClick={onSave}
         />
       </View>
-    </SafeAreaView>
+    </View>
   );
 };
 

package/src/screens/EmergencyContacts/EmergencyContactsSelectContacts.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { SafeAreaView, StyleSheet, View, Platform } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -70,9 +70,9 @@ export const EmergencyContactsSelectContacts = ({ route }) => {
     loadMembers(unitId);
   }, [loadMembers, unitId]);
   return (
-    <SafeAreaView style={styles.container}>
+    <View style={styles.container}>
       <WrapHeaderScrollable title={t('select_contacts')} loading={loading}>
-        <Section type={'border'} style={styles.section}>
+        <Section type={'border'}>
           {dataContact.map((contact, index) => (
             <RowUser
               key={contact.id.toString()}
@@ -108,7 +108,7 @@ export const EmergencyContactsSelectContacts = ({ route }) => {
         onRightClick={goSave}
         rightDisabled={false}
       />
-    </SafeAreaView>
+    </View>
   );
 };
 
@@ -117,9 +117,6 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.Gray2,
   },
-  section: {
-    marginTop: Platform.OS === 'ios' ? 40 : 0,
-  },
   buttonRemove: {
     height: 40,
     width: 40,

package/src/screens/Notification/__test__/NotificationItem.test.js

@@ -57,7 +57,6 @@ describe('test NotificationItem', () => {
     NOTIFICATION_TYPES.NOTIFY_MEMBER_LEAVE_UNIT,
     NOTIFICATION_TYPES.NOTIFY_REMOVE_SUB_UNIT,
     NOTIFICATION_TYPES.NOTIFY_REMOVE_DEVICE,
-    'default case',
   ];
 
   for (const content_code of listCase2) {
@@ -176,11 +175,8 @@ describe('test NotificationItem', () => {
       tree = create(wrapComponent(item));
     });
     const instance = tree.root;
-    const button = instance.findByType(TouchableOpacity);
-    act(() => {
-      button.props.onPress();
-    });
-    expect(mockNavigate).not.toHaveBeenCalled();
+    const button = instance.findAllByType(TouchableOpacity);
+    expect(button).toHaveLength(0);
   });
 
   const listSensorType2 = [
@@ -249,25 +245,8 @@ describe('test NotificationItem', () => {
       tree = create(wrapComponent(item));
     });
     const instance = tree.root;
-    const button = instance.findByType(TouchableOpacity);
-    act(() => {
-      button.props.onPress();
-    });
-    expect(mockNavigate).not.toHaveBeenCalledWith();
-  });
-
-  test('test render Notify params is object', () => {
-    item.content_code = 'NEW CASE';
-    item.params = { unit_id: 1 };
-    act(() => {
-      tree = create(wrapComponent(item));
-    });
-    const instance = tree.root;
-    const button = instance.findByType(TouchableOpacity);
-    act(() => {
-      button.props.onPress();
-    });
-    expect(mockNavigate).not.toHaveBeenCalledWith();
+    const button = instance.findAllByType(TouchableOpacity);
+    expect(button).toHaveLength(0);
   });
 
   test('test notify emergency ', () => {
@@ -332,10 +311,7 @@ describe('test NotificationItem', () => {
       tree = create(wrapComponent(item));
     });
     const instance = tree.root;
-    const button = instance.findByType(TouchableOpacity);
-    act(() => {
-      button.props.onPress();
-    });
-    expect(mockNavigate).not.toHaveBeenCalled();
+    const button = instance.findAllByType(TouchableOpacity);
+    expect(button).toHaveLength(0);
   });
 });

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

@@ -195,13 +195,7 @@ const NotificationItem = memo(({ item }) => {
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
           default:
-            return {
-              content: customColorText(
-                t('this_notification_will_be_updated_soon')
-              ),
-              redirect: () => null,
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
+            return null;
         }
 
       case NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT:
@@ -354,20 +348,10 @@ const NotificationItem = memo(({ item }) => {
               iconContent: <Image source={Images.logo} style={styles.logo} />,
             };
           default:
-            return {
-              content: customColorText(
-                t('this_notification_will_be_updated_soon')
-              ),
-              redirect: () => null,
-              iconContent: <Image source={Images.logo} style={styles.logo} />,
-            };
+            return null;
         }
       default:
-        return {
-          content: customColorText(t('this_notification_will_be_updated_soon')),
-          redirect: () => null,
-          iconContent: <Image source={Images.logo} style={styles.logo} />,
-        };
+        return null;
     }
   }, [content_code, customColorText, navigation, params, t]);
 

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

@@ -168,7 +168,7 @@ describe('Test ScriptDetail', () => {
     });
     const instance = tree.root;
     const buttonStar = instance.find(
-      (el) => el.props.testID === TESTID.HEADER_DEVICE_BUTTON_STAR
+      (el) => el.props.testID === TESTID.HEADER_SCRIPT_DETAIL_BUTTON_STAR
     );
     mock.onPost(API.AUTOMATE.STAR_SCRIPT(1)).reply(200);
     await act(async () => {

package/src/screens/ScriptDetail/index.js

@@ -321,7 +321,8 @@ const ScriptDetail = ({ route }) => {
       <PreventDoubleTouch
         style={[styles.buttonStar, styles.headerButton]}
         onPress={onPressStar}
-        testID={TESTID.HEADER_DEVICE_BUTTON_STAR}
+        testID={TESTID.HEADER_SCRIPT_DETAIL_BUTTON_STAR}
+        accessibilityLabel={TESTID.HEADER_SCRIPT_DETAIL_BUTTON_STAR}
       >
         {isStarred ? (
           <IconFill name="star" size={25} color={Colors.Yellow6} />

package/src/screens/Sharing/Components/SensorItem.js

@@ -27,7 +27,7 @@ const SensorItem = ({
     isChecked,
   } = item;
   const [dataConfig, setDataConfig] = useState([
-    ...actions,
+    ...actions.map((i) => ({ ...i, isControl: true })),
     ...read_configs.map((i) => ({ ...i, isConfig: true })),
   ]);
 
@@ -84,6 +84,9 @@ const SensorItem = ({
         titleStyle={styles.titleStyle}
         key={i.id}
         idGroup={idGroup}
+        isConfig={i.isConfig}
+        isControl={i.isControl}
+        wrapStyle={styles.wrapStyleTitle}
       />
     ));
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/screens/Sharing/Components/Styles/SensorItemStyles.js

@@ -49,6 +49,7 @@ export default StyleSheet.create({
   titleStyle: {
     fontSize: 16,
     fontWeight: 'normal',
+    width: 200,
   },
   wrapExpand: {
     marginTop: 10,
@@ -57,4 +58,7 @@ export default StyleSheet.create({
     width: normalize(20),
     height: normalize(20),
   },
+  wrapStyleTitle: {
+    justifyContent: 'space-between',
+  },
 });

package/src/screens/Sharing/Components/Styles/TitleCheckBoxStyles.js

@@ -14,4 +14,8 @@ export default StyleSheet.create({
     fontWeight: '600',
     fontStyle: 'normal',
   },
+  wrapRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
 });

package/src/screens/Sharing/Components/TitleCheckBox.js

@@ -1,6 +1,7 @@
 import React, { memo, useEffect, useState } from 'react';
 import { View, Text } from 'react-native';
 import { CheckBoxCustom } from '.';
+import t from '../../../hooks/Common/useTranslations';
 import styles from './Styles/TitleCheckBoxStyles';
 
 const TitleCheckBox = ({
@@ -12,6 +13,8 @@ const TitleCheckBox = ({
   wrapStyle,
   titleStyle,
   idGroup,
+  isConfig,
+  isControl,
 }) => {
   const [checked, setChecked] = useState(isChecked);
   const handleOnPress = () => {
@@ -26,14 +29,20 @@ const TitleCheckBox = ({
 
   return (
     <View style={[styles.wrap, wrapStyle]}>
-      <CheckBoxCustom
-        isChecked={checked}
-        onPress={handleOnPress}
-        wrapStyle={wrapCheckBoxStyle}
-      />
-      <Text onPress={handleOnPress} style={[styles.title, titleStyle]}>
-        {title}
-      </Text>
+      <View style={styles.wrapRow}>
+        <CheckBoxCustom
+          isChecked={checked}
+          onPress={handleOnPress}
+          wrapStyle={wrapCheckBoxStyle}
+        />
+        <Text onPress={handleOnPress} style={[styles.title, titleStyle]}>
+          {title}
+        </Text>
+      </View>
+      <View>
+        {isControl && <Text>{t('can_control')}</Text>}
+        {isConfig && <Text>{t('view_only')}</Text>}
+      </View>
     </View>
   );
 };

package/src/screens/Unit/Detail.js

@@ -108,10 +108,12 @@ const UnitDetail = ({ route }) => {
       rawUnitData.stations.unshift({
         isOneTap: true,
         name: t('smart'),
+        id: 'smart',
       });
       rawUnitData.stations.unshift({
         isFavorites: true,
         name: t('favorites'),
+        id: 'favorites',
       });
     },
     [t]
@@ -302,7 +304,8 @@ const UnitDetail = ({ route }) => {
         clearTimeout(to);
       }, 3000);
     }
-  }, [isFirstOpenCamera, isIOS, setAction]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isFirstOpenCamera, isIOS]);
 
   return (
     <WrapParallaxScrollView
@@ -331,6 +334,8 @@ const UnitDetail = ({ route }) => {
           onSnapToItem={onSnapToItem}
           indexStation={indexStation}
           idLabelScrollView={TESTID.NAV_LIST}
+          idLabelItem={TESTID.SUB_UNIT_NAME}
+          idLabelIconBars={TESTID.NAVBAR_ICON_BARS}
         />
         {renderDetailSubUnit()}
         {!!unit.can_add && unit.stations.length === 0 && (

package/src/screens/Unit/SelectAddToFavorites.js

@@ -21,6 +21,7 @@ import { SCContext } from '../../context';
 import { Action } from '../../context/actionType';
 import { axiosGet, axiosPost } from '../../utils/Apis/axios';
 import { API, Colors } from '../../configs';
+import { TESTID } from '../../configs/Constants';
 import styles from './SelectAddToFavoritesStyles';
 
 const SelectAddToFavorites = memo(({ route }) => {
@@ -136,7 +137,12 @@ const SelectAddToFavorites = memo(({ route }) => {
 
   const rightComponent = useMemo(
     () => (
-      <TouchableOpacity style={styles.buttonClose} onPress={goBack}>
+      <TouchableOpacity
+        testID={TESTID.ICON_BACK}
+        accessibilityLabel={TESTID.ICON_BACK}
+        style={styles.buttonClose}
+        onPress={goBack}
+      >
         <Icon name={'close'} size={24} color={Colors.Black} />
       </TouchableOpacity>
     ),
@@ -151,6 +157,8 @@ const SelectAddToFavorites = memo(({ route }) => {
         style={styles.wrap}
         contentContainerStyle={styles.contentContainerStyle}
         scrollIndicatorInsets={{ right: 1 }}
+        testID={TESTID.LIST_FAVORITES}
+        idLabelScrollView={TESTID.LIST_FAVORITES}
       >
         <Text bold type="H2" style={styles.title}>
           {t('select_device')}
@@ -162,6 +170,8 @@ const SelectAddToFavorites = memo(({ route }) => {
             listMenuItem={listMenuItem}
             onSnapToItem={onSnapToItem}
             indexStation={indexStation}
+            idLabelItem={TESTID.SUB_UNIT_FAVORITES}
+            idLabelIconBars={TESTID.NAVBAR_ICON_BARS_ADD_FAVORITES}
             style={styles.navbar}
           />
         )}

package/src/screens/Unit/components/AutomateScript/index.js

@@ -9,7 +9,7 @@ import ValueChange from '../../../../../assets/images/ValueChange.svg';
 import Schedule from '../../../../../assets/images/Schedule.svg';
 import Event from '../../../../../assets/images/Event.svg';
 import styles from './styles';
-import { AUTOMATE_TYPE } from '../../../../configs/Constants';
+import { AUTOMATE_TYPE, TESTID } from '../../../../configs/Constants';
 import { Colors } from '../../../../configs';
 
 const AutomateScript = ({ automate, onPress, isSelected }) => {
@@ -36,7 +36,10 @@ const AutomateScript = ({ automate, onPress, isSelected }) => {
   };
 
   return (
-    <TouchableWithoutFeedback onPress={_onPress}>
+    <TouchableWithoutFeedback
+      onPress={_onPress}
+      accessibilityLabel={`${TESTID.TOUCHABLE_ACTION_ADD_ITEM_AUTOMATE_FAVORITE}-${automate.id}`}
+    >
       <View style={[styles.container, isSelected && styles.active]}>
         <View style={styles.boxIcon}>{displayIcon()}</View>
         <View>

package/src/utils/I18n/translations/en.json

@@ -687,6 +687,7 @@
   "text_notification_content_update_address": "New address of **unit_name** has been updated by **unit_owner_name** to **unit_address**.",
   "text_notification_content_emergency": "The Emergency button has been activated at **unit_name**: **sub_unit_name**. Please check now!",
   "text_notification_content_emergency_resolve": "Emergency situation activated at **unit_name**: **sub_unit_name** has resolved.",
+  "text_notification_content_invite_member": "**unit_owner_name** invited you to join **unit_name**.",
   "this_spot_does_not_exsit": "This spot does not exist",
   "please_scan_again_or_contact_the_parking_manager": "Please scan again or contact the parking manager",
   "this_spot_does_not_support_to_scan": "This spot does not support to scan",
@@ -979,10 +980,14 @@
   "activated": "Activated",
   "text_unit_add_to_favorites_no_devices": "You don't have any devices or all your devices was added to your favorites",
   "not_found": "Not found",
+  "view_only": "View only",
+  "can_control": "Can control",
   "not_activated": "Not activated",
   "open": "Open",
   "close": "Close",
   "create_contact_success": "Create contact success!",
+  "can_not_login_to_current_ssid":"Can't login to current SSID",
+  "confirm_password_not_match": "Confirm password does not match",
   "templates": "Templates",
   "template": "Template",
   "gateways": "Gateways",

package/src/utils/I18n/translations/vi.json

@@ -702,6 +702,7 @@
   "text_notification_content_update_address": "Địa chỉ mới của **unit_name** vừa được cập nhật bởi **unit_owner_name** thành **unit_address**.",
   "text_notification_content_emergency": "Một tình huống khẩn cấp vừa được kích hoạt tại **unit_name**: **sub_unit_name**. Vui lòng kiểm tra ngay!",
   "text_notification_content_emergency_resolve": "Tình huống khẩn cấp được kích hoạt tại **unit_name**: **sub_unit_name** đã được giải quyết.",
+  "text_notification_content_invite_member": "**unit_owner_name** mời bạn đến địa điểm **unit_name**.",
   "this_spot_does_not_exsit": "Vị trí đỗ này không tồn tại",
   "please_scan_again_or_contact_the_parking_manager": "Vui lòng quét lại hoặc liên hệ với người quản lý bãi đậu xe",
   "this_spot_does_not_support_to_scan": "Vị trí đỗ này không hỗ trợ quét",
@@ -978,10 +979,14 @@
   "activated": "Được kích hoạt",
   "text_unit_add_to_favorites_no_devices": "Bạn không có thiết bị nào hoặc tất cả thiết bị của bạn đã được thêm vào yêu thích",
   "not_found": "Không tìm thấy",
+  "view_only": "Chỉ xem",
+  "can_control": "Có thể điều khiển",
   "not_activated": "Không kích hoạt",
   "open": "Mở",
   "close": "Đóng",
   "create_contact_success": "Tạo liên hệ thành công!",
+  "can_not_login_to_current_ssid":"Không thể đăng nhập vào SSID hiện tại",
+  "confirm_password_not_match": "Mật khẩu xác nhận không trùng khớp",
   "templates": "Mẫu",
   "template": "Mẫu",
   "gateways": "Cổng vào",