From deefedd7d90b07b07ecbf3e62489b7325481ec6f Mon Sep 17 00:00:00 2001
From: Benjamin Reis <benjamin.reis@belledonne-communications.com>
Date: Fri, 12 Jan 2018 11:04:26 +0100
Subject: [PATCH] fix merge

---
 Classes/ChatConversationCreateTableView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/ChatConversationCreateTableView.m b/Classes/ChatConversationCreateTableView.m
index ca868993a..b8e44ec7f 100644
--- a/Classes/ChatConversationCreateTableView.m
+++ b/Classes/ChatConversationCreateTableView.m
@@ -93,8 +93,8 @@
 
 	for (NSString* key in _sortedAddresses){
 		NSString *address = (NSString *)key;
-		NSString *name = [FastAddressBook displayNameForContact:value];
 		Contact *contact = [LinphoneManager.instance.fastAddressBook.addressBookMap objectForKey:address];
+		NSString *name = [FastAddressBook displayNameForContact:contact];
 		Boolean linphoneContact = [FastAddressBook contactHasValidSipDomain:contact]
 			|| (contact.friend && linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(contact.friend)) == LinphonePresenceBasicStatusOpen);
 		BOOL add = _allFilter || linphoneContact;