Avoid return statement

1 files changed, 41 insertions, 42 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
index bcb29a7f61..82d0ad6a6b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
@@ -161,52 +161,51 @@ private fun ReportProblemScreen(
                     is SendingReportUiState.Error -> ErrorContent(onSendReport, onClearSendResult)
                     is SendingReportUiState.Success -> SentContent(state.sendingState)
                 }
-                return@ScaffoldWithMediumTopBar
             }
-        }
-
-        Column(
-            modifier =
-                modifier
-                    .padding(
-                        start = Dimens.sideMargin,
-                        end = Dimens.sideMargin,
-                        bottom = Dimens.verticalSpace,
-                    )
-                    .height(IntrinsicSize.Max),
-            verticalArrangement = Arrangement.spacedBy(Dimens.mediumPadding)
-        ) {
-            Text(text = stringResource(id = R.string.problem_report_description))
-
-            TextField(
-                modifier = Modifier.fillMaxWidth(),
-                value = state.email,
-                onValueChange = onEmailChanged,
-                maxLines = 1,
-                singleLine = true,
-                placeholder = { Text(text = stringResource(id = R.string.user_email_hint)) },
-                colors = mullvadWhiteTextFieldColors()
-            )
-
-            TextField(
-                modifier = Modifier.fillMaxWidth().weight(1f),
-                value = state.description,
-                onValueChange = onDescriptionChanged,
-                placeholder = { Text(stringResource(R.string.user_message_hint)) },
-                colors = mullvadWhiteTextFieldColors()
-            )
+        } else {
+            Column(
+                modifier =
+                    modifier
+                        .padding(
+                            start = Dimens.sideMargin,
+                            end = Dimens.sideMargin,
+                            bottom = Dimens.verticalSpace,
+                        )
+                        .height(IntrinsicSize.Max),
+                verticalArrangement = Arrangement.spacedBy(Dimens.mediumPadding)
+            ) {
+                Text(text = stringResource(id = R.string.problem_report_description))
 
-            Column {
-                PrimaryButton(
-                    onClick = onNavigateToViewLogs,
-                    text = stringResource(id = R.string.view_logs)
+                TextField(
+                    modifier = Modifier.fillMaxWidth(),
+                    value = state.email,
+                    onValueChange = onEmailChanged,
+                    maxLines = 1,
+                    singleLine = true,
+                    placeholder = { Text(text = stringResource(id = R.string.user_email_hint)) },
+                    colors = mullvadWhiteTextFieldColors()
                 )
-                Spacer(modifier = Modifier.height(Dimens.buttonSpacing))
-                VariantButton(
-                    onClick = onSendReport,
-                    isEnabled = state.description.isNotEmpty(),
-                    text = stringResource(id = R.string.send)
+
+                TextField(
+                    modifier = Modifier.fillMaxWidth().weight(1f),
+                    value = state.description,
+                    onValueChange = onDescriptionChanged,
+                    placeholder = { Text(stringResource(R.string.user_message_hint)) },
+                    colors = mullvadWhiteTextFieldColors()
                 )
+
+                Column {
+                    PrimaryButton(
+                        onClick = onNavigateToViewLogs,
+                        text = stringResource(id = R.string.view_logs)
+                    )
+                    Spacer(modifier = Modifier.height(Dimens.buttonSpacing))
+                    VariantButton(
+                        onClick = onSendReport,
+                        isEnabled = state.description.isNotEmpty(),
+                        text = stringResource(id = R.string.send)
+                    )
+                }
             }
         }
     }