@eohjsc/react-native-smart-city 0.6.2 → 0.7.0

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

@@ -20,16 +20,6 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mockGoBack = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      goBack: mockGoBack,
-    }),
-  };
-});
-
 const mock = new MockAdapter(api.axiosInstance);
 
 const getButton = (instance, accessibilityLabel, many = false) => {
@@ -53,7 +43,6 @@ describe('Test GuestInfo', () => {
   let data;
 
   beforeEach(() => {
-    mockGoBack.mockClear();
     route = {
       params: { id: 1 },
     };

package/src/screens/GuestInfo/components/RowGuestInfo.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, TouchableOpacity } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import Text from '../../../commons/Text';
 import styles from '../styles/indexStyles';
 
@@ -19,7 +19,7 @@ const RowGuestInfo = ({
         <View style={styles.rowRight}>
           <Text type="Body">{textRight}</Text>
           {rightArrow && (
-            <IconOutline name="right" size={20} style={styles.icon} />
+            <AntDesign name="right" size={20} style={styles.icon} />
           )}
         </View>
       </View>

package/src/screens/GuestInfo/index.js

@@ -7,7 +7,7 @@ import RowGuestInfo from './components/RowGuestInfo';
 import HeaderGuestInfo from './components/HeaderGuestInfo';
 import AccessScheduleSheet from './components/AccessScheduleSheet';
 import { CircleView } from '../../commons/CircleView';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import Text from '../../commons/Text';
 import { useBoolean } from '../../hooks/Common';
 import { axiosGet, axiosPut } from '../../utils/Apis/axios';
@@ -113,7 +113,7 @@ const GuestInfo = ({ route }) => {
                   />
                 ) : (
                   <CircleView size={88} center style={styles.avatar}>
-                    <IconOutline name="user" size={44} color={Colors.Pink1} />
+                    <AntDesign name="user" size={44} color={Colors.Pink1} />
                   </CircleView>
                 )}
                 <Text type="H3" bold>

package/src/screens/HanetCamera/Detail.js

@@ -7,7 +7,7 @@ import React, {
 } from 'react';
 import { View, TouchableOpacity, FlatList, Image } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import { Icon } from '@ant-design/react-native';
+import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import moment from 'moment';
 import styles from './styles/detailStyles';
 import { HeaderCustom } from '../../commons/Header';
@@ -184,7 +184,11 @@ const HanetCameraDetail = ({ route }) => {
               onPress={handleShowMenuAction}
               ref={refMenuAction}
             >
-              <Icon name={'more'} size={27} color={Colors.Black} />
+              <MaterialIcons
+                name={'more-vert'}
+                size={27}
+                color={Colors.Black}
+              />
             </TouchableOpacity>
           </View>
         );

package/src/screens/HanetCamera/ManageAccess.js

@@ -1,8 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
 import { View, TouchableOpacity, Image, FlatList } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import { Icon } from '@ant-design/react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { HeaderCustom } from '../../commons/Header';
 import Text from '../../commons/Text';
 import RequestFaceIDPopup from './components/RequestFaceIDPopup';
@@ -75,7 +74,7 @@ const HanetManageAccess = ({ route }) => {
             {' '}
             {item.name}
           </Text>
-          <IconOutline name="right" size={20} color={Colors.Gray6} />
+          <AntDesign name="right" size={20} color={Colors.Gray6} />
         </TouchableOpacity>
       );
     },
@@ -90,7 +89,7 @@ const HanetManageAccess = ({ route }) => {
           onPress={setShowAddMemberModal}
           accessibilityLabel={AccessibilityLabel.HANET_MANAGE_ACCESS_ADD_BUTTON}
         >
-          <Icon name={'plus'} size={27} color={Colors.Black} />
+          <AntDesign name={'plus'} size={27} color={Colors.Black} />
         </TouchableOpacity>
       </View>
     ),

package/src/screens/HanetCamera/MemberInfo.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { View, TouchableOpacity, Image } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import { IconFill } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 
 import { HeaderCustom } from '../../commons/Header';
 import { AlertAction, FullLoading } from '../../commons';
@@ -78,9 +78,9 @@ const HanetMemberInfo = ({ route }) => {
       }
     );
     if (success) {
-      setMemberAvatar(data.avatar_uri);
+      setMemberAvatar(data?.avatar_uri);
     } else {
-      setError(data.detail);
+      setError(data?.detail);
     }
     setLoading(false);
   };
@@ -173,7 +173,7 @@ const HanetMemberInfo = ({ route }) => {
         onPress={setShowSetFaceIDModal}
         style={[styles.row, !!error && { borderBottomColor: Colors.Red6 }]}
       >
-        <IconFill name="camera" size={27} color={Colors.Primary} />
+        <AntDesign name="camera" size={27} color={Colors.Primary} />
         <Text
           type="Body"
           bold

package/src/screens/HanetCamera/__test__/CaptureFaceID.test.js

@@ -17,25 +17,11 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-  };
-});
-
 const mockSetAvatar = jest.fn();
 describe('Test HanetCaptureFaceID', () => {
   let tree, route;
 
   beforeEach(() => {
-    mockedNavigate.mockClear();
-    mockedGoBack.mockClear();
     mockSetAvatar.mockClear();
     route = {
       params: {
@@ -100,7 +86,7 @@ describe('Test HanetCaptureFaceID', () => {
       await touches[1].props.onPress();
     });
     expect(mockSetAvatar).toHaveBeenCalled();
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('Test set face id for new member', async () => {
@@ -117,6 +103,6 @@ describe('Test HanetCaptureFaceID', () => {
     await act(async () => {
       await touches[1].props.onPress();
     });
-    expect(mockedNavigate).toHaveBeenCalled();
+    expect(global.mockedNavigate).toHaveBeenCalled();
   });
 });

package/src/screens/HanetCamera/__test__/Detail.test.js

@@ -22,17 +22,6 @@ const wrapComponent = (route) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useRoute: jest.fn(),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
-
 describe('Test HanetCameraDetail', () => {
   Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
   let tree, route, responseDisplay, responseCheckin;
@@ -114,7 +103,7 @@ describe('Test HanetCameraDetail', () => {
     expect(textCountStranger.props.children).toBe(1);
     const MenuActionMores = instance.findByType(MenuActionMore);
     await MenuActionMores.props.onItemClick({ data: 'test' });
-    expect(mockNavigate).toBeCalled();
+    expect(global.mockedNavigate).toBeCalled();
   });
 
   it('Test change date', async () => {

package/src/screens/HanetCamera/__test__/ManageAccess.test.js

@@ -21,22 +21,11 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-    useIsFocused: () => true,
-  };
-});
-
 describe('Test HanetManageAccess', () => {
   let tree, route, response;
 
   beforeEach(() => {
-    mockedNavigate.mockClear();
+    global.mockedNavigate.mockClear();
     route = {
       params: {
         hanetPlace: {
@@ -82,7 +71,7 @@ describe('Test HanetManageAccess', () => {
     await act(async () => {
       touches[0].props.onPress();
     });
-    expect(mockedNavigate).toBeCalled();
+    expect(global.mockedNavigate).toBeCalled();
   });
 
   const chooseAddMemberOption = async (instance, index) => {
@@ -115,7 +104,7 @@ describe('Test HanetManageAccess', () => {
     await chooseAddMemberOption(instance, 0);
 
     expect(bottomSheet.props.isVisible).toBe(false);
-    expect(mockedNavigate).toBeCalledWith(Routes.HanetCaptureFaceID, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.HanetCaptureFaceID, {
       title: 'Add new member',
       hanetPlace: {
         place_id: 1,
@@ -139,7 +128,7 @@ describe('Test HanetManageAccess', () => {
     await chooseAddMemberOption(instance, 1);
 
     expect(bottomSheet.props.isVisible).toBe(false);
-    expect(mockedNavigate).toBeCalledWith(Routes.HanetMemberInfo, {
+    expect(global.mockedNavigate).toBeCalledWith(Routes.HanetMemberInfo, {
       hanetPlace: {
         place_id: 1,
       },
@@ -168,6 +157,6 @@ describe('Test HanetManageAccess', () => {
     await chooseAddMemberOption(instance, 1);
 
     expect(bottomSheet.props.isVisible).toBe(false);
-    expect(mockedNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toBeCalled();
   });
 });

package/src/screens/HanetCamera/__test__/MemberInfo.test.js

@@ -13,6 +13,7 @@ import BottomSheet from '../../../commons/BottomSheet';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import api from '../../../utils/Apis/axios';
 import { API } from '../../../configs';
+import { useNavigation } from '@react-navigation/native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -20,27 +21,13 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-    useIsFocused: () => true,
-  };
-});
-
 const mock = new MockAdapter(api.axiosInstance);
 
 describe('Test HanetMemberInfo', () => {
   let tree, route;
+  const { goBack, navigate } = useNavigation();
 
   beforeEach(() => {
-    mockedNavigate.mockClear();
-    mockedGoBack.mockClear();
     route = {
       params: {
         hanetPlace: {
@@ -96,7 +83,7 @@ describe('Test HanetMemberInfo', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(goBack).toHaveBeenCalled();
   });
 
   const chooseSetFaceIDOption = async (instance, index) => {
@@ -126,7 +113,7 @@ describe('Test HanetMemberInfo', () => {
     await chooseSetFaceIDOption(instance, 0);
 
     expect(bottomSheet.props.isVisible).toBe(false);
-    expect(mockedNavigate).toBeCalled(); // navigate to HanetCaptureFaceID
+    expect(navigate).toBeCalled(); // navigate to HanetCaptureFaceID
   });
 
   it('Test set photo id choose file', async () => {
@@ -189,6 +176,6 @@ describe('Test HanetMemberInfo', () => {
     await act(async () => {
       await bottomButton.props.onPressMain();
     });
-    expect(mockedNavigate).toBeCalled();
+    expect(navigate).toBeCalled();
   });
 });

package/src/screens/HanetCamera/components/RequestFaceIDPopup.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { TouchableOpacity, StyleSheet } from 'react-native';
 import ImagePicker from 'react-native-image-crop-picker';
-import { IconFill } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import Text from '../../../commons/Text';
 import BottomSheet from '../../../commons/BottomSheet';
 import { Colors } from '../../../configs';
@@ -19,7 +19,7 @@ const RequestFaceIDPopup = ({
   const t = useTranslations();
   const options = [
     {
-      icon: <IconFill name="camera" color={Colors.Gray9} size={27} />,
+      icon: <AntDesign name="camera" color={Colors.Gray9} size={27} />,
       text: t('capture_image'),
       onChoose: () => {
         setHide();

package/src/screens/ManageAccess/__test__/ManageAccess.test.js

@@ -14,21 +14,6 @@ import { API } from '../../../configs';
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockUseIsFocused = jest.fn();
-const mockedNavigate = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useRoute: jest.fn(),
-    useNavigation: () => ({
-      goBack: jest.fn(),
-      navigate: mockedNavigate,
-    }),
-    useIsFocused: () => mockUseIsFocused,
-  };
-});
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <ManageAccessScreen route={route} />
@@ -40,7 +25,6 @@ describe('Test Manage Access', () => {
   let route;
 
   beforeEach(() => {
-    mockedNavigate.mockClear();
     route = {
       params: {
         unit: {
@@ -56,7 +40,7 @@ describe('Test Manage Access', () => {
   });
 
   it('render Manage Access', async () => {
-    mockUseIsFocused.mockImplementation(() => true);
+    global.mockedUseIsFocused.mockImplementation(() => true);
     mock.onGet(API.UNIT.MANAGE_ACCESS(1)).reply(200, [
       {
         id: 1,
@@ -86,13 +70,13 @@ describe('Test Manage Access', () => {
     await act(async () => {
       await memberButton[0].props.onPress();
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.GuestInfo, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.GuestInfo, {
       id: 1,
     });
   });
 
   it('render Manage Access without params', async () => {
-    mockUseIsFocused.mockImplementation(() => false);
+    global.mockedUseIsFocused.mockImplementation(() => false);
     await act(async () => {
       tree = await create(wrapComponent({}));
     });

package/src/screens/ManageAccess/index.js

@@ -9,7 +9,7 @@ import {
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { HeaderCustom } from '../../commons/Header';
-import { IconOutline } from '@ant-design/icons-react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import styles from './styles/ManageAccessStyles';
 import { Colors } from '../../configs';
 import Text from '../../commons/Text';
@@ -75,7 +75,7 @@ const ManageAccessScreen = memo(({ route }) => {
                             // accessibilityLabel={AccessibilityLabel.SIDE_MENU_AVATAR_USER}
                           />
                         ) : (
-                          <IconOutline
+                          <AntDesign
                             name="user"
                             size={20}
                             color={Colors.White}
@@ -90,7 +90,7 @@ const ManageAccessScreen = memo(({ route }) => {
                       subtext={item.schedule}
                       onPress={() => goToGuestInfo(item.id)}
                       rightComponent={
-                        <IconOutline
+                        <AntDesign
                           name="right"
                           size={20}
                           color={Colors.Gray6}

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

@@ -79,10 +79,10 @@ describe('Test Render ListSubUnit', () => {
       },
     },
   };
-  const mockNavigate = useNavigation().navigate;
+  const mockedNavigate = useNavigation().navigate;
 
   beforeEach(() => {
-    mockNavigate.mockReset();
+    mockedNavigate.mockReset();
   });
 
   it('render ListSubUnit with out params', async () => {
@@ -128,18 +128,18 @@ describe('Test Render ListSubUnit', () => {
       await bottomButtonView.props.onPressMain();
     });
 
-    expect(mockNavigate).toBeCalled();
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(global.mockedNavigate).toBeCalled();
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
     await act(async () => {
-      await TouchableOpacities[2].props.onPress();
+      await touchableOpacities[2].props.onPress();
     });
 
-    mockNavigate.mockClear();
+    mockedNavigate.mockClear();
     mock.onPatch(API.DEVICE.CHANGE_SUB_UNIT(200, 3, 73)).reply(400);
 
     await act(async () => {
       await bottomButtonView.props.onPressMain();
     });
-    expect(mockNavigate).not.toBeCalled();
+    expect(global.mockedNavigate).not.toBeCalled();
   });
 });

package/src/screens/Notification/__test__/Notification.test.js

@@ -73,9 +73,7 @@ describe('test Notification', () => {
         },
       ],
     };
-    mock
-      .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, ''))
-      .reply(200, response);
+    mock.onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1)).reply(200, response);
     await act(async () => {
       tree = await create(wrapComponent());
     });
@@ -101,9 +99,7 @@ describe('test Notification', () => {
         type: 'NEWS',
       });
     }
-    mock
-      .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, ''))
-      .reply(200, response);
+    mock.onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1)).reply(200, response);
     await act(async () => {
       tree = await create(wrapComponent());
     });
@@ -112,9 +108,7 @@ describe('test Notification', () => {
     expect(wrapHeaderScrollable.props.disableLoadMore).toEqual(false);
 
     const scrollView = instance.findByType(Animated.ScrollView);
-    mock
-      .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(2, ''))
-      .reply(200, response);
+    mock.onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(2)).reply(200, response);
     await act(async () => {
       scrollView.props.onMomentumScrollEnd();
     });
@@ -144,9 +138,7 @@ describe('test Notification', () => {
         },
       ],
     };
-    mock
-      .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, ''))
-      .reply(200, response);
+    mock.onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1)).reply(200, response);
     await act(async () => {
       tree = await create(wrapComponent());
     });
@@ -179,9 +171,7 @@ describe('test Notification', () => {
         },
       ],
     };
-    mock
-      .onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, ''))
-      .reply(200, response);
+    mock.onGet(API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1)).reply(200, response);
     await act(async () => {
       tree = await create(wrapComponent());
     });

package/src/screens/Notification/__test__/NotificationItem.test.js

@@ -20,20 +20,10 @@ const wrapComponent = (item, stateData = {}) => (
 
 const mock = new MockAdapter(api.axiosInstance);
 
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
-
 describe('test NotificationItem', () => {
   let item = {};
   beforeEach(() => {
-    mockNavigate.mockClear();
+    global.mockedNavigate.mockClear();
     item = {
       id: 1,
       content_code: '',
@@ -71,7 +61,7 @@ describe('test NotificationItem', () => {
       await act(async () => {
         button.props.onPress();
       });
-      expect(mockNavigate).not.toHaveBeenCalled();
+      expect(global.mockedNavigate).not.toHaveBeenCalled();
     });
   }
 
@@ -97,7 +87,7 @@ describe('test NotificationItem', () => {
       await act(async () => {
         button.props.onPress();
       });
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
         screen: Routes.UnitDetail,
         params: {
           unitId: 1,
@@ -123,7 +113,7 @@ describe('test NotificationItem', () => {
       await act(async () => {
         button.props.onPress();
       });
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
         screen: Routes.DeviceDetail,
         params: {
           unitId: 1,
@@ -155,7 +145,7 @@ describe('test NotificationItem', () => {
       await act(async () => {
         button.props.onPress();
       });
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
         screen: Routes.UnitSummary,
         params: {
           summaryId: 11,
@@ -188,7 +178,7 @@ describe('test NotificationItem', () => {
       await act(async () => {
         button.props.onPress();
       });
-      expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
         screen: Routes.DeviceDetail,
         params: {
           unitId: 70,
@@ -214,7 +204,7 @@ describe('test NotificationItem', () => {
     await act(async () => {
       button.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
       screen: Routes.UnitSummary,
       params: {
         summaryId: 11,
@@ -250,7 +240,7 @@ describe('test NotificationItem', () => {
     await act(async () => {
       button.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
       screen: Routes.DeviceDetail,
       params: {
         unitId: 1,
@@ -275,7 +265,7 @@ describe('test NotificationItem', () => {
     await act(async () => {
       button.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
       screen: Routes.DeviceDetail,
       params: {
         unitId: 1,

package/src/screens/Notification/index.js

@@ -1,6 +1,6 @@
 import React, { memo, useMemo, useState, useCallback, useEffect } from 'react';
 import { View, TouchableOpacity } from 'react-native';
-import { Icon } from '@ant-design/react-native';
+import AntDesign from 'react-native-vector-icons/AntDesign';
 import { useFocusEffect } from '@react-navigation/native';
 
 import styles from './styles/indexStyles';
@@ -33,7 +33,7 @@ const Notification = memo(() => {
             notImplemented(t);
           }}
         >
-          <Icon name={'plus'} size={27} color={Colors.Black} />
+          <AntDesign name={'plus'} size={27} color={Colors.Black} />
         </TouchableOpacity>
 
         <TouchableOpacity
@@ -41,7 +41,7 @@ const Notification = memo(() => {
             notImplemented(t);
           }}
         >
-          <Icon name={'search'} size={27} color={Colors.Black} />
+          <AntDesign name={'search1'} size={27} color={Colors.Black} />
         </TouchableOpacity>
       </View>
     ),
@@ -51,7 +51,7 @@ const Notification = memo(() => {
 
   const fetchNotifications = useCallback(async (pageParam) => {
     const { success, data } = await axiosGet(
-      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(pageParam, '')
+      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(pageParam)
     );
     if (success) {
       setNotifications((preState) => preState.concat(data.results));
@@ -69,7 +69,7 @@ const Notification = memo(() => {
   const onRefresh = useCallback(async () => {
     setPage(1);
     const { success, data } = await axiosGet(
-      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1, '')
+      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1)
     );
     if (success) {
       setNotifications(data.results);