UI: fix conversation request view

Change-Id: Icba597077f417388cd31a8f7780ce1dc393536ab

Ring/Ring/Features/ContactRequests/Cells/ContactRequestCell.swift

@@ -39,6 +39,11 @@ class ContactRequestCell: UITableViewCell, NibReusable {
         })
     }
 
+    override func willMove(toWindow newWindow: UIWindow?) {
+        super.willMove(toWindow: newWindow)
+        drawBanButtonImage()
+    }
+
     override func setHighlighted(_ highlighted: Bool, animated: Bool) {
         if highlighted {
             self.backgroundColor = UIColor.jamiUITableViewCellSelection
@@ -51,7 +56,6 @@ class ContactRequestCell: UITableViewCell, NibReusable {
 
     override func prepareForReuse() {
         super.prepareForReuse()
-        drawBanButtonImage()
         self.disposeBag = DisposeBag()
     }
 

Ring/Ring/Features/ContactRequests/Cells/ContactRequestCell.xib

@@ -51,7 +51,7 @@
                                         </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="17"/>
+                                                <real key="value" value="20"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
                                                 <color key="value" red="0.0" green="0.69803921568627447" blue="0.043137254901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -79,7 +79,7 @@
                                                 <color key="value" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="17"/>
+                                                <real key="value" value="20"/>
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </button>
@@ -101,7 +101,7 @@
                                                 <color key="value" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="17"/>
+                                                <real key="value" value="20"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="roundedCorners" value="YES"/>
                                         </userDefinedRuntimeAttributes>

Ring/Ring/Features/ContactRequests/ContactRequestsViewController.swift

@@ -90,7 +90,9 @@ class ContactRequestsViewController: UIViewController, StoryboardBased, ViewMode
                 cell.acceptButton.rx.tap
                     .subscribe(onNext: { [weak self] in
                         self?.acceptButtonTapped(withItem: item)
-                        self?.view.isHidden = true
+                        if self?.tableView.numberOfRows(inSection: 0) ?? 0 <= 1 {
+                            self?.view.isHidden = true
+                        }
                     })
                     .disposed(by: cell.disposeBag)