Merge pull request #81 from avouspierre/alpha

fix issues with double close menu and seems fix issues on greyed buttons
nightscout · Apr 11, 2024 · adede04 · adede04
2 parents 11a0484 + e778233
commit adede04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/FreeAPS/Sources/Modules/Base/BaseStateModel.swift b/FreeAPS/Sources/Modules/Base/BaseStateModel.swift
@@ -37,6 +37,7 @@ class BaseStateModel<Provider>: StateModel, Injectable where Provider: FreeAPS.P
 
  func hideModal() {
  router.mainModalScreen.send(nil)
+ router.mainSecondaryModalView.send(nil)
  }
 
  func view(for screen: Screen) -> AnyView {

diff --git a/FreeAPS/Sources/Modules/Home/HomeStateModel.swift b/FreeAPS/Sources/Modules/Home/HomeStateModel.swift
@@ -353,7 +353,7 @@ extension Home {
  }
 
  func openCGM() {
- showModal(for: .cgmDirect)
+ router.mainSecondaryModalView.send(router.view(for: .cgmDirect))
  }
 
  func infoPanelTTPercentage(_ hbt_: Double, _ target: Decimal) -> Decimal {