Compare commits

..

2 commits

2 changed files with 20 additions and 2 deletions

View file

@ -1390,6 +1390,22 @@ getBalance pool za = do
let oBal = sum oAmts let oBal = sum oAmts
return . fromIntegral $ tBal + sBal + oBal return . fromIntegral $ tBal + sBal + oBal
getTransparentBalance :: ConnectionPool -> ZcashAccountId -> IO Integer
getTransparentBalance pool za = do
trNotes <- getWalletUnspentTrNotes pool za
let tAmts = map (walletTrNoteValue . entityVal) trNotes
return . fromIntegral $ sum tAmts
getShieldedBalance :: ConnectionPool -> ZcashAccountId -> IO Integer
getShieldedBalance pool za = do
sapNotes <- getWalletUnspentSapNotes pool za
let sAmts = map (walletSapNoteValue . entityVal) sapNotes
let sBal = sum sAmts
orchNotes <- getWalletUnspentOrchNotes pool za
let oAmts = map (walletOrchNoteValue . entityVal) orchNotes
let oBal = sum oAmts
return . fromIntegral $ sBal + oBal
getUnconfirmedBalance :: ConnectionPool -> ZcashAccountId -> IO Integer getUnconfirmedBalance :: ConnectionPool -> ZcashAccountId -> IO Integer
getUnconfirmedBalance pool za = do getUnconfirmedBalance pool za = do
trNotes <- getWalletUnspentUnconfirmedTrNotes pool za trNotes <- getWalletUnspentUnconfirmedTrNotes pool za

View file

@ -866,10 +866,11 @@ handleEvent wenv node model evt =
ShowSend -> [Model $ model & openSend .~ True] ShowSend -> [Model $ model & openSend .~ True]
SendTx -> SendTx ->
case currentAccount of case currentAccount of
Nothing -> [Event $ ShowError "No account available"] Nothing -> [Event $ ShowError "No account available", Event CancelSend]
Just acc -> Just acc ->
case currentWallet of case currentWallet of
Nothing -> [Event $ ShowError "No wallet available"] Nothing ->
[Event $ ShowError "No wallet available", Event CancelSend]
Just wal -> Just wal ->
[ Producer $ [ Producer $
sendTransaction sendTransaction
@ -880,6 +881,7 @@ handleEvent wenv node model evt =
(model ^. sendAmount) (model ^. sendAmount)
(model ^. sendRecipient) (model ^. sendRecipient)
(model ^. sendMemo) (model ^. sendMemo)
, Event CancelSend
] ]
CancelSend -> CancelSend ->
[ Model $ [ Model $