iphone/Maps/Classes/CustomAlert/Toast/Toast.swift

@@ -7,11 +7,20 @@ final class Toast: NSObject {
   }
 
   private var blurView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
+  private var timer: Timer?
+
+  private static var toasts: [Toast] = []
 
   @objc static func toast(withText text: String) -> Toast {
-    return Toast(text)
+    let toast = Toast(text)
+    toasts.append(toast)
+    return toast
   }
-
+  
+  @objc static func hideAll() {
+    toasts.forEach { $0.hide() }
+  }
+  
   private init(_ text: String) {
     blurView.layer.setCorner(radius: 8)
     blurView.clipsToBounds = true
@@ -34,6 +43,10 @@ final class Toast: NSObject {
         label.bottomAnchor.constraint(equalTo: blurView.contentView.bottomAnchor, constant: -8)
     ])
   }
+  
+  deinit {
+    timer?.invalidate()
+  }
 
   @objc func show() {
     show(in: UIApplication.shared.keyWindow, alignment: .bottom)
@@ -72,15 +85,20 @@ final class Toast: NSObject {
       self.blurView.alpha = 1
     }
 
-    Timer.scheduledTimer(timeInterval: 3,
-                         target: self,
-                         selector: #selector(onTimer),
-                         userInfo: nil,
-                         repeats: false)
+    timer = Timer.scheduledTimer(timeInterval: 3,
+                                 target: self,
+                                 selector: #selector(hide),
+                                 userInfo: nil,
+                                 repeats: false)
   }
-
-  @objc private func onTimer() {
-    UIView.animate(withDuration: kDefaultAnimationDuration,
-                   animations: { self.blurView.alpha = 0 }) { [self] _ in self.blurView.removeFromSuperview() }
+  
+  @objc func hide() {
+    timer?.invalidate()
+    if self.blurView.superview != nil {
+      UIView.animate(withDuration: kDefaultAnimationDuration,
+                     animations: { self.blurView.alpha = 0 }) { [self] _ in
+        self.blurView.removeFromSuperview()
+        Self.toasts.removeAll(where: { $0 === self }) }
+    }
   }
 }

iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm

@@ -63,6 +63,11 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
   [StyleManager.shared removeListener:self];
 }
 
+- (void)viewWillDisappear:(BOOL)animated {
+  [super viewWillDisappear:animated];
+  [MWMToast hideAll];
+}
+
 - (void)configLayout {
   UIView *sv = self.view;
   UIView *ov = sv.superview;