diff --git a/android/app/build.gradle b/android/app/build.gradle index 5464bebb..4a8a8fbb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -134,8 +134,8 @@ def reactNativeArchitectures() { return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] } -def VERSION_CODE = 169 -def VERSION_NAME = "2.11.3" +def VERSION_CODE = 170 +def VERSION_NAME = "2.11.4" android { ndkVersion rootProject.ext.ndkVersion diff --git a/package.json b/package.json index 15f200d3..2f7dc1c6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "name": "AV_APP", - "version": "2.11.3", - "buildNumber": "169", + "version": "2.11.4", + "buildNumber": "170", + "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android", diff --git a/src/hooks/useFCM/notificationHelperFunctions.ts b/src/hooks/useFCM/notificationHelperFunctions.ts index 22feedd4..73a90028 100644 --- a/src/hooks/useFCM/notificationHelperFunctions.ts +++ b/src/hooks/useFCM/notificationHelperFunctions.ts @@ -21,7 +21,8 @@ import { DAY_MONTH_DATE_FORMAT, } from '@rn-ui-lib/utils/dates'; import { DashBoardScreensEnum } from "@screens/Dashboard/DashBoardScreens"; -import { BOTTOM_TAB_ROUTES } from "@screens/allCases/constants"; +import { BOTTOM_TAB_ROUTES, TABS_KEYS } from "@screens/allCases/constants"; +import { setSortTabSelected } from '@reducers/nearbyCasesSlice'; // Actions that can be performed on notification export enum NotificationAction { @@ -475,11 +476,13 @@ export const handleRevivalNotificationNavigation = (action: string, notification }); break; case NotificationAction.VIEW_NEARBY_CASES: - navigateToScreen(PageRouteEnum.HOME, { + { + store?.dispatch(setSortTabSelected?.(TABS_KEYS.NEAREST_CASE)); + navigateToScreen(PageRouteEnum.HOME, { screen: BOTTOM_TAB_ROUTES.Cases, params: { allCasesView: true }, }); - break; + break;} case NotificationAction.VIEW_AGENT_PERFORMANCE_DASHBOARD: navigateToScreen(BOTTOM_TAB_ROUTES.Dashboard); break; diff --git a/src/screens/allCases/ListItem.tsx b/src/screens/allCases/ListItem.tsx index 91ede626..b988c926 100644 --- a/src/screens/allCases/ListItem.tsx +++ b/src/screens/allCases/ListItem.tsx @@ -255,7 +255,7 @@ const ListItem: React.FC = (props) => { ) : null} - {distanceOfCaseItem ? ( + {allCasesView && distanceOfCaseItem ? (