better fav wip

Author: functora

ghcjs/lightning-verifier/src/App/Widgets/Fav.hs

@@ -14,7 +14,6 @@ import qualified Functora.Miso.Widgets.Field as Field
 import qualified Functora.Miso.Widgets.Grid as Grid
 import qualified Material.Button as Button
 import qualified Material.Dialog as Dialog
-import qualified Material.Theme as Theme
 import qualified Text.URI as URI
 
 fav :: Model -> [View Action]
@@ -32,46 +31,31 @@ fav st =
               [ Grid.grid
                   mempty
                   $ favItems st
-                  <> [ Grid.mediumCell
+                  <> [ Grid.bigCell
                         $ Field.textField
                           Field.Args
                             { Field.argsModel = st,
                               Field.argsOptic = #modelFavName,
                               Field.argsAction = PushUpdate . Instant
                             }
-                          ( Field.defOpts
-                              & #optsPlaceholder
-                              .~ ( let name = makeFavName st
-                                    in "Name"
-                                        <> ( if name == mempty
-                                              then mempty
-                                              else " - "
-                                           )
-                                        <> name
-                                 )
-                          ),
-                       Grid.smallCell
-                        $ Button.raised
-                          ( Button.config
-                              & Button.setOnClick saveAction
-                              & Button.setIcon (Just "favorite")
-                              & Button.setAttributes
-                                [ Theme.secondaryBg,
-                                  Css.fullWidth
-                                ]
-                          )
-                          "Save",
-                       Grid.smallCell
-                        $ Button.raised
-                          ( Button.config
-                              & Button.setOnClick deleteAction
-                              & Button.setIcon (Just "delete_forever")
-                              & Button.setAttributes
-                                [ Theme.secondaryBg,
-                                  Css.fullWidth
-                                ]
-                          )
-                          "Delete",
+                          Field.defOpts
+                            { Field.optsPlaceholder = "Name",
+                              Field.optsFilledOrOutlined = Outlined,
+                              Field.optsOnKeyDownAction = onKeyDownAction,
+                              Field.optsTrailingWidget =
+                                Just
+                                  . Field.ActionWidget
+                                    "favorite"
+                                    mempty
+                                  . PushUpdate
+                                  $ Instant saveAction,
+                              Field.optsLeadingWidget =
+                                Just
+                                  $ Field.ActionWidget
+                                    "delete_forever"
+                                    mempty
+                                    deleteAction
+                            },
                        Grid.bigCell
                         $ Button.raised
                           ( Button.config
@@ -87,7 +71,7 @@ fav st =
       ]
   where
     closeAction = PushUpdate . Instant $ pure . (& #modelFav .~ Closed)
-    saveAction = PushUpdate . Instant $ \nextSt -> do
+    saveAction nextSt = do
       ct <- getCurrentTime
       let txt = makeFavName st
       let uri = either impureThrow id . URI.mkURI $ shareLink nextSt
@@ -122,6 +106,10 @@ fav st =
         & #modelFavMap
         . at nextFavName
         .~ Nothing
+    onKeyDownAction uid code =
+      if code == KeyCode 13
+        then saveAction
+        else Jsm.enterOrEscapeBlur uid code
 
 makeFavName :: Model -> MisoString
 makeFavName st =

ghcjs/miso-widgets/shell.nix

@@ -19,6 +19,7 @@ in
         functora-pkgs.libwebp
         functora-pkgs.nodejs
         functora-pkgs.terser
+        functora-pkgs.secp256k1
       ]
       ++ prev.buildInputs
       ++ pkgs.lib.lists.take (pkgs.lib.lists.length functora-tools - 1)

pub/functora/src/test/Functora/Bolt11Spec.hs

@@ -82,6 +82,41 @@ goodSamples =
                 bolt11SigRecoveryFlag = 0
               }
         }
+    ),
+    ( "lnbc2500u1pvjluezsp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygspp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5xysxxatsyp3k7enxv4jsxqzpu9qrsgquk0rl77nj30yxdy8j9vdx85fkpmdla2087ne0xh8nhedh8w27kyke0lp53ut353s06fv3qfegext0eh0ymjpf39tuven09sam30g4vgpfna3rh",
+      Bolt11
+        { bolt11Hrp =
+            Bolt11Hrp
+              { bolt11HrpNet = BitcoinMainnet,
+                bolt11HrpAmt =
+                  Just (Bolt11HrpAmt {bolt11HrpAmtNum = 2500, bolt11HrpAmtMul = Micro})
+              },
+          bolt11Timestamp = 1496314658,
+          bolt11Tags =
+            [ PaymentSecret "1111111111111111111111111111111111111111111111111111111111111111",
+              PaymentHash "0001020304050607080900010203040506070809000102030405060708090102",
+              Description "1 cup coffee",
+              Expiry 60,
+              Features
+                [ Feature
+                    { featureBits = 8,
+                      featureName = Var_onion_optin,
+                      featureRequiredOrSuported = Required
+                    },
+                  Feature
+                    { featureBits = 14,
+                      featureName = Payment_secret,
+                      featureRequiredOrSuported = Required
+                    }
+                ]
+            ],
+          bolt11Signature =
+            Bolt11Sig
+              { bolt11SigVal =
+                  "e59e3ffbd3945e4334879158d31e89b076dff54f3fa7979ae79df2db9dcaf5896cbfe1a478b8d2307e92c88139464cb7e6ef26e414c4abe33337961ddc5e8ab1",
+                bolt11SigRecoveryFlag = 1
+              }
+        }
     )
   ]