Fix/dapps fixes

novawallet/Common/Extension/UIKit/UIApplication+TabBarController.swift

@@ -2,10 +2,14 @@ import UIKit
 
 extension UIApplication {
     var tabBarController: MainTabBarViewController? {
-        delegate?
-            .window??
-            .rootViewController?
+        rootContainer?
             .children
             .first(where: { $0 is UITabBarController }) as? MainTabBarViewController
     }
+
+    var rootContainer: NovaMainAppContainerViewController? {
+        delegate?
+            .window??
+            .rootViewController as? NovaMainAppContainerViewController
+    }
 }

novawallet/Common/Extension/UIKit/UIScreen+Corners.swift

@@ -0,0 +1,62 @@
+import UIKit
+
+extension UIScreen {
+    var cornerRadius: CGFloat {
+        let identifier = deviceModelIdentifier()
+
+        switch identifier {
+        case "iPhone10,3", "iPhone10,6",
+             "iPhone11,2",
+             "iPhone11,4", "iPhone11,6",
+             "iPhone12,3",
+             "iPhone12,5":
+            return 39.0
+
+        case "iPhone11,8",
+             "iPhone12,1":
+            return 41.5
+
+        case "iPhone13,1",
+             "iPhone14,4":
+            return 44.0
+
+        case "iPhone13,2",
+             "iPhone13,3",
+             "iPhone14,2",
+             "iPhone14,7":
+            return 47.33
+
+        case "iPhone13,4",
+             "iPhone14,3",
+             "iPhone14,8":
+            return 53.33
+
+        case "iPhone15,2",
+             "iPhone15,3",
+             "iPhone15,4",
+             "iPhone15,5",
+             "iPhone16,1",
+             "iPhone16,2",
+             "iPhone17,3",
+             "iPhone17,4":
+            return 55.0
+
+        case "iPhone17,1",
+             "iPhone17,2":
+            return 62.0
+        default:
+            return 0
+        }
+    }
+
+    private func deviceModelIdentifier() -> String {
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let machineMirror = Mirror(reflecting: systemInfo.machine)
+        let identifier = machineMirror.children.reduce("") { identifier, element in
+            guard let value = element.value as? Int8, value != 0 else { return identifier }
+            return identifier + String(UnicodeScalar(UInt8(value)))
+        }
+        return identifier
+    }
+}

novawallet/Common/Protocols/TransactionSigningPresenting.swift

@@ -69,7 +69,7 @@ final class TransactionSigningPresenter: TransactionSigningPresenting {
             completion(.failure(HardwareSigningError.signingCancelled))
         }
 
-        controller.present(navigationController, animated: true)
+        controller.presentWithCardLayout(navigationController, animated: true)
     }
 
     func presentParitySignerFlow(

novawallet/Common/Protocols/YourWalletsPresentable.swift

@@ -7,7 +7,7 @@ protocol YourWalletsPresentable {
         address: AccountAddress?,
         delegate: YourWalletsDelegate
     )
-    func hideYourWallets(from view: ControllerBackedProtocol?)
+    func hideYourWallets(from view: YourWalletsPresentationProtocol)
 }
 
 extension YourWalletsPresentable {
@@ -32,7 +32,7 @@ extension YourWalletsPresentable {
         view?.controller.present(viewController.controller, animated: true)
     }
 
-    func hideYourWallets(from view: ControllerBackedProtocol?) {
-        view?.controller.dismiss(animated: true)
+    func hideYourWallets(from view: YourWalletsPresentationProtocol) {
+        view.controller.dismiss(animated: true)
     }
 }

novawallet/Common/View/CollectionView/TitleCollectionHeaderView.swift

@@ -47,6 +47,14 @@ final class TitleCollectionHeaderView: UICollectionReusableView {
         }
     }
 
+    var buttonWidth: CGFloat = 40.0 {
+        didSet {
+            button.snp.updateConstraints { make in
+                make.width.greaterThanOrEqualTo(buttonWidth)
+            }
+        }
+    }
+
     override init(frame: CGRect) {
         super.init(frame: frame)
 
@@ -69,13 +77,15 @@ final class TitleCollectionHeaderView: UICollectionReusableView {
 
         displayContentView.addSubview(button)
         button.snp.makeConstraints { make in
-            make.centerY.trailing.equalToSuperview()
+            make.top.bottom.equalToSuperview()
+            make.trailing.equalToSuperview()
+            make.width.greaterThanOrEqualTo(buttonWidth)
         }
 
         displayContentView.addSubview(titleView)
         titleView.snp.makeConstraints { make in
             make.leading.centerY.equalToSuperview()
-            make.trailing.equalTo(button.snp.leading)
+            make.trailing.lessThanOrEqualTo(button.snp.leading).offset(-8)
         }
     }
 }