fix latest ghcjs pkgs

Author: functora

ghcjs/delivery-calculator/src/App/Types.hs

@@ -49,12 +49,11 @@ import Functora.Miso.Types as X hiding
 import qualified Functora.Miso.Types as FM
 import qualified Functora.Miso.Widgets.Field as Field
 import qualified Functora.Miso.Widgets.Icon as Icon
-import Functora.Money hiding (Currency, Money, Text)
+import Functora.Money hiding (Money, Text)
 import qualified Functora.Money as Money
 import qualified Functora.Prelude as Prelude
 import qualified Functora.Rates as Rates
 import qualified Functora.Web as Web
-import Lens.Micro ((^..))
 import qualified Network.URI as NetUri
 import qualified Paths_delivery_calculator as Paths
 import qualified Text.Regex as Re

ghcjs/delivery-calculator/src/App/Xlsx.hs

@@ -12,7 +12,7 @@ import qualified Data.ByteString.Lazy as BL
 import qualified Data.Map as Map
 import qualified Data.Time.Format as TF
 import Functora.Miso.Prelude
-import Lens.Micro ((?~), (^..))
+import Lens.Micro ((?~))
 
 newXlsx :: St Unique -> Map Unicode Rfc2397 -> BL.ByteString
 newXlsx st imgs = xlsx

ghcjs/delivery-calculator/src/Main.hs

@@ -411,8 +411,8 @@ evalModel prev = do
             . fmap (^. #currenciesList)
             $ Rates.getCurrencies web
         let base =
-              Money.Funds
-                1
+              Money.Money
+                (Money.MoneyAmount 1)
                 $ prev
                 ^. #modelState
                 . #stAssetCurrency
@@ -429,7 +429,10 @@ evalModel prev = do
                 )
                 ( ^.
                     #quoteMoneyAmount
-                      . to unTagged
+                      . to
+                        ( from @(Ratio Natural) @Rational
+                            . Money.unMoneyAmount
+                        )
                 )
             )
             . Rates.tryMarket

ghcjs/miso-functora/src/Functora/Miso/Types.hs

@@ -71,7 +71,7 @@ import qualified Data.Map as Map
 import Functora.Cfg
 import Functora.Miso.Prelude
 import Functora.Miso.Theme as X (Theme)
-import Functora.Money hiding (Currency, Money)
+import Functora.Money hiding (Money)
 import qualified Miso.Html.Types as Miso
 import qualified Text.Casing as Casing
 import qualified Text.URI as URI

ghcjs/miso-functora/src/Functora/Miso/Widgets/Currency.hs

@@ -11,7 +11,7 @@ import Functora.Miso.Types
 import qualified Functora.Miso.Widgets.Dialog as Dialog
 import qualified Functora.Miso.Widgets.Field as Field
 import qualified Functora.Miso.Widgets.Icon as Icon
-import Functora.Money hiding (Currency, Money, Text)
+import Functora.Money hiding (Money, Text)
 import qualified Miso
 import qualified Text.Fuzzy as Fuzzy
 

ghcjs/miso-functora/src/Functora/Miso/Widgets/Money.hs

@@ -9,7 +9,7 @@ where
 import Functora.Miso.Prelude
 import Functora.Miso.Types
 import qualified Functora.Miso.Widgets.Field as Field
-import Functora.Money hiding (Currency, Money, Text)
+import Functora.Money hiding (Money, Text)
 
 data Args model action = Args
   { argsModel :: model,