From 7cf7a9529a99658c4e5cc0d59279a36f9dac2b28 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 2 Sep 2024 16:29:45 +0200
Subject: [PATCH 01/42] 2173: Add a11y-language in categories

---
 native/src/components/Caption.tsx             | 12 ++++++++++--
 native/src/components/CategoryListItem.tsx    |  2 +-
 native/src/components/HeaderBox.tsx           | 10 ++++++++--
 native/src/components/ListItem.tsx            |  2 +-
 native/src/components/SubCategoryListItem.tsx |  2 +-
 native/src/components/Tile.tsx                |  5 +++--
 native/src/components/Tiles.tsx               |  2 +-
 7 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/native/src/components/Caption.tsx b/native/src/components/Caption.tsx
index 095bd944ca..5b0ae76b1c 100644
--- a/native/src/components/Caption.tsx
+++ b/native/src/components/Caption.tsx
@@ -1,6 +1,7 @@
-import React, { ReactElement } from 'react'
+import React, { ReactElement, useContext } from 'react'
 import styled from 'styled-components/native'
 
+import { AppContext } from '../contexts/AppContextProvider'
 import Text from './base/Text'
 
 const H1 = styled(Text)`
@@ -14,6 +15,13 @@ type CaptionProps = {
   title: string
 }
 
-const Caption = ({ title }: CaptionProps): ReactElement => <H1 android_hyphenationFrequency='full'>{title}</H1>
+const Caption = ({ title }: CaptionProps): ReactElement => {
+  const { languageCode } = useContext(AppContext)
+  return (
+    <H1 android_hyphenationFrequency='full' accessibilityLanguage={languageCode}>
+      {title}
+    </H1>
+  )
+}
 
 export default Caption
diff --git a/native/src/components/CategoryListItem.tsx b/native/src/components/CategoryListItem.tsx
index 0204a9820f..fa942cb948 100644
--- a/native/src/components/CategoryListItem.tsx
+++ b/native/src/components/CategoryListItem.tsx
@@ -68,7 +68,7 @@ const CategoryListItem = ({
   onItemPress,
 }: CategoryListItemProps): ReactElement => (
   <>
-    <FlexStyledLink onPress={() => onItemPress({ path: category.path })}>
+    <FlexStyledLink onPress={() => onItemPress({ path: category.path })} accessibilityLanguage={language}>
       <DirectionContainer language={language}>
         <CategoryEntryContainer>
           <TitleDirectionContainer language={language}>
diff --git a/native/src/components/HeaderBox.tsx b/native/src/components/HeaderBox.tsx
index 96b5954359..dabb56cccf 100644
--- a/native/src/components/HeaderBox.tsx
+++ b/native/src/components/HeaderBox.tsx
@@ -1,11 +1,12 @@
 import { HeaderBackButton } from '@react-navigation/elements'
-import React, { ReactElement } from 'react'
+import React, { ReactElement, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useWindowDimensions } from 'react-native'
 import styled, { useTheme } from 'styled-components/native'
 
 import { buildConfigAssets } from '../constants/buildConfig'
 import dimensions from '../constants/dimensions'
+import { AppContext } from '../contexts/AppContextProvider'
 import Icon from './base/Icon'
 
 const HorizontalLeft = styled.View`
@@ -37,6 +38,7 @@ const HeaderBox = ({ goBack, canGoBack = true, text }: HeaderBoxProps): ReactEle
   const deviceWidth = useWindowDimensions().width
   const theme = useTheme()
   const { t } = useTranslation('common')
+  const { languageCode } = useContext(AppContext)
 
   const AppIcon = buildConfigAssets().AppIcon
   const HeaderIcon = canGoBack ? (
@@ -49,10 +51,14 @@ const HeaderBox = ({ goBack, canGoBack = true, text }: HeaderBoxProps): ReactEle
   ) : (
     <StyledIcon Icon={AppIcon} />
   )
