From 0a9338724a22e8540e17f7502f4f2e52b25b1fab Mon Sep 17 00:00:00 2001
From: Ghenadie Vasiliev-Pusca <ghenadie.vasiliev-pusca@rdx.works>
Date: Sun, 23 Jul 2023 23:50:43 +0300
Subject: [PATCH] Persona details update

---
 .../ViewModifiers/TextStyleModifier.swift     |  2 +-
 .../EditPersonaEntries+View.swift             |  8 ++---
 .../PersonaDetails+View.swift                 | 31 +++++++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Sources/Core/DesignSystem/ViewModifiers/TextStyleModifier.swift b/Sources/Core/DesignSystem/ViewModifiers/TextStyleModifier.swift
index 60718049bf..2f39c9e8e0 100644
--- a/Sources/Core/DesignSystem/ViewModifiers/TextStyleModifier.swift
+++ b/Sources/Core/DesignSystem/ViewModifiers/TextStyleModifier.swift
@@ -64,7 +64,7 @@ extension View {
 extension Text {
 	/// Text formatted as a section heading
 	public var sectionHeading: some View {
-		textStyle(.body1Link)
+		textStyle(.body1Header)
 			.foregroundColor(.app.gray2)
 	}
 
diff --git a/Sources/Features/EditPersonaFeature/EditPersonaEntries+View.swift b/Sources/Features/EditPersonaFeature/EditPersonaEntries+View.swift
index fd239030f5..3efbfd04af 100644
--- a/Sources/Features/EditPersonaFeature/EditPersonaEntries+View.swift
+++ b/Sources/Features/EditPersonaFeature/EditPersonaEntries+View.swift
@@ -29,9 +29,9 @@ extension EditPersonaEntries {
 
 				IfLetStore(
 					store.scope(
-						state: \.emailAddress,
+						state: \.phoneNumber,
 						action: (/Action.child
-							.. EditPersonaEntries.ChildAction.emailAddress
+							.. EditPersonaEntries.ChildAction.phoneNumber
 						).embed
 					)
 				) { store in
@@ -44,9 +44,9 @@ extension EditPersonaEntries {
 
 				IfLetStore(
 					store.scope(
-						state: \.phoneNumber,
+						state: \.emailAddress,
 						action: (/Action.child
-							.. EditPersonaEntries.ChildAction.phoneNumber
+							.. EditPersonaEntries.ChildAction.emailAddress
 						).embed
 					)
 				) { store in
diff --git a/Sources/Features/PersonaDetailsFeature/PersonaDetails+View.swift b/Sources/Features/PersonaDetailsFeature/PersonaDetails+View.swift
index 040b15fe58..1f96a40fed 100644
--- a/Sources/Features/PersonaDetailsFeature/PersonaDetails+View.swift
+++ b/Sources/Features/PersonaDetailsFeature/PersonaDetails+View.swift
@@ -360,23 +360,28 @@ extension PersonaDetails.View {
 						}
 					}
 
-					Group {
-						if let fullName = viewStore.fullName {
-							VPair(
-								heading: "Full Name", // FIXME: Localize
-								item: fullName
-							)
-						}
+					if let fullName = viewStore.fullName {
+						VPair(
+							heading: "Full Name", // FIXME: Localize
+							item: fullName
+						)
+						Separator()
 					}
 
-					if let emailAddress = viewStore.emailAddresses?.first {
-						Text("Email").font(.app.sectionHeader)
-						VPair(heading: L10n.AuthorizedDapps.PersonaDetails.emailAddress, item: emailAddress)
+					if let phoneNumber = viewStore.phoneNumbers?.first {
+						VPair(
+							heading: L10n.AuthorizedDapps.PersonaDetails.phoneNumber,
+							item: phoneNumber
+						)
+						Separator()
 					}
 
-					if let phoneNumber = viewStore.phoneNumbers?.first {
-						Text("Phone number").font(.app.sectionHeader)
-						VPair(heading: L10n.AuthorizedDapps.PersonaDetails.phoneNumber, item: phoneNumber)
+					if let emailAddress = viewStore.emailAddresses?.first {
+						VPair(
+							heading: L10n.AuthorizedDapps.PersonaDetails.emailAddress,
+							item: emailAddress
+						)
+						Separator()
 					}
 				}
 				.padding(.horizontal, .medium1)