2 files changed, 8 insertions, 2 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt
index a91ce46148..f856ef8c89 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt
@@ -7,7 +7,7 @@ import org.joda.time.DateTime
 sealed class AccountExpiry : Parcelable {
     @Parcelize data class Available(val expiryDateTime: DateTime) : AccountExpiry()
 
-    @Parcelize object Missing : AccountExpiry()
+    @Parcelize data object Missing : AccountExpiry()
 
     fun date(): DateTime? {
         return (this as? Available)?.expiryDateTime
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt
index 440d03de55..2af9b01362 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt
@@ -19,10 +19,16 @@ sealed class DeviceState : Parcelable {
     }
 
     fun deviceName(): String? {
-        return (this as? LoggedIn)?.accountAndDevice?.device?.name
+        return (this as? LoggedIn)?.accountAndDevice?.device?.name?.capitalizeFirstCharOfEachWord()
     }
 
     fun token(): String? {
         return (this as? LoggedIn)?.accountAndDevice?.account_token
     }
 }
+
+private fun String.capitalizeFirstCharOfEachWord(): String {
+    return split(" ")
+        .joinToString(" ") { word -> word.replaceFirstChar { firstChar -> firstChar.uppercase() } }
+        .trimEnd()
+}