From e4498e1b7d029f5447e4354ca025b5f9b18f13e8 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Thu, 16 May 2024 10:47:38 -0500
Subject: [PATCH 1/2] Update to latest branch of ZH

---
 .gitmodules   | 2 +-
 zcash-haskell | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 53b8dda..8a74eac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "zcash-haskell"]
 	path = zcash-haskell
 	url = https://git.vergara.tech/Vergara_Tech/zcash-haskell.git
-	branch = dev040
+	branch = milestone2
diff --git a/zcash-haskell b/zcash-haskell
index 9dddb42..90c8a7c 160000
--- a/zcash-haskell
+++ b/zcash-haskell
@@ -1 +1 @@
-Subproject commit 9dddb42bb3ab78ed0c4d44efb00960ac112c2ce6
+Subproject commit 90c8a7c3028bd6836dea5655221277a25d457653

From a96d7138598a845ec62229a807b0f98d4f3dee77 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Thu, 16 May 2024 11:50:48 -0500
Subject: [PATCH 2/2] Bug fixes for beta version

---
 CHANGELOG.md      | 23 +++++++++++++++++++++++
 src/Zenith/CLI.hs |  9 +++++++--
 zenith.cabal      |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ebaabf..a865617 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,29 @@ 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.2.0-beta]
+
+### Changed
+
+- Update to `zcash-haskell-0.6.2.0` to increase performance of transaction creation
+
+### Fixed
+
+- Truncation of transaction ID when displaying a successfully sent transaction
+- Missing command in menu for Send
+
+## [0.5.1.1-beta.1]
+
+### Changed
+
+- Installation instructions in README
+
+## [0.5.1.1-beta]
+
+### Added
+
+- Implement CLI changes to send transactions
+
 ## [0.5.0.0]
 
 ### Added
diff --git a/src/Zenith/CLI.hs b/src/Zenith/CLI.hs
index 73409e8..b46d04b 100644
--- a/src/Zenith/CLI.hs
+++ b/src/Zenith/CLI.hs
@@ -213,6 +213,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
            [ capCommand "W" "allets"
            , capCommand "A" "ccounts"
            , capCommand "V" "iew address"
+           , capCommand "S" "end Tx"
            , capCommand "Q" "uit"
            , str $ show (st ^. timer)
            ])
@@ -347,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.1.0-beta")) <=>
+                  (withAttr titleAttr (str "Zcash Wallet v0.5.2.0-beta")) <=>
                 C.hCenter (withAttr blinkAttr $ str "Press any key..."))
         else emptyWidget
     capCommand :: String -> String -> Widget Name
@@ -458,7 +459,11 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
           withBorderStyle unicodeBold $
           D.renderDialog
             (D.dialog (Just $ txt "Sending Transaction") Nothing 50)
-            (padAll 1 (str $ st ^. msg))
+            (padAll
+               1
+               (strWrapWith
+                  (WrapSettings False True NoFill FillAfterFirst)
+                  (st ^. msg)))
         BlankDisplay -> emptyWidget
 
 mkInputForm :: DialogInput -> Form DialogInput e Name
diff --git a/zenith.cabal b/zenith.cabal
index 3101182..09a664c 100644
--- a/zenith.cabal
+++ b/zenith.cabal
@@ -1,6 +1,6 @@
 cabal-version:    3.0
 name:             zenith
-version:          0.5.1.0-beta
+version:          0.5.2.0-beta
 license:          MIT
 license-file:     LICENSE
 author:           Rene Vergara