@eohjsc/react-native-smart-city 0.3.97 → 0.3.99

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.97",
+  "version": "0.3.99",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -178,7 +178,6 @@
     "react-native-input-credit-card": "^0.5.5",
     "react-native-iphone-x-helper": "^1.2.1",
     "react-native-linear-gradient": "^2.5.6",
-    "react-native-loading-dots": "^1.3.2",
     "react-native-localize": "^1.4.1",
     "react-native-maps": "0.27.1",
     "react-native-maps-directions": "^1.8.0",
@@ -200,7 +199,6 @@
     "react-native-svg": "^12.1.0",
     "react-native-toast-message": "^2.1.1",
     "react-native-udp": "^4.1.3",
-    "react-native-unimodules": "^0.11.0",
     "react-native-version-check": "^3.4.2",
     "react-native-vlc-media-player": "^1.0.41",
     "react-native-webview": "11.17.2",

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

@@ -67,11 +67,17 @@ const MyUnit = ({ refreshing }) => {
     if (isNeedUpdateCache) {
       setAction(Action.IS_CHECK_CLEAR_CACHE_UNITS, false);
       const { success, data } = await axiosGet(API.UNIT.MY_UNITS(), {}, true);
-      success && setMyUnits(data);
+      if (success) {
+        setMyUnits(data);
+        setAction(Action.SET_MY_UNITS, data);
+      }
     } else {
       await fetchWithCache(API.UNIT.MY_UNITS(), {}, (response) => {
         const { success, data } = response;
-        success && setMyUnits(data);
+        if (success) {
+          setMyUnits(data);
+          setAction(Action.SET_MY_UNITS, data);
+        }
       });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/commons/Device/WindSpeed/Anemometer/index.js

@@ -34,7 +34,7 @@ const Anemometer = memo(
     }, [item?.configuration?.max_value]);
 
     const value = data.length ? data[0].value : 0;
-    const measure = data.length ? data[0].measure : 'm/s';
+    const measure = data.length ? data[0].unit || data[0].measure : 'm/s';
 
     const radius = (size - strokeWidth) / 2;
     const viewBox = `0 0 ${width} ${width}`;
@@ -178,25 +178,24 @@ const Anemometer = memo(
         </View>
 
         <View style={styles.textValue}>
-          {!!value && (
-            <Svg width={width} height={width} {...viewBox}>
-              <Text
-                fill={Colors.Lime6}
-                fontSize={valueSize[0]}
-                fontWeight="bold"
-                x={width / 2}
-                y={width / 2 + valueSize[1]}
-                textAnchor="middle"
-                fontFamily={Fonts.Regular}
-                onPressIn={handleShowToolTip(true)}
-                onPressOut={handleShowToolTip(false)}
-              >
-                {value.toString().length > 10
-                  ? value.toString().substring(0, 10) + '...'
-                  : value}
-              </Text>
-            </Svg>
-          )}
+          <Svg width={width} height={width} {...viewBox}>
+            <Text
+              fill={Colors.Lime6}
+              fontSize={valueSize[0]}
+              fontWeight="bold"
+              x={width / 2}
+              y={width / 2 + valueSize[1]}
+              textAnchor="middle"
+              fontFamily={Fonts.Regular}
+              onPressIn={handleShowToolTip(true)}
+              onPressOut={handleShowToolTip(false)}
+              accessibilityLabel={AccessibilityLabel.GAUGE_VALUE}
+            >
+              {value.toString().length > 10
+                ? value.toString().substring(0, 10) + '...'
+                : value}
+            </Text>
+          </Svg>
           {isShowToolTip && (
             <View
               style={{

package/src/commons/Device/WindSpeed/__test__/Anemometer.test.js

@@ -19,14 +19,17 @@ describe('Test Anemometer', () => {
     const text = instance.findAllByType(Text);
     expect(text.length).toBe(5);
   });
+
   it('render Anemometer data null', async () => {
     let data = [];
     await act(async () => {
       wrapper = renderer.create(<Anemometer data={data} maxValue={1} />);
     });
     const instance = wrapper.root;
-    const text = instance.findAllByType(Text);
-    expect(text.length).toBe(4);
+    const textValue = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.GAUGE_VALUE,
+    });
+    expect(textValue.props.children).toEqual(0);
   });
 
   it('test render value font size length < 4', async () => {
@@ -114,4 +117,20 @@ describe('Test Anemometer', () => {
     });
     expect(view.props.style.transform[0].translateX).toEqual(-50);
   });
+
+  it('test render measure', async () => {
+    let data = [
+      {
+        value: 123456789,
+        unit: '%',
+      },
+    ];
+    await act(async () => {
+      wrapper = renderer.create(<Anemometer data={data} maxValue={1} />);
+    });
+    let instance = wrapper.root;
+    const text = instance.findAllByType(Text);
+    expect(text).toHaveLength(5);
+    expect(text[4].props.children).toEqual('%');
+  });
 });

package/src/commons/SubUnit/OneTap/__test__/SubUnitAutomate.test.js

@@ -282,10 +282,9 @@ describe('test Item', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate(
-        'en',
-        "You've reached the [0] limit. Remove one automation or upgrade your plan for a better experience."
-      )
+      getTranslate('en', 'reach_max_automations_per_unit'),
+      '',
+      7000
     );
   });
 

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

@@ -43,7 +43,9 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
         ToastBottomHelper.error(
           t('reach_max_automations_per_unit', {
             length: permissions.max_automations_per_unit,
-          })
+          }),
+          '',
+          7000
         );
         return;
       }

package/src/configs/AccessibilityLabel.js

@@ -409,6 +409,7 @@ export default {
   EMERGENCY_POPUP: 'EMERGENCY_POPUP',
   RESOLVED_EMERGENCY_POPUP: 'RESOLVED_EMERGENCY_POPUP',
   TOTAL_POWER_CONSUMPTION: 'TOTAL_POWER_CONSUMPTION',
+  GAUGE_VALUE: 'GAUGE_VALUE',
 
   // Shared unit
   ICON_REMOVE_PIN_SHARED_UNIT: 'ICON_REMOVE_PIN_SHARED_UNIT',

package/src/configs/Constants.js

@@ -233,6 +233,7 @@ export const NOTIFICATION_TYPES = {
   FILTER_WATER: 'FILTER_WATER',
   LOW_BATTERY: 'LOW_BATTERY',
   BROADCAST_NOTIFICATION: 'BROADCAST_NOTIFICATION',
+  SUBSCRIBE_SUCCESS: 'SUBSCRIBE_SUCCESS',
 };
 
 export const ACTIVITY_LOG_TYPES = {

package/src/context/actionType.ts

@@ -41,6 +41,7 @@ export const Action = {
   SET_IS_IN_EDIT_TEMPLATE_SCREEN: 'SET_IS_IN_EDIT_TEMPLATE_SCREEN',
   LOGOUT: 'LOGOUT',
   SET_APP_STATE_CHANGE: 'SET_APP_STATE_CHANGE',
+  SET_MY_UNITS: 'SET_MY_UNITS',
 };
 
 export type AuthData = {

package/src/context/mockStore.ts

@@ -25,6 +25,7 @@ export const mockDataStore: ContextData = {
     barStyle: '',
   },
   listAction: [],
+  myUnits: [],
   unit: {
     favoriteDeviceIds: [],
   },
@@ -95,6 +96,7 @@ export const mockSCStore = (data: ContextData): ContextData => {
       appState: 'active',
       ...data.app,
     },
+    myUnits: [...mockDataStore.myUnits, ...(data?.myUnits || [])],
     unit: {
       favoriteDeviceIds: [
         ...mockDataStore.unit.favoriteDeviceIds,
@@ -130,5 +132,6 @@ export const mockSCStore = (data: ContextData): ContextData => {
     bluetooth: {
       ...mockDataStore.bluetooth,
     },
+    percent: mockDataStore.percent,
   };
 };

package/src/context/reducer.ts

@@ -33,6 +33,7 @@ export type ContextData = {
   devMode: DevModeType;
   bluetooth: BluetoothType;
   percent: number;
+  myUnits: [];
 };
 
 export type Action = {
@@ -54,6 +55,7 @@ export const initialState = {
   listDevice: {} as ListDevice,
   listAction: [] as ListAction,
   percent: 0,
+  myUnits: [],
   unit: {
     favoriteDeviceIds: [],
   },
@@ -537,7 +539,11 @@ export const reducer = (currentState: ContextData, action: Action) => {
           appState: payload,
         },
       };
-
+    case Action.SET_MY_UNITS:
+      return {
+        ...currentState,
+        myUnits: payload,
+      };
     default:
       return currentState;
   }

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

@@ -62,7 +62,11 @@ export default ({ id, type, share, filterEnabled }) => {
     if (api?.needPermission && !permissions?.[api?.needPermission]) {
       setIsLoading(false);
       setIsRefreshing(false);
-      ToastBottomHelper.error(t(`no_permission_${api?.needPermission}`));
+      ToastBottomHelper.error(
+        t(`no_permission_${api?.needPermission}`),
+        '',
+        7000
+      );
       return;
     }
 

package/src/screens/AddCommon/SelectUnit.js

@@ -77,6 +77,7 @@ const AddCommonSelectUnit = ({ route }) => {
               password: route.params.password,
               brand: route.params.brand,
               unit_id: unit?.id,
+              unitName: unit?.name,
             },
           });
           break;

package/src/screens/AddNewGateway/ScanGatewayQR.js

@@ -22,11 +22,6 @@ const ScanGatewayQR = memo(({ route }) => {
         setLoading(false);
         return;
       }
-      if (data?.prefix !== 'lite') {
-        setIsInvalidQrCode(true);
-        setLoading(false);
-        return;
-      }
       navigate(Routes.ConnectingWifiGuide, {
         unit,
         stationId,

package/src/screens/AddNewGateway/SelectDeviceType.js

@@ -150,7 +150,7 @@ const SelectDeviceType = ({ route }) => {
   const handleOnSelect = (itemSelect) => {
     const needPermission = getPermissionCode(itemSelect);
     if (!permissions?.[needPermission]) {
-      ToastBottomHelper.error(t(`no_permission_${needPermission}`));
+      ToastBottomHelper.error(t(`no_permission_${needPermission}`), '', 7000);
       return false;
     }
 
@@ -159,7 +159,9 @@ const SelectDeviceType = ({ route }) => {
         ToastBottomHelper.error(
           t('reach_max_chips_per_unit', {
             length: permissions?.max_chips_per_unit,
-          })
+          }),
+          '',
+          7000
         );
         return false;
       }
@@ -172,7 +174,9 @@ const SelectDeviceType = ({ route }) => {
         ToastBottomHelper.error(
           t('reach_max_configs_per_unit', {
             length: permissions?.max_configs_per_unit,
-          })
+          }),
+          '',
+          7000
         );
         return false;
       }

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

@@ -62,7 +62,6 @@ describe('test scan gateway device QR', () => {
     const bottomSheet = instance.findByProps({
       title: getTranslate('en', 'invalid_qr_code'),
     });
-    expect(bottomSheet.props.isVisible).toBe(true);
 
     const buttonBottom = instance.findByType(ViewButtonBottom);
     await act(async () => {

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

@@ -14,6 +14,7 @@ import api from '../../../utils/Apis/axios';
 import API from '../../../configs/API';
 import { ToastBottomHelper } from '../../../utils/Utils';
 import { getTranslate } from '../../../utils/I18n';
+
 const wrapComponent = (route, storeData = {}) => (
   <SCProvider initState={mockSCStore(storeData)}>
     <SelectDeviceType route={route} />
@@ -147,10 +148,9 @@ describe('Test select device type', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate(
-        'en',
-        "You've reached the [1] limit. Remove one config or upgrade your plan for a better experience."
-      )
+      getTranslate('en', 'reach_max_configs_per_unit'),
+      '',
+      7000
     );
   });
 
@@ -189,10 +189,9 @@ describe('Test select device type', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate(
-        'en',
-        "You've reached the [1] limit. Remove one chip or upgrade your plan for a better experience."
-      )
+      getTranslate('en', 'reach_max_chips_per_unit'),
+      '',
+      7000
     );
   });
 
@@ -209,7 +208,9 @@ describe('Test select device type', () => {
       },
     });
     expect(spyToastError).toBeCalledWith(
-      getTranslate('en', 'no_permission_plug_and_play_gateway')
+      getTranslate('en', 'no_permission_plug_and_play_gateway'),
+      '',
+      7000
     );
   });
 
@@ -226,7 +227,9 @@ describe('Test select device type', () => {
       },
     });
     expect(spyToastError).toBeCalledWith(
-      getTranslate('en', 'no_permission_plug_and_play_zigbee')
+      getTranslate('en', 'no_permission_plug_and_play_zigbee'),
+      '',
+      7000
     );
   });
 
@@ -243,7 +246,9 @@ describe('Test select device type', () => {
       },
     });
     expect(spyToastError).toBeCalledWith(
-      getTranslate('en', 'no_permission_plug_and_play_wifi')
+      getTranslate('en', 'no_permission_plug_and_play_wifi'),
+      '',
+      7000
     );
   });
 
@@ -260,7 +265,9 @@ describe('Test select device type', () => {
       },
     });
     expect(spyToastError).toBeCalledWith(
-      getTranslate('en', 'no_permission_plug_and_play_modbus')
+      getTranslate('en', 'no_permission_plug_and_play_modbus'),
+      '',
+      7000
     );
   });
 

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

@@ -68,25 +68,16 @@ const SetupConfigCondition = () => {
   };
 
   const onSave = useCallback(() => {
-    const conditionValue = parseFloat(itemActiveModal?.value);
-    if (isNaN(conditionValue)) {
+    const conditionValue = itemActiveModal?.value;
+
+    if (isNaN(parseFloat(conditionValue)) || !isFinite(conditionValue)) {
       ToastBottomHelper.error(t('value_must_be_a_number'));
       return;
     }
 
-    if (['<', '>', '='].includes(itemActiveModal?.condition)) {
-      if (item.range_min !== null && conditionValue < item.range_min) {
-        ToastBottomHelper.error(
-          t('value_must_be_greater_than_min', { min: item.range_min })
-        );
-        return;
-      }
-      if (item.range_max !== null && conditionValue > item.range_max) {
-        ToastBottomHelper.error(
-          t('value_must_be_less_than_max', { max: item.range_max })
-        );
-        return;
-      }
+    if (Math.abs(conditionValue)?.toString()?.length > 6) {
+      ToastBottomHelper.error(t('value_must_be_6_digits_or_less'));
+      return;
     }
 
     navigate({
@@ -99,7 +90,7 @@ const SetupConfigCondition = () => {
         },
       },
     });
-  }, [item.id, item.range_max, item.range_min, itemActiveModal, navigate, t]);
+  }, [item.id, itemActiveModal, navigate, t]);
 
   useEffect(() => {
     !hasNoValueEvaluation && setValue(1);

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

@@ -80,13 +80,11 @@ describe('Test SetupConfigCondition', () => {
     expect(mockGoBack).toBeCalled();
   });
 
-  const testWithRange = async (rangeMin, rangeMax, value, message) => {
+  const testConditionValue = async (value, message) => {
     useRoute.mockReturnValue({
       params: {
         item: {
           id: 1,
-          range_min: rangeMin,
-          range_max: rangeMax,
           decimal_behind: 0,
           title: 'is below (<)',
           sensor_type: 'air_quality',
@@ -116,22 +114,10 @@ describe('Test SetupConfigCondition', () => {
     }
   };
 
-  it('Test render when have maximum', async () => {
-    await testWithRange(0, 10, '128', 'Value must be less than 10');
-  });
-
-  it('Test render when have no maximum', async () => {
-    await testWithRange(0, null, '128', null);
-  });
-  it('Test render when have minium', async () => {
-    await testWithRange(4, 10, '1', 'Value must be greater than 4');
-  });
-
-  it('Test render when have no minium', async () => {
-    await testWithRange(null, 10, '1', null);
-  });
-
   it('Test render when have input not number', async () => {
-    await testWithRange(null, 10, 'abc', 'Value must be a number');
+    await testConditionValue('abc', 'Value must be a number');
+  });
+  it('Test render when have input value must be 6 digits or less', async () => {
+    await testConditionValue('1234567', 'Value must be 6 digits or less');
   });
 });

package/src/screens/Automate/MultiUnits.js

@@ -81,12 +81,18 @@ const MultiUnits = () => {
         ToastBottomHelper.error(
           t('reach_max_automations_per_unit', {
             length: permissions.max_automations_per_unit,
-          })
+          }),
+          '',
+          7000
         );
         return;
       }
     } else if (!permissions?.smart_script_for_multi_unit) {
-      ToastBottomHelper.error(t('no_permission_smart_script_for_multi_unit'));
+      ToastBottomHelper.error(
+        t('no_permission_smart_script_for_multi_unit'),
+        '',
+        7000
+      );
       return;
     }
     if (tabActive === AUTOMATE_TABS.SCENARIO) {

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

@@ -271,10 +271,9 @@ describe('Test ScriptDetail', () => {
     });
     expect(mockNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate(
-        'en',
-        "You've reached the [0] limit. Remove one action or upgrade your plan for a better experience."
-      )
+      getTranslate('en', 'reach_max_actions_per_automation'),
+      '',
+      7000
     );
   });
 

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

@@ -305,7 +305,9 @@ const ItemAdd = ({ automate, index }) => {
       ToastBottomHelper.error(
         t('reach_max_actions_per_automation', {
           length: permissions?.max_actions_per_automation,
-        })
+        }),
+        '',
+        7000
       );
       return;
     }

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

@@ -252,10 +252,9 @@ describe('Test MultiUnits', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate(
-        'en',
-        "You've reached the [0] limit. Remove one automation or upgrade your plan for a better experience."
-      )
+      getTranslate('en', 'reach_max_automations_per_unit'),
+      '',
+      7000
     );
   });
 
@@ -291,7 +290,9 @@ describe('Test MultiUnits', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate('en', 'no_permission_smart_script_for_multi_unit')
+      getTranslate('en', 'no_permission_smart_script_for_multi_unit'),
+      '',
+      7000
     );
   });
 

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

@@ -148,10 +148,9 @@ describe('Test Automate', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate(
-        'en',
-        "You've reached the [0] limit. Remove one automation or upgrade your plan for a better experience."
-      )
+      getTranslate('en', 'reach_max_automations_per_unit'),
+      '',
+      7000
     );
   });
 
@@ -295,7 +294,9 @@ describe('Test Automate', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate('en', 'no_permission_smart_script_for_multi_unit')
+      getTranslate('en', 'no_permission_smart_script_for_multi_unit'),
+      '',
+      7000
     );
   });
 });

package/src/screens/Automate/index.js

@@ -88,12 +88,18 @@ const Automate = () => {
           ToastBottomHelper.error(
             t('reach_max_automations_per_unit', {
               length: permissions.max_automations_per_unit,
-            })
+            }),
+            '',
+            7000
           );
           return;
         }
       } else if (!permissions?.smart_script_for_multi_unit) {
-        ToastBottomHelper.error(t('no_permission_smart_script_for_multi_unit'));
+        ToastBottomHelper.error(
+          t('no_permission_smart_script_for_multi_unit'),
+          '',
+          7000
+        );
         return;
       }
       navigate(Routes.UnitStack, {

package/src/screens/Device/detail.js

@@ -501,13 +501,14 @@ const DeviceDetail = ({ route }) => {
       const configIds = [];
 
       display.items.map((item) => {
+        const type = item?.template || item?.type;
         if (!item.configuration) {
           return;
         }
-        if (!['action', 'value'].includes(item.type)) {
+        if (!['action', 'value'].includes(type)) {
           return;
         }
-        if (item.type === 'action') {
+        if (type === 'action') {
           if (
             [
               'on_off_button_action_template',
@@ -518,7 +519,7 @@ const DeviceDetail = ({ route }) => {
               configIds.push(item.configuration.configuration.config);
           }
         }
-        if (item.type === 'value') {
+        if (type === 'value') {
           item.configuration.configs.map((config) => {
             if (!configIds.includes(config.id)) {
               configIds.push(config.id);

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

@@ -1,7 +1,8 @@
 export const getConfigControlFromDeviceDisplay = (deviceDisplay) => {
   const configIds = [];
   (deviceDisplay?.items || []).map((item) => {
-    if (item.type !== 'action') {
+    const type = item?.template || item?.type;
+    if (type !== 'action') {
       return;
     }
     const actionGroup = item?.configuration || {};

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

@@ -55,6 +55,7 @@ describe('test NotificationItem', () => {
     NOTIFICATION_TYPES.NOTIFY_REMOVE_SUB_UNIT,
     NOTIFICATION_TYPES.NOTIFY_REMOVE_DEVICE,
     NOTIFICATION_TYPES.NOTIFY_CHANGE_UNIT_OLD_OWNER,
+    NOTIFICATION_TYPES.SUBSCRIBE_SUCCESS,
   ];
 
   for (const content_code of listCase2) {

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

@@ -408,6 +408,14 @@ const NotificationItem = memo(({ item }) => {
           redirect: () => null,
           iconContent: <Image source={Images.logo} style={styles.logo} />,
         };
+      case NOTIFICATION_TYPES.SUBSCRIBE_SUCCESS:
+        return {
+          content: customColorText(
+            t('text_notification_content_subscribe_success')
+          ),
+          redirect: () => null,
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
       default:
         return null;
     }

package/src/screens/Sharing/MemberList.js

@@ -41,7 +41,9 @@ const MemberList = ({ route }) => {
       ToastBottomHelper.error(
         t('reach_max_members_per_unit', {
           length: permissions?.max_members_per_unit,
-        })
+        }),
+        '',
+        7000
       );
       return;
     }

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

@@ -101,10 +101,9 @@ describe('test MemberList', () => {
     });
     expect(mockedNavigate).not.toBeCalled();
     expect(spyToastError).toBeCalledWith(
-      getTranslate(
-        'en',
-        "You've reached the [0] limit. Remove one member or upgrade your plan for a better experience."
-      )
+      getTranslate('en', 'reach_max_members_per_unit'),
+      '',
+      7000
     );
   });
 });

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

@@ -2,7 +2,6 @@ import React, { useEffect, useCallback, useContext } from 'react';
 import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import * as Progress from 'react-native-progress';
-import LoadingDots from 'react-native-loading-dots';
 
 import Text from '../../../commons/Text';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
@@ -25,6 +24,7 @@ const SmartAccountConnecting = ({ route }) => {
     password,
     brand,
     unit_id,
+    unitName,
     listDeviceIds,
     stationId,
     nameSubUnit,
@@ -95,6 +95,7 @@ const SmartAccountConnecting = ({ route }) => {
           smart_account_id: smart_account_id,
           smart_account_id_from_backend: smart_account_id_from_backend,
           unit_id: unit_id,
+          unitName,
           stationId,
           username,
           brand,
@@ -139,7 +140,6 @@ const SmartAccountConnecting = ({ route }) => {
         <Text bold style={styles.connectingText}>
           {t('connecting_smart_account')}
         </Text>
-        <LoadingDots />
       </View>
 
       <Text style={styles.warningText}>

package/src/screens/SmartAccount/Connecting/style.js

@@ -22,7 +22,7 @@ export default StyleSheet.create({
   },
   warningText: {
     marginHorizontal: 30,
-    marginTop: 16,
+    marginTop: 8,
     fontSize: 14,
     color: Colors.Gray8,
   },

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

@@ -21,12 +21,13 @@ const SuccessfullyConnected = memo(({ route }) => {
     listSelectDevice,
     smart_account_id,
     unit_id,
+    unitName,
     stationId,
     smart_account_id_from_backend,
     username,
     brand,
     chipId,
-  } = route.params;
+  } = route.params || {};
   const t = useTranslations();
   const { navigate, dispatch } = useNavigation();
   const [info, setInfo] = useState({});
@@ -139,7 +140,7 @@ const SuccessfullyConnected = memo(({ route }) => {
               {t('successfully_connected')}
             </Text>
             <Text size={14} style={styles.textHome}>
-              {`Home - ${nameSubUnit}`}
+              {`${unitName} - ${nameSubUnit}`}
             </Text>
             {!loading && info?.sensors?.length !== 0 ? (
               <View>
@@ -187,6 +188,7 @@ const SuccessfullyConnected = memo(({ route }) => {
           accessibilityLabelPrefix={
             AccessibilityLabel.PREFIX.BUTTON_BOTTOM_SMART_ACCOUNT
           }
+          wrapStyle={styles.wrapViewButton}
         />
       </View>
     </>

package/src/screens/SmartAccount/SuccessfullyConnected/styles.js

@@ -96,4 +96,7 @@ export default StyleSheet.create({
     resizeMode: 'contain',
     marginRight: 10,
   },
+  wrapViewButton: {
+    position: 'relative',
+  },
 });

package/src/screens/SmartAccount/index.js

@@ -50,6 +50,7 @@ const SmartAccount = ({ route }) => {
         password: password,
         brand: 'google_home',
         unit_id: route?.params?.unitId,
+        unitName: route?.params?.unitName,
       });
     } else {
       navigate(Routes.AddDeviceStack, {

package/src/screens/SubUnit/AddSubUnit.js

@@ -20,11 +20,16 @@ import { AccessibilityLabel } from '../../configs/Constants';
 import styles from './AddSubUnitStyles';
 import useKeyboardShow from '../../hooks/Common/useKeyboardShow';
 import { replace } from '../../navigations/utils';
+import { useBackendPermission } from '../../utils/Permission/backend';
+import { useSCContextSelector } from '../../context';
 
 const AddSubUnit = ({ route }) => {
   const t = useTranslations();
   const { dismissKeyboard } = useKeyboardShow();
   const { navigate, goBack, dispatch } = useNavigation();
+  const permissions = useBackendPermission();
+  const myUnits = useSCContextSelector((state) => state.myUnits);
+
   const {
     unit,
     addType,
@@ -38,6 +43,10 @@ const AddSubUnit = ({ route }) => {
   const [showImagePicker, setShowImagePicker] = useState(false);
   let awaitCreate = useRef(false);
 
+  const unitChoose = useMemo(() => {
+    return myUnits?.find((item) => item?.id === unit?.id);
+  }, [myUnits, unit?.id]);
+
   const cleanData = () => {
     setRoomName('');
     setWallpaper('');
@@ -124,6 +133,11 @@ const AddSubUnit = ({ route }) => {
           cleanData();
         } else {
           awaitCreate.current = false;
+          if (
+            unitChoose?.stations?.length >= permissions?.max_stations_per_unit
+          ) {
+            ToastBottomHelper.error(t('reach_max_stations_per_unit'), '', 7000);
+          }
         }
       }
     }
@@ -140,6 +154,8 @@ const AddSubUnit = ({ route }) => {
     goBack,
     navigate,
     route.params,
+    unitChoose?.stations?.length,
+    permissions?.max_stations_per_unit,
   ]);
 
   const onChoosePhoto = useCallback(() => {

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

@@ -14,9 +14,10 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
 import { API } from '../../../configs';
+import { ToastBottomHelper } from '../../../utils/Utils';
 
-const wrapComponent = (route) => (
-  <SCProvider initState={mockSCStore({})}>
+const wrapComponent = (route, storeData = {}) => (
+  <SCProvider initState={mockSCStore(storeData)}>
     <AddSubUnit route={route} />
   </SCProvider>
 );
@@ -297,7 +298,19 @@ describe('Test AddSubUnit', () => {
     };
     mock.onPost(API.SUB_UNIT.CREATE_SUB_UNIT(1)).reply(200, {});
     await act(async () => {
-      tree = await create(wrapComponent(route));
+      tree = await create(
+        wrapComponent(route, {
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  max_stations_per_unit: 100,
+                },
+              },
+            },
+          },
+        })
+      );
     });
     const instance = tree.root;
     const viewButtonBottom = await makeValidateData(instance);
@@ -307,6 +320,45 @@ describe('Test AddSubUnit', () => {
     expect(mockNavigationDispatch).toBeCalledWith(mockReplace);
   });
 
+  it('test no permission create fail sub-unit is out side Unit', async () => {
+    route.params = {
+      ...route.params,
+      isInsideUnit: false,
+    };
+    const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
+    mock.onPost(API.SUB_UNIT.CREATE_SUB_UNIT(1)).reply(400, {});
+    await act(async () => {
+      tree = await create(
+        wrapComponent(route, {
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  max_stations_per_unit: 0,
+                },
+              },
+            },
+          },
+          myUnits: [
+            { id: 1, name: 'unit 1', stations: [{ id: 1, name: 'station' }] },
+          ],
+        })
+      );
+    });
+    const instance = tree.root;
+    const viewButtonBottom = await makeValidateData(instance);
+
+    await act(async () => {
+      await viewButtonBottom.props.onRightClick();
+    });
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'reach_max_stations_per_unit'),
+      '',
+      7000
+    );
+    expect(mockNavigationDispatch).not.toBeCalled();
+  });
+
   it('test create sub-unit type AddHassiDevice', async () => {
     route.params = {
       ...route.params,

package/src/screens/Unit/AddMenu.js

@@ -36,7 +36,9 @@ const AddMenu = memo(({ unit, afterItemClick, showAdd, setHideAdd }) => {
             ToastBottomHelper.error(
               t('reach_max_stations_per_unit', {
                 length: permissions.max_stations_per_unit,
-              })
+              }),
+              '',
+              7000
             );
             return;
           }

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

@@ -885,6 +885,9 @@ export default {
   text_notification_content_when_trial_will_end:
     'The service usage period is only **days** days left, ' +
     'Package **product_name** will automatically renew on **trial_end** with **amount** **currency**',
+  text_notification_content_subscribe_success:
+    'Your account has just successfully registered for the **plan_name** plan - expires on **expire**. ' +
+    "Let's experience the new features now!",
   text_notification_content_your_account_upgraded_3_month:
     'Congratulations! Your account has just been upgraded to a 3-month free PREMIUM plan ' +
     'as a sincere thanking word to your loyalty of the BETA version of E-Ra IoT Platform. ' +
@@ -1392,34 +1395,31 @@ export default {
     'To provide a better user experience, [Era] will perform a system upgrade.The upgrade will take about 10 ' +
     'minutes.\n\n Some device control functions will be interrupted during the upgrade.[Era] would like to ask ' +
     'for your understanding for this inconvenience.\n\nBest regards.',
-  value_must_be_greater_than_min: 'Value must be greater than {min}',
-  value_must_be_less_than_max: 'Value must be less than {max}',
   value_must_be_a_number: 'Value must be a number',
   reach_max_stations_per_unit:
-    "You've reached the [{length}] limit. Remove one sub-unit or upgrade your plan for a better experience.",
+    'Sub-unit is incomplete. Please visit app.e-ra.io to complete your operation.',
   not_support_plug_and_play: 'Not support plug and play',
   reach_max_actions_per_automation:
-    "You've reached the [{length}] limit. Remove one action or upgrade your plan for a better experience.",
+    'Action is incomplete. Please visit app.e-ra.io to complete your operation.',
   reach_max_automations_per_unit:
-    "You've reached the [{length}] limit. Remove one automation or upgrade your plan for a better experience.",
+    'Automation is incomplete. Please visit app.e-ra.io to complete your operation.',
   reach_max_members_per_unit:
-    "You've reached the [{length}] limit. Remove one member or upgrade your plan for a better experience.",
+    'Member is incomplete. Please visit app.e-ra.io to complete your operation.',
   reach_max_chips_per_unit:
-    "You've reached the [{length}] limit. Remove one chip or upgrade your plan for a better experience.",
+    'Chip is incomplete. Please visit app.e-ra.io to complete your operation.',
   reach_max_configs_per_unit:
-    "You've reached the [{length}] limit. Remove one config or upgrade your plan for a better experience.",
+    'Config is incomplete. Please visit app.e-ra.io to complete your operation.',
   no_permission_plug_and_play_modbus:
-    'Add modbus is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+    'Add modbus is incomplete. Please visit app.e-ra.io to complete your operation.',
   no_permission_plug_and_play_zigbee:
-    'Add zigbee is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+    'Add zigbee is incomplete. Please visit app.e-ra.io to complete your operation.',
   no_permission_plug_and_play_wifi:
-    'Add wifi is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+    'Add wifi is incomplete. Please visit app.e-ra.io to complete your operation.',
   no_permission_plug_and_play_gateway:
-    'Add gateway is currently not available on your Subscription. Please upgrade your plan for a better experience!',
+    'Add gateway is incomplete. Please visit app.e-ra.io to complete your operation.',
   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!',
+    'View action log is incomplete. Please visit app.e-ra.io to complete your operation.',
   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!',
+    'Smart script for Multi Unit is incomplete. Please visit app.e-ra.io to complete your operation.',
+  value_must_be_6_digits_or_less: 'Value must be 6 digits or less',
 };

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

@@ -901,6 +901,9 @@ export default {
   text_notification_content_when_trial_will_end:
     'Thời hạn sử dụng dịch vụ chỉ còn **days** ngày, ' +
     'Gói **product_name** sẽ tự động gia hạn vào ngày **trial_end** với **amount** **currency**',
+  text_notification_content_subscribe_success:
+    'Tài khoản của bạn vừa đăng ký thành công gói **plan_name** -  ngày kết thúc **expire**. ' +
+    'Cùng trải nghiệm các tính năng mới ngay thôi!',
   text_notification_content_your_account_upgraded_3_month:
     'Xin chúc mừng! Tài khoản của bạn vừa được nâng cấp lên gói PREMIUM miễn phí 3 tháng ' +
     'nhằm tri ân người dùng phiên bản BETA của E-Ra IoT Platform. ' +
@@ -1404,29 +1407,29 @@ export default {
   value_must_be_less_than_max: 'Giá trị phải nhỏ hơn {max}',
   value_must_be_a_number: 'Giá trị phải là một số',
   reach_max_stations_per_unit:
-    'Bạn đã đạt giới hạn [{length}]. Vui lòng xoá bớt một sub-unit hoặc nâng cấp gói để có trải nghiệm tốt hơn.',
+    'Sub-unit chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạn.',
   not_support_plug_and_play: 'Không hỗ trợ kết nối tự động',
   reach_max_actions_per_automation:
-    'Bạn đã đạt giới hạn [{length}]. Vui lòng xoá bớt một action hoặc nâng cấp gói để có trải nghiệm tốt hơn.',
+    'Action chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạn.',
   reach_max_automations_per_unit:
-    'Bạn đã đạt giới hạn [{length}]. Vui lòng xoá bớt một automation hoặc nâng cấp gói để có trải nghiệm tốt hơn.',
+    'Automation chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạn.',
   reach_max_members_per_unit:
-    'Bạn đã đạt giới hạn [{length}]. Vui lòng xoá bớt một member hoặc nâng cấp gói để có trải nghiệm tốt hơn.',
+    'Member chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạn.',
   reach_max_chips_per_unit:
-    'Bạn đã đạt giới hạn [{length}]. Vui lòng xoá bớt một chip hoặc nâng cấp gói để có trải nghiệm tốt hơn.',
+    'Chip chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạn.',
   reach_max_configs_per_unit:
-    'Bạn đã đạt giới hạn [{length}]. Vui lòng xoá bớt một config hoặc nâng cấp gói để có trải nghiệm tốt hơn.',
+    'Config chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạn.',
   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!',
+    'Kết nối tự động modbus chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạ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!',
+    'Kết nối tự động zigbee chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạ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!',
+    'Kết nối tự động wifi chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạ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!',
+    'Kết nối tự động gateway chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạ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!',
+    'Xem lịch sử hoạt động chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạ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!',
+    'Kịch bản thông minh cho nhiều địa điểm chưa hoàn tất. Hãy truy cập app.e-ra.io để hoàn thiện thao tác của bạn.',
+  value_must_be_6_digits_or_less: 'Giá trị phải nhỏ hơn 6 chữ số',
 };

package/src/utils/Utils.js

@@ -88,31 +88,31 @@ export const openMapDirection = (item) => () => {
 };
 
 export const ToastBottomHelper = {
-  success: (msg, line2) => {
+  success: (msg, line2, visibilityTime = 1000) => {
     Toast.show({
       type: 'success',
       position: 'bottom',
       text1: msg,
       text2: line2,
-      visibilityTime: 1000,
+      visibilityTime: visibilityTime,
     });
   },
-  error: (msg, line2) => {
+  error: (msg, line2, visibilityTime = 1000) => {
     Toast.show({
       type: 'error',
       position: 'bottom',
       text1: msg,
       text2: line2,
-      visibilityTime: 1000,
+      visibilityTime: visibilityTime,
     });
   },
-  info: (msg, line2) => {
+  info: (msg, line2, visibilityTime = 1000) => {
     Toast.show({
       type: 'info',
       position: 'bottom',
       text1: msg,
       text2: line2,
-      visibilityTime: 1000,
+      visibilityTime: visibilityTime,
     });
   },
 };