Merge branch 'clicking-on-a-item-in-the-search-view-from-the-entry-list-droid-2121'

1 files changed, 2 insertions, 1 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
index 3abeee2143..754a162029 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
@@ -78,6 +78,7 @@ import net.mullvad.mullvadvpn.compose.state.RelayListType
 import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState
 import net.mullvad.mullvadvpn.compose.transitions.TopLevelTransition
 import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle
+import net.mullvad.mullvadvpn.compose.util.RunOnKeyChange
 import net.mullvad.mullvadvpn.compose.util.showSnackbarImmediately
 import net.mullvad.mullvadvpn.lib.model.CustomListId
 import net.mullvad.mullvadvpn.lib.model.Hop
@@ -558,7 +559,7 @@ private fun RelayLists(
         // correctly.
         // If multihop is not enabled, the pager will only have one page, so this will not be
         // called.
-        LaunchedEffect(pagerState.currentPage) {
+        RunOnKeyChange(pagerState.currentPage) {
             onSelectRelayList(MultihopRelayListType.entries[pagerState.currentPage])
         }
         // This is so that when the relay list entry or exit button is clicked, the pager will