From ed74e69047721c4cd17f4200004f7587d67a7517 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 1 May 2021 10:47:04 +0200
Subject: [PATCH] Migrate transaction table

---
 apps/api/src/app/order/order.controller.ts    |  6 ++++-
 .../transactions-table.component.html         | 24 ++++++++-----------
 .../transactions-table.component.ts           |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts
index 63bd91943..0c459b2a7 100644
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@@ -71,7 +71,11 @@ export class OrderController {
 
     let orders = await this.orderService.orders({
       include: {
-        Platform: true
+        Account: {
+          include: {
+            Platform: true
+          }
+        }
       },
       orderBy: { date: 'desc' },
       where: { userId: impersonationUserId || this.request.user.id }
diff --git a/apps/client/src/app/components/transactions-table/transactions-table.component.html b/apps/client/src/app/components/transactions-table/transactions-table.component.html
index f9d561558..bacf72849 100644
--- a/apps/client/src/app/components/transactions-table/transactions-table.component.html
+++ b/apps/client/src/app/components/transactions-table/transactions-table.component.html
@@ -17,25 +17,21 @@
   mat-table
   [dataSource]="dataSource"
 >
-  <ng-container matColumnDef="platform">
-    <th
-      *matHeaderCellDef
-      class="d-none d-lg-table-cell text-center px-0"
-      i18n
-      mat-header-cell
-    >
-      Platform
-    </th>
-    <td *matCellDef="let element" class="d-none d-lg-table-cell px-0" mat-cell>
-      <div class="d-flex justify-content-center">
+  <ng-container matColumnDef="account">
+    <th *matHeaderCellDef i18n mat-header-cell mat-sort-header>Account</th>
+    <td *matCellDef="let element" mat-cell>
+      <div class="d-flex">
         <gf-symbol-icon
-          *ngIf="element.Platform?.url"
-          [tooltip]="element.Platform?.name"
-          [url]="element.Platform?.url"
+          *ngIf="element.Account?.Platform?.url"
+          class="mr-2"
+          [tooltip]="element.Account?.Platform?.name"
+          [url]="element.Account?.Platform?.url"
         ></gf-symbol-icon>
+        <span class="d-none d-lg-block">{{ element.Account?.name }}</span>
       </div>
     </td>
   </ng-container>
+
   <ng-container matColumnDef="date">
     <th
       *matHeaderCellDef
diff --git a/apps/client/src/app/components/transactions-table/transactions-table.component.ts b/apps/client/src/app/components/transactions-table/transactions-table.component.ts
index c0cfe05af..4bd084395 100644
--- a/apps/client/src/app/components/transactions-table/transactions-table.component.ts
+++ b/apps/client/src/app/components/transactions-table/transactions-table.component.ts
@@ -68,7 +68,7 @@ export class TransactionsTableComponent
 
   public ngOnChanges() {
     this.displayedColumns = [
-      'platform',
+      'account',
       'date',
       'type',
       'symbol',