@eohjsc/react-native-smart-city 0.7.20 → 0.7.22

package/assets/images/Schedule.svg

@@ -0,0 +1,39 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3584_6742)">
+<path d="M16.332 21.377L18.5464 25.1419L20.0979 23.5904L16.332 21.377Z" fill="url(#paint0_linear_3584_6742)"/>
+<path d="M19.5576 26.1531L23.322 28.3659L21.1088 24.6016L19.5576 26.1531Z" fill="url(#paint1_linear_3584_6742)"/>
+<path d="M19.2852 7.71777V8.49292H20.7137V7.71777C20.241 7.79895 19.7579 7.79895 19.2852 7.71777Z" fill="url(#paint2_linear_3584_6742)"/>
+<path d="M20 9.92188C11.7157 9.92188 5 16.6376 5 24.9219C5 33.2062 11.7157 39.9219 20 39.9219C28.2843 39.9219 35 33.2062 35 24.9219C34.9906 16.6415 28.2803 9.93134 20 9.92188ZM20 38.4934C12.5046 38.4934 6.42853 32.4173 6.42853 24.9219C6.42853 17.4265 12.5046 11.3504 20 11.3504C27.4951 11.3504 33.5715 17.4265 33.5715 24.9219C33.5633 32.4137 27.4918 38.4851 20 38.4934Z" fill="url(#paint3_linear_3584_6742)"/>
+<path d="M19.9996 6.35041C21.7748 6.35041 23.2137 4.9115 23.2137 3.13629C23.2137 1.36109 21.7748 -0.078125 19.9996 -0.078125C18.2244 -0.078125 16.7852 1.36109 16.7852 3.13629C16.7873 4.91059 18.2253 6.34858 19.9996 6.35041ZM19.9996 2.42188C20.3942 2.42188 20.7137 2.7417 20.7137 3.13629C20.7137 3.53058 20.3939 3.85041 19.9996 3.85041C19.605 3.85041 19.2852 3.53058 19.2852 3.13629C19.2852 2.7417 19.605 2.42188 19.9996 2.42188Z" fill="url(#paint4_linear_3584_6742)"/>
+<path d="M20.0004 12.7793C13.2941 12.7793 7.85742 18.216 7.85742 24.9223C7.85742 31.6285 13.2941 37.0652 20.0004 37.0652C26.7066 37.0652 32.1433 31.6285 32.1433 24.9223C32.1357 18.2191 26.7036 12.7869 20.0004 12.7793ZM19.286 14.9222C19.286 14.5277 19.6058 14.2078 20.0004 14.2078C20.395 14.2078 20.7145 14.5277 20.7145 14.9222V16.3508C20.7145 16.7454 20.3947 17.0652 20.0004 17.0652C19.6058 17.0652 19.286 16.7454 19.286 16.3508V14.9222ZM11.4289 25.6367H10.0004C9.60578 25.6367 9.28595 25.3168 9.28595 24.9223C9.28595 24.5277 9.60578 24.2078 10.0004 24.2078H11.4289C11.8235 24.2078 12.1433 24.5277 12.1433 24.9223C12.1433 25.3168 11.8235 25.6367 11.4289 25.6367ZM20.7145 34.9223C20.7145 35.3169 20.3947 35.6364 20.0004 35.6364C19.6058 35.6364 19.286 35.3169 19.286 34.9223V33.4937C19.286 33.0991 19.6058 32.7793 20.0004 32.7793C20.395 32.7793 20.7145 33.0991 20.7145 33.4937V34.9223ZM25.8381 30.8829C25.608 31.1131 25.2515 31.1585 24.9711 30.9937L18.0375 26.9172C18.0311 26.9135 18.0283 26.9065 18.0216 26.9022C17.9819 26.872 17.9459 26.8375 17.9139 26.7994C17.8696 26.7634 17.83 26.7216 17.7961 26.6758C17.7924 26.67 17.786 26.6679 17.7833 26.6624L13.7052 19.7288C13.5044 19.3891 13.6164 18.9512 13.9561 18.7501C14.1804 18.617 14.4593 18.617 14.6839 18.7501L21.6181 22.8266C21.6245 22.8309 21.6276 22.8379 21.634 22.8416C21.673 22.8721 21.7091 22.9066 21.7417 22.9444C21.7857 22.9807 21.825 23.0222 21.8589 23.068C21.8626 23.0735 21.869 23.0765 21.8723 23.0823L25.9489 30.0156C26.114 30.2964 26.0682 30.6528 25.8381 30.8829ZM30.0004 25.6367H28.5719C28.1773 25.6367 27.8574 25.3168 27.8574 24.9223C27.8574 24.5277 28.1773 24.2078 28.5719 24.2078H30.0004C30.395 24.2078 30.7148 24.5277 30.7148 24.9223C30.7145 25.3168 30.3947 25.6367 30.0004 25.6367Z" fill="url(#paint5_linear_3584_6742)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_3584_6742" x1="16.332" y1="21.377" x2="20.0928" y2="25.1428" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint1_linear_3584_6742" x1="19.5576" y1="24.6016" x2="23.3178" y2="28.3659" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint2_linear_3584_6742" x1="19.2852" y1="7.71777" x2="19.9339" y2="8.91471" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint3_linear_3584_6742" x1="5" y1="9.92187" x2="34.9668" y2="39.9219" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint4_linear_3584_6742" x1="16.7852" y1="-0.078125" x2="23.2066" y2="6.3504" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint5_linear_3584_6742" x1="7.85742" y1="12.7793" x2="32.1165" y2="37.0652" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<clipPath id="clip0_3584_6742">
+<rect width="40" height="40" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/assets/images/ValueChange.svg

