From b4ca385028ee1ab0ce9ef8287180db274dfcc261 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Fri, 17 May 2019 11:58:46 +1000
Subject: [PATCH] Clean

---
 Signal/src/Loki/FriendRequestView.swift          | 11 ++++++++---
 Signal/translations/en.lproj/Localizable.strings |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Signal/src/Loki/FriendRequestView.swift b/Signal/src/Loki/FriendRequestView.swift
index 177f31314..96205360e 100644
--- a/Signal/src/Loki/FriendRequestView.swift
+++ b/Signal/src/Loki/FriendRequestView.swift
@@ -96,8 +96,14 @@
             label.text = text
         case .outgoing:
             guard let message = message as? TSOutgoingMessage else { preconditionFailure() }
-            label.isHidden = didAcceptRequest
-            label.text = String(format: NSLocalizedString("You've sent %@ a friend request", comment: ""), message.thread.contactIdentifier()!)
+            let text: String = {
+                if didAcceptRequest {
+                    return String(format: NSLocalizedString("%@ accepted your friend request", comment: ""), message.thread.contactIdentifier()!)
+                } else {
+                    return String(format: NSLocalizedString("You've sent %@ a friend request", comment: ""), message.thread.contactIdentifier()!)
+                }
+            }()
+            label.text = text
         }
     }
     
@@ -133,7 +139,6 @@
                 let buttonHeight = dummyFriendRequestView.buttonStackView.isHidden ? 0 : dummyFriendRequestView.buttonHeight
                 return topSpacing + messageHeight + buttonHeight
             case .outgoing:
-                let messageHeight = dummyFriendRequestView.label.isHidden ? 0 : messageHeight
                 return topSpacing + messageHeight
             }
         }()
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index f94b0fc4a..de69579b5 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -2581,3 +2581,4 @@
 "Session" = "Session";
 "You've declined %@'s friend request" = "You've declined %@'s friend request";
 "You've accepted %@'s friend request" = "You've accepted %@'s friend request";
+"%@ accepted your friend request" = "%@ accepted your friend request";