+
   return (
     <HorizontalLeft>
       {HeaderIcon}
-      <HeaderText allowFontScaling={false} fontSize={deviceWidth * dimensions.fontScaling}>
+      <HeaderText
+        allowFontScaling={false}
+        fontSize={deviceWidth * dimensions.fontScaling}
+        accessibilityLanguage={languageCode}>
         {text}
       </HeaderText>
     </HorizontalLeft>
diff --git a/native/src/components/ListItem.tsx b/native/src/components/ListItem.tsx
index ebe041db06..01d8831d3b 100644
--- a/native/src/components/ListItem.tsx
+++ b/native/src/components/ListItem.tsx
@@ -54,7 +54,7 @@ type ListItemProps = {
 }
 
 const ListItem = ({ language, title, thumbnail, children, Icon, navigateTo }: ListItemProps): ReactElement => (
-  <StyledPressable onPress={navigateTo}>
+  <StyledPressable onPress={navigateTo} accessibilityLanguage={language}>
     <ListItemView language={language}>
       <Thumbnail source={thumbnail} />
       <Description>
diff --git a/native/src/components/SubCategoryListItem.tsx b/native/src/components/SubCategoryListItem.tsx
index cde749da2f..1fb43679d8 100644
--- a/native/src/components/SubCategoryListItem.tsx
+++ b/native/src/components/SubCategoryListItem.tsx
@@ -42,7 +42,7 @@ const SubCategoryListItem = ({
   onItemPress,
   language,
 }: SubCategoryListItemProps): ReactElement => (
-  <FlexStyledLink onPress={() => onItemPress(subCategory)} language={language}>
+  <FlexStyledLink onPress={() => onItemPress(subCategory)} language={language} accessibilityLanguage={language}>
     <SubCategoryTitleContainer language={language}>
       {!!subCategory.thumbnail && (
         <CategoryThumbnail language={language} source={subCategory.thumbnail} resourceCache={resourceCache} />
diff --git a/native/src/components/Tile.tsx b/native/src/components/Tile.tsx
index 1af584a587..158a244e01 100644
--- a/native/src/components/Tile.tsx
+++ b/native/src/components/Tile.tsx
@@ -32,15 +32,16 @@ type TileProps = {
   tile: TileModel
   onTilePress: (tile: TileModel) => void
   resourceCache: PageResourceCacheStateType | undefined
+  language: string
 }
 
-const Tile = ({ onTilePress, tile, resourceCache }: TileProps): ReactElement => {
+const Tile = ({ onTilePress, tile, resourceCache, language }: TileProps): ReactElement => {
   const showSnackbar = useSnackbar()
   const openTile = () =>
     tile.isExternalUrl ? openExternalUrl(tile.path, showSnackbar).catch(reportError) : onTilePress(tile)
 
   return (
-    <TileContainer onPress={openTile}>
+    <TileContainer onPress={openTile} accessibilityLanguage={language}>
       <Thumbnail source={tile.thumbnail} resourceCache={resourceCache} />
       <TileTitle android_hyphenationFrequency='full'>{tile.title}</TileTitle>
     </TileContainer>
diff --git a/native/src/components/Tiles.tsx b/native/src/components/Tiles.tsx
index ac3ad9c570..08a1ffa5c8 100644
--- a/native/src/components/Tiles.tsx
+++ b/native/src/components/Tiles.tsx
@@ -29,7 +29,7 @@ const Tiles = ({ title, language, tiles, onTilePress, resourceCache }: TilesProp
     {!!title && <Caption title={title} />}
     <TilesRow language={language}>
       {tiles.map(tile => (
-        <Tile key={tile.path} tile={tile} onTilePress={onTilePress} resourceCache={resourceCache} />
+        <Tile key={tile.path} tile={tile} onTilePress={onTilePress} resourceCache={resourceCache} language={language} />
       ))}
     </TilesRow>
   </>

From ace8a6fa467fb476434b035ee513dbc6a510f64e Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 2 Sep 2024 17:44:25 +0200
Subject: [PATCH 02/42] 2173: Add a11y-language elsewhere

---
 native/src/components/Caption.tsx        |  6 ++---
 native/src/components/CityEntry.tsx      |  9 ++++++--
 native/src/components/Header.tsx         | 28 ++++++++++++++++++++++--
 native/src/components/HeaderBox.tsx      |  6 ++---
 native/src/components/NewsListItem.tsx   |  6 +++--
 native/src/components/Page.tsx           |  2 +-
 native/src/components/SearchListItem.tsx |  2 +-
 7 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/native/src/components/Caption.tsx b/native/src/components/Caption.tsx
index 5b0ae76b1c..3606f40d43 100644
--- a/native/src/components/Caption.tsx
+++ b/native/src/components/Caption.tsx
@@ -13,12 +13,12 @@ const H1 = styled(Text)`
 `
 type CaptionProps = {
   title: string
+  language?: string
 }
 
-const Caption = ({ title }: CaptionProps): ReactElement => {
-  const { languageCode } = useContext(AppContext)
+const Caption = ({ title, language }: CaptionProps): ReactElement => {
   return (
-    <H1 android_hyphenationFrequency='full' accessibilityLanguage={languageCode}>
+    <H1 android_hyphenationFrequency='full' accessibilityLanguage={language}>
       {title}
     </H1>
   )
diff --git a/native/src/components/CityEntry.tsx b/native/src/components/CityEntry.tsx
index 7e5a0d0038..87498e1251 100644
--- a/native/src/components/CityEntry.tsx
+++ b/native/src/components/CityEntry.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, memo, ReactElement } from 'react'
+import React, { Fragment, memo, ReactElement, useContext } from 'react'
 import { Text } from 'react-native'
 import Highlighter from 'react-native-highlight-words'
 import styled from 'styled-components/native'
@@ -6,6 +6,7 @@ import styled from 'styled-components/native'
 import { normalizeString } from 'shared'
 import { CityModel } from 'shared/api'
 
+import { AppContext } from '../contexts/AppContextProvider'
 import testID from '../testing/testID'
 import Pressable from './base/Pressable'
 
@@ -52,6 +53,7 @@ const CityEntry = ({ city, query, navigateToDashboard }: CityEntryProps): ReactE
       ? Object.keys(city.aliases).filter(alias => normalizeString(alias).includes(normalizedQuery))
       : []
   const aliases = matchingAliases.slice(0, MAX_NUMBER_OF_ALIASES_SHOWN)
+  const { languageCode } = useContext(AppContext)
 
   const Aliases =
     aliases.length > 0 ? (
@@ -86,7 +88,10 @@ const CityEntry = ({ city, query, navigateToDashboard }: CityEntryProps): ReactE
     ) : null
 
   return (
-    <CityListItem {...testID('City-Entry')} onPress={() => navigateToDashboard(city)}>
+    <CityListItem
+      {...testID('City-Entry')}
+      onPress={() => navigateToDashboard(city)}
+      accessibilityLanguage={languageCode}>
       <>
         <Label
           searchWords={[normalizedQuery]}
diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index 5afe53cf57..5f70561ac9 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -18,6 +18,9 @@ import {
   DISCLAIMER_ROUTE,
   SEARCH_ROUTE,
   SETTINGS_ROUTE,
+  FEEDBACK_MODAL_ROUTE,
+  CONSENT_ROUTE,
+  LICENSES_ROUTE,
 } from 'shared'
 import { LanguageModel, FeedbackRouteType } from 'shared/api'
 
@@ -218,13 +221,34 @@ const Header = ({
     }
 
     const previousRouteTitle = (previousParams as { title?: string } | undefined)?.title
-    return previousRouteTitle ?? t(previousRoute.name === 'categories' ? 'localInformation' : previousRoute.name)
+    return previousRouteTitle ?? t(previousRoute.name === CATEGORIES_ROUTE ? 'localInformation' : previousRoute.name)
+  }
+
+  const isHeaderTextInPhoneLanguage = (): boolean => {
+    if (route.name === NEWS_ROUTE && (route.params as { newsId?: string })?.newsId) {
+      return true
+    }
+    if (route.name === EVENTS_ROUTE && (route.params as { slug?: string })?.slug) {
+      return true
+    }
+    if (route.name === CONSENT_ROUTE) {
+      return true
+    }
+    if (route.name === LICENSES_ROUTE) {
+      return true
+    }
+    return false
   }
 
   return (
     <BoxShadow>
       <Horizontal>
-        <HeaderBox goBack={navigation.goBack} canGoBack={canGoBack} text={getHeaderText()} />
+        <HeaderBox
+          goBack={navigation.goBack}
+          canGoBack={canGoBack}
+          text={getHeaderText()}
+          language={isHeaderTextInPhoneLanguage() ? '' : languageCode}
+        />
         <CustomHeaderButtons cancelLabel={t('cancel')} items={items} overflowItems={overflowItems} />
       </Horizontal>
     </BoxShadow>
diff --git a/native/src/components/HeaderBox.tsx b/native/src/components/HeaderBox.tsx
index dabb56cccf..50f621a9c4 100644
--- a/native/src/components/HeaderBox.tsx
+++ b/native/src/components/HeaderBox.tsx
@@ -32,13 +32,13 @@ type HeaderBoxProps = {
   goBack?: () => void
   canGoBack?: boolean
   text?: string
+  language?: string
 }
 
-const HeaderBox = ({ goBack, canGoBack = true, text }: HeaderBoxProps): ReactElement => {
+const HeaderBox = ({ goBack, canGoBack = true, text, language }: HeaderBoxProps): ReactElement => {
   const deviceWidth = useWindowDimensions().width
   const theme = useTheme()
   const { t } = useTranslation('common')
-  const { languageCode } = useContext(AppContext)
 
   const AppIcon = buildConfigAssets().AppIcon
   const HeaderIcon = canGoBack ? (
@@ -58,7 +58,7 @@ const HeaderBox = ({ goBack, canGoBack = true, text }: HeaderBoxProps): ReactEle
       <HeaderText
         allowFontScaling={false}
         fontSize={deviceWidth * dimensions.fontScaling}
-        accessibilityLanguage={languageCode}>
+        accessibilityLanguage={language}>
         {text}
       </HeaderText>
     </HorizontalLeft>
diff --git a/native/src/components/NewsListItem.tsx b/native/src/components/NewsListItem.tsx
index fe1a5b1be3..cdfed73091 100644
--- a/native/src/components/NewsListItem.tsx
+++ b/native/src/components/NewsListItem.tsx
@@ -86,7 +86,7 @@ const NewsListItem = ({ index, newsItem, navigateToNews, isTunews }: NewsListIte
     <>
       <Divider firstItem={index === 0} />
       <ListItemWrapper>
-        <StyledPressable onPress={navigateToNews}>
+        <StyledPressable onPress={navigateToNews} accessibilityLanguage='de'>
           <Description>
             <Title>{newsItem.title}</Title>
             <Content numberOfLines={EXCERPT_MAX_LINES}>{newsItem.content}</Content>
@@ -96,11 +96,13 @@ const NewsListItem = ({ index, newsItem, navigateToNews, isTunews }: NewsListIte
               </TimeStampContent>
             )}
           </Description>
+        </StyledPressable>
+        <Pressable onPress={navigateToNews}>
           <ReadMoreWrapper language={i18n.language}>
             <ReadMore isTunews={isTunews} onPress={navigateToNews}>{`${t('readMore')}`}</ReadMore>
             <StyledIcon Icon={ArrowBackIcon} directionDependent reverse isTunews={isTunews} />
           </ReadMoreWrapper>
-        </StyledPressable>
+        </Pressable>
       </ListItemWrapper>
     </>
   )
diff --git a/native/src/components/Page.tsx b/native/src/components/Page.tsx
index f463dfc6e9..34e4c5a451 100644
--- a/native/src/components/Page.tsx
+++ b/native/src/components/Page.tsx
@@ -76,7 +76,7 @@ const Page = ({
 
   return (
     <Container $padding={padding}>
-      {!loading && title ? <Caption title={title} /> : null}
+      {!loading && title ? <Caption title={title} language={language} /> : null}
       {!loading && BeforeContent}
       <RemoteContent
         content={content}
diff --git a/native/src/components/SearchListItem.tsx b/native/src/components/SearchListItem.tsx
index 6a1fba34b5..b1dac59caa 100644
--- a/native/src/components/SearchListItem.tsx
+++ b/native/src/components/SearchListItem.tsx
@@ -114,7 +114,7 @@ const SearchListItem = ({
   )
 
   return (
-    <FlexStyledLink onPress={navigateToSearchResult} accessibilityHint={t('itemHint')}>
+    <FlexStyledLink onPress={navigateToSearchResult} accessibilityHint={t('itemHint')} accessibilityLanguage={language}>
       <DirectionContainer language={language}>
         <SearchEntryContainer>
           <TitleDirectionContainer language={language}>

From 5c916299b9258b40bd8b02fee9a0403f081e1131 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 2 Sep 2024 17:47:59 +0200
Subject: [PATCH 03/42] 2173: Fix lint

---
 native/src/components/Caption.tsx             | 15 ++++++---------
 native/src/components/Header.tsx              |  5 ++---
 native/src/components/HeaderBox.tsx           |  3 +--
 native/src/components/__tests__/Tile.spec.tsx |  4 ++--
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/native/src/components/Caption.tsx b/native/src/components/Caption.tsx
index 3606f40d43..5ae24a083d 100644
--- a/native/src/components/Caption.tsx
+++ b/native/src/components/Caption.tsx
@@ -1,7 +1,6 @@
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import styled from 'styled-components/native'
 
-import { AppContext } from '../contexts/AppContextProvider'
 import Text from './base/Text'
 
 const H1 = styled(Text)`
@@ -16,12 +15,10 @@ type CaptionProps = {
   language?: string
 }
 
-const Caption = ({ title, language }: CaptionProps): ReactElement => {
-  return (
-    <H1 android_hyphenationFrequency='full' accessibilityLanguage={language}>
-      {title}
-    </H1>
-  )
-}
+const Caption = ({ title, language }: CaptionProps): ReactElement => (
+  <H1 android_hyphenationFrequency='full' accessibilityLanguage={language}>
+    {title}
+  </H1>
+)
 
 export default Caption
diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index 5f70561ac9..77be0901f0 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -18,7 +18,6 @@ import {
   DISCLAIMER_ROUTE,
   SEARCH_ROUTE,
   SETTINGS_ROUTE,
-  FEEDBACK_MODAL_ROUTE,
   CONSENT_ROUTE,
   LICENSES_ROUTE,
 } from 'shared'
@@ -225,10 +224,10 @@ const Header = ({
   }
 
   const isHeaderTextInPhoneLanguage = (): boolean => {
-    if (route.name === NEWS_ROUTE && (route.params as { newsId?: string })?.newsId) {
+    if (route.name === NEWS_ROUTE && (route.params as { newsId?: string }).newsId) {
       return true
     }
-    if (route.name === EVENTS_ROUTE && (route.params as { slug?: string })?.slug) {
+    if (route.name === EVENTS_ROUTE && (route.params as { slug?: string }).slug) {
       return true
     }
     if (route.name === CONSENT_ROUTE) {
diff --git a/native/src/components/HeaderBox.tsx b/native/src/components/HeaderBox.tsx
index 50f621a9c4..638dd9b343 100644
--- a/native/src/components/HeaderBox.tsx
+++ b/native/src/components/HeaderBox.tsx
@@ -1,12 +1,11 @@
 import { HeaderBackButton } from '@react-navigation/elements'
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useWindowDimensions } from 'react-native'
 import styled, { useTheme } from 'styled-components/native'
 
 import { buildConfigAssets } from '../constants/buildConfig'
 import dimensions from '../constants/dimensions'
-import { AppContext } from '../contexts/AppContextProvider'
 import Icon from './base/Icon'
 
 const HorizontalLeft = styled.View`
diff --git a/native/src/components/__tests__/Tile.spec.tsx b/native/src/components/__tests__/Tile.spec.tsx
index 57cff47938..ba19b6d85f 100644
--- a/native/src/components/__tests__/Tile.spec.tsx
+++ b/native/src/components/__tests__/Tile.spec.tsx
@@ -23,7 +23,7 @@ describe('Tile', () => {
       thumbnail: null,
       isExternalUrl: false,
     })
-    const { getByText } = render(<Tile tile={tile} onTilePress={onTilePress} resourceCache={{}} />)
+    const { getByText } = render(<Tile tile={tile} onTilePress={onTilePress} resourceCache={{}} language='' />)
     fireEvent.press(getByText(tile.title))
 
     expect(onTilePress).toHaveBeenCalledTimes(1)
@@ -38,7 +38,7 @@ describe('Tile', () => {
       thumbnail: null,
       isExternalUrl: true,
     })
-    const { getByText } = render(<Tile tile={tile} onTilePress={onTilePress} resourceCache={{}} />)
+    const { getByText } = render(<Tile tile={tile} onTilePress={onTilePress} resourceCache={{}} language='' />)
     fireEvent.press(getByText(tile.title))
 
     expect(openExternalUrl).toHaveBeenCalledTimes(1)

From 9ba50dde20c911908543c31d9ea2fd22bf1506d5 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Tue, 3 Sep 2024 14:22:16 +0200
Subject: [PATCH 04/42] 2173: Refactoring

---
 native/src/components/Header.tsx | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index 77be0901f0..876594ff40 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -224,16 +224,12 @@ const Header = ({
   }
 
   const isHeaderTextInPhoneLanguage = (): boolean => {
-    if (route.name === NEWS_ROUTE && (route.params as { newsId?: string }).newsId) {
-      return true
-    }
-    if (route.name === EVENTS_ROUTE && (route.params as { slug?: string }).slug) {
-      return true
-    }
-    if (route.name === CONSENT_ROUTE) {
-      return true
-    }
-    if (route.name === LICENSES_ROUTE) {
+    if (
+      (route.name === NEWS_ROUTE && (route.params as { newsId?: string }).newsId) ||
+      (route.name === EVENTS_ROUTE && (route.params as { slug?: string }).slug) ||
+      route.name === CONSENT_ROUTE ||
+      route.name === LICENSES_ROUTE
+    ) {
       return true
     }
     return false

From dac97a25d9f5ec3d621437ac2edc7559044fbb65 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Wed, 4 Sep 2024 14:54:09 +0200
Subject: [PATCH 05/42] 2173: Remove test code

---
 native/src/components/NewsListItem.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/native/src/components/NewsListItem.tsx b/native/src/components/NewsListItem.tsx
index cdfed73091..97735cc8b1 100644
--- a/native/src/components/NewsListItem.tsx
+++ b/native/src/components/NewsListItem.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import React, { ReactElement, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components/native'
 
@@ -7,6 +7,7 @@ import { LocalNewsModel, TunewsModel } from 'shared/api'
 import { ArrowBackIcon } from '../assets'
 import { EXCERPT_MAX_LINES } from '../constants'
 import { contentDirection } from '../constants/contentDirection'
+import { AppContext } from '../contexts/AppContextProvider'
 import TimeStamp from './TimeStamp'
 import Icon from './base/Icon'
 import Pressable from './base/Pressable'
@@ -81,12 +82,13 @@ export const ReadMore = styled(Text)<{ isTunews: boolean }>`
 const NewsListItem = ({ index, newsItem, navigateToNews, isTunews }: NewsListItemProps): ReactElement => {
   const { t, i18n } = useTranslation('news')
   const timestamp = newsItem instanceof LocalNewsModel ? newsItem.timestamp : null
+  const { languageCode } = useContext(AppContext)
 
   return (
     <>
       <Divider firstItem={index === 0} />
       <ListItemWrapper>
-        <StyledPressable onPress={navigateToNews} accessibilityLanguage='de'>
+        <StyledPressable onPress={navigateToNews} accessibilityLanguage={languageCode}>
           <Description>
             <Title>{newsItem.title}</Title>
             <Content numberOfLines={EXCERPT_MAX_LINES}>{newsItem.content}</Content>

From eaa4f881e93dac28d95ce5a93114193ae5299207 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 30 Sep 2024 10:58:34 +0200
Subject: [PATCH 06/42] 2173: Fix prettier

---
 native/src/components/SearchListItem.tsx      | 6 +++++-
 native/src/components/SubCategoryListItem.tsx | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/native/src/components/SearchListItem.tsx b/native/src/components/SearchListItem.tsx
index fe77f5f462..bc01c81cda 100644
--- a/native/src/components/SearchListItem.tsx
+++ b/native/src/components/SearchListItem.tsx
@@ -114,7 +114,11 @@ const SearchListItem = ({
   )
 
   return (
-    <FlexStyledLink onPress={navigateToSearchResult} role='link' accessibilityHint={t('itemHint')} accessibilityLanguage={language}>
+    <FlexStyledLink
+      onPress={navigateToSearchResult}
+      role='link'
+      accessibilityHint={t('itemHint')}
+      accessibilityLanguage={language}>
       <DirectionContainer language={language}>
         <SearchEntryContainer>
           <TitleDirectionContainer language={language}>
diff --git a/native/src/components/SubCategoryListItem.tsx b/native/src/components/SubCategoryListItem.tsx
index 1ba540cea2..e479ab0935 100644
--- a/native/src/components/SubCategoryListItem.tsx
+++ b/native/src/components/SubCategoryListItem.tsx
@@ -42,7 +42,11 @@ const SubCategoryListItem = ({
   onItemPress,
   language,
 }: SubCategoryListItemProps): ReactElement => (
-  <FlexStyledLink onPress={() => onItemPress(subCategory)} language={language} role='link' accessibilityLanguage={language}>
+  <FlexStyledLink
+    onPress={() => onItemPress(subCategory)}
+    language={language}
+    role='link'
+    accessibilityLanguage={language}>
     <SubCategoryTitleContainer language={language}>
       {!!subCategory.thumbnail && (
         <CategoryThumbnail language={language} source={subCategory.thumbnail} resourceCache={resourceCache} />

From 3a60175fd4d069d03e14b94a1866fd32223404ba Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 30 Sep 2024 15:19:17 +0200
Subject: [PATCH 07/42] 2173: Add role description

---
 native/src/components/NewsListItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/src/components/NewsListItem.tsx b/native/src/components/NewsListItem.tsx
index 1f4b5a884f..298dd03bc8 100644
--- a/native/src/components/NewsListItem.tsx
+++ b/native/src/components/NewsListItem.tsx
@@ -99,7 +99,7 @@ const NewsListItem = ({ index, newsItem, navigateToNews, isTunews }: NewsListIte
             )}
           </Description>
         </StyledPressable>
-        <Pressable onPress={navigateToNews}>
+        <Pressable role='link' onPress={navigateToNews}>
           <ReadMoreWrapper language={i18n.language}>
             <ReadMore isTunews={isTunews} onPress={navigateToNews}>{`${t('readMore')}`}</ReadMore>
             <StyledIcon Icon={ArrowBackIcon} directionDependent reverse isTunews={isTunews} />

From 2f99104437524190d2b1365783f73239c90aa4ae Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 10 Oct 2024 17:26:48 +0200
Subject: [PATCH 08/42] 2173: Fix header language

---
 native/src/components/Header.tsx | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index 876594ff40..86faf43ee6 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -18,8 +18,6 @@ import {
   DISCLAIMER_ROUTE,
   SEARCH_ROUTE,
   SETTINGS_ROUTE,
-  CONSENT_ROUTE,
-  LICENSES_ROUTE,
 } from 'shared'
 import { LanguageModel, FeedbackRouteType } from 'shared/api'
 
@@ -36,6 +34,8 @@ import CustomHeaderButtons from './CustomHeaderButtons'
 import HeaderBox from './HeaderBox'
 import HighlightBox from './HighlightBox'
 
+const DEFAULT_LANGUAGE = 'de'
+
 const Horizontal = styled.View`
   flex: 1;
   flex-direction: row;
@@ -201,11 +201,11 @@ const Header = ({
       ]
     : []
 
-  const getHeaderText = (): string => {
+  const getHeaderText = (): { text: string; language: string } => {
     const currentTitle = (route.params as { title?: string } | undefined)?.title
     if (!previousRoute) {
       // Home/Dashboard: Show current route title, i.e. city name
-      return currentTitle ?? ''
+      return { text: currentTitle ?? '', language: DEFAULT_LANGUAGE }
     }
 
     const previousParams = previousRoute.params
@@ -215,24 +215,24 @@ const Header = ({
     if (currentRouteIsPoi && notFromDeepLink) {
       const poisRouteParams = route.params as RoutesParamsType[PoisRouteType]
       if (poisRouteParams.slug || poisRouteParams.multipoi !== undefined) {
-        return t('locations')
+        return { text: t('locations'), language: '' } // system language
       }
     }
 
     const previousRouteTitle = (previousParams as { title?: string } | undefined)?.title
-    return previousRouteTitle ?? t(previousRoute.name === CATEGORIES_ROUTE ? 'localInformation' : previousRoute.name)
-  }
+    let language
+    if (previousRoute.name === CATEGORIES_ROUTE && !(previousParams as { path?: string }).path) {
+      language = DEFAULT_LANGUAGE
+    } else if (previousRouteTitle || previousRoute.name === CATEGORIES_ROUTE) {
+      language = languageCode
+    } else {
+      language = '' // systen language
+    }
 
-  const isHeaderTextInPhoneLanguage = (): boolean => {
-    if (
-      (route.name === NEWS_ROUTE && (route.params as { newsId?: string }).newsId) ||
-      (route.name === EVENTS_ROUTE && (route.params as { slug?: string }).slug) ||
-      route.name === CONSENT_ROUTE ||
-      route.name === LICENSES_ROUTE
-    ) {
-      return true
+    return {
+      text: previousRouteTitle ?? t(previousRoute.name === CATEGORIES_ROUTE ? 'localInformation' : previousRoute.name),
+      language,
     }
-    return false
   }
 
   return (
@@ -241,8 +241,8 @@ const Header = ({
         <HeaderBox
           goBack={navigation.goBack}
           canGoBack={canGoBack}
-          text={getHeaderText()}
-          language={isHeaderTextInPhoneLanguage() ? '' : languageCode}
+          text={getHeaderText().text}
+          language={getHeaderText().language}
         />
         <CustomHeaderButtons cancelLabel={t('cancel')} items={items} overflowItems={overflowItems} />
       </Horizontal>

From b9c9149112eb521bfd87b25f03b91f894b13f4a6 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 10 Oct 2024 17:28:11 +0200
Subject: [PATCH 09/42] 2173: Small fix

---
 native/src/components/NewsListItem.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/native/src/components/NewsListItem.tsx b/native/src/components/NewsListItem.tsx
index 298dd03bc8..73b6bbc86e 100644
--- a/native/src/components/NewsListItem.tsx
+++ b/native/src/components/NewsListItem.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components/native'
 
@@ -7,7 +7,7 @@ import { LocalNewsModel, TunewsModel } from 'shared/api'
 import { ArrowBackIcon } from '../assets'
 import { EXCERPT_MAX_LINES } from '../constants'
 import { contentDirection } from '../constants/contentDirection'
-import { AppContext } from '../contexts/AppContextProvider'
+import { useAppContext } from '../hooks/useCityAppContext'
 import TimeStamp from './TimeStamp'
 import Icon from './base/Icon'
 import Pressable from './base/Pressable'
@@ -82,7 +82,7 @@ export const ReadMore = styled(Text)<{ isTunews: boolean }>`
 const NewsListItem = ({ index, newsItem, navigateToNews, isTunews }: NewsListItemProps): ReactElement => {
   const { t, i18n } = useTranslation('news')
   const timestamp = newsItem instanceof LocalNewsModel ? newsItem.timestamp : null
-  const { languageCode } = useContext(AppContext)
+  const { languageCode } = useAppContext()
 
   return (
     <>

From d82d2403ff9ad870d812ab5282b7b2b455571e2e Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 17 Oct 2024 13:03:43 +0200
Subject: [PATCH 10/42] 2173: Refactoring

---
 native/src/components/Header.tsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index 86faf43ee6..6b792ab60c 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -20,6 +20,7 @@ import {
   SETTINGS_ROUTE,
 } from 'shared'
 import { LanguageModel, FeedbackRouteType } from 'shared/api'
+import { config } from 'translations'
 
 import { NavigationProps, RouteProps, RoutesParamsType, RoutesType } from '../constants/NavigationTypes'
 import buildConfig from '../constants/buildConfig'
@@ -34,8 +35,6 @@ import CustomHeaderButtons from './CustomHeaderButtons'
 import HeaderBox from './HeaderBox'
 import HighlightBox from './HighlightBox'
 
-const DEFAULT_LANGUAGE = 'de'
-
 const Horizontal = styled.View`
   flex: 1;
   flex-direction: row;
@@ -201,11 +200,11 @@ const Header = ({
       ]
     : []
 
-  const getHeaderText = (): { text: string; language: string } => {
+  const getHeaderText = (): { text: string; language?: string } => {
     const currentTitle = (route.params as { title?: string } | undefined)?.title
     if (!previousRoute) {
       // Home/Dashboard: Show current route title, i.e. city name
-      return { text: currentTitle ?? '', language: DEFAULT_LANGUAGE }
+      return { text: currentTitle ?? '', language: config.sourceLanguage }
     }
 
     const previousParams = previousRoute.params
@@ -215,18 +214,18 @@ const Header = ({
     if (currentRouteIsPoi && notFromDeepLink) {
       const poisRouteParams = route.params as RoutesParamsType[PoisRouteType]
       if (poisRouteParams.slug || poisRouteParams.multipoi !== undefined) {
-        return { text: t('locations'), language: '' } // system language
+        return { text: t('locations'), language: undefined }
       }
     }
 
     const previousRouteTitle = (previousParams as { title?: string } | undefined)?.title
     let language
     if (previousRoute.name === CATEGORIES_ROUTE && !(previousParams as { path?: string }).path) {
-      language = DEFAULT_LANGUAGE
+      language = config.sourceLanguage
     } else if (previousRouteTitle || previousRoute.name === CATEGORIES_ROUTE) {
       language = languageCode
     } else {
-      language = '' // systen language
+      language = undefined
     }
 
     return {

From 01ef52d7649985baea4f0fb0caf995182fdbdace Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 17 Oct 2024 14:26:41 +0200
Subject: [PATCH 11/42] 2173: Simplify

---
 native/src/components/Header.tsx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index 6b792ab60c..3fb03f3905 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -218,20 +218,20 @@ const Header = ({
       }
     }
 
-    const previousRouteTitle = (previousParams as { title?: string } | undefined)?.title
-    let language
-    if (previousRoute.name === CATEGORIES_ROUTE && !(previousParams as { path?: string }).path) {
-      language = config.sourceLanguage
-    } else if (previousRouteTitle || previousRoute.name === CATEGORIES_ROUTE) {
-      language = languageCode
-    } else {
-      language = undefined
+    const previousRouteTitle = (previousParams as { path?: string } | undefined)?.path
+
+    if (previousRouteTitle) {
+      return { text: previousRouteTitle, language: languageCode }
     }
 
-    return {
-      text: previousRouteTitle ?? t(previousRoute.name === CATEGORIES_ROUTE ? 'localInformation' : previousRoute.name),
-      language,
+    if (previousRoute.name === CATEGORIES_ROUTE) {
+      return {
+        text: t('localInformation'),
+        language: previousRouteTitle === undefined ? config.sourceLanguage : languageCode,
+      }
     }
+
+    return { text: previousRoute.name, language: undefined }
   }
 
   return (

From 3a72399bc52b14558d113cab71f3b71a771d061e Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Thu, 17 Oct 2024 14:34:52 +0200
Subject: [PATCH 12/42] 2350: Refactor settings

---
 native/src/components/SettingItem.tsx         |  84 ++++---
 native/src/routes/Settings.tsx                |  42 +---
 .../__tests__/createSettingsSections.spec.ts  |  14 +-
 native/src/utils/createSettingsSections.ts    | 205 ++++++++----------
 4 files changed, 160 insertions(+), 185 deletions(-)

diff --git a/native/src/components/SettingItem.tsx b/native/src/components/SettingItem.tsx
index f73dac6eba..d69a10cfc5 100644
--- a/native/src/components/SettingItem.tsx
+++ b/native/src/components/SettingItem.tsx
@@ -35,6 +35,11 @@ const FlexEndContainer = styled.View`
   padding: 0 5px;
 `
 
+const BadgeContainer = styled.View`
+  flex-direction: row;
+  align-items: center;
+`
+
 const Badge = styled.View<{ enabled: boolean }>`
   width: 8px;
   height: 8px;
@@ -42,50 +47,61 @@ const Badge = styled.View<{ enabled: boolean }>`
   background-color: ${props => (props.enabled ? 'limegreen' : 'red')};
 `
 
+type SettingItemValueProps = {
+  onPress: () => void
+  hasBadge: boolean
+  value: boolean
+}
+
+const SettingsItemValue = ({ value, hasBadge, onPress }: SettingItemValueProps): ReactElement => {
+  const { t } = useTranslation('settings')
+  if (hasBadge) {
+    return (
+      <BadgeContainer>
+        <Badge enabled={value} />
+        <Text> {value ? t('enabled') : t('disabled')}</Text>
+      </BadgeContainer>
+    )
+  }
+  return <SettingsSwitch value={value} onPress={onPress} />
+}
+
 type SettingItemProps = {
   title: string
   description?: string
   onPress: () => void
   bigTitle?: boolean
   role?: Role
-  hasSwitch?: boolean
   hasBadge?: boolean
-  value: boolean
+  value: boolean | null
 }
 
-const SettingItem = (props: SettingItemProps): ReactElement => {
-  const { title, description, onPress, value, hasBadge, hasSwitch, bigTitle, role } = props
-  const { t } = useTranslation('settings')
-
-  return (
-    <Pressable onPress={onPress} role={role ?? 'none'} accessible={false}>
-      <PadView>
-        <ContentContainer>
+const SettingItem = ({
+  title,
+  description,
+  onPress,
+  value,
+  bigTitle,
+  role,
+  hasBadge = false,
+}: SettingItemProps): ReactElement => (
+  <Pressable onPress={onPress} role={role ?? 'none'} accessible={false}>
+    <PadView>
+      <ContentContainer>
+        <View>
+          <Title bigTitle={bigTitle || false}>{title}</Title>
+        </View>
+        {!!description && (
           <View>
-            <Title bigTitle={bigTitle || false}>{title}</Title>
+            <Description>{description}</Description>
           </View>
-          {!!description && (
-            <View>
-              <Description>{description}</Description>
-            </View>
-          )}
-        </ContentContainer>
-        <FlexEndContainer>
-          {hasSwitch && <SettingsSwitch value={value} onPress={onPress} />}
-          {hasBadge && (
-            <View
-              style={{
-                flexDirection: 'row',
-                alignItems: 'center',
-              }}>
-              <Badge enabled={value} />
-              <Text> {value ? t('enabled') : t('disabled')}</Text>
-            </View>
-          )}
-        </FlexEndContainer>
-      </PadView>
-    </Pressable>
-  )
-}
+        )}
+      </ContentContainer>
+      <FlexEndContainer>
+        {value !== null && <SettingsItemValue onPress={onPress} hasBadge={hasBadge} value={value} />}
+      </FlexEndContainer>
+    </PadView>
+  </Pressable>
+)
 
 export default SettingItem
diff --git a/native/src/routes/Settings.tsx b/native/src/routes/Settings.tsx
index 66e176e8fb..d88696f056 100644
--- a/native/src/routes/Settings.tsx
+++ b/native/src/routes/Settings.tsx
@@ -1,7 +1,6 @@
 import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
-import { SectionList, SectionListData } from 'react-native'
-import styled from 'styled-components/native'
+import { FlatList } from 'react-native'
 
 import { SettingsRouteType } from 'shared'
 
@@ -19,15 +18,6 @@ type SettingsProps = {
   navigation: NavigationProps<SettingsRouteType>
 }
 
-type SectionType = SectionListData<SettingsSectionType> & {
-  title?: string | null
-}
-
-const SectionHeader = styled.Text`
-  padding: 20px;
-  color: ${props => props.theme.colors.textColor};
-`
-
 const Settings = ({ navigation }: SettingsProps): ReactElement => {
   const appContext = useCityAppContext()
   const showSnackbar = useSnackbar()
@@ -46,36 +36,24 @@ const Settings = ({ navigation }: SettingsProps): ReactElement => {
 
   const renderItem = ({ item }: { item: SettingsSectionType }) => {
     const { getSettingValue, onPress, ...otherProps } = item
-    const value = !!(getSettingValue && getSettingValue(settings))
+    const value = getSettingValue ? !!getSettingValue(settings) : null
     return <SettingItem value={value} key={otherProps.title} onPress={safeOnPress(onPress)} {...otherProps} />
   }
 
-  const renderSectionHeader = ({ section: { title } }: { section: SectionType }) => {
-    if (!title) {
-      return null
-    }
-
-    return <SectionHeader>{title}</SectionHeader>
-  }
-
-  const sections = createSettingsSections({
-    appContext,
-    navigation,
-    showSnackbar,
-    t,
-  })
+  const sections = createSettingsSections({ appContext, navigation, showSnackbar, t }).filter(
+    (it): it is SettingsSectionType => it !== null,
+  )
 
   return (
     <Layout>
       <Caption title={t('layout:settings')} />
-      <SectionList
-        sections={sections}
-        extraData={settings}
+      <ItemSeparator />
+      <FlatList
+        data={sections}
+        extraData={appContext.settings}
         renderItem={renderItem}
-        renderSectionHeader={renderSectionHeader}
         ItemSeparatorComponent={ItemSeparator}
-        SectionSeparatorComponent={ItemSeparator}
-        stickySectionHeadersEnabled={false}
+        ListFooterComponent={ItemSeparator}
       />
     </Layout>
   )
diff --git a/native/src/utils/__tests__/createSettingsSections.spec.ts b/native/src/utils/__tests__/createSettingsSections.spec.ts
index bd6eb9f7db..5cc737f42b 100644
--- a/native/src/utils/__tests__/createSettingsSections.spec.ts
+++ b/native/src/utils/__tests__/createSettingsSections.spec.ts
@@ -48,20 +48,20 @@ describe('createSettingsSections', () => {
       navigation,
       showSnackbar,
       t,
-    })[0]!.data
+    })
 
   describe('allowPushNotifications', () => {
     it('should not include push notification setting if disabled', () => {
       mockedPushNotificationsEnabled.mockImplementation(() => false)
       const sections = createSettings()
-      expect(sections.find(it => it.title === 'privacyPolicy')).toBeTruthy()
-      expect(sections.find(it => it.title === 'pushNewsTitle')).toBeFalsy()
+      expect(sections.find(it => it?.title === 'privacyPolicy')).toBeTruthy()
+      expect(sections.find(it => it?.title === 'pushNewsTitle')).toBeFalsy()
     })
 
     it('should set correct setting on press', async () => {
       mockedPushNotificationsEnabled.mockImplementation(() => true)
       const sections = createSettings()
-      const pushNotificationSection = sections.find(it => it.title === 'pushNewsTitle')!
+      const pushNotificationSection = sections.find(it => it?.title === 'pushNewsTitle')!
       await pushNotificationSection!.onPress()
       expect(updateSettings).toHaveBeenCalledTimes(1)
       expect(updateSettings).toHaveBeenCalledWith({ allowPushNotifications: false })
@@ -77,7 +77,7 @@ describe('createSettingsSections', () => {
     it('should unsubscribe from push notification topic', async () => {
       mockedPushNotificationsEnabled.mockImplementation(() => true)
       const sections = createSettings()
-      const pushNotificationSection = sections.find(it => it.title === 'pushNewsTitle')!
+      const pushNotificationSection = sections.find(it => it?.title === 'pushNewsTitle')!
 
       expect(mockUnsubscribeNews).not.toHaveBeenCalled()
 
@@ -95,7 +95,7 @@ describe('createSettingsSections', () => {
     it('should subscribe to push notification topic if permission is granted', async () => {
       mockedPushNotificationsEnabled.mockImplementation(() => true)
       const sections = createSettings({ allowPushNotifications: false })
-      const pushNotificationSection = sections.find(it => it.title === 'pushNewsTitle')!
+      const pushNotificationSection = sections.find(it => it?.title === 'pushNewsTitle')!
 
       expect(mockRequestPushNotificationPermission).not.toHaveBeenCalled()
       expect(mockSubscribeNews).not.toHaveBeenCalled()
@@ -120,7 +120,7 @@ describe('createSettingsSections', () => {
     it('should open settings and return false if permissions not granted', async () => {
       mockedPushNotificationsEnabled.mockImplementation(() => true)
       const sections = createSettings({ allowPushNotifications: false })
-      const pushNotificationSection = sections.find(it => it.title === 'pushNewsTitle')!
+      const pushNotificationSection = sections.find(it => it?.title === 'pushNewsTitle')!
 
       expect(mockRequestPushNotificationPermission).not.toHaveBeenCalled()
       expect(mockSubscribeNews).not.toHaveBeenCalled()
diff --git a/native/src/utils/createSettingsSections.ts b/native/src/utils/createSettingsSections.ts
index e10a547358..8c06a7e647 100644
--- a/native/src/utils/createSettingsSections.ts
+++ b/native/src/utils/createSettingsSections.ts
@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/react-native'
 import { TFunction } from 'i18next'
-import { Role, SectionListData } from 'react-native'
+import { Role } from 'react-native'
 import { openSettings } from 'react-native-permissions'
 
 import { CONSENT_ROUTE, JPAL_TRACKING_ROUTE, LICENSES_ROUTE, SettingsRouteType } from 'shared'
@@ -26,7 +26,6 @@ export type SettingsSectionType = {
   onPress: () => Promise<void> | void
   bigTitle?: boolean
   role?: Role
-  hasSwitch?: boolean
   hasBadge?: boolean
   getSettingValue?: (settings: SettingsType) => boolean | null
 }
@@ -49,123 +48,105 @@ const createSettingsSections = ({
   navigation,
   showSnackbar,
   t,
-}: CreateSettingsSectionsProps): Readonly<Array<SectionListData<SettingsSectionType>>> => [
-  {
-    title: null,
-    data: [
-      ...(!pushNotificationsEnabled()
-        ? []
-        : [
-            {
-              title: t('pushNewsTitle'),
-              description: t('pushNewsDescription'),
-              hasSwitch: true,
-              getSettingValue: (settings: SettingsType) => settings.allowPushNotifications,
-              onPress: async () => {
-                const allowPushNotifications = !settings.allowPushNotifications
-                updateSettings({ allowPushNotifications })
-                if (!allowPushNotifications) {
-                  await unsubscribeNews(cityCode, languageCode)
-                  return
-                }
+}: CreateSettingsSectionsProps): (SettingsSectionType | null)[] => [
+  pushNotificationsEnabled()
+    ? {
+        title: t('pushNewsTitle'),
+        description: t('pushNewsDescription'),
+        getSettingValue: (settings: SettingsType) => settings.allowPushNotifications,
+        onPress: async () => {
+          const allowPushNotifications = !settings.allowPushNotifications
+          updateSettings({ allowPushNotifications })
+          if (!allowPushNotifications) {
+            await unsubscribeNews(cityCode, languageCode)
+            return
+          }
 
-                const status = await requestPushNotificationPermission(updateSettings)
+          const status = await requestPushNotificationPermission(updateSettings)
 
-                if (status) {
-                  await subscribeNews({ cityCode, languageCode, allowPushNotifications, skipSettingsCheck: true })
-                } else {
-                  updateSettings({ allowPushNotifications: false })
-                  // If the user has rejected the permission once, it can only be changed in the system settings
-                  showSnackbar({
-                    text: 'noPushNotificationPermission',
-                    positiveAction: {
-                      label: t('layout:settings'),
-                      onPress: openSettings,
-                    },
-                  })
-                }
+          if (status) {
+            await subscribeNews({ cityCode, languageCode, allowPushNotifications, skipSettingsCheck: true })
+          } else {
+            updateSettings({ allowPushNotifications: false })
+            // If the user has rejected the permission once, it can only be changed in the system settings
+            showSnackbar({
+              text: 'noPushNotificationPermission',
+              positiveAction: {
+                label: t('layout:settings'),
+                onPress: openSettings,
               },
-            },
-          ]),
-      {
-        title: t('sentryTitle'),
-        description: t('sentryDescription', {
-          appName: buildConfig().appName,
-        }),
-        hasSwitch: true,
-        getSettingValue: (settings: SettingsType) => settings.errorTracking,
-        onPress: async () => {
-          const errorTracking = !settings.errorTracking
-          updateSettings({ errorTracking })
-
-          const client = Sentry.getClient()
-          if (errorTracking && !client) {
-            initSentry()
-          } else if (client) {
-            client.getOptions().enabled = errorTracking
+            })
           }
         },
-      },
-      {
-        title: t('externalResourcesTitle'),
-        description: t('externalResourcesDescription'),
-        onPress: () => {
-          navigation.navigate(CONSENT_ROUTE)
-        },
-      },
-      {
-        role: 'link',
-        title: t('about', {
-          appName: buildConfig().appName,
-        }),
-        onPress: async () => {
-          const { aboutUrls } = buildConfig()
-          const aboutUrl = aboutUrls[languageCode] || aboutUrls.default
-          await openExternalUrl(aboutUrl, showSnackbar)
-        },
-      },
-      {
-        role: 'link',
-        title: t('privacyPolicy'),
-        onPress: async () => {
-          const { privacyUrls } = buildConfig()
-          const privacyUrl = privacyUrls[languageCode] || privacyUrls.default
-          await openExternalUrl(privacyUrl, showSnackbar)
-        },
-      },
-      {
-        title: t('version', {
-          version: NativeConstants.appVersion,
-        }),
-        onPress: () => {
-          volatileValues.versionTaps += 1
+      }
+    : null,
+  {
+    title: t('sentryTitle'),
+    description: t('sentryDescription', { appName: buildConfig().appName }),
+    getSettingValue: (settings: SettingsType) => settings.errorTracking,
+    onPress: async () => {
+      const errorTracking = !settings.errorTracking
+      updateSettings({ errorTracking })
 
-          if (volatileValues.versionTaps === TRIGGER_VERSION_TAPS) {
-            volatileValues.versionTaps = 0
-            throw Error('This error was thrown for testing purposes. Please ignore this error.')
-          }
-        },
-      },
-      {
-        title: t('openSourceLicenses'),
-        onPress: () => navigation.navigate(LICENSES_ROUTE),
-      },
-      // Only show the jpal tracking setting for users that opened it via deep link before
-      ...(buildConfig().featureFlags.jpalTracking && settings.jpalTrackingCode
-        ? [
-            {
-              title: t('tracking'),
-              description: t('trackingShortDescription', { appName: buildConfig().appName }),
-              getSettingValue: (settings: SettingsType) => settings.jpalTrackingEnabled,
-              hasBadge: true,
-              onPress: () => {
-                navigation.navigate(JPAL_TRACKING_ROUTE)
-              },
-            },
-          ]
-        : []),
-    ],
+      const client = Sentry.getClient()
+      if (errorTracking && !client) {
+        initSentry()
+      } else if (client) {
+        client.getOptions().enabled = errorTracking
+      }
+    },
+  },
+  {
+    title: t('externalResourcesTitle'),
+    description: t('externalResourcesDescription'),
+    onPress: () => navigation.navigate(CONSENT_ROUTE),
+  },
+  {
+    role: 'link',
+    title: t('about', {
+      appName: buildConfig().appName,
+    }),
+    onPress: async () => {
+      const { aboutUrls } = buildConfig()
+      const aboutUrl = aboutUrls[languageCode] || aboutUrls.default
+      await openExternalUrl(aboutUrl, showSnackbar)
+    },
+  },
+  {
+    role: 'link',
+    title: t('privacyPolicy'),
+    onPress: async () => {
+      const { privacyUrls } = buildConfig()
+      const privacyUrl = privacyUrls[languageCode] || privacyUrls.default
+      await openExternalUrl(privacyUrl, showSnackbar)
+    },
   },
+  {
+    title: t('version', { version: NativeConstants.appVersion }),
+    onPress: () => {
+      volatileValues.versionTaps += 1
+
+      if (volatileValues.versionTaps === TRIGGER_VERSION_TAPS) {
+        volatileValues.versionTaps = 0
+        throw Error('This error was thrown for testing purposes. Please ignore this error.')
+      }
+    },
+  },
+  {
+    title: t('openSourceLicenses'),
+    onPress: () => navigation.navigate(LICENSES_ROUTE),
+  },
+  buildConfig().featureFlags.jpalTracking && settings.jpalTrackingCode
+    ? {
+        title: t('tracking'),
+        description: t('trackingShortDescription', { appName: buildConfig().appName }),
+        getSettingValue: (settings: SettingsType) => settings.jpalTrackingEnabled,
+        hasBadge: true,
+        onPress: () => {
+          navigation.navigate(JPAL_TRACKING_ROUTE)
+        },
+      }
+    : null,
 ]
 
 export default createSettingsSections

From ab734f16ea6c1625cb12c8662e6ccd2482c62329 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 17 Oct 2024 14:36:35 +0200
Subject: [PATCH 13/42] 2173: Add comment back in

---
 native/src/components/Header.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index 3fb03f3905..b6c565d408 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -214,7 +214,7 @@ const Header = ({
     if (currentRouteIsPoi && notFromDeepLink) {
       const poisRouteParams = route.params as RoutesParamsType[PoisRouteType]
       if (poisRouteParams.slug || poisRouteParams.multipoi !== undefined) {
-        return { text: t('locations'), language: undefined }
+        return { text: t('locations'), language: undefined } // system language
       }
     }
 
@@ -231,7 +231,7 @@ const Header = ({
       }
     }
 
-    return { text: previousRoute.name, language: undefined }
+    return { text: previousRoute.name, language: undefined } // system language
   }
 
   return (

From 9eb0687a9c73d62ebccb226da461f2238fe0de81 Mon Sep 17 00:00:00 2001
From: Simon Kleinle <simon.kleinle1@hs-augsburg.de>
Date: Mon, 21 Oct 2024 14:37:19 +0200
Subject: [PATCH 14/42] 2577: Add warningColor into config

---
 build-configs/common/theme/colors.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-configs/common/theme/colors.ts b/build-configs/common/theme/colors.ts
index 3b6d266ac0..52c2e3859c 100644
--- a/build-configs/common/theme/colors.ts
+++ b/build-configs/common/theme/colors.ts
@@ -30,5 +30,6 @@ export const commonLightColors = {
   positiveHighlight: '#188038',
   negativeHighlight: '#8b0000',
   invalidInput: '#B3261E',
+  warningColor: '#FFA726',
   linkColor: '#0b57d0',
 }

From 3af74a5a284615f8508b8fd93f86ec8bca09c8e1 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Tue, 22 Oct 2024 13:25:54 +0200
Subject: [PATCH 15/42] 2642: Add tests for embedded offers in web

---
 .../__tests__/EmbeddedOffers.spec.tsx         | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 web/src/components/__tests__/EmbeddedOffers.spec.tsx

diff --git a/web/src/components/__tests__/EmbeddedOffers.spec.tsx b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
new file mode 100644
index 0000000000..2d30e97de0
--- /dev/null
+++ b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -0,0 +1,78 @@
+import { render } from '@testing-library/react'
+import { DateTime } from 'luxon'
+import React from 'react'
+
+import { MALTE_HELP_FORM_OFFER_ALIAS, SPRUNGBRETT_OFFER_ALIAS } from 'shared'
+import { CategoryModel, OfferModel } from 'shared/api'
+
+import EmbeddedOffers from '../EmbeddedOffers'
+
+jest.mock('../SprungbrettOffer.tsx', () => ({
+  __esModule: true,
+  default: ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => (
+    <div>This is the Sprungbrett offer called {sprungbrettOffer.title}</div>
+  ),
+}))
+
+jest.mock('../MalteHelpForm.tsx', () => ({
+  __esModule: true,
+  default: ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => (
+    <div>This is the Malte help form called {malteHelpFormOffer.title}</div>
+  ),
+}))
+
+describe('EmbeddedOffers', () => {
+  const createCategory = (offer: OfferModel) =>
+    new CategoryModel({
+      root: false,
+      path: '/augsburg/de/title',
+      title: 'Title',
+      content: '',
+      parentPath: '/augsburg/de',
+      order: 75,
+      availableLanguages: {},
+      thumbnail: '',
+      lastUpdate: DateTime.fromISO('2024-08-15T10:47:34+02:00'),
+      organization: null,
+      embeddedOffers: [offer],
+    })
+
+  const renderEmbeddedOffers = (category: CategoryModel) =>
+    render(
+      <EmbeddedOffers
+        category={category}
+        city={null}
+        pathname='/augsburg/de/title'
+        cityCode='augsburg'
+        languageCode='de'
+      />,
+    )
+
+  it('should render a Sprungbrett offer correctly', () => {
+    const offer = new OfferModel({
+      alias: SPRUNGBRETT_OFFER_ALIAS,
+      path: '/augsburg/de/title',
+      thumbnail: '',
+      title: 'Offer 1',
+    })
+    const category = createCategory(offer)
+    const { queryByText } = renderEmbeddedOffers(category)
+
+    expect(queryByText('This is the Sprungbrett offer called Offer 1')).toBeTruthy()
+    expect(queryByText('This is the Malte help form called Offer 1')).toBeNull()
+  })
+
+  it('should render a Malte help form correctly', () => {
+    const offer = new OfferModel({
+      alias: MALTE_HELP_FORM_OFFER_ALIAS,
+      path: '/augsburg/de/title',
+      thumbnail: '',
+      title: 'Offer 2',
+    })
+    const category = createCategory(offer)
+    const { queryByText } = renderEmbeddedOffers(category)
+
+    expect(queryByText('This is the Malte help form called Offer 2')).toBeTruthy()
+    expect(queryByText('This is the Sprungbrett offer called Offer 2')).toBeNull()
+  })
+})

From 2019308fcb514bb6b01973c3ff48d92628d7e4e6 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Tue, 22 Oct 2024 13:50:28 +0200
Subject: [PATCH 16/42] 2642: Add tests for embedded offers in native

---
 .../__tests__/EmbeddedOffers.spec.tsx         | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 native/src/components/__tests__/EmbeddedOffers.spec.tsx

diff --git a/native/src/components/__tests__/EmbeddedOffers.spec.tsx b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
new file mode 100644
index 0000000000..0c06edadf2
--- /dev/null
+++ b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -0,0 +1,72 @@
+import { DateTime } from 'luxon'
+import React from 'react'
+
+import { MALTE_HELP_FORM_OFFER_ALIAS, SPRUNGBRETT_OFFER_ALIAS } from 'shared'
+import { CategoryModel, OfferModel } from 'shared/api'
+
+import render from '../../testing/render'
+import EmbeddedOffers from '../EmbeddedOffers'
+
+jest.mock('../SprungbrettOffer.tsx', () => ({
+  __esModule: true,
+  default: ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => {
+    const { Text } = require('react-native')
+    return <Text>This is the Sprungbrett offer called {sprungbrettOffer.title}</Text>
+  },
+}))
+
+jest.mock('../MalteHelpFormOffer.tsx', () => ({
+  __esModule: true,
+  default: ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => {
+    const { Text } = require('react-native')
+    return <Text>This is the Malte help form called {malteHelpFormOffer.title}</Text>
+  },
+}))
+
+describe('EmbeddedOffers', () => {
+  const createCategory = (offer: OfferModel) =>
+    new CategoryModel({
+      root: false,
+      path: '/augsburg/de/title',
+      title: 'Title',
+      content: '',
+      parentPath: '/augsburg/de',
+      order: 75,
+      availableLanguages: {},
+      thumbnail: '',
+      lastUpdate: DateTime.fromISO('2024-08-15T10:47:34+02:00'),
+      organization: null,
+      embeddedOffers: [offer],
+    })
+
+  const renderEmbeddedOffers = (category: CategoryModel) =>
+    render(<EmbeddedOffers category={category} cityCode='augsburg' languageCode='de' goBack={() => undefined} />)
+
+  it('should render a Sprungbrett offer correctly', () => {
+    const offer = new OfferModel({
+      alias: SPRUNGBRETT_OFFER_ALIAS,
+      path: '/augsburg/de/title',
+      thumbnail: '',
+      title: 'Offer 1',
+    })
+    const category = createCategory(offer)
+    const { queryByText } = renderEmbeddedOffers(category)
+
+    expect(queryByText('This is the Sprungbrett offer called Offer 1')).toBeTruthy()
+    expect(queryByText('This is the Malte help form called Offer 1')).toBeNull()
+  })
+
+  it('should render a Malte help form correctly', () => {
+    const offer = new OfferModel({
+      alias: MALTE_HELP_FORM_OFFER_ALIAS,
+      path: '/augsburg/de/title',
+      thumbnail: '',
+      title: 'Offer 2',
+    })
+    const category = createCategory(offer)
+    const { queryByText } = renderEmbeddedOffers(category)
+
+    expect(queryByText('This is the Malte help form called Offer 2')).toBeTruthy()
+    expect(queryByText('This is the Sprungbrett offer called Offer 2')).toBeNull()
+  })
+})

From 6c54b137a456c75fa2cc1694c2b9be104ac00b56 Mon Sep 17 00:00:00 2001
From: Simon Kleinle <simon.kleinle1@hs-augsburg.de>
Date: Wed, 23 Oct 2024 13:33:14 +0200
Subject: [PATCH 17/42] 2577: Add missing declaration and use warningColor in
 project

---
 build-configs/common/theme/colors.ts | 1 +
 web/src/components/Note.tsx          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-configs/common/theme/colors.ts b/build-configs/common/theme/colors.ts
index 52c2e3859c..13d32983bf 100644
--- a/build-configs/common/theme/colors.ts
+++ b/build-configs/common/theme/colors.ts
@@ -14,6 +14,7 @@ export type ColorsType = {
   positiveHighlight: string
   negativeHighlight: string
   invalidInput: string
+  warningColor: string
   linkColor: string
 }
 export const commonLightColors = {
diff --git a/web/src/components/Note.tsx b/web/src/components/Note.tsx
index db1030528e..9105cae392 100644
--- a/web/src/components/Note.tsx
+++ b/web/src/components/Note.tsx
@@ -6,7 +6,7 @@ import Icon from './base/Icon'
 
 const NoteContainer = styled.div`
   display: flex;
-  background-color: ${props => props.theme.colors.themeColor};
+  background-color: ${props => props.theme.colors.warningColor};
   padding: 12px;
   gap: 12px;
   align-items: center;

From 6fcf779e8da51e086422279c742664a1fae5cbe0 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 24 Oct 2024 16:30:27 +0200
Subject: [PATCH 18/42] 2642: Add tests for Malte help form in web

---
 .../__tests__/MalteHelpForm.spec.tsx          | 359 ++++++++++++++++++
 1 file changed, 359 insertions(+)
 create mode 100644 web/src/components/__tests__/MalteHelpForm.spec.tsx

diff --git a/web/src/components/__tests__/MalteHelpForm.spec.tsx b/web/src/components/__tests__/MalteHelpForm.spec.tsx
new file mode 100644
index 0000000000..e039ee481b
--- /dev/null
+++ b/web/src/components/__tests__/MalteHelpForm.spec.tsx
@@ -0,0 +1,359 @@
+import { fireEvent, waitFor } from '@testing-library/dom'
+import React from 'react'
+
+import { InvalidEmailError, OfferModel, submitMalteHelpForm } from 'shared/api'
+
+import { renderWithRouterAndTheme, renderWithTheme } from '../../testing/render'
+import MalteHelpForm from '../MalteHelpForm'
+
+jest.mock('react-i18next')
+jest.mock('shared/api', () => ({
+  ...jest.requireActual('shared/api'),
+  submitMalteHelpForm: jest.fn(),
+}))
+
+const submitButtonLabel = 'malteHelpForm:submit'
+const nameInputLabel = 'malteHelpForm:name'
+const name = 'Doe, Jane'
+const roomNumberInputLabel = 'malteHelpForm:roomNumber (malteHelpForm:common:optional)'
+const roomNumber = '42'
+const emailInputLabel = 'malteHelpForm:eMail'
+const email = 'testEmail@tuerantuer.org'
+const phoneInputLabel = 'malteHelpForm:telephone'
+const phoneNumber = '0049 160 12345678'
+const personalContactLabel = 'malteHelpForm:personally'
+const femaleContactLabel = 'malteHelpForm:contactPersonGenderFemale'
+const maleContactLabel = 'malteHelpForm:contactPersonGenderMale'
+const messageInputLabel = 'malteHelpForm:contactReason'
+const message =
+  "Hello, I can't figure out how to open my window for my contractually agreed daily Lüften, can you help me?"
+
+describe('MalteHelpForm', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  const offer = new OfferModel({
+    alias: 'help',
+    title: 'Hilfebutton',
+    path: 'https://zammad-malte.tuerantuer.org',
+    thumbnail: '',
+  })
+
+  const props = {
+    cityCode: 'testumgebung',
+    pageTitle: 'Kontaktformular',
+    languageCode: 'de',
+    malteHelpFormOffer: offer,
+  }
+
+  it('should submit the form successfully with an email', () => {
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByLabelText(nameInputLabel)
+    fireEvent.change(nameInput, { target: { value: name } })
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getAllByLabelText(emailInputLabel)[1]!
+    fireEvent.change(emailInput, { target: { value: email } })
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeEnabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'email',
+        contactGender: 'any',
+        email,
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+  })
+
+  it('should submit the form successfully with a phone number', () => {
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByLabelText(nameInputLabel)
+    fireEvent.change(nameInput, { target: { value: name } })
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const phoneButton = getAllByLabelText(phoneInputLabel)[0]!
+    expect(phoneButton).not.toBeChecked()
+    fireEvent.click(phoneButton)
+    expect(phoneButton).toBeChecked()
+    expect(submitButton).toBeDisabled()
+
+    const phoneInput = getAllByLabelText(phoneInputLabel)[1]!
+    fireEvent.change(phoneInput, { target: { value: phoneNumber } })
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeEnabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'telephone',
+        contactGender: 'any',
+        email: '',
+        name,
+        roomNumber,
+        telephone: phoneNumber,
+      }),
+    )
+  })
+
+  it('should submit the form successfully with a request for contact in person', () => {
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByLabelText(nameInputLabel)
+    fireEvent.change(nameInput, { target: { value: name } })
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const personalContactButton = getAllByLabelText(personalContactLabel)[0]!
+    expect(personalContactButton).not.toBeChecked()
+    fireEvent.click(personalContactButton)
+    expect(personalContactButton).toBeChecked()
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeEnabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'personally',
+        contactGender: 'any',
+        email: '',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+  })
+
+  it('should submit the form successfully with a request to be contacted by a woman', () => {
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByLabelText(nameInputLabel)
+    fireEvent.change(nameInput, { target: { value: name } })
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const personalContactButton = getAllByLabelText(personalContactLabel)[0]!
+    expect(personalContactButton).not.toBeChecked()
+    fireEvent.click(personalContactButton)
+    expect(personalContactButton).toBeChecked()
+    expect(submitButton).toBeEnabled()
+
+    const femaleContactButton = getByLabelText(femaleContactLabel)
+    expect(femaleContactButton).not.toBeChecked()
+    fireEvent.click(femaleContactButton)
+    expect(femaleContactButton).toBeChecked()
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeEnabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'personally',
+        contactGender: 'female',
+        email: '',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+  })
+
+  it('should submit the form successfully with a request to be contacted by a man', () => {
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByLabelText(nameInputLabel)
+    fireEvent.change(nameInput, { target: { value: name } })
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const personalContactButton = getAllByLabelText(personalContactLabel)[0]!
+    expect(personalContactButton).not.toBeChecked()
+    fireEvent.click(personalContactButton)
+    expect(personalContactButton).toBeChecked()
+    expect(submitButton).toBeEnabled()
+
+    const maleContactButton = getByLabelText(maleContactLabel)
+    expect(maleContactButton).not.toBeChecked()
+    fireEvent.click(maleContactButton)
+    expect(maleContactButton).toBeChecked()
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeEnabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'personally',
+        contactGender: 'male',
+        email: '',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+  })
+
+  it('should not submit if the name is empty', () => {
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getAllByLabelText(emailInputLabel)[1]!
+    fireEvent.change(emailInput, { target: { value: email } })
+    expect(submitButton).toBeDisabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeDisabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).not.toHaveBeenCalled()
+  })
+
+  it('should show an error if Zammad says the email address is invalid', async () => {
+    submitMalteHelpForm.mockImplementation(() => {
+      throw new InvalidEmailError()
+    })
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithRouterAndTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByLabelText(nameInputLabel)
+    fireEvent.change(nameInput, { target: { value: name } })
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getAllByLabelText(emailInputLabel)[1]!
+    fireEvent.change(emailInput, { target: { value: 'email' } })
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeEnabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'email',
+        contactGender: 'any',
+        email: 'email',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    await waitFor(() => expect(getByText('malteHelpForm:submitFailed')).toBeInTheDocument())
+  })
+
+  it('should show an error if there is another error while sending to Zammad', async () => {
+    submitMalteHelpForm.mockImplementation(() => {
+      throw new Error()
+    })
+    global.reportError = jest.fn()
+
+    const { getByLabelText, getByText, getAllByLabelText } = renderWithRouterAndTheme(<MalteHelpForm {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByLabelText(nameInputLabel)
+    fireEvent.change(nameInput, { target: { value: name } })
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByLabelText(roomNumberInputLabel)
+    fireEvent.change(roomNumberInput, { target: { value: roomNumber } })
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getAllByLabelText(emailInputLabel)[1]!
+    fireEvent.change(emailInput, { target: { value: 'email' } })
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByLabelText(messageInputLabel)
+    fireEvent.change(messageInput, { target: { value: message } })
+    expect(submitButton).toBeEnabled()
+
+    fireEvent.click(submitButton)
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'email',
+        contactGender: 'any',
+        email: 'email',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    await waitFor(() => expect(getByText('malteHelpForm:submitFailedReasoning')).toBeInTheDocument())
+  })
+})

From b50aeb951a52481e0bda6714f3b444d6077846c1 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Fri, 25 Oct 2024 12:20:20 +0200
Subject: [PATCH 19/42] 2642: WIP tests for Malte help form in native

---
 .../__tests__/MalteHelpFormOffer.spec.tsx     | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 native/src/components/__tests__/MalteHelpFormOffer.spec.tsx

diff --git a/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
new file mode 100644
index 0000000000..b6e78799f9
--- /dev/null
+++ b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
@@ -0,0 +1,114 @@
+import { act, fireEvent } from '@testing-library/react-native'
+import React from 'react'
+import { Control, useForm } from 'react-hook-form'
+import mockSafeAreaContext from 'react-native-safe-area-context/jest/mock'
+
+import { OfferModel, submitMalteHelpForm } from 'shared/api'
+
+import renderWithTheme from '../../testing/render'
+import MalteHelpFormOffer from '../MalteHelpFormOffer'
+
+jest.mock('react-i18next')
+jest.mock('shared/api', () => ({
+  ...jest.requireActual('shared/api'),
+  submitMalteHelpForm: jest.fn(),
+}))
+jest.mock('react-native-safe-area-context', () => mockSafeAreaContext)
+jest.mock('react-hook-form', () => ({
+  ...jest.requireActual('react-hook-form'),
+  useForm: () => ({
+    // ...useForm,
+    handleSubmit: (fn: () => void) => fn(),
+    // formState: {
+    //   isValid: true,
+    //   isSubmitting: false,
+    //   control: () => ({}) as Control,
+    // },
+  }),
+}))
+
+const submitButtonLabel = 'submit'
+const nameInputLabel = 'name'
+const name = 'Doe, Jane'
+const roomNumberInputLabel = 'roomNumber'
+const roomNumber = '42'
+const emailInputLabel = 'eMail'
+const email = 'testEmail@tuerantuer.org'
+const phoneInputLabel = 'telephone'
+const phoneNumber = '0049 160 12345678'
+const personalContactLabel = 'personally'
+const femaleContactLabel = 'contactPersonGenderFemale'
+const maleContactLabel = 'contactPersonGenderMale'
+const messageInputLabel = 'contactReason'
+const message =
+  "Hello, I can't figure out how to open my window for my contractually agreed daily Lüften, can you help me?"
+
+describe('MalteHelpFormOffer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  const offer = new OfferModel({
+    alias: 'help',
+    title: 'Hilfebutton',
+    path: 'https://zammad-malte.tuerantuer.org',
+    thumbnail: '',
+  })
+
+  const props = {
+    categoryPageTitle: 'Kontaktformular',
+    cityCode: 'testumgebung',
+    malteHelpFormOffer: offer,
+    url: '',
+    onSubmit: () => undefined,
+  }
+
+  it.only('should submit the form successfully with an email', async () => {
+    const { debug, getByText } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    // expect(submitButton).toBeDisabled()
+
+    const nameInput = getByText(nameInputLabel)
+    // fireEvent.press(nameInput)
+    await act(async () => fireEvent.press(nameInput))
+    fireEvent.changeText(nameInput, name)
+    // expect(submitButton).toBeDisabled()
+
+    // const roomNumberInput = getByText(roomNumberInputLabel)
+    // fireEvent.press(roomNumberInput)
+    // fireEvent.changeText(roomNumberInput, roomNumber)
+    // // expect(submitButton).toBeDisabled()
+
+    // const emailInput = getByText(emailInputLabel)
+    // fireEvent.press(emailInput)
+    // fireEvent.changeText(emailInput, email)
+    // // expect(submitButton).toBeEnabled()
+
+    // const messageInput = getByText(messageInputLabel)
+    // fireEvent.press(messageInput)
+    // fireEvent.changeText(messageInput, message)
+    // // expect(submitButton).toBeEnabled()
+
+    await act(async () => fireEvent.press(submitButton))
+    await expect(submitMalteHelpForm).toHaveBeenCalled()
+    // expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    //   expect.objectContaining({
+    //     comment: message,
+    //     contactChannel: 'email',
+    //     contactGender: 'any',
+    //     email,
+    //     name,
+    //     roomNumber,
+    //     telephone: '',
+    //   }),
+    // )
+  })
+
+  it('should submit the form successfully with a phone number', () => {})
+  it('should submit the form successfully with a request for contact in person', () => {})
+  it('should submit the form successfully with a request to be contacted by a woman', () => {})
+  it('should submit the form successfully with a request to be contacted by a man', () => {})
+  it('should not submit if the name is empty', () => {})
+  it('should not submit if Zammad says the email address is invalid', () => {})
+})

From 1e7bc77d05e1bf64bc431b397f7354d87be044bd Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Wed, 30 Oct 2024 18:59:26 +0100
Subject: [PATCH 20/42] 2642: Tests for Malte help form in native

---
 .../__tests__/MalteHelpFormOffer.spec.tsx     | 417 +++++++++++++++---
 native/src/components/base/InputSection.tsx   |   1 +
 .../src/components/form/FormRadioButtons.tsx  |   2 +-
 3 files changed, 359 insertions(+), 61 deletions(-)

diff --git a/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
index b6e78799f9..26d714acaa 100644
--- a/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
+++ b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
@@ -1,9 +1,8 @@
-import { act, fireEvent } from '@testing-library/react-native'
+import { userEvent, waitFor } from '@testing-library/react-native'
 import React from 'react'
-import { Control, useForm } from 'react-hook-form'
 import mockSafeAreaContext from 'react-native-safe-area-context/jest/mock'
 
-import { OfferModel, submitMalteHelpForm } from 'shared/api'
+import { InvalidEmailError, OfferModel, submitMalteHelpForm } from 'shared/api'
 
 import renderWithTheme from '../../testing/render'
 import MalteHelpFormOffer from '../MalteHelpFormOffer'
@@ -14,17 +13,10 @@ jest.mock('shared/api', () => ({
   submitMalteHelpForm: jest.fn(),
 }))
 jest.mock('react-native-safe-area-context', () => mockSafeAreaContext)
-jest.mock('react-hook-form', () => ({
-  ...jest.requireActual('react-hook-form'),
-  useForm: () => ({
-    // ...useForm,
-    handleSubmit: (fn: () => void) => fn(),
-    // formState: {
-    //   isValid: true,
-    //   isSubmitting: false,
-    //   control: () => ({}) as Control,
-    // },
-  }),
+const mockShowSnackbar = jest.fn()
+jest.mock('../../hooks/useSnackbar.ts', () => ({
+  __esModule: true,
+  default: () => mockShowSnackbar,
 }))
 
 const submitButtonLabel = 'submit'
@@ -32,7 +24,7 @@ const nameInputLabel = 'name'
 const name = 'Doe, Jane'
 const roomNumberInputLabel = 'roomNumber'
 const roomNumber = '42'
-const emailInputLabel = 'eMail'
+const emailInputLabel = 'email'
 const email = 'testEmail@tuerantuer.org'
 const phoneInputLabel = 'telephone'
 const phoneNumber = '0049 160 12345678'
@@ -43,9 +35,17 @@ const messageInputLabel = 'contactReason'
 const message =
   "Hello, I can't figure out how to open my window for my contractually agreed daily Lüften, can you help me?"
 
+// Typescript shenanigans to be able to use mockImplementation in the tests
+const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
+
 describe('MalteHelpFormOffer', () => {
   beforeEach(() => {
     jest.clearAllMocks()
+    jest.useFakeTimers()
+  })
+
+  const user = userEvent.setup({
+    advanceTimers: () => jest.advanceTimersByTime(1000),
   })
 
   const offer = new OfferModel({
@@ -60,55 +60,352 @@ describe('MalteHelpFormOffer', () => {
     cityCode: 'testumgebung',
     malteHelpFormOffer: offer,
     url: '',
-    onSubmit: () => undefined,
+    onSubmit: jest.fn(),
   }
 
-  it.only('should submit the form successfully with an email', async () => {
-    const { debug, getByText } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+  it('should submit the form successfully with an email', async () => {
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByTestId(nameInputLabel)
+    await user.type(nameInput, name)
+    expect(nameInput.props.value).toBe(name)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getByTestId(emailInputLabel)
+    await user.type(emailInput, email)
+    expect(emailInput.props.value).toBe(email)
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    expect(submitButton).toBeEnabled()
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'email',
+        contactGender: 'any',
+        email,
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    expect(mockShowSnackbar).toHaveBeenCalledWith({ text: 'submitSuccessful' })
+  })
+
+  it('should submit the form successfully with a phone number', async () => {
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByTestId(nameInputLabel)
+    await user.type(nameInput, name)
+    expect(nameInput.props.value).toBe(name)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const phoneButton = getByText(phoneInputLabel)
+    await user.press(phoneButton)
+    expect(submitButton).toBeDisabled()
+
+    const phoneInput = getByTestId(phoneInputLabel)
+    await user.type(phoneInput, phoneNumber)
+    expect(phoneInput.props.value).toBe(phoneNumber)
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    await waitFor(() => {
+      expect(submitButton).toBeEnabled()
+    })
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'telephone',
+        contactGender: 'any',
+        email: '',
+        name,
+        roomNumber,
+        telephone: phoneNumber,
+      }),
+    )
+
+    expect(mockShowSnackbar).toHaveBeenCalledWith({ text: 'submitSuccessful' })
+  })
+
+  it('should submit the form successfully with a request for contact in person', async () => {
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByTestId(nameInputLabel)
+    await user.type(nameInput, name)
+    expect(nameInput.props.value).toBe(name)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const personalContactButton = getByText(personalContactLabel)
+    await user.press(personalContactButton)
+    expect(submitButton).toBeDisabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    await waitFor(() => {
+      expect(submitButton).toBeEnabled()
+    })
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'personally',
+        contactGender: 'any',
+        email: '',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    expect(mockShowSnackbar).toHaveBeenCalledWith({ text: 'submitSuccessful' })
+  })
+
+  it('should submit the form successfully with a request to be contacted by a woman', async () => {
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByTestId(nameInputLabel)
+    await user.type(nameInput, name)
+    expect(nameInput.props.value).toBe(name)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const personalContactButton = getByText(personalContactLabel)
+    await user.press(personalContactButton)
+    expect(submitButton).toBeDisabled()
+
+    const femaleContactButton = getByText(femaleContactLabel)
+    await user.press(femaleContactButton)
+    expect(submitButton).toBeDisabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    await waitFor(() => {
+      expect(submitButton).toBeEnabled()
+    })
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'personally',
+        contactGender: 'female',
+        email: '',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    expect(mockShowSnackbar).toHaveBeenCalledWith({ text: 'submitSuccessful' })
+  })
+
+  it('should submit the form successfully with a request to be contacted by a man', async () => {
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
 
     const submitButton = getByText(submitButtonLabel)
-    // expect(submitButton).toBeDisabled()
-
-    const nameInput = getByText(nameInputLabel)
-    // fireEvent.press(nameInput)
-    await act(async () => fireEvent.press(nameInput))
-    fireEvent.changeText(nameInput, name)
-    // expect(submitButton).toBeDisabled()
-
-    // const roomNumberInput = getByText(roomNumberInputLabel)
-    // fireEvent.press(roomNumberInput)
-    // fireEvent.changeText(roomNumberInput, roomNumber)
-    // // expect(submitButton).toBeDisabled()
-
-    // const emailInput = getByText(emailInputLabel)
-    // fireEvent.press(emailInput)
-    // fireEvent.changeText(emailInput, email)
-    // // expect(submitButton).toBeEnabled()
-
-    // const messageInput = getByText(messageInputLabel)
-    // fireEvent.press(messageInput)
-    // fireEvent.changeText(messageInput, message)
-    // // expect(submitButton).toBeEnabled()
-
-    await act(async () => fireEvent.press(submitButton))
-    await expect(submitMalteHelpForm).toHaveBeenCalled()
-    // expect(submitMalteHelpForm).toHaveBeenCalledWith(
-    //   expect.objectContaining({
-    //     comment: message,
-    //     contactChannel: 'email',
-    //     contactGender: 'any',
-    //     email,
-    //     name,
-    //     roomNumber,
-    //     telephone: '',
-    //   }),
-    // )
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByTestId(nameInputLabel)
+    await user.type(nameInput, name)
+    expect(nameInput.props.value).toBe(name)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const personalContactButton = getByText(personalContactLabel)
+    await user.press(personalContactButton)
+    expect(submitButton).toBeDisabled()
+
+    const maleContactButton = getByText(maleContactLabel)
+    await user.press(maleContactButton)
+    expect(submitButton).toBeDisabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    await waitFor(() => {
+      expect(submitButton).toBeEnabled()
+    })
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'personally',
+        contactGender: 'male',
+        email: '',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    expect(mockShowSnackbar).toHaveBeenCalledWith({ text: 'submitSuccessful' })
   })
 
-  it('should submit the form successfully with a phone number', () => {})
-  it('should submit the form successfully with a request for contact in person', () => {})
-  it('should submit the form successfully with a request to be contacted by a woman', () => {})
-  it('should submit the form successfully with a request to be contacted by a man', () => {})
-  it('should not submit if the name is empty', () => {})
-  it('should not submit if Zammad says the email address is invalid', () => {})
+  it('should not submit if the name is empty', async () => {
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getByTestId(emailInputLabel)
+    await user.type(emailInput, email)
+    expect(emailInput.props.value).toBe(email)
+    expect(submitButton).toBeDisabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    expect(submitButton).toBeDisabled()
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).not.toHaveBeenCalled()
+
+    expect(mockShowSnackbar).not.toHaveBeenCalled()
+  })
+
+  it('should not submit if Zammad says the email address is invalid', async () => {
+    mockedSubmitMalteHelpForm.mockImplementation(() => {
+      throw new InvalidEmailError()
+    })
+
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByTestId(nameInputLabel)
+    await user.type(nameInput, name)
+    expect(nameInput.props.value).toBe(name)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getByTestId(emailInputLabel)
+    await user.type(emailInput, 'email')
+    expect(emailInput.props.value).toBe('email')
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    expect(submitButton).toBeEnabled()
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'email',
+        contactGender: 'any',
+        email: 'email',
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    expect(mockShowSnackbar).toHaveBeenCalledWith({ text: 'invalidEmailAddress' })
+  })
+
+  it('should show an error if there is another error while sending to Zammad', async () => {
+    mockedSubmitMalteHelpForm.mockImplementation(() => {
+      throw new Error()
+    })
+
+    const { getByText, getByTestId } = renderWithTheme(<MalteHelpFormOffer {...props} />)
+
+    const submitButton = getByText(submitButtonLabel)
+    expect(submitButton).toBeDisabled()
+
+    const nameInput = getByTestId(nameInputLabel)
+    await user.type(nameInput, name)
+    expect(nameInput.props.value).toBe(name)
+    expect(submitButton).toBeDisabled()
+
+    const roomNumberInput = getByTestId(roomNumberInputLabel)
+    await user.type(roomNumberInput, roomNumber)
+    expect(roomNumberInput.props.value).toBe(roomNumber)
+    expect(submitButton).toBeDisabled()
+
+    const emailInput = getByTestId(emailInputLabel)
+    await user.type(emailInput, email)
+    expect(emailInput.props.value).toBe(email)
+    expect(submitButton).toBeEnabled()
+
+    const messageInput = getByTestId(messageInputLabel)
+    await user.type(messageInput, message)
+    expect(messageInput.props.value).toBe(message)
+    expect(submitButton).toBeEnabled()
+
+    await user.press(submitButton)
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        comment: message,
+        contactChannel: 'email',
+        contactGender: 'any',
+        email,
+        name,
+        roomNumber,
+        telephone: '',
+      }),
+    )
+
+    expect(mockShowSnackbar).toHaveBeenCalledWith({ text: 'error:unknownError' })
+  })
 })
diff --git a/native/src/components/base/InputSection.tsx b/native/src/components/base/InputSection.tsx
index 17d2f617f3..266a8ce5be 100644
--- a/native/src/components/base/InputSection.tsx
+++ b/native/src/components/base/InputSection.tsx
@@ -95,6 +95,7 @@ const InputSection = ({
         returnKeyType='done'
         blurOnSubmit
         role='searchbox'
+        testID={title ?? value}
       />
     </Container>
   )
diff --git a/native/src/components/form/FormRadioButtons.tsx b/native/src/components/form/FormRadioButtons.tsx
index 3a786692c5..66b9a644fd 100644
--- a/native/src/components/form/FormRadioButtons.tsx
+++ b/native/src/components/form/FormRadioButtons.tsx
@@ -30,7 +30,7 @@ const FormRadioButtons = <T extends FieldValues>({ name, control, values }: Form
               <Text>{label}</Text>
             </RadioButton>
             {inputName !== undefined && value === key && (
-              <FormInput rules={{ required: true }} name={inputName} control={control} />
+              <FormInput rules={{ required: true }} name={inputName} control={control} title={inputName} />
             )}
           </View>
         ))}

From b89e75a739b0cf96b14b45b3214fe22f5d5f1043 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Wed, 30 Oct 2024 18:59:36 +0100
Subject: [PATCH 21/42] 2642: Cleaning up

---
 .../__tests__/MalteHelpForm.spec.tsx          | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/web/src/components/__tests__/MalteHelpForm.spec.tsx b/web/src/components/__tests__/MalteHelpForm.spec.tsx
index e039ee481b..87736060a0 100644
--- a/web/src/components/__tests__/MalteHelpForm.spec.tsx
+++ b/web/src/components/__tests__/MalteHelpForm.spec.tsx
@@ -28,6 +28,9 @@ const messageInputLabel = 'malteHelpForm:contactReason'
 const message =
   "Hello, I can't figure out how to open my window for my contractually agreed daily Lüften, can you help me?"
 
+// Typescript shenanigans to be able to use mockImplementation in the tests
+const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
+
 describe('MalteHelpForm', () => {
   beforeEach(() => {
     jest.clearAllMocks()
@@ -70,7 +73,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
@@ -112,7 +115,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'telephone',
@@ -150,7 +153,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -194,7 +197,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -238,7 +241,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -270,11 +273,11 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeDisabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).not.toHaveBeenCalled()
+    expect(mockedSubmitMalteHelpForm).not.toHaveBeenCalled()
   })
 
   it('should show an error if Zammad says the email address is invalid', async () => {
-    submitMalteHelpForm.mockImplementation(() => {
+    mockedSubmitMalteHelpForm.mockImplementation(() => {
       throw new InvalidEmailError()
     })
     const { getByLabelText, getByText, getAllByLabelText } = renderWithRouterAndTheme(<MalteHelpForm {...props} />)
@@ -299,7 +302,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
@@ -315,7 +318,7 @@ describe('MalteHelpForm', () => {
   })
 
   it('should show an error if there is another error while sending to Zammad', async () => {
-    submitMalteHelpForm.mockImplementation(() => {
+    mockedSubmitMalteHelpForm.mockImplementation(() => {
       throw new Error()
     })
     global.reportError = jest.fn()
@@ -334,7 +337,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeDisabled()
 
     const emailInput = getAllByLabelText(emailInputLabel)[1]!
-    fireEvent.change(emailInput, { target: { value: 'email' } })
+    fireEvent.change(emailInput, { target: { value: email } })
     expect(submitButton).toBeEnabled()
 
     const messageInput = getByLabelText(messageInputLabel)
@@ -342,12 +345,12 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(submitMalteHelpForm).toHaveBeenCalledWith(
+    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
         contactGender: 'any',
-        email: 'email',
+        email,
         name,
         roomNumber,
         telephone: '',

From 6e5fa6820743b4bebced60635a33bff58f476e77 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Wed, 30 Oct 2024 19:00:53 +0100
Subject: [PATCH 22/42] 2642: More cleaning up

---
 native/src/components/__tests__/MalteHelpFormOffer.spec.tsx | 6 +++---
 web/src/components/__tests__/MalteHelpForm.spec.tsx         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
index 26d714acaa..d3d8d095cb 100644
--- a/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
+++ b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
@@ -19,6 +19,9 @@ jest.mock('../../hooks/useSnackbar.ts', () => ({
   default: () => mockShowSnackbar,
 }))
 
+// Typescript shenanigans to be able to use mockImplementation in the tests
+const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
+
 const submitButtonLabel = 'submit'
 const nameInputLabel = 'name'
 const name = 'Doe, Jane'
@@ -35,9 +38,6 @@ const messageInputLabel = 'contactReason'
 const message =
   "Hello, I can't figure out how to open my window for my contractually agreed daily Lüften, can you help me?"
 
-// Typescript shenanigans to be able to use mockImplementation in the tests
-const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
-
 describe('MalteHelpFormOffer', () => {
   beforeEach(() => {
     jest.clearAllMocks()
diff --git a/web/src/components/__tests__/MalteHelpForm.spec.tsx b/web/src/components/__tests__/MalteHelpForm.spec.tsx
index 87736060a0..dfb9f7489d 100644
--- a/web/src/components/__tests__/MalteHelpForm.spec.tsx
+++ b/web/src/components/__tests__/MalteHelpForm.spec.tsx
@@ -12,6 +12,9 @@ jest.mock('shared/api', () => ({
   submitMalteHelpForm: jest.fn(),
 }))
 
+// Typescript shenanigans to be able to use mockImplementation in the tests
+const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
+
 const submitButtonLabel = 'malteHelpForm:submit'
 const nameInputLabel = 'malteHelpForm:name'
 const name = 'Doe, Jane'
@@ -28,9 +31,6 @@ const messageInputLabel = 'malteHelpForm:contactReason'
 const message =
   "Hello, I can't figure out how to open my window for my contractually agreed daily Lüften, can you help me?"
 
-// Typescript shenanigans to be able to use mockImplementation in the tests
-const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
-
 describe('MalteHelpForm', () => {
   beforeEach(() => {
     jest.clearAllMocks()

From a36dfa32fc13970cf77ed7e19ec054a26ace3f13 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 31 Oct 2024 15:26:36 +0100
Subject: [PATCH 23/42] 2642: Small fixes

---
 .../__tests__/EmbeddedOffers.spec.tsx         |  4 ++--
 .../__tests__/MalteHelpFormOffer.spec.tsx     | 23 ++++++++-----------
 .../__tests__/EmbeddedOffers.spec.tsx         |  4 ++--
 .../__tests__/MalteHelpForm.spec.tsx          | 23 ++++++++-----------
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/native/src/components/__tests__/EmbeddedOffers.spec.tsx b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
index 0c06edadf2..6eebd72e6a 100644
--- a/native/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,7 +7,7 @@ import { CategoryModel, OfferModel } from 'shared/api'
 import render from '../../testing/render'
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer.tsx', () => ({
+jest.mock('../SprungbrettOffer', () => ({
   __esModule: true,
   default: ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => {
     const { Text } = require('react-native')
@@ -15,7 +15,7 @@ jest.mock('../SprungbrettOffer.tsx', () => ({
   },
 }))
 
-jest.mock('../MalteHelpFormOffer.tsx', () => ({
+jest.mock('../MalteHelpFormOffer', () => ({
   __esModule: true,
   default: ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => {
     const { Text } = require('react-native')
diff --git a/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
index d3d8d095cb..cd833e4c8c 100644
--- a/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
+++ b/native/src/components/__tests__/MalteHelpFormOffer.spec.tsx
@@ -19,9 +19,6 @@ jest.mock('../../hooks/useSnackbar.ts', () => ({
   default: () => mockShowSnackbar,
 }))
 
-// Typescript shenanigans to be able to use mockImplementation in the tests
-const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
-
 const submitButtonLabel = 'submit'
 const nameInputLabel = 'name'
 const name = 'Doe, Jane'
@@ -90,7 +87,7 @@ describe('MalteHelpFormOffer', () => {
     expect(submitButton).toBeEnabled()
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
@@ -138,7 +135,7 @@ describe('MalteHelpFormOffer', () => {
     })
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'telephone',
@@ -181,7 +178,7 @@ describe('MalteHelpFormOffer', () => {
     })
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -228,7 +225,7 @@ describe('MalteHelpFormOffer', () => {
     })
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -275,7 +272,7 @@ describe('MalteHelpFormOffer', () => {
     })
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -312,13 +309,13 @@ describe('MalteHelpFormOffer', () => {
     expect(submitButton).toBeDisabled()
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).not.toHaveBeenCalled()
+    expect(submitMalteHelpForm).not.toHaveBeenCalled()
 
     expect(mockShowSnackbar).not.toHaveBeenCalled()
   })
 
   it('should not submit if Zammad says the email address is invalid', async () => {
-    mockedSubmitMalteHelpForm.mockImplementation(() => {
+    jest.mocked(submitMalteHelpForm).mockImplementation(() => {
       throw new InvalidEmailError()
     })
 
@@ -348,7 +345,7 @@ describe('MalteHelpFormOffer', () => {
     expect(submitButton).toBeEnabled()
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
@@ -364,7 +361,7 @@ describe('MalteHelpFormOffer', () => {
   })
 
   it('should show an error if there is another error while sending to Zammad', async () => {
-    mockedSubmitMalteHelpForm.mockImplementation(() => {
+    jest.mocked(submitMalteHelpForm).mockImplementation(() => {
       throw new Error()
     })
 
@@ -394,7 +391,7 @@ describe('MalteHelpFormOffer', () => {
     expect(submitButton).toBeEnabled()
 
     await user.press(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
diff --git a/web/src/components/__tests__/EmbeddedOffers.spec.tsx b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
index 2d30e97de0..4201947436 100644
--- a/web/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,14 +7,14 @@ import { CategoryModel, OfferModel } from 'shared/api'
 
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer.tsx', () => ({
+jest.mock('../SprungbrettOffer', () => ({
   __esModule: true,
   default: ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => (
     <div>This is the Sprungbrett offer called {sprungbrettOffer.title}</div>
   ),
 }))
 
-jest.mock('../MalteHelpForm.tsx', () => ({
+jest.mock('../MalteHelpForm', () => ({
   __esModule: true,
   default: ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => (
     <div>This is the Malte help form called {malteHelpFormOffer.title}</div>
diff --git a/web/src/components/__tests__/MalteHelpForm.spec.tsx b/web/src/components/__tests__/MalteHelpForm.spec.tsx
index dfb9f7489d..e7531b99f3 100644
--- a/web/src/components/__tests__/MalteHelpForm.spec.tsx
+++ b/web/src/components/__tests__/MalteHelpForm.spec.tsx
@@ -12,9 +12,6 @@ jest.mock('shared/api', () => ({
   submitMalteHelpForm: jest.fn(),
 }))
 
-// Typescript shenanigans to be able to use mockImplementation in the tests
-const mockedSubmitMalteHelpForm = submitMalteHelpForm as jest.MockedFunction<typeof submitMalteHelpForm>
-
 const submitButtonLabel = 'malteHelpForm:submit'
 const nameInputLabel = 'malteHelpForm:name'
 const name = 'Doe, Jane'
@@ -73,7 +70,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
@@ -115,7 +112,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'telephone',
@@ -153,7 +150,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -197,7 +194,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -241,7 +238,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'personally',
@@ -273,11 +270,11 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeDisabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).not.toHaveBeenCalled()
+    expect(submitMalteHelpForm).not.toHaveBeenCalled()
   })
 
   it('should show an error if Zammad says the email address is invalid', async () => {
-    mockedSubmitMalteHelpForm.mockImplementation(() => {
+    jest.mocked(submitMalteHelpForm).mockImplementation(() => {
       throw new InvalidEmailError()
     })
     const { getByLabelText, getByText, getAllByLabelText } = renderWithRouterAndTheme(<MalteHelpForm {...props} />)
@@ -302,7 +299,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',
@@ -318,7 +315,7 @@ describe('MalteHelpForm', () => {
   })
 
   it('should show an error if there is another error while sending to Zammad', async () => {
-    mockedSubmitMalteHelpForm.mockImplementation(() => {
+    jest.mocked(submitMalteHelpForm).mockImplementation(() => {
       throw new Error()
     })
     global.reportError = jest.fn()
@@ -345,7 +342,7 @@ describe('MalteHelpForm', () => {
     expect(submitButton).toBeEnabled()
 
     fireEvent.click(submitButton)
-    expect(mockedSubmitMalteHelpForm).toHaveBeenCalledWith(
+    expect(submitMalteHelpForm).toHaveBeenCalledWith(
       expect.objectContaining({
         comment: message,
         contactChannel: 'email',

From 5711d5fc78fa64bed23b4a14f0d7f70de7687080 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Thu, 31 Oct 2024 16:45:41 +0100
Subject: [PATCH 24/42] 2929: Allow coarse location in Android

---
 native/src/hooks/useUserLocation.ts           | 23 ++++++++++++++-----
 .../2949-coarse-location-android.yml          |  6 +++++
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 release-notes/unreleased/2949-coarse-location-android.yml

diff --git a/native/src/hooks/useUserLocation.ts b/native/src/hooks/useUserLocation.ts
index 6d0b163f05..aa6f10de7e 100644
--- a/native/src/hooks/useUserLocation.ts
+++ b/native/src/hooks/useUserLocation.ts
@@ -9,9 +9,6 @@ import { LocationStateType, UnavailableLocationState } from 'shared'
 import { log, reportError } from '../utils/sentry'
 import useSnackbar from './useSnackbar'
 
-const locationPermission =
-  Platform.OS === 'ios' ? PERMISSIONS.IOS.LOCATION_WHEN_IN_USE : PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION
-
 const locationStateOnError = (error: GeolocationError): UnavailableLocationState => {
   const message = error.code === error.PERMISSION_DENIED ? 'noPermission' : 'timeout'
   return {
@@ -35,6 +32,22 @@ const getUserLocation = async (): Promise<LocationStateType> =>
     )
   })
 
+const locationPermissionIOS = PERMISSIONS.IOS.LOCATION_WHEN_IN_USE
+const fineLocationPermissionAndroid = PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION
+const coarseLocationPermissionAndroid = PERMISSIONS.ANDROID.ACCESS_COARSE_LOCATION
+
+const getLocationPermissionStatus = async (requestPermission: boolean) => {
+  const permissionFunctionToCall = requestPermission ? request : check
+  if (Platform.OS === 'ios') {
+    return permissionFunctionToCall(locationPermissionIOS)
+  }
+  const finePermission = await permissionFunctionToCall(fineLocationPermissionAndroid)
+  if (finePermission === RESULTS.GRANTED || finePermission === RESULTS.LIMITED) {
+    return finePermission
+  }
+  return permissionFunctionToCall(coarseLocationPermissionAndroid)
+}
+
 type UseUserLocationProps = {
   requestPermissionInitially: boolean
 }
@@ -59,9 +72,7 @@ const useUserLocation = ({ requestPermissionInitially }: UseUserLocationProps):
     async ({ showSnackbarIfBlocked = true, requestPermission = true }: RequestPermissionAndLocationOptions = {}) => {
       setLocationState(initialState)
 
-      const locationPermissionStatus = requestPermission
-        ? await request(locationPermission)
-        : await check(locationPermission)
+      const locationPermissionStatus = await getLocationPermissionStatus(requestPermission)
 
       if (requestPermission) {
         log(`Location permission status: ${locationPermissionStatus}`)
diff --git a/release-notes/unreleased/2949-coarse-location-android.yml b/release-notes/unreleased/2949-coarse-location-android.yml
new file mode 100644
index 0000000000..f9350aeac3
--- /dev/null
+++ b/release-notes/unreleased/2949-coarse-location-android.yml
@@ -0,0 +1,6 @@
+issue_key: 2949
+show_in_stores: true
+platforms:
+  - android
+en: A coarse location permission is now seen as an accepted permission
+de: Erlaubnis zur groben Ortung zählt jetzt als erlaubt

From 5bd8eda60bb41f317972de7640e18139305e3209 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 4 Nov 2024 12:41:15 +0100
Subject: [PATCH 25/42] 2642: Improve tests

---
 .../__tests__/EmbeddedOffers.spec.tsx         | 20 +++++++++----------
 .../__tests__/EmbeddedOffers.spec.tsx         | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/native/src/components/__tests__/EmbeddedOffers.spec.tsx b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
index 6eebd72e6a..90ea3f561d 100644
--- a/native/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,21 +7,21 @@ import { CategoryModel, OfferModel } from 'shared/api'
 import render from '../../testing/render'
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer', () => ({
-  __esModule: true,
-  default: ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => {
+jest.mock('../SprungbrettOffer.tsx', () => {
+  const MockedSprungbrettOffer = ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => {
     const { Text } = require('react-native')
     return <Text>This is the Sprungbrett offer called {sprungbrettOffer.title}</Text>
-  },
-}))
+  }
+  return MockedSprungbrettOffer
+})
 
-jest.mock('../MalteHelpFormOffer', () => ({
-  __esModule: true,
-  default: ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => {
+jest.mock('../MalteHelpFormOffer', () => {
+  const MockedMalteHelpForm = ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => {
     const { Text } = require('react-native')
     return <Text>This is the Malte help form called {malteHelpFormOffer.title}</Text>
-  },
-}))
+  }
+  return MockedMalteHelpForm
+})
 
 describe('EmbeddedOffers', () => {
   const createCategory = (offer: OfferModel) =>
diff --git a/web/src/components/__tests__/EmbeddedOffers.spec.tsx b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
index 4201947436..eb8d0f4937 100644
--- a/web/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,19 +7,19 @@ import { CategoryModel, OfferModel } from 'shared/api'
 
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer', () => ({
-  __esModule: true,
-  default: ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => (
+jest.mock('../SprungbrettOffer.tsx', () => {
+  const MockedSprungbrettOffer = ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => (
     <div>This is the Sprungbrett offer called {sprungbrettOffer.title}</div>
-  ),
-}))
+  )
+  return MockedSprungbrettOffer
+})
 
-jest.mock('../MalteHelpForm', () => ({
-  __esModule: true,
-  default: ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => (
+jest.mock('../MalteHelpForm', () => {
+  const MockedMalteHelpForm = ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => (
     <div>This is the Malte help form called {malteHelpFormOffer.title}</div>
-  ),
-}))
+  )
+  return MockedMalteHelpForm
+})
 
 describe('EmbeddedOffers', () => {
   const createCategory = (offer: OfferModel) =>

From 868721227ff744365b446b24678d92a301708e26 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 4 Nov 2024 13:02:32 +0100
Subject: [PATCH 26/42] 2642: Remove unnecessary file format

---
 native/src/components/__tests__/EmbeddedOffers.spec.tsx | 2 +-
 web/src/components/__tests__/EmbeddedOffers.spec.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/native/src/components/__tests__/EmbeddedOffers.spec.tsx b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
index 90ea3f561d..ff8de54cbb 100644
--- a/native/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,7 +7,7 @@ import { CategoryModel, OfferModel } from 'shared/api'
 import render from '../../testing/render'
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer.tsx', () => {
+jest.mock('../SprungbrettOffer', () => {
   const MockedSprungbrettOffer = ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => {
     const { Text } = require('react-native')
     return <Text>This is the Sprungbrett offer called {sprungbrettOffer.title}</Text>
diff --git a/web/src/components/__tests__/EmbeddedOffers.spec.tsx b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
index eb8d0f4937..78db30ed26 100644
--- a/web/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,7 +7,7 @@ import { CategoryModel, OfferModel } from 'shared/api'
 
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer.tsx', () => {
+jest.mock('../SprungbrettOffer', () => {
   const MockedSprungbrettOffer = ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => (
     <div>This is the Sprungbrett offer called {sprungbrettOffer.title}</div>
   )

From d5105ecdc3935daa4d4f68c6492680134670dd26 Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Mon, 4 Nov 2024 13:30:40 +0100
Subject: [PATCH 27/42] 2642: Fix for Steffen's linter :X

---
 .../__tests__/EmbeddedOffers.spec.tsx          | 18 ++++++------------
 .../__tests__/EmbeddedOffers.spec.tsx          | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/native/src/components/__tests__/EmbeddedOffers.spec.tsx b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
index ff8de54cbb..095cebb9e6 100644
--- a/native/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/native/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,20 +7,14 @@ import { CategoryModel, OfferModel } from 'shared/api'
 import render from '../../testing/render'
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer', () => {
-  const MockedSprungbrettOffer = ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => {
-    const { Text } = require('react-native')
-    return <Text>This is the Sprungbrett offer called {sprungbrettOffer.title}</Text>
-  }
-  return MockedSprungbrettOffer
+jest.mock('../SprungbrettOffer', () => ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => {
+  const { Text } = require('react-native')
+  return <Text>This is the Sprungbrett offer called {sprungbrettOffer.title}</Text>
 })
 
-jest.mock('../MalteHelpFormOffer', () => {
-  const MockedMalteHelpForm = ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => {
-    const { Text } = require('react-native')
-    return <Text>This is the Malte help form called {malteHelpFormOffer.title}</Text>
-  }
-  return MockedMalteHelpForm
+jest.mock('../MalteHelpFormOffer', () => ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => {
+  const { Text } = require('react-native')
+  return <Text>This is the Malte help form called {malteHelpFormOffer.title}</Text>
 })
 
 describe('EmbeddedOffers', () => {
diff --git a/web/src/components/__tests__/EmbeddedOffers.spec.tsx b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
index 78db30ed26..35c26c926e 100644
--- a/web/src/components/__tests__/EmbeddedOffers.spec.tsx
+++ b/web/src/components/__tests__/EmbeddedOffers.spec.tsx
@@ -7,19 +7,13 @@ import { CategoryModel, OfferModel } from 'shared/api'
 
 import EmbeddedOffers from '../EmbeddedOffers'
 
-jest.mock('../SprungbrettOffer', () => {
-  const MockedSprungbrettOffer = ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => (
-    <div>This is the Sprungbrett offer called {sprungbrettOffer.title}</div>
-  )
-  return MockedSprungbrettOffer
-})
+jest.mock('../SprungbrettOffer', () => ({ sprungbrettOffer }: { sprungbrettOffer: OfferModel }) => (
+  <div>This is the Sprungbrett offer called {sprungbrettOffer.title}</div>
+))
 
-jest.mock('../MalteHelpForm', () => {
-  const MockedMalteHelpForm = ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => (
-    <div>This is the Malte help form called {malteHelpFormOffer.title}</div>
-  )
-  return MockedMalteHelpForm
-})
+jest.mock('../MalteHelpForm', () => ({ malteHelpFormOffer }: { malteHelpFormOffer: OfferModel }) => (
+  <div>This is the Malte help form called {malteHelpFormOffer.title}</div>
+))
 
 describe('EmbeddedOffers', () => {
   const createCategory = (offer: OfferModel) =>

From 2744ca1211359dfa2fb01ddf8b4bcfa80ead8f91 Mon Sep 17 00:00:00 2001
From: Leandra Hahn <LeandraH@users.noreply.github.com>
Date: Mon, 4 Nov 2024 16:36:43 +0100
Subject: [PATCH 28/42] Update
 release-notes/unreleased/2949-coarse-location-android.yml

Co-authored-by: Steffen Kleinle <steffen.kleinle@mailbox.org>
---
 release-notes/unreleased/2949-coarse-location-android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-notes/unreleased/2949-coarse-location-android.yml b/release-notes/unreleased/2949-coarse-location-android.yml
index f9350aeac3..194f3624cb 100644
--- a/release-notes/unreleased/2949-coarse-location-android.yml
+++ b/release-notes/unreleased/2949-coarse-location-android.yml
@@ -2,5 +2,5 @@ issue_key: 2949
 show_in_stores: true
 platforms:
   - android
-en: A coarse location permission is now seen as an accepted permission
-de: Erlaubnis zur groben Ortung zählt jetzt als erlaubt
+en: Fix location detection if only granted approximate permission.
+de: Die Standortbestimmung funktioniert nun auch, wenn nur eine grobe Bestimmung erlaubt wird.

From 9d7ca552c53996dc9187d1a48ee97ca78b796cb7 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Mon, 11 Nov 2024 13:41:49 +0100
Subject: [PATCH 29/42] 2949: Fix map user location with approximate permission
 (for degoogled devices?)

---
 native/src/components/MapView.tsx         |  6 ++---
 native/src/components/base/IconButton.tsx |  2 +-
 native/src/hooks/useUserLocation.ts       | 29 +++++++++++++----------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/native/src/components/MapView.tsx b/native/src/components/MapView.tsx
index 5646a40270..7b17a25091 100644
--- a/native/src/components/MapView.tsx
+++ b/native/src/components/MapView.tsx
@@ -119,11 +119,11 @@ const MapView = ({
   )
 
   const onRequestLocation = useCallback(async () => {
-    if (userLocation) {
-      moveTo(userLocation)
+    const newUserLocation = userLocation ?? (await refreshPermissionAndLocation())?.coordinates
+    if (newUserLocation) {
+      moveTo(newUserLocation)
       setFollowUserLocation(true)
     }
-    await refreshPermissionAndLocation()
   }, [refreshPermissionAndLocation, moveTo, userLocation])
 
   useEffect(() => {
diff --git a/native/src/components/base/IconButton.tsx b/native/src/components/base/IconButton.tsx
index cc200e8d4d..2f5df73170 100644
--- a/native/src/components/base/IconButton.tsx
+++ b/native/src/components/base/IconButton.tsx
@@ -16,7 +16,7 @@ const StyledPressable = styled(Pressable)`
 type IconButtonProps = {
   accessibilityLabel: string
   icon: ReactElement
-  onPress: () => Promise<void> | void
+  onPress: () => unknown
   style?: StyleProp<ViewStyle>
 }
 
diff --git a/native/src/hooks/useUserLocation.ts b/native/src/hooks/useUserLocation.ts
index aa6f10de7e..342ccffea0 100644
--- a/native/src/hooks/useUserLocation.ts
+++ b/native/src/hooks/useUserLocation.ts
@@ -58,7 +58,7 @@ type RequestPermissionAndLocationOptions = {
 }
 
 type UseUserLocationReturn = LocationStateType & {
-  refreshPermissionAndLocation: (options?: RequestPermissionAndLocationOptions) => Promise<void>
+  refreshPermissionAndLocation: (options?: RequestPermissionAndLocationOptions) => Promise<LocationStateType | null>
 }
 
 const initialState: LocationStateType = { status: 'loading', message: 'loading', coordinates: undefined }
@@ -69,7 +69,10 @@ const useUserLocation = ({ requestPermissionInitially }: UseUserLocationProps):
   const { t } = useTranslation()
 
   const refreshPermissionAndLocation = useCallback(
-    async ({ showSnackbarIfBlocked = true, requestPermission = true }: RequestPermissionAndLocationOptions = {}) => {
+    async ({
+      showSnackbarIfBlocked = true,
+      requestPermission = true,
+    }: RequestPermissionAndLocationOptions = {}): Promise<LocationStateType | null> => {
       setLocationState(initialState)
 
       const locationPermissionStatus = await getLocationPermissionStatus(requestPermission)
@@ -79,17 +82,19 @@ const useUserLocation = ({ requestPermissionInitially }: UseUserLocationProps):
       }
 
       if (locationPermissionStatus === RESULTS.GRANTED) {
-        setLocationState(await getUserLocation())
-      } else {
-        setLocationState({ message: 'noPermission', status: 'unavailable', coordinates: undefined })
-
-        if (requestPermission && showSnackbarIfBlocked && locationPermissionStatus === RESULTS.BLOCKED) {
-          showSnackbar({
-            text: t('landing:noPermission'),
-            positiveAction: { label: t('layout:settings'), onPress: openSettings },
-          })
-        }
+        const location = await getUserLocation()
+        setLocationState(location)
+        return location
       }
+
+      setLocationState({ message: 'noPermission', status: 'unavailable', coordinates: undefined })
+      if (requestPermission && showSnackbarIfBlocked && locationPermissionStatus === RESULTS.BLOCKED) {
+        showSnackbar({
+          text: t('landing:noPermission'),
+          positiveAction: { label: t('layout:settings'), onPress: openSettings },
+        })
+      }
+      return null
     },
     [showSnackbar, t],
   )

From 18e17636ee8ed0bf6294aca90bae57fee69c174e Mon Sep 17 00:00:00 2001
From: Simon Kleinle <simon.kleinle1@hs-augsburg.de>
Date: Mon, 11 Nov 2024 15:23:12 +0100
Subject: [PATCH 30/42] 2577: Add warning color to native feedback

---
 native/src/components/Note.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/src/components/Note.tsx b/native/src/components/Note.tsx
index a930bcdc9a..efc96a39c2 100644
--- a/native/src/components/Note.tsx
+++ b/native/src/components/Note.tsx
@@ -5,7 +5,7 @@ import { NoteIcon } from '../assets'
 import Icon from './base/Icon'
 
 const NoteBox = styled.View`
-  background-color: ${props => props.theme.colors.themeColor};
+  background-color: ${props => props.theme.colors.warningColor};
   margin-top: 12px;
   padding: 12px;
   flex-direction: row;

From 37de4710ac8b4047f2d835e09f4247a6b992842a Mon Sep 17 00:00:00 2001
From: ztefanie <stefanie.metzger@tuerantuer.org>
Date: Tue, 12 Nov 2024 12:47:29 +0100
Subject: [PATCH 31/42] Add related issue hint to issue template

---
 .github/ISSUE_TEMPLATE/bug-report.md | 2 +-
 .github/ISSUE_TEMPLATE/task.md       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index f4186a96e1..cf410f9e3e 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -25,7 +25,7 @@ labels: Bug
 
 ### Additional Information
 
-<!-- Add any other context (e.g. logs, screenshots, environment etc.) about the problem here. -->
+<!-- Add any other context (e.g. logs, screenshots, environment, related issues etc.) about the problem here. -->
 
 <details>
   <summary>Traceback</summary>
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
index 062088c723..da7abb915f 100644
--- a/.github/ISSUE_TEMPLATE/task.md
+++ b/.github/ISSUE_TEMPLATE/task.md
@@ -16,4 +16,4 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context or screenshots about the feature request here. If applicable link any related issues or back-end issues.

From eeeaf57293e34b66e40ce1b4666093da2f79bfd4 Mon Sep 17 00:00:00 2001
From: Simon Kleinle <80710541+simomps@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:09:20 +0100
Subject: [PATCH 32/42] 2520: Show number search results (#2976)

* 2577: Add count of number of search results to search

* 2577: Add release note

* 2520: Add number of search results to city selection

---------

Co-authored-by: Steffen Kleinle <steffen.kleinle@mailbox.org>
---
 native/README.md                              |  5 ++--
 native/src/components/CitySelector.tsx        |  7 +++++
 native/src/routes/SearchModal.tsx             | 26 ++++++++++++-------
 .../2520-Show-number-of-search-results.yml    |  8 ++++++
 web/src/components/CitySelector.tsx           |  4 +++
 web/src/routes/SearchPage.tsx                 |  6 +++++
 6 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 release-notes/unreleased/2520-Show-number-of-search-results.yml

diff --git a/native/README.md b/native/README.md
index 7a43557b08..934b4b11ac 100644
--- a/native/README.md
+++ b/native/README.md
@@ -29,9 +29,8 @@ Depending on whether you want to develop for Android, iOS or both the following
 
 - Install Java JDK, SDK and Runtime (v8 or v11).
 - Install the Android SDK by using
-  the [Android Support plugin](https://plugins.jetbrains.com/plugin/1792-android-support) in IntelliJ.
-- Install the latest stable SDK Platform and Android SDK Tools in the SDK Manager (Settings > Appearance & Behaviour >
-  System Settings > Android SDK).
+  the [Android plugin](https://plugins.jetbrains.com/plugin/22989-android) in IntelliJ.
+- Install the latest stable SDK Platform and Android SDK Tools in the SDK Manager (Settings > Languages & Frameworks > Android SDK Updater).
 - Install and accept the SDK license in the SDK Manager.
 - [optional] If you want to develop using an emulator, also install the Android Emulator in the Android SDK settings.
 
diff --git a/native/src/components/CitySelector.tsx b/native/src/components/CitySelector.tsx
index 34b2454e8a..9f70fd07b0 100644
--- a/native/src/components/CitySelector.tsx
+++ b/native/src/components/CitySelector.tsx
@@ -26,6 +26,12 @@ const SearchBar = styled.View`
   padding: 0 10%;
 `
 
+const SearchCounter = styled.Text`
+  margin: 15px 0 10px;
+  color: ${props => props.theme.colors.textSecondaryColor};
+  font-weight: 500;
+`
+
 type CitySelectorProps = {
   cities: CityModel[]
   navigateToDashboard: (city: CityModel) => void
@@ -70,6 +76,7 @@ const CitySelector = ({ cities, navigateToDashboard }: CitySelectorProps): React
           <CityGroup>{t('nearbyCities')}</CityGroup>
           <NearbyCities cities={cities} navigateToDashboard={navigateToDashboard} filterText={filterText} />
         </CityGroupContainer>
+        <SearchCounter>{t('search:searchResultsCount', { count: resultCities.length })}</SearchCounter>
         {resultCities.length === 0 ? <NothingFound paddingTop /> : cityEntries}
       </View>
     </View>
diff --git a/native/src/routes/SearchModal.tsx b/native/src/routes/SearchModal.tsx
index f5480269d5..9e7da908ea 100644
--- a/native/src/routes/SearchModal.tsx
+++ b/native/src/routes/SearchModal.tsx
@@ -22,6 +22,11 @@ const Wrapper = styled.View`
   background-color: ${props => props.theme.colors.backgroundColor};
 `
 
+const SearchCounter = styled.Text`
+  margin: 10px 20px;
+  color: ${props => props.theme.colors.textSecondaryColor};
+`
+
 export type SearchModalProps = {
   allPossibleResults: SearchResult[]
   languageCode: string
@@ -76,15 +81,18 @@ const SearchModal = ({
       <SearchHeader query={query} closeSearchBar={onClose} onSearchChanged={setQuery} />
       <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={{ flex: 1 }}>
         {query.length > 0 && (
-          <List
-            items={searchResults}
-            renderItem={renderItem}
-            accessibilityLabel={t('searchResultsCount', { count: searchResults.length })}
-            style={{ flex: 1 }}
-            noItemsMessage={
-              <FeedbackContainer routeType={SEARCH_ROUTE} language={languageCode} cityCode={cityCode} query={query} />
-            }
-          />
+          <>
+            <SearchCounter>{t('searchResultsCount', { count: searchResults.length })}</SearchCounter>
+            <List
+              items={searchResults}
+              renderItem={renderItem}
+              accessibilityLabel={t('searchResultsCount', { count: searchResults.length })}
+              style={{ flex: 1 }}
+              noItemsMessage={
+                <FeedbackContainer routeType={SEARCH_ROUTE} language={languageCode} cityCode={cityCode} query={query} />
+              }
+            />
+          </>
         )}
       </KeyboardAvoidingView>
     </Wrapper>
diff --git a/release-notes/unreleased/2520-Show-number-of-search-results.yml b/release-notes/unreleased/2520-Show-number-of-search-results.yml
new file mode 100644
index 0000000000..dc777f8474
--- /dev/null
+++ b/release-notes/unreleased/2520-Show-number-of-search-results.yml
@@ -0,0 +1,8 @@
+issue_key: 2520
+show_in_stores: true
+platforms:
+  - web
+  - android
+  - ios
+en: Show number of search results
+de: Zeige die Anzahl von Suchergebnissen an
diff --git a/web/src/components/CitySelector.tsx b/web/src/components/CitySelector.tsx
index bfb75f9394..9a91146fa0 100644
--- a/web/src/components/CitySelector.tsx
+++ b/web/src/components/CitySelector.tsx
@@ -25,6 +25,9 @@ const CityListParent = styled.div<{ $stickyTop: number }>`
   background-color: ${props => props.theme.colors.backgroundColor};
   border-bottom: 1px solid ${props => props.theme.colors.themeColor};
 `
+const SearchCounter = styled.p`
+  color: ${props => props.theme.colors.textSecondaryColor};
+`
 
 type CitySelectorProps = {
   cities: CityModel[]
@@ -58,6 +61,7 @@ const CitySelector = ({ cities, language }: CitySelectorProps): ReactElement =>
         placeholderText={t('searchCity')}
         spaceSearch={false}
         onStickyTopChanged={setStickyTop}>
+        <SearchCounter>{t('search:searchResultsCount', { count: resultCities.length })}</SearchCounter>
         {resultCities.length === 0 ? <Failure errorMessage='search:nothingFound' /> : groups}
       </ScrollingSearchBox>
     </Container>
diff --git a/web/src/routes/SearchPage.tsx b/web/src/routes/SearchPage.tsx
index adba4b4290..e145501fd0 100644
--- a/web/src/routes/SearchPage.tsx
+++ b/web/src/routes/SearchPage.tsx
@@ -25,6 +25,11 @@ const List = styled.ul`
   }
 `
 
+const SearchCounter = styled.p`
+  padding: 0 5px;
+  color: ${props => props.theme.colors.textSecondaryColor};
+`
+
 const SearchPage = ({ city, cityCode, languageCode, pathname }: CityRouteProps): ReactElement | null => {
   const query = new URLSearchParams(useLocation().search).get('query') ?? ''
   const [filterText, setFilterText] = useState<string>(query)
@@ -102,6 +107,7 @@ const SearchPage = ({ city, cityCode, languageCode, pathname }: CityRouteProps):
       {query.length > 0 && (
         <>
           <List>
+            <SearchCounter>{t('searchResultsCount', { count: results.length })}</SearchCounter>
             {results.map(({ title, content, path, thumbnail }) => (
               <SearchListItem
                 title={title}

From ac208079ce3c84a87fcbede52f993b39c04976e1 Mon Sep 17 00:00:00 2001
From: "deliverino[bot]" <62934656+deliverino[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 03:58:54 +0000
Subject: [PATCH 33/42] Bump version name to 2024.11.2 and version code to
 100042406 [skip ci]

---
 version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.json b/version.json
index d0a6272a38..d14fc4a3c0 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"versionName":"2024.11.1","versionCode":100042405}
\ No newline at end of file
+{"versionName":"2024.11.2","versionCode":100042406}
\ No newline at end of file

From b7683ec42a8952ebbeb454f629768a728ce802ad Mon Sep 17 00:00:00 2001
From: "deliverino[bot]" <62934656+deliverino[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 04:25:53 +0000
Subject: [PATCH 34/42] Move release notes to 2024.11.2 [skip ci]

---
 .../{unreleased => 2024.11.2}/2350-pn-permission-settings.yml     | 0
 .../2520-Show-number-of-search-results.yml                        | 0
 release-notes/{unreleased => 2024.11.2}/2924-security-error.yml   | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename release-notes/{unreleased => 2024.11.2}/2350-pn-permission-settings.yml (100%)
 rename release-notes/{unreleased => 2024.11.2}/2520-Show-number-of-search-results.yml (100%)
 rename release-notes/{unreleased => 2024.11.2}/2924-security-error.yml (100%)

diff --git a/release-notes/unreleased/2350-pn-permission-settings.yml b/release-notes/2024.11.2/2350-pn-permission-settings.yml
similarity index 100%
rename from release-notes/unreleased/2350-pn-permission-settings.yml
rename to release-notes/2024.11.2/2350-pn-permission-settings.yml
diff --git a/release-notes/unreleased/2520-Show-number-of-search-results.yml b/release-notes/2024.11.2/2520-Show-number-of-search-results.yml
similarity index 100%
rename from release-notes/unreleased/2520-Show-number-of-search-results.yml
rename to release-notes/2024.11.2/2520-Show-number-of-search-results.yml
diff --git a/release-notes/unreleased/2924-security-error.yml b/release-notes/2024.11.2/2924-security-error.yml
similarity index 100%
rename from release-notes/unreleased/2924-security-error.yml
rename to release-notes/2024.11.2/2924-security-error.yml

From 146d247adffbaaec6e97fb7aa0eb3c9e241dbb89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 22:35:52 +0000
Subject: [PATCH 35/42] Bump cross-spawn from 7.0.3 to 7.0.6

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 591bdd3374..66aeaf4762 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7020,9 +7020,9 @@ cross-fetch@^3.0.4:
     node-fetch "^2.6.12"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

From 0a4dfe32f5a2e0cb681459cf7f479ee00ef31fe9 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Wed, 6 Nov 2024 10:48:21 +0100
Subject: [PATCH 36/42] 2982: Add romani language

---
 translations/README.md     | 3 +++
 translations/src/config.ts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/translations/README.md b/translations/README.md
index 991a0aed15..0ee6815b12 100644
--- a/translations/README.md
+++ b/translations/README.md
@@ -47,6 +47,9 @@ If there are enough untranslated strings, they can be submitted to professionals
   - `yarn export:ods:override-aschaffenburg`
 - Now you can edit the ODS files (e.g. send them to an external translation service). Exporting plain CSVs is currently not supported.
 
+Note: If the translators only work with English source translations, simply change `source_language` in [config.ts](src/config.ts) to `en`.
+Make sure to revert this after exporting.
+
 ### Receiving finished translations
 
 - Place the edited ODS files in the directories which were generated in the [export step](#submitting-for-translation).
diff --git a/translations/src/config.ts b/translations/src/config.ts
index e12853659a..318540e136 100644
--- a/translations/src/config.ts
+++ b/translations/src/config.ts
@@ -138,6 +138,9 @@ class Config {
     da: {
       rtl: false,
     },
+    rom: {
+      rtl: false,
+    },
   }
 
   // Fallbacks for unnormalized language codes from our backend

From 31869065482259614d7113beed9fbcf712483869 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Tue, 19 Nov 2024 13:33:45 +0100
Subject: [PATCH 37/42] 2982: Add romani translations

---
 translations/translations.json | 361 +++++++++++++++++++++++++++++++++
 1 file changed, 361 insertions(+)

diff --git a/translations/translations.json b/translations/translations.json
index 0d5b90a26f..4e2f81ffce 100644
--- a/translations/translations.json
+++ b/translations/translations.json
@@ -181,6 +181,13 @@
       "organizationMoreInformation": "Puteți găsi mai multe informații despre <1>{{organization}}</1> la <3>{{domain}}</3>.",
       "disabledPdf": "Exportul PDF nu este posibil momentan în această limbă."
     },
+    "rom": {
+      "createPdf": "Ker PDF",
+      "metaDescription": "{{appName}} tano to digitalno legarutno e dživdipaskoro ki Germania. Pučar lokalnikane informacie, čipote thaj dejbe godi. Sakana ov haberi kerdo thaj šajdin ki tiri čhib.",
+      "organizationContent": "O bukja tari akaja strana si taro {{organization}}.",
+      "organizationMoreInformation": "Šaj te arakhe buteder informacie bašo <1>{{organization}}</1> ko <3>{{domain}}</3>.",
+      "disabledPdf": "Akava PDF keribe ko momenti nane ki akaja čhib."
+    },
     "ru": {
       "createPdf": "Создать PDF",
       "metaDescription": "{{appName}} – это твой цифровой путеводитель по Германии. Узнавай местные новости, находи информацию о мероприятиях и консультациях. Всегда актуально и на твоем языке.",
@@ -624,6 +631,20 @@
       "sendButton": "Trimitere",
       "user": "Tu"
     },
+    "rom": {
+      "button": "Keribe lafi (beta)",
+      "conversationTitle": "Hramon tiro pučiba ko kotor taro teksti.",
+      "conversationText": "Šaj te puče so mangea taro lokalnikane informacie bašo disave rodiba prema tiri situacia.",
+      "dataSecurity": "Arakhiba podatke thaj garavibe: Tiri privatnost si but vastno amengje. Sa o lafikeriba si arakhle thaj tire podatke si garavde. Šaj te arakhe buteder informacie ko arakhibe e podatkonoro ki amari privatnikani polisa.",
+      "errorMessage": "Bangipe ulo prekal i komunikacia.",
+      "header": "{{appName}} Keribaske lafi dejbe dumo",
+      "initialMessage": "To keribaskoro lafi rodibe si bičhaldo. O  godjarno ka iranel ko tiro mesaži so šaj sigjeder.",
+      "inputLabel": "Mo pučiba:",
+      "inputPlaceholder": "Bi mangav te džanav...",
+      "loadingText": "Adžikeren harica, o lafi keribe ka širdinel...",
+      "sendButton": "Bičhal",
+      "user": "Tu"
+    },
     "ru": {
       "button": "Чат (бета-версия)",
       "conversationTitle": "Введи свой вопрос в текстовое поле.",
@@ -988,6 +1009,14 @@
       "sendText": "Copiați acest text, completați conținutul [ ] cu datele dumneavoastră și trimiteți-l.",
       "copyText": "Copiați textul"
     },
+    "rom": {
+      "callToAction": "Preporučin ti regia ko Integreat!",
+      "explanation": "Akava koncepto taro i Integreat-App ubedingja tut li thaj mislinea so thaj hem tiri diz,\ntiro than jali tiri khedin šaj te ovel ola korist taro akava digitalno čhinavdipe? Onda tu šaj te ove aktivno akate akana.",
+      "whatToDo": "Akava i tano so šaj te kere:",
+      "findOutMail": "Le i mejl adresa tari ti regia",
+      "sendText": "Kopirin akava teksti, haz'riker [ ]- o bukja te detalencar thaj bičhal olen",
+      "copyText": "Kopirin o teksti"
+    },
     "ru": {
       "callToAction": "Предложите Integreat своему региону!",
       "explanation": "Вас впечатлила некоммерческая концепция приложения Integreat, и вы считаете, что ваш город, район или муниципалитет мог бы воспользоваться преимуществами этого цифрового решения? Тогда нужно действовать!",
@@ -1441,6 +1470,20 @@
       "back": "Înapoi",
       "ok": "Bine"
     },
+    "rom": {
+      "copied": "Kopirimo",
+      "moreOptions": "Buteder opcie",
+      "languageNotAvailable": "Afi ker, numa tiri čhib nane akate.",
+      "chooseALanguage": "Birin čhib.",
+      "lastUpdate": "Paluno ikeribe ko tek:",
+      "loading": "Avela ...",
+      "close": "Phande",
+      "showMore": "Sikav buteder",
+      "showLess": "Sikav harica",
+      "optional": "opciono",
+      "back": "Palal",
+      "ok": "Ok"
+    },
     "ru": {
       "copied": "Скопировано",
       "moreOptions": "дополнительные опции",
@@ -1857,6 +1900,16 @@
       "knownResourceBlocked": "Conținutul extern din această sursă a fost blocat. Puteți permite această sursă în setări.",
       "noSources": "Nu sunt disponibile surse externe."
     },
+    "rom": {
+      "title": "Avralutne Hainga",
+      "description": "Tu šaj skros te soglasine tut te sikaven pes o bukja taro trito-thaneskere džene. O biribe ka ovel stalno arakhlo ko to internet rodutno. Tu šaj te čhinave to prifatiba akate ko bilo savo vakti.",
+      "descriptionNative": "Tu šaj skros te soglasine tut te sikaven pes o bukja taro trito-thaneskere džene. O biribe ka ovel stalno arakhlo ko to lokalnikano uredi. Tu šaj te čhinave to prifatiba akate ko bilo savo vakti.",
+      "consentDescription": "Muk o bukja taro {{source}}",
+      "knownResourceOptIn": "Soglasinava man so o bukja taro akava avralutno uredi šaj te ovel sikavdo mange.",
+      "knownResourceContentMessage": "Akava elemento isi ole podatkoja taro avralutno haing. Tu šaj te blokirine o keribe taro asavko kotor ko podesiba.",
+      "knownResourceBlocked": "Avralutno kotor taro akava haingo sas blokirimo. Tu šaj te mukhe akava haingo ko podesiba.",
+      "noSources": "Nane dostapna avralutne hainga."
+    },
     "ru": {
       "title": "Внешние источники",
       "description": "Ты можешь дать постоянное согласие на отображение интегрированного контента из внешних источников. После этого выбранная настройка будет навсегда сохранена в твоем интернет-браузере. Согласие может быть отозвано в любое время.",
@@ -2125,6 +2178,12 @@
       "news": "Știri",
       "pois": "Hartă"
     },
+    "rom": {
+      "localInformation": "Lokalnikane informacie",
+      "events": "Čipote",
+      "news": "Haberia",
+      "pois": "Mapa"
+    },
     "ru": {
       "localInformation": "Местная информация",
       "events": "Мероприятия",
@@ -2271,6 +2330,9 @@
     "ro": {
       "pageTitle": "Caseta tehnică și contact"
     },
+    "rom": {
+      "pageTitle": "Otpečatkoja thaj kontaktia"
+    },
     "ru": {
       "pageTitle": "Выходные данные и контактная информация"
     },
@@ -3220,6 +3282,41 @@
       "noCalendarPermission": "Accesul la calendar nu este permis.",
       "noCalendarFound": "Nu a fost găsit niciun calendar adecvat."
     },
+    "rom": {
+      "notFound": {
+        "language": "Afi ker, numa akaja čhib nane akate.",
+        "city": "Afi ker akaja regia na sine arakhli.",
+        "category": "Afi ker, numa i rodimi strana našti te ovel arakhli.",
+        "event": "Afi ker, numa akaja čipota naši te ovel arakhli.",
+        "poi": "Afi ker, akava than na sine arakhlo.",
+        "news": "Afi ker, numa akava mesaži našti te ovel arakhlo.",
+        "pageTitle": "I strana nane arakhli."
+      },
+      "pageNotFound": "Afi ker, numa i rodimi strana našti te ovel arakhli.",
+      "noSuitableAppInstalled": "Nane instalirimi pravo app.",
+      "networkConnectionFailed": "I konekcija ko serveri našti te ovel.",
+      "networkRequestFailed": "O rodiba našti te ovel procesujmo.",
+      "responseMappingFailed": "Bangin uli džikote procesujngja pes e servereskoro dževapi.",
+      "unknownError": "Bipendžardi bangin uli.",
+      "tryAgain": "Panda jekh far probin.",
+      "loadingFailed": "Afi ker, numa i rodimi strana našti te avel.",
+      "chooseALanguage": "Birin čhib:",
+      "goTo": {
+        "start": "Dža ki kherutni strana",
+        "categories": "Dža ko kategorie",
+        "events": "Dža ko čipote",
+        "pois": "Dža ko mape",
+        "news": "Dža ko haberia",
+        "pageNumber": "Dža ki strana {{number}}"
+      },
+      "pageTitle": "Bangin",
+      "generalError": "Bangin uli.",
+      "notSupportedByDevice": "Akaja funkcia nane ikerdi ko akava uredi.",
+      "languageSwitchFailedTitle": "Jasineste, o menibe e čhibjakoro na ulo.",
+      "languageSwitchFailedMessage": "I birimi čhib našti te ovel te sian oflajn. Valjani te ovel tu aktivno internet konekcija.",
+      "noCalendarPermission": "O pristapiba ko kalendari nane mukhlo.",
+      "noCalendarFound": "Na sine arakhlo pravo kalendari."
+    },
     "ru": {
       "notFound": {
         "language": "К сожалению, этот язык не поддерживается.",
@@ -4361,6 +4458,36 @@
       "showFilters": "Afișare filtru",
       "selectRange": "Selectarea perioadei"
     },
+    "rom": {
+      "address": "Adresa",
+      "date_one": "Datumo",
+      "date_other": "Datumoja",
+      "nextDate_one": "Aver datumo",
+      "nextDate_other": "Avera datumoja",
+      "events": "Čipote",
+      "exportAsICal": "Ikal sar iCal",
+      "addToCalendar": "Čhiv ko kalendari",
+      "currentlyNoEvents": "Nane čipote ko akava vakti.",
+      "pageTitle": "Čipote",
+      "chooseCalendar": "Kalendareskoro biribe",
+      "added": "Čhivde",
+      "goToCalendar": "Dža ko kalendari",
+      "settings": "Podesiba",
+      "recurring": "paleovibe",
+      "today": "avdive",
+      "todayRecurring": "avdive, paleovibe",
+      "onlyThisEvent": "Salde akaja čipota",
+      "thisAndAllFutureEvents": "Akala thaj sa o avutne čipote",
+      "from": "taro",
+      "to": "ko",
+      "resetFilter": "resetirin o filteri:",
+      "invalidFromDate": "Banginutno širdipaskoro datumo",
+      "invalidToDate": "Banginutno agorutno datumo",
+      "shouldBeEarlier": "O širdipaskoro datumo valjani te ovel angleder o agoripaskoro datumo.",
+      "hideFilters": "Garav o filteroja",
+      "showFilters": "Sikav o filteroja",
+      "selectRange": "Birin Rango"
+    },
     "ru": {
       "address": "Адрес",
       "date_one": "Дата",
@@ -5280,6 +5407,29 @@
       "contactMailAddress": "E-mail pentru întrebări ulterioare",
       "note": "Vă rugăm să selectați o reacție sau să scrieți un comentariu pentru a putea trimite feedback-ul."
     },
+    "rom": {
+      "disclaimer": "Kontaktia thaj otpečatokoja",
+      "send": "Bičhal",
+      "failedSendingFeedback": "Bangin uli ko bičhalibe o dževapi.",
+      "feedback": "Dževapi",
+      "headline": "So misline baši akaja strana?",
+      "description": "Birin reakcija thaj/jali hramon komentari.",
+      "commentHeadline": "Komentirin",
+      "commentDescription": "Ulav to dževapi amencar! Amen šaj te den pozitivno thaj negativno dževapi, so ka pomožinel amen te ova lačheder {{appName}}.",
+      "isThisSiteUseful": "Si li akava sajto korisno?",
+      "useful": "Korisno",
+      "notUseful": "Nane korisno",
+      "informationNotFound": "Na arakhljan odova so rodingjan?",
+      "wantedInformation": "Savi informacia falinel?",
+      "feedbackSent": "Bičhaldo dževapi",
+      "thanksHeadline": "Oven saste but baši tumaro dževapi.",
+      "thanksMessage": "To dževapi sine uspešno bičhaldo.",
+      "negativeRating": "Akava sajti nane korisno",
+      "positiveRating": "Akava sajti si korisno",
+      "searchTermDescription": "Našti te ovel arakhlo rezultato akale lafea:",
+      "contactMailAddress": "I-Mejl bašo avera pučiba",
+      "note": "Birin reakcia jali hramon komentari te šaj te bičhale dževapi."
+    },
     "ru": {
       "disclaimer": "Контактная информация и выходные данные",
       "send": "Отправить",
@@ -5821,6 +5971,17 @@
       "skip": "Treceți peste",
       "next": "Mai departe"
     },
+    "rom": {
+      "appDescription": "{{appName}} si tiro digitalnikano legatuno baši o dživdipa ki Germania",
+      "search": "Rode",
+      "searchDescription": "Arak i pravo informacia prema o lafia",
+      "languageChange": "Menibe i čhib",
+      "languageChangeDescription": "Te menine i čhib ko strane si lokheste",
+      "events": "Čipote",
+      "eventsDescription": "Momentalna čipote thaj datumoja ko paše thana",
+      "skip": "Na akana",
+      "next": "Produžun"
+    },
     "ru": {
       "appDescription": "{{appName}} – это ваш цифровой гид по Германии",
       "search": "Поиск",
@@ -6386,6 +6547,23 @@
       "cityNotFound": "Nu v-ați găsit regiunea? Fii activ acum!",
       "suggestToRegion": "{{appName}} sugerat în regiunea dvs."
     },
+    "rom": {
+      "searchCity": "Rode",
+      "noCitiesFound": "Nane rezultatoja",
+      "nearbyCities": "Ko pašipe",
+      "noNearbyCities": "Nane arakhli regia ko pašipe.",
+      "alert": "Zapišin",
+      "locationError": "Te sikavel regie ko pašipa, e sledibaskere servisoja valjani te oven aktivirime",
+      "noPermission": "Lokacijakoro pristap zaruri",
+      "loading": "Arakhibe lokacia...",
+      "notAvailable": "Lokaciakoro arakhibe si deaktivirimo",
+      "timeout": "Lokaciakoro arakhibe bangimo",
+      "refresh": "Iker ko teko i lista taro paše regionia",
+      "pageTitle": "Lokalnikani Informacia Tukje",
+      "metaDescription": "{{appName}} tano to digitalno legarutno e dživdipaskoro ki Germania. Pučar lokalnikane informacie, čipote thaj dejbe godi. Sakana ov haberi kerdo thaj šajdin ki tiri čhib.",
+      "cityNotFound": "To regioni na sine arakhlo? Ker akcia akana.",
+      "suggestToRegion": "Preporučin {{appName}} ki ti regia"
+    },
     "ru": {
       "searchCity": "Поиск",
       "noCitiesFound": "Результаты не найдены",
@@ -7237,6 +7415,35 @@
       "sideBarCloseAriaLabel": "Închideți bara laterală",
       "accessibility": "Accesibilitate"
     },
+    "rom": {
+      "imprintAndContact": "Otpečatkoja thaj kontaktia",
+      "privacy": "Arakhiba podatke",
+      "localInformation": "Lokalnikane informacie",
+      "events": "Čipote",
+      "noEvents": "Nane čipote",
+      "news": "Haberia",
+      "noLanguages": "Nane ko avera čhiba",
+      "noTranslation": "Nane prevod",
+      "search": "Rode",
+      "locations": "Mapa",
+      "changeLocation": "Menin lokacia",
+      "changeLanguage": "Menin čhib",
+      "settings": "Podesiba",
+      "copyUrl": "Kopirin o linko",
+      "feedback": "Dževapi",
+      "share": "Ulav",
+      "cancel": "Čhinav",
+      "shareMessage": "Arakhlilo: {{message}}",
+      "shareFailDefaultMessage": "Jasineste bangin uli ko ulavibe o kotor.",
+      "disclaimer": "Otpečatkoja",
+      "sideBarOpenAriaLabel": "Phrav rigakorothan",
+      "sideBarCloseAriaLabel": "Phan rigakorothan",
+      "openInApp": "Phrav ki {{appName}} app",
+      "open": "Phrav",
+      "view": "Dikh",
+      "getOnPlayStore": "LE — ko Google Play Store",
+      "accessibility": "Khuvin"
+    },
     "ru": {
       "imprintAndContact": "Выходные данные и контактная информация",
       "privacy": "Защита данных",
@@ -7644,6 +7851,11 @@
       "license": "Licență:",
       "noLicensesMessage": "Nu sunt disponibile informații despre licență"
     },
+    "rom": {
+      "version": "Verzia:",
+      "license": "Licenca:",
+      "noLicensesMessage": "Nane informacia e licencake"
+    },
     "ru": {
       "version": "Версия:",
       "license": "Лицензия:",
@@ -7779,6 +7991,9 @@
     "ro": {
       "pageTitle": "Caseta tehnică și contact - {{appName}}"
     },
+    "rom": {
+      "pageTitle": "Otpečatkoja thaj kontaktia - {{appName}}"
+    },
     "ru": {
       "pageTitle": "Выходные данные и контактная информация – {{appName}}"
     },
@@ -8412,6 +8627,29 @@
       "submitFailedReasoning": "Vă rugăm să vă asigurați că aveți o conexiune stabilă la internet și să încercați din nou.",
       "invalidEmailAddress": "Adresa de e-mail furnizată nu este validă."
     },
+    "rom": {
+      "supportNote": "Amen mangaja te osetine tut arakhlo thaj dendo dumo ked isi tu problemoja jali pučiba. Akaja kontakt forma dela tut šansa te ove kontakt manušea. Šaj te vakere to rodibe thaj te birine taro ververane kontakteskere opcie.",
+      "securityNote": "Tiro arakhibe si amaro top prioriteti.Tire podatke si dende ko garaviba te šaj ti privatnost te ovel arakhli sasto vakti.",
+      "name": "Paloanav, anav",
+      "roomNumber": "Numero e sobakoro",
+      "howToBeContacted": "Agjare bi mangava te ovav kontaktirimo:",
+      "eMail": "prekal I-Mejl",
+      "telephone": "prekal telefoni",
+      "telephoneNumber": "Numero e telefoneskoro",
+      "personally": "Personalnikane",
+      "contactPerson": "Kontakt manuš:",
+      "contactPersonAnyGender": "O pol taro kontak manuš nane si bitno",
+      "contactPersonGenderFemale": "Bi mangava te ovav kontaktirimo tari džuvli",
+      "contactPersonGenderMale": "Bi mangava te ovav kontaktirimo taro murš",
+      "contactReason": "To rodiba:",
+      "maxCharacters": "maksimum {{numberOfCharacters}} karakteria",
+      "responseDisclaimer": "Šaj te lel nekobor bukjakere dive angleder te dobine to džovapi. Ka kera sa amendar te šaj te procesujna to rodibe so šaj sigjeder.",
+      "submit": "Bičhal i forma",
+      "submitSuccessful": "I forma uspešno bičhaldi",
+      "submitFailed": "I forma našti te ovel bičhaldi",
+      "submitFailedReasoning": "Dik te šaj te ikere stabilno internet konekcia thaj probin panda jekh far.",
+      "invalidEmailAddress": "I i-mejl adresa so čigjan si bangini."
+    },
     "ru": {
       "supportNote": "Мы хотим, чтобы вы чувствовали себя в безопасности и могли рассчитывать на поддержку, когда у вас возникают проблемы или вопросы. Чтобы связаться со специалистом, вы можете использовать следующую контактную форму. Вы можете указать причину вашего обращения и выбрать подходящий способ связи.",
       "securityNote": "Ваша безопасность – наш главный приоритет. Ваши данные будут обрабатываться конфиденциально, чтобы ваша частная жизнь всегда оставалась под защитой.",
@@ -8849,6 +9087,13 @@
       "NSCalendarsUsageDescription": "{{appName}} ar dori să acceseze calendarul pentru a adăuga un eveniment.",
       "NSCalendarsFullAccessUsageDescription": "{{appName}} ar dori să acceseze calendarul pentru a adăuga un eveniment."
     },
+    "rom": {
+      "NSPhotoLibraryAddUsageDescription": "{{appName}} mangel te garavel o slike ko to than.",
+      "NSLocationWhenInUseUsageDescription": "{{appName}} mangela te sikave ti lokacia te šaj arakhen pes paše diza.",
+      "NSLocationAlwaysAndWhenInUseUsageDescription": "{{appName}} mangela te sikave ti lokacia te šaj arakhen pes paše diza.",
+      "NSCalendarsUsageDescription": "{{appName}} mangel te khuvel ano kalendari te šaj čhivel čipota.",
+      "NSCalendarsFullAccessUsageDescription": "{{appName}} mangel te khuvel ano kalendari te šaj čhivel čipota."
+    },
     "ru": {
       "NSPhotoLibraryAddUsageDescription": "Чтобы сохранить снимки, приложению {{appName}} требуется доступ к галерее изображений.",
       "NSLocationWhenInUseUsageDescription": "Чтобы найти близлежащие населенные пункты, приложению {{appName}} требуется доступ к данным о вашем местоположении.",
@@ -9188,6 +9433,16 @@
       "readMore": "Citire mai departe",
       "currentlyNoNews": "În prezent nu există nicio știre."
     },
+    "rom": {
+      "news": "Haberia",
+      "localNews": {
+        "localNews": "Lokalnikane haberia",
+        "pageTitle": "Lokalnikane haberia"
+      },
+      "local": "Lokalnikano",
+      "readMore": "Produžun",
+      "currentlyNoNews": "Nane haberia ko akava vakti."
+    },
     "ru": {
       "news": "Новости",
       "localNews": {
@@ -10912,6 +11167,68 @@
       "makeAppointmentTooltipWithLink": "Realizează o programare în această zi prin <1>pagina de Internet</1> sau telefonic.",
       "theWebsite": "pagina de Internet"
     },
+    "rom": {
+      "pageTitle": "Mapa",
+      "poi": "Than",
+      "pois": "Thana",
+      "map": "Mapa",
+      "showOnMap": "Sikav ki mapa",
+      "noPois": "Nane arakhle thana.",
+      "unitKilometre": "km",
+      "unitMetre": "m",
+      "distanceKilometre": "{{distance}} km dur",
+      "distanceKilometreAlternative": "{{distance}} km",
+      "distanceMetre": "{{distance}} m dur",
+      "distanceMetreAlternative": "{{distance}} m",
+      "contactInformation": "Kontaktno detalia",
+      "address": "Adresa",
+      "phone": "Numero telefoneskoro",
+      "eMail": "I-mejl adresa",
+      "website": "Vebstrana",
+      "openingHours": "Pravibaskere aria",
+      "description": "Havljarin",
+      "addressCopied": "I adresa si kopirimi ko than",
+      "phoneCopied": "E telefoneskoro numero si kopirimo ko than",
+      "eMailCopied": "I-mejl adresa si kopirimi ko than",
+      "websiteCopied": "Vebstrana si kopirimi ko than",
+      "listTitle": "Paše tute",
+      "detailsHeader": "Palal",
+      "detailsAddress": "Legariba",
+      "detailsMapLink": "Phrav ko Google Maps",
+      "detailsInformation": "Info",
+      "detailsNextPoi": "Aver",
+      "detailsPreviousPoi": "Angleder",
+      "previousPoi": "Anglederutno than",
+      "nextPoi": "Aver than",
+      "openExternalMaps": "Phrav ko mapengjiri app",
+      "allDay": "sasto dive",
+      "opened": "phravdo",
+      "closed": "phanlo",
+      "temporarilyClosed": "harne vakteske phanlo",
+      "montag": "Jekhtodi",
+      "dienstag": "Dujtodi",
+      "mittwoch": "Trintodi",
+      "donnerstag": "Štartodi",
+      "freitag": "Paraštuj",
+      "samstag": "Savato",
+      "sonntag": "Purano kurko",
+      "adjustFilters": "Filteri ko lokacie",
+      "onlyCurrentlyOpen": "salde sikav akana so si phravde lokacie",
+      "poiCategories": "Kategorie",
+      "showPois_zero": "Sikav 0 thana",
+      "showPois_one": "Sikav 1 than",
+      "showPois_two": "Sikav {{count}} thana",
+      "showPois_few": "Sikav {{count}} thana",
+      "showPois_many": "Sikav {{count}} thana",
+      "showPois_other": "Sikav {{count}} thana",
+      "alphabetLetters": "A-Ž",
+      "clearFilter": "Kos o filteri {{filter}}",
+      "showOwnLocation": "Sikav tli lokacia",
+      "makeAppointment": "Ker zakažiba",
+      "appointmentNecessary": "Valjani zakažiba",
+      "makeAppointmentTooltipWithLink": "Ker zakažibe ko akava dive prekal <1>the website</1> jali katar telefoni.",
+      "theWebsite": "i vebstrana"
+    },
     "ru": {
       "pageTitle": "Карта",
       "poi": "Населенный пункт",
@@ -11934,6 +12251,19 @@
       "pageTitle": "Căutare",
       "delete": "Ștergeți intrarea"
     },
+    "rom": {
+      "nothingFound": "Afi ker, našti arakhljam nisave prava rezultatoja.",
+      "searchPlaceholder": "Rode",
+      "itemHint": "Dik e rodibaskoro rezultato",
+      "searchResultsCount_zero": "0 rodibaskere rezultatoja",
+      "searchResultsCount_one": "1 rodibaskoro rezultato",
+      "searchResultsCount_two": "2 rodibaskere rezultatoja",
+      "searchResultsCount_few": "{{count}} rodibaskere rezultatoja",
+      "searchResultsCount_many": "{{count}} rodibaskere rezultatoja",
+      "searchResultsCount_other": "{{count}} rodibaskere rezultatoja",
+      "pageTitle": "Rode",
+      "delete": "Kos o čhivdo"
+    },
     "ru": {
       "nothingFound": "К сожалению, подходящие результаты не найдены.",
       "searchPlaceholder": "Поиск",
@@ -12651,6 +12981,28 @@
       "externalResourcesTitle": "Surse externe",
       "externalResourcesDescription": "Precizați ce surse externe sunt permise."
     },
+    "rom": {
+      "sentryTitle": "App stabiliteti",
+      "sentryDescription": "Ker lačheder i {{appName}} app prekal avtomatikane bičhaliba bangeskere reportoja",
+      "pushNewsTitle": "Mečin notifikacie",
+      "pushNewsDescription": "Dobin mečibaskere notifikacie baši o palune lokalnikane haberia",
+      "about": "Baši {{appName}}",
+      "privacyPolicy": "Arakhibe podatkongjiri polisa",
+      "version": "Verzia: {{version}}",
+      "openSourceLicenses": "Phrav haingaskiri licenca",
+      "tracking": "J-PAL evaluacia",
+      "allowTracking": "Muk sledibe",
+      "trackingShortDescription": "Le than ki J-PAL evaluaciakiri studia lačhakeribaske {{appName}}.",
+      "trackingMoreInformation": "Buteder informacie ki J-Pal evaluacia thaj o rodlaripaskere kauze",
+      "trackingDescription": "{{appName}} rodel izini te sikavel to koristiba tari app. Te podatke si anonimna thaj ka oven koristime salde bašo rodlaripaskere kauze thaj te lačhakerel pes i app. E sledibaskere podatke nane te oven ulavde jali procesuime bašo reklamiribe jali aver komercialnikane kauze.",
+      "trackingLeaveTitle": "Muk o sledibe?",
+      "trackingLeaveDescription": "Čhinagjan o slediba. O slediba pomožinel tu te lačhare {{appName}} app thaj te de šukareder informacie baši o imigrantoja. Sian li sigurno so mangea te mukhe o ekrani bizo te mukhe o slediba?",
+      "enabled": "aktivirimo",
+      "disabled": "deaktivirimo",
+      "decline": "Ma te mange",
+      "externalResourcesTitle": "Avralutne Hainga",
+      "externalResourcesDescription": "Vaker save avralutne hainga si mukhle."
+    },
     "ru": {
       "sentryTitle": "Стабильность приложения",
       "sentryDescription": "Повышение стабильности работы приложения {{appName}} путем автоматической отправки сообщений о сбоях",
@@ -13051,6 +13403,12 @@
       "whatsappTooltip": "partajați în WhatsApp",
       "closeTooltip": "Închideți"
     },
+    "rom": {
+      "facebookTooltip": "ulav ko Facebook",
+      "mailTooltip": "preporučin prekal imejl",
+      "whatsappTooltip": "ulav ko WhatsApp",
+      "closeTooltip": "Phande"
+    },
     "ru": {
       "facebookTooltip": "поделиться на Facebook",
       "mailTooltip": "рекомендовать по электронной почте",
@@ -13197,6 +13555,9 @@
     "ro": {
       "noOffersAvailable": "Nicio ofertă disponibilă"
     },
+    "rom": {
+      "noOffersAvailable": "Nane dostapna ponude"
+    },
     "ru": {
       "noOffersAvailable": "Предложения отсутствуют"
     },

From 461f0d32b06854e2115b7c6c25e320fe11c895c6 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Tue, 19 Nov 2024 13:40:35 +0100
Subject: [PATCH 38/42] 2982: Add release note

---
 release-notes/unreleased/2982-add-romani.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 release-notes/unreleased/2982-add-romani.yml

diff --git a/release-notes/unreleased/2982-add-romani.yml b/release-notes/unreleased/2982-add-romani.yml
new file mode 100644
index 0000000000..64279dcd3a
--- /dev/null
+++ b/release-notes/unreleased/2982-add-romani.yml
@@ -0,0 +1,8 @@
+issue_key: 2982
+show_in_stores: true
+platforms:
+  - web
+  - android
+  - ios
+en: Add support and translations for Romani.
+de: Romani wurde als neue Sprache hinzugefügt.

From 183b65c499b1c88d4ec134c9d321360e693d5335 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Mon, 28 Oct 2024 13:33:17 +0100
Subject: [PATCH 39/42] 2954: Add svg documentation and update documentation

---
 README.md            | 14 +++-----------
 assets/README.md     | 29 +++++++++++++++++++++++++++++
 docs/contributing.md | 26 ++++++++++++++++++++++++--
 docs/conventions.md  | 11 +++++++++++
 4 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 assets/README.md

diff --git a/README.md b/README.md
index e9474d3f97..e6444a409b 100644
--- a/README.md
+++ b/README.md
@@ -22,24 +22,16 @@ React JS and React Native App for [Integreat](https://integreat-app.de), [Malte]
 
 ## Contributing
 
+First, make sure you have a look at our [conventions](docs/conventions.md).
+
 You can contribute by:
 
+- [Reporting bugs](docs/contributing.md#reporting-issues-and-bugs)
 - [Creating Pull requests](docs/contributing.md#pull-requests)
-- [Reporting bugs](docs/contributing.md#bug-reporting)
 
 If you want to know more about Integreat or if you want to join us, contact [Leandra](mailto:leandra.hahn@tuerantuer.org),
 [Steffen](mailto:steffen.kleinle@tuerantuer.org) or [our info mail](mailto:info@integreat-app.de) and visit our [website](https://integreat-app.de).
 
-We use this emoji code for reviewing:
-
-- :+1: or `:+1:` This is great! It always feels good when somebody likes your work. Show them!
-- :question: or `:question:` I have a question / can you clarify?
-- :x: or `:x:` This has to change. It’s possibly an error or strongly violates existing conventions.
-- :wrench: or `:wrench:` This is a well-meant suggestion. Take it or leave it.
-- :upside_down_face: or `:upside_down_face:` This is a nitpick. Normally related to a small formatting or stylizing detail that shouldn’t block moving forward.
-- :thought_balloon: or `:thought_balloon:` I’m just thinking out loud here. Something doesn’t necessarily have to change, but I want to make sure to share my thoughts.
-- :clown_face: or `:clown_face:` This is a complaint about something with no obvious answer, not necessarily a problem originating from changes.
-
 ## Project Structure
 
 This is a monorepo and contains the following projects:
diff --git a/assets/README.md b/assets/README.md
new file mode 100644
index 0000000000..c49f873ca1
--- /dev/null
+++ b/assets/README.md
@@ -0,0 +1,29 @@
+# Assets
+
+All build-config and platform independent assets should be placed in this directory.
+All assets should use kebab-case naming.
+
+## Icons
+
+### Conventions
+
+Icons should be added to the corresponding [icons](icons) subfolder.
+Normal icons are supposed to follow the following conventions:
+
+- Use the SVG format
+- Resize to 24x24px with width and height set
+- The viewbox starts at (0, 0)
+- Set the general icon color to `currentColor` (using `fill="currentColor"`)
+- The SVG should be as simple and reduced as possible
+
+If the icon has e.g. a build-config dependent background, you can use `fill="var(--theme-color, none)"`.
+
+### Usage
+
+To use icons (and other assets) in the code, add them to the corresponding assets files
+for [web](../web/src/assets/index.ts) and/or [native](../native/src/assets/index.ts).
+You can then simply use our custom `Icon`
+components ([web](../web/src/components/base/Icon.tsx), [native](../native/src/components/base/Icon.tsx)).
+They automatically set the default color, theme color and size and provide additional convenience props
+(e.g. `directionDependent`, `reverse`).
+If necessary, you can simply override styles using styled-components.
diff --git a/docs/contributing.md b/docs/contributing.md
index e56924379d..a06a0b7d79 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -5,7 +5,17 @@ by [reporting a bug](#reporting-issues-and-bugs), [opening a pull request](#pull
 or [contacting us](#contact-us) if you don't know where to start. Please make sure to have a look at
 our [conventions](conventions.md).
 
-## Contact us
+Before contributing, please make sure to have a look at our [conventions](conventions.md).
+
+## Contents
+
+- [Contact](#contact-us)
+- [Reporting Issues and Bugs](#reporting-issues-and-bugs)
+- [Pull Requests](#pull-requests)
+- [Release Notes](#release-notes)
+- [Reviews](#reviews)
+
+## Contact Us
 
 If you don't know where to start or if you want to know more about Integreat,
 contact [Leandra](mailto:leandra.hahn@tuerantuer.org),
@@ -23,7 +33,7 @@ our [project views](https://github.com/orgs/digitalfabrik/projects/2/views/1).
 
 If you open a new issue, please make sure to follow the templates and create meaningful issues and bugs.
 
-## Pull requests
+## Pull Requests
 
 Before starting to write code and opening a pull request, please take a look [at our conventions](conventions.md).
 
@@ -58,3 +68,15 @@ The release notes can be found [here](../release-notes) and are automatically mo
 release.
 They are also shown in the stores and
 the [release section of github](https://github.com/digitalfabrik/integreat-app/releases).
+
+### Reviews
+
+We use the following emoji code for reviewing:
+
+- :+1: or `:+1:` This is great! It always feels good when somebody likes your work. Show them!
+- :question: or `:question:` I have a question / can you clarify?
+- :x: or `:x:` This has to change. It’s possibly an error or strongly violates existing conventions.
+- :wrench: or `:wrench:` This is a well-meant suggestion. Take it or leave it.
+- :upside_down_face: or `:upside_down_face:` This is a nitpick. Normally related to a small formatting or stylizing detail that shouldn’t block moving forward.
+- :thought_balloon: or `:thought_balloon:` I’m just thinking out loud here. Something doesn’t necessarily have to change, but I want to make sure to share my thoughts.
+- :clown_face: or `:clown_face:` This is a complaint about something with no obvious answer, not necessarily a problem originating from changes.
diff --git a/docs/conventions.md b/docs/conventions.md
index 4e475d937b..e8144d4f15 100644
--- a/docs/conventions.md
+++ b/docs/conventions.md
@@ -6,8 +6,10 @@
 - [Testing](#testing)
 - [Code Quality](#code-quality)
 - [Commit Messages and Pull Requests](#commit-messages-and-pull-request)
+- [Reviews](#reviews)
 - [Versioning](#versioning)
 - [Folder Structure](#folder-structure)
+- [Assets and Icons](#assets-and-icons)
 
 ## Naming
 
@@ -89,6 +91,10 @@ write good commit messages. Commit messages should have the following schema:
 
 The same applies for PR names.
 
+## Reviews
+
+We use an [emoji code](contributing.md#reviews) for reviewing.
+
 ## Versioning
 
 Versions consist of a version name and a version code.
@@ -135,3 +141,8 @@ src
     │   LanguageDetector.ts
     |   indext.ts
 ```
+
+## Assets and Icons
+
+We place our build-config and platform independent assets and icons in the [assets](../assets) in the root directory.
+See more information in the corresponding [README](../assets/README.md).

From 34fbd11d8a0dc97a81dd6a15a2e390c2e1f31b09 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Tue, 19 Nov 2024 13:47:37 +0100
Subject: [PATCH 40/42] 2954: Remove usage section and add link to reviewing

---
 README.md        |  5 +++--
 assets/README.md | 10 ----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index e6444a409b..2097898bfd 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ React JS and React Native App for [Integreat](https://integreat-app.de), [Malte]
 - [Project Structure](#project-structure)
 - [Getting Started](#getting-started)
   - [Prerequisites](#prerequisites)
-  - [Project setup](#project-setup)
+  - [Project Setup](#project-setup)
 - [Further Reading](#further-reading)
 
 ## Contributing
@@ -27,7 +27,8 @@ First, make sure you have a look at our [conventions](docs/conventions.md).
 You can contribute by:
 
 - [Reporting bugs](docs/contributing.md#reporting-issues-and-bugs)
-- [Creating Pull requests](docs/contributing.md#pull-requests)
+- [Creating pull requests](docs/contributing.md#pull-requests)
+- [Reviewing pull requests](docs/contributing.md#reviews)
 
 If you want to know more about Integreat or if you want to join us, contact [Leandra](mailto:leandra.hahn@tuerantuer.org),
 [Steffen](mailto:steffen.kleinle@tuerantuer.org) or [our info mail](mailto:info@integreat-app.de) and visit our [website](https://integreat-app.de).
diff --git a/assets/README.md b/assets/README.md
index c49f873ca1..9b1a64a6ec 100644
--- a/assets/README.md
+++ b/assets/README.md
@@ -17,13 +17,3 @@ Normal icons are supposed to follow the following conventions:
 - The SVG should be as simple and reduced as possible
 
 If the icon has e.g. a build-config dependent background, you can use `fill="var(--theme-color, none)"`.
-
-### Usage
-
-To use icons (and other assets) in the code, add them to the corresponding assets files
-for [web](../web/src/assets/index.ts) and/or [native](../native/src/assets/index.ts).
-You can then simply use our custom `Icon`
-components ([web](../web/src/components/base/Icon.tsx), [native](../native/src/components/base/Icon.tsx)).
-They automatically set the default color, theme color and size and provide additional convenience props
-(e.g. `directionDependent`, `reverse`).
-If necessary, you can simply override styles using styled-components.

From fce7d4957a8f1193bd6531687155b342cd0b4b8c Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Tue, 19 Nov 2024 14:44:18 +0100
Subject: [PATCH 41/42] 2173: Refactoring

---
 native/src/components/Header.tsx | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx
index b6c565d408..9ca8055f1f 100644
--- a/native/src/components/Header.tsx
+++ b/native/src/components/Header.tsx
@@ -207,18 +207,14 @@ const Header = ({
       return { text: currentTitle ?? '', language: config.sourceLanguage }
     }
 
-    const previousParams = previousRoute.params
-
-    const currentRouteIsPoi = route.name === POIS_ROUTE
+    const poisRouteParams = route.params as RoutesParamsType[PoisRouteType]
+    const isSinglePoi = !!poisRouteParams.slug || poisRouteParams.multipoi !== undefined
     const notFromDeepLink = previousRoute.name === POIS_ROUTE
-    if (currentRouteIsPoi && notFromDeepLink) {
-      const poisRouteParams = route.params as RoutesParamsType[PoisRouteType]
-      if (poisRouteParams.slug || poisRouteParams.multipoi !== undefined) {
-        return { text: t('locations'), language: undefined } // system language
-      }
+    if (isSinglePoi && notFromDeepLink) {
+      return { text: t('locations'), language: undefined } // system language
     }
 
-    const previousRouteTitle = (previousParams as { path?: string } | undefined)?.path
+    const previousRouteTitle = (previousRoute.params as { path?: string } | undefined)?.path
 
     if (previousRouteTitle) {
       return { text: previousRouteTitle, language: languageCode }
@@ -227,7 +223,7 @@ const Header = ({
     if (previousRoute.name === CATEGORIES_ROUTE) {
       return {
         text: t('localInformation'),
-        language: previousRouteTitle === undefined ? config.sourceLanguage : languageCode,
+        language: languageCode,
       }
     }
 

From 69237c542a6bb542015d16547ab4ed53ddb573cd Mon Sep 17 00:00:00 2001
From: LeandraH <leandravhahn@gmail.com>
Date: Tue, 19 Nov 2024 16:38:23 +0100
Subject: [PATCH 42/42] 2949: Refactoring

---
 native/src/hooks/useUserLocation.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/native/src/hooks/useUserLocation.ts b/native/src/hooks/useUserLocation.ts
index 342ccffea0..06228b993c 100644
--- a/native/src/hooks/useUserLocation.ts
+++ b/native/src/hooks/useUserLocation.ts
@@ -2,7 +2,7 @@ import Geolocation, { GeolocationError } from '@react-native-community/geolocati
 import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Platform } from 'react-native'
-import { check, openSettings, PERMISSIONS, request, RESULTS } from 'react-native-permissions'
+import { check, openSettings, PERMISSIONS, PermissionStatus, request, RESULTS } from 'react-native-permissions'
 
 import { LocationStateType, UnavailableLocationState } from 'shared'
 
@@ -37,15 +37,15 @@ const fineLocationPermissionAndroid = PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION
 const coarseLocationPermissionAndroid = PERMISSIONS.ANDROID.ACCESS_COARSE_LOCATION
 
 const getLocationPermissionStatus = async (requestPermission: boolean) => {
-  const permissionFunctionToCall = requestPermission ? request : check
+  const checkOrRequest = requestPermission ? request : check
   if (Platform.OS === 'ios') {
-    return permissionFunctionToCall(locationPermissionIOS)
+    return checkOrRequest(locationPermissionIOS)
   }
-  const finePermission = await permissionFunctionToCall(fineLocationPermissionAndroid)
-  if (finePermission === RESULTS.GRANTED || finePermission === RESULTS.LIMITED) {
-    return finePermission
+  const finePermissionStatus = await checkOrRequest(fineLocationPermissionAndroid)
+  if (([RESULTS.GRANTED, RESULTS.LIMITED] as PermissionStatus[]).includes(finePermissionStatus)) {
+    return finePermissionStatus
   }
-  return permissionFunctionToCall(coarseLocationPermissionAndroid)
+  return checkOrRequest(coarseLocationPermissionAndroid)
 }
 
 type UseUserLocationProps = {