@eohjsc/react-native-smart-city 0.6.0-rc4 → 0.6.0-rc5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.6.0-rc4",
+  "version": "0.6.0-rc5",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -125,7 +125,7 @@
     "pluralize": "^8.0.0",
     "postinstall": "^0.7.0",
     "precompiled-mqtt": "^4.3.14-beta",
-    "pusher-js": "^7.4.0",
+    "pusher-js": "^8.4.0-rc2",
     "pusher-js-auth": "^4.0.1",
     "python-struct": "^1.1.3",
     "querystring": "^0.2.0",

package/src/navigations/SharedStack.js

@@ -15,7 +15,7 @@ const SharedStack = memo(() => {
   const t = useTranslations();
   const { toggleDrawer, goBack } = useNavigation();
   const { params } = useRoute();
-  const { isMainSource } = params;
+  const { isMainSource } = params || {};
   return (
     <Stack.Navigator>
       <Stack.Screen

package/src/screens/Device/detail.js

@@ -755,7 +755,7 @@ const DeviceDetail = ({ route }) => {
             >
               {display.items.map((item, index) => {
                 return (
-                  <>
+                  <View key={item?.id?.toString()}>
                     {!item.is_configuration_ready && (
                       <Text center>{t('bellow_widget_is_not_configured')}</Text>
                     )}
@@ -779,7 +779,7 @@ const DeviceDetail = ({ route }) => {
                       setShowWindDirection={setShowWindDirection}
                       background={station?.background}
                     />
-                  </>
+                  </View>
                 );
               })}
             </SensorConnectStatusViewHeader>

package/src/screens/SmartIr/__test__/GroupButtonByType.test.js

@@ -10,6 +10,7 @@ import TextInput from '../../../commons/Form/TextInput';
 import { ModalCustom } from '../../../commons/Modal';
 import { TouchableOpacity } from 'react-native';
 import AntDesign from 'react-native-vector-icons/AntDesign';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -137,7 +138,7 @@ describe('Test GroupButtonByType', () => {
     await act(async () => {
       await touch.props.onPress();
     });
-    expect(icon.props.name).toEqual('reload');
+    expect(icon.props.name).toEqual('reload1');
 
     const touch2 = instance.find(
       (el) =>
@@ -145,14 +146,14 @@ describe('Test GroupButtonByType', () => {
           AccessibilityLabel.HEADER_BUTTON_TYPE_MORE &&
         el.type === TouchableOpacity
     );
-    const AntDesign2 = instance.find(
+    const moreIcon = instance.find(
       (el) =>
         el.props.accessibilityLabel ===
-          AccessibilityLabel.ICON_OUTLINE_TYPE_MORE && el.type === AntDesign
+          AccessibilityLabel.ICON_OUTLINE_TYPE_MORE && el.type === MaterialIcons
     );
     await act(async () => {
       await touch2.props.onPress();
     });
-    expect(AntDesign2.props.name).toEqual('more');
+    expect(moreIcon.props.name).toEqual('more-vert');
   });
 });

package/src/utils/Monitor.js

@@ -1,12 +1,11 @@
 import { getPusher, destroyPusher } from './Pusher';
 
-// eslint-disable-next-line promise/prefer-await-to-callbacks
-export const watchNotificationData = (user, callback) => {
-  // const channel = getPusher().subscribe(`private-user-${user.id}`);
-  // channel.bind('new-notification', callback);
+export const watchNotificationData = (user, handler) => {
+  const channel = getPusher().subscribe(`private-user-${user.id}`);
+  channel.bind('new-notification', handler);
 };
 
 export const unwatchNotificationData = (user) => {
-  // getPusher().unsubscribe(`private-user-${user.id}`);
-  // destroyPusher();
+  getPusher().unsubscribe(`private-user-${user.id}`);
+  destroyPusher();
 };