Factor out address rendering into common pages lib

lib/ui/src/Cardano/Wallet/UI/Common/Html/Pages/Lib.hs

@@ -27,11 +27,18 @@ module Cardano.Wallet.UI.Common.Html.Pages.Lib
     , Striped (..)
     , onStriped
     , box
+    , addressH
     )
 where
 
 import Prelude
 
+import Cardano.Wallet.Deposit.Pure.API.Address
+    ( encodeAddress
+    )
+import Cardano.Wallet.Deposit.Read
+    ( Address
+    )
 import Cardano.Wallet.UI.Common.Html.Htmx
     ( hxExt_
     , hxGet_
@@ -40,7 +47,9 @@ import Cardano.Wallet.UI.Common.Html.Htmx
     , hxTrigger_
     )
 import Cardano.Wallet.UI.Common.Html.Lib
-    ( linkText
+    ( WithCopy
+    , linkText
+    , truncatableText
     )
 import Cardano.Wallet.UI.Lib.ListOf
     ( Cons (..)
@@ -141,30 +150,40 @@ onStriped s a b = case s of
 
 -- | Render a list of 'AssocRow' as a table. We use 'listOf' to allow 'do' notation
 -- in the definition of the rows
-record :: Maybe Int -> Width -> Striped -> ListOf (AssocRow m) -> Monad m => HtmlT m ()
+record
+    :: Maybe Int
+    -> Width
+    -> Striped
+    -> ListOf (AssocRow m)
+    -> Monad m
+    => HtmlT m ()
 record n w s xs =
     table_
-        [ class_ $ "border-top table table-hover mb-0" <> onStriped s " table-striped" ""
+        [ class_
+            $ "border-top table table-hover mb-0" <> onStriped s " table-striped" ""
         , style_
             $ onWidth w "width: auto" ""
         ]
         $ mapM_ (assocRowH n)
         $ listOf xs
 
 -- | Create an 'AssocRow' from a key and a value.
-field :: [Attribute] -> HtmlT m () -> HtmlT m () -> ListOf (AssocRow m)
+field
+    :: [Attribute] -> HtmlT m () -> HtmlT m () -> ListOf (AssocRow m)
 field attrs key val = singleton $ Elem $ AssocRow attrs key val
 
 -- | Create a simple 'AssocRow' from a key and a value. where the key is a 'Text'.
 simpleField :: Monad m => Text -> HtmlT m () -> ListOf (AssocRow m)
 simpleField = field [] . toHtml
 
 -- | Create an 'AssocRow' from a key and a value where the value is an 'Html'.
-fieldHtml :: Monad m => [Attribute] -> Text -> HtmlT m () -> ListOf (AssocRow m)
+fieldHtml
+    :: Monad m => [Attribute] -> Text -> HtmlT m () -> ListOf (AssocRow m)
 fieldHtml as = field as . toHtml
 
 -- | Create an 'AssocRow' from a key and a value where the value is a 'Show' instance.
-fieldShow :: (Show a, Monad m) => [Attribute] -> Text -> a -> ListOf (AssocRow m)
+fieldShow
+    :: (Show a, Monad m) => [Attribute] -> Text -> a -> ListOf (AssocRow m)
 fieldShow attrs key val = field attrs (toHtml key) (toHtml $ show val)
 
 fadeInId :: Monad m => HtmlT m ()
@@ -178,14 +197,14 @@ fadeInId =
 -- whenever some specific events are received from an SSE endpoint.
 -- It also self populate on load.
 sseH
-    :: Link
+    :: Monad m
+    => Link
     -- ^ Link to fetch data from
     -> Text
     -- ^ Target element
     -> [Text]
     -- ^ Events to trigger onto
-    -> Monad m
-    => HtmlT m ()
+    -> HtmlT m ()
 sseH link target events = do
     do
         div_
@@ -254,7 +273,23 @@ showThousandDots = reverse . showThousandDots' . reverse . show
         in
             a <> if null b then [] else "." <> showThousandDots' b
 
-box :: Monad m => HtmlT m () -> HtmlT m () -> HtmlT m () -> HtmlT m ()
+addressH :: Monad m => WithCopy -> Address -> HtmlT m ()
+addressH copy addr =
+    truncatableText copy ("address-text-" <> encodedAddr)
+        $ toHtml encodedAddr
+  where
+    encodedAddr = encodeAddress addr
+
+-- | A box with a title, a subtitle and a content.
+box
+    :: Monad m
+    => HtmlT m ()
+    -- ^ title
+    -> HtmlT m ()
+    -- ^ subtitle
+    -> HtmlT m ()
+    -- ^ content
+    -> HtmlT m ()
 box x y z = div_ [class_ "bg-body-secondary pb-1"] $ do
     nav_ [class_ "navbar  p-1 justify-content-center pb-0"]
         $ do

lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs

@@ -10,9 +10,6 @@ import Prelude
 import Cardano.Wallet.Deposit.IO
     ( WalletPublicIdentity (..)
     )
-import Cardano.Wallet.Deposit.Read
-    ( Address
-    )
 import Cardano.Wallet.UI.Common.Html.Htmx
     ( hxInclude_
     , hxPost_
@@ -21,9 +18,7 @@ import Cardano.Wallet.UI.Common.Html.Htmx
     )
 import Cardano.Wallet.UI.Common.Html.Lib
     ( AlertH
-    , WithCopy
     , linkText
-    , truncatableText
     )
 import Cardano.Wallet.UI.Common.Html.Pages.Lib
     ( AssocRow
@@ -45,9 +40,6 @@ import Cardano.Wallet.UI.Deposit.Html.Pages.Wallet
     ( WalletPresent (..)
     , onWalletPresentH
     )
-import Cardano.Wallet.UI.Lib.Address
-    ( encodeMainnetAddress
-    )
 import Cardano.Wallet.UI.Lib.ListOf
     ( ListOf
     )
@@ -65,8 +57,6 @@ import Data.Time
     )
 import Lucid
     ( Html
-    , HtmlT
-    , ToHtml (..)
     , class_
     , div_
     , id_
@@ -90,13 +80,6 @@ addressesH :: WHtml ()
 addressesH = do
     sseH addressesLink "addresses" ["wallet"]
 
-customerAddressH :: Monad m => WithCopy -> Address -> HtmlT m ()
-customerAddressH copy addr =
-    truncatableText copy ("address-text-" <> encodedAddr)
-        $ toHtml encodedAddr
-  where
-    encodedAddr = encodeMainnetAddress addr
-
 addressElementH
     :: UTCTime -> UTCTime -> AlertH -> WalletPresent -> Html ()
 addressElementH now origin = onWalletPresentH $ \case

lib/ui/src/Cardano/Wallet/UI/Deposit/Server/Addresses.hs

@@ -23,7 +23,8 @@ import Cardano.Wallet.UI.Common.Html.Lib
     ( WithCopy (..)
     )
 import Cardano.Wallet.UI.Common.Html.Pages.Lib
-    ( alertH
+    ( addressH
+    , alertH
     )
 import Cardano.Wallet.UI.Common.Layer
     ( UILayer (..)
@@ -44,7 +45,6 @@ import Cardano.Wallet.UI.Deposit.Handlers.Addresses.Transactions
     )
 import Cardano.Wallet.UI.Deposit.Html.Pages.Addresses
     ( addressElementH
-    , customerAddressH
     )
 import Cardano.Wallet.UI.Deposit.Html.Pages.Addresses.Transactions
     ( customerHistoryH
@@ -80,7 +80,7 @@ serveGetAddress
 serveGetAddress ul c = withSessionLayer ul $ \l -> do
     getCustomerAddress
         l
-        (renderSmoothHtml . customerAddressH WithCopy)
+        (renderSmoothHtml . addressH WithCopy)
         alert
         c