diff --git a/ios/TrainLCD.xcodeproj/project.pbxproj b/ios/TrainLCD.xcodeproj/project.pbxproj index df9e9fab8..3ad9c0948 100644 --- a/ios/TrainLCD.xcodeproj/project.pbxproj +++ b/ios/TrainLCD.xcodeproj/project.pbxproj @@ -1457,7 +1457,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1495,7 +1495,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1586,7 +1586,7 @@ "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; @@ -1672,7 +1672,7 @@ "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -1708,7 +1708,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1746,7 +1746,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1784,7 +1784,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Dev/Info.plist; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -1823,7 +1823,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Dev/Info.plist; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.dev.watchkitapp; @@ -1865,7 +1865,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -1909,7 +1909,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.dev.watchkitapp.watchkitextension; @@ -1953,7 +1953,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2001,7 +2001,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.dev.ridesessionactivity; @@ -2047,7 +2047,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2095,7 +2095,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.ridesessionactivity; @@ -2139,7 +2139,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2183,7 +2183,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp.watchkitextension; @@ -2221,7 +2221,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -2261,7 +2261,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Schemes/Prod/Info.plist; - MARKETING_VERSION = 8.1.0; + MARKETING_VERSION = 8.1.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = me.tinykitten.trainlcd.watchkitapp; diff --git a/src/hooks/useUpdateLiveActivities.ts b/src/hooks/useUpdateLiveActivities.ts index 2457390c4..7d4a793cc 100644 --- a/src/hooks/useUpdateLiveActivities.ts +++ b/src/hooks/useUpdateLiveActivities.ts @@ -4,6 +4,7 @@ import { parenthesisRegexp } from '../constants' import { directionToDirectionName } from '../models/Bound' import stationState from '../store/atoms/station' import { isJapanese } from '../translation' +import getIsPass from '../utils/isPass' import { startLiveActivity, stopLiveActivity, @@ -91,7 +92,7 @@ export const useUpdateLiveActivities = (): void => { const stoppedStation = useMemo( () => - arrivedFromState && !approachingFromState + arrivedFromState && !approachingFromState && !getIsPass(currentStation) ? currentStation : previousStation, [approachingFromState, arrivedFromState, currentStation, previousStation]