diff --git a/src/components/TypeChangeNotify.tsx b/src/components/TypeChangeNotify.tsx index 145748294..2f36e6039 100644 --- 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 ( diff --git a/src/hooks/useTypeWillChange.ts b/src/hooks/useTypeWillChange.ts index 2e7f3bc50..f3a330aad 100644 --- 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