From d2b7480262dd6fa4cd8e9fd158b6cda567b59dac Mon Sep 17 00:00:00 2001
From: Vincent TE <vincent.te@infomaniak.com>
Date: Tue, 27 Aug 2024 13:18:55 +0200
Subject: [PATCH] Fix merge

---
 .../main/settings/SettingsEmailLanguageScreen.kt      |  2 ++
 .../ui/screen/main/settings/SettingsScreen.kt         | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt
index 9fc8e1738..d05e68f30 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt
@@ -29,6 +29,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import com.infomaniak.swisstransfer.R
+import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar
+import com.infomaniak.swisstransfer.ui.components.TopAppBarButton
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingTitle
 import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SingleSelectOptions
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt
index 32865ae94..6af59f3c8 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt
@@ -117,11 +117,14 @@ private fun DetailPane(navigator: ThreePaneScaffoldNavigator<SettingsOptionScree
     val destination = navigator.currentDestination?.content ?: lastSelectedScreen
     navigator.currentDestination?.content?.let { lastSelectedScreen = it }
 
+    val navigateBackCallback: () -> Unit = { navigator.navigateBack() }
+    val navigateBack: (() -> Unit)? = if (navigator.canNavigateBack()) navigateBackCallback else null
+
     when (destination) {
-        THEME -> SettingsThemeScreen()
-        VALIDITY_PERIOD -> SettingsValidityPeriodScreen()
-        DOWNLOAD_LIMIT -> SettingsDownloadsLimitScreen()
-        EMAIL_LANGUAGE -> SettingsEmailLanguageScreen()
+        THEME -> SettingsThemeScreen(navigateBack)
+        VALIDITY_PERIOD -> SettingsValidityPeriodScreen(navigateBack)
+        DOWNLOAD_LIMIT -> SettingsDownloadsLimitScreen(navigateBack)
+        EMAIL_LANGUAGE -> SettingsEmailLanguageScreen(navigateBack)
         NOTIFICATIONS,
         DISCOVER_INFOMANIAK,
         SHARE_IDEAS,