@eohjsc/react-native-smart-city 0.3.94 → 0.3.96

package/package.json

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

package/src/commons/ActionGroup/OnOffTemplate/index.js

@@ -22,7 +22,7 @@ const getComponent = (template) => {
   }
 };
 
-const OnOffTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
+const OnOffTemplate = memo(({ actionGroup = {}, doAction, sensor = {} }) => {
   const { configuration = {} } = actionGroup;
   const {
     action_on_data,
@@ -41,6 +41,7 @@ const OnOffTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
 
   // eslint-disable-next-line no-unused-vars
   const [configValues, _] = useConfigGlobalState('configValues');
+  const { device_type, is_managed_by_backend } = sensor;
 
   const getIsOnValue = useCallback(() => {
     const configValue = configValues[config];
@@ -65,34 +66,36 @@ const OnOffTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
       return;
     }
     let data;
-    if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
-      data = null;
-    } else {
+    if (
+      allow_config_store_value &&
+      config &&
+      device_type !== DEVICE_TYPE.GOOGLE_HOME
+    ) {
       data = {
-        value: isOn ? 0 : 1,
-        state: isOn ? 0 : 1, // todo Bang remove this for Zigbee
+        config_id: config,
+        config_value: isOn ? 0 : 1,
       };
-      if (allow_config_store_value && config) {
-        data.config_id = config;
-        data.config_value = data.value;
-      }
     }
-    if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+
+    if (device_type === DEVICE_TYPE.LG_THINQ) {
       setTempIsOn((prev) => !prev);
     }
     await doAction(action_data, data);
     updateStatusFromPusher(); // todo Bang read about this magic
 
-    sensor?.is_managed_by_backend &&
+    if (
+      is_managed_by_backend &&
       config &&
-      sensor.device_type === DEVICE_TYPE.LG_THINQ &&
+      device_type === DEVICE_TYPE.LG_THINQ
+    ) {
       watchMultiConfigs([config]);
+    }
   }, [
     isOn,
     action_off_data,
     action_on_data,
-    sensor?.device_type,
-    sensor?.is_managed_by_backend,
+    device_type,
+    is_managed_by_backend,
     allow_config_store_value,
     config,
     doAction,
@@ -110,10 +113,10 @@ const OnOffTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
   }, [isOn]);
 
   useEffect(() => {
-    if (sensor?.device_type !== DEVICE_TYPE.LG_THINQ) {
+    if (device_type !== DEVICE_TYPE.LG_THINQ) {
       setTempIsOn(getIsOnValue());
     }
-  }, [getIsOnValue, sensor?.device_type]);
+  }, [getIsOnValue, device_type]);
 
   const Component = useMemo(() => {
     return getComponent(actionGroup.template);

package/src/commons/ActionGroup/__test__/OnOffButtonTemplate.test.js

@@ -122,7 +122,7 @@ describe('Test OneBigButtonTemplate', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, data2);
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, undefined);
   };
 
   it('action state on', async () => {

package/src/commons/ActionGroup/__test__/OnOffTemplate.test.js

@@ -163,10 +163,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, {
-      value: 0,
-      state: 0,
-    });
+    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, undefined);
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
@@ -183,10 +180,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_on_data, {
-      value: 1,
-      state: 1,
-    });
+    expect(mockDoAction).toHaveBeenCalledWith(action_on_data, undefined);
   });
 
   it('template OnOffSimpleActionTemplate doAction with is_on_value and is_managed_by_backend', async () => {
@@ -201,10 +195,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, {
-      value: 0,
-      state: 0,
-    });
+    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, undefined);
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
@@ -231,10 +222,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template[0].props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, {
-      state: 0,
-      value: 0,
-    });
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, undefined);
   });
 
   it('render with template OnOffSimpleActionTemplate with just action_data lg_thinq', async () => {
@@ -269,10 +257,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       jest.runAllTimers();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, {
-      value: 0,
-      state: 0,
-    });
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, undefined);
   });
 
   it('render with template OnOffSimpleActionTemplate with action_data zigbee trigger off', async () => {
@@ -303,10 +288,8 @@ describe('Test OnOffTemplate', () => {
       await template[0].props.triggerAction();
     });
     expect(mockDoAction).toHaveBeenCalledWith(action_off_data, {
-      state: 0,
       config_id: 5,
       config_value: 0,
-      value: 0,
     });
   });
 
