summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-10-30 13:18:21 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-10-30 13:18:21 +0100
commitbef0b156b6ec8c8f7ccad3eee81c20606039dae0 (patch)
treede3ba986ea2fa18268881f5de42874af999bf7ee /android
parent5d7ff54eef32c43e43f531d08baa4de3c5f8219a (diff)
parent64ba1a8775e9c29b3972f208ed0fc8549c00c397 (diff)
downloadmullvadvpn-bef0b156b6ec8c8f7ccad3eee81c20606039dae0.tar.xz
mullvadvpn-bef0b156b6ec8c8f7ccad3eee81c20606039dae0.zip
Merge branch 'success-state-on-login-shows-wrong-subtitle-droid-447'
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
index 8f27cf9ebe..fe951fe878 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
@@ -304,8 +304,8 @@ private fun LoginState.supportingText(): String? {
}
}
is Loading.CreatingAccount -> R.string.creating_new_account
- is Loading.LoggingIn,
- Success -> R.string.logging_in_description
+ is Loading.LoggingIn -> R.string.logging_in_description
+ Success -> R.string.logged_in_description
}
return stringResource(id = res)
}