@eohjsc/react-native-smart-city 0.3.78 → 0.3.79

package/package.json

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

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -105,7 +105,7 @@ const OptionsDropdownActionTemplate = ({
     if (!config) {
       return t('not_available');
     }
-    return selectedOption.text;
+    return selectedOption?.text;
   }, [config, selectedOption?.text, t]);
 
   const iconSvg = useMemo(() => {
@@ -190,7 +190,7 @@ const OptionsDropdownActionTemplate = ({
                     setSelectedIndex(index);
                   }}
                 >
-                  <Text style={styles.text}>{item.text}</Text>
+                  <Text style={styles.text}>{item?.text}</Text>
                 </TouchableOpacity>
               </View>
             ))}

package/src/commons/Device/FlatListItems.js

@@ -49,7 +49,7 @@ const FlatListItems = memo(({ data, style, title, offsetTitle }) => {
         key={item?.id}
         standard={item.standard}
         value={item.value}
-        measure={item.measure}
+        measure={item.unit}
         evaluate={item.evaluate}
         style={styles.boxStatus}
         descriptionScreen={Routes.TDSGuide}

package/src/commons/Device/WaterQualitySensor/ListQualityIndicator.js

@@ -17,7 +17,7 @@ const ListQualityIndicator = ({ data, style }) => {
         standard={item.standard}
         value={getValue}
         evaluate={item.evaluate}
-        measure={item.measure}
+        measure={item.unit}
       />
     );
   }, []);

package/src/configs/API.js

@@ -53,7 +53,7 @@ const API = {
   },
   DEVICE: {
     SENSOR_DETAIL: (id) => `/property_manager/sensors/${id}/`,
-    DISPLAY: (id) => `/property_manager/sensors/${id}/display/`,
+    DISPLAY: (id) => `/property_manager/devices/${id}/display/`,
     SIDE_MENU_DETAIL: (id, side_menu_id) =>
       `/property_manager/devices/${id}/display/side_menu/${side_menu_id}/`,
     DISPLAY_VALUES_V2: (id) =>

package/src/screens/AddNewAction/SelectAction.js

@@ -169,7 +169,7 @@ const SelectAction = memo(({ route }) => {
       Alert.alert('', t('choose_only_one'));
       return;
     }
-    if (isSelectSensor || isSetupEvent) {
+    if (isSelectSensor || sensorData?.length > 0) {
       await checkConditionToContinue();
     } else {
       if (automateId) {

package/src/screens/ScriptDetail/index.js

@@ -419,7 +419,7 @@ const ScriptDetail = ({ route }) => {
       [AUTOMATE_TYPE.EVENT, AUTOMATE_TYPE.EVENT_ACTION].includes(type)
     ) {
       const { action, end_device_name, config_name, sensor_type, value } =
-        automate?.event;
+        automate?.event || automate?.event_action || automate?.event_sensor;
       let textEvent = '';
       if (config_name) {
         const stateConditionData = STATE_VALUE_SENSOR_TYPES.find(