diff --git a/android/app/build.gradle b/android/app/build.gradle index 960dcb51..6c3b1756 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,7 +105,7 @@ android { applicationId "com.betterrail" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 88 + versionCode 90 versionName "2.3.3" missingDimensionStrategy "store", "play" } diff --git a/app/utils/notification-helpers.ts b/app/utils/notification-helpers.ts index 9a1cff97..78f636a8 100644 --- a/app/utils/notification-helpers.ts +++ b/app/utils/notification-helpers.ts @@ -1,5 +1,5 @@ import messaging, { FirebaseMessagingTypes } from "@react-native-firebase/messaging" -import notifee, { AndroidImportance, AndroidLaunchActivityFlag, EventType, TriggerType } from "@notifee/react-native" +import notifee, { AndroidImportance, EventType, TriggerType } from "@notifee/react-native" import { RideState, RideStatus, getStatusEndDate, rideProgress } from "../hooks/use-ride-progress" import { RideApi, RouteItem } from "../services/api" import { findClosestStationInRoute, getRideStatus, getTrainFromStationId } from "./helpers/ride-helpers" @@ -93,8 +93,6 @@ const handleLiveRideNotification = async (message: FirebaseMessagingTypes.Remote timeoutAfter: 60 * 1000, pressAction: { id: "default", - launchActivity: "com.betterrail.MainActivity", - launchActivityFlags: [AndroidLaunchActivityFlag.SINGLE_TOP], }, }, }) @@ -155,8 +153,6 @@ const handleServiceUpdateNotification = async (message: FirebaseMessagingTypes.R smallIcon: "notification_icon", pressAction: { id: "default", - launchActivity: "com.betterrail.MainActivity", - launchActivityFlags: [AndroidLaunchActivityFlag.SINGLE_TOP], }, }, }) @@ -254,8 +250,6 @@ const updateNotification = async (route: RouteItem, state: RideState) => { timeoutAfter: state.status === "arrived" ? 3 * 60 * 1000 : undefined, pressAction: { id: "default", - launchActivity: "com.betterrail.MainActivity", - launchActivityFlags: [AndroidLaunchActivityFlag.SINGLE_TOP], }, }, }) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 38346180..3438d0a7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2484,10 +2484,10 @@ PODS: - React-Core - RNInAppBrowser (3.7.0): - React-Core - - RNNotifee (7.8.0): + - RNNotifee (9.1.2): - React-Core - - RNNotifee/NotifeeCore (= 7.8.0) - - RNNotifee/NotifeeCore (7.8.0): + - RNNotifee/NotifeeCore (= 9.1.2) + - RNNotifee/NotifeeCore (9.1.2): - React-Core - RNReactNativeHapticFeedback (2.3.3): - DoubleConversion @@ -3097,7 +3097,7 @@ SPEC CHECKSUMS: RNGestureHandler: 939f21fabf5d45a725c0bf175eb819dd25cf2e70 RNIap: 38776f86996edea5837ba2a0dfc1e35427191327 RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364 - RNNotifee: f3c01b391dd8e98e67f539f9a35a9cbcd3bae744 + RNNotifee: bc20a5e3d581f629db988075944fdd944d363dfe RNReactNativeHapticFeedback: 0d591ea1e150f36cb96d868d4e8d77272243d78a RNReanimated: b0912c8ba12f6c03db07c851c4de71c3eed6c83c RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06 @@ -3108,7 +3108,7 @@ SPEC CHECKSUMS: SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d SPAlert: 735da1f16a887e294719217572ce1f936d8c8782 SPIndicator: 93e0a4fb23de51294ac48e874c0f081a5e293e4f - Yoga: aa3df615739504eebb91925fc9c58b4922ea9a08 + Yoga: 055f92ad73f8c8600a93f0e25ac0b2344c3b07e6 PODFILE CHECKSUM: 44a26264f6cd33442848b186227025ac1a856570 diff --git a/package.json b/package.json index 807e73e4..fd81b3de 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "@expo/react-native-action-sheet": "^4.1.0", "@gorhom/bottom-sheet": "^4", - "@notifee/react-native": "^7.7.1", + "@notifee/react-native": "^9.1.2", "@react-native-async-storage/async-storage": "^2.0.0", "@react-native-community/blur": "^4.3.2", "@react-native-community/datetimepicker": "^8.2.0", diff --git a/yarn.lock b/yarn.lock index 09a9c292..64e69444 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2833,10 +2833,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@notifee/react-native@^7.7.1": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@notifee/react-native/-/react-native-7.8.0.tgz#2990883753990f3585aa0cb5becc5cbdbcd87a43" - integrity sha512-sx8h62U4FrR4pqlbN1rkgPsdamDt9Tad0zgfO6VtP6rNJq/78k8nxUnh0xIX3WPDcCV8KAzdYCE7+UNvhF1CpQ== +"@notifee/react-native@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@notifee/react-native/-/react-native-9.1.2.tgz#e82a6007cf6350e7f5b55883f682fbb833336942" + integrity sha512-oUabHwBtu7Zkos898mZkFb3t1by7PPJmXAWS5Kl5VQSxjNUyVA9kk6a1p31TUDKCkV083tN33scT+cyLnyKMzw== "@npmcli/fs@^3.1.0": version "3.1.1" @@ -18015,7 +18015,7 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -18041,15 +18041,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -18196,7 +18187,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18224,13 +18215,6 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -19840,7 +19824,7 @@ workerpool@6.0.2: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.2.tgz#e241b43d8d033f1beb52c7851069456039d1d438" integrity sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -19867,15 +19851,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"