@@ -0,0 +1,49 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3603_7308)">
+<path d="M39.9611 19.4151C39.9611 16.0576 37.5369 13.2553 34.3463 12.6674C34.4471 7.7329 29.6477 3.91545 24.7269 5.38009C23.237 2.22626 20.0431 0 16.2575 0C11.2143 0 7.08953 4.01089 6.90707 9.01047C2.92807 9.87659 0.0392761 13.4122 0.0392761 17.5438C0.0392761 22.3593 3.9566 26.2766 8.77217 26.2766H33.0995C36.8827 26.2766 39.9611 23.1983 39.9611 19.4151Z" fill="url(#paint0_linear_3603_7308)"/>
+<path d="M27.4197 28.2794C26.8035 27.9714 26.054 28.221 25.7459 28.8374L23.2508 33.8276C22.8332 34.6629 23.4489 35.6334 24.3657 35.6334C24.8234 35.6334 25.264 35.3806 25.4825 34.9435L27.9776 29.9533C28.2857 29.337 28.036 28.5876 27.4197 28.2794Z" fill="url(#paint1_linear_3603_7308)"/>
+<path d="M38.6473 28.2794C38.0311 27.9714 37.2816 28.221 36.9736 28.8374L34.4785 33.8276C34.0609 34.6629 34.6765 35.6334 35.5934 35.6334C36.051 35.6334 36.4916 35.3806 36.7102 34.9435L39.2053 29.9533C39.5134 29.337 39.2636 28.5876 38.6473 28.2794Z" fill="url(#paint2_linear_3603_7308)"/>
+<path d="M16.1915 28.2794C15.5753 27.9714 14.8258 28.221 14.5177 28.8374L12.0226 33.8276C11.605 34.6629 12.2206 35.6334 13.1375 35.6334C13.5951 35.6334 14.0358 35.3806 14.2543 34.9435L16.7494 29.9533C17.0575 29.337 16.8077 28.5876 16.1915 28.2794Z" fill="url(#paint3_linear_3603_7308)"/>
+<path d="M4.9638 28.2794C4.34766 27.9714 3.59811 28.221 3.29004 28.8374L0.79493 33.8276C0.37731 34.6629 0.99298 35.6334 1.90986 35.6334C2.36748 35.6334 2.8081 35.3806 3.02665 34.9435L5.52177 29.9533C5.82984 29.337 5.58009 28.5876 4.9638 28.2794Z" fill="url(#paint4_linear_3603_7308)"/>
+<path d="M19.934 32.6459C19.3178 32.3378 18.5683 32.5875 18.2603 33.2038L15.7652 38.1941C15.3475 39.0293 15.9632 39.9998 16.8801 39.9998C17.3377 39.9998 17.7783 39.747 17.9969 39.3099L20.492 34.3197C20.8001 33.7034 20.5503 32.954 19.934 32.6459Z" fill="url(#paint5_linear_3603_7308)"/>
+<path d="M31.1622 32.6459C30.546 32.3378 29.7965 32.5875 29.4885 33.2038L26.9933 38.1941C26.5757 39.0293 27.1914 39.9998 28.1083 39.9998C28.5659 39.9998 29.0065 39.747 29.2251 39.3099L31.7202 34.3197C32.0282 33.7034 31.7785 32.954 31.1622 32.6459Z" fill="url(#paint6_linear_3603_7308)"/>
+<path d="M8.70636 32.6459C8.09014 32.3378 7.34067 32.5875 7.03261 33.2038L4.53749 38.1941C4.11987 39.0293 4.73554 39.9998 5.65242 39.9998C6.11004 39.9998 6.55066 39.747 6.76922 39.3099L9.26433 34.3197C9.5724 33.7034 9.32265 32.954 8.70636 32.6459Z" fill="url(#paint7_linear_3603_7308)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_3603_7308" x1="0.0392761" y1="0" x2="24.1368" y2="36.6517" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint1_linear_3603_7308" x1="23.1174" y1="28.1475" x2="30.0236" y2="32.7581" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint2_linear_3603_7308" x1="34.3451" y1="28.1475" x2="41.2513" y2="32.7581" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint3_linear_3603_7308" x1="11.8892" y1="28.1475" x2="18.7954" y2="32.7582" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint4_linear_3603_7308" x1="0.661537" y1="28.1475" x2="7.56774" y2="32.7581" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint5_linear_3603_7308" x1="15.6318" y1="32.5139" x2="22.5379" y2="37.1246" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint6_linear_3603_7308" x1="26.86" y1="32.5139" x2="33.7661" y2="37.1246" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<linearGradient id="paint7_linear_3603_7308" x1="4.4041" y1="32.5139" x2="11.3103" y2="37.1246" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2B6B9F"/>
+<stop offset="1" stop-color="#D5FFCB"/>
+</linearGradient>
+<clipPath id="clip0_3603_7308">
+<rect width="40" height="40" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/package.json

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

package/src/commons/Automate/ButtonAddCondition.js

@@ -0,0 +1,51 @@
+import React, { useCallback } from 'react';
+import { View, TouchableOpacity } from 'react-native';
+import Text from '../Text';
+import { Colors } from '../../configs';
+import styles from './ItemConditionScriptDetailStyles';
+import { AccessibilityLabel } from '../../configs/Constants';
+import { useTranslations } from '../../hooks/Common/useTranslations';
+
+import Add from '../../../assets/images/Add.svg';
+import { ToastBottomHelper } from '../../utils/Utils';
+
+const ButtonAddCondition = ({
+  setIsShowAddCondition,
+  numberConditionsUsed,
+  max_conditions_per_automation,
+}) => {
+  const t = useTranslations();
+  const onPressAddCondition = useCallback(async () => {
+    if (numberConditionsUsed > 0) {
+      setIsShowAddCondition(true);
+    } else {
+      ToastBottomHelper.error(
+        t('reach_max_conditions_per_automation', {
+          length: max_conditions_per_automation,
+        })
+      );
+    }
+  }, [
+    max_conditions_per_automation,
+    numberConditionsUsed,
+    setIsShowAddCondition,
+    t,
+  ]);
+
+  return (
+    <View style={styles.wrap}>
+      <TouchableOpacity
+        onPress={onPressAddCondition}
+        style={styles.row}
+        accessibilityLabel={AccessibilityLabel.BUTTON_ADD_CONDITION}
+      >
+        <Add />
+        <Text color={Colors.Gray8} style={styles.addCondition}>
+          {t('add_condition')}
+        </Text>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+export default ButtonAddCondition;

package/src/commons/Automate/ItemConditionScriptDetail.js

@@ -1,10 +1,14 @@
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo, useRef } from 'react';
 import { View, TouchableOpacity } from 'react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import Text from '../Text';
 import { Colors } from '../../configs';
 import styles from './ItemConditionScriptDetailStyles';
-import { AccessibilityLabel, AUTOMATES } from '../../configs/Constants';
+import {
+  AccessibilityLabel,
+  AUTOMATE_TYPE,
+  AUTOMATES,
+} from '../../configs/Constants';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { generateAutomationConditionText } from '../../screens/Automate/ScriptDetail/utils';
 import { useGetEvaluateValue } from '../../screens/Device/hooks/useEvaluateValue';
@@ -13,18 +17,21 @@ const ItemConditionScriptDetail = ({
   automate,
   enableScript = true,
   handleShowMenuAction1,
-  refMenuAction1,
+  condition,
 }) => {
+  const refMenuAction1 = useRef();
   const t = useTranslations();
-  const { type, config, unit } = automate;
+  const { unit } = automate;
+  const { type, config } = condition;
   /* istanbul ignore next */
   const item = AUTOMATES[type] || {};
   const { icon: Icon, title } = item;
   const valueEvaluations = useGetEvaluateValue(config, unit);
 
   const textCondition = useMemo(
-    () => generateAutomationConditionText(automate, valueEvaluations, t),
-    [automate, valueEvaluations, t]
+    () =>
+      generateAutomationConditionText(automate, condition, valueEvaluations, t),
+    [automate, condition, valueEvaluations, t]
   );
 
   const renderText = useMemo(() => {
@@ -34,6 +41,10 @@ const ItemConditionScriptDetail = ({
     return t('quick_button_create_at_dashboard');
   }, [textCondition, t]);
 
+  const onPress = useCallback(() => {
+    handleShowMenuAction1(condition, refMenuAction1);
+  }, [condition, handleShowMenuAction1]);
+
   return (
     <View style={styles.wrap}>
       <View style={styles.col}>
@@ -51,15 +62,17 @@ const ItemConditionScriptDetail = ({
           </Text>
         </View>
       </View>
-      <View>
-        <TouchableOpacity
-          onPress={handleShowMenuAction1}
-          ref={refMenuAction1}
-          accessibilityLabel={AccessibilityLabel.ICON_MENU_POPUP}
-        >
-          <MaterialIcons name="more-vert" size={27} color={Colors.Black} />
-        </TouchableOpacity>
-      </View>
+      {type !== AUTOMATE_TYPE.ONE_TAP && (
+        <View>
+          <TouchableOpacity
+            onPress={onPress}
+            ref={refMenuAction1}
+            accessibilityLabel={AccessibilityLabel.ICON_MENU_POPUP}
+          >
+            <MaterialIcons name="more-vert" size={27} color={Colors.Black} />
+          </TouchableOpacity>
+        </View>
+      )}
     </View>
   );
 };

package/src/commons/Automate/ItemConditionScriptDetailStyles.js

@@ -25,6 +25,15 @@ export default StyleSheet.create({
     alignItems: 'center',
     flexDirection: 'row',
   },
+  row: {
+    width: '100%',
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  addCondition: {
+    marginLeft: 20,
+  },
   wrapIcon: {
     justifyContent: 'center',
     flexDirection: 'row',

package/src/commons/Dashboard/MyUnit/index.js

@@ -1,40 +1,39 @@
+import { API, Colors, Images, SCConfig } from '../../../configs';
+import { AccessibilityLabel, DEVICE_TYPE } from '../../../configs/Constants';
+import { Dimensions, TouchableOpacity, View } from 'react-native';
 import React, {
   memo,
   useCallback,
-  useEffect,
-  useState,
   useContext,
+  useEffect,
   useMemo,
   useRef,
+  useState,
 } from 'react';
-import { View, TouchableOpacity, Dimensions } from 'react-native';
+import { SCContext, useSCContextSelector } from '../../../context';
+import { axiosGet, fetchWithCache } from '../../../utils/Apis/axios';
+import { useBluetoothConnection, useWatchConfigs } from '../../../hooks/IoT';
 import {
-  useNavigation,
-  useIsFocused,
   useFocusEffect,
+  useIsFocused,
+  useNavigation,
 } from '@react-navigation/native';
-import NetInfo from '@react-native-community/netinfo';
-import { BleManager } from 'react-native-ble-plx';
-import { API, Colors, Images, SCConfig } from '../../../configs';
-import Text from '../../Text';
-import { axiosGet, fetchWithCache } from '../../../utils/Apis/axios';
 
-import styles from './styles';
-import { Section } from '../../Section';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { useUnitConnectRemoteDevices } from '../../../screens/Unit/hook/useUnitConnectRemoteDevices';
-import { useWatchConfigs, useBluetoothConnection } from '../../../hooks/IoT';
-import { SCContext, useSCContextSelector } from '../../../context';
 import { Action } from '../../../context/actionType';
-
+import { BleManager } from 'react-native-ble-plx';
 import Carousel from 'react-native-new-snap-carousel';
-import { AccessibilityLabel, DEVICE_TYPE } from '../../../configs/Constants';
-import Routes from '../../../utils/Route';
+import FImage from '../../FImage';
 import MyUnitDevice from '../../../screens/Unit/components/MyUnitDevice';
+import NetInfo from '@react-native-community/netinfo';
+import Routes from '../../../utils/Route';
 import { STORAGE_KEY } from '../../../utils/Storage';
+import { Section } from '../../Section';
+import Text from '../../Text';
 import { preloadImagesFromUnits } from '../../../utils/Functions/preloadImages';
-import FImage from '../../FImage';
+import styles from './styles';
 import { usePrevious } from '../../../hooks';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+import { useUnitConnectRemoteDevices } from '../../../screens/Unit/hook/useUnitConnectRemoteDevices';
 
 let screenWidth = Dimensions.get('window').width;
 

package/src/commons/DevMode/Search.js

@@ -10,7 +10,7 @@ const Search = ({ onSearch }) => {
       <Image source={Images.search} style={styles.icon} />
       <TextInput
         style={styles.textInput}
-        placeholder={t('what_are_you_looking_for')}
+        placeholder={t('search')}
         onChangeText={onSearch}
       />
     </View>

package/src/commons/Device/RainningSensor/CurrentRainSensor.js

@@ -1,13 +1,13 @@
 import React, { useMemo } from 'react';
-import { View, StyleSheet } from 'react-native';
-import LinearGradient from 'react-native-linear-gradient';
+import { StyleSheet, View } from 'react-native';
 
-import { Colors } from '../../../configs';
 import { CircleView } from '../../../commons';
-import Text from '../../../commons/Text';
+import { Colors } from '../../../configs';
+import FImage from '../../FImage';
 import IconComponent from '../../IconComponent';
+import LinearGradient from 'react-native-linear-gradient';
+import Text from '../../../commons/Text';
 import images from '../../../configs/Images';
-import FImage from '../../FImage';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 
 const CurrentRainSensor = ({

package/src/commons/Widgets/IFrameWithConfig/IFrameWithConfig.js

@@ -6,7 +6,6 @@ import { styles } from './IFrameWithConfigStyles';
 import IconComponent from '../../IconComponent';
 import { useConfigGlobalState } from '../../../iot/states';
 import { useFetchConfigHistory } from '../../UnitSummary/ConfigHistoryChart';
-import API from '../../../configs/API';
 import WebView from 'react-native-webview';
 import { TouchableOpacity, View } from 'react-native';
 
@@ -25,8 +24,7 @@ const IFrameWithConfig = memo(
     const [chartData, setChartData] = useState(configuration?.history_configs);
     const fetchDataDisplayHistory = useFetchConfigHistory(
       configuration?.history_configs,
-      setChartData,
-      API.CONFIG.DISPLAY_HISTORY_V4()
+      setChartData
     );
 
     const postMessage = useCallback((message) => {

package/src/commons/Widgets/IFrameWithConfig/__tests__/IFrameWithConfig.test.js

@@ -252,7 +252,7 @@ describe('Test IFrame With Config', () => {
     });
 
     const mockAxios = new MockAdapter(api.axiosInstance);
-    mockAxios.onGet(API.CONFIG.DISPLAY_HISTORY_V4()).reply(200, {
+    mockAxios.onGet(API.CONFIG.DISPLAY_HISTORY_V3()).reply(200, {
       configs: [
         {
           id: 1,

package/src/configs/API.js

@@ -1,6 +1,9 @@
 import { SCConfig } from './SCConfig';
 
 const API = {
+  AUTH: {
+    PERMISSIONS: () => '/accounts/permissions/',
+  },
   UNIT: {
     MY_UNITS: () => '/property_manager/units/mine/',
     SHARED_UNITS: () => '/property_manager/shared_units/',
@@ -119,7 +122,8 @@ const API = {
     ADD_SCRIPT_EMAIL: (id) =>
       `/property_manager/automate/${id}/add_script_email/`,
     ADD_SCRIPT_SMS: (id) => `/property_manager/automate/${id}/add_script_sms/`,
-    FETCH_AUTOMATE: (automateId) => `/property_manager/automate/${automateId}/`,
+    FETCH_AUTOMATE: (automateId) =>
+      `/property_manager/automate_v2/${automateId}/`,
     CREATE_AUTOMATE: () => '/property_manager/automate/',
     UPDATE_AUTOMATE: (automateId) =>
       `/property_manager/automate/${automateId}/`,
@@ -135,6 +139,13 @@ const API = {
     STARRED_SCRIPTS: () => '/property_manager/automate/starred_scripts/',
     ENABLE_LOCAL_CONTROL: (id) =>
       `/property_manager/automate/${id}/enable_local_control/`,
+    NEED_ALL_CONDITIONS: (id) =>
+      `/property_manager/automate/${id}/need_all_conditions/`,
+    ADD_CONDITION: (id) => `/property_manager/automate/${id}/condition/`,
+    UPDATE_CONDITION: (automateId, conditionId) =>
+      `/property_manager/automate/${automateId}/update_condition/${conditionId}/`,
+    DELETE_CONDITION: (automateId, conditionId) =>
+      `/property_manager/automate/${automateId}/delete_condition/${conditionId}/`,
   },
   HOME_ASSISTANT: {
     CHECK_SEND_EMAIL: () =>
@@ -147,6 +158,8 @@ const API = {
     UNITS: () => '/property_manager/sharing/units/',
     UNIT_PERMISSIONS: (id) =>
       `/property_manager/sharing/units/${id}/permissions/`,
+    UNIT_PERMISSIONS_v2: (id) =>
+      `/property_manager/sharing/units/${id}/permissions_v2/`,
     UNITS_MEMBERS: (id) => `/property_manager/sharing/units/${id}/members/`,
     UNITS_MEMBER_DETAIL: (id, shareId) =>
       `/property_manager/sharing/units/${id}/members/${shareId}/`,
@@ -154,6 +167,8 @@ const API = {
       `/property_manager/sharing/units/${unit_id}/member/${member_id}/information/`,
     UNIT_MEMBER_SHARE_DEVICE: (unit_id, member_id) =>
       `/property_manager/sharing/units/${unit_id}/member/${member_id}/shared_devices/`,
+    UNIT_MEMBER_SHARE_DEVICE_V2: (unit_id, member_id) =>
+      `/property_manager/sharing/units/${unit_id}/member/${member_id}/shared_devices_v2/`,
     SHARE: () => '/property_manager/sharing/share/',
     SHARE_V2: () => '/property_manager/sharing/share_v2/',
     SEARCH_USER_BY_PHONE: (phone) => `/accounts/search/phone/${phone}/`,

package/src/configs/AccessibilityLabel.js

@@ -242,6 +242,8 @@ export default {
   BUTTON_ACTIVATE_ONE_TAP: 'BUTTON_ACTIVATE_ONE_TAP',
   BUTTON_EDIT_SCRIPT_ACTION: 'BUTTON_EDIT_SCRIPT_ACTION',
   BUTTON_ADD_SCRIPT_ACTION: 'BUTTON_ADD_SCRIPT_ACTION',
+  BUTTON_ADD_CONDITION: 'BUTTON_ADD_CONDITION',
+  BUTTON_CONTINUE: 'BUTTON_CONTINUE',
   ICON_CLOSE: 'ICON_CLOSE',
   ICON_MORE: 'ICON_MORE',
   ICON_MENU_POPUP: 'ICON_MENU_POPUP',
@@ -254,6 +256,10 @@ export default {
   AUTOMATE_SHOW_LOCAL_CONTROL: 'AUTOMATE_SHOW_LOCAL_CONTROL',
   AUTOMATE_DISABLE_LOCAL_CONTROL: 'AUTOMATE_DISABLE_LOCAL_CONTROL',
   AUTOMATE_ENABLE_LOCAL_CONTROL: 'AUTOMATE_ENABLE_LOCAL_CONTROL',
+  AUTOMATE_CONDITION: 'AUTOMATE_CONDITION',
+  AUTOMATE_SELECT_CONDITION: 'AUTOMATE_SELECT_CONDITION',
+  AUTOMATE_DELETE_CONDITION: 'AUTOMATE_DELETE_CONDITION',
+  AUTOMATE_NUMBER_CONDITION: 'AUTOMATE_NUMBER_CONDITION',
 
   // Parking input maunaly spot
   PARKING_SPOT_INFO_BUTTON: 'PARKING_SPOT_INFO_BUTTON',
@@ -446,7 +452,9 @@ export default {
     CHECK_BOX_CUSTOM: 'CHECK_BOX_CUSTOM',
     CHECK_BOX_CONFIG: 'CHECK_BOX_CONFIG',
     EXPAND_END_DEVICE: 'EXPAND_END_DEVICE',
-    CLICK_NAME_END_DEVICE: 'CLICK_NAME_END_DEVICE',
+    NAME_END_DEVICE: 'CLICK_NAME_END_DEVICE',
+    ICON_END_DEVICE: 'ICON_END_DEVICE',
+    ICON_CHECK: 'ICON_CHECK',
   },
 
   // Select subunit

package/src/configs/Images.js

@@ -27,4 +27,5 @@ export default {
   inforCode: require('../Images/DevMode/inforCode.png'),
   activeCurrentSensor: require('../Images/Common/Sunny.png'),
   unitDefaultBackground: require('../Images/Common/unit_default_background.png'),
+  defaultEndDeviceIcon: require('../Images/Common/default_end_device.png'),
 };

package/src/context/actionType.ts

@@ -1,6 +1,7 @@
 export const Action = {
   UPDATE_AUTH: 'UPDATE_AUTH',
   UPDATE_LANGUAGE: 'UPDATE_LANGUAGE',
+  UPDATE_PERMISSIONS: 'UPDATE_PERMISSIONS',
   STORE_STATUS_BAR: 'STORE_STATUS_BAR',
   LIST_DEVICE_TYPES: 'LIST_DEVICE_TYPES',
   LIST_ACTION: 'LIST_ACTION',
@@ -17,6 +18,8 @@ export const Action = {
   SET_STARRED_SCRIPTS: 'SET_STARRED_SCRIPTS',
   STAR_SCRIPTS: 'STAR_SCRIPTS',
   UNSTAR_SCRIPTS: 'UNSTAR_SCRIPTS',
+  IS_CREATE_CONDITION: 'IS_CREATE_CONDITION',
+  IS_UPDATE_CONDITION: 'IS_UPDATE_CONDITION',
   SET_BLUETOOTH_CONNECTED_DEVICE: 'SET_BLUETOOTH_CONNECTED_DEVICE',
   SET_BLUETOOTH_PERM_REQUESTED: 'SET_BLUETOOTH_PERM_REQUESTED',
   SET_BLUETOOTH_PERM_GRANTED: 'SET_BLUETOOTH_PERM_GRANTED',
@@ -80,6 +83,8 @@ export type UnitType = {
 
 export type AutomateType = {
   starredScriptIds: [];
+  isCreateCondition: false;
+  isUpdateCondition: false;
 };
 
 export type ActionType = keyof typeof Action;

package/src/context/reducer.ts

@@ -114,6 +114,20 @@ export const reducer = (currentState: ContextData, action: Action) => {
       return { ...currentState, statusBar: payload };
     case Action.UPDATE_LANGUAGE:
       return { ...currentState, language: payload };
+    case Action.UPDATE_PERMISSIONS:
+      return {
+        ...currentState,
+        auth: {
+          ...currentState.auth,
+          account: {
+            ...currentState.auth.account,
+            user: {
+              ...currentState.auth.account.user,
+              permissions: payload,
+            },
+          },
+        },
+      };
     case Action.PERCENT_LOADED:
       // eslint-disable-next-line no-case-declarations
       const percent =
@@ -307,7 +321,22 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ),
         },
       };
-
+    case Action.IS_CREATE_CONDITION:
+      return {
+        ...currentState,
+        automate: {
+          ...currentState.automate,
+          isCreateCondition: payload,
+        },
+      };
+    case Action.IS_UPDATE_CONDITION:
+      return {
+        ...currentState,
+        automate: {
+          ...currentState.automate,
+          isUpdateCondition: payload,
+        },
+      };
     case Action.SET_BLUETOOTH_CONNECTED_DEVICE:
       return {
         ...currentState,

package/src/navigations/AddMemberStack.js

@@ -1,12 +1,12 @@
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import React, { memo } from 'react';
 
 import AddCommonSelectUnit from '../screens/AddCommon/SelectUnit';
 import Route from '../utils/Route';
-import { screenOptions } from './utils';
+import SelectShareDevice from '../screens/Sharing/SelectShareDevice';
 import SharingInviteMembers from '../screens/Sharing/SelectUser';
 import UpdateShareDevice from '../screens/Sharing/UpdateShareDevice';
-import SelectShareDevice from '../screens/Sharing/SelectShareDevice';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { screenOptions } from './utils';
 
 const Stack = createNativeStackNavigator();
 

package/src/navigations/UnitStack.js

@@ -75,6 +75,7 @@ import UpdateReceiverEmailScript from '../screens/Automate/EditActionsList/Updat
 import SetupScriptSms from '../screens/Automate/AddNewAction/SetupScriptSms';
 import SetupScriptReceiverSms from '../screens/Automate/AddNewAction/SetupScriptReceiverSms';
 import UpdateReceiverSmsScript from '../screens/Automate/EditActionsList/UpdateReceiverSmsScript';
+import AddEditConditionSchedule from '../screens/Automate/SetSchedule/AddEditConditionSchedule';
 
 const Stack = createNativeStackNavigator();
 
@@ -547,6 +548,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.AddEditConditionSchedule}
+        component={AddEditConditionSchedule}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.EmergencySetting}
         component={EmergencySetting}

package/src/screens/AddCommon/SelectUnit.js

@@ -1,8 +1,9 @@
-import { useNavigation } from '@react-navigation/native';
-import { useTranslations } from '../../hooks/Common/useTranslations';
 import React, { useCallback, useEffect, useState } from 'react';
+
 import Routes from '../../utils/Route';
 import SelectUnit from '../../commons/SelectUnit';
+import { useNavigation } from '@react-navigation/native';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 
 const AddCommonSelectUnit = ({ route }) => {
   const t = useTranslations();

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

@@ -1,22 +1,22 @@
-import MockAdapter from 'axios-mock-adapter';
-import React from 'react';
-import { Alert } from 'react-native';
-import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
-import RNP from 'react-native-permissions';
+import {
+  GEOLOCATION_ERROR,
+  OpenSetting,
+} from '../../../utils/Permission/common';
 import { act, create } from 'react-test-renderer';
 
-import { useNavigation } from '@react-navigation/native';
-import { RESULTS } from 'react-native-permissions';
 import { API } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
+import AddLocationMaps from '../index';
+import { Alert } from 'react-native';
+import MockAdapter from 'axios-mock-adapter';
+import { RESULTS } from 'react-native-permissions';
+import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
+import RNP from 'react-native-permissions';
+import React from 'react';
 import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
-import {
-  GEOLOCATION_ERROR,
-  OpenSetting,
-} from '../../../utils/Permission/common';
-import AddLocationMaps from '../index';
+import { mockSCStore } from '../../../context/mockStore';
+import { useNavigation } from '@react-navigation/native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>