fix donate widget

Author: functora

ghcjs/delivery-calculator/delivery-calculator.cabal

@@ -19,8 +19,9 @@ common pkg
     App.I18n
     App.Jsm
     App.Types
-    App.Widgets.AppLinks
     App.Widgets.Asset
+    App.Widgets.Donate
+    App.Widgets.GooglePlay
     App.Widgets.Main
     App.Widgets.MarketLinks
     App.Widgets.Menu

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

@@ -64,6 +64,7 @@ import qualified Text.URI as URI
 data Model = Model
   { modelSink :: MVar (Action -> IO ()),
     modelMenu :: OpenedOrClosed,
+    modelDonate :: OpenedOrClosed,
     modelAppLinks :: OpenedOrClosed,
     modelShareApp :: OpenedOrClosed,
     modelPlaceOrder :: OpenedOrClosed,

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

@@ -0,0 +1,49 @@
+module App.Widgets.Donate (donate) where
+
+import App.Types
+import Functora.Miso.Prelude
+import qualified Functora.Miso.Widgets.Dialog as Dialog
+import qualified Functora.Miso.Widgets.FieldPairs as FieldPairs
+import qualified Functora.Miso.Widgets.Icon as Icon
+
+donate :: Model -> [View Action]
+donate st =
+  if not . null $ st ^. #modelState . #stAssets
+    then mempty
+    else
+      ( button_
+          [ onClick openWidget
+          ]
+          [ icon Icon.IconBitcoin,
+            text " Donate"
+          ]
+      )
+        : Dialog.dialog
+          ( Dialog.defOpts
+              & #optsTitle
+              .~ Just ("Donate" :: Unicode)
+              & #optsFlexCol
+              .~ False
+              & #optsTitleIcon
+              .~ Just Icon.IconBitcoin
+          )
+          Dialog.Args
+            { Dialog.argsModel = st,
+              Dialog.argsOptic = #modelDonate,
+              Dialog.argsAction = PushUpdate,
+              Dialog.argsContent =
+                FieldPairs.fieldPairsViewer
+                  FieldPairs.defOpts
+                  FieldPairs.Args
+                    { FieldPairs.argsModel = st,
+                      FieldPairs.argsOptic = #modelDonateViewer,
+                      FieldPairs.argsAction = PushUpdate,
+                      FieldPairs.argsEmitter = emitter st
+                    }
+            }
+  where
+    openWidget =
+      PushUpdate
+        . PureUpdate
+        $ #modelDonate
+        .~ Opened

ghcjs/delivery-calculator/src/App/Widgets/AppLinks.hs renamed to ghcjs/delivery-calculator/src/App/Widgets/GooglePlay.hs

@@ -1,14 +1,15 @@
-module App.Widgets.AppLinks (appLinks) where
+module App.Widgets.GooglePlay (googlePlay) where
 
 import App.Types
+import qualified App.Widgets.Donate as Donate
 import qualified Functora.Miso.Jsm as Jsm
 import Functora.Miso.Prelude
 import qualified Functora.Miso.Widgets.BrowserLink as BrowserLink
 import qualified Functora.Miso.Widgets.Dialog as Dialog
 import qualified Functora.Miso.Widgets.Icon as Icon
 
-appLinks :: Model -> [View Action]
-appLinks st =
+googlePlay :: Model -> [View Action]
+googlePlay st =
   if not . null $ st ^. #modelState . #stAssets
     then mempty
     else
@@ -91,14 +92,9 @@ appLinks st =
                     ]
                     [ icon Icon.IconUser,
                       text " Author"
-                    ],
-                  button_
-                    [ onClick $ setScreenAction Donate
-                    ]
-                    [ icon Icon.IconBitcoin,
-                      text " Donate"
                     ]
                 ]
+                  <> Donate.donate st
             }
   where
     openWidget =

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

@@ -1,8 +1,8 @@
 module App.Widgets.Main (mainWidget) where
 
 import App.Types
-import qualified App.Widgets.AppLinks as AppLinks
 import qualified App.Widgets.Asset as Asset
+import qualified App.Widgets.GooglePlay as GooglePlay
 import qualified App.Widgets.MarketLinks as MarketLinks
 import qualified App.Widgets.Menu as Menu
 import qualified App.Widgets.PlaceOrder as PlaceOrder
@@ -154,7 +154,7 @@ screenWidget st@Model {modelState = St {stScreen = Main}} =
               ]
           )
         : ShareApp.shareApp st
-          <> AppLinks.appLinks st
+          <> GooglePlay.googlePlay st
           <> RemoveOrder.removeOrder st
           <> PlaceOrder.placeOrder st
 

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

@@ -27,6 +27,7 @@ newModel webOpts sink mSt uri = do
     Model
       { modelSink = sink,
         modelMenu = Closed,
+        modelDonate = Closed,
         modelAppLinks = Closed,
         modelShareApp = Closed,
         modelPlaceOrder = Closed,
@@ -45,19 +46,19 @@ newModel webOpts sink mSt uri = do
 
 newDonateViewer :: (MonadIO m) => m [FieldPair DynamicField Unique]
 newDonateViewer = do
-  title <- newFieldPair mempty $ DynamicFieldText "Hello, User!"
-  message <- newFieldPair mempty $ DynamicFieldText exampleDonationText
+  message <- newFieldPair "Hello, User!" $ DynamicFieldText exampleDonationText
   btcMtd <- newFieldPair "BTC - Bitcoin" $ DynamicFieldText exampleBtcAddress
   xmrMtd <- newFieldPair "XMR - Monero" $ DynamicFieldText exampleXmrAddress
   pure
-    [ title & #fieldPairValue . #fieldType .~ FieldTypeTitle,
-      message,
+    [ noTrunc message,
       qr btcMtd,
       qr xmrMtd
     ]
   where
     qr :: FieldPair a b -> FieldPair a b
-    qr = (& #fieldPairValue . #fieldType .~ FieldTypeQrCode)
+    qr = noTrunc . (#fieldPairValue . #fieldType .~ FieldTypeQrCode)
+    noTrunc :: FieldPair a b -> FieldPair a b
+    noTrunc = #fieldPairValue . #fieldOpts . #fieldOptsTruncateLimit .~ Nothing
 
 exampleBtcAddress :: Unicode
 exampleBtcAddress = "bc1qa3qk8d4mxl6qkpvahl5xvg6c5k33kmuwvt9v8q"

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

@@ -723,7 +723,7 @@ header txt =
   if txt == mempty
     then mempty
     else
-      [ div_
+      [ dt_
           [ style_ [("text-align", "center")]
           ]
           [ text txt