@eohjsc/react-native-smart-city 0.3.11 → 0.3.12

package/index.js

@@ -17,6 +17,7 @@ import NotificationStack from './src/navigations/NotificationStack';
 import MyPinnedSharedUnit from './src/commons/Dashboard/MyPinnedSharedUnit';
 import MyUnit from './src/commons/Dashboard/MyUnit';
 import SharedUnit from './src/commons/Unit/SharedUnit';
+import { Action } from './src/context/actionType';
 
 export {
   AddSubUnitStack,
@@ -40,4 +41,5 @@ export {
   SharedUnit,
   MyUnit,
   SCWrapper,
+  Action,
 };

package/package.json

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

package/src/commons/Device/HistoryChart.js

@@ -234,7 +234,7 @@ const HistoryChart = memo(
         )}
         <DateTimePickerModal
           isVisible={eventPicker.showModalStart}
-          date={eventPicker.startTime.valueOf()}
+          date={eventPicker.startTime?._d}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmStart}
           onCancel={onCancel}
@@ -244,7 +244,7 @@ const HistoryChart = memo(
         />
         <DateTimePickerModal
           isVisible={eventPicker.showModalEnd}
-          date={eventPicker.endTime.valueOf()}
+          date={eventPicker.endTime?._d}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmEnd}
           onCancel={onCancel}

package/src/configs/SCConfig.js

@@ -112,7 +112,7 @@ export class SCConfig {
 
 export const initSCConfig = (config) => {
   api.setBaseURL(config.apiRoot ?? SCDefaultConfig.apiRoot);
-  LocaleConfig.defaultLocale = config.language;
+  LocaleConfig.defaultLocale = config.language ?? SCConfig.language;
   SCConfig.language = config.language ?? SCConfig.language;
   SCConfig.apiRoot = config.apiRoot ?? SCDefaultConfig.apiRoot;
   SCConfig.GOOGLE_MAP_API_KEY =

package/src/context/actionType.ts

@@ -21,6 +21,7 @@ export const Action = {
   SET_GOOGLE_HOME_CONNECTIONS: 'SET_GOOGLE_HOME_CONNECTIONS',
   CHANGE_GOOGLE_HOME_CONN_STATE: 'CHANGE_GOOGLE_HOME_CONN_STATE',
   UPDATE_VALUE_EVALUATIONS: 'UPDATE_VALUE_EVALUATIONS',
+  ON_RECEIVE_NOTIFICATION: 'ON_RECEIVE_NOTIFICATION',
 };
 
 export type AuthData = {
@@ -77,6 +78,7 @@ export type AppType = {
   isBluetoothEnabled: boolean;
   isNetworkConnected: boolean;
   camera_opened: any[];
+  notificationData: any;
 };
 
 export type IoTType = {

package/src/context/reducer.ts

@@ -59,6 +59,7 @@ export const initialState = {
     isBluetoothEnabled: false,
     isNetworkConnected: false,
     camera_opened: [],
+    notificationData: null,
   },
   iot: {
     googlehome: {
@@ -318,6 +319,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
         ),
       };
 
+    case Action.ON_RECEIVE_NOTIFICATION:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          notificationData: payload,
+        },
+      };
+
     default:
       return currentState;
   }

package/src/hooks/useReceiveNotifications.js

@@ -1,26 +1,20 @@
-import { useEffect, useState, useCallback } from 'react';
-import OneSignal from 'react-native-onesignal';
+import { useEffect, useState } from 'react';
+import { useSCContextSelector } from '../context';
 
 const useReceiveNotifications = (callBack) => {
-  const [dataNofitication, setDataNofitication] = useState(null);
-
-  const onReceived = useCallback((data) => {
-    const { additionalData } = data;
-    setDataNofitication(additionalData);
-  }, []);
+  const [dataNotification, setDataNotification] = useState(null);
+  const notificationData = useSCContextSelector(
+    (state) => state.app.notificationData
+  );
 
   useEffect(() => {
-    OneSignal.setNotificationWillShowInForegroundHandler(
-      (notifReceivedEvent) => {
-        let notif = notifReceivedEvent.getNotification();
-        setTimeout(() => notifReceivedEvent.complete(notif), 0);
-        onReceived(notif);
-        callBack && callBack();
-      }
-    );
-  }, [callBack, onReceived]);
+    if (notificationData) {
+      setDataNotification(notificationData);
+      callBack && callBack();
+    }
+  }, [callBack, notificationData]);
 
-  return { dataNofitication };
+  return { dataNotification };
 };
 
 export default useReceiveNotifications;

package/src/screens/Unit/Detail.js

@@ -189,7 +189,7 @@ const UnitDetail = ({ route }) => {
     });
 
     return () => {
-      subscription.remove();
+      subscription?.remove();
     };
   }, [fetchDetails]);
 

package/src/screens/Unit/Summaries.js

@@ -69,7 +69,7 @@ const Summaries = memo(({ unit }) => {
     });
 
     return () => {
-      subscription.remove();
+      subscription?.remove();
     };
   }, [fetchUnitSummary]);