@@ -338,10 +321,8 @@ describe('Test OnOffTemplate', () => {
       await template[0].props.triggerAction();
     });
     expect(mockDoAction).toHaveBeenCalledWith(action_on_data, {
-      state: 1, // todo Bang remove this after production
       config_id: 5,
       config_value: 1,
-      value: 1, // this is correct
     });
   });
 

package/src/commons/BottomButtonView/index.js

@@ -23,6 +23,7 @@ const BottomButtonView = memo(
     accessibilityLabelPrefix = '',
     disableBackgroundMainButton = false,
     disableBackgroundSecondButton = false,
+    disableKeyBoardAnimated = false,
   }) => {
     const transY = useKeyboardAnimated();
     const [keyboardAnim] = useState(new Animated.Value(0));
@@ -42,7 +43,8 @@ const BottomButtonView = memo(
           typeMain === 'CardShadow'
             ? styleCustom.container1
             : styleCustom.container,
-          { bottom: keyboardAnim },
+          // eslint-disable-next-line react-native/no-inline-styles
+          { bottom: disableKeyBoardAnimated ? 0.1 : keyboardAnim },
           rowButton && styleCustom.horizontalContainer,
           style,
         ]}

package/src/commons/ButtonPopup/index.js

@@ -61,6 +61,7 @@ const ButtonPopup = ({
             typeSecondary={typeSecondary}
             accessibilityLabelPrefix={AccessibilityLabel.PREFIX.BUTTON_POPUP}
             semiboldSecond={semiboldSecond}
+            disableKeyBoardAnimated
           />
           {thirdTitle && (
             <BottomButtonView

package/src/commons/SelectGateway/index.js

@@ -140,6 +140,7 @@ const SelectGateway = ({
               rightTitle={t('ok')}
               onRightClick={handleButtonModalOk}
               styleButton={styles.bottomButton}
+              wrapStyle={styles.wrapViewButton}
             />
           </View>
         </ModalCustom>

package/src/commons/SelectGateway/styles.js

@@ -73,4 +73,7 @@ export default StyleSheet.create({
   bottomButton: {
     paddingVertical: 11,
   },
+  wrapViewButton: {
+    position: 'relative',
+  },
 });

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

@@ -33,8 +33,8 @@ jest.mock('react', () => {
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const wrapComponent = (route) => (
-  <SCProvider initState={mockSCStore({})}>
+const wrapComponent = (route, storeData = {}) => (
+  <SCProvider initState={mockSCStore(storeData)}>
     <ActivityLog route={route} />
   </SCProvider>
 );
@@ -149,4 +149,62 @@ describe('Test Activity log', () => {
     expect(filterPopup[0].props.isVisible).toBeTruthy();
     expect(datePicker.props.isVisible).toBeFalsy();
   });
+
+  const setUpActionLogScreen = () => {
+    route = {
+      params: {
+        id: 1,
+        type: 'action',
+        filterEnabled: {},
+      },
+    };
+
+    mock.onGet(API.DEVICE.ACTIVITY_LOG(1)).reply(200, {
+      results: [
+        {
+          id: 1,
+          content_code: 'ACTIVATED_BY',
+          params: { username: 'name' },
+          created_at: '2021-07-01T15:48:24.917932Z',
+        },
+      ],
+      count: 1,
+    });
+    global.URLSearchParams = jest.fn(() => ({
+      append: jest.fn(),
+    }));
+  };
+
+  it('render action log has permission', async () => {
+    const storeData = {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              view_action_log: true,
+            },
+          },
+        },
+      },
+    };
+    setUpActionLogScreen();
+
+    await act(async () => {
+      tree = await create(wrapComponent(route, storeData));
+    });
+    const instance = tree.root;
+    const items = instance.findAllByType(ItemLog);
+    expect(items).toHaveLength(1);
+  });
+
+  it('render action log no permission', async () => {
+    setUpActionLogScreen();
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const items = instance.findAllByType(ItemLog);
+    expect(items).toHaveLength(0);
+  });
 });

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

@@ -7,6 +7,11 @@ import api from '../../../../utils/Apis/axios';
 import { getDataForList, getEmergencyEventDataForList } from '../../utils';
 
 const mock = new MockAdapter(api.axiosInstance);
+jest.mock('../../../../utils/Permission/backend', () => ({
+  useBackendPermission: jest.fn(() => ({
+    view_action_log: true,
+  })),
+}));
 
 describe('Test useActivityLog', () => {
   let props;

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

@@ -6,6 +6,8 @@ import API from '../../../configs/API';
 import t from '../../../hooks/Common/useTranslations';
 import { AUTOMATE_TYPE } from '../../../configs/Constants';
 import { getDataForList, getEmergencyEventDataForList } from '../utils';
+import { useBackendPermission } from '../../../utils/Permission/backend';
+import { ToastBottomHelper } from '../../../utils/Utils';
 
 const apiMaps = {
   ['action']: {
@@ -13,6 +15,7 @@ const apiMaps = {
     params: (id) => ({ id: id }),
     standardizeData: getDataForList,
     memberUrl: (id) => API.SHARE.UNITS_MEMBERS(id),
+    needPermission: 'view_action_log',
   },
   ['emergency_event']: {
     url: () => API.EMERGENCY_BUTTON.ACTIVITY_LOG(),
@@ -54,7 +57,15 @@ export default ({ id, type, share, filterEnabled }) => {
   });
   const api = apiMaps[type];
 
+  const permissions = useBackendPermission();
   const fetchData = async (filters) => {
+    if (api?.needPermission && !permissions?.[api?.needPermission]) {
+      setIsLoading(false);
+      setIsRefreshing(false);
+      ToastBottomHelper.error(t(`no_permission_${api?.needPermission}`));
+      return;
+    }
+
     const { page } = filters;
     setPage(page);
     if (page === 1) {

package/src/screens/AddLocationMaps/index.js

@@ -287,7 +287,7 @@ const AddLocationMaps = memo(() => {
         onPressMain={onDone}
         secondaryTitle={t('cancel')}
         onPressSecondary={goBack}
-        typeMain={input?.description ? 'primaryText' : 'disabled'}
+        typeMain={searchedLocation?.description ? 'primaryText' : 'disabled'}
         typeSecondary="primaryText"
         accessibilityLabelPrefix="LOCATION_"
         disableBackgroundMainButton

package/src/screens/AddNewGateway/ConnectingWifiDevice.js

@@ -12,7 +12,7 @@ let isCallingAPI = false;
 
 const ConnectingWifiDevice = ({ route }) => {
   const t = useTranslations();
-  const { unit, subUnit, gateway, selectedWifi, qrData, addDeviceType } =
+  const { unit, subUnit, gateway, selectedWifi, qrData, addDeviceType, code } =
     route?.params || {};
   const { goBack } = useNavigation();
 
@@ -40,7 +40,8 @@ const ConnectingWifiDevice = ({ route }) => {
           const { success, problem, data } = await axiosPost(
             API.UNIT.CHIP_SCAN(unit?.id),
             {
-              imei: gateway?.imei,
+              code,
+              host: qrData?.host,
               secret: qrData?.secret,
               name: gateway?.model,
               station: subUnit?.id,
@@ -61,9 +62,10 @@ const ConnectingWifiDevice = ({ route }) => {
     },
     [
       unit?.id,
-      gateway?.imei,
-      gateway?.model,
+      code,
+      qrData?.host,
       qrData?.secret,
+      gateway?.model,
       subUnit?.id,
       selectedWifi.ssid,
       selectedWifi.password,

package/src/screens/AddNewGateway/ConnectingWifiGuide.js

@@ -124,7 +124,6 @@ const ConnectingWifiGuide = ({ route }) => {
         socket = dgram.createSocket({ type: 'udp4' });
         socket.bind(54321);
       }
-
       socket.on('message', (msg, rinfo) => {
         const data = JSON.parse(msg.toString());
         if (Object.prototype.hasOwnProperty.call(data, 'wifi')) {

package/src/screens/AddNewGateway/ScanModbusQR.js

@@ -84,6 +84,7 @@ const ScanModbusQR = memo(({ route }) => {
             onLeftClick={handleCancel}
             rightTitle={t('ok')}
             onRightClick={setHidePopupGuide}
+            wrapStyle={styles.wrapViewButton}
           />
         </View>
       </ModalCustom>
@@ -119,6 +120,9 @@ const styles = StyleSheet.create({
   txtCenter: {
     textAlign: 'center',
   },
+  wrapViewButton: {
+    position: 'relative',
+  },
 });
 
 export default ScanModbusQR;

package/src/screens/AddNewGateway/ScanWifiDeviceQR.js

@@ -9,7 +9,6 @@ const ScanWifiDeviceQR = memo(({ route }) => {
   const { unit, subUnit } = route?.params || {};
   const [isInvalidQrCode, setIsInvalidQrCode] = useState(false);
   const { navigate, goBack } = useNavigation();
-
   const onScan = useCallback(
     (body, setLoading) => {
       let data;
@@ -20,11 +19,7 @@ const ScanWifiDeviceQR = memo(({ route }) => {
         setLoading(false);
         return;
       }
-      if (data?.prefix !== 'robot') {
-        setIsInvalidQrCode(true);
-        setLoading(false);
-        return;
-      }
+
       navigate(Routes.ConnectingWifiGuide, {
         unit,
         subUnit,

package/src/screens/AddNewGateway/ShareWifiPassword.js

@@ -1,4 +1,10 @@
-import React, { useCallback, useRef, useState, useEffect } from 'react';
+import React, {
+  useCallback,
+  useRef,
+  useState,
+  useEffect,
+  useMemo,
+} from 'react';
 import {
   Alert,
   TouchableOpacity,
@@ -9,6 +15,7 @@ import {
 import dgram from 'react-native-udp';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import LottieView from 'lottie-react-native';
+import uuid from 'uuid';
 
 import { ToastBottomHelper } from '../../utils/Utils';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -68,6 +75,10 @@ const ShareWifiPassword = ({ route }) => {
   const [isDisabled, setIsDisabled] = useState(false);
   const [dataGateway, setDataGateway] = useState({ gateway: [], error: '' });
 
+  const code = useMemo(() => {
+    return uuid.v4();
+  }, []);
+
   const hidePopupPassword = useCallback(() => {
     setIsShowPopupPassword(false);
   }, []);
@@ -80,7 +91,11 @@ const ShareWifiPassword = ({ route }) => {
         socket.send(
           JSON.stringify({
             type: 'connect',
-            data: { wifi: { ssid: selectedWifi, pass: selectedWifiPassword } },
+            data: {
+              token: code,
+              host: qrData?.host,
+              wifi: { ssid: selectedWifi, pass: selectedWifiPassword },
+            },
           }),
           undefined,
           undefined,
@@ -94,7 +109,7 @@ const ShareWifiPassword = ({ route }) => {
         }
       }, 1000);
     },
-    [selectedWifiPassword, selectedWifi]
+    [code, qrData?.host, selectedWifi, selectedWifiPassword]
   );
 
   const isWrongPassword = useRef(true);
@@ -197,6 +212,7 @@ const ShareWifiPassword = ({ route }) => {
                 password: selectedWifiPassword,
               },
               addDeviceType,
+              code,
             });
           }
         }, 800);
@@ -223,6 +239,7 @@ const ShareWifiPassword = ({ route }) => {
     t,
     wifiList,
     unit,
+    code,
   ]);
 
   return (

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

@@ -5,7 +5,6 @@ import ScanWifiDeviceQR from '../ScanWifiDeviceQR';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import QRScan from '../../ScanChipQR/components/QRScan';
-import { getTranslate } from '../../../utils/I18n';
 import Routes from '../../../utils/Route';
 
 const mockedGoBack = jest.fn();
@@ -54,15 +53,6 @@ describe('test scan wifi device QR', () => {
     });
   };
 
-  it('on scan wrong QR code', async () => {
-    await scanQRCode({ imei: 'SAMSUNG-xxx' });
-    const instance = tree.root;
-    const bottomSheet = instance.findByProps({
-      title: getTranslate('en', 'invalid_qr_code'),
-    });
-    expect(bottomSheet.props.isVisible).toBe(true);
-  });
-
   it('on scan correct QR code', async () => {
     await scanQRCode({ prefix: 'robot', org_slug: 'eoh' }, jest.fn());
     expect(mockedNavigate).toHaveBeenCalled();

package/src/screens/AllGateway/GatewayInfo/index.js

@@ -36,7 +36,7 @@ const GatewayInfo = () => {
     date_install = '',
     expired_at = '',
     firmware = {},
-    imei = '',
+    code = '',
     arduino_gateway = undefined,
     modbus_gateway = undefined,
     zigbee_gateway = undefined,
@@ -81,7 +81,7 @@ const GatewayInfo = () => {
       {
         id: 5,
         title: 'auth_token',
-        data: imei || '--',
+        data: code || '--',
       },
       {
         id: 7,
@@ -105,7 +105,7 @@ const GatewayInfo = () => {
       expired_at,
       firmware?.board,
       id,
-      imei,
+      code,
       wifi_ssid,
     ]
   );

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

@@ -172,7 +172,6 @@ const SetupConfigCondition = () => {
         style={styles.modal}
       >
         <View style={styles.modalContent}>
-          <Text type="H3">{t('select_condition')}</Text>
           {conditionOptions.map((option, index) => (
             <React.Fragment key={index}>
               <TouchableOpacity

package/src/screens/Automate/MultiUnits.js

@@ -81,6 +81,9 @@ const MultiUnits = () => {
         ToastBottomHelper.error(t('reach_max_automations_per_unit'));
         return;
       }
+    } else if (!permissions?.smart_script_for_multi_unit) {
+      ToastBottomHelper.error(t('no_permission_smart_script_for_multi_unit'));
+      return;
     }
     if (tabActive === AUTOMATE_TABS.SCENARIO) {
       navigate(Routes.UnitStack, {
@@ -105,6 +108,7 @@ const MultiUnits = () => {
     data.length,
     navigate,
     permissions?.max_automations_per_unit,
+    permissions?.smart_script_for_multi_unit,
     t,
     tabActive,
     unit?.id,

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

@@ -80,7 +80,19 @@ describe('Test MultiUnits', () => {
       },
     });
     await act(async () => {
-      tree = await create(wrapComponent());
+      tree = await create(
+        wrapComponent({
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  smart_script_for_multi_unit: true,
+                },
+              },
+            },
+          },
+        })
+      );
     });
     const instance = tree.root;
     const WrapHeaderScrollables = instance.findAllByType(WrapHeaderScrollable);
@@ -157,7 +169,19 @@ describe('Test MultiUnits', () => {
       },
     });
     await act(async () => {
-      tree = await create(wrapComponent());
+      tree = await create(
+        wrapComponent({
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  smart_script_for_multi_unit: true,
+                },
+              },
+            },
+          },
+        })
+      );
     });
     const instance = tree.root;
     const WrapHeaderScrollables = instance.findAllByType(WrapHeaderScrollable);
@@ -232,6 +256,42 @@ describe('Test MultiUnits', () => {
     );
   });
 
+  it('create new smart multi unit but missing permission', async () => {
+    mock.onGet(API.UNIT.AUTOMATE(1)).reply(200, []);
+    useRoute.mockReturnValue({
+      params: {
+        isMultiUnits: true,
+        unitName: null,
+        unit: null,
+      },
+    });
+    await act(async () => {
+      tree = await create(
+        wrapComponent({
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  smart_script_for_multi_unit: false,
+                },
+              },
+            },
+          },
+        })
+      );
+    });
+    const instance = tree.root;
+    const itemAddNews = instance.findAllByType(ItemAddNew);
+    const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
+    await act(async () => {
+      itemAddNews[0].props.onAddNew();
+    });
+    expect(mockedNavigate).not.toBeCalled();
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'no_permission_smart_script_for_multi_unit')
+    );
+  });
+
   it('Test is not multi unit', async () => {
     useRoute.mockReturnValue({
       params: {

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

@@ -81,7 +81,19 @@ describe('Test Automate', () => {
     mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, response.data);
 
     await act(async () => {
-      tree = await create(wrapComponent());
+      tree = await create(
+        wrapComponent({
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  smart_script_for_multi_unit: true,
+                },
+              },
+            },
+          },
+        })
+      );
     });
 
     const instance = tree.root;
@@ -245,4 +257,42 @@ describe('Test Automate', () => {
       unit: { id: 3, name: 'La Vida' },
     });
   });
+
+  it('onPress onAddNew multi unit script but missing permission', async () => {
+    mock.onGet(API.AUTOMATE.GET_SMART()).reply(200, [
+      {
+        type: 'MultiUnit',
+        unit_id: null,
+        automates: [],
+      },
+    ]);
+
+    await act(async () => {
+      tree = await create(
+        wrapComponent({
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  smart_script_for_multi_unit: false,
+                },
+              },
+            },
+          },
+        })
+      );
+    });
+
+    const instance = tree.root;
+
+    const itemAddNew = instance.findByType(ItemAddNew);
+    const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
+    await act(async () => {
+      itemAddNew.props.onAddNew(1, []);
+    });
+    expect(mockedNavigate).not.toBeCalled();
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'no_permission_smart_script_for_multi_unit')
+    );
+  });
 });

package/src/screens/Automate/index.js

@@ -88,6 +88,9 @@ const Automate = () => {
           ToastBottomHelper.error(t('reach_max_automations_per_unit'));
           return;
         }
+      } else if (!permissions?.smart_script_for_multi_unit) {
+        ToastBottomHelper.error(t('no_permission_smart_script_for_multi_unit'));
+        return;
       }
       navigate(Routes.UnitStack, {
         screen: Routes.AddUnknownTypeSmart,
@@ -97,7 +100,13 @@ const Automate = () => {
         },
       });
     },
-    [currentRouteName, navigate, permissions?.max_automations_per_unit, t]
+    [
+      currentRouteName,
+      navigate,
+      permissions?.max_automations_per_unit,
+      permissions?.smart_script_for_multi_unit,
+      t,
+    ]
   );
 
   const onPressArrowRight = useCallback(

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

@@ -19,6 +19,7 @@ const InvalidQRCode = ({ isInvalidQrCode, goBack, onRetry }) => {
         onLeftClick={goBack}
         rightTitle={t('retry')}
         onRightClick={onRetry}
+        wrapStyle={styles.wrapViewButton}
       />
     </BottomSheet>
   );
@@ -30,4 +31,7 @@ const styles = StyleSheet.create({
   warningContainer: {
     paddingHorizontal: 16,
   },
+  wrapViewButton: {
+    position: 'relative',
+  },
 });

package/src/screens/SubUnit/AddSubUnit.js

@@ -163,7 +163,7 @@ const AddSubUnit = ({ route }) => {
 
   const validateData = useMemo(() => {
     if (isAddUnit) {
-      return roomName === '' || wallpaper === '' || location.description === '';
+      return roomName === '' || wallpaper === '' || !location.description;
     } else {
       return roomName === '' || wallpaper === '';
     }

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

@@ -62,6 +62,9 @@ describe('Test AddSubUnit', () => {
         unit: {
           id: 1,
           name: 'Unit name',
+          location: {
+            description: 'location',
+          },
         },
       },
     };
@@ -187,7 +190,9 @@ describe('Test AddSubUnit', () => {
   it('test create Unit', async () => {
     route.params = {
       ...route.params,
-      location: 'Unit address',
+      location: {
+        description: 'Unit address',
+      },
       isAddUnit: true,
     };
     mock.onPost(API.UNIT.CREATE_UNIT()).reply(200, {
@@ -231,7 +236,9 @@ describe('Test AddSubUnit', () => {
   it('test create Unit Fail', async () => {
     route.params = {
       ...route.params,
-      location: 'Unit address',
+      location: {
+        description: 'Unit address',
+      },
       isAddUnit: true,
     };
     mock.onPost(API.UNIT.CREATE_UNIT()).reply(400);
@@ -270,7 +277,13 @@ describe('Test AddSubUnit', () => {
         isAddSubUnit: true,
         routeName: 'DashboardStack',
         stationId: undefined,
-        unitData: { id: 1, name: 'Unit name' },
+        unitData: {
+          id: 1,
+          name: 'Unit name',
+          location: {
+            description: 'location',
+          },
+        },
         unitId: 1,
       },
     });

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

@@ -1126,9 +1126,6 @@ export default {
     'To give you a good experience, you need to know the name and password of the wifi network and make sure the ' +
     'device is placed in a good location.',
   warning_beta_test_feature: 'This feature is in beta test, not official yet',
-  connecting_gateway_warning_1:
-    "By continuing, {appName} needs to connect to the device's wifi.",
-  connecting_gateway_warning_2: 'A message will appear asking you to connect.',
   remove_account: 'Remove Account',
   brightness: 'Brightness',
   tap_to_add_new_schedule: 'Tap + to add new schedule',
@@ -1401,9 +1398,18 @@ export default {
   reach_max_members_per_unit: 'You have reached the maximum number of members',
   reach_max_chips_per_unit: 'You have reached the maximum number of gateway',
   reach_max_configs_per_unit: 'You have reached the maximum number of tags',
-  no_permission_plug_and_play_modbus: "You don't have permission to add modbus",
-  no_permission_plug_and_play_zigbee: "You don't have permission to add zigbee",
-  no_permission_plug_and_play_wifi: "You don't have permission to add wifi",
+  no_permission_plug_and_play_modbus:
+    'Add modbus is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+  no_permission_plug_and_play_zigbee:
+    'Add zigbee is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+  no_permission_plug_and_play_wifi:
+    'Add wifi is currently not available on your Subscription. Please upgrade your plan for a better experience!',
   no_permission_plug_and_play_gateway:
-    "You don't have permission to add gateway",
+    'Add gateway is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+  no_permission_view_action_log:
+    // eslint-disable-next-line max-len
+    'View action log is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+  no_permission_smart_script_for_multi_unit:
+    // eslint-disable-next-line max-len
+    'Smart script for Multi Unit is currently not available on your Subscription. Please upgrade your plan for a better experience!',
 };

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

@@ -1404,8 +1404,17 @@ export default {
   reach_max_members_per_unit: 'Đã đạt đến số lượng tối đa thành viên',
   reach_max_chips_per_unit: 'Đã đạt đến số lượng tối đa chip',
   reach_max_configs_per_unit: 'Đã đạt đến số lượng tối đa thông số',
-  no_permission_plug_and_play_modbus: 'Không có quyền kết nối tự động modbus',
-  no_permission_plug_and_play_zigbee: 'Không có quyền kết nối tự động zigbee',
-  no_permission_plug_and_play_wifi: 'Không có quyền kết nối tự động wifi',
-  no_permission_plug_and_play_gateway: 'Không có quyền kết nối tự động gateway',
+  no_permission_plug_and_play_modbus:
+    'Kết nối tự động modbus hiện tại chưa hỗ trợ trên gói của bạn. Vui lòng nâng cấp gói để có trải nghiệm tốt hơn!',
+  no_permission_plug_and_play_zigbee:
+    'Kết nối tự động zigbee hiện tại chưa hỗ trợ trên gói của bạn. Vui lòng nâng cấp gói để có trải nghiệm tốt hơn!',
+  no_permission_plug_and_play_wifi:
+    'Kết nối tự động wifi hiện tại chưa hỗ trợ trên gói của bạn. Vui lòng nâng cấp gói để có trải nghiệm tốt hơn!',
+  no_permission_plug_and_play_gateway:
+    'Kết nối tự động gateway hiện tại chưa hỗ trợ trên gói của bạn. Vui lòng nâng cấp gói để có trải nghiệm tốt hơn!',
+  no_permission_view_action_log:
+    'Xem lịch sử hoạt động hiện tại chưa hỗ trợ trên gói của bạn. Vui lòng nâng cấp gói để có trải nghiệm tốt hơn!',
+  no_permission_smart_script_for_multi_unit:
+    // eslint-disable-next-line max-len
+    'Kịch bản thông minh cho nhiều địa điểm hiện tại chưa hỗ trợ trên gói của bạn. Vui lòng nâng cấp gói để có trải nghiệm tốt hơn!',
 };