diff --git a/native/src/components/DashboardNavigationTiles.tsx b/native/src/components/DashboardNavigationTiles.tsx index 826a37cd92..5258a394b1 100644 --- a/native/src/components/DashboardNavigationTiles.tsx +++ b/native/src/components/DashboardNavigationTiles.tsx @@ -39,51 +39,51 @@ const DashboardNavigationTiles = ({ const isNewsEnabled = tunewsEnabled || localNewsEnabled const tiles = [] - if (featureFlags.newsStream && isNewsEnabled) { + if (cityModel.poisEnabled && featureFlags.pois) { tiles.push( new TileModel({ - title: t('news'), - path: 'news', - thumbnail: NewsIcon, + title: t('pois'), + path: 'pois', + thumbnail: POIsIcon, isExternalUrl: false, onTilePress: () => navigateTo({ - route: NEWS_ROUTE, + route: POIS_ROUTE, cityCode, languageCode, - newsType: localNewsEnabled ? LOCAL_NEWS_TYPE : TU_NEWS_TYPE, }), }), ) } - if (cityModel.eventsEnabled) { + if (featureFlags.newsStream && isNewsEnabled) { tiles.push( new TileModel({ - title: t('events'), - path: 'events', - thumbnail: CalendarIcon, + title: t('news'), + path: 'news', + thumbnail: NewsIcon, isExternalUrl: false, onTilePress: () => navigateTo({ - route: EVENTS_ROUTE, + route: NEWS_ROUTE, cityCode, languageCode, + newsType: localNewsEnabled ? LOCAL_NEWS_TYPE : TU_NEWS_TYPE, }), }), ) } - if (cityModel.poisEnabled && featureFlags.pois) { + if (cityModel.eventsEnabled) { tiles.push( new TileModel({ - title: t('pois'), - path: 'pois', - thumbnail: POIsIcon, + title: t('events'), + path: 'events', + thumbnail: CalendarIcon, isExternalUrl: false, onTilePress: () => navigateTo({ - route: POIS_ROUTE, + route: EVENTS_ROUTE, cityCode, languageCode, }), diff --git a/release-notes/unreleased/2468-reorder-the-icons-in-header.yml b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml new file mode 100644 index 0000000000..6bf867ecf8 --- /dev/null +++ b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml @@ -0,0 +1,8 @@ +issue_key: 2468 +show_in_stores: true +platforms: + - web + - android + - ios +en: Reordered icons in the header +de: GeƤnderte Reihenfolge der Icons im Header diff --git a/web/src/components/CityContentHeader.tsx b/web/src/components/CityContentHeader.tsx index 6f2903cd32..fe716e477f 100644 --- a/web/src/components/CityContentHeader.tsx +++ b/web/src/components/CityContentHeader.tsx @@ -100,6 +100,18 @@ const CityContentHeader = ({ />, ] + if (isPoisVisible) { + items.push( + , + ) + } + if (isNewsVisible) { items.push( , - ) - } - return items }