From 770ccaeca9f6af73d655097f727377e8016df5cc Mon Sep 17 00:00:00 2001
From: Soner YUKSEL <grkmyksl@gmail.com>
Date: Mon, 30 Oct 2023 17:32:59 -0400
Subject: [PATCH] Fix brave/brave-ios#8329: Send to your Devices action "Send"
 button placement (brave/brave-ios#8335)

---
 .../SendTab/SendTabToSelfController.swift     |  41 +++++++-----------
 Sources/BraveStrings/BraveStrings.swift       |   3 ++
 .../Certificates/leaf.cer                     | Bin 2078 -> 1900 bytes
 .../Certificates/self-signed.cer              | Bin 1157 -> 1146 bytes
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/Sources/Brave/Frontend/Browser/SendTab/SendTabToSelfController.swift b/Sources/Brave/Frontend/Browser/SendTab/SendTabToSelfController.swift
index 01cdeba9a616..2b717b899231 100644
--- a/Sources/Brave/Frontend/Browser/SendTab/SendTabToSelfController.swift
+++ b/Sources/Brave/Frontend/Browser/SendTab/SendTabToSelfController.swift
@@ -12,7 +12,7 @@ class SendTabToSelfController: SendTabTransitioningController {
   
   struct UX {
     static let contentInset = 20.0
-    static let preferredSizePadding = 132.0
+    static let preferredSizePadding = 100.0
   }
   
   // MARK: Internal
@@ -66,14 +66,16 @@ class SendTabToSelfController: SendTabTransitioningController {
   }
   
   private func updateLayoutConstraints() {
+    let contentSize = CGSize(width: view.bounds.size.width, height: view.frame.height)
+    
     let preferredSize = sendTabContentController.view.systemLayoutSizeFitting(
-      CGSize(width: view.bounds.size.width, height: view.frame.height),
+      contentSize,
       withHorizontalFittingPriority: .required,
       verticalFittingPriority: .fittingSizeLevel
     ).with {
       $0.height += UX.preferredSizePadding
     }
-    
+
     contentNavigationController.view.snp.makeConstraints {
       if traitCollection.horizontalSizeClass == .compact && traitCollection.verticalSizeClass == .regular {
         $0.leading.trailing.equalTo(contentView.safeAreaLayoutGuide).inset(UX.contentInset)
@@ -125,39 +127,27 @@ class SendTabToSelfContentController: UITableViewController {
     navigationItem.title = Strings.OpenTabs.sendWebpageScreenTitle
     navigationItem.leftBarButtonItem =
       UIBarButtonItem(title: Strings.cancelButtonTitle, style: .plain, target: self, action: #selector(cancel))
-
+    navigationItem.rightBarButtonItem =
+      UIBarButtonItem(title: Strings.sendButtonTitle, style: .plain, target: self, action: #selector(send))
+    
     tableView.do {
       $0.tableHeaderView = UIView()
       $0.register(CenteredButtonCell.self)
       $0.register(TwoLineTableViewCell.self)
-      $0.registerHeaderFooter(SendTabToSelfContentHeaderFooterView.self)
-      $0.tableFooterView = SendTabToSelfContentHeaderFooterView().then {
-        $0.titleLabel.text = Strings.OpenTabs.sendDeviceButtonTitle
-        $0.titleLabel.isUserInteractionEnabled = true
-        $0.titleLabel.addGestureRecognizer(UITapGestureRecognizer(
-          target: self,
-          action: #selector(tappedSendLabel(_:))))
-      }
     }
-  }
-  
-  override func viewDidLayoutSubviews() {
-    super.viewDidLayoutSubviews()
     
-    guard let footerView = tableView.tableFooterView else { return }
-    
-    let size = footerView.systemLayoutSizeFitting(
-      CGSize(width: tableView.bounds.size.width, height: UIView.layoutFittingCompressedSize.height))
-    
-    if footerView.frame.size.height != size.height {
-      footerView.frame.size.height = size.height
-      tableView.tableFooterView = footerView
-    }
+    tableView.flashScrollIndicators()
   }
   
   @objc func cancel() {
     dismiss(animated: true)
   }
+  
+  @objc func send() {
+    guard let dataSource = dataSource else { return }
+    
+    sendWebSiteHandler?(dataSource)
+  }
 }
 
 // MARK: UITableViewDataSource - UITableViewDelegate
@@ -193,6 +183,7 @@ extension SendTabToSelfContentController {
       }
       
       cell.do {
+        $0.separatorInset = UIEdgeInsets.zero
         $0.backgroundColor = .clear
         $0.accessoryType = indexPath.row == dataSource?.selectedIndex ? .checkmark : .none
         $0.setLines(device.fullName, detailText: device.lastUpdatedTime.formattedActivePeriodDate)
diff --git a/Sources/BraveStrings/BraveStrings.swift b/Sources/BraveStrings/BraveStrings.swift
index d664a56e14a4..9d4f331c1ab4 100644
--- a/Sources/BraveStrings/BraveStrings.swift
+++ b/Sources/BraveStrings/BraveStrings.swift
@@ -50,6 +50,9 @@ extension Strings {
     NSLocalizedString(
       "yearAbbreviation", tableName: "BraveShared",
       bundle: .module, value: "yr.", comment: "Abbreviation for 'Year', use full word' Yeara' if this word can't be shortened in your language")
+  public static let sendButtonTitle = NSLocalizedString(
+    "sendButtonTitle", tableName: "BraveShared",
+    bundle: .module, value: "Send", comment: "")
 }
 
 // MARK:-  UIAlertControllerExtensions.swift
diff --git a/Tests/CertificateUtilitiesTests/Certificates/leaf.cer b/Tests/CertificateUtilitiesTests/Certificates/leaf.cer
index faea96882431b4f415c1a0b576106fcc8fc120e8..06198b7f80cd361f8322baf9bfb7432fa6c64833 100644
GIT binary patch
delta 1216
zcmV;x1V8(p5bO>gFoFkYFoFh9paTK{0s;^sY=F#le3PrO4RngH^GRiqA895zGBz<d
zG&eLbS{Ds6GchtUH8D6fH#9I>FoDN09WWaP162eM43Vxo0SuAqG(QXqLt$)bW^ZzC
zX<;!EFc1a<RRjkN2}5;oWpZ?BZf`LYFcAg=RRjtQ3PEsiY-J!xZeuPn7BCbB162eA
z43k{}FMqsFriOI)TAcz*Uj96X=j%VqG4C00LV{)T9M(WHQm)3S`y}Qee#b6^_>Md<
zrtaH-OH`UW680%K@mwlU%E?>0V$Hu6EL{X}dRYI!HeG-yuppH<8xlQmKj*zQtGgqA
z311qD*$E8k`~}p55a{aBX(bgsz6&2;A3-iHPJdSyS=jdI*Kw=XtK^~MnwrDIprqB)
z68y0vw10E?w`TV*7zax}+@|UkB8nGJjXR6xA;RC0fhx34qTMYB3as80oNXt71ho*G
z@m`mr#fo%5gnj`Zy<yPNu#EXwN=ywBylX7_hQQ_`jQWQ-p%j|rE-sC&6a&1TNYnUY
zbq|jj0s{d60i%Kg!!Uvazmu5)>LXwV163U$1X(awFh~XkXMqd>0Wd!>Jq8FX1_1>H
z2Lb^WF_XIkF%2*a1_@w>NCAfZYytt3m;_fqa6JOo`;P3nH%&<wK80W;rQjt_Fb)O-
zRUHoj0sjO90|Eu0FoFT~1_~<%0R#coc>)9i1cCwO1cCwK0p9?1lcohEQ;O2steyY>
z1Oos@Fhl|%R_qLbjzZ0V{rezrd)BViBuaJas+6hfQA+dS1BnFR0w6OQ`4bMe2sbig
z8~h~^G<u__cb{;1&I;{4nZlzbCnNxNlO6^ne~QxDthE3D1Oos^Fhv3(0Gv_ItLsbN
zIQhX=9}3#POZhMaS_M}V#DroL@I*~6m;xYWd{7E00Jr@}<H$M_@4LlX;KN37i?@C3
zt0d(SMgJrKb^xvSzWRLs5Xg(2J)9ms7;3a<DP7O83?#~hhBWKkf{FkD0gBSvtmps$
zO#}k~M=(VKAP)K)1E0x@5CtR*P(s5|QGX(vi>f@7Qqt8vobs`WKms8E#qOGj-jXdb
zhYd(bnO{Wlq{g*OWTZxk!Whl+*Qv+r0Ctm=1|)xq(%P*k000C707o!I0w6C0N%+IQ
zO8o@M(s|OaM9kEvSdpquxu+N85{s8fK=%S60NfmOX7FSz_Gb#cFXx54mQvz0-#9#y
z=LjRTaOco(zAz022`Yw2hW8Bt0Sg5H1A+ko0M=wqSqvkTGs1D*I-(nmAm60@FUG7&
zz_x$VVMN4K8?Tso?*efsd@w0p(!a>4xHb>aXqe;}+wJ4hz8|@b76`2EXXN>iU;t(z
zjU44RPh(v5DiH*J?A15dUId<Rq{7p>dgPxkZo9%2(M(DD2&SQ;FZ{97sjm_S#7rJ=
z<Stpr>aL7hs-pX_7qC*nku2`1SgvRlN*-tlp{-nX(fj%K`4WVoT4e^d9Fe`OX@L{f
zz#B;t>J(|M{)nSt!qH1NEv)W^;C3_(`bWHFv;SGb6rVdYN$eBL#+Cly76n1oRr58-
eejsg+eF##v0ux+l>)qyqU|itZsxmxKGYrZ(KloJu

delta 1356
zcmYL`c~DbV6vp3sSuhyF5)dIq9t@(Q!c7na1tMjYD2vJzs0_xC#3;N3l7K845=u}(
z+ZeDC6cLresGuUK;Gni{EUin?6lEz8T#yzd3W5s_cBcMuXYTpVJ-_+Bb4MuU77jo;
z#~vt6kO~|EBZ!5o_=eIBZ9M$R<#K%5l@Yz#LFnQMm`tXp55p(k){N=F08DSD2k>Ed
z#{<P(1|86dxEQ=SRb9IVrmBZmvZ$tkoMa(il!gg83@czU+cu$+0%c-enpB917*t?6
ztC><w1H|HF9=Z<Wx-sSf>sb*;)g-{~@*6eRAN<rl{CH33ZrthWs5kKSD9Nam+vE%O
z%`CytL})ZUoK8eNKb8l({`NG{M4xL|!X)};HH<O$23V%65=%-NyQ-R3#^BrywNBII
zQ$de5?7!56uAGYQFwGxkf;uc?z`j|NQ^x8K*q2Iyv*!Gq%%)A$cY}{F%VQMs;`hh5
z+?xNPvvJ1T=9$`d=#SUB^F4~-Z7$S{3wG`*Y?AA=a}}7q_Pp7H_#9fzTVdt8&v7qq
zzIoNPzVq0j-o$&~QNHnK={o!u1g<(_@Ty3#9CKvL<u?;Y(fH=Rgp#yweftTm?SyBt
z`OM~rOAQHU`f?ZTrAw}yZ-yobIp+4G2o8qelS;e{DDkP9Qe@a$30oOAL`U&Tm;{tC
z0hka80tFd{fnthC+NuhJRiBa(WAz&N6Xz@=!UTc|0?%V=s&EXsJ5W^rFCsuuMphiz
z$V(P-FfI=jVW@PwP=a!2KZq~na-=+TTPDiEGEp%nO=`SJB(fBq1m$qKJhAk@8NP9b
zhZ-4~LQH^0eR&rkNaOKRc$gIBi)2_5%8{bmrBbnEwdO2t8RG7y(c`|AJ0uod>m(M{
zzWP+x8fc!vFDkyM1C-fl<}f^i$Kwz}g)yIjXll%Who593c*K}_(0Kab9!Lh&OEOIQ
zzmIy)RXripbX$_bGgn*?kmnY3kKrhpUZ=GX1Q+x+`Po4b9tVYhAOziA(b0DLZRcO?
zk@#%ybjnymvq$Y`lUOt?eKBSHBU&_wpspF^kyxml9@7%kcrdq&%->qLG%h47%r~~w
zp*5wx8%oz?<DEAf!M;{sz@Z=*afI$ofBrk*gPJla9~mkg(51t)`N*@E*N@$)7qut7
zh>k{33brAiA)Fs(v*Z4ZpI6hZrd^JqI(`3*%0aDRj5vB5l4-{A&YO(jHRE3$d$0=!
zomM;z>9V*poL;^ClCrLPUy`cqti3#<na&(kAgG|o<;14YmOa`1<?4ig8X~8gt3220
zX9j%0V>p5g&ogod2+s0Z!%M$%*RmYLoCd|#C!^2lCAuG9mk&tvA#DnAY3tok5x1R&
zpf<i;!k}G;)|%%3S=FDbCu?`!duD@?TC7W}n%>-&Uj=4FlB+6AHE9OJa|sYm3B%AD
z678(|-TT0rBj~~hG%VGwy^%S>9(8{gD<?7N`APgoU}DFX@VxuhwtNPQ$S$#L$Qzd}
zVgU~~S&{6(QA#DppX#8!Gac+ize=5m==-%dC$I8ttlF91nf2;%=9#GrmzM;`b$w85
zrSC7j_&iWT-=u8oDD2F$+qfEJPoieW$NbA8CRaP2D=Q{X)wL|^n7It}J=(>BvZDaB
z4d35Wy#C;U<%vC~!W!On{Jz}0BVqI5g#<|OFivV8e=WS!<rmZ-f`mBR(Ew;2#jlMP
zLv}A*A<f9`1(A`htmpeH^*+H^s`=5{oM1N5uOREvkZOZhgHQT&-w!dXo)-NJ?Z_z!

diff --git a/Tests/CertificateUtilitiesTests/Certificates/self-signed.cer b/Tests/CertificateUtilitiesTests/Certificates/self-signed.cer
index 1f4f69032b2bbbd4e64c5a545162bd03433d955a..35d1ac739a1ab71bc9d591791e8f3312a726755d 100644
GIT binary patch
delta 642
zcmV-|0)7333Hk^aFoFbjFoFYKpaTK{0s;vD&wC}B&d>>Ekt2y3GchnTFfuSRH#IU^
z7Y#BrF)%VYGB7hYH8PRLmw&WPp#kn~bI5E%a1=>r<h<-L^qAYY8oWh~Agl6QM*W8S
z+2Z;P3#nqvAXv)Y9)93n+=0P@7Epqsr<L>V$aPEleuQF{s)u&-S~bPs_XHNje|@-`
z_h$xQNmHV#<8GjU{ZeqQpgaHQt5s=8(TjqUA;3v2%S6B|K74Z}XMb=WMCKc(P?Ykj
z3L<Ykcc8pgx|uFJPM0=<3>d(5#04yp=ODX3X&Q}HhBAE?k&ciQ^s1nKlzQ9X-!OWy
zawcMfaGp6F+Q3c576ygz@Q`IwRwrBd)!NLrbE}*y8lEP;*L=e0Z;J3Un198P(IVjg
z)Jq7`O8&WJq9g=##sb1elU)KBHQK?-Qs-@~)lL)foRba40-c6Oc`zRa163U(1Q;+D
zfE3!n%2MZTtkq5v@tl(l#sZy&M|qQ~0^5IWMDRIzZWavw1!*6@GnQ=k=CeKqA}UPN
zzT?ImR0=F%pL>+C6Q?lkwfwJeUoghA)&@*iQw11Cz0u~*x&PV_A^gq>C|VTx^kvKK
z6&?-T>7<&COLgfWI}2;GX&YL~V&T1Z+Rs+Sry|Goq)wps2$UoHcJ)9q+PC}za#??d
z<fze8${-#iy*a$9G4`)Yc>!f=f$$L~!4mDfmYcc&L+B`*Q;!>_o)^^vt;tVIU0z*2
zUxa)0NTr2wMjP=;UD>^4fs+REqBLeOM-w4IKE_?fT9mg10L-`q4#T4{<z8SkCXvF?
cZGb>;q<W`LX*!r$Nc*MkK32p#aJd3MN9!dmR{#J2

delta 672
zcmeyx(aNc8(8SVc(8Qd%fSHMriAhAp@3d*iB`49>M~z<o`p?uFynIFDM2Su*BLh=I
zV?zrQV`Gabab6>11b5=@>Gikz`Qj9Qdx~a<DyOGM-7<IbeH?9VutHp<E$p|(uJ>O*
zryZz0tNy&H?^XBrBk3+b9#v}X<)3ijgUywzb?Q#<EX51=^?Z9b$=__FPGzLO<<30`
zi(9wwFlHYtDLQN~W$CG~RJm@U_yjA1_}!~RO(Tup3y7sISwC?rx571!Sp6sU{{6S&
zxA1Fy(x1QmtE}h)flrn<v*S)RzP{%!YJX08@#;y-cRc+Qk}Q7nBy-M%rTwhaKJE2g
z8ps^JTQ-q%@q+cwH%J9-dF0gi$UjpvB7}Y0`ED<>P}`s0ftzN&sBM@V-5crUuxQ7G
zSF6r+X@1tJ5}V@0YOejqe9Lcbi;c1+vtIiPPGw?dWMEv}#K>*X#K>+S%f=ik%f}+d
zBBHNj^jzvlPWGN}y_^Oo{=AvIH^R$69we>IB4HrbfK|cd`AoO#`y@QR{}B~=8Wne$
zSt^xnr3Sl<uw&f)vNd;}T>N@qx0hBT?;ItQ==L|K-!fd$-BRSZdUffCBTN3+N`xAl
z`N!9b_j4~%n?C7v_y23xrzIS56xwf7zv;JblW}k9Q!e9ef@Z7V?RmC8)0@?^^l)U@
zo~x4%Z5EyBRmVU3+`Y*+x9+Upu;oo|_g5_@h1Ivya_@)LSW0f}(p__MPxn{uYsz+;
z4@W6Y;$f2EQwSITI#)L7xXt1PHkbMtAFP_=X%<~#@;}sl&5>;3dE2t8l(t6{@wCl0
zJYZPPu;plKPUi91l?6$js!0Y%7pV3nKMgv{5qmM|>2{%M--|SIITRFgf-WsJW@0@A
E0Jje+RR910