From fa4181ecb451028fe16c46e0fc46acf3bf3c32d1 Mon Sep 17 00:00:00 2001
From: janichla <laura.janich@freenet.de>
Date: Fri, 15 Nov 2024 12:19:08 +0100
Subject: [PATCH 1/3] Reordered header icons in web

---
 web/src/components/CityContentHeader.tsx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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(
+        <HeaderNavigationItem
+          key='locations'
+          to={poisPath}
+          active={route === POIS_ROUTE}
+          text={t('locations')}
+          icon={POIsIcon}
+        />,
+      )
+    }
+
     if (isNewsVisible) {
       items.push(
         <HeaderNavigationItem
@@ -124,18 +136,6 @@ const CityContentHeader = ({
       )
     }
 
-    if (isPoisVisible) {
-      items.push(
-        <HeaderNavigationItem
-          key='locations'
-          to={poisPath}
-          active={route === POIS_ROUTE}
-          text={t('locations')}
-          icon={POIsIcon}
-        />,
-      )
-    }
-
     return items
   }
 

From 00f5b9a87fc20026df867e279c1464e033d123f8 Mon Sep 17 00:00:00 2001
From: Laura Janich <167319888+janichla@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:06:34 +0100
Subject: [PATCH 2/3] Added release node

---
 .../unreleased/2468-reorder-the-icons-in-header.yml         | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 release-notes/unreleased/2468-reorder-the-icons-in-header.yml

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..abdf67397a
--- /dev/null
+++ b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml
@@ -0,0 +1,6 @@
+issue_key: 2468
+show_in_stores: true
+platforms: # relevant platforms, possible values: web, android and ios
+  - web
+en: Reordered icons in the header
+de: Geänderte Reihenfolge der Icons im Header

From 02cfcb9c3c8ee481c19d9965c352d524145eb249 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Wed, 20 Nov 2024 10:23:21 +0100
Subject: [PATCH 3/3] 2468: Reorder header icons native

---
 .../components/DashboardNavigationTiles.tsx   | 32 +++++++++----------
 .../2468-reorder-the-icons-in-header.yml      |  4 ++-
 2 files changed, 19 insertions(+), 17 deletions(-)

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
index abdf67397a..6bf867ecf8 100644
--- a/release-notes/unreleased/2468-reorder-the-icons-in-header.yml
+++ b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml
@@ -1,6 +1,8 @@
 issue_key: 2468
 show_in_stores: true
-platforms: # relevant platforms, possible values: web, android and ios
+platforms:
   - web
+  - android
+  - ios
 en: Reordered icons in the header
 de: Geänderte Reihenfolge der Icons im Header