From f527cefe9583bdcff0dfbbf8342f16084b07bdf7 Mon Sep 17 00:00:00 2001 From: paolino Date: Sat, 21 Sep 2024 19:41:54 +0000 Subject: [PATCH 1/2] Remove titles in the middle of the pages --- lib/ui/src/Cardano/Wallet/UI/Deposit/API.hs | 1 - lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs | 2 -- lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs | 3 --- 3 files changed, 6 deletions(-) diff --git a/lib/ui/src/Cardano/Wallet/UI/Deposit/API.hs b/lib/ui/src/Cardano/Wallet/UI/Deposit/API.hs index 347e610119a..3c04c186f46 100644 --- a/lib/ui/src/Cardano/Wallet/UI/Deposit/API.hs +++ b/lib/ui/src/Cardano/Wallet/UI/Deposit/API.hs @@ -4,7 +4,6 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs index 1b24ec006e9..5276cde0892 100644 --- a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs +++ b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs @@ -52,7 +52,6 @@ import Lucid , ToHtml (..) , class_ , div_ - , h5_ , id_ , input_ , min_ @@ -88,7 +87,6 @@ addressElementH :: (BL.ByteString -> Html ()) -> WalletPresent -> Html () addressElementH alert = \case WalletPresent (WalletPublicIdentity _xpub customers) -> do div_ [class_ "row mt-5"] $ do - h5_ [class_ "text-center"] "Addresses" div_ [class_ "col"] $ record $ do simpleField "Customer Number" $ input_ diff --git a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs index cd65b503695..d31736ea249 100644 --- a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs +++ b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs @@ -89,7 +89,6 @@ import Lucid , button_ , class_ , div_ - , h5_ , hr_ , id_ , p_ @@ -182,12 +181,10 @@ walletElementH :: (BL.ByteString -> Html ()) -> WalletPresent -> Html () walletElementH alert = \case WalletPresent (WalletPublicIdentity xpub customers) -> do div_ [class_ "row mt-5 "] $ do - h5_ [class_ "text-center"] "Details" div_ [class_ "col"] $ record $ do simpleField "Public Key" $ pubKeyH xpub simpleField "Tracked Addresses" $ toHtml $ toText customers div_ [class_ "row mt-5"] $ do - h5_ [class_ "text-center"] "Administration" div_ [class_ "col"] $ do deleteWalletButtonH div_ [id_ "delete-result"] mempty From 2c0d72ae35937dab808941329d3ca8cdec811731 Mon Sep 17 00:00:00 2001 From: paolino Date: Sat, 21 Sep 2024 20:05:10 +0000 Subject: [PATCH 2/2] Display full information on larger displays --- .../Wallet/UI/Deposit/Html/Pages/Addresses.hs | 3 +- .../Wallet/UI/Deposit/Html/Pages/Wallet.hs | 28 ++++--------------- .../src/Cardano/Wallet/UI/Deposit/Server.hs | 4 +-- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs index 5276cde0892..fd5d654f4ac 100644 --- a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs +++ b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Addresses.hs @@ -74,7 +74,8 @@ addressesH = do customerAddressH :: Monad m => Address -> HtmlT m () customerAddressH addr = div_ [class_ "d-flex justify-content-end"] $ do div_ (copyableHidden "address") $ toHtml encodedAddr - div_ [class_ ""] $ toHtml addrShortened + div_ [class_ "d-block d-md-none"] $ toHtml addrShortened + div_ [class_ "d-none d-md-block"] $ toHtml encodedAddr div_ [class_ "ms-1"] $ copyButton "address" where encodedAddr = encodeMainnetAddress addr diff --git a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs index d31736ea249..e040dbd06c9 100644 --- a/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs +++ b/lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Wallet.hs @@ -14,9 +14,6 @@ import Cardano.Address.Derivation import Cardano.Wallet.Deposit.IO ( WalletPublicIdentity (..) ) -import Cardano.Wallet.Deposit.Read - ( Address - ) import Cardano.Wallet.Deposit.REST ( ErrDatabase ) @@ -58,9 +55,6 @@ import Cardano.Wallet.UI.Deposit.API , walletPostMnemonicLink , walletPostXPubLink ) -import Cardano.Wallet.UI.Lib.Address - ( encodeMainnetAddress - ) import Cardano.Wallet.UI.Type ( WHtml , WalletType (..) @@ -97,7 +91,6 @@ import Lucid import qualified Data.ByteString.Char8 as B8 import qualified Data.ByteString.Lazy.Char8 as BL -import qualified Data.Text as T data WalletPresent = WalletPresent WalletPublicIdentity @@ -125,24 +118,15 @@ walletH = sseH walletLink "wallet" ["wallet"] base64 :: ByteString -> ByteString base64 = convertToBase Base64 -customerAddressH :: Monad m => Address -> HtmlT m () -customerAddressH addr = div_ [class_ "d-flex justify-content-end"] $ do - div_ (copyableHidden "address") $ toHtml encodedAddr - div_ [class_ ""] $ toHtml addrShortened - div_ [class_ "ms-1"] $ copyButton "address" - where - encodedAddr = encodeMainnetAddress addr - addrShortened = - T.take 10 (T.drop 5 encodedAddr) - <> " .. " - <> T.takeEnd 10 encodedAddr - pubKeyH :: Monad m => XPub -> HtmlT m () pubKeyH xpub = div_ [class_ "d-flex justify-content-end"] $ do div_ (copyableHidden "public_key") $ toHtml xpubByteString - div_ [class_ ""] $ toHtml $ headAndTail 4 $ B8.dropEnd 1 xpubByteString - div_ [class_ "ms-1"] - $ copyButton "public_key" + div_ [class_ "d-block d-lg-none"] + $ toHtml + $ headAndTail 5 + $ B8.dropEnd 1 xpubByteString + div_ [class_ "d-none d-lg-block"] $ toHtml xpubByteString + div_ [class_ "ms-1"] $ copyButton "public_key" where xpubByteString = base64 $ xpubToBytes xpub diff --git a/lib/ui/src/Cardano/Wallet/UI/Deposit/Server.hs b/lib/ui/src/Cardano/Wallet/UI/Deposit/Server.hs index c981723ecef..4b9a82af27c 100644 --- a/lib/ui/src/Cardano/Wallet/UI/Deposit/Server.hs +++ b/lib/ui/src/Cardano/Wallet/UI/Deposit/Server.hs @@ -99,6 +99,7 @@ import Cardano.Wallet.UI.Deposit.Handlers.Wallet ) import Cardano.Wallet.UI.Deposit.Html.Pages.Addresses ( addressElementH + , customerAddressH ) import Cardano.Wallet.UI.Deposit.Html.Pages.Page ( Page (..) @@ -106,8 +107,7 @@ import Cardano.Wallet.UI.Deposit.Html.Pages.Page , page ) import Cardano.Wallet.UI.Deposit.Html.Pages.Wallet - ( customerAddressH - , deleteWalletModalH + ( deleteWalletModalH , walletElementH ) import Control.Monad.Trans