aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-05-15 17:23:49 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-05-15 17:23:49 +0530
commit59178331a46467e0eb6f4dc0331f8d52d9afcb3c (patch)
tree3871fa5844ecfcecb16b2339e4b98e2e3060a93b
parent87f9e7b1e3e4ed78440d3b5108cfa538768644f3 (diff)
show withdrawal transaction continuouslyv0.7.1-dev.5
-rw-r--r--src/operations/transactions.ts41
1 files changed, 20 insertions, 21 deletions
diff --git a/src/operations/transactions.ts b/src/operations/transactions.ts
index 20adf320e..5602c6b04 100644
--- a/src/operations/transactions.ts
+++ b/src/operations/transactions.ts
@@ -166,25 +166,19 @@ export async function getTransactions(
return;
}
- if (transactionsRequest?.search)
- if (wsr.rawWithdrawalAmount.currency)
- if (wsr.timestampFinish) {
- transactions.push({
- type: TransactionType.Withdrawal,
- amountEffective: Amounts.stringify(
- wsr.denomsSel.totalCoinValue,
- ),
- amountRaw: Amounts.stringify(wsr.denomsSel.totalWithdrawCost),
- confirmed: true,
- exchangeBaseUrl: wsr.exchangeBaseUrl,
- pending: !wsr.timestampFinish,
- timestamp: wsr.timestampStart,
- transactionId: makeEventId(
- TransactionType.Withdrawal,
- wsr.withdrawalGroupId,
- ),
- });
- }
+ transactions.push({
+ type: TransactionType.Withdrawal,
+ amountEffective: Amounts.stringify(wsr.denomsSel.totalCoinValue),
+ amountRaw: Amounts.stringify(wsr.denomsSel.totalWithdrawCost),
+ confirmed: true,
+ exchangeBaseUrl: wsr.exchangeBaseUrl,
+ pending: !wsr.timestampFinish,
+ timestamp: wsr.timestampStart,
+ transactionId: makeEventId(
+ TransactionType.Withdrawal,
+ wsr.withdrawalGroupId,
+ ),
+ });
});
tx.iter(Stores.reserves).forEach((r) => {
@@ -194,8 +188,13 @@ export async function getTransactions(
if (shouldSkipSearch(transactionsRequest, [])) {
return;
}
- if (r.reserveStatus !== ReserveRecordStatus.WAIT_CONFIRM_BANK) {
- return;
+ switch (r.reserveStatus) {
+ case ReserveRecordStatus.WAIT_CONFIRM_BANK:
+ break;
+ case ReserveRecordStatus.WITHDRAWING:
+ break;
+ default:
+ return;
}
if (!r.bankInfo) {
return;