Update name to match server (#296)

projectNEWM · Jul 22, 2024 · e9d52fc · e9d52fc
1 parent daaee1b
commit e9d52fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/android/app-newm/src/main/java/io/newm/screens/profile/ProfileHeader.kt b/android/app-newm/src/main/java/io/newm/screens/profile/ProfileHeader.kt
@@ -17,7 +17,7 @@ fun ProfileHeader(
     lastName: String,
     email: String
 ) {
-    val fullName = if(firstName.isNotEmpty() || lastName.isNotEmpty()) "$firstName $lastName" else ""
+    val fullName = "${firstName.trim()} ${lastName.trim()}".trim()
 
     Text(
         modifier = Modifier

diff --git a/shared/src/commonMain/kotlin/io.newm.shared/public/models/User.kt b/shared/src/commonMain/kotlin/io.newm.shared/public/models/User.kt
@@ -63,8 +63,8 @@ data class User(
     val confirmPassword: String? = null
 )
 
-fun User.fullName(): String? {
-    return if(!firstName.isNullOrBlank() && !lastName.isNullOrBlank()) "$firstName $lastName" else null
+fun User.fullName(): String {
+    return "${firstName.orEmpty().trim()} ${lastName.orEmpty().trim()}".trim()
 }
 
 fun User.canEditName(): Boolean {