@eohjsc/react-native-smart-city 0.4.2 → 0.4.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.02",
+  "version": "0.4.21",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -177,7 +177,6 @@
     "react-native-image-resizer": "^1.4.5",
     "react-native-input-credit-card": "^0.5.5",
     "react-native-iphone-x-helper": "^1.2.1",
-    "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-localize": "^1.4.1",
     "react-native-maps": "0.27.1",

package/src/commons/Sharing/WrapHeaderScrollable.js

@@ -3,7 +3,6 @@ import {
   Animated,
   Platform,
   RefreshControl,
-  SafeAreaView,
   StyleSheet,
   View,
 } from 'react-native';
@@ -50,8 +49,7 @@ const WrapHeaderScrollable = ({
   );
 
   return (
-    // NOTE: We have problem if don't use SafeAreaView in here. Hinh will remove it later
-    <SafeAreaView style={[styles.container, headerAniStyle]}>
+    <View style={[styles.container, headerAniStyle]}>
       <HeaderAni
         scrollY={animatedScrollYValue}
         contentHeight={contentHeight}
@@ -105,7 +103,7 @@ const WrapHeaderScrollable = ({
           </View>
         )}
       </Animated.ScrollView>
-    </SafeAreaView>
+    </View>
   );
 };
 

package/src/commons/Unit/HeaderUnit/index.js

