Merge pull request #3581 from TrainLCD/revert-3578-fix/type-change

Revert "小田急対応時のデグレ修正"
TrainLCD · Jul 18, 2024 · f119349 · f119349
2 parents d452ebf + 18af349
commit f119349
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/components/TypeChangeNotify.tsx b/src/components/TypeChangeNotify.tsx
@@ -910,13 +910,6 @@ const TypeChangeNotify: React.FC = () => {
     }
   }, [theme])
 
-  if (
-    !selectedBound ||
-    currentTypeLastStation.groupId === selectedBound.groupId
-  ) {
-    return null
-  }
-
   return (
     <SafeAreaView style={styles.container}>
       <View style={styles.top}>

diff --git a/src/hooks/useTypeWillChange.ts b/src/hooks/useTypeWillChange.ts
@@ -8,20 +8,16 @@ export const useTypeWillChange = (): boolean => {
   const nextTrainType = useNextTrainType()
 
   const nextTrainTypeIsDifferent = useMemo(() => {
-    if (!trainType || !nextTrainType) {
+    if (!trainType) {
       return false
     }
 
-    if (getIsLocal(trainType) && getIsLocal(nextTrainType)) {
+    if (!nextTrainType) {
       return false
     }
 
-    // 小田急の路線同一で途中種別が変わる対応
-    if (
-      trainType.line?.id === nextTrainType.line?.id &&
-      trainType.line?.company?.id === nextTrainType.line?.company?.id
-    ) {
-      return true
+    if (getIsLocal(trainType) && getIsLocal(nextTrainType)) {
+      return false
     }
 
     return trainType?.typeId !== nextTrainType?.typeId