github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-21 20:20:03 -05:00
Code Issues 1.5k Packages Projects Releases 125 Wiki Activity

BIT-1631: Hide Pending requests button when approve requests is disabled (#819)

Browse Source
This commit is contained in:
Caleb Derosier
2024-01-27 18:35:38 -07:00
committed by Álison Fernandes
parent 365e4e5dd9
commit f33ec6e6a3
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt
View File

@@ -66,7 +66,7 @@ private const val MINUTES_PER_HOUR = 60
/**
* Displays the account security screen.
*/
@Suppress("LongMethod")
@Suppress("LongMethod", "LongParameterList")
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun AccountSecurityScreen(
@@ -175,13 +175,15 @@ fun AccountSecurityScreen(
.fillMaxWidth()
.padding(horizontal = 16.dp),
)
BitwardenTextRow(
text = stringResource(id = R.string.pending_log_in_requests),
onClick = remember(viewModel) {
{ viewModel.trySendAction(AccountSecurityAction.PendingLoginRequestsClick) }
},
modifier = Modifier.fillMaxWidth(),
)
if (state.isApproveLoginRequestsEnabled) {
BitwardenTextRow(
text = stringResource(id = R.string.pending_log_in_requests),
onClick = remember(viewModel) {
{ viewModel.trySendAction(AccountSecurityAction.PendingLoginRequestsClick) }
},
modifier = Modifier.fillMaxWidth(),
)
}
Spacer(Modifier.height(16.dp))
BitwardenListHeaderText(

11
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt
View File

@@ -131,13 +131,21 @@ class AccountSecurityScreenTest : BaseComposeTest() {
}
@Test
fun `on approve login requests toggle off should send Disabled action`() {
fun `on approve login requests toggle off should send Disabled action and hide requests row`() {
composeTestRule
.onNodeWithText("Pending login requests")
.assertDoesNotExist()
mutableStateFlow.update { it.copy(isApproveLoginRequestsEnabled = true) }
composeTestRule
.onNodeWithText("Use this device to approve login requests made from other devices")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Pending login requests")
.performScrollTo()
.assertIsDisplayed()
verify {
viewModel.trySendAction(
@@ -300,6 +308,7 @@ class AccountSecurityScreenTest : BaseComposeTest() {
@Test
fun `on pending login requests click should send PendingLoginRequestsClick`() {
mutableStateFlow.update { it.copy(isApproveLoginRequestsEnabled = true) }
composeTestRule
.onNodeWithText("Pending login requests")
.performScrollTo()