From 2f3e398d7012e3524cc25d0b06cf0e5d57db62fb Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Thu, 15 Dec 2022 18:43:39 +0100
Subject: [PATCH] Fixed #556

---
 src/components/Menu/Row.tsx              |  1 -
 src/screens/Tabs/Me/SettingsLanguage.tsx | 34 ++++++++++++------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/Menu/Row.tsx b/src/components/Menu/Row.tsx
index b3b8ca6e..c4d32e9b 100644
--- a/src/components/Menu/Row.tsx
+++ b/src/components/Menu/Row.tsx
@@ -65,7 +65,6 @@ const MenuRow: React.FC<Props> = ({
     >
       <TapGestureHandler
         onHandlerStateChange={async ({ nativeEvent }) => {
-          if (typeof iconBack !== 'string') return // Let icon back handles the gesture
           if (nativeEvent.state === State.ACTIVE && !loading) {
             if (screenReaderEnabled && switchOnValueChange) {
               switchOnValueChange()
diff --git a/src/screens/Tabs/Me/SettingsLanguage.tsx b/src/screens/Tabs/Me/SettingsLanguage.tsx
index 399a39d2..ee87aa16 100644
--- a/src/screens/Tabs/Me/SettingsLanguage.tsx
+++ b/src/screens/Tabs/Me/SettingsLanguage.tsx
@@ -1,10 +1,11 @@
 import haptics from '@components/haptics'
-import { MenuContainer, MenuRow } from '@components/Menu'
+import { MenuRow } from '@components/Menu'
 import { LOCALES } from '@root/i18n/locales'
 import { TabMeStackScreenProps } from '@utils/navigation/navigators'
 import { setChannels } from '@utils/slices/instances/push/utils'
 import { getInstances } from '@utils/slices/instancesSlice'
 import { changeLanguage } from '@utils/slices/settingsSlice'
+import { StyleConstants } from '@utils/styles/constants'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList, Platform } from 'react-native'
@@ -33,22 +34,21 @@ const TabMeSettingsLanguage: React.FC<TabMeStackScreenProps<'Tab-Me-Settings-Lan
   }
 
   return (
-    <MenuContainer>
-      <FlatList
-        data={languages}
-        renderItem={({ item }) => {
-          return (
-            <MenuRow
-              key={item[0]}
-              title={item[1]}
-              iconBack={item[0] === i18n.language ? 'Check' : undefined}
-              iconBackColor={'blue'}
-              onPress={() => item[0] !== i18n.language && change(item[0])}
-            />
-          )
-        }}
-      />
-    </MenuContainer>
+    <FlatList
+      style={{ flex: 1, paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}
+      data={languages}
+      renderItem={({ item }) => {
+        return (
+          <MenuRow
+            key={item[0]}
+            title={item[1]}
+            iconBack={item[0] === i18n.language ? 'Check' : undefined}
+            iconBackColor={'blue'}
+            onPress={() => item[0] !== i18n.language && change(item[0])}
+          />
+        )
+      }}
+    />
   )
 }