Merge pull request #3794 from TrainLCD/release/canary

Release/canary

android/app/build.gradle

@@ -121,7 +121,7 @@ android {
         applicationIdSuffix ".dev"
         versionNameSuffix "-dev"
         // 10203010 <- 10203(v1.2.3 version name)+01(build number)+0(Android app)
-        versionCode 80000480
+        versionCode 80000490
         versionName "8.0.0"
       }
       prod {

android/wearable/build.gradle.kts

@@ -34,7 +34,7 @@ android {
       applicationIdSuffix = ".dev"
       versionNameSuffix = "-dev"
       // 10203011 <- 10203(v1.2.3 version name)+01(build number)+1(Wearable app)
-      versionCode = 80000481
+      versionCode = 80000491
       versionName = "8.0.0"
     }
     create("prod") {

package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@connectrpc/connect-query": "^1.3.1",
     "@expo/react-native-action-sheet": "^3.8.0",
-    "@expo/vector-icons": "^14.0.0",
+    "@expo/vector-icons": "^14.0.4",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-community/netinfo": "11.3.1",
     "@react-native-firebase/analytics": "^18.3.2",

src/screens/RouteSearchScreen.tsx

@@ -30,6 +30,7 @@ import { FONTS } from '../constants'
 import { useCurrentStation } from '../hooks/useCurrentStation'
 import { useThemeStore } from '../hooks/useThemeStore'
 import { useTrainTypeStations } from '../hooks/useTrainTypeStations'
+import { LineDirection } from '../models/Bound'
 import { APP_THEME } from '../models/Theme'
 import lineState from '../store/atoms/line'
 import navigationState from '../store/atoms/navigation'
@@ -174,8 +175,27 @@ const RouteSearchScreen = () => {
       )?.trainType
 
       if (!trainType?.id) {
+        const direction: LineDirection =
+          (route?.stops ?? []).findIndex(
+            (s) => s.groupId === currentStation?.groupId
+          ) <
+          (route?.stops ?? []).findIndex(
+            (s) => selectedStation?.groupId === s.groupId
+          )
+            ? 'INBOUND'
+            : 'OUTBOUND'
+
+        setStationState((prev) => ({
+          ...prev,
+          stations: route?.stops ?? [],
+          selectedDirection: direction,
+          selectedBound:
+            (direction === 'INBOUND'
+              ? route?.stops[0]
+              : route?.stops[route.stops.length - 1]) ?? null,
+        }))
         setNavigationState((prev) => ({ ...prev, trainType: null }))
-        navigation.navigate('SelectBound')
+        navigation.navigate('Main')
         return
       }
 
@@ -187,17 +207,32 @@ const RouteSearchScreen = () => {
         (s) => s.groupId === currentStation?.groupId
       )
 
+      const direction: LineDirection =
+        data.stations.findIndex((s) => s.groupId === currentStation?.groupId) <
+        data.stations.findIndex((s) => selectedStation?.groupId === s.groupId)
+          ? 'INBOUND'
+          : 'OUTBOUND'
+
       setNavigationState((prev) => ({
         ...prev,
         trainType: station?.trainType ?? null,
       }))
-      setStationState((prev) => ({ ...prev, stations: data.stations }))
-      navigation.navigate('SelectBound')
+      setStationState((prev) => ({
+        ...prev,
+        stations: data.stations,
+        selectedDirection: direction,
+        selectedBound:
+          (direction === 'INBOUND'
+            ? route?.stops[0]
+            : route?.stops[route.stops.length - 1]) ?? null,
+      }))
+      navigation.navigate('Main')
     },
     [
       currentStation?.groupId,
       fetchTrainTypeFromTrainTypeId,
       navigation,
+      selectedStation?.groupId,
       setNavigationState,
       setStationState,
     ]