Merge pull request #3044 from DFXswiss/develop

Release: develop -> main

Author: davidleomay

src/subdomains/core/custody/services/custody-order.service.ts

@@ -118,7 +118,7 @@ export class CustodyOrderService {
         );
 
         orderDto.swap = await this.swapService.getById(swapPaymentInfo.routeId);
-        orderDto.outputAsset = targetAsset;
+        orderDto.outputAsset = sourceAsset;
         orderDto.outputAmount = swapPaymentInfo.amount;
         paymentInfo = CustodyOrderResponseDtoMapper.mapSwapPaymentInfo(swapPaymentInfo);
         break;
@@ -147,7 +147,7 @@ export class CustodyOrderService {
         );
 
         orderDto.swap = await this.swapService.getById(swapPaymentInfo.routeId);
-        orderDto.outputAsset = targetAsset;
+        orderDto.outputAsset = sourceAsset;
         orderDto.outputAmount = swapPaymentInfo.amount;
         paymentInfo = CustodyOrderResponseDtoMapper.mapSwapPaymentInfo(swapPaymentInfo);
         break;

src/subdomains/supporting/bank-tx/bank-tx/services/bank-tx.service.ts

@@ -140,7 +140,7 @@ export class BankTxService implements OnModuleInit {
       try {
         const dates = groupTransactions.map((tx) => (tx.bookingDate ?? tx.created).getTime());
         const fromDate = new Date(Math.min(...dates));
-        const toDate = new Date(Math.max(...dates));
+        const toDate = Util.daysAfter(1, new Date(Math.max(...dates)));
 
         const yapealTransactions = await this.yapealService.getTransactions(accountIban, fromDate, toDate);