wip

Author: functora

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

@@ -95,7 +95,7 @@ data St f = St
     stMerchantTele :: Field Unicode f,
     stMerchantWhats :: Field Unicode f,
     stMerchantEmail :: Field Unicode f,
-    stMerchantFeePercent :: Field DynamicField f,
+    stMerchantFeePercent :: Field Rational f,
     stOnlineOrOffline :: OnlineOrOffline,
     stEnableTheme :: Bool,
     stTheme :: Theme
@@ -124,7 +124,7 @@ newSt = do
   tele <- newTextField "Functora"
   whats <- newTextField mempty
   email <- newTextField mempty
-  fee <- newDynamicField $ DynamicFieldNumber 2
+  fee <- newRatioField 2
   pure
     St
       { stAssets = mempty,
@@ -286,10 +286,6 @@ newFieldPair key val = do
     $ res
     & #fieldPairValue
     . #fieldOpts
-    . #fieldOptsQrState
-    .~ Nothing
-    & #fieldPairValue
-    . #fieldOpts
     . #fieldOptsAllowCopy
     .~ False
 
@@ -299,10 +295,6 @@ newFieldPairId ::
   FieldPair DynamicField Identity
 newFieldPairId key val = do
   FM.newFieldPairId key val
-    & #fieldPairValue
-    . #fieldOpts
-    . #fieldOptsQrState
-    .~ Nothing
     & #fieldPairValue
     . #fieldOpts
     . #fieldOptsAllowCopy
@@ -323,10 +315,7 @@ newTotal st =
           . DynamicFieldText
           $ inspectExchangeRate st,
         FieldPair (newDynamicFieldId $ DynamicFieldText "Fee %")
-          $ uniqueToIdentity fee
-          & #fieldOpts
-          . #fieldOptsQrState
-          .~ Nothing
+          $ fee
           & #fieldOpts
           . #fieldOptsAllowCopy
           .~ False,
@@ -337,8 +326,17 @@ newTotal st =
           $ fee
       ]
   where
-    fee = st ^. #stMerchantFeePercent
-    rate = st ^. #stExchangeRate . #fieldOutput
+    fee =
+      ( newDynamicFieldId
+          . DynamicFieldNumber
+          $ st
+          ^. #stMerchantFeePercent
+          . #fieldOutput
+      )
+        & #fieldType
+        .~ FieldTypePercent
+    rate =
+      st ^. #stExchangeRate . #fieldOutput
     base =
       foldl
         ( \acc fps ->

ghcjs/delivery-calculator/src/App/Widgets/Menu.hs

@@ -113,7 +113,7 @@ menu st =
                         & #optsLabel
                         .~ Just (inspectExchangeRate $ modelState st)
                 )
-              <> Field.dynamicField
+              <> Field.ratioField
                 Field.Args
                   { Field.argsModel = st,
                     Field.argsOptic = #modelState . #stMerchantFeePercent,

ghcjs/delivery-calculator/test/App/TypesSpec.hs

@@ -56,8 +56,9 @@ spec = do
   --   $ over soplate fun expr
   --   `shouldBe` Mul (Sub (Lit 2) (Lit 3)) (Lit 4)
   it "serialization" $ do
-    st0 <- newModel Web.defOpts Nothing =<< URI.mkURI "http://localhost"
-    uri <- stUri st0
-    st1 <- newModel Web.defOpts Nothing uri
+    var <- newEmptyMVar
+    st0 <- newModel Web.defOpts var Nothing =<< URI.mkURI "http://localhost"
+    uri <- stLongUri st0
+    st1 <- newModel Web.defOpts var Nothing uri
     (st0 ^. #modelState . to uniqueToIdentity)
       `shouldBe` (st1 ^. #modelState . to uniqueToIdentity)

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

@@ -171,7 +171,7 @@ defFieldOpts =
     { fieldOptsAllowCopy = True,
       fieldOptsTruncateLimit = Just defTruncateLimit,
       fieldOptsTruncateState = Just Closed,
-      fieldOptsQrState = Just Closed
+      fieldOptsQrState = Nothing
     }
 
 defTruncateLimit :: Int