Ivan Valkou 4 лет назад
Родитель
Сommit
d05eefd282

+ 2 - 3
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -150,14 +150,13 @@ extension Home {
                 .store(in: &lifetime)
                 .store(in: &lifetime)
 
 
             $setupPump
             $setupPump
-                .removeDuplicates()
                 .sink { [weak self] show in
                 .sink { [weak self] show in
                     guard let self = self else { return }
                     guard let self = self else { return }
                     if show, let pumpManager = self.provider.apsManager.pumpManager {
                     if show, let pumpManager = self.provider.apsManager.pumpManager {
                         let view = PumpConfig.PumpSettingsView(pumpManager: pumpManager, completionDelegate: self).asAny()
                         let view = PumpConfig.PumpSettingsView(pumpManager: pumpManager, completionDelegate: self).asAny()
-                        self.router.mainSecondaryModalView.value = view
+                        self.router.mainSecondaryModalView.send(view)
                     } else {
                     } else {
-                        self.router.mainSecondaryModalView.value = nil
+                        self.router.mainSecondaryModalView.send(nil)
                     }
                     }
                 }
                 }
                 .store(in: &lifetime)
                 .store(in: &lifetime)

+ 1 - 5
FreeAPS/Sources/Modules/Main/View/MainRootView.swift

@@ -13,11 +13,7 @@ extension Main {
                         .navigationViewStyle(StackNavigationViewStyle())
                         .navigationViewStyle(StackNavigationViewStyle())
                 }
                 }
                 .sheet(isPresented: $state.isSecondaryModalPresented) {
                 .sheet(isPresented: $state.isSecondaryModalPresented) {
-                    if let view = state.secondaryModalView {
-                        view
-                    } else {
-                        EmptyView()
-                    }
+                    state.secondaryModalView ?? EmptyView().asAny()
                 }
                 }
                 .onAppear(perform: configureView)
                 .onAppear(perform: configureView)
         }
         }