From 0b9109bcd37a56741bd28955d3f523074617ea51 Mon Sep 17 00:00:00 2001
From: Jonatan Rhodin <jonatan.rhodin@mullvad.net>
Date: Mon, 20 Nov 2023 15:00:45 +0100
Subject: [PATCH] Fix collapsible toolbar flickering

---
 .../mullvad/mullvadvpn/compose/component/Scaffolding.kt  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
index 11abdad19103..ce8507db6403 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
@@ -144,7 +144,7 @@ fun ScaffoldWithMediumTopBar(
                 title = appBarTitle,
                 navigationIcon = navigationIcon,
                 actions,
-                scrollBehavior = if (canScroll) scrollBehavior else null
+                scrollBehavior = scrollBehavior
             )
         },
         content = {
@@ -180,12 +180,7 @@ fun ScaffoldWithMediumTopBar(
                 title = appBarTitle,
                 navigationIcon = navigationIcon,
                 actions,
-                scrollBehavior =
-                    if (canScroll) {
-                        scrollBehavior
-                    } else {
-                        null
-                    }
+                scrollBehavior = scrollBehavior
             )
         },
         content = {