From 4771498d697dad659a43f7de8bb06a76359627f6 Mon Sep 17 00:00:00 2001
From: Alexander <polas.okurtis@gmail.com>
Date: Thu, 23 Jan 2020 20:38:20 +0300
Subject: [PATCH] [iOS] Fixed back button in CatalogWebView

https://jira.mail.ru/browse/MAPSME-12987
---
 .../Catalog/CatalogWebViewController.swift    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
index 8340d3148f..5a3248acaf 100644
--- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
@@ -60,10 +60,11 @@ final class CatalogWebViewController: WebViewController {
       }
     }
     super.init(url: catalogUrl, title: L("guides_catalogue_title"))!
-    let bButton = UIButton(type: .custom)
-    bButton.addTarget(self, action: #selector(onBack), for: .touchUpInside)
-    bButton.setImage(UIImage(named: "ic_nav_bar_back"), for: .normal)
-    backButton = UIBarButtonItem(customView: bButton)
+    backButton = UIBarButtonItem(image: UIImage(named: "ic_nav_bar_back"),
+                                  style: .plain,
+                                  target: navigationController,
+                                  action: #selector(onBack))
+    navigationItem.leftBarButtonItem = backButton
     noInternetView = CatalogConnectionErrorView(frame: .zero, actionCallback: { [weak self] in
       guard let self = self else { return }
       if !FrameworkHelper.isNetworkConnected() {
@@ -182,11 +183,6 @@ final class CatalogWebViewController: WebViewController {
       MWMEye.boomarksCatalogShown()
     }
     loadingIndicator.stopAnimating()
-    if (webView.canGoBack) {
-      navigationItem.leftBarButtonItem = backButton
-    } else {
-      navigationItem.leftBarButtonItem = nil
-    }
   }
 
   override func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
@@ -409,7 +405,11 @@ final class CatalogWebViewController: WebViewController {
   }
 
   @objc private func onBack() {
-    back()
+    if (webView.canGoBack) {
+      back()
+    } else {
+      navigationController?.popViewController(animated: true)
+    }
   }
 
   @objc private func onFwd() {