@eohjsc/react-native-smart-city 0.2.97 → 0.2.98

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

@@ -224,7 +224,10 @@ const GatewayWifiList = memo(({ route }) => {
           {t('select_wifi')}
         </Text>
 
-        <ScrollView style={styles.listContainer}>
+        <ScrollView
+          style={styles.listContainer}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           {!!list_wifi.length &&
             list_wifi.map((item, index) => (
               <TouchableOpacity

package/src/screens/AddNewGateway/SelectGateway.js

@@ -91,6 +91,7 @@ const AddNewGatewaySelectGateway = ({ route }) => {
         <ScrollView
           style={styles.scrollContainer}
           showsVerticalScrollIndicator={false}
+          scrollIndicatorInsets={{ right: 1 }}
         >
           <Section type={'border'}>
             {gateways.map((item, index) => (

package/src/screens/AddNewGateway/SetupGatewayWifi.js

@@ -147,6 +147,7 @@ const SetupGatewayWifi = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <Text style={styles.textWifi} bold color={Colors.Primary}>

package/src/screens/AddNewGateway/index.js

@@ -75,6 +75,7 @@ const AddNewGateway = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           {!wifiName && (

package/src/screens/AddNewOneTap/index.js

@@ -120,7 +120,7 @@ const AddNewOneTap = memo(({ route }) => {
       }
     >
       <HeaderCustom isShowClose onClose={onClose} />
-      <ScrollView>
+      <ScrollView scrollIndicatorInsets={{ right: 1 }}>
         <Text
           testID={TESTID.ADD_NEW_DEVICE_ADD}
           semibold

package/src/screens/Automate/index.js

@@ -147,6 +147,7 @@ const Automate = () => {
             showsHorizontalScrollIndicator={false}
             contentContainerStyle={styles.contentContainerStyle2}
             ListFooterComponent={renderListFooterComponent(type, unit_id)}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         </View>
       );
@@ -189,6 +190,7 @@ const Automate = () => {
         contentContainerStyle={styles.contentContainerStyle}
         refreshing={false}
         onRefresh={getAutomates}
+        scrollIndicatorInsets={{ right: 1 }}
       />
     </View>
   );

package/src/screens/Device/detail.js

@@ -33,7 +33,12 @@ import { useFavoriteDevice } from './hooks/useFavoriteDevice';
 import BottomButtonView from '../../commons/BottomButtonView';
 import Text from '../../commons/Text';
 import { transformDatetime } from '../../utils/Converter/time';
-import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
+import {
+  AlertAction,
+  ButtonPopup,
+  FullLoading,
+  MenuActionMore,
+} from '../../commons';
 import { TESTID } from '../../configs/Constants';
 import Routes from '../../utils/Route';
 import { usePopover } from '../../hooks/Common';
@@ -90,6 +95,8 @@ const DeviceDetail = ({ route }) => {
     return state.app.isBluetoothEnabled;
   });
 
+  const isFullLoading = useSCContextSelector((state) => state.isFullLoading);
+
   const isDeviceConnectedViaBle = useMemo(
     () =>
       isBluetoothEnabled &&
@@ -573,6 +580,7 @@ const DeviceDetail = ({ route }) => {
             })}
           </Card>
         )}
+        {isFullLoading && <FullLoading />}
       </SensorConnectStatusViewHeader>
     );
   };

package/src/screens/EmergencyContacts/__test__/EmergencyContactList.test.js

@@ -2,6 +2,9 @@ import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import Routes from '../../../utils/Route';
+import axios from 'axios';
+import { API } from '../../../configs';
+
 import { AlertAction } from '../../../commons';
 import { EmergencyContactsList } from '../EmergencyContactsList';
 import { TESTID } from '../../../configs/Constants';
@@ -27,6 +30,8 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
+jest.mock('axios');
+
 describe('test EmergencyContactList', () => {
   let route;
 
@@ -37,6 +42,7 @@ describe('test EmergencyContactList', () => {
         group: 1,
       },
     };
+    axios.delete.mockClear();
   });
   let tree;
 
@@ -51,11 +57,19 @@ describe('test EmergencyContactList', () => {
     const instance = tree.root;
     const alertAction = instance.findByType(AlertAction);
 
+    const response = { status: 204 };
+    axios.delete.mockImplementation(async () => {
+      return response;
+    });
+
     act(() => {
       alertAction.props.rightButtonClick();
     });
 
     expect(alertAction.props.visible).toBe(false);
+    expect(axios.delete).toHaveBeenCalledWith(
+      API.EMERGENCY_BUTTON.REMOVE_CONTACTS()
+    );
   });
 
   test('onAddNew', async () => {

package/src/screens/EmergencyContacts/__test__/EmergencyContactsSelectContacts.test.js

@@ -75,7 +75,25 @@ describe('test EmergencyContactsSelectContacts', () => {
   test('test onSave emergencyContactsSelectContacts', async () => {
     const response = {
       status: 200,
-      success: true,
+    };
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+    act(() => {
+      tree = create(wrapComponent(route));
+    });
+    const instance = tree.root;
+
+    const viewButtonBottom = instance.findByType(ViewButtonBottom);
+    await act(async () => {
+      viewButtonBottom.props.onRightClick();
+    });
+    expect(axios.post).toHaveBeenCalled();
+  });
+
+  test('test onSave emergencyContactsSelectContacts fail', async () => {
+    const response = {
+      status: 500,
     };
     axios.post.mockImplementation(async () => {
       return response;

package/src/screens/EmergencySetting/index.js

@@ -63,7 +63,10 @@ const EmergencySetting = () => {
     <View style={styles.wrap}>
       <HeaderCustom title={t('setting')} isShowSeparator />
 
-      <ScrollView contentContainerStyle={styles.contentContainerStyle}>
+      <ScrollView
+        contentContainerStyle={styles.contentContainerStyle}
+        scrollIndicatorInsets={{ right: 1 }}
+      >
         {listData.map((item, index) => (
           <DropDownItem
             {...item}

package/src/screens/Explore/index.js

@@ -92,6 +92,7 @@ const Explore = ({ navigation }) => {
             horizontal={true}
             contentContainerStyle={styles.locationContent}
             showsHorizontalScrollIndicator={false}
+            scrollIndicatorInsets={{ right: 1 }}
           >
             {!!unitsNearMe &&
               unitsNearMe.map((item) => (
@@ -134,6 +135,7 @@ const Explore = ({ navigation }) => {
           onEndReachedThreshold={0.01}
           onMomentumScrollBegin={() => setOnEndReached(false)}
           onEndReached={handleEndReachUnitPublic}
+          scrollIndicatorInsets={{ right: 1 }}
         />
       </Animated.View>
     </SafeAreaView>

package/src/screens/ManageAccess/index.js

@@ -46,6 +46,7 @@ const ManageAccessScreen = memo(({ route }) => {
         refreshControl={
           <RefreshControl refreshing={false} onRefresh={onRefresh} />
         }
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <View style={styles.container}>
           <Text semibold style={styles.titleGuest}>

package/src/screens/MoveToAnotherSubUnit/index.js

@@ -62,7 +62,7 @@ const MoveToAnotherSubUnit = memo(({ route }) => {
   return (
     <View style={styles.wrap}>
       <HeaderCustom title={t('move_to_another_sub_unit')} isShowSeparator />
-      <ScrollView>
+      <ScrollView scrollIndicatorInsets={{ right: 1 }}>
         <View style={styles.container}>
           <View>
             {listStationUnit.map((item, index) => (

package/src/screens/ScriptDetail/index.js

@@ -369,10 +369,10 @@ const ScriptDetail = ({ route }) => {
       return `${config_name} ${t(textCondition)} ${value}`;
     } else if (type === AUTOMATE_TYPE.SCHEDULE) {
       const time =
-        time_repeat.length >= 8
+        time_repeat?.length >= 8
           ? time_repeat.substring(0, time_repeat.length - 3)
           : time_repeat;
-      const date = date_repeat.split('-').reverse().join('/');
+      const date = date_repeat?.split('-').reverse().join('/');
       const weekday = {
         1: t('mon'),
         2: t('tue'),

package/src/screens/SelectUnit/index.js

@@ -155,6 +155,7 @@ const SelectUnit = () => {
             keyExtractor={(item) => item.id}
             data={data}
             renderItem={renderItem}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         </View>
       </WrapHeaderScrollable>

package/src/screens/SetSchedule/index.js

@@ -136,7 +136,10 @@ const SetSchedule = ({ route }) => {
     <>
       <View style={styles.container}>
         <HeaderCustom isShowClose onClose={onClose} />
-        <ScrollView contentContainerStyle={styles.scollView}>
+        <ScrollView
+          contentContainerStyle={styles.scollView}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           <Text type="H2" bold style={styles.title}>
             {t('set_schedule')}
           </Text>

package/src/screens/SharedUnit/index.js

@@ -139,6 +139,7 @@ const Shared = () => {
             keyExtractor={(item, index) => item.id.toString()}
             ItemSeparatorComponent={() => <View style={styles.seperator} />}
             contentContainerStyle={styles.scrollView}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         ) : (
           <FlatList
@@ -162,6 +163,7 @@ const Shared = () => {
             keyExtractor={(item, index) => item.id.toString()}
             ItemSeparatorComponent={() => <View style={styles.seperator} />}
             contentContainerStyle={styles.scrollView}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         )}
       </View>

package/src/screens/Sharing/MemberList.js

@@ -21,10 +21,8 @@ const MemberList = ({ route }) => {
   const isFocused = useIsFocused();
   const account = useSCContextSelector((state) => state.auth.account);
   const { unitId, unit } = route.params;
-  const { dataMembers, isRefresh, onRefresh, leaveUnit } = useDataMember(
-    unitId,
-    unit?.user_id
-  );
+  const { dataMembers, isRefresh, onRefresh, leaveUnit, loading } =
+    useDataMember(unitId, unit?.user_id);
   const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
 
   const { stateAlertSharingMenu, hideStateAlertSharingMenu, stateLeaveUnit } =
@@ -67,6 +65,7 @@ const MemberList = ({ route }) => {
       />
     </TouchableOpacity>
   );
+
   return (
     <View style={styles.container}>
       <WrapHeaderScrollable
@@ -77,13 +76,15 @@ const MemberList = ({ route }) => {
         headerAniStyle={styles.headerAniStyle}
         styleScrollView={{ backgroundColor: Colors.White }}
       >
-        <SharingMembers
-          testID={TESTID.SHARING_MEMBER}
-          dataMember={dataMembers}
-          unit={unit}
-          ownerId={unit.user_id}
-          currentUserId={account.user.id}
-        />
+        {!loading && (
+          <SharingMembers
+            testID={TESTID.SHARING_MEMBER}
+            dataMember={dataMembers}
+            unit={unit}
+            ownerId={unit.user_id}
+            currentUserId={account.user.id}
+          />
+        )}
       </WrapHeaderScrollable>
       <AlertAction
         visible={stateAlertSharingMenu.visible}

package/src/screens/Sharing/SelectPermission.js

@@ -266,6 +266,7 @@ const SelectPermission = ({ route }) => {
               />
             )
           }
+          scrollIndicatorInsets={{ right: 1 }}
         />
       )
     );

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

@@ -13,6 +13,7 @@ const useDataMember = (unitId, userUnitId = undefined) => {
   const { navigate, goBack } = useNavigation();
   const [dataMembers, setDataMembers] = useState([]);
   const [isRefresh, setRefresh] = useState(false);
+  const [loading, setLoading] = useState(true);
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const { isOwner } = useIsOwnerOfUnit(userUnitId);
 
@@ -42,6 +43,7 @@ const useDataMember = (unitId, userUnitId = undefined) => {
         const arrChanged = changePositionOwnerAndMe(data);
         setDataMembers(arrChanged);
       }
+      setLoading(false);
     },
     [changePositionOwnerAndMe]
   );
@@ -82,6 +84,7 @@ const useDataMember = (unitId, userUnitId = undefined) => {
     loadMembers,
     isRefresh,
     onRefresh,
+    loading,
   };
 };
 

package/src/screens/SmartIr/components/SelectBrand.js

@@ -36,7 +36,7 @@ const SelectDeviceType = memo(({ route }) => {
   return (
     <View style={styles.container}>
       <HeaderCustom title={t('select_brand')} />
-      <ScrollView>
+      <ScrollView scrollIndicatorInsets={{ right: 1 }}>
         <View style={styles.listBrands}>
           {!!deviceBrand &&
             deviceBrand.map((item, index) => {

package/src/screens/SubUnit/ManageSubUnit.js

@@ -81,6 +81,7 @@ const ManageSubUnit = memo((props) => {
             refreshControl={
               <RefreshControl refreshing={false} onRefresh={onRefresh} />
             }
+            scrollIndicatorInsets={{ right: 1 }}
           >
             <View>
               {!!station.length &&

package/src/screens/SyncLGDevice/AddLGDevice.js

@@ -99,6 +99,7 @@ const AddLGDevice = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <GroupCheckBox

package/src/screens/TDSGuide/index.js

@@ -13,7 +13,10 @@ const TDSGuide = memo(() => {
 
   return (
     <View style={styles.container}>
-      <ScrollView style={styles.paddingHorizontal16}>
+      <ScrollView
+        style={styles.paddingHorizontal16}
+        scrollIndicatorInsets={{ right: 1 }}
+      >
         <Text
           type="H3"
           semibold

package/src/screens/UVIndexGuide/index.js

@@ -73,7 +73,7 @@ const UVIndexGuide = memo(() => {
   const onPress = useCallback((item) => {}, []);
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         {titles.map((item, index) => {
           const { title, des } = item;
           return (

package/src/screens/Unit/SelectAddress.js

@@ -163,7 +163,10 @@ const SelectAddress = memo(({ route }) => {
     <View style={styles.wrap}>
       <View style={styles.searchLocation}>
         <SearchBarLocation input={input} onTextInput={onTextInput} />
-        <ScrollView style={styles.searchData}>
+        <ScrollView
+          style={styles.searchData}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           {searchData.map((item, index) => (
             <RowLocation key={index} item={item} onPress={onPressRowLocation} />
           ))}

package/src/screens/Unit/Station/index.js

@@ -70,6 +70,7 @@ const Station = ({ listStation = [], onSnapToItem, indexStation }) => {
         extraData={data}
         renderItem={renderItem}
         showsHorizontalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       />
     </View>
   );

package/src/screens/Unit/Summaries.js

@@ -85,7 +85,7 @@ const Summaries = memo(({ unit }) => {
   return (
     <>
       {!unitSummaries || !unitSummaries.length ? null : (
-        <ScrollView horizontal={true}>
+        <ScrollView horizontal={true} scrollIndicatorInsets={{ right: 1 }}>
           {unitSummaries.map((item, index) => (
             <SummaryItem key={index} item={item} goToSummary={goToSummary} />
           ))}

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

@@ -43,6 +43,7 @@ describe('Test UnitSummary', () => {
     Date.now = jest.fn(() => new Date('2021-01-24T12:00:00.000Z'));
     route = {
       params: {
+        unitId: 1,
         unitData: {
           id: 1,
         },
@@ -114,6 +115,37 @@ describe('Test UnitSummary', () => {
     );
   });
 
+  test('render fetchUnitDetail success', async () => {
+    route = {
+      params: {
+        unitId: 1,
+        unitData: null,
+        summaryData: {
+          id: 1,
+          name: '',
+          screen: Routes.AirQuality,
+        },
+      },
+    };
+    jest.useFakeTimers();
+    const response = {
+      status: 200,
+      data: {
+        data: {},
+      },
+    };
+    axios.get.mockImplementation(async (url) => response);
+
+    act(() => {
+      tree = create(wrapComponent(route));
+    });
+    act(() => {
+      jest.runOnlyPendingTimers();
+    });
+    expect(axios.get).toHaveBeenCalled();
+    expect(axios.get).toHaveBeenCalledWith(API.UNIT.UNIT_DETAIL(1), {});
+  });
+
   let list_value = [
     Routes.AirQuality,
     Routes.PowerConsumption,

package/src/screens/WaterQualityGuide/index.js

@@ -270,7 +270,7 @@ const WaterQualityGuide = memo(({ route }) => {
 
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         <View style={styles.wrapScroll}>
           {titles.map((item, index) => {
             const { title, des } = item;