Compare commits

..

No commits in common. "96c9df571ee2cd58803f6149475db0c7f52ecf87" and "1673e653eb3d637dd15fde0bfeb35fe555f384b4" have entirely different histories.

2 changed files with 2 additions and 20 deletions

View file

@ -1390,22 +1390,6 @@ getBalance pool za = do
let oBal = sum oAmts
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 pool za = do
trNotes <- getWalletUnspentUnconfirmedTrNotes pool za

View file

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