From 8aae1b2020680b17888ca67be16a338658607ab6 Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Wed, 8 Nov 2023 22:01:10 +0100
Subject: [PATCH] Edit native contact test

---
 Linphone.xcodeproj/project.pbxproj            |   4 +
 Linphone/Contacts/ContactsManager.swift       |  43 +-
 Linphone/Localizable.xcstrings                |   3 +
 .../Contacts/Fragments/ContactFragment.swift  |   6 +-
 .../ContactInnerActionsFragment.swift         | 455 ++++++++++++++++++
 .../Fragments/ContactInnerFragment.swift      | 433 ++---------------
 .../Fragments/ContactsListBottomSheet.swift   |   6 +-
 .../Fragments/EditContactFragment.swift       |  19 +-
 Linphone/UI/Main/ContentView.swift            |  13 +-
 Linphone/Utils/EditContactController.swift    |   2 +-
 10 files changed, 551 insertions(+), 433 deletions(-)
 create mode 100644 Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift

diff --git a/Linphone.xcodeproj/project.pbxproj b/Linphone.xcodeproj/project.pbxproj
index d04b4595f..565fc4601 100644
--- a/Linphone.xcodeproj/project.pbxproj
+++ b/Linphone.xcodeproj/project.pbxproj
@@ -51,6 +51,7 @@
 		D7C3650C2AF0084000FE6142 /* EditContactViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C3650B2AF0084000FE6142 /* EditContactViewModel.swift */; };
 		D7C3650E2AF15BF200FE6142 /* PhotoPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C3650D2AF15BF200FE6142 /* PhotoPicker.swift */; };
 		D7C48DF42AFA66F900D938CB /* EditContactController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C48DF32AFA66F900D938CB /* EditContactController.swift */; };
+		D7C48DF62AFCDF4700D938CB /* ContactInnerActionsFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C48DF52AFCDF4700D938CB /* ContactInnerActionsFragment.swift */; };
 		D7D1698C2AE66FA500109A5C /* MagicSearchSingleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7D1698B2AE66FA500109A5C /* MagicSearchSingleton.swift */; };
 		D7D24D132AC1B4E800C6F35B /* NotoSans-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7D24D0D2AC1B4E800C6F35B /* NotoSans-Medium.ttf */; };
 		D7D24D142AC1B4E800C6F35B /* NotoSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7D24D0E2AC1B4E800C6F35B /* NotoSans-Regular.ttf */; };
@@ -118,6 +119,7 @@
 		D7C3650B2AF0084000FE6142 /* EditContactViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditContactViewModel.swift; sourceTree = "<group>"; };
 		D7C3650D2AF15BF200FE6142 /* PhotoPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPicker.swift; sourceTree = "<group>"; };
 		D7C48DF32AFA66F900D938CB /* EditContactController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditContactController.swift; sourceTree = "<group>"; };
+		D7C48DF52AFCDF4700D938CB /* ContactInnerActionsFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactInnerActionsFragment.swift; sourceTree = "<group>"; };
 		D7D1698B2AE66FA500109A5C /* MagicSearchSingleton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicSearchSingleton.swift; sourceTree = "<group>"; };
 		D7D24D0D2AC1B4E800C6F35B /* NotoSans-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSans-Medium.ttf"; sourceTree = "<group>"; };
 		D7D24D0E2AC1B4E800C6F35B /* NotoSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSans-Regular.ttf"; sourceTree = "<group>"; };
@@ -342,6 +344,7 @@
 				D7B5066C2AEFA9B900CEB4E9 /* ContactInnerFragment.swift */,
 				D7C365072AEFAB7F00FE6142 /* ContactListBottomSheet.swift */,
 				D7C365092AF001C300FE6142 /* EditContactFragment.swift */,
+				D7C48DF52AFCDF4700D938CB /* ContactInnerActionsFragment.swift */,
 			);
 			path = Fragments;
 			sourceTree = "<group>";
@@ -588,6 +591,7 @@
 				D7E6D0552AEBFCCE00A57AAF /* ContactsInnerFragment.swift in Sources */,
 				D72343362AD037AF009AA24E /* ToastView.swift in Sources */,
 				D7FB55112AD447FD00A5AB15 /* RegisterFragment.swift in Sources */,
+				D7C48DF62AFCDF4700D938CB /* ContactInnerActionsFragment.swift in Sources */,
 				D72343322ACEFF58009AA24E /* QRScannerController.swift in Sources */,
 				D72343342ACEFFC3009AA24E /* QRScanner.swift in Sources */,
 				D72343302ACEFEF8009AA24E /* QrCodeScannerFragment.swift in Sources */,
diff --git a/Linphone/Contacts/ContactsManager.swift b/Linphone/Contacts/ContactsManager.swift
index 981bd7c6f..29506bbd5 100644
--- a/Linphone/Contacts/ContactsManager.swift
+++ b/Linphone/Contacts/ContactsManager.swift
@@ -95,6 +95,7 @@ final class ContactsManager: ObservableObject {
 			}
 			
 			let store = CNContactStore()
