diff --git a/components/Menu/Carousel/CarouselBox.tsx b/components/Menu/Carousel/CarouselBox.tsx index 110e66e..3a54a9a 100644 --- a/components/Menu/Carousel/CarouselBox.tsx +++ b/components/Menu/Carousel/CarouselBox.tsx @@ -106,7 +106,7 @@ export const CarouselBox = ({ onPress={() => setSelectedCurrentStation(index)} currentStation={d} active={active} - key={numberIndex} + key={numberIndex + index} /> ); } else { @@ -114,7 +114,7 @@ export const CarouselBox = ({ setSelectedCurrentStation(index)} active={active} - key={numberIndex} + key={numberIndex + index} /> ); } diff --git a/menu.js b/menu.js index 015f5cb..09a7fdb 100644 --- a/menu.js +++ b/menu.js @@ -113,7 +113,7 @@ export default function Menu({ getCurrentTrain, scrollRef }) { ); } else { setAllStationData( - [currentStation, ...favoriteStation].filter((d) => d != undefined) + favoriteStation.filter((d) => d != undefined) ); } }, [currentStation, favoriteStation, stationListMode]);