@@ -101,17 +101,18 @@ const stickyHeaderHeight =
 const styles = StyleSheet.create({
   container: {
     flexDirection: 'row',
-    height: stickyHeaderHeight,
+    height: stickyHeaderHeight + getStatusBarHeight(),
     alignItems: 'center',
     justifyContent: 'space-between',
     width: '100%',
-    paddingTop: getStatusBarHeight(true),
+    paddingTop: 15,
   },
   btnLeft: {
     height: '100%',
     paddingHorizontal: 8,
     justifyContent: 'center',
     alignItems: 'center',
+    width: 40,
   },
   boxRight: {
     flexDirection: 'row',
@@ -126,10 +127,10 @@ const styles = StyleSheet.create({
   },
   btnMore: {
     height: '100%',
-    width: 32,
     justifyContent: 'center',
     alignItems: 'center',
     marginRight: 16,
+    width: 40,
   },
   txtHeader: {
     fontSize: 16,

package/src/commons/Unit/__test__/HeaderUnit.test.js

@@ -28,6 +28,7 @@ describe('Test HeaderUnit', () => {
       paddingHorizontal: 8,
       justifyContent: 'center',
       alignItems: 'center',
+      width: 40,
     };
     await act(async () => {
       tree = await create(

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

@@ -1,5 +1,6 @@
 import React, { useCallback, useMemo } from 'react';
 import { TouchableOpacity, View } from 'react-native';
+import { KeyboardAwareScrollView } from '@eohjsc/react-native-keyboard-aware-scroll-view';
 
 import styles from './Styles/SelectActionStyles';
 import WrapHeaderScrollable from '../../../commons/Sharing/WrapHeaderScrollable';
@@ -8,7 +9,6 @@ import { Colors } from '../../../configs';
 import { useNavigation, useRoute } from '@react-navigation/native';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import { AccessibilityLabel } from '../../../configs/Constants';
-import { KeyboardAwareScrollView } from '@eohjsc/react-native-keyboard-aware-scroll-view';
 
 const NewActionWrapper = ({ name, children, canNext, onNext, nextTitle }) => {
   const { navigate } = useNavigation();
@@ -34,15 +34,19 @@ const NewActionWrapper = ({ name, children, canNext, onNext, nextTitle }) => {
 
   return (
     <View style={styles.wrap}>
-      <KeyboardAwareScrollView enableOnAndroid extraScrollHeight={100}>
-        <WrapHeaderScrollable
-          title={name}
-          headerAniStyle={styles.headerAniStyle}
-          rightComponent={rightComponent}
+      <WrapHeaderScrollable
+        title={name}
+        headerAniStyle={styles.headerAniStyle}
+        rightComponent={rightComponent}
+      >
+        <KeyboardAwareScrollView
+          enableOnAndroid
+          extraScrollHeight={100}
+          nestedScrollEnabled
         >
           {children}
-        </WrapHeaderScrollable>
-      </KeyboardAwareScrollView>
+        </KeyboardAwareScrollView>
+      </WrapHeaderScrollable>
 
       <BottomButtonView
         style={styles.bottomButtonView}

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

@@ -22,7 +22,11 @@ const SetupConfigCondition = () => {
 
   const [isShowModal, setIsShowModal] = useState(false);
   const [itemActiveModal, setItemActiveModal] = useState(defaultCondition);
-  const [value, setValue] = useState(defaultCondition?.value || '');
+  const [value, setValue] = useState(
+    [undefined, null].includes(defaultCondition?.value)
+      ? ''
+      : String(defaultCondition?.value)
+  );
 
   const hasNoValueEvaluation = !item?.evaluate_configuration;
 
@@ -71,12 +75,12 @@ const SetupConfigCondition = () => {
     const conditionValue = itemActiveModal?.value;
 
     if (isNaN(parseFloat(conditionValue)) || !isFinite(conditionValue)) {
-      ToastBottomHelper.error(t('value_must_be_a_number'));
+      ToastBottomHelper.error(t('please_enter_a_number'));
       return;
     }
 
-    if (Math.abs(conditionValue)?.toString()?.length > 6) {
-      ToastBottomHelper.error(t('value_must_be_6_digits_or_less'));
+    if (Math.abs(conditionValue)?.toString()?.length > 8) {
+      ToastBottomHelper.error(t('value_must_be_less_than_8_character'));
       return;
     }
 
@@ -87,6 +91,7 @@ const SetupConfigCondition = () => {
         newCondition: {
           ...itemActiveModal,
           config: item.id,
+          value: Number(conditionValue),
         },
       },
     });
@@ -146,7 +151,6 @@ const SetupConfigCondition = () => {
                   textInputStyle={styles.value}
                   wrapStyle={styles.wrapValue}
                   value={value}
-                  keyboardType={'numeric'}
                   onChange={onChangeValue}
                 />
               </View>

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

@@ -115,9 +115,12 @@ describe('Test SetupConfigCondition', () => {
   };
 
   it('Test render when have input not number', async () => {
-    await testConditionValue('abc', 'Value must be a number');
+    await testConditionValue('abc', 'Please enter 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');
+    await testConditionValue(
+      '123456789',
+      'Value must be less than or equal to 8 characters'
+    );
   });
 });

package/src/screens/Sharing/InfoMemberUnit.js

@@ -173,6 +173,7 @@ const InfoMemberUnit = memo(({ route }) => {
           styleButtonLeftText={styles.textButton}
           onLeftClick={() => setIsShowWarning(false)}
           onRightClick={handleChangeOwner}
+          wrapStyle={styles.wrapButtonBottom}
         />
       </>
     );

package/src/screens/Sharing/Styles/inforMemberUnitStyles.js

@@ -100,4 +100,7 @@ export default StyleSheet.create({
   textButton: {
     color: Colors.Gray9,
   },
+  wrapButtonBottom: {
+    position: 'relative',
+  },
 });

package/src/screens/Template/__test__/GatewayList.test.js

@@ -21,6 +21,6 @@ describe('Test GatewayList', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(12);
+    expect(Views).toHaveLength(13);
   });
 });

package/src/screens/Template/__test__/Information.test.js

@@ -11,6 +11,6 @@ describe('Test Information', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(13);
+    expect(Views).toHaveLength(14);
   });
 });

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

@@ -1395,7 +1395,7 @@ 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_a_number: 'Value must be a number',
+  please_enter_a_number: 'Please enter a number',
   reach_max_stations_per_unit:
     'Sub-unit is incomplete. Please visit app.e-ra.io to complete your operation.',
   not_support_plug_and_play: 'Not support plug and play',
@@ -1423,5 +1423,6 @@ export default {
     'Smart script for Multi Unit is incomplete. Please visit app.e-ra.io to complete your operation.',
   you_can_only_add_more: 'You can only add more {number}',
   actions: 'actions',
-  value_must_be_6_digits_or_less: 'Value must be 6 digits or less',
+  value_must_be_less_than_8_character:
+    'Value must be less than or equal to 8 characters',
 };

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

@@ -1405,7 +1405,7 @@ export default {
     '[Era] kính mong quý khách hàng thông cảm cho sự bất tiện này.\n\nTrân trọng ',
   value_must_be_greater_than_min: 'Giá trị phải lớn hơn {min}',
   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ố',
+  please_enter_a_number: 'Vui lòng nhập một số',
   reach_max_stations_per_unit:
     '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',
@@ -1433,5 +1433,6 @@ export default {
     '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.',
   you_can_only_add_more: 'Bạn chỉ có thể thêm {number}',
   actions: 'hành động',
-  value_must_be_6_digits_or_less: 'Giá trị phải nhỏ hơn 6 chữ số',
+  value_must_be_less_than_8_character: 'Giá trị phải ít hơn hoặc bằng 8 kí tự',
+  name_your_automation: 'Đặt tên cho kịch bản của bạn',
 };