From 60f0760f632cf6094339e71d59a768cf41d381ad Mon Sep 17 00:00:00 2001
From: David May <david.leo.may@gmail.com>
Date: Thu, 1 Sep 2022 13:43:17 +0200
Subject: [PATCH 1/2] [DEV-658] Return account type in KYC info

---
 src/user/models/kyc/kyc.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/user/models/kyc/kyc.service.ts b/src/user/models/kyc/kyc.service.ts
index 908d6fbaec..328549380a 100644
--- a/src/user/models/kyc/kyc.service.ts
+++ b/src/user/models/kyc/kyc.service.ts
@@ -23,6 +23,7 @@ export interface KycInfo {
   kycState: KycState;
   kycHash: string;
   kycDataComplete: boolean;
+  accountType: AccountType;
   depositLimit: number;
   sessionUrl?: string;
   setupUrl?: string;
@@ -213,6 +214,7 @@ export class KycService {
       kycState: userData.kycState,
       kycHash: userData.kycHash,
       kycDataComplete: this.isDataComplete(userData),
+      accountType: userData.accountType,
       depositLimit: userData.depositLimit,
       blankedPhone: Blank(userData.phone, BlankType.PHONE),
       blankedMail: Blank(userData.mail, BlankType.MAIL),

From b06fbaeff6b3f3eebe6abe75ffeb8b0302184e9d Mon Sep 17 00:00:00 2001
From: David May <david.leo.may@gmail.com>
Date: Thu, 1 Sep 2022 13:44:45 +0200
Subject: [PATCH 2/2] [DEV-695] Improved trading log

---
 src/payment/models/exchange/exchange.service.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/payment/models/exchange/exchange.service.ts b/src/payment/models/exchange/exchange.service.ts
index 00bb1d2111..fcca36ee6b 100644
--- a/src/payment/models/exchange/exchange.service.ts
+++ b/src/payment/models/exchange/exchange.service.ts
@@ -146,12 +146,13 @@ export class ExchangeService {
         true,
       );
 
+      const filledAmount = orderSide === OrderSide.BUY ? order.filled * order.price : order.filled;
       console.log(
-        `${this.name}: order ${order.id} is ${order.status} (filled: ${order.filled})/${amount} at price ${order.price}, total: ${totalAmount})`,
+        `${this.name}: order ${order.id} is ${order.status} (filled: ${filledAmount}/${amount} at price ${order.price}, total: ${totalAmount})`,
       );
 
       // check for partial orders
-      if (order?.status != OrderStatus.CANCELED && order?.filled) {
+      if (order.status != OrderStatus.CANCELED && order.filled) {
         orders[order.id] = {
           id: order.id,
           price: order.price,
@@ -160,7 +161,7 @@ export class ExchangeService {
           fee: order.fee,
         };
 
-        amount -= orderSide == OrderSide.BUY ? order.filled * order.price : order.filled;
+        amount -= filledAmount;
       }
 
       numRetries++;