From 3a20e37896a317fa029e9660174eab5cf7bb680c Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 11:02:17 +1000
Subject: [PATCH] Fix conversation setting ordering

---
 .../OWSConversationSettingsViewController.m    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
index 8246b2536..9b1adbe36 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@@ -829,6 +829,15 @@ const CGFloat kIconViewLength = 24;
     // Block Conversation section.
 
     if (!isNoteToSelf && [self.thread isKindOfClass:TSContactThread.class]) {
+        [mainSection addItem:
+            [OWSTableItem itemWithCustomCellBlock:^{
+                NSString *title = @"Reset Secure Session";
+                NSString *accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(OWSConversationSettingsViewController, @"reset_secure_session");
+                return [weakSelf disclosureCellWithName:title iconName:@"system_message_security" accessibilityIdentifier:accessibilityIdentifier];
+            }
+            actionBlock:^{ [weakSelf resetSecureSession]; }]
+        ];
+
         mainSection.footerTitle = NSLocalizedString(
             @"BLOCK_USER_BEHAVIOR_EXPLANATION", @"An explanation of the consequences of blocking another user.");
 
@@ -860,15 +869,6 @@ const CGFloat kIconViewLength = 24;
                                  return cell;
                              }
                                          actionBlock:nil]];
-
-        [mainSection addItem:
-            [OWSTableItem itemWithCustomCellBlock:^{
-                NSString *title = @"Reset Secure Session";
-                NSString *accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(OWSConversationSettingsViewController, @"reset_secure_session");
-                return [weakSelf disclosureCellWithName:title iconName:@"system_message_security" accessibilityIdentifier:accessibilityIdentifier];
-            }
-            actionBlock:^{ [weakSelf resetSecureSession]; }]
-         ];
     }
 
     self.contents = contents;