From b2114aff051fd2102f23f0c28b379b19297a12cf Mon Sep 17 00:00:00 2001 From: Aleksey Belouosv Date: Mon, 2 Sep 2019 18:42:48 +0300 Subject: [PATCH] [iOS] fix "successfull subscription" dialog https://jira.mail.ru/browse/MAPSME-10942 --- .../Catalog/BookmarksSubscriptionViewController.swift | 4 ---- iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iphone/Maps/Bookmarks/Catalog/BookmarksSubscriptionViewController.swift b/iphone/Maps/Bookmarks/Catalog/BookmarksSubscriptionViewController.swift index 29a58614c4..66cf054539 100644 --- a/iphone/Maps/Bookmarks/Catalog/BookmarksSubscriptionViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/BookmarksSubscriptionViewController.swift @@ -207,10 +207,6 @@ extension BookmarksSubscriptionViewController: SubscriptionManagerListener { loadingView.isHidden = true if (isValid) { onSubscribe?() - let successDialog = BookmarksSubscriptionSuccessViewController { [weak self] in - self?.dismiss(animated: true) - } - present(successDialog, animated: true) } else { MWMAlertViewController.activeAlert().presentInfoAlert(L("bookmarks_convert_error_title"), text: L("purchase_error_subtitle")) diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index 3dece98147..fcebe18f4d 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -221,7 +221,12 @@ final class CatalogWebViewController: WebViewController { private func showSubscribe() { let subscribeViewController = BookmarksSubscriptionViewController() subscribeViewController.onSubscribe = { [weak self] in + self?.webView.reload() self?.dismiss(animated: true) + let successDialog = BookmarksSubscriptionSuccessViewController { [weak self] in + self?.dismiss(animated: true) + } + self?.present(successDialog, animated: true) } subscribeViewController.onCancel = { [weak self] in self?.dismiss(animated: true)