From c6e006edf3e45cdc13cc5c86c5082362204ac995 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Mon, 3 Jun 2024 11:33:43 -0500
Subject: [PATCH 1/2] Fix issue 015

---
 CHANGELOG.md      |  6 ++++++
 src/Zenith/CLI.hs | 10 +++++++---
 zenith.cabal      |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a865617..b8ddb47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.3.0-beta]
+
+## Fixed
+
+- Wallet sync when no new block has been detected on-chain.
+
 ## [0.5.2.0-beta]
 
 ### Changed
diff --git a/src/Zenith/CLI.hs b/src/Zenith/CLI.hs
index b46d04b..953b0a8 100644
--- a/src/Zenith/CLI.hs
+++ b/src/Zenith/CLI.hs
@@ -348,7 +348,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
                   (str
                      " _____          _ _   _     \n|__  /___ _ __ (_) |_| |__\n  / // _ \\ '_ \\| | __| '_ \\\n / /|  __/ | | | | |_| | | |\n/____\\___|_| |_|_|\\__|_| |_|") <=>
                 C.hCenter
-                  (withAttr titleAttr (str "Zcash Wallet v0.5.2.0-beta")) <=>
+                  (withAttr titleAttr (str "Zcash Wallet v0.5.3.0-beta")) <=>
                 C.hCenter (withAttr blinkAttr $ str "Press any key..."))
         else emptyWidget
     capCommand :: String -> String -> Widget Name
@@ -590,8 +590,12 @@ scanZebra dbP zHost zPort b eChan = do
       liftIO $ BC.writeBChan eChan $ TickMsg "Invalid starting block for scan"
     else do
       let bList = [(sb + 1) .. (zgb_blocks bStatus)]
-      let step = (1.0 :: Float) / fromIntegral (zgb_blocks bStatus - (sb + 1))
-      mapM_ (processBlock pool step) bList
+      if not (null bList)
+        then do
+          let step =
+                (1.0 :: Float) / fromIntegral (zgb_blocks bStatus - (sb + 1))
+          mapM_ (processBlock pool step) bList
+        else liftIO $ BC.writeBChan eChan $ TickVal 1.0
   where
     processBlock :: ConnectionPool -> Float -> Int -> IO ()
     processBlock pool step bl = do
diff --git a/zenith.cabal b/zenith.cabal
index 09a664c..c7dedb1 100644
--- a/zenith.cabal
+++ b/zenith.cabal
@@ -1,6 +1,6 @@
 cabal-version:    3.0
 name:             zenith
-version:          0.5.2.0-beta
+version:          0.5.3.0-beta
 license:          MIT
 license-file:     LICENSE
 author:           Rene Vergara

From 006c101c0605e6d63f15d7cbbd0ce9840e5b8cf3 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Mon, 3 Jun 2024 12:18:18 -0500
Subject: [PATCH 2/2] Fix issue 010

---
 CHANGELOG.md      | 6 +++++-
 src/Zenith/CLI.hs | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8ddb47..8daee9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.5.3.0-beta]
 
-## Fixed
+### Changed
+
+- Improved formatting of sync progress
+
+### Fixed
 
 - Wallet sync when no new block has been detected on-chain.
 
diff --git a/src/Zenith/CLI.hs b/src/Zenith/CLI.hs
index 953b0a8..dcc2e7f 100644
--- a/src/Zenith/CLI.hs
+++ b/src/Zenith/CLI.hs
@@ -76,6 +76,7 @@ import Lens.Micro ((&), (.~), (^.), set)
 import Lens.Micro.Mtl
 import Lens.Micro.TH
 import System.Hclip
+import Text.Printf
 import Text.Wrap (FillScope(..), FillStrategy(..), WrapSettings(..), wrapText)
 import ZcashHaskell.Keys (generateWalletSeedPhrase, getWalletSeed)
 import ZcashHaskell.Orchard (getSaplingFromUA, isValidUnifiedAddress)
@@ -453,7 +454,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
                      , (barToDoAttr, P.progressIncompleteAttr)
                      ])
                   (P.progressBar
-                     (Just $ show (st ^. barValue * 100))
+                     (Just $ printf "%.2f%%" (st ^. barValue * 100))
                      (_barValue st))))
         SendDisplay ->
           withBorderStyle unicodeBold $