Nickname is not optional

Sources/Core/SharedModels/PreviewValues/Profile/Persona+PreviewValues.swift

@@ -44,7 +44,8 @@ extension Profile.Network.Persona {
 				value: .init(
 					variant: .western,
 					familyName: "Sanchez",
-					givenNames: "Rick"
+					givenNames: "Rick",
+					nickname: "Ricky"
 				)
 			)
 		)

Sources/Core/SharedTestingModels/TestVectorsSharedByMultipleTargets/profile_snapshot.json

@@ -697,6 +697,7 @@
 			  "value" : {
 				"familyName" : "Publicson",
 				"givenNames" : "Maria",
+                                "nickname" : "Publy",
 				"variant" : "western"
 			  }
 			},

Sources/Features/DebugInspectProfile/InspectProfile+View.swift

@@ -506,9 +506,7 @@ public struct DappAuthorizedPersonaView: IndentedView {
 				if let name = sharedPersonaData.name {
 					Text("Name")
 					Labeled("Given Names", value: name.value.givenNames)
-					if let nickname = name.value.nickname {
-						Labeled("Nickname", value: nickname)
-					}
+					Labeled("Nickname", value: name.value.nickname)
 					Labeled("Family Name", value: name.value.familyName)
 					Labeled("id", value: name.id)
 				}

Sources/Features/EditPersonaFeature/EditPersona.swift

@@ -19,7 +19,7 @@ extension EditPersona {
 					variant: $0.variant,
 					familyName: $0.family.input ?? "",
 					givenNames: $0.given.input ?? "",
-					nickname: $0.nickName.input
+					nickname: $0.nickName.input ?? ""
 				))
 			}
 
@@ -277,7 +277,7 @@ extension EditPersonaEntry<EditPersonaDynamicField>.State {
 
 extension EditPersonaEntry<EditPersonaName>.State {
 	static func entry(
-		name: PersonaData.Name = .init(variant: .western, familyName: "", givenNames: ""),
+		name: PersonaData.Name = .init(variant: .western, familyName: "", givenNames: "", nickname: ""),
 		isRequestedByDapp: Bool = false
 	) -> Self {
 		.init(

Sources/Profile/Entity/PersonaData/EntryKinds/Name/PersonaData+Name.swift

@@ -20,13 +20,13 @@ extension PersonaData {
 
 		public let givenNames: String
 
-		public let nickname: String?
+		public let nickname: String
 
 		public init(
 			variant: Variant,
 			familyName: String,
 			givenNames: String,
-			nickname: String? = nil
+			nickname: String
 		) {
 			self.variant = variant
 			self.familyName = familyName
@@ -35,13 +35,13 @@ extension PersonaData {
 		}
 
 		public var description: String {
-			let components: [String?] = {
+			let components: [String] = {
 				switch variant {
 				case .western: return [givenNames, nickname, familyName]
 				case .eastern: return [familyName, nickname, givenNames]
 				}
 			}()
-			return components.compactMap { $0 }.joined(separator: " ")
+			return components.joined(separator: " ")
 		}
 
 		public var formatted: String {
@@ -54,7 +54,7 @@ extension PersonaData {
 
 			let firstLine = components.joined(separator: " ")
 			return """
-			\(firstLine)\(nickname.map { "\n\($0)" } ?? "")
+			\(firstLine)"\n"\(nickname)
 			"""
 		}
 	}

Tests/Core/SharedModelsTests/DappModelsTests/DappModelsTests.swift

@@ -23,7 +23,7 @@ final class ToDappResponseTests: TestCase {
 						),
 					]),
 					oneTimePersonaData: .init(
-						name: .init(variant: .western, familyName: "Jackson", givenNames: "Percy"),
+						name: .init(variant: .western, familyName: "Jackson", givenNames: "Percy", nickname: "Percy J"),
 						emailAddresses: [.init(email: "lightningthief@olympus.lol")],
 						phoneNumbers: [.init(number: "555 5555")]
 					)
@@ -52,6 +52,7 @@ final class ToDappResponseTests: TestCase {
 						"name": [
 							"givenNames": "Percy",
 							"familyName": "Jackson",
+							"nickname": "Percy J",
 							"variant": "western",
 						],
 						"emailAddresses": [

Tests/ProfileTests/PersonaDataEntryTests.swift

@@ -39,13 +39,14 @@ final class PersonaFieldTests: TestCase {
 					value: .init(
 						variant: .eastern,
 						familyName: "Park",
-						givenNames: "Chan-wook"
+						givenNames: "Chan-wook",
+						nickname: "Wook"
 					)
 				)
 			)
 		}
 		let aName = try dappRequest(value: \.name, from: personaData)
-		XCTAssertEqual(aName.value.valueForDapp, "Park Chan-wook")
+		XCTAssertEqual(aName.value.valueForDapp, "Park Wook Chan-wook")
 	}
 
 	func test_email_addresses() throws {
@@ -149,7 +150,8 @@ final class PersonaFieldTests: TestCase {
 					value: .init(
 						variant: .western,
 						familyName: "Palme",
-						givenNames: "Olof"
+						givenNames: "Olof",
+						nickname: "Oly"
 					)
 				),
 				postalAddresses: [[

Tests/ProfileTests/ProfileTests.swift

@@ -325,7 +325,7 @@ final class ProfileTests: TestCase {
 			personaData: .init(
 				name: .init(
 					id: .init(uuidString: "00000000-0000-0000-0000-0000000000FF")!,
-					value: .init(variant: .western, familyName: "Publicson", givenNames: "Maria")
+					value: .init(variant: .western, familyName: "Publicson", givenNames: "Maria", nickname: "Publy")
 				)
 			)
 		)