From 623c71aa1ffd08cc4ca39fc9fea1f09bd2cbbf53 Mon Sep 17 00:00:00 2001 From: Andrew Haisting <142518658+ahaisting-livefront@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:15:36 -0500 Subject: [PATCH] BIT-751 Remove submit button at bottom of create account (#97) --- .../feature/createaccount/CreateAccountScreen.kt | 7 ------- .../createaccount/CreateAccountScreenTest.kt | 16 +--------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt index 32870f8fca..684527b306 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt @@ -26,7 +26,6 @@ import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.Pas import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.PasswordInputChange import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog -import com.x8bit.bitwarden.ui.platform.components.BitwardenFilledButton import com.x8bit.bitwarden.ui.platform.components.BitwardenPasswordField import com.x8bit.bitwarden.ui.platform.components.BitwardenTextButtonTopAppBar import com.x8bit.bitwarden.ui.platform.components.BitwardenTextField @@ -107,12 +106,6 @@ fun CreateAccountScreen( onValueChange = remember { { viewModel.trySendAction(PasswordHintChange(it)) } }, modifier = Modifier.fillMaxWidth(), ) - BitwardenFilledButton( - label = stringResource(id = R.string.submit), - onClick = remember { { viewModel.trySendAction(CreateAccountAction.SubmitClick) } }, - isEnabled = true, - modifier = Modifier.fillMaxWidth(), - ) } } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreenTest.kt index bed96beac7..d3feba1fe6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreenTest.kt @@ -38,21 +38,7 @@ class CreateAccountScreenTest : BaseComposeTest() { composeTestRule.setContent { CreateAccountScreen(onNavigateBack = {}, viewModel = viewModel) } - composeTestRule.onAllNodesWithText("Submit")[0].performClick() - verify { viewModel.trySendAction(SubmitClick) } - } - - @Test - fun `bottom button submit click should send SubmitClick action`() { - val viewModel = mockk(relaxed = true) { - every { stateFlow } returns MutableStateFlow(DEFAULT_STATE) - every { eventFlow } returns emptyFlow() - every { trySendAction(SubmitClick) } returns Unit - } - composeTestRule.setContent { - CreateAccountScreen(onNavigateBack = {}, viewModel = viewModel) - } - composeTestRule.onAllNodesWithText("Submit")[1].performClick() + composeTestRule.onNodeWithText("Submit").performClick() verify { viewModel.trySendAction(SubmitClick) } }