From 90fca336d20c880b99afee18ec229c3e7094d8d9 Mon Sep 17 00:00:00 2001 From: Claus-Peter Huebner Date: Thu, 28 Sep 2023 23:08:23 +0200 Subject: [PATCH] solve merge-conflict --- .../resolver/util/settlePendingSenderTransaction.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts index ac9318f42..b9c7d8b36 100644 --- a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts +++ b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable new-cap */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -/* + import { getConnection } from '@dbTools/typeorm' import { Community as DbCommunity } from '@entity/Community' import { PendingTransaction as DbPendingTransaction } from '@entity/PendingTransaction' @@ -94,7 +94,7 @@ export async function settlePendingSenderTransaction( await queryRunner.commitTransaction() logger.info(`commit send Transaction successful...`) - --* + /* await EVENT_TRANSACTION_SEND(sender, recipient, transactionSend, transactionSend.amount) await EVENT_TRANSACTION_RECEIVE( @@ -103,7 +103,7 @@ export async function settlePendingSenderTransaction( transactionReceive, transactionReceive.amount, ) - *-- + */ // trigger to send transaction via dlt-connector // void sendTransactionsToDltConnector() } catch (e) { @@ -113,7 +113,7 @@ export async function settlePendingSenderTransaction( await queryRunner.release() releaseLock() } - --* + /* void sendTransactionReceivedEmail({ firstName: recipient.firstName, lastName: recipient.lastName, @@ -141,7 +141,6 @@ export async function settlePendingSenderTransaction( } finally { releaseLock() } - *-- + */ return true } -*/