Merge pull request #3285 from vladyslav-iosdev/#3279

When browser's DappBrowserNavigationBar.state is .browserOnly, the home button, bookmarks, history, etc shouldn't be shown #3279

AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift

@@ -279,20 +279,24 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
 
         let cancelAction = UIAlertAction(title: R.string.localizable.cancel(), style: .cancel) { _ in }
 
-        alertController.addAction(reloadAction)
+        let mappedAlertActionsToDisplay: [(action: UIAlertAction, flag: Bool)] = [
-        alertController.addAction(myBookmarksAction)
+            (action: reloadAction, flag: true),
-        alertController.addAction(historyAction)
+            (action: myBookmarksAction, flag: !browserOnly),
-        alertController.addAction(setAsHomePageAction)
+            (action: historyAction, flag: !browserOnly),
-        alertController.addAction(shareAction)
+            (action: setAsHomePageAction, flag: !browserOnly),
-        alertController.addAction(addBookmarkAction)
+            (action: shareAction, flag: true),
-        alertController.addAction(switchNetworkAction)
+            (action: addBookmarkAction, flag: !browserOnly),
-
+            (action: switchNetworkAction, flag: !browserOnly),
-        if browserOnly {
+            (action: scanQrCodeAction, flag: !browserOnly),
-            //no-op
+            (action: cancelAction, flag: true)
-        } else {
+        ]
-            alertController.addAction(scanQrCodeAction)
+
-        }
+        for each in mappedAlertActionsToDisplay {
-        alertController.addAction(cancelAction)
+            guard each.flag else { continue }
+
+            alertController.addAction(each.action)
+        }
+        
         return alertController
     }
 

AlphaWallet/Browser/Views/DappBrowserNavigationBar.swift

@@ -171,7 +171,7 @@ final class DappBrowserNavigationBar: UINavigationBar {
 
         viewsToShowWhenNotEditing.append(contentsOf: [spacer0, spacer1, backwardForwardButtonStackView, textField, spacer2, homeButton, spacer3, moreButton])
         viewsToShowWhenEditing.append(contentsOf: [textField, cancelEditingButton])
-        viewsToShowWhenBrowserOnly.append(contentsOf: [spacer0, backwardForwardButtonStackView, domainNameLabel, spacer1, closeButton, spacer2, homeButton, spacer3, moreButton])
+        viewsToShowWhenBrowserOnly.append(contentsOf: [spacer0, backwardForwardButtonStackView, domainNameLabel, spacer1, closeButton, spacer3, moreButton])
 
         changeServerButton.setContentCompressionResistancePriority(.required, for: .horizontal)
         changeServerButton.setContentHuggingPriority(.required, for: .horizontal)