From da08af7e3fb50014a2f9a977dc663382e31b3102 Mon Sep 17 00:00:00 2001
From: QuentinArguillere <quentin.arguillere@belledone-communications.com>
Date: Tue, 5 Jul 2022 13:50:15 +0200
Subject: [PATCH] =?UTF-8?q?=E2=80=9CBack=E2=80=9D=20button=20in=20chatroom?=
 =?UTF-8?q?s=20should=20now=20behave=20more=20in=20line=20with=20what=20is?=
 =?UTF-8?q?=20expected=20:=20return=20to=20the=20chatlist=20view=20in=20mo?=
 =?UTF-8?q?st=20cases?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Classes/ChatConversationView.m | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 3db5d7864..4f74c4133 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -781,7 +781,14 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark - Action Functions
 
 - (IBAction)onBackClick:(id)event {
-	[PhoneMainView.instance popCurrentView];
+	NSString *previousViewName = [PhoneMainView.instance getPreviousViewName];
+	if ([previousViewName isEqualToString:@"ContactDetailsView"]) {
+		ContactDetailsView *view = VIEW(ContactDetailsView);
+		[PhoneMainView.instance popToView:view.compositeViewDescription];
+	} else {
+		ChatsListView *view = VIEW(ChatsListView);
+		[PhoneMainView.instance popToView:view.compositeViewDescription];
+	}
 }
 
 - (IBAction)onEditClick:(id)event {