CHANGELOG.md

@@ -28,7 +28,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Upgraded to GHC 9.6.5
-- Implemented config and data folder
 
 ### Fixed
 

app/Main.hs

@@ -202,7 +202,7 @@ processUri user pwd =
 
 main :: IO ()
 main = do
-  config <- load ["$(HOME)/Zenith/zenith.cfg"]
+  config <- load ["zenith.cfg"]
   args <- getArgs
   dbFilePath <- require config "dbFilePath"
   {-nodeUser <- require config "nodeUser"-}

src/Zenith/GUI.hs

@@ -25,8 +25,6 @@ import Lens.Micro ((&), (+~), (.~), (?~), (^.), set)
 import Lens.Micro.TH
 import Monomer
 import qualified Monomer.Lens as L
-import System.Directory (getHomeDirectory)
-import System.FilePath ((</>))
 import System.Hclip
 import Text.Printf
 import Text.Wrap (FillScope(..), FillStrategy(..), WrapSettings(..), wrapText)
@@ -143,7 +141,6 @@ data AppModel = AppModel
   , _recipientValid :: !Bool
   , _amountValid :: !Bool
   , _showId :: !(Maybe T.Text)
-  , _home :: !FilePath
   } deriving (Eq, Show)
 
 makeLenses ''AppModel
@@ -443,11 +440,7 @@ buildUI wenv model = widgetTree
                                  (fromIntegral $ qrCodeWidth qr))
                               [fitWidth]
                           Nothing ->
-                            image_
+                            image_ "./assets/1F928_color.png" [fitEither]) `styleBasic`
-                              (T.pack $
-                               (model ^. home) </>
-                               "Zenith/assets/1F928_color.png")
-                              [fitEither]) `styleBasic`
                      [bgColor white, height 100, width 100]
                    , filler
                    ] `styleBasic`
@@ -511,9 +504,7 @@ buildUI wenv model = widgetTree
         , spacer
         , label (showt $ model ^. timer) `styleBasic` [padding 3, textSize 8]
         , filler
-        , image_
+        , image_ "./assets/1F993.png" [fitHeight] `styleBasic`
-            (T.pack $ (model ^. home) </> "Zenith/assets/1F993.png")
-            [fitHeight] `styleBasic`
           [height 24, width 24] `nodeVisible`
           (model ^. zebraOn)
         , label
@@ -1251,10 +1242,6 @@ txtWrap = wrapText (WrapSettings False True NoFill FillAfterFirst) 32
 
 runZenithGUI :: Config -> IO ()
 runZenithGUI config = do
-  homeDir <- try getHomeDirectory :: IO (Either IOError FilePath)
-  case homeDir of
-    Left e -> print e
-    Right hD -> do
   let host = c_zebraHost config
   let port = c_zebraPort config
   let dbFilePath = c_dbPath config
@@ -1273,13 +1260,11 @@ runZenithGUI config = do
           walList <- getWallets pool $ zgb_net chainInfo
           accList <-
             if not (null walList)
-                  then runNoLoggingT $
+              then runNoLoggingT $ getAccounts pool $ entityKey $ head walList
-                       getAccounts pool $ entityKey $ head walList
               else return []
           addrList <-
             if not (null accList)
-                  then runNoLoggingT $
+              then runNoLoggingT $ getAddresses pool $ entityKey $ head accList
-                       getAddresses pool $ entityKey $ head accList
               else return []
           txList <-
             if not (null addrList)
@@ -1342,8 +1327,7 @@ runZenithGUI config = do
                   False
                   False
                   Nothing
-                      hD
+          startApp model handleEvent buildUI params
-              startApp model handleEvent buildUI (params hD)
     Left e -> do
       initDb dbFilePath
       let model =
@@ -1388,26 +1372,16 @@ runZenithGUI config = do
               False
               False
               Nothing
-                  hD
+      startApp model handleEvent buildUI params
-          startApp model handleEvent buildUI (params hD)
   where
-    params hd =
+    params =
       [ appWindowTitle "Zenith - Zcash Full Node Wallet"
       , appWindowState $ MainWindowNormal (1000, 700)
       , appTheme zenithTheme
-      , appFontDef
+      , appFontDef "Regular" "./assets/Atkinson-Hyperlegible-Regular-102.ttf" --"./assets/DejaVuSansMono.ttf" 
-          "Regular"
+      , appFontDef "Bold" "./assets/Atkinson-Hyperlegible-Bold-102.ttf"
-          (T.pack $
+      , appFontDef "Italic" "./assets/Atkinson-Hyperlegible-Italic-102.ttf"
-           hd </>
+      , appFontDef "Remix" "./assets/remixicon.ttf"
-           "Zenith/assets/Atkinson-Hyperlegible-Regular-102.ttf" --"./assets/DejaVuSansMono.ttf" 
-           )
-      , appFontDef
-          "Bold"
-          (T.pack $ hd </> "Zenith/assets/Atkinson-Hyperlegible-Bold-102.ttf")
-      , appFontDef
-          "Italic"
-          (T.pack $ hd </> "Zenith/assets/Atkinson-Hyperlegible-Italic-102.ttf")
-      , appFontDef "Remix" (T.pack $ hd </> "Zenith/assets/remixicon.ttf")
       , appDisableAutoScale True
       , appScaleFactor 2.0
       , appInitEvent AppInit

zcash-haskell

@@ -1 +1 @@
-Subproject commit e8074419cfb54559a4c09731ad2448d5930869a2
+Subproject commit 90c8a7c3028bd6836dea5655221277a25d457653

zenith.cabal

@@ -47,8 +47,6 @@ library
     , brick
     , bytestring
     , data-default
-    , directory
-    , filepath
     , esqueleto
     , resource-pool
     , binary