lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1550 from chaotixkilla/fix-cancel-batched-txs

Browse source 
[LAM-891] Allow for batched transactions to be canceled
This commit is contained in:
Rafael Taranto 2023-06-15 20:27:44 +01:00 • committed by GitHub
commit f0d992a35c
12 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
new-lamassu-admin/src/pages/Transactions/DetailsCard.js
View file

@ -383,7 +383,8 @@ const DetailsRow = ({ it: tx, timezone }) => {
) : (
errorElements
)}
{tx.txClass === 'cashOut' && getStatus(tx) === 'Pending' && (
{((tx.txClass === 'cashOut' && getStatus(tx) === 'Pending') ||
(tx.txClass === 'cashIn' && getStatus(tx) === 'Batched')) && (
<ActionButton
color="primary"
Icon={CancelIcon}