From 255dc015eb287a03544f0ae85514fbffe035bb59 Mon Sep 17 00:00:00 2001
From: Gal Lakovnik Gorenec <gal.lakovnik.gorenec@proton.me>
Date: Sun, 17 Nov 2024 03:37:28 +0100
Subject: [PATCH] fix:ui: Fixed #2284 -- valuation and cost flags now reset
 each other on toggle.

---
 hledger-ui/Hledger/UI/UIState.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hledger-ui/Hledger/UI/UIState.hs b/hledger-ui/Hledger/UI/UIState.hs
index 106c0ace911..b55950e946a 100644
--- a/hledger-ui/Hledger/UI/UIState.hs
+++ b/hledger-ui/Hledger/UI/UIState.hs
@@ -149,15 +149,16 @@ toggleEmpty = over empty__ not
 
 -- | Toggle between showing the primary amounts or costs.
 toggleConversionOp :: UIState -> UIState
-toggleConversionOp = over conversionop toggleCostMode
+toggleConversionOp ui = (over value valOff) (over conversionop toggleCostMode ui)
   where
     toggleCostMode Nothing               = Just ToCost
     toggleCostMode (Just NoConversionOp) = Just ToCost
     toggleCostMode (Just ToCost)         = Just NoConversionOp
+    valOff _                             = Nothing
 
 -- | Toggle between showing primary amounts or values (using valuation specified at startup, or a default).
 toggleValue :: UIState -> UIState
-toggleValue ui = over value (valuationToggleValue mstartupvaluation0) ui
+toggleValue ui = (over conversionop costOff) (over value (valuationToggleValue mstartupvaluation0) ui)
   where
     mstartupvaluation0 = value_ $ _rsReportOpts $ reportspec_ $ uoCliOpts $ astartupopts ui
     mdefvaluation = Just (AtEnd Nothing)
@@ -166,6 +167,7 @@ toggleValue ui = over value (valuationToggleValue mstartupvaluation0) ui
     valuationToggleValue Nothing           (Just _) = Nothing
     valuationToggleValue mstartupvaluation Nothing  = mstartupvaluation
     valuationToggleValue _                 (Just _) = Nothing
+    costOff _ = Just NoConversionOp
 
 -- | Set hierarchic account tree mode.
 setTree :: UIState -> UIState