Call activeHandler after configure

HedvigInsurance · Aug 20, 2021 · 1ef7751 · 1ef7751
1 parent 78502ef
commit 1ef7751
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/Presentation/Journey/TabbedJourney.swift b/Presentation/Journey/TabbedJourney.swift
@@ -116,15 +116,15 @@ public struct TabbedJourney: JourneyPresentation {
             tabBarController.viewControllers = [viewController].filter { $0 as? ContinuerPresentable.ContinuerViewController == nil }
             configurer()
 
-            bag += Self.activeHandler(tabBarController)
-
             return (tabBarController, bag)
         })
 
         self.options = options
         self.onDismiss = { _ in }
         self.style = style
         self.configure = { presenter in
+            presenter.bag += Self.activeHandler(presenter.matter)
+
             dismisser = { error in
                 presenter.dismisser(error)
             }
@@ -159,15 +159,15 @@ public struct TabbedJourney: JourneyPresentation {
             configurer1()
             configurer2()
 
-            bag += Self.activeHandler(tabBarController)
-
             return (tabBarController, bag)
         })
 
         self.options = options
         self.onDismiss = { _ in }
         self.style = style
         self.configure = { presenter in
+            presenter.bag += Self.activeHandler(presenter.matter)
+
             dismisser = { error in
                 presenter.dismisser(error)
             }
@@ -207,15 +207,15 @@ public struct TabbedJourney: JourneyPresentation {
             configurer2()
             configurer3()
 
-            bag += Self.activeHandler(tabBarController)
-
             return (tabBarController, bag)
         })
 
         self.options = options
         self.onDismiss = { _ in }
         self.style = style
         self.configure = { presenter in
+            presenter.bag += Self.activeHandler(presenter.matter)
+
             dismisser = { error in
                 presenter.dismisser(error)
             }
@@ -260,15 +260,15 @@ public struct TabbedJourney: JourneyPresentation {
             configurer3()
             configurer4()
 
-            bag += Self.activeHandler(tabBarController)
-
             return (tabBarController, bag)
         })
 
         self.options = options
         self.onDismiss = { _ in }
         self.style = style
         self.configure = { presenter in
+            presenter.bag += Self.activeHandler(presenter.matter)
+
             dismisser = { error in
                 presenter.dismisser(error)
             }
@@ -318,15 +318,15 @@ public struct TabbedJourney: JourneyPresentation {
             configurer4()
             configurer5()
 
-            bag += Self.activeHandler(tabBarController)
-
             return (tabBarController, bag)
         })
 
         self.options = options
         self.onDismiss = { _ in }
         self.style = style
         self.configure = { presenter in
+            presenter.bag += Self.activeHandler(presenter.matter)
+
             dismisser = { error in
                 presenter.dismisser(error)
             }
@@ -381,15 +381,15 @@ public struct TabbedJourney: JourneyPresentation {
             configurer5()
             configurer6()
 
-            bag += Self.activeHandler(tabBarController)
-
             return (tabBarController, bag)
         })
 
         self.options = options
         self.onDismiss = { _ in }
         self.style = style
         self.configure = { presenter in
+            presenter.bag += Self.activeHandler(presenter.matter)
+
             dismisser = { error in
                 presenter.dismisser(error)
             }
@@ -449,15 +449,15 @@ public struct TabbedJourney: JourneyPresentation {
             configurer6()
             configurer7()
 
-            bag += Self.activeHandler(tabBarController)
-
             return (tabBarController, bag)
         })
 
         self.options = options
         self.onDismiss = { _ in }
         self.style = style
         self.configure = { presenter in
+            presenter.bag += Self.activeHandler(presenter.matter)
+
             dismisser = { error in
                 presenter.dismisser(error)
             }