Rename viewActions to uiSideEffect

22 files changed, 143 insertions, 140 deletions

diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
index c4d2fab62e..41bf449369 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
@@ -35,7 +35,7 @@ class AccountScreenTest {
                         accountNumber = DUMMY_ACCOUNT_NUMBER,
                         accountExpiry = null
                     ),
-                viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
                 enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
@@ -60,7 +60,7 @@ class AccountScreenTest {
                         accountNumber = DUMMY_ACCOUNT_NUMBER,
                         accountExpiry = null
                     ),
-                viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
                 enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onManageAccountClick = mockedClickHandler
             )
@@ -86,7 +86,7 @@ class AccountScreenTest {
                         accountNumber = DUMMY_ACCOUNT_NUMBER,
                         accountExpiry = null
                     ),
-                viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
                 enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onRedeemVoucherClick = mockedClickHandler
             )
@@ -112,7 +112,7 @@ class AccountScreenTest {
                         accountNumber = DUMMY_ACCOUNT_NUMBER,
                         accountExpiry = null
                     ),
-                viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
                 enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onLogoutClick = mockedClickHandler
             )
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
index 40f9b278b8..02a148b22d 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
@@ -56,7 +56,7 @@ class ConnectScreenTest {
         composeTestRule.setContent {
             ConnectScreen(
                 uiState = ConnectUiState.INITIAL,
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -86,7 +86,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowTunnelStateNotificationBlocked
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -121,7 +121,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowTunnelStateNotificationBlocked
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -153,7 +153,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -184,7 +184,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -216,7 +216,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -248,7 +248,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -285,7 +285,7 @@ class ConnectScreenTest {
                                 ErrorState(ErrorStateCause.StartTunnelError, true)
                             )
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -323,7 +323,7 @@ class ConnectScreenTest {
                                 ErrorState(ErrorStateCause.StartTunnelError, false)
                             )
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -356,7 +356,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowTunnelStateNotificationBlocked
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -391,7 +391,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowTunnelStateNotificationBlocked
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -425,7 +425,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onSwitchLocationClick = mockedClickHandler
             )
         }
@@ -456,7 +456,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onDisconnectClick = mockedClickHandler
             )
         }
@@ -487,7 +487,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onReconnectClick = mockedClickHandler
             )
         }
@@ -517,7 +517,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onConnectClick = mockedClickHandler
             )
         }
@@ -547,7 +547,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onCancelClick = mockedClickHandler
             )
         }
@@ -578,7 +578,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = false,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow(),
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onToggleTunnelInfo = mockedClickHandler
             )
         }
@@ -616,7 +616,7 @@ class ConnectScreenTest {
                         isTunnelInfoExpanded = true,
                         connectNotificationState = ConnectNotificationState.HideNotification
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -654,7 +654,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowVersionInfoNotification(versionInfo)
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -690,7 +690,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowVersionInfoNotification(versionInfo)
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -723,7 +723,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowAccountExpiryNotification(expiryDate)
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -761,7 +761,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowVersionInfoNotification(versionInfo)
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -793,7 +793,7 @@ class ConnectScreenTest {
                         connectNotificationState =
                             ConnectNotificationState.ShowAccountExpiryNotification(expiryDate)
                     ),
-                viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -810,9 +810,9 @@ class ConnectScreenTest {
         composeTestRule.setContent {
             ConnectScreen(
                 uiState = ConnectUiState.INITIAL,
-                viewActions =
+                uiSideEffect =
                     MutableStateFlow(
-                        ConnectViewModel.ViewAction.OpenAccountManagementPageInBrowser("222")
+                        ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser("222")
                     )
             )
         }
@@ -828,7 +828,7 @@ class ConnectScreenTest {
         composeTestRule.setContent {
             ConnectScreen(
                 uiState = ConnectUiState.INITIAL,
-                viewActions = MutableStateFlow(ConnectViewModel.ViewAction.OpenOutOfTimeView),
+                uiSideEffect = MutableStateFlow(ConnectViewModel.UiSideEffect.OpenOutOfTimeView),
                 onOpenOutOfTimeScreen = mockedOpenScreenHandler
             )
         }
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt
index a97e587c8c..a177aa8ac1 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreenTest.kt
@@ -30,7 +30,7 @@ class OutOfTimeScreenTest {
             OutOfTimeScreen(
                 showSitePayment = false,
                 uiState = OutOfTimeUiState(),
-                viewActions = MutableSharedFlow(),
+                uiSideEffect = MutableSharedFlow(),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -58,8 +58,8 @@ class OutOfTimeScreenTest {
             OutOfTimeScreen(
                 showSitePayment = true,
                 uiState = OutOfTimeUiState(),
-                viewActions =
-                    MutableStateFlow(OutOfTimeViewModel.ViewAction.OpenAccountView("222")),
+                uiSideEffect =
+                    MutableStateFlow(OutOfTimeViewModel.UiSideEffect.OpenAccountView("222")),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -81,7 +81,7 @@ class OutOfTimeScreenTest {
             OutOfTimeScreen(
                 showSitePayment = true,
                 uiState = OutOfTimeUiState(),
-                viewActions = MutableStateFlow(OutOfTimeViewModel.ViewAction.OpenConnectScreen),
+                uiSideEffect = MutableStateFlow(OutOfTimeViewModel.UiSideEffect.OpenConnectScreen),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -103,7 +103,7 @@ class OutOfTimeScreenTest {
             OutOfTimeScreen(
                 showSitePayment = true,
                 uiState = OutOfTimeUiState(),
-                viewActions = MutableSharedFlow(),
+                uiSideEffect = MutableSharedFlow(),
                 onSitePaymentClick = mockClickListener,
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -128,7 +128,7 @@ class OutOfTimeScreenTest {
             OutOfTimeScreen(
                 showSitePayment = true,
                 uiState = OutOfTimeUiState(),
-                viewActions = MutableSharedFlow(),
+                uiSideEffect = MutableSharedFlow(),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = mockClickListener,
                 onSettingsClick = {},
@@ -153,7 +153,7 @@ class OutOfTimeScreenTest {
             OutOfTimeScreen(
                 showSitePayment = true,
                 uiState = OutOfTimeUiState(tunnelState = TunnelState.Connecting(null, null)),
-                viewActions = MutableSharedFlow(),
+                uiSideEffect = MutableSharedFlow(),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
index 051b16b6b1..4efa98225b 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
@@ -29,7 +29,7 @@ class WelcomeScreenTest {
             WelcomeScreen(
                 showSitePayment = true,
                 uiState = WelcomeUiState(),
-                viewActions = MutableSharedFlow(),
+                uiSideEffect = MutableSharedFlow(),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -52,7 +52,7 @@ class WelcomeScreenTest {
             WelcomeScreen(
                 showSitePayment = false,
                 uiState = WelcomeUiState(),
-                viewActions = MutableSharedFlow(),
+                uiSideEffect = MutableSharedFlow(),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -81,7 +81,7 @@ class WelcomeScreenTest {
             WelcomeScreen(
                 showSitePayment = true,
                 uiState = WelcomeUiState(accountNumber = rawAccountNumber),
-                viewActions = MutableSharedFlow(),
+                uiSideEffect = MutableSharedFlow(),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -101,7 +101,8 @@ class WelcomeScreenTest {
             WelcomeScreen(
                 showSitePayment = true,
                 uiState = WelcomeUiState(),
-                viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenAccountView("222")),
+                uiSideEffect =
+                    MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenAccountView("222")),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -122,7 +123,7 @@ class WelcomeScreenTest {
             WelcomeScreen(
                 showSitePayment = true,
                 uiState = WelcomeUiState(),
-                viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenConnectScreen),
+                uiSideEffect = MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenConnectScreen),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -143,7 +144,7 @@ class WelcomeScreenTest {
             WelcomeScreen(
                 showSitePayment = true,
                 uiState = WelcomeUiState(),
-                viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenConnectScreen),
+                uiSideEffect = MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenConnectScreen),
                 onSitePaymentClick = mockClickListener,
                 onRedeemVoucherClick = {},
                 onSettingsClick = {},
@@ -167,7 +168,7 @@ class WelcomeScreenTest {
             WelcomeScreen(
                 showSitePayment = true,
                 uiState = WelcomeUiState(),
-                viewActions = MutableStateFlow(WelcomeViewModel.ViewAction.OpenConnectScreen),
+                uiSideEffect = MutableStateFlow(WelcomeViewModel.UiSideEffect.OpenConnectScreen),
                 onSitePaymentClick = {},
                 onRedeemVoucherClick = mockClickListener,
                 onSettingsClick = {},
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
index b3bc9e7f3b..6241b3bf04 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
@@ -62,7 +62,7 @@ private fun PreviewAccountScreen() {
                 accountNumber = "1234123412341234",
                 accountExpiry = null
             ),
-        viewActions = MutableSharedFlow<AccountViewModel.ViewAction>().asSharedFlow(),
+        uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
         enterTransitionEndAction = MutableSharedFlow()
     )
 }
@@ -71,7 +71,7 @@ private fun PreviewAccountScreen() {
 @Composable
 fun AccountScreen(
     uiState: AccountUiState,
-    viewActions: SharedFlow<AccountViewModel.ViewAction>,
+    uiSideEffect: SharedFlow<AccountViewModel.UiSideEffect>,
     enterTransitionEndAction: SharedFlow<Unit>,
     onRedeemVoucherClick: () -> Unit = {},
     onManageAccountClick: () -> Unit = {},
@@ -116,9 +116,11 @@ fun AccountScreen(
         },
     ) {
         LaunchedEffect(Unit) {
-            viewActions.collect { viewAction ->
-                if (viewAction is AccountViewModel.ViewAction.OpenAccountManagementPageInBrowser) {
-                    context.openAccountPageInBrowser(viewAction.token)
+            uiSideEffect.collect { uiSideEffect ->
+                if (
+                    uiSideEffect is AccountViewModel.UiSideEffect.OpenAccountManagementPageInBrowser
+                ) {
+                    context.openAccountPageInBrowser(uiSideEffect.token)
                 }
             }
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
index d250a5467e..8ca98c410a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
@@ -60,7 +60,7 @@ fun PreviewConnectScreen() {
     AppTheme {
         ConnectScreen(
             uiState = state,
-            viewActions = MutableSharedFlow<ConnectViewModel.ViewAction>().asSharedFlow()
+            uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
         )
     }
 }
@@ -68,7 +68,7 @@ fun PreviewConnectScreen() {
 @Composable
 fun ConnectScreen(
     uiState: ConnectUiState,
-    viewActions: SharedFlow<ConnectViewModel.ViewAction>,
+    uiSideEffect: SharedFlow<ConnectViewModel.UiSideEffect>,
     onDisconnectClick: () -> Unit = {},
     onReconnectClick: () -> Unit = {},
     onConnectClick: () -> Unit = {},
@@ -83,12 +83,12 @@ fun ConnectScreen(
 ) {
     val context = LocalContext.current
     LaunchedEffect(key1 = Unit) {
-        viewActions.collect { viewAction ->
-            when (viewAction) {
-                is ConnectViewModel.ViewAction.OpenAccountManagementPageInBrowser -> {
-                    context.openAccountPageInBrowser(viewAction.token)
+        uiSideEffect.collect { uiSideEffect ->
+            when (uiSideEffect) {
+                is ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser -> {
+                    context.openAccountPageInBrowser(uiSideEffect.token)
                 }
-                is ConnectViewModel.ViewAction.OpenOutOfTimeView -> {
+                is ConnectViewModel.UiSideEffect.OpenOutOfTimeView -> {
                     onOpenOutOfTimeScreen()
                 }
             }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
index a9ab126dae..49de23228c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
@@ -48,7 +48,7 @@ private fun PreviewOutOfTimeScreenDisconnected() {
         OutOfTimeScreen(
             showSitePayment = true,
             uiState = OutOfTimeUiState(tunnelState = TunnelState.Disconnected),
-            viewActions = MutableSharedFlow<OutOfTimeViewModel.ViewAction>().asSharedFlow()
+            uiSideEffect = MutableSharedFlow<OutOfTimeViewModel.UiSideEffect>().asSharedFlow()
         )
     }
 }
@@ -60,7 +60,7 @@ private fun PreviewOutOfTimeScreenConnecting() {
         OutOfTimeScreen(
             showSitePayment = true,
             uiState = OutOfTimeUiState(tunnelState = TunnelState.Connecting(null, null)),
-            viewActions = MutableSharedFlow<OutOfTimeViewModel.ViewAction>().asSharedFlow()
+            uiSideEffect = MutableSharedFlow<OutOfTimeViewModel.UiSideEffect>().asSharedFlow()
         )
     }
 }
@@ -78,7 +78,7 @@ private fun PreviewOutOfTimeScreenError() {
                             ErrorState(cause = ErrorStateCause.IsOffline, isBlocking = true)
                         )
                 ),
-            viewActions = MutableSharedFlow<OutOfTimeViewModel.ViewAction>().asSharedFlow()
+            uiSideEffect = MutableSharedFlow<OutOfTimeViewModel.UiSideEffect>().asSharedFlow()
         )
     }
 }
@@ -87,7 +87,7 @@ private fun PreviewOutOfTimeScreenError() {
 fun OutOfTimeScreen(
     showSitePayment: Boolean,
     uiState: OutOfTimeUiState,
-    viewActions: SharedFlow<OutOfTimeViewModel.ViewAction>,
+    uiSideEffect: SharedFlow<OutOfTimeViewModel.UiSideEffect>,
     onDisconnectClick: () -> Unit = {},
     onSitePaymentClick: () -> Unit = {},
     onRedeemVoucherClick: () -> Unit = {},
@@ -97,11 +97,11 @@ fun OutOfTimeScreen(
 ) {
     val openAccountPage = LocalUriHandler.current.createOpenAccountPageHook()
     LaunchedEffect(key1 = Unit) {
-        viewActions.collect { viewAction ->
-            when (viewAction) {
-                is OutOfTimeViewModel.ViewAction.OpenAccountView ->
-                    openAccountPage(viewAction.token)
-                OutOfTimeViewModel.ViewAction.OpenConnectScreen -> openConnectScreen()
+        uiSideEffect.collect { uiSideEffect ->
+            when (uiSideEffect) {
+                is OutOfTimeViewModel.UiSideEffect.OpenAccountView ->
+                    openAccountPage(uiSideEffect.token)
+                OutOfTimeViewModel.UiSideEffect.OpenConnectScreen -> openConnectScreen()
             }
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
index 140b9824df..5cae9e966a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
@@ -56,7 +56,7 @@ private fun PreviewWelcomeScreen() {
         WelcomeScreen(
             showSitePayment = true,
             uiState = WelcomeUiState(accountNumber = "4444555566667777", deviceName = "Happy Mole"),
-            viewActions = MutableSharedFlow<WelcomeViewModel.ViewAction>().asSharedFlow(),
+            uiSideEffect = MutableSharedFlow<WelcomeViewModel.UiSideEffect>().asSharedFlow(),
             onSitePaymentClick = {},
             onRedeemVoucherClick = {},
             onSettingsClick = {},
@@ -70,7 +70,7 @@ private fun PreviewWelcomeScreen() {
 fun WelcomeScreen(
     showSitePayment: Boolean,
     uiState: WelcomeUiState,
-    viewActions: SharedFlow<WelcomeViewModel.ViewAction>,
+    uiSideEffect: SharedFlow<WelcomeViewModel.UiSideEffect>,
     onSitePaymentClick: () -> Unit,
     onRedeemVoucherClick: () -> Unit,
     onSettingsClick: () -> Unit,
@@ -79,11 +79,11 @@ fun WelcomeScreen(
 ) {
     val context = LocalContext.current
     LaunchedEffect(Unit) {
-        viewActions.collect { viewAction ->
-            when (viewAction) {
-                is WelcomeViewModel.ViewAction.OpenAccountView ->
-                    context.openAccountPageInBrowser(viewAction.token)
-                WelcomeViewModel.ViewAction.OpenConnectScreen -> openConnectScreen()
+        uiSideEffect.collect { uiSideEffect ->
+            when (uiSideEffect) {
+                is WelcomeViewModel.UiSideEffect.OpenAccountView ->
+                    context.openAccountPageInBrowser(uiSideEffect.token)
+                WelcomeViewModel.UiSideEffect.OpenConnectScreen -> openConnectScreen()
             }
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
index 666bd19cdb..b0784d62a9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
@@ -32,7 +32,7 @@ class AccountFragment : BaseFragment(), StatusBarPainter, NavigationBarPainter {
                     val state = vm.uiState.collectAsState().value
                     AccountScreen(
                         uiState = state,
-                        viewActions = vm.viewActions,
+                        uiSideEffect = vm.uiSideEffect,
                         enterTransitionEndAction = vm.enterTransitionEndAction,
                         onRedeemVoucherClick = { openRedeemVoucherFragment() },
                         onManageAccountClick = vm::onManageAccountClick,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
index b32f162761..afb2ec9d94 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
@@ -34,7 +34,7 @@ class ConnectFragment : BaseFragment(), NavigationBarPainter {
                 val state = connectViewModel.uiState.collectAsState().value
                 ConnectScreen(
                     uiState = state,
-                    viewActions = connectViewModel.viewActions,
+                    uiSideEffect = connectViewModel.uiSideEffect,
                     onDisconnectClick = connectViewModel::onDisconnectClick,
                     onReconnectClick = connectViewModel::onReconnectClick,
                     onConnectClick = connectViewModel::onConnectClick,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoginFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoginFragment.kt
index 466b0eca85..9fd6e5aceb 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoginFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoginFragment.kt
@@ -14,7 +14,7 @@ import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.model.AccountToken
 import net.mullvad.mullvadvpn.ui.MainActivity
 import net.mullvad.mullvadvpn.ui.NavigationBarPainter
-import net.mullvad.mullvadvpn.viewmodel.LoginViewAction
+import net.mullvad.mullvadvpn.viewmodel.LoginUiSideEffect
 import net.mullvad.mullvadvpn.viewmodel.LoginViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -40,12 +40,12 @@ class LoginFragment : BaseFragment(), NavigationBarPainter {
                 AppTheme {
                     val uiState by vm.uiState.collectAsState()
                     LaunchedEffect(Unit) {
-                        vm.viewActions.collect {
+                        vm.uiSideEffect.collect {
                             when (it) {
-                                LoginViewAction.NavigateToWelcome,
-                                LoginViewAction
+                                LoginUiSideEffect.NavigateToWelcome,
+                                LoginUiSideEffect
                                     .NavigateToConnect -> {} // TODO Fix when we redo navigation
-                                is LoginViewAction.TooManyDevices -> {
+                                is LoginUiSideEffect.TooManyDevices -> {
                                     navigateToDeviceListFragment(it.accountToken)
                                 }
                             }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
index 8d3bf00010..700ffba145 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
@@ -30,7 +30,7 @@ class OutOfTimeFragment : BaseFragment() {
                     OutOfTimeScreen(
                         showSitePayment = IS_PLAY_BUILD.not(),
                         uiState = state,
-                        viewActions = vm.viewActions,
+                        uiSideEffect = vm.uiSideEffect,
                         onSitePaymentClick = vm::onSitePaymentClick,
                         onRedeemVoucherClick = ::openRedeemVoucherFragment,
                         onSettingsClick = ::openSettingsView,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
index 6c9fa0c4c7..403c50ccec 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
@@ -30,7 +30,7 @@ class WelcomeFragment : BaseFragment() {
                     WelcomeScreen(
                         showSitePayment = IS_PLAY_BUILD.not(),
                         uiState = state,
-                        viewActions = vm.viewActions,
+                        uiSideEffect = vm.uiSideEffect,
                         onSitePaymentClick = vm::onSitePaymentClick,
                         onRedeemVoucherClick = ::openRedeemVoucherFragment,
                         onSettingsClick = ::openSettingsView,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt
index b1ce2e0027..425a64dd71 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt
@@ -22,9 +22,9 @@ class AccountViewModel(
     deviceRepository: DeviceRepository
 ) : ViewModel() {
 
-    private val _viewActions = MutableSharedFlow<ViewAction>(extraBufferCapacity = 1)
+    private val _uiSideEffect = MutableSharedFlow<UiSideEffect>(extraBufferCapacity = 1)
     private val _enterTransitionEndAction = MutableSharedFlow<Unit>()
-    val viewActions = _viewActions.asSharedFlow()
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
 
     val uiState =
         combine(deviceRepository.deviceState, accountRepository.accountExpiryState) {
@@ -42,8 +42,8 @@ class AccountViewModel(
 
     fun onManageAccountClick() {
         viewModelScope.launch {
-            _viewActions.tryEmit(
-                ViewAction.OpenAccountManagementPageInBrowser(
+            _uiSideEffect.tryEmit(
+                UiSideEffect.OpenAccountManagementPageInBrowser(
                     serviceConnectionManager.authTokenCache()?.fetchAuthToken() ?: ""
                 )
             )
@@ -58,8 +58,8 @@ class AccountViewModel(
         viewModelScope.launch { _enterTransitionEndAction.emit(Unit) }
     }
 
-    sealed class ViewAction {
-        data class OpenAccountManagementPageInBrowser(val token: String) : ViewAction()
+    sealed class UiSideEffect {
+        data class OpenAccountManagementPageInBrowser(val token: String) : UiSideEffect()
     }
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
index bf3414b0e1..01a1c84896 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
@@ -48,8 +48,8 @@ class ConnectViewModel(
     private val isVersionInfoNotificationEnabled: Boolean,
     accountRepository: AccountRepository,
 ) : ViewModel() {
-    private val _viewActions = MutableSharedFlow<ViewAction>(extraBufferCapacity = 1)
-    val viewActions = _viewActions.asSharedFlow()
+    private val _uiSideEffect = MutableSharedFlow<UiSideEffect>(extraBufferCapacity = 1)
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
 
     private val _shared: SharedFlow<ServiceConnectionContainer> =
         serviceConnectionManager.connectionState
@@ -84,7 +84,7 @@ class ConnectViewModel(
                     accountExpiry,
                     isTunnelInfoExpanded ->
                     if (tunnelRealState.isTunnelErrorStateDueToExpiredAccount()) {
-                        _viewActions.tryEmit(ViewAction.OpenOutOfTimeView)
+                        _uiSideEffect.tryEmit(UiSideEffect.OpenOutOfTimeView)
                     }
                     ConnectUiState(
                         location =
@@ -205,18 +205,18 @@ class ConnectViewModel(
 
     fun onManageAccountClick() {
         viewModelScope.launch {
-            _viewActions.tryEmit(
-                ViewAction.OpenAccountManagementPageInBrowser(
+            _uiSideEffect.tryEmit(
+                UiSideEffect.OpenAccountManagementPageInBrowser(
                     serviceConnectionManager.authTokenCache()?.fetchAuthToken() ?: ""
                 )
             )
         }
     }
 
-    sealed interface ViewAction {
-        data class OpenAccountManagementPageInBrowser(val token: String) : ViewAction
+    sealed interface UiSideEffect {
+        data class OpenAccountManagementPageInBrowser(val token: String) : UiSideEffect
 
-        data object OpenOutOfTimeView : ViewAction
+        data object OpenOutOfTimeView : UiSideEffect
     }
 
     companion object {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
index 194b6462a5..953e59f388 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
@@ -27,12 +27,12 @@ import net.mullvad.mullvadvpn.repository.DeviceRepository
 
 private const val MINIMUM_LOADING_SPINNER_TIME_MILLIS = 500L
 
-sealed interface LoginViewAction {
-    data object NavigateToWelcome : LoginViewAction
+sealed interface LoginUiSideEffect {
+    data object NavigateToWelcome : LoginUiSideEffect
 
-    data object NavigateToConnect : LoginViewAction
+    data object NavigateToConnect : LoginUiSideEffect
 
-    data class TooManyDevices(val accountToken: AccountToken) : LoginViewAction
+    data class TooManyDevices(val accountToken: AccountToken) : LoginUiSideEffect
 }
 
 class LoginViewModel(
@@ -43,8 +43,8 @@ class LoginViewModel(
     private val _loginState = MutableStateFlow(LoginUiState.INITIAL.loginState)
     private val _loginInput = MutableStateFlow(LoginUiState.INITIAL.accountNumberInput)
 
-    private val _viewActions = MutableSharedFlow<LoginViewAction>(extraBufferCapacity = 1)
-    val viewActions = _viewActions.asSharedFlow()
+    private val _uiSideEffect = MutableSharedFlow<LoginUiSideEffect>(extraBufferCapacity = 1)
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
 
     private val _uiState =
         combine(
@@ -83,7 +83,7 @@ class LoginViewModel(
                     LoginResult.Ok -> {
                         launch {
                             delay(1000)
-                            _viewActions.emit(LoginViewAction.NavigateToConnect)
+                            _uiSideEffect.emit(LoginUiSideEffect.NavigateToConnect)
                         }
                         Success
                     }
@@ -100,8 +100,8 @@ class LoginViewModel(
 
                         if (refreshResult.isAvailable()) {
                             // Navigate to device list
-                            _viewActions.emit(
-                                LoginViewAction.TooManyDevices(AccountToken(accountToken))
+                            _uiSideEffect.emit(
+                                LoginUiSideEffect.TooManyDevices(AccountToken(accountToken))
                             )
                             return@launch
                         } else {
@@ -123,7 +123,7 @@ class LoginViewModel(
 
     private suspend fun AccountCreationResult.mapToUiState(): LoginState? {
         return if (this is AccountCreationResult.Success) {
-            _viewActions.emit(LoginViewAction.NavigateToWelcome)
+            _uiSideEffect.emit(LoginUiSideEffect.NavigateToWelcome)
             null
         } else {
             Idle(LoginError.UnableToCreateAccount)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModel.kt
index 00f3850777..8a789f62fd 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModel.kt
@@ -34,8 +34,8 @@ class OutOfTimeViewModel(
     private val pollAccountExpiry: Boolean = true
 ) : ViewModel() {
 
-    private val _viewActions = MutableSharedFlow<ViewAction>(extraBufferCapacity = 1)
-    val viewActions = _viewActions.asSharedFlow()
+    private val _uiSideEffect = MutableSharedFlow<UiSideEffect>(extraBufferCapacity = 1)
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
 
     val uiState =
         serviceConnectionManager.connectionState
@@ -59,7 +59,7 @@ class OutOfTimeViewModel(
                     val tomorrow = DateTime.now().plusHours(20)
 
                     if (expiry.isAfter(tomorrow)) {
-                        _viewActions.tryEmit(ViewAction.OpenConnectScreen)
+                        _uiSideEffect.tryEmit(UiSideEffect.OpenConnectScreen)
                     }
                 }
             }
@@ -77,8 +77,8 @@ class OutOfTimeViewModel(
 
     fun onSitePaymentClick() {
         viewModelScope.launch {
-            _viewActions.tryEmit(
-                ViewAction.OpenAccountView(
+            _uiSideEffect.tryEmit(
+                UiSideEffect.OpenAccountView(
                     serviceConnectionManager.authTokenCache()?.fetchAuthToken() ?: ""
                 )
             )
@@ -89,9 +89,9 @@ class OutOfTimeViewModel(
         viewModelScope.launch { serviceConnectionManager.connectionProxy()?.disconnect() }
     }
 
-    sealed interface ViewAction {
-        data class OpenAccountView(val token: String) : ViewAction
+    sealed interface UiSideEffect {
+        data class OpenAccountView(val token: String) : UiSideEffect
 
-        data object OpenConnectScreen : ViewAction
+        data object OpenConnectScreen : UiSideEffect
     }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt
index eb25ad1268..fe2ddcb66a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModel.kt
@@ -39,8 +39,8 @@ class WelcomeViewModel(
     private val pollAccountExpiry: Boolean = true
 ) : ViewModel() {
 
-    private val _viewActions = MutableSharedFlow<ViewAction>(extraBufferCapacity = 1)
-    val viewActions = _viewActions.asSharedFlow()
+    private val _uiSideEffect = MutableSharedFlow<UiSideEffect>(extraBufferCapacity = 1)
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
 
     val uiState =
         serviceConnectionManager.connectionState
@@ -74,7 +74,7 @@ class WelcomeViewModel(
                     val tomorrow = DateTime.now().plusHours(20)
 
                     if (expiry.isAfter(tomorrow)) {
-                        _viewActions.tryEmit(ViewAction.OpenConnectScreen)
+                        _uiSideEffect.tryEmit(UiSideEffect.OpenConnectScreen)
                     }
                 }
             }
@@ -92,17 +92,17 @@ class WelcomeViewModel(
 
     fun onSitePaymentClick() {
         viewModelScope.launch {
-            _viewActions.tryEmit(
-                ViewAction.OpenAccountView(
+            _uiSideEffect.tryEmit(
+                UiSideEffect.OpenAccountView(
                     serviceConnectionManager.authTokenCache()?.fetchAuthToken() ?: ""
                 )
             )
         }
     }
 
-    sealed interface ViewAction {
-        data class OpenAccountView(val token: String) : ViewAction
+    sealed interface UiSideEffect {
+        data class OpenAccountView(val token: String) : UiSideEffect
 
-        data object OpenConnectScreen : ViewAction
+        data object OpenConnectScreen : UiSideEffect
     }
 }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
index a2a39e54c4..18f8447f44 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
@@ -375,21 +375,21 @@ class ConnectViewModelTest {
             coEvery { mockAuthTokenCache.fetchAuthToken() } returns mockToken
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 viewModel.onManageAccountClick()
                 val action = awaitItem()
-                assertIs<ConnectViewModel.ViewAction.OpenAccountManagementPageInBrowser>(action)
+                assertIs<ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser>(action)
                 assertEquals(mockToken, action.token)
             }
         }
 
     @Test
-    fun testOutOfTimeViewAction() =
+    fun testOutOfTimeUiSideEffect() =
         runTest(testCoroutineRule.testDispatcher) {
             // Arrange
             val errorStateCause = ErrorStateCause.AuthFailed("[EXPIRED_ACCOUNT]")
             val tunnelRealStateTestItem = TunnelState.Error(ErrorState(errorStateCause, true))
-            val deferred = async { viewModel.viewActions.first() }
+            val deferred = async { viewModel.uiSideEffect.first() }
 
             // Act
             viewModel.uiState.test {
@@ -403,7 +403,7 @@ class ConnectViewModelTest {
             }
 
             // Assert
-            assertIs<ConnectViewModel.ViewAction.OpenOutOfTimeView>(deferred.await())
+            assertIs<ConnectViewModel.UiSideEffect.OpenOutOfTimeView>(deferred.await())
         }
 
     companion object {
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
index 73bfd1ef38..744989a922 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
@@ -63,7 +63,7 @@ class LoginViewModelTest {
         turbineScope {
             // Arrange
             val uiStates = loginViewModel.uiState.testIn(backgroundScope)
-            val sideEffects = loginViewModel.viewActions.testIn(backgroundScope)
+            val sideEffects = loginViewModel.uiSideEffect.testIn(backgroundScope)
             coEvery { mockedAccountRepository.createAccount() } returns
                 AccountCreationResult.Success(DUMMY_ACCOUNT_TOKEN)
 
@@ -71,7 +71,7 @@ class LoginViewModelTest {
             uiStates.skipDefaultItem()
             loginViewModel.createAccount()
             assertEquals(Loading.CreatingAccount, uiStates.awaitItem().loginState)
-            assertEquals(LoginViewAction.NavigateToWelcome, sideEffects.awaitItem())
+            assertEquals(LoginUiSideEffect.NavigateToWelcome, sideEffects.awaitItem())
         }
     }
 
@@ -80,7 +80,7 @@ class LoginViewModelTest {
         turbineScope {
             // Arrange
             val uiStates = loginViewModel.uiState.testIn(backgroundScope)
-            val sideEffects = loginViewModel.viewActions.testIn(backgroundScope)
+            val sideEffects = loginViewModel.uiSideEffect.testIn(backgroundScope)
             coEvery { mockedAccountRepository.login(any()) } returns LoginResult.Ok
 
             // Act, Assert
@@ -88,7 +88,7 @@ class LoginViewModelTest {
             loginViewModel.login(DUMMY_ACCOUNT_TOKEN)
             assertEquals(Loading.LoggingIn, uiStates.awaitItem().loginState)
             assertEquals(Success, uiStates.awaitItem().loginState)
-            assertEquals(LoginViewAction.NavigateToConnect, sideEffects.awaitItem())
+            assertEquals(LoginUiSideEffect.NavigateToConnect, sideEffects.awaitItem())
         }
     }
 
@@ -111,7 +111,7 @@ class LoginViewModelTest {
         turbineScope {
             // Arrange
             val uiStates = loginViewModel.uiState.testIn(backgroundScope)
-            val sideEffects = loginViewModel.viewActions.testIn(backgroundScope)
+            val sideEffects = loginViewModel.uiSideEffect.testIn(backgroundScope)
             coEvery {
                 mockedDeviceRepository.refreshAndAwaitDeviceListWithTimeout(
                     any(),
@@ -127,7 +127,7 @@ class LoginViewModelTest {
             loginViewModel.login(DUMMY_ACCOUNT_TOKEN)
             assertEquals(Loading.LoggingIn, uiStates.awaitItem().loginState)
             assertEquals(
-                LoginViewAction.TooManyDevices(AccountToken(DUMMY_ACCOUNT_TOKEN)),
+                LoginUiSideEffect.TooManyDevices(AccountToken(DUMMY_ACCOUNT_TOKEN)),
                 sideEffects.awaitItem()
             )
         }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt
index b12c0382a5..5f81032938 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/OutOfTimeViewModelTest.kt
@@ -88,10 +88,10 @@ class OutOfTimeViewModelTest {
             coEvery { mockAuthTokenCache.fetchAuthToken() } returns mockToken
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 viewModel.onSitePaymentClick()
                 val action = awaitItem()
-                assertIs<OutOfTimeViewModel.ViewAction.OpenAccountView>(action)
+                assertIs<OutOfTimeViewModel.UiSideEffect.OpenAccountView>(action)
                 assertEquals(mockToken, action.token)
             }
         }
@@ -121,10 +121,10 @@ class OutOfTimeViewModelTest {
             every { mockExpiryDate.isAfter(any<ReadableInstant>()) } returns true
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 accountExpiryState.value = AccountExpiry.Available(mockExpiryDate)
                 val action = awaitItem()
-                assertIs<OutOfTimeViewModel.ViewAction.OpenConnectScreen>(action)
+                assertIs<OutOfTimeViewModel.UiSideEffect.OpenConnectScreen>(action)
             }
         }
 
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
index 1c61b11505..52713c0b0d 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
@@ -95,10 +95,10 @@ class WelcomeViewModelTest {
             coEvery { mockAuthTokenCache.fetchAuthToken() } returns mockToken
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 viewModel.onSitePaymentClick()
                 val action = awaitItem()
-                assertIs<WelcomeViewModel.ViewAction.OpenAccountView>(action)
+                assertIs<WelcomeViewModel.UiSideEffect.OpenAccountView>(action)
                 assertEquals(mockToken, action.token)
             }
         }
@@ -151,10 +151,10 @@ class WelcomeViewModelTest {
             every { mockExpiryDate.isAfter(any<ReadableInstant>()) } returns true
 
             // Act, Assert
-            viewModel.viewActions.test {
+            viewModel.uiSideEffect.test {
                 accountExpiryState.value = AccountExpiry.Available(mockExpiryDate)
                 val action = awaitItem()
-                assertIs<WelcomeViewModel.ViewAction.OpenConnectScreen>(action)
+                assertIs<WelcomeViewModel.UiSideEffect.OpenConnectScreen>(action)
             }
         }