From 2cf2c6bef464e17fd711778cb043a61bf074c254 Mon Sep 17 00:00:00 2001
From: Kyle Hickinson <git@kylehickinson.com>
Date: Mon, 28 Oct 2019 15:23:19 -0400
Subject: [PATCH 1/2] Fix #1805: Show publisher name in the tipping panel

---
 BraveRewardsUI/Tipping/TippingOverviewView.swift   | 11 +++++++++++
 BraveRewardsUI/Tipping/TippingViewController.swift |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/BraveRewardsUI/Tipping/TippingOverviewView.swift b/BraveRewardsUI/Tipping/TippingOverviewView.swift
index 6f1922fde..8955262bc 100644
--- a/BraveRewardsUI/Tipping/TippingOverviewView.swift
+++ b/BraveRewardsUI/Tipping/TippingOverviewView.swift
@@ -37,6 +37,11 @@ class TippingOverviewView: UIView {
     $0.layer.borderWidth = 2.0
   }
   
+  let publisherNameLabel = UILabel().then {
+    $0.appearanceTextColor = .white
+    $0.font = .systemFont(ofSize: 20.0, weight: .medium)
+  }
+  
   let socialStackView = UIStackView().then {
     $0.spacing = 20.0
   }
@@ -90,6 +95,7 @@ class TippingOverviewView: UIView {
     addSubview(headerView)
     headerView.addSubview(watermarkImageView)
     headerView.addSubview(grabberView)
+    headerView.addSubview(publisherNameLabel)
     addSubview(dismissButton)
     // headerView.addSubview(heartsImageView)
     scrollView.addSubview(socialStackView)
@@ -125,6 +131,11 @@ class TippingOverviewView: UIView {
       $0.leading.equalTo(self).offset(25.0)
       $0.size.equalTo(UX.faviconSize)
     }
+    publisherNameLabel.snp.makeConstraints {
+      $0.leading.equalTo(faviconImageView.snp.trailing).offset(15)
+      $0.bottom.equalTo(headerView).inset(10)
+      $0.trailing.equalTo(headerView).inset(15)
+    }
     socialStackView.snp.makeConstraints {
       $0.top.equalTo(self.scrollView.contentLayoutGuide).offset(20.0)
       $0.trailing.equalTo(self).offset(-20.0)
diff --git a/BraveRewardsUI/Tipping/TippingViewController.swift b/BraveRewardsUI/Tipping/TippingViewController.swift
index 392efc83b..eb8b5e073 100644
--- a/BraveRewardsUI/Tipping/TippingViewController.swift
+++ b/BraveRewardsUI/Tipping/TippingViewController.swift
@@ -4,6 +4,7 @@
 
 import UIKit
 import BraveRewards
+import BraveShared
 
 enum PublisherMediaType: String {
   case youtube
@@ -95,6 +96,11 @@ class TippingViewController: UIViewController, UIViewControllerTransitioningDele
     state.ledger.publisherBanner(forId: self.publisherInfo.id) { [weak self] banner in
       guard let self = self, let banner = banner else { return }
       
+      if publisherInfo.provider.isEmpty {
+        self.tippingView.overviewView.publisherNameLabel.text = publisherInfo.name
+      } else {
+        self.tippingView.overviewView.publisherNameLabel.text = "\(publisherInfo.name) \(String(format: Strings.OnProviderText, publisherInfo.providerDisplayString))"
+      }
       self.tippingView.overviewView.titleLabel.text = banner.title.isEmpty ? Strings.TippingOverviewTitle : banner.title
       self.tippingView.overviewView.bodyLabel.text = banner.desc.isEmpty ? Strings.TippingOverviewBody : banner.desc
       

From c4f4102e9758878c3f3cdccf403c289d4e6359c7 Mon Sep 17 00:00:00 2001
From: Kyle Hickinson <git@kylehickinson.com>
Date: Mon, 28 Oct 2019 15:23:59 -0400
Subject: [PATCH 2/2] No Bug: Fix publisher favicon in tipping panel to not be
 as cut-off

---
 BraveRewardsUI/Common/PublisherIconCircleImageView.swift | 4 ++--
 BraveRewardsUI/Tipping/TippingOverviewView.swift         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/BraveRewardsUI/Common/PublisherIconCircleImageView.swift b/BraveRewardsUI/Common/PublisherIconCircleImageView.swift
index b59224662..007ff9900 100644
--- a/BraveRewardsUI/Common/PublisherIconCircleImageView.swift
+++ b/BraveRewardsUI/Common/PublisherIconCircleImageView.swift
@@ -8,7 +8,7 @@ class PublisherIconCircleImageView: UIView {
   
   private var imageView = UIImageView()
   
-  init(size: CGFloat) {
+  init(size: CGFloat, inset: CGFloat = 7.0) {
     super.init(frame: .zero)
     
     addSubview(imageView)
@@ -18,7 +18,7 @@ class PublisherIconCircleImageView: UIView {
     }
     
     imageView.snp.makeConstraints {
-      $0.edges.equalTo(self).inset(7)
+      $0.edges.equalTo(self).inset(inset)
     }
     
     setContentHuggingPriority(.required, for: .horizontal)
diff --git a/BraveRewardsUI/Tipping/TippingOverviewView.swift b/BraveRewardsUI/Tipping/TippingOverviewView.swift
index 8955262bc..eecf87458 100644
--- a/BraveRewardsUI/Tipping/TippingOverviewView.swift
+++ b/BraveRewardsUI/Tipping/TippingOverviewView.swift
@@ -29,10 +29,8 @@ class TippingOverviewView: UIView {
   
   let heartsImageView = UIImageView(image: UIImage(frameworkResourceNamed: "hearts"))
   
-  let faviconImageView = UIImageView().then {
+  let faviconImageView = PublisherIconCircleImageView(size: UX.faviconSize.width, inset: 14).then {
     $0.backgroundColor = UX.faviconBackgroundColor
-    $0.clipsToBounds = true
-    $0.layer.cornerRadius = UX.faviconSize.width / 2.0
     $0.layer.borderColor = UIColor.white.cgColor
     $0.layer.borderWidth = 2.0
   }