Merge pull request #1366 from input-output-hk/ffakenz/fix-new-tx-selecting-recipient-own-addr

Fix TUI new transaction dialog goes blank

Author: locallycompact

hydra-tui/src/Hydra/TUI/Forms.hs

@@ -19,14 +19,14 @@ import Brick.Forms (
   newForm,
   radioField,
  )
-import Brick.Types (Location (..))
+import Brick.Types (Location (..), Widget)
 import Brick.Widgets.Core (clickable, putCursor, txt, (<+>))
 import Cardano.Api.UTxO qualified as UTxO
 import Data.Map.Strict qualified as Map
 import Data.Text qualified as Text
 import Graphics.Vty (Event (..), Key (..))
 import Hydra.Chain.Direct.State ()
-import Lens.Micro (Lens')
+import Lens.Micro (Lens', (^.))
 import Prelude qualified
 
 utxoCheckboxField ::
@@ -83,14 +83,15 @@ confirmRadioField =
 
   radioFields = radioField id [(opt, fst opt, show $ fst opt) | opt <- options]
 
+type LeftBracketChar = Char
+type CheckmarkChar = Char
+type RightBracketChar = Char
+
 checkboxGroupField ::
   (Ord k, Ord n) =>
-  -- | Left bracket character.
-  Char ->
-  -- | Checkmark character.
-  Char ->
-  -- | Right bracket character.
-  Char ->
+  LeftBracketChar ->
+  CheckmarkChar ->
+  RightBracketChar ->
   -- | The state lens for this value.
   Lens' (Map k (a, Bool)) (Map k (a, Bool)) ->
   -- | The available choices, in order.
@@ -148,3 +149,69 @@ checkboxGroupField lb check rb stLens options initialState =
     case Map.lookup k cur of
       Nothing -> return ()
       Just _ -> put $ Map.adjust (second not) k cur
+
+type FormFieldRenderHelper a n = (a -> Text -> Bool -> Widget n -> Widget n)
+
+customRadioField ::
+  (Ord n, Eq a) =>
+  LeftBracketChar ->
+  CheckmarkChar ->
+  RightBracketChar ->
+  -- | The state lens for this value.
+  Lens' s a ->
+  -- | The available choices, in order. Each choice has a value
+  -- of type @a@, a resource name, and a text label.
+  [(a, n, Text.Text)] ->
+  -- | Render widget helper.
+  FormFieldRenderHelper a n ->
+  -- | The initial form state.
+  s ->
+  FormFieldState s e n
+customRadioField lb check rb stLens options decorator initialState =
+  let initVal = initialState ^. stLens
+
+      lookupOptionValue n =
+        let results = filter (\(_, n', _) -> n' == n) options
+         in case results of
+              [(val, _, _)] -> Just val
+              _ -> Nothing
+
+      handleEvent _ (MouseDown n _ _ _) = forM_ (lookupOptionValue n) put
+      handleEvent new (VtyEvent (EvKey (KChar ' ') [])) = put new
+      handleEvent _ _ = return ()
+
+      optionFields = mkOptionField <$> options
+      mkOptionField (val, name, lbl) =
+        FormField
+          name
+          Just
+          True
+          (renderRadio val name lbl)
+          (handleEvent val)
+   in FormFieldState
+        { formFieldState = initVal
+        , formFields = optionFields
+        , formFieldLens = stLens
+        , formFieldUpdate = const
+        , formFieldRenderHelper = id
+        , formFieldConcat = vBox
+        , formFieldVisibilityMode = ShowFocusedFieldOnly
+        }
+ where
+  renderRadio val name lbl foc cur =
+    let addAttr =
+          if foc
+            then withDefAttr focusedFormInputAttr
+            else id
+        isSet = val == cur
+        csr = if foc then putCursor name (Location (1, 0)) else id
+     in clickable name $
+          addAttr $
+            csr $
+              decorator val lbl isSet $
+                txt $
+                  Text.concat
+                    [ Text.singleton lb
+                    , if isSet then Text.singleton check else " "
+                    , Text.singleton rb <> " " <> lbl
+                    ]

hydra-tui/src/Hydra/TUI/Handlers.hs

@@ -11,7 +11,7 @@ import Brick
 import Hydra.Cardano.Api hiding (Active)
 import Hydra.Chain (PostTxError (InternalWalletError, NotEnoughFuel), reason)
 
-import Brick.Forms (Form (formState), editShowableFieldWithValidate, handleFormEvent, newForm, radioField)
+import Brick.Forms (Form (formState), editShowableFieldWithValidate, handleFormEvent, newForm)
 import Cardano.Api.UTxO qualified as UTxO
 import Data.List (nub, (\\))
 import Data.Map qualified as Map
@@ -34,6 +34,7 @@ import Hydra.TUI.Handlers.Global (handleVtyGlobalEvents)
 import Hydra.TUI.Logging.Handlers (info, report, warn)
 import Hydra.TUI.Logging.Types (LogMessage, LogState, LogVerbosity (..), Severity (..), logMessagesL, logVerbosityL)
 import Hydra.TUI.Model
+import Hydra.TUI.Style (own)
 import Lens.Micro.Mtl (use, (%=), (.=))
 import Prelude qualified
 
@@ -181,16 +182,19 @@ handleVtyEventsOpen cardanoClient hydraClient utxo e = do
         EvKey KEsc [] -> id .= OpenHome
         EvKey KEnter [] -> do
           let amountEntered = formState i
-          let ownAddress = mkVkAddress (networkId cardanoClient) (getVerificationKey $ sk hydraClient)
+          let ownAddress = mkVkAddress @Era (networkId cardanoClient) (getVerificationKey $ sk hydraClient)
           let field =
-                radioField
-                  id
+                customRadioField '[' 'X' ']' id $
                   [ (u, show u, decodeUtf8 $ encodePretty u)
-                  | u <- filter (/= ownAddress) (nub addresses)
+                  | u <- nub addresses
                   ]
               addresses = getRecipientAddress <$> Map.elems (UTxO.toMap utxo)
               getRecipientAddress TxOut{txOutAddress = addr} = addr
-          let selectingRecipientForm = newForm [field] (Prelude.head addresses)
+              decorator a _ _ =
+                if a == ownAddress
+                  then withAttr own
+                  else id
+          let selectingRecipientForm = newForm [field decorator] (Prelude.head addresses)
           id .= SelectingRecipient{utxoSelected, amountEntered, selectingRecipientForm}
         _ -> pure ()
       zoom enteringAmountFormL $ handleFormEvent (VtyEvent e)