+            
 			store.requestAccess(for: .contacts) { (granted, error) in
 				if let error = error {
 					print("failed to request access", error)
@@ -105,7 +106,7 @@ final class ContactsManager: ObservableObject {
 								CNContactFamilyNameKey, CNContactGivenNameKey, CNContactNicknameKey,
 								CNContactPostalAddressesKey, CNContactIdentifierKey,
 								CNInstantMessageAddressUsernameKey, CNContactInstantMessageAddressesKey,
-								CNContactImageDataKey, CNContactThumbnailImageDataKey, CNContactOrganizationNameKey]
+								CNContactOrganizationNameKey, CNContactImageDataAvailableKey, CNContactImageDataKey, CNContactThumbnailImageDataKey]
 					let request = CNContactFetchRequest(keysToFetch: keys as [CNKeyDescriptor])
 					do {
 						try store.enumerateContacts(with: request, usingBlock: { (contact, _) in
@@ -289,46 +290,6 @@ final class ContactsManager: ObservableObject {
 		}
 	}
 	
-	func getCNContact(friend: Friend, completion: @escaping (CNContact?) -> Void) {
-		DispatchQueue.global().async {
-			let store = CNContactStore()
-			store.requestAccess(for: .contacts) { (granted, error) in
-				if let error = error {
-					print("failed to request access", error)
-					return
-				}
-				if granted {
-					let keys = [CNContactEmailAddressesKey, CNContactPhoneNumbersKey,
-								CNContactFamilyNameKey, CNContactGivenNameKey, CNContactNicknameKey,
-								CNContactPostalAddressesKey, CNContactIdentifierKey,
-								CNInstantMessageAddressUsernameKey, CNContactInstantMessageAddressesKey,
-								CNContactImageDataKey, CNContactThumbnailImageDataKey, CNContactOrganizationNameKey]
-					let request = CNContactFetchRequest(keysToFetch: keys as [CNKeyDescriptor])
-					do {
-						try store.enumerateContacts(with: request, usingBlock: { (contact, _) in
-							if contact.identifier == friend.nativeUri {
-								var contactFetched = contact
-								if !contactFetched.areKeysAvailable([CNContactViewController.descriptorForRequiredKeys()]) {
-									do {
-										contactFetched = try store.unifiedContact(withIdentifier: contact.identifier, keysToFetch: [CNContactViewController.descriptorForRequiredKeys()])
-										completion(contactFetched)
-									}
-									catch {
-										completion(nil)
-									}
-								}
-							}
-						})
-					} catch let error {
-						print("Failed to enumerate contact", error)
-					}
-				} else {
-					print("access denied")
-				}
-			}
-		}
-	}
-	
 	func getFriend(contact: Contact) -> Friend? {
 		if friendList != nil {
 			let friend = friendList!.friends.first(where: {$0.nativeUri == contact.identifier})
diff --git a/Linphone/Localizable.xcstrings b/Linphone/Localizable.xcstrings
index 2742080e2..0062a8ce1 100644
--- a/Linphone/Localizable.xcstrings
+++ b/Linphone/Localizable.xcstrings
@@ -3,6 +3,9 @@
   "strings" : {
     "" : {
 
+    },
+    " " : {
+
     },
     " et " : {
 
diff --git a/Linphone/UI/Main/Contacts/Fragments/ContactFragment.swift b/Linphone/UI/Main/Contacts/Fragments/ContactFragment.swift
index 02d537c6f..aa8a09228 100644
--- a/Linphone/UI/Main/Contacts/Fragments/ContactFragment.swift
+++ b/Linphone/UI/Main/Contacts/Fragments/ContactFragment.swift
@@ -18,6 +18,7 @@
  */
 
 import SwiftUI
+import Contacts
 
 struct ContactFragment: View {
 	
@@ -37,7 +38,8 @@ struct ContactFragment: View {
 				ContactInnerFragment(
 					contactViewModel: contactViewModel,
 					editContactViewModel: editContactViewModel,
-					isShowDeletePopup: $isShowDeletePopup,
+                    cnContact: CNContact(),
+                    isShowDeletePopup: $isShowDeletePopup,
 					showingSheet: $showingSheet,
 					isShowDismissPopup: $isShowDismissPopup
 				)
@@ -49,6 +51,7 @@ struct ContactFragment: View {
 				ContactInnerFragment(
 					contactViewModel: contactViewModel,
 					editContactViewModel: editContactViewModel,
+                    cnContact: CNContact(),
 					isShowDeletePopup: $isShowDeletePopup,
 					showingSheet: $showingSheet,
 					isShowDismissPopup: $isShowDismissPopup
@@ -61,6 +64,7 @@ struct ContactFragment: View {
 			ContactInnerFragment(
 				contactViewModel: contactViewModel,
 				editContactViewModel: editContactViewModel,
+                cnContact: CNContact(),
 				isShowDeletePopup: $isShowDeletePopup,
 				showingSheet: $showingSheet,
 				isShowDismissPopup: $isShowDismissPopup
diff --git a/Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift b/Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift
new file mode 100644
index 000000000..23eb79e93
--- /dev/null
+++ b/Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift
@@ -0,0 +1,455 @@
+//
+//  ContactInnerActionsFragment.swift
+//  Linphone
+//
+//  Created by Benoît Martins on 09/11/2023.
+//
+
+import SwiftUI
+
+struct ContactInnerActionsFragment: View {
+	
+	@ObservedObject var magicSearch = MagicSearchSingleton.shared
+	@ObservedObject var contactViewModel: ContactViewModel
+	@ObservedObject var editContactViewModel: EditContactViewModel
+	
+	@State private var informationIsOpen = true
+	
+	@Binding var showingSheet: Bool
+	@Binding var isShowDeletePopup: Bool
+	@Binding var isShowDismissPopup: Bool
+	
+	var actionEditButton: () -> Void
+	
+    var body: some View {
+		HStack(alignment: .center) {
+			Text("Information")
+				.default_text_style_800(styleSize: 16)
+			
+			Spacer()
+			
+			Image(informationIsOpen ? "caret-up" : "caret-down")
+				.renderingMode(.template)
+				.resizable()
+				.foregroundStyle(Color.grayMain2c600)
+				.frame(width: 25, height: 25, alignment: .leading)
+		}
+		.padding(.top, 30)
+		.padding(.bottom, 10)
+		.padding(.horizontal, 16)
+		.background(Color.gray100)
+		.onTapGesture {
+			withAnimation {
+				informationIsOpen.toggle()
+			}
+		}
+		
+		if informationIsOpen {
+			VStack(spacing: 0) {
+				if contactViewModel.indexDisplayedFriend != nil && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil {
+					ForEach(0..<magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses.count, id: \.self) { index in
+						Button {
+						} label: {
+							HStack {
+								VStack {
+									Text("SIP address :")
+										.default_text_style_700(styleSize: 14)
+										.frame(maxWidth: .infinity, alignment: .leading)
+									Text(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses[index].asStringUriOnly().dropFirst(4))
+										.default_text_style(styleSize: 14)
+										.frame(maxWidth: .infinity, alignment: .leading)
+										.lineLimit(1)
+										.fixedSize(horizontal: false, vertical: true)
+								}
+								Spacer()
+								
+								Image("phone")
+									.renderingMode(.template)
+									.resizable()
+									.foregroundStyle(Color.grayMain2c600)
+									.frame(width: 25, height: 25)
+									.onTapGesture {
+										withAnimation {
+											
+										}
+									}
+							}
+							.padding(.vertical, 15)
+							.padding(.horizontal, 20)
+						}
+						.simultaneousGesture(
+							LongPressGesture()
+								.onEnded { _ in
+									contactViewModel.stringToCopy = magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses[index].asStringUriOnly()
+									showingSheet.toggle()
+								}
+						)
+						.highPriorityGesture(
+							TapGesture()
+								.onEnded { _ in
+									withAnimation {
+										
+									}
+								}
+						)
+						
+						if !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbers.isEmpty
+							|| index < magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses.count - 1 {
+							VStack {
+								Divider()
+							}
+							.padding(.horizontal)
+						}
+					}
+					
+					ForEach(0..<magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbers.count, id: \.self) { index in
+						Button {
+						} label: {
+							HStack {
+								VStack {
+									if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].label != nil
+										&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].label!.isEmpty {
+										Text("Phone (\(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].label!)) :")
+											.default_text_style_700(styleSize: 14)
+											.frame(maxWidth: .infinity, alignment: .leading)
+									} else {
+										Text("Phone :")
+											.default_text_style_700(styleSize: 14)
+											.frame(maxWidth: .infinity, alignment: .leading)
+									}
+									Text(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].phoneNumber)
+										.default_text_style(styleSize: 14)
+										.frame(maxWidth: .infinity, alignment: .leading)
+										.lineLimit(1)
+										.fixedSize(horizontal: false, vertical: true)
+								}
+								Spacer()
+								
+								Image("phone")
+									.renderingMode(.template)
+									.resizable()
+									.foregroundStyle(Color.grayMain2c600)
+									.frame(width: 25, height: 25)
+									.onTapGesture {
+										withAnimation {
+											
+										}
+									}
+							}
+							.padding(.vertical, 15)
+							.padding(.horizontal, 20)
+						}
+						.simultaneousGesture(
+							LongPressGesture()
+								.onEnded { _ in
+									contactViewModel.stringToCopy = 
+									magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].phoneNumber
+									showingSheet.toggle()
+								}
+						)
+						.highPriorityGesture(
+							TapGesture()
+								.onEnded { _ in
+									withAnimation {
+										
+									}
+								}
+						)
+						
+						if index < magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbers.count - 1 {
+							VStack {
+								Divider()
+							}
+							.padding(.horizontal)
+						}
+					}
+				}
+			}
+			.background(.white)
+			.cornerRadius(15)
+			.padding(.horizontal)
+			.zIndex(-1)
+			.transition(.move(edge: .top))
+		}
+		
+		if contactViewModel.indexDisplayedFriend != nil
+			&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
+			&& ((magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization != nil
+				 && !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization!.isEmpty)
+				|| (magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle != nil
+					&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle!.isEmpty)) {
+			VStack {
+				if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization != nil
+					&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization!.isEmpty {
+					Text("**Company :** \(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization!)")
+						.default_text_style(styleSize: 14)
+						.padding(.vertical, 15)
+						.padding(.horizontal, 20)
+						.frame(maxWidth: .infinity, alignment: .leading)
+				}
+				
+				if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle != nil
+					&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle!.isEmpty {
+					Text("**Job :** \(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle!)")
+						.default_text_style(styleSize: 14)
+						.padding(.vertical, 15)
+						.padding(.horizontal, 20)
+						.frame(maxWidth: .infinity, alignment: .leading)
+				}
+			}
+			.background(.white)
+			.cornerRadius(15)
+			.padding(.top)
+			.padding(.horizontal)
+			.zIndex(-1)
+			.transition(.move(edge: .top))
+		}
+		
+		// TODO Trust Fragment
+		
+		// TODO Medias Fragment
+		
+		HStack(alignment: .center) {
+			Text("Other actions")
+				.default_text_style_800(styleSize: 16)
+			
+			Spacer()
+		}
+		.padding(.vertical, 10)
+		.padding(.horizontal, 16)
+		.background(Color.gray100)
+		
+		VStack(spacing: 0) {
+			if contactViewModel.indexDisplayedFriend != nil && contactViewModel.indexDisplayedFriend! < magicSearch.lastSearch.count
+				&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
+				&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.nativeUri != nil
+				&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.nativeUri!.isEmpty {
+				Button {
+					actionEditButton()
+				} label: {
+					HStack {
+						Image("pencil-simple")
+							.renderingMode(.template)
+							.resizable()
+							.foregroundStyle(Color.grayMain2c600)
+							.frame(width: 25, height: 25)
+						
+						Text("Edit")
+							.default_text_style(styleSize: 14)
+							.frame(maxWidth: .infinity, alignment: .leading)
+							.lineLimit(1)
+							.fixedSize(horizontal: false, vertical: true)
+						Spacer()
+					}
+					.padding(.vertical, 15)
+					.padding(.horizontal, 20)
+				}
+			} else {
+				NavigationLink(destination: EditContactFragment(
+						editContactViewModel: editContactViewModel,
+						isShowEditContactFragment: .constant(false),
+						isShowDismissPopup: $isShowDismissPopup)) {
+						HStack {
+							Image("pencil-simple")
+								.renderingMode(.template)
+								.resizable()
+								.foregroundStyle(Color.grayMain2c600)
+								.frame(width: 25, height: 25)
+							
+							Text("Edit")
+								.default_text_style(styleSize: 14)
+								.frame(maxWidth: .infinity, alignment: .leading)
+								.lineLimit(1)
+								.fixedSize(horizontal: false, vertical: true)
+							Spacer()
+						}
+						.padding(.vertical, 15)
+						.padding(.horizontal, 20)
+				}
+				.simultaneousGesture(
+					TapGesture().onEnded {
+						editContactViewModel.selectedEditFriend = magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend
+						editContactViewModel.resetValues()
+					}
+				)
+			}
+			/*
+			Button {
+			} label: {
+				HStack {
+					Image("pencil-simple")
+						.renderingMode(.template)
+						.resizable()
+						.foregroundStyle(Color.grayMain2c600)
+						.frame(width: 25, height: 25)
+					
+					Text("Edit")
+						.default_text_style(styleSize: 14)
+						.frame(maxWidth: .infinity, alignment: .leading)
+						.lineLimit(1)
+						.fixedSize(horizontal: false, vertical: true)
+					Spacer()
+				}
+				.padding(.vertical, 15)
+				.padding(.horizontal, 20)
+			}
+			 */
+			
+			VStack {
+				Divider()
+			}
+			.padding(.horizontal)
+			
+			Button {
+				if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil {
+					contactViewModel.objectWillChange.send()
+					magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred.toggle()
+				}
+			} label: {
+				HStack {
+					Image(contactViewModel.indexDisplayedFriend != nil && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
+						  && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred == true ? "heart-fill" : "heart")
+					.renderingMode(.template)
+					.resizable()
+					.foregroundStyle(contactViewModel.indexDisplayedFriend != nil && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
+									 && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred == true ? Color.redDanger500 : Color.grayMain2c500)
+					.frame(width: 25, height: 25)
+					Text(contactViewModel.indexDisplayedFriend != nil
+						 && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
+						 && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred == true
+						 ? "Remove from favourites"
+						 : "Add to favourites")
+					.default_text_style(styleSize: 14)
+					.frame(maxWidth: .infinity, alignment: .leading)
+					.lineLimit(1)
+					.fixedSize(horizontal: false, vertical: true)
+					Spacer()
+				}
+				.padding(.vertical, 15)
+				.padding(.horizontal, 20)
+			}
+			
+			VStack {
+				Divider()
+			}
+			.padding(.horizontal)
+			
+			Button {
+			} label: {
+				HStack {
+					Image("share-network")
+						.renderingMode(.template)
+						.resizable()
+						.foregroundStyle(Color.grayMain2c600)
+						.frame(width: 25, height: 25)
+					
+					Text("Share")
+						.default_text_style(styleSize: 14)
+						.frame(maxWidth: .infinity, alignment: .leading)
+						.lineLimit(1)
+						.fixedSize(horizontal: false, vertical: true)
+					Spacer()
+				}
+				.padding(.vertical, 15)
+				.padding(.horizontal, 20)
+			}
+			
+			VStack {
+				Divider()
+			}
+			.padding(.horizontal)
+			
+			/*
+			 Button {
+			 } label: {
+			 HStack {
+			 Image("bell-simple-slash")
+			 .renderingMode(.template)
+			 .resizable()
+			 .foregroundStyle(Color.grayMain2c600)
+			 .frame(width: 25, height: 25)
+			 
+			 Text("Mute")
+			 .default_text_style(styleSize: 14)
+			 .frame(maxWidth: .infinity, alignment: .leading)
+			 .lineLimit(1)
+			 .fixedSize(horizontal: false, vertical: true)
+			 Spacer()
+			 }
+			 .padding(.vertical, 15)
+			 .padding(.horizontal, 20)
+			 }
+			 
+			 VStack {
+			 Divider()
+			 }
+			 .padding(.horizontal)
+			 
+			 Button {
+			 } label: {
+			 HStack {
+			 Image("x-circle")
+			 .renderingMode(.template)
+			 .resizable()
+			 .foregroundStyle(Color.grayMain2c600)
+			 .frame(width: 25, height: 25)
+			 
+			 Text("Block")
+			 .default_text_style(styleSize: 14)
+			 .frame(maxWidth: .infinity, alignment: .leading)
+			 .lineLimit(1)
+			 .fixedSize(horizontal: false, vertical: true)
+			 Spacer()
+			 }
+			 .padding(.vertical, 15)
+			 .padding(.horizontal, 20)
+			 }
+			 
+			 VStack {
+			 Divider()
+			 }
+			 .padding(.horizontal)
+			 */
+			
+			Button {
+				if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil {
+					isShowDeletePopup.toggle()
+				}
+			} label: {
+				HStack {
+					Image("trash-simple")
+						.renderingMode(.template)
+						.resizable()
+						.foregroundStyle(Color.redDanger500)
+						.frame(width: 25, height: 25)
+					
+					Text("Delete this contact")
+						.foregroundStyle(Color.redDanger500)
+						.default_text_style(styleSize: 14)
+						.frame(maxWidth: .infinity, alignment: .leading)
+						.lineLimit(1)
+						.fixedSize(horizontal: false, vertical: true)
+					Spacer()
+				}
+				.padding(.vertical, 15)
+				.padding(.horizontal, 20)
+			}
+		}
+		.background(.white)
+		.cornerRadius(15)
+		.padding(.horizontal)
+		.zIndex(-1)
+		.transition(.move(edge: .top))
+    }
+}
+
+#Preview {
+	ContactInnerActionsFragment(
+		contactViewModel: ContactViewModel(),
+		editContactViewModel: EditContactViewModel(),
+		showingSheet: .constant(false),
+		isShowDeletePopup: .constant(false),
+		isShowDismissPopup: .constant(false),
+		actionEditButton: {}
+	)
+}
diff --git a/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift b/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift
index 3823d44df..1a72c7c53 100644
--- a/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift
+++ b/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift
@@ -19,20 +19,21 @@
 
 import SwiftUI
 import Contacts
+import ContactsUI
 
 struct ContactInnerFragment: View {
 	
 	@ObservedObject private var sharedMainViewModel = SharedMainViewModel()
 	
+	@ObservedObject var magicSearch = MagicSearchSingleton.shared
+	
 	@ObservedObject var contactViewModel: ContactViewModel
 	@ObservedObject var editContactViewModel: EditContactViewModel
-	@ObservedObject var magicSearch = MagicSearchSingleton.shared
 	
 	@State private var orientation = UIDevice.current.orientation
 	
-	@State private var informationIsOpen = true
 	@State private var presentingEditContact = false
-	@State private var cnContact: CNContact?
+	@State var cnContact: CNContact?
 	
 	@Binding var isShowDeletePopup: Bool
 	@Binding var showingSheet: Bool
@@ -63,16 +64,12 @@ struct ContactInnerFragment: View {
 					}
 					
 					Spacer()
-					if contactViewModel.indexDisplayedFriend != nil
+					if contactViewModel.indexDisplayedFriend != nil && contactViewModel.indexDisplayedFriend! < magicSearch.lastSearch.count
 						&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
-						&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.nativeUri != nil && !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.nativeUri!.isEmpty {
+						&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.nativeUri != nil
+						&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.nativeUri!.isEmpty {
 						Button(action: {
-							ContactsManager.shared.getCNContact(friend: magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!) { result in
-								cnContact = result
-								if cnContact != nil {
-									presentingEditContact.toggle()
-								}
-							}
+							editNativeContact()
 						}, label: {
 							Image("pencil-simple")
 								.renderingMode(.template)
@@ -82,7 +79,10 @@ struct ContactInnerFragment: View {
 								.padding(.top, 2)
 						})
 					} else {
-						NavigationLink(destination: EditContactFragment(editContactViewModel: editContactViewModel, isShowEditContactFragment: .constant(false), isShowDismissPopup: $isShowDismissPopup)) {
+						NavigationLink(destination: EditContactFragment(
+							editContactViewModel: editContactViewModel,
+							isShowEditContactFragment: .constant(false),
+							isShowDismissPopup: $isShowDismissPopup)) {
 							Image("pencil-simple")
 								.renderingMode(.template)
 								.resizable()
@@ -108,11 +108,13 @@ struct ContactInnerFragment: View {
 					VStack(spacing: 0) {
 						VStack(spacing: 0) {
 							VStack(spacing: 0) {
-								if contactViewModel.indexDisplayedFriend != nil  
+								if contactViewModel.indexDisplayedFriend != nil && contactViewModel.indexDisplayedFriend! < magicSearch.lastSearch.count
 									&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
 									&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.photo != nil
 									&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.photo!.isEmpty {
-									AsyncImage(url: ContactsManager.shared.getImagePath(friendPhotoPath: magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.photo!)) { image in
+									AsyncImage(
+										url: ContactsManager.shared.getImagePath(
+										friendPhotoPath: magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.photo!)) { image in
 										switch image {
 										case .empty:
 											ProgressView()
@@ -246,367 +248,15 @@ struct ContactInnerFragment: View {
 							.padding(.top, 20)
 							.frame(maxWidth: .infinity)
 							.background(Color.gray100)
-							
-							HStack(alignment: .center) {
-								Text("Information")
-									.default_text_style_800(styleSize: 16)
-								
-								Spacer()
-								
-								Image(informationIsOpen ? "caret-up" : "caret-down")
-									.renderingMode(.template)
-									.resizable()
-									.foregroundStyle(Color.grayMain2c600)
-									.frame(width: 25, height: 25, alignment: .leading)
-							}
-							.padding(.top, 30)
-							.padding(.bottom, 10)
-							.padding(.horizontal, 16)
-							.background(Color.gray100)
-							.onTapGesture {
-								withAnimation {
-									informationIsOpen.toggle()
-								}
-							}
-							
-							if informationIsOpen {
-								VStack(spacing: 0) {
-									if contactViewModel.indexDisplayedFriend != nil && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil {
-										ForEach(0..<magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses.count, id: \.self) { index in
-											Button {
-											} label: {
-												HStack {
-													VStack {
-														Text("SIP address :")
-															.default_text_style_700(styleSize: 14)
-															.frame(maxWidth: .infinity, alignment: .leading)
-														Text(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses[index].asStringUriOnly().dropFirst(4))
-															.default_text_style(styleSize: 14)
-															.frame(maxWidth: .infinity, alignment: .leading)
-															.lineLimit(1)
-															.fixedSize(horizontal: false, vertical: true)
-													}
-													Spacer()
-													
-													Image("phone")
-														.renderingMode(.template)
-														.resizable()
-														.foregroundStyle(Color.grayMain2c600)
-														.frame(width: 25, height: 25)
-														.onTapGesture {
-															withAnimation {
-																
-															}
-														}
-												}
-												.padding(.vertical, 15)
-												.padding(.horizontal, 20)
-											}
-											.simultaneousGesture(
-												LongPressGesture()
-													.onEnded { _ in
-														contactViewModel.stringToCopy = magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses[index].asStringUriOnly()
-														showingSheet.toggle()
-													}
-											)
-											.highPriorityGesture(
-												TapGesture()
-													.onEnded { _ in
-														withAnimation {
-															
-														}
-													}
-											)
-											
-											if !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbers.isEmpty 
-												|| index < magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.addresses.count - 1 {
-												VStack {
-													Divider()
-												}
-												.padding(.horizontal)
-											}
-										}
-										
-										ForEach(0..<magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbers.count, id: \.self) { index in
-											Button {
-											} label: {
-												HStack {
-													VStack {
-														if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].label != nil 
-															&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].label!.isEmpty {
-															Text("Phone (\(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].label!)) :")
-																.default_text_style_700(styleSize: 14)
-																.frame(maxWidth: .infinity, alignment: .leading)
-														} else {
-															Text("Phone :")
-															 .default_text_style_700(styleSize: 14)
-															 .frame(maxWidth: .infinity, alignment: .leading)
-														}
-														Text(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].phoneNumber)
-															.default_text_style(styleSize: 14)
-															.frame(maxWidth: .infinity, alignment: .leading)
-															.lineLimit(1)
-															.fixedSize(horizontal: false, vertical: true)
-													}
-													Spacer()
-													
-													Image("phone")
-														.renderingMode(.template)
-														.resizable()
-														.foregroundStyle(Color.grayMain2c600)
-														.frame(width: 25, height: 25)
-														.onTapGesture {
-															withAnimation {
-																
-															}
-														}
-												}
-												.padding(.vertical, 15)
-												.padding(.horizontal, 20)
-											}
-											.simultaneousGesture(
-												LongPressGesture()
-													.onEnded { _ in
-														contactViewModel.stringToCopy = magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbersWithLabel[index].phoneNumber
-														showingSheet.toggle()
-													}
-											)
-											.highPriorityGesture(
-												TapGesture()
-													.onEnded { _ in
-														withAnimation {
-															
-														}
-													}
-											)
-											
-											if index < magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.phoneNumbers.count - 1 {
-												VStack {
-													Divider()
-												}
-												.padding(.horizontal)
-											}
-										}
-									}
-								}
-								.background(.white)
-								.cornerRadius(15)
-								.padding(.horizontal)
-								.zIndex(-1)
-								.transition(.move(edge: .top))
-							}
-							
-							if contactViewModel.indexDisplayedFriend != nil
-								&& magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
-								&& ((magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization != nil
-									 && !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization!.isEmpty) 
-									|| (magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle != nil
-																									  && !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle!.isEmpty)) {
-								VStack {
-									if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization != nil 
-										&& !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization!.isEmpty {
-										Text("**Company :** \(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.organization!)")
-											.default_text_style(styleSize: 14)
-											.padding(.vertical, 15)
-											.padding(.horizontal, 20)
-											.frame(maxWidth: .infinity, alignment: .leading)
-									}
-									
-									if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle != nil && !magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle!.isEmpty {
-										Text("**Job :** \(magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.jobTitle!)")
-											.default_text_style(styleSize: 14)
-											.padding(.vertical, 15)
-											.padding(.horizontal, 20)
-											.frame(maxWidth: .infinity, alignment: .leading)
-									}
-								}
-								.background(.white)
-								.cornerRadius(15)
-								.padding(.top)
-								.padding(.horizontal)
-								.zIndex(-1)
-								.transition(.move(edge: .top))
-							}
-							
-							// TODO Trust Fragment
-							
-							// TODO Medias Fragment
-							
-							HStack(alignment: .center) {
-								Text("Other actions")
-									.default_text_style_800(styleSize: 16)
-								
-								Spacer()
-							}
-							.padding(.vertical, 10)
-							.padding(.horizontal, 16)
-							.background(Color.gray100)
-							
-							VStack(spacing: 0) {
-								Button {
-								} label: {
-									HStack {
-										Image("pencil-simple")
-											.renderingMode(.template)
-											.resizable()
-											.foregroundStyle(Color.grayMain2c600)
-											.frame(width: 25, height: 25)
-										
-										Text("Edit")
-											.default_text_style(styleSize: 14)
-											.frame(maxWidth: .infinity, alignment: .leading)
-											.lineLimit(1)
-											.fixedSize(horizontal: false, vertical: true)
-										Spacer()
-									}
-									.padding(.vertical, 15)
-									.padding(.horizontal, 20)
-								}
-								VStack {
-									Divider()
-								}
-								.padding(.horizontal)
-								
-								Button {
-									if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil {
-										contactViewModel.objectWillChange.send()
-										magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred.toggle()
-									}
-								} label: {
-									HStack {
-										Image(contactViewModel.indexDisplayedFriend != nil && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
-											  && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred == true ? "heart-fill" : "heart")
-											.renderingMode(.template)
-											.resizable()
-											.foregroundStyle(contactViewModel.indexDisplayedFriend != nil && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil 
-															 && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred == true ? Color.redDanger500 : Color.grayMain2c500)
-											.frame(width: 25, height: 25)
-										Text(contactViewModel.indexDisplayedFriend != nil
-											 && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil
-											 && magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.starred == true
-											 ? "Remove from favourites"
-											 : "Add to favourites")
-										.default_text_style(styleSize: 14)
-										.frame(maxWidth: .infinity, alignment: .leading)
-										.lineLimit(1)
-										.fixedSize(horizontal: false, vertical: true)
-										Spacer()
-									}
-									.padding(.vertical, 15)
-									.padding(.horizontal, 20)
-								}
-								
-								VStack {
-									Divider()
-								}
-								.padding(.horizontal)
-								
-								Button {
-								} label: {
-									HStack {
-										Image("share-network")
-											.renderingMode(.template)
-											.resizable()
-											.foregroundStyle(Color.grayMain2c600)
-											.frame(width: 25, height: 25)
-										
-										Text("Share")
-											.default_text_style(styleSize: 14)
-											.frame(maxWidth: .infinity, alignment: .leading)
-											.lineLimit(1)
-											.fixedSize(horizontal: false, vertical: true)
-										Spacer()
-									}
-									.padding(.vertical, 15)
-									.padding(.horizontal, 20)
-								}
-								
-								VStack {
-									Divider()
-								}
-								.padding(.horizontal)
-								
-								/*
-								 Button {
-								 } label: {
-								 HStack {
-								 Image("bell-simple-slash")
-								 .renderingMode(.template)
-								 .resizable()
-								 .foregroundStyle(Color.grayMain2c600)
-								 .frame(width: 25, height: 25)
-								 
-								 Text("Mute")
-								 .default_text_style(styleSize: 14)
-								 .frame(maxWidth: .infinity, alignment: .leading)
-								 .lineLimit(1)
-								 .fixedSize(horizontal: false, vertical: true)
-								 Spacer()
-								 }
-								 .padding(.vertical, 15)
-								 .padding(.horizontal, 20)
-								 }
-								 
-								 VStack {
-								 Divider()
-								 }
-								 .padding(.horizontal)
-								 
-								 Button {
-								 } label: {
-								 HStack {
-								 Image("x-circle")
-								 .renderingMode(.template)
-								 .resizable()
-								 .foregroundStyle(Color.grayMain2c600)
-								 .frame(width: 25, height: 25)
-								 
-								 Text("Block")
-								 .default_text_style(styleSize: 14)
-								 .frame(maxWidth: .infinity, alignment: .leading)
-								 .lineLimit(1)
-								 .fixedSize(horizontal: false, vertical: true)
-								 Spacer()
-								 }
-								 .padding(.vertical, 15)
-								 .padding(.horizontal, 20)
-								 }
-								 
-								 VStack {
-								 Divider()
-								 }
-								 .padding(.horizontal)
-								 */
-								
-								Button {
-									if magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend != nil {
-										isShowDeletePopup.toggle()
-									}
-								} label: {
-									HStack {
-										Image("trash-simple")
-											.renderingMode(.template)
-											.resizable()
-											.foregroundStyle(Color.redDanger500)
-											.frame(width: 25, height: 25)
-										
-										Text("Delete this contact")
-											.foregroundStyle(Color.redDanger500)
-											.default_text_style(styleSize: 14)
-											.frame(maxWidth: .infinity, alignment: .leading)
-											.lineLimit(1)
-											.fixedSize(horizontal: false, vertical: true)
-										Spacer()
-									}
-									.padding(.vertical, 15)
-									.padding(.horizontal, 20)
-								}
-							}
-							.background(.white)
-							.cornerRadius(15)
-							.padding(.horizontal)
-							.zIndex(-1)
-							.transition(.move(edge: .top))
+
+							ContactInnerActionsFragment(
+								contactViewModel: contactViewModel,
+								editContactViewModel: editContactViewModel,
+								showingSheet: $showingSheet,
+								isShowDeletePopup: $isShowDeletePopup,
+								isShowDismissPopup: $isShowDismissPopup,
+								actionEditButton: editNativeContact
+							)
 						}
 						.frame(maxWidth: sharedMainViewModel.maxWidth)
 					}
@@ -619,17 +269,34 @@ struct ContactInnerFragment: View {
 			.onRotate { newOrientation in
 				orientation = newOrientation
 			}
-			.sheet(isPresented: $presentingEditContact) {
-						NavigationView {
-							AnyView(EditContactView(contact: $cnContact)
-								.navigationBarTitle("Edit Contact")
-								.navigationBarTitleDisplayMode(.inline))
-								.edgesIgnoringSafeArea(.top)
-						}
-					}
+			.fullScreenCover(isPresented: $presentingEditContact) {
+				NavigationView {
+					EditContactView(contact: $cnContact)
+						.navigationBarTitle("Edit Contact")
+						.navigationBarTitleDisplayMode(.inline)
+						.edgesIgnoringSafeArea(.vertical)
+				}
+			}
 		}
 		.navigationViewStyle(.stack)
 	}
+	
+	func editNativeContact() {
+		do {
+			let store = CNContactStore()
+			let descriptor = CNContactViewController.descriptorForRequiredKeys()
+			cnContact = try store.unifiedContact(
+				withIdentifier: magicSearch.lastSearch[contactViewModel.indexDisplayedFriend!].friend!.nativeUri!,
+				keysToFetch: [descriptor]
+			)
+			
+			if cnContact != nil {
+				presentingEditContact.toggle()
+			}
+		} catch {
+			print(error)
+		}
+	}
 }
 
 #Preview {
diff --git a/Linphone/UI/Main/Contacts/Fragments/ContactsListBottomSheet.swift b/Linphone/UI/Main/Contacts/Fragments/ContactsListBottomSheet.swift
index 8e65df8a8..9ae204546 100644
--- a/Linphone/UI/Main/Contacts/Fragments/ContactsListBottomSheet.swift
+++ b/Linphone/UI/Main/Contacts/Fragments/ContactsListBottomSheet.swift
@@ -74,7 +74,11 @@ struct ContactsListBottomSheet: View {
 					Image(contactViewModel.selectedFriend != nil && contactViewModel.selectedFriend!.starred == true ? "heart-fill" : "heart")
                         .renderingMode(.template)
                         .resizable()
-						.foregroundStyle(contactViewModel.selectedFriend != nil && contactViewModel.selectedFriend!.starred == true ? Color.redDanger500 : Color.grayMain2c500)
+						.foregroundStyle(
+							contactViewModel.selectedFriend != nil && contactViewModel.selectedFriend!.starred == true
+							? Color.redDanger500
+							: Color.grayMain2c500
+						)
                         .frame(width: 25, height: 25, alignment: .leading)
                     Text(contactViewModel.selectedFriend != nil && contactViewModel.selectedFriend!.starred == true
                          ? "Remove from favourites"
diff --git a/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift b/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift
index f4666f2d2..60f744217 100644
--- a/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift
+++ b/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift
@@ -333,7 +333,11 @@ struct EditContactFragment: View {
 											Image("x")
 												.renderingMode(.template)
 												.resizable()
-												.foregroundStyle(editContactViewModel.sipAddresses[index].isEmpty && editContactViewModel.sipAddresses.count == index + 1 ? Color.gray100 : Color.grayMain2c600)
+												.foregroundStyle(
+													editContactViewModel.sipAddresses[index].isEmpty && editContactViewModel.sipAddresses.count == index + 1
+													? Color.gray100
+													: Color.grayMain2c600
+												)
 												.frame(width: 25, height: 25)
 										})
 										.disabled(editContactViewModel.sipAddresses[index].isEmpty && editContactViewModel.sipAddresses.count == index + 1)
@@ -377,7 +381,11 @@ struct EditContactFragment: View {
 											Image("x")
 												.renderingMode(.template)
 												.resizable()
-												.foregroundStyle(editContactViewModel.phoneNumbers[index].isEmpty && editContactViewModel.phoneNumbers.count == index + 1 ? Color.gray100 : Color.grayMain2c600)
+												.foregroundStyle(
+													editContactViewModel.phoneNumbers[index].isEmpty && editContactViewModel.phoneNumbers.count == index + 1
+													? Color.gray100
+													: Color.grayMain2c600
+												)
 												.frame(width: 25, height: 25)
 										})
 										.disabled(editContactViewModel.phoneNumbers[index].isEmpty && editContactViewModel.phoneNumbers.count == index + 1)
@@ -485,7 +493,7 @@ struct EditContactFragment: View {
 		
 		if editContactViewModel.selectedEditFriend != nil && selectedImage == nil &&
 			!removedImage {
-			let saveFriendResult = ContactsManager.shared.saveFriend(
+			_ = ContactsManager.shared.saveFriend(
 				result: String(editContactViewModel.selectedEditFriend!.photo!.dropFirst(6)),
 				contact: newContact,
 				existingFriend: editContactViewModel.selectedEditFriend
@@ -495,7 +503,10 @@ struct EditContactFragment: View {
 				image: selectedImage
 				?? ContactsManager.shared.textToImage(
 					firstName: editContactViewModel.firstName, lastName: editContactViewModel.lastName),
-				name: editContactViewModel.firstName + editContactViewModel.lastName + String(Int.random(in: 1...1000)) + ((selectedImage == nil) ? "-default" : ""),
+				name: editContactViewModel.firstName 
+				+ editContactViewModel.lastName
+				+ String(Int.random(in: 1...1000))
+				+ ((selectedImage == nil) ? "-default" : ""),
 				contact: newContact, linphoneFriend: true, existingFriend: editContactViewModel.selectedEditFriend)
 		}
 		
diff --git a/Linphone/UI/Main/ContentView.swift b/Linphone/UI/Main/ContentView.swift
index 3f60aa239..d9a8307c1 100644
--- a/Linphone/UI/Main/ContentView.swift
+++ b/Linphone/UI/Main/ContentView.swift
@@ -378,7 +378,12 @@ struct ContentView: View {
 								   : 0
 							)
 						if self.index == 0 {
-							ContactFragment(contactViewModel: contactViewModel, editContactViewModel: editContactViewModel, isShowDeletePopup: $isShowDeletePopup, isShowDismissPopup: $isShowDismissPopup)
+							ContactFragment(
+								contactViewModel: contactViewModel,
+								editContactViewModel: editContactViewModel,
+								isShowDeletePopup: $isShowDeletePopup,
+								isShowDismissPopup: $isShowDismissPopup
+							)
 								.frame(maxWidth: .infinity)
 								.background(Color.gray100)
 								.ignoresSafeArea(.keyboard)
@@ -423,7 +428,11 @@ struct ContentView: View {
 				.zIndex(2)
 				
 				if isShowEditContactFragment {
-					EditContactFragment(editContactViewModel: editContactViewModel, isShowEditContactFragment: $isShowEditContactFragment, isShowDismissPopup: $isShowDismissPopup)
+					EditContactFragment(
+						editContactViewModel: editContactViewModel,
+						isShowEditContactFragment: $isShowEditContactFragment,
+						isShowDismissPopup: $isShowDismissPopup
+					)
 						.zIndex(3)
 						.transition(.move(edge: .bottom))
 						.onAppear {
diff --git a/Linphone/Utils/EditContactController.swift b/Linphone/Utils/EditContactController.swift
index 43a6e52a7..b3a9d250e 100644
--- a/Linphone/Utils/EditContactController.swift
+++ b/Linphone/Utils/EditContactController.swift
@@ -28,7 +28,7 @@ struct EditContactView: UIViewControllerRepresentable {
 			if let cnc = contact {
 				DispatchQueue.global().asyncAfter(deadline: .now() + 1) {
 					self.parent.contact = cnc
-					
+                    
 					let newContact = Contact(
 						identifier: cnc.identifier,
 						firstName: cnc.givenName,