@eohjsc/react-native-smart-city 0.2.52 → 0.2.56

package/package.json

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

package/src/commons/AlertAction/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
-import Modal from 'react-native-modal';
 
+import ModalCustom from '../../commons/Modal/ModalCustom';
 import Text from '../../commons/Text';
 import ViewButtonBottom from '../ViewButtonBottom';
 import { Colors, Device } from '../../configs';
@@ -24,7 +24,7 @@ const AlertAction = ({
   animatedStyle,
 }) => {
   return (
-    <Modal
+    <ModalCustom
       isVisible={visible}
       onBackButtonPress={hideModal}
       onBackdropPress={hideModal}
@@ -58,7 +58,7 @@ const AlertAction = ({
           />
         </View>
       </Animated.View>
-    </Modal>
+    </ModalCustom>
   );
 };
 

package/src/screens/Unit/SmartAccount.js

@@ -95,7 +95,6 @@ const ListSmartAccount = ({ route }) => {
     },
     [navigate, unitId]
   );
-
   return (
     <View style={styles.wrap}>
       <WrapHeaderScrollable
@@ -116,7 +115,7 @@ const ListSmartAccount = ({ route }) => {
           })}
         </View>
         <AlertAction
-          visible={stateAlertRemove.visible && lockShowing}
+          visible={stateAlertRemove.visible && !lockShowing}
           hideModal={hideAlertAction}
           title={stateAlertRemove.title}
           message={stateAlertRemove.message}
@@ -131,7 +130,7 @@ const ListSmartAccount = ({ route }) => {
           listMenuItem={listMenuItem}
           childRef={childRef}
           onItemClick={onItemClick}
-          onHide={releaseLockShowing}
+          hideComplete={releaseLockShowing}
         />
       </WrapHeaderScrollable>
     </View>

package/src/screens/Unit/SmartAccountStyles.js

@@ -26,7 +26,7 @@ export default StyleSheet.create({
   },
   wrapText: {
     flexDirection: 'row',
-    alignItems: 'space-arou',
+    alignItems: 'space-around',
   },
   icon: {
     width: 48,

package/src/screens/UnitSummary/components/UvIndex/index.js

@@ -43,7 +43,12 @@ const UvIndex = memo(({ summaryDetail }) => {
         />
         <View style={styles.boxHealth}>
           <IconOutline name="alert" size={20} style={styles.iconMargin} />
-          <Text semibold color={Colors.Gray9} size={16}>
+          <Text
+            semibold
+            color={Colors.Gray9}
+            type="H4"
+            style={styles.textTitle}
+          >
             {t('Protection advices:')}
           </Text>
         </View>
@@ -56,7 +61,7 @@ const UvIndex = memo(({ summaryDetail }) => {
                   { backgroundColor: summaryDetail.uv_color },
                 ]}
               />
-              <Text color={Colors.Gray7} size={14}>
+              <Text color={Colors.Gray7} type="Body">
                 {item}
               </Text>
             </View>
@@ -119,4 +124,7 @@ const styles = StyleSheet.create({
   iconMargin: {
     marginRight: 8,
   },
+  textTitle: {
+    lineHeight: 28,
+  },
 });