@eohjsc/react-native-smart-city 0.4.62 → 0.4.63

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -5,6 +5,7 @@ import { useSCContextSelector } from '../../context';
 import { useRemoteControl } from '../../hooks/IoT';
 import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
+import { Colors } from '../../configs';
 
 const ItemQuickAction = memo(
   ({ sensor, wrapperStyle, setStatus, iconSize = 30 }) => {
@@ -21,18 +22,16 @@ const ItemQuickAction = memo(
     const [action, setAction] = useState(sensor?.action);
     // eslint-disable-next-line no-unused-vars
     const [configValues, _] = useConfigGlobalState('configValues');
-    const [isOn, setIsOn] = useState(false);
+    const currentValue = configValues[config_id]?.value || 0;
+    const isFault = currentValue === 2; // phukhaco fault value
+    const [isOn, setIsOn] = useState(currentValue);
 
     const sendRemoteCommand = useRemoteControl();
     const [processing, setProcessing] = useState(false);
 
     useEffect(() => {
-      if (!(config_id in configValues)) {
-        return;
-      }
-      const configValue = configValues[config_id];
-      setIsOn(configValue?.value);
-    }, [configValues, config_id]);
+      setIsOn(currentValue);
+    }, [currentValue]);
 
     useEffect(() => {
       if (!quick_action) {
@@ -58,6 +57,10 @@ const ItemQuickAction = memo(
 
     const userId = useSCContextSelector((state) => state?.auth.account.user.id);
     const onActionPress = useCallback(async () => {
+      if (isFault) {
+        /* istanbul ignore next */
+        return;
+      }
       if (processing || !action) {
         /* istanbul ignore next */
         return;
@@ -87,6 +90,7 @@ const ItemQuickAction = memo(
       }
       setProcessing(false);
     }, [
+      isFault,
       processing,
       action,
       config_id,
@@ -108,12 +112,21 @@ const ItemQuickAction = memo(
         onPress={onActionPress}
       >
         <View style={wrapperStyle}>
-          <IconComponent
-            icon={action?.icon_kit || action?.icon || 'PoweroffOutlined'}
-            isOn={isOn}
-            iconSize={iconSize}
-            size={iconSize}
-          />
+          {isFault ? (
+            <IconComponent
+              icon={'WarningOutlined'}
+              color={Colors.Red}
+              iconSize={iconSize}
+              size={iconSize}
+            />
+          ) : (
+            <IconComponent
+              icon={action?.icon_kit || action?.icon || 'PoweroffOutlined'}
+              isOn={isOn}
+              iconSize={iconSize}
+              size={iconSize}
+            />
+          )}
         </View>
       </TouchableOpacity>
     );

package/src/commons/Device/__test__/ConnectedViewHeader.test.js

@@ -17,12 +17,11 @@ const wrapComponent = (lastUpdated) => (
 describe('Test ConnectedViewHeader', () => {
   let tree;
 
-  beforeAll(() => {
-    Date.now = jest.fn(() => new Date('2021-01-24T12:00:00.000Z'));
-  });
-
   it('render ConnectedViewHeader', async () => {
-    const lastUpdated = moment(new Date('2021-01-20T05:00:00.629Z'));
+    const lastUpdated = moment(new Date('2019-01-24T05:00:00.629Z'));
+
+    const date = new Date('2021-01-24T12:00:00.000Z');
+    jest.spyOn(global, 'Date').mockImplementation(() => date);
     await act(async () => {
       tree = await create(wrapComponent(lastUpdated));
     });