From dc7fca0311d5de80861f967dd49592c284dd4653 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:09:04 -0700
Subject: [PATCH] Fix scroll

---
 .../x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt
index c406350b8..b418497de 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt
@@ -194,7 +194,7 @@ private fun VaultScreenScaffold(
     var shouldShowExitConfirmationDialog by rememberSaveable { mutableStateOf(false) }
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(
         state = rememberTopAppBarState(),
-        canScroll = { !accountMenuVisible },
+        canScroll = { !accountMenuVisible && !notificationMenuVisible },
     )
 
     // Dynamic dialogs
@@ -278,7 +278,7 @@ private fun VaultScreenScaffold(
         },
         floatingActionButton = {
             AnimatedVisibility(
-                visible = state.viewState.hasFab && !accountMenuVisible,
+                visible = state.viewState.hasFab && !accountMenuVisible && !notificationMenuVisible,
                 enter = scaleIn(),
                 exit = scaleOut(),
             ) {
@@ -380,7 +380,7 @@ private fun VaultScreenScaffold(
                 isVisible = notificationMenuVisible,
                 notificationSummaries = state.notificationSummaries.toImmutableList(),
                 onNotificationClick = {},
-                onDismissRequest = { updateAccountMenuVisibility(false) },
+                onDismissRequest = { updateNotificationMenuVisibility(false) },
                 topAppBarScrollBehavior = scrollBehavior,
                 modifier = outerModifier,
             )