From 6875917ec7992b9a8d5abe16413aae1ad5fb574f Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Tue, 20 Aug 2024 16:46:01 -0500 Subject: [PATCH] Fix button style --- src/Zenith/GUI/Theme.hs | 3 +++ src/Zenith/Utils.hs | 10 +++++----- zcash-haskell | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Zenith/GUI/Theme.hs b/src/Zenith/GUI/Theme.hs index 6b59ef3..2e2cd4b 100644 --- a/src/Zenith/GUI/Theme.hs +++ b/src/Zenith/GUI/Theme.hs @@ -49,6 +49,9 @@ zenithTheme = L.active . L.btnStyle . L.text ?~ baseTextStyle & + L.disabled . + L.btnStyle . L.text ?~ + baseTextStyle & L.basic . L.btnMainStyle . L.text ?~ hiliteTextStyle & diff --git a/src/Zenith/Utils.hs b/src/Zenith/Utils.hs index 1410429..61e0daa 100644 --- a/src/Zenith/Utils.hs +++ b/src/Zenith/Utils.hs @@ -9,8 +9,8 @@ import Data.Ord (clamp) import Data.Scientific (Scientific(..), scientific) import qualified Data.Text as T import qualified Data.Text.Encoding as E -import System.Process (createProcess_, shell) import System.Directory +import System.Process (createProcess_, shell) import Text.Regex.Posix import ZcashHaskell.Orchard (encodeUnifiedAddress, isValidUnifiedAddress) import ZcashHaskell.Sapling (decodeSaplingAddress, isValidShieldedAddress) @@ -86,7 +86,7 @@ validateAddress txt --(tReg || sReg && isJust chk) || (uReg && isJust chk) -- | Return True if Address is valid validateAddressBool :: T.Text -> Bool -validateAddressBool a = do +validateAddressBool a = do case (validateAddress a) of Nothing -> False _ -> True @@ -100,9 +100,9 @@ copyAddress a = -- | Get current user and build zenith path getZenithPath :: IO String -getZenithPath = do +getZenithPath = do homeDirectory <- getHomeDirectory - return (homeDirectory ++ "/Zenith/") + return (homeDirectory ++ "/Zenith/") -- | Bound a value to the 0..1 range, used for progress reporting on UIs validBarValue :: Float -> Float @@ -117,7 +117,7 @@ isRecipientValid a = (case decodeTransparentAddress (E.encodeUtf8 a) of Just _a3 -> True Nothing -> - case decodeExchangeAddress a of + case decodeExchangeAddress (E.encodeUtf8 a) of Just _a4 -> True Nothing -> False) diff --git a/zcash-haskell b/zcash-haskell index e807441..0b2fae2 160000 --- a/zcash-haskell +++ b/zcash-haskell @@ -1 +1 @@ -Subproject commit e8074419cfb54559a4c09731ad2448d5930869a2 +Subproject commit 0b2fae2b5db6878b7669d639a5cb8c73b986906e