Integrate with backend

1 files changed, 19 insertions, 15 deletions

diff --git a/src/routes/tabs/NavigationBar.tsx b/src/routes/tabs/NavigationBar.tsx
index 4b291023..77131098 100644
--- a/src/routes/tabs/NavigationBar.tsx
+++ b/src/routes/tabs/NavigationBar.tsx
@@ -6,7 +6,10 @@ import {useSelector} from 'react-redux';
 import {NavigationIcon} from '../../components';
 import {NO_NOTIFICATIONS} from '../../store/initialStates';
 import {RootState} from '../../store/rootReducer';
-import {getNotificationsUnreadCount} from '../../services';
+import {
+  getNotificationsUnreadCount,
+  setNotificationsReadDate,
+} from '../../services';
 import {ScreenType} from '../../types';
 import {haveUnreadNotifications, SCREEN_WIDTH, isIPhoneX} from '../../utils';
 import MainStackScreen from '../main/MainStackScreen';
@@ -41,10 +44,8 @@ const NavigationBar: React.FC = () => {
 
   const navBarPos = 20;
 
-  const [
-    unreadNotificationsPresent,
-    setUnreadNotificationsPresent,
-  ] = useState<boolean>(false);
+  const [unreadNotificationsPresent, setUnreadNotificationsPresent] =
+    useState<boolean>(false);
 
   useEffect(() => {
     const determine = async () => {
@@ -56,6 +57,7 @@ const NavigationBar: React.FC = () => {
   }, [notifications]);
 
   useEffect(() => {
+    console.log('notifications', notificationSets);
     setTimeout(() => {
       if (iconRef.current) {
         iconRef.current.measure(
@@ -94,18 +96,18 @@ const NavigationBar: React.FC = () => {
     }, 100);
   }, [notificationSets, iconRef, tipRef]);
 
-  useEffect(() => {
-    if (timeCount) {
-      setTimeout(() => {
-        setTimeOut(true);
-      }, 5000);
-    }
-  }, [timeCount]);
+  // useEffect(() => {
+  //   if (timeCount) {
+  //     setTimeout(() => {
+  //       setTimeOut(true);
+  //     }, 5000);
+  //   }
+  // }, [timeCount]);
 
   useEffect(() => {
     const getCount = async () => {
-      // const data = await getNotificationsUnreadCount();
-      const data = {};
+      const data = await getNotificationsUnreadCount();
+      // const data = {};
       setTimeout(() => {
         setNotificationSets(data);
       }, 100);
@@ -250,6 +252,7 @@ const NavigationBar: React.FC = () => {
           listeners={{
             tabPress: (_) => {
               setShowIcon(false);
+              setNotificationsReadDate();
             },
           }}
         />
@@ -298,7 +301,7 @@ const styles = StyleSheet.create({
     fontSize: normalize(10),
     justifyContent: 'center',
     alignItems: 'center',
-    marginRight: 10,
+    marginRight: 5,
   },
   tip: {
     position: 'absolute',
@@ -311,6 +314,7 @@ const styles = StyleSheet.create({
     height: 14,
     width: 14,
     margin: 2,
+    marginLeft: 5,
   },
   svgIndicationIcon: {
     height: 14,