From b754c35697517a02d7548141db31667a4df4ede5 Mon Sep 17 00:00:00 2001
From: Louis CAD <louis.cognault@infomaniak.com>
Date: Wed, 5 Mar 2025 13:26:40 +0100
Subject: [PATCH] chore: Remove redundant close button

The back buttons/gestures are enough and more standard.
The close button previously removed picked files after
a popup confirmation, which requires the same amount of steps
as going back twice.
---
 .../ui/screen/newtransfer/upload/UploadRetryScreen.kt        | 1 -
 .../newtransfer/validateemail/ValidateUserEmailScreen.kt     | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt
index 4e3119901..710c6aa47 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadRetryScreen.kt
@@ -49,7 +49,6 @@ fun UploadRetryScreen(
     when (val error: UploadState.Retry = errorState.value) {
         is UploadState.Retry.EmailValidationRequired -> {
             ValidateUserEmailScreen(
-                cancelTransfer = cancel,
                 editTransfer = edit,
                 state = error
             )
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/validateemail/ValidateUserEmailScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/validateemail/ValidateUserEmailScreen.kt
index b61eff2bc..8b13bb63d 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/validateemail/ValidateUserEmailScreen.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/validateemail/ValidateUserEmailScreen.kt
@@ -60,7 +60,6 @@ private val MAX_LAYOUT_WIDTH = 400.dp
 
 @Composable
 fun ValidateUserEmailScreen(
-    cancelTransfer: () -> Unit,
     editTransfer: () -> Unit,
     state: UploadState.Retry.EmailValidationRequired,
     viewModel: ValidateUserEmailViewModel = hiltViewModel(),
@@ -88,7 +87,6 @@ fun ValidateUserEmailScreen(
         isInvalidVerificationCode = { isInvalidVerificationCode },
         snackbarHostState = snackbarHostState,
         navigateBack = editTransfer,
-        exitNewTransfer = cancelTransfer,
         onResendEmailCode = {
             scope.launch {
                 snackbarHostState.showSnackbar(
@@ -129,7 +127,6 @@ private fun ValidateUserEmailScreen(
     isInvalidVerificationCode: () -> Boolean,
     snackbarHostState: SnackbarHostState,
     navigateBack: () -> Unit,
-    exitNewTransfer: () -> Unit,
     onResendEmailCode: () -> Unit,
 ) {
     var otpCode by rememberSaveable { mutableStateOf("") }
@@ -142,7 +139,6 @@ private fun ValidateUserEmailScreen(
             SwissTransferTopAppBar(
                 titleRes = R.string.transferTypeScreenTitle,
                 navigationIcon = { TopAppBarButtons.Back(onClick = navigateBack) },
-                actions = { TopAppBarButtons.Close(onClick = exitNewTransfer) },
             )
         },
         topButton = {
@@ -247,7 +243,6 @@ private fun Preview() {
                 isInvalidVerificationCode = { false },
                 snackbarHostState = remember { SnackbarHostState() },
                 navigateBack = {},
-                exitNewTransfer = {},
                 onResendEmailCode = {},
             )
         }