@eohjsc/react-native-smart-city 0.2.85 → 0.2.86

package/assets/images/Device/button-lock.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.0495 3.90313C22.0112 3.88385 21.9687 3.87473 21.9259 3.87662C21.8831 3.87852 21.8415 3.89138 21.8051 3.91397C21.7687 3.93656 21.7388 3.96811 21.7181 4.00561C21.6974 4.04311 21.6867 4.0853 21.687 4.12813V6.13438C21.687 6.30625 21.7776 6.46562 21.9213 6.55937C22.626 7.00293 23.2781 7.52502 23.8651 8.11563C24.887 9.14063 25.6901 10.3313 26.2495 11.6563C26.828 13.0279 27.1245 14.502 27.1213 15.9906C27.1213 17.4938 26.8276 18.9531 26.2495 20.325C25.6907 21.6481 24.881 22.8504 23.8651 23.8656C22.8525 24.8841 21.6509 25.6951 20.3276 26.2531C18.9588 26.8344 17.4995 27.1281 15.9995 27.1281C14.4995 27.1281 13.0401 26.8344 11.6713 26.2531C10.348 25.6951 9.14638 24.8841 8.13384 23.8656C7.11791 22.8504 6.3082 21.6481 5.74946 20.325C5.17097 18.9533 4.87446 17.4793 4.87759 15.9906C4.87759 14.4875 5.17134 13.0281 5.74946 11.6562C6.30884 10.3313 7.11196 9.14063 8.13384 8.11563C8.72759 7.52188 9.37759 7.00312 10.0776 6.55937C10.2245 6.46875 10.312 6.30625 10.312 6.13438V4.125C10.312 3.9375 10.1151 3.81875 9.94946 3.9C5.57759 6.1 2.56196 10.6031 2.49946 15.8219C2.41196 23.2844 8.51509 29.4844 15.9745 29.5C23.4432 29.5156 29.4995 23.4594 29.4995 15.9875C29.4995 10.7 26.4682 6.12188 22.0495 3.90313ZM14.9995 17.5H16.9995C17.137 17.5 17.2495 17.3875 17.2495 17.25V2.75C17.2495 2.6125 17.137 2.5 16.9995 2.5H14.9995C14.862 2.5 14.7495 2.6125 14.7495 2.75L14.7495 17.25C14.7495 17.3875 14.862 17.5 14.9995 17.5Z" fill="#00979D"/>
+</svg>

package/assets/images/Device/button-unlock.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.0495 3.90313C22.0112 3.88385 21.9687 3.87473 21.9259 3.87662C21.8831 3.87852 21.8415 3.89138 21.8051 3.91397C21.7687 3.93656 21.7388 3.96811 21.7181 4.00561C21.6974 4.04311 21.6867 4.0853 21.687 4.12813V6.13438C21.687 6.30625 21.7776 6.46562 21.9213 6.55937C22.626 7.00293 23.2781 7.52502 23.8651 8.11563C24.887 9.14063 25.6901 10.3313 26.2495 11.6563C26.828 13.0279 27.1245 14.502 27.1213 15.9906C27.1213 17.4938 26.8276 18.9531 26.2495 20.325C25.6907 21.6481 24.881 22.8504 23.8651 23.8656C22.8525 24.8841 21.6509 25.6951 20.3276 26.2531C18.9588 26.8344 17.4995 27.1281 15.9995 27.1281C14.4995 27.1281 13.0401 26.8344 11.6713 26.2531C10.348 25.6951 9.14638 24.8841 8.13384 23.8656C7.11791 22.8504 6.3082 21.6481 5.74946 20.325C5.17097 18.9533 4.87446 17.4793 4.87759 15.9906C4.87759 14.4875 5.17134 13.0281 5.74946 11.6562C6.30884 10.3313 7.11196 9.14063 8.13384 8.11563C8.72759 7.52188 9.37759 7.00312 10.0776 6.55937C10.2245 6.46875 10.312 6.30625 10.312 6.13438V4.125C10.312 3.9375 10.1151 3.81875 9.94946 3.9C5.57759 6.1 2.56196 10.6031 2.49946 15.8219C2.41196 23.2844 8.51509 29.4844 15.9745 29.5C23.4432 29.5156 29.4995 23.4594 29.4995 15.9875C29.4995 10.7 26.4682 6.12188 22.0495 3.90313ZM14.9995 17.5H16.9995C17.137 17.5 17.2495 17.3875 17.2495 17.25V2.75C17.2495 2.6125 17.137 2.5 16.9995 2.5H14.9995C14.862 2.5 14.7495 2.6125 14.7495 2.75L14.7495 17.25C14.7495 17.3875 14.862 17.5 14.9995 17.5Z" fill="#F5222D"/>
+</svg>

package/package.json

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

package/src/commons/ActionGroup/OnOffSmartLock.js

@@ -0,0 +1,48 @@
+import React, { memo, useCallback, useState } from 'react';
+import { SafeAreaView, TouchableOpacity, View } from 'react-native';
+import { useTranslations } from '../../hooks/Common/useTranslations';
+import { Section } from '../Section';
+import Text from '../Text';
+import styles from './OnOffSmartLockStyle';
+import ButtonLock from '../../../assets/images/Device/button-lock.svg';
+import ButtonUnLock from '../../../assets/images/Device/button-unlock.svg';
+
+const OnOffSmartLock = memo(({ actionGroup, doAction, sensor }) => {
+  const t = useTranslations();
+  const [active, setActive] = useState(true);
+
+  const handleClickButton = useCallback(() => {
+    setActive(!active);
+  }, [active]);
+
+  return (
+    <SafeAreaView style={styles.container}>
+      <View style={styles.wrap}>
+        <Section style={styles.section}>
+          <View style={styles.wrapController}>
+            <Text style={styles.textController}>{t('controller')}</Text>
+          </View>
+          <View style={styles.wrapButtonSmartLock}>
+            <TouchableOpacity onPress={handleClickButton}>
+              {active ? (
+                <ButtonLock style={styles.buttonSmartLock} />
+              ) : (
+                <ButtonUnLock style={styles.buttonSmartLock} />
+              )}
+            </TouchableOpacity>
+            <Text style={styles.textSmartLock}>
+              {active ? t('lock') : t('unlock')}
+            </Text>
+          </View>
+          <View style={styles.wrapStatus}>
+            <Text style={styles.textStatus}>
+              {active ? t('door_is_open') : t('door_is_close')}
+            </Text>
+          </View>
+        </Section>
+      </View>
+    </SafeAreaView>
+  );
+});
+
+export default OnOffSmartLock;

package/src/commons/ActionGroup/OnOffSmartLockStyle.js

@@ -0,0 +1,51 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../configs';
+
+export default StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  wrap: {
+    paddingHorizontal: 16,
+  },
+  section: {
+    borderRadius: 10,
+  },
+  wrapController: {
+    flexDirection: 'row',
+    justifyContent: 'flex-start',
+  },
+  textController: {
+    color: Colors.Gray8,
+    fontSize: 16,
+    marginBottom: 16,
+  },
+  wrapButtonSmartLock: {
+    flexDirection: 'column',
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.Gray2,
+    borderRadius: 10,
+    borderColor: Colors.Gray4,
+    borderWidth: 1,
+  },
+  buttonSmartLock: {
+    marginTop: 14,
+  },
+  textSmartLock: {
+    color: Colors.Gray9,
+    fontSize: 14,
+    marginTop: 8,
+    marginBottom: 18,
+  },
+  wrapStatus: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  textStatus: {
+    color: Colors.Gray8,
+    fontSize: 14,
+    marginTop: 16,
+  },
+});

package/src/commons/ActionGroup/index.js

@@ -11,6 +11,7 @@ import TimerActionTemplate from './TimerActionTemplate';
 import CurtainButtonTemplate from './CurtainButtonTemplate';
 import SmartTiviActionTemplate from './SmartTiviActionTemplate/SmartTiviActionTemplate';
 import LightActionTemplate from './LightActionTemplate';
+import OnOffSmartLock from './OnOffSmartLock';
 
 export const getActionComponent = (template) => {
   switch (template) {
@@ -21,6 +22,8 @@ export const getActionComponent = (template) => {
     case 'OnOffButtonActionTemplate':
     case 'OnOffSimpleActionTemplate':
       return OnOffTemplate;
+    case 'OnOffButtonActionSmartLock':
+      return OnOffSmartLock;
     case 'one_button_action_template': // todo refactor later with backend
     case 'OneBigButtonActionTemplate':
       return OneBigButtonTemplate;

package/src/commons/ConnectingProcess/index.js

@@ -23,6 +23,7 @@ const ConnectingProcess = ({ route }) => {
     station,
     unit,
     unit_id,
+    unit_name,
     devicePrefixName,
     wifi_ssid,
     wifi_pass,
@@ -156,12 +157,14 @@ const ConnectingProcess = ({ route }) => {
           {t('successfully_connected')}
         </Text>
         <Text size={14} style={styles.textHome}>
-          Home - {station?.name}
+          {`${unit?.name || unit_name} ${
+            station?.name !== undefined ? '- ' + station?.name : ''
+          }`}
         </Text>
         <DeviceItem icon={sensor?.icon_kit} name={sensor?.name} />
       </View>
     );
-  }, [sensor?.icon_kit, sensor?.name, station?.name, t]);
+  }, [sensor?.icon_kit, sensor?.name, station?.name, t, unit?.name, unit_name]);
 
   const handleDone = useCallback(() => {
     navigate(Routes.UnitStack, {

package/src/commons/Device/ItemDevice.js

@@ -14,7 +14,7 @@ import Text from '../../commons/Text';
 import { isDeviceConnected } from '../../iot/RemoteControl/Bluetooth';
 
 import { Colors, Constants } from '../../configs';
-import { TESTID } from '../../configs/Constants';
+import { TESTID, DEVICE_TYPE } from '../../configs/Constants';
 import FImage from '../../commons/FImage';
 
 const marginItem = 12;
@@ -61,11 +61,16 @@ const ItemDevice = memo(
       status === undefined
         ? isNetworkConnected && sensor.is_connected
         : isNetworkConnected && status.is_connected;
-    const isBLEConnected = isDeviceConnected(
+    const isConnectedViaBLE = isDeviceConnected(
       sensor?.remote_control_options?.bluetooth?.address
     );
+    const isConnectedViaGGHome =
+      !!sensor &&
+      sensor?.is_other_device &&
+      !sensor?.device_type !== DEVICE_TYPE.LG_THINQ &&
+      isGGHomeConnected;
     const isConnected =
-      isConnectedViaInternet || isGGHomeConnected || isBLEConnected;
+      isConnectedViaInternet || isConnectedViaGGHome || isConnectedViaBLE;
     const borderColor = isConnected ? Colors.Gray4 : Colors.Red6;
     const textConnected = isConnected ? t('connected') : t('disconnected');
 

package/src/commons/MediaPlayer/__test__/index.test.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import { act, create } from 'react-test-renderer';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import { TouchableOpacity } from 'react-native';
+import MediaPlay from '../index';
+
+jest.mock('react', () => {
+  return {
+    ...jest.requireActual('react'),
+    memo: (x) => x,
+  };
+});
+
+const wrapComponent = (props) => (
+  <SCProvider initState={mockSCStore({})}>
+    <MediaPlay {...props} />
+  </SCProvider>
+);
+
+describe('Test MediaPlayer', () => {
+  let tree, props;
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+    props = {
+      uri: 'uri',
+      previewUri: 'previewUri',
+      thumbnail: 'thumbnail',
+      background: 'background',
+    };
+  });
+
+  it('Test render', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(props));
+    });
+    const instance = tree.root;
+    const pauseButton = instance.findByType(TouchableOpacity);
+    await act(async () => {
+      await pauseButton.props.onPress();
+    });
+    jest.runAllTimers();
+  });
+});

package/src/commons/SubUnit/ShortDetail.js

@@ -4,7 +4,7 @@ import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { Images, Device, API } from '../../configs';
-import { SubUnitName, TESTID } from '../../configs/Constants';
+import { TESTID } from '../../configs/Constants';
 import { Section } from '../Section';
 import Text from '../Text';
 import ItemDevice from '../Device/ItemDevice';
@@ -104,28 +104,16 @@ const ShortDetailSubUnit = ({
   };
 
   const handleOnAddNew = () => {
-    if (!station.isFavorites) {
-      navigate(Routes.AddDeviceStack, {
-        screen: Routes.ScanSensorQR,
-        params: {
-          station_id: station.id,
-          unit_id: unit.id,
-          unit_name: unit.name,
-        },
-      });
-    } else {
-      alert(t('feature_under_development'));
-    }
+    navigate(Routes.AddDeviceStack, {
+      screen: Routes.ScanSensorQR,
+      params: {
+        station_id: station?.id,
+        unit_id: unit.id,
+        unit_name: unit.name,
+      },
+    });
   };
 
-  const itemAddNewTitle = t(
-    station?.isFavorites
-      ? 'add_to_favorites'
-      : station?.name === SubUnitName.smart
-      ? 'add_script'
-      : 'add_new'
-  );
-
   return (
     <Section style={styles.noShadow}>
       {renderCamera()}
@@ -156,7 +144,7 @@ const ShortDetailSubUnit = ({
               status={sensorsStatus.find((s) => s.id === sensor.id)}
             />
           ))}
-        <ItemAddNew title={itemAddNewTitle} onAddNew={handleOnAddNew} />
+        <ItemAddNew title={t('add_new_device')} onAddNew={handleOnAddNew} />
       </View>
     </Section>
   );

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -1,21 +1,27 @@
 import React from 'react';
-import { Image, View, TouchableWithoutFeedback } from 'react-native';
+import { Image, View } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import { TESTID } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import ShortDetailSubUnit from '../ShortDetail';
+import ItemAddNew from '../../Device/ItemAddNew';
 import Routes from '../../../utils/Route';
 
-const wrapComponent = (unit, station) => (
+const wrapComponent = (props) => (
   <SCProvider initState={mockSCStore({})}>
-    <ShortDetailSubUnit unit={unit} station={station} />
+    <ShortDetailSubUnit {...props} />
   </SCProvider>
 );
 
-import ShortDetailSubUnit from '../ShortDetail';
+jest.mock('react', () => {
+  return {
+    ...jest.requireActual('react'),
+    memo: (x) => x,
+  };
+});
 
 const mockedNavigate = jest.fn();
-
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -27,43 +33,46 @@ jest.mock('@react-navigation/native', () => {
 });
 
 describe('test ShortDetail Subunit', () => {
-  let tree, unit, station;
+  let tree, props;
   beforeEach(() => {
-    unit = {
-      address: null,
-      background:
-        'https://cdn-staging.eoh.io/image-90a42c0a-96ad-42e5-b736-b2b8a2e7fb20.jpg',
-      can_add: true,
-      icon: 'https://cdn-staging.eoh.io/baelen.jpg',
-      id: 21,
-      main_config_count: 0,
-      name: 'Gia Cat Unit',
-      remote_control_options: { bluetooth: [], googlehome: [] },
-      stations: [
-        {
-          background:
-            'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
-          camera: null,
-          id: 71,
-          name: 'Station 1',
-          sensors: [],
-        },
-      ],
-      user_id: 64,
-    };
-
-    station = {
-      background:
-        'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
-      camera: null,
-      id: 71,
-      name: 'Station 1',
+    props = {
+      unit: {
+        address: null,
+        background:
+          'https://cdn-staging.eoh.io/image-90a42c0a-96ad-42e5-b736-b2b8a2e7fb20.jpg',
+        can_add: true,
+        icon: 'https://cdn-staging.eoh.io/baelen.jpg',
+        id: 21,
+        main_config_count: 0,
+        name: 'Gia Cat Unit',
+        remote_control_options: { bluetooth: [], googlehome: [] },
+        stations: [
+          {
+            background:
+              'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
+            camera: null,
+            id: 71,
+            name: 'Station 1',
+            sensors: [],
+          },
+        ],
+        user_id: 64,
+      },
+      station: {
+        background:
+          'https://cdn-staging.eoh.io/image-cc9ea441-e113-46b5-bff3-23d924723733.jpg',
+        camera: null,
+        id: 71,
+        name: 'Station 1',
+      },
+      isNetworkConnected: true,
+      isGGHomeConnected: true,
     };
   });
 
   test('render ShortDetail', () => {
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const image = instance.findAllByType(Image);
@@ -74,9 +83,9 @@ describe('test ShortDetail Subunit', () => {
   });
 
   test('render ShortDetail without background', () => {
-    station.background = '';
+    props.station.background = '';
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const image = instance.findAllByType(Image);
@@ -87,7 +96,7 @@ describe('test ShortDetail Subunit', () => {
   });
 
   test('render ShortDetail with camera', () => {
-    station.camera = {
+    props.station.camera = {
       id: 2,
       name: 'EoH Gate',
       preview_uri: '',
@@ -95,7 +104,7 @@ describe('test ShortDetail Subunit', () => {
     };
 
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const view = instance.findAllByType(View);
@@ -106,7 +115,7 @@ describe('test ShortDetail Subunit', () => {
   });
 
   test('render ShortDetail with device', () => {
-    station.sensors = [
+    props.station.sensors = [
       {
         action: {
           color: '#00979D',
@@ -129,7 +138,7 @@ describe('test ShortDetail Subunit', () => {
     ];
 
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
     const itemDevice = instance.findAll(
@@ -141,19 +150,19 @@ describe('test ShortDetail Subunit', () => {
 
   test('render ShortDetail add new device', () => {
     act(() => {
-      tree = create(wrapComponent(unit, station));
+      tree = create(wrapComponent(props));
     });
     const instance = tree.root;
-    const buttonAddNew = instance.findAllByType(TouchableWithoutFeedback);
+    const buttonAddNew = instance.findByType(ItemAddNew);
     act(() => {
-      buttonAddNew[0].props.onPress();
+      buttonAddNew.props.onAddNew();
     });
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.AddDeviceStack, {
       screen: Routes.ScanSensorQR,
       params: {
-        station_id: station.id,
-        unit_id: unit.id,
-        unit_name: unit.name,
+        station_id: props.station.id,
+        unit_id: props.unit.id,
+        unit_name: props.unit.name,
       },
     });
   });

package/src/configs/API.js

@@ -182,9 +182,9 @@ const API = {
         `/connection_manager/lg_thinq/device_status/${sensorId}/`,
     },
     VCONNEX: {
-      AUTHORIZE: (client_id, redirect_uri, user_id, station_id) =>
+      AUTHORIZE: (client_id, redirect_uri, user_id, unit_id, station_id) =>
         // eslint-disable-next-line max-len
-        `https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${station_id}`,
+        `https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=${user_id}@${unit_id}@${station_id}`,
     },
   },
   NOTIFICATION: {

package/src/configs/Constants.js

@@ -663,6 +663,8 @@ export const NOTIFICATION_TYPES = {
   NOTIFY_DEVICE_DISCONNECT: 'NOTIFY_DEVICE_DISCONNECT',
   NOTIFY_RENAME_SUB_UNIT: 'NOTIFY_RENAME_SUB_UNIT',
   NOTIFY_UPDATE_ADDRESS: 'NOTIFY_UPDATE_ADDRESS',
+  NOTIFY_REMOVE_SUB_UNIT: 'NOTIFY_REMOVE_SUB_UNIT',
+  NOTIFY_REMOVE_DEVICE: 'NOTIFY_REMOVE_DEVICE',
 };
 
 export const ACTIVITY_LOG_TYPES = {
@@ -670,3 +672,14 @@ export const ACTIVITY_LOG_TYPES = {
   ACTIVATED_BY: 'ACTIVATED_BY',
   SCRIPT_UPDATED_BY: 'SCRIPT_UPDATED_BY',
 };
+
+export const SENSOR_TYPE = {
+  AIR_QUALITY: 'air_quality',
+  TURBIDITY: 'turbidity',
+  PH: 'ph',
+  CLO: 'clo',
+  UV: 'uv',
+  SMOKE: 'smoke',
+  FIRE: 'fire',
+  SOS: 'sos',
+};

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

@@ -37,6 +37,7 @@ String.prototype.capitalize = function () {
   return this.charAt(0).toUpperCase() + this.slice(1);
 };
 
+let onEndReachedCalledDuringMomentum = false;
 let dataTemp = [];
 
 export default ({ id, type, share, filterEnabled }) => {
@@ -59,7 +60,7 @@ export default ({ id, type, share, filterEnabled }) => {
     if (page === 1) {
       setIsRefreshing(true);
     } else {
-      if (!isCanLoadMore || isLoading) {
+      if (!isCanLoadMore) {
         return;
       }
       setIsLoading(true);
@@ -81,6 +82,7 @@ export default ({ id, type, share, filterEnabled }) => {
       params.append(key, value);
     }
     params.append('page', page);
+
     const { success, data } = await axiosGet(api.url(id), {
       params: params,
     });
@@ -91,9 +93,9 @@ export default ({ id, type, share, filterEnabled }) => {
         setData(api.standardizeData(results));
       } else {
         dataTemp = dataTemp.concat(results);
+        setIsCanLoadMore(page < Math.ceil(data.count / 20));
         setData(api.standardizeData(dataTemp));
       }
-      setIsCanLoadMore(page < Math.ceil(data.count / 20));
     }
     page === 1 ? setIsRefreshing(false) : setIsLoading(false);
   };
@@ -110,9 +112,20 @@ export default ({ id, type, share, filterEnabled }) => {
     }
   };
 
-  const onRefresh = () => fetchData({ ...filters, page: 1 });
+  const onRefresh = () => {
+    setIsCanLoadMore(true);
+    fetchData({ ...filters, page: 1 });
+  };
+
+  const onLoadMore = () => {
+    if (!onEndReachedCalledDuringMomentum) {
+      onEndReachedCalledDuringMomentum = true;
+      fetchData({ ...filters, page: page + 1 });
+    }
+  };
 
-  const onLoadMore = () => fetchData({ ...filters, page: page + 1 });
+  const onMomentumScrollBegin = () =>
+    (onEndReachedCalledDuringMomentum = false);
 
   return {
     data,
@@ -124,5 +137,6 @@ export default ({ id, type, share, filterEnabled }) => {
     fetchMembers,
     filters,
     setFilters,
+    onMomentumScrollBegin,
   };
 };

package/src/screens/ActivityLog/index.js

@@ -34,7 +34,9 @@ const ActivityLogScreen = ({ route }) => {
     fetchMembers,
     filters,
     setFilters,
+    onMomentumScrollBegin,
   } = useActivityLog({ id, type, share, filterEnabled });
+
   const [showFilterPopup, setShowFilterPopup, setHideFilterPopup] =
     useBoolean();
 
@@ -113,6 +115,7 @@ const ActivityLogScreen = ({ route }) => {
           removeClippedSubviews={true}
           maxToRenderPerBatch={20}
           contentContainerStyle={styles.contentContainerStyle}
+          onMomentumScrollBegin={onMomentumScrollBegin}
         />
       </View>
       {(filterEnabled.user || filterEnabled.date) && (

package/src/screens/AddCommon/SelectSubUnit.js

@@ -107,6 +107,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
             SCConfig.VCONNEX_CLIENT_ID,
             SCConfig.VCONNEX_REDIRECT_URI_APP,
             unit.user_id,
+            unit_id,
             subUnits[selectedIndex]?.id
           ),
         });

package/src/screens/AddCommon/__test__/SelectSubUnit.test.js

@@ -152,7 +152,7 @@ describe('Test SelectSubUnit container', () => {
         case 'AddVconnexDevice':
           expect(mockedNavigate).toBeCalledWith('Browser', {
             // eslint-disable-next-line max-len
-            link: 'https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=&redirect_uri=&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=undefined@undefined',
+            link: 'https://partner-api-stg.vconnex.vn/oauth/authorize?client_id=&redirect_uri=&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=undefined@undefined@undefined',
           });
           break;
         case 'AddDeviceNewFlow':

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -175,7 +175,7 @@ const SelectSensorDevices = memo(({ route }) => {
           {t(title)}
         </Text>
 
-        {!!listStation.length > 0 ? (
+        {listStation ? (
           <NavBar
             listStation={listStation}
             listMenuItem={listMenuItem}
@@ -185,7 +185,9 @@ const SelectSensorDevices = memo(({ route }) => {
           />
         ) : (
           <View style={styles.noneData}>
-            <Text center>{t('text_sub_unit_not_have_device')}</Text>
+            <Text center>
+              {t('you_do_not_have_the_device_or_have_share_control_device')}
+            </Text>
           </View>
         )}
 

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

@@ -28,8 +28,15 @@ import { SCContext } from '../../../context';
 import { Action } from '../../../context/actionType';
 
 const ConnectWifiWarning = memo(({ route }) => {
-  const { wifi_ssid, wifi_pass, unit_id, chip_id, devicePrefixName, body } =
-    route.params;
+  const {
+    wifi_ssid,
+    wifi_pass,
+    unit_id,
+    chip_id,
+    devicePrefixName,
+    body,
+    unit_name,
+  } = route.params;
   const t = useTranslations();
   const { navigate, goBack } = useNavigation();
   const [isLoading, setIsLoading] = useState(false);
@@ -109,6 +116,7 @@ const ConnectWifiWarning = memo(({ route }) => {
                   screen: Routes.ConnectingProcess,
                   params: {
                     unit_id: unit_id,
+                    unit_name: unit_name,
                     scan_sensor_data: { ...body },
                     gateway: data?.gateway,
                     devicePrefixName: devicePrefixName,