From f87e3a6f513d1804a3a031dc2bef431b8a47f27c Mon Sep 17 00:00:00 2001
From: mantovanig <gabriele.mantovani92@gmail.com>
Date: Tue, 4 May 2021 21:18:11 +0200
Subject: [PATCH] fix: review changes

---
 .../transactions-table.component.html              |  4 ++--
 .../transactions-table.component.ts                |  6 +++---
 .../transactions/transactions-page.component.ts    | 14 +++++++-------
 .../app/pages/transactions/transactions-page.html  |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

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 e5c7c11e3..9d2165180 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
@@ -177,8 +177,8 @@
         <button i18n mat-menu-item (click)="onUpdateTransaction(element)">
           Edit
         </button>
-        <button i18n mat-menu-item (click)="onDuplicateTransaction(element)">
-          Duplicate
+        <button i18n mat-menu-item (click)="onCloneTransaction(element)">
+          Clone
         </button>
         <button i18n mat-menu-item (click)="onDeleteTransaction(element.id)">
           Delete
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 eeacbbfc3..4978701f4 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
@@ -35,8 +35,8 @@ export class TransactionsTableComponent
   @Input() transactions: OrderModel[];
 
   @Output() transactionDeleted = new EventEmitter<string>();
+  @Output() transactionToClone = new EventEmitter<OrderModel>();
   @Output() transactionToUpdate = new EventEmitter<OrderModel>();
-  @Output() transactionToDuplicate = new EventEmitter<OrderModel>();
 
   @ViewChild(MatSort) sort: MatSort;
 
@@ -124,8 +124,8 @@ export class TransactionsTableComponent
     this.transactionToUpdate.emit(aTransaction);
   }
 
-  public onDuplicateTransaction(aTransaction: OrderModel) {
-    this.transactionToDuplicate.emit(aTransaction);
+  public onCloneTransaction(aTransaction: OrderModel) {
+    this.transactionToClone.emit(aTransaction);
   }
 
   public openPositionDialog({
diff --git a/apps/client/src/app/pages/transactions/transactions-page.component.ts b/apps/client/src/app/pages/transactions/transactions-page.component.ts
index e56dba3eb..ae6af560a 100644
--- a/apps/client/src/app/pages/transactions/transactions-page.component.ts
+++ b/apps/client/src/app/pages/transactions/transactions-page.component.ts
@@ -109,6 +109,10 @@ export class TransactionsPageComponent implements OnInit {
     });
   }
 
+  public onCloneTransaction(aTransaction: OrderModel) {
+    this.openCreateTransactionDialog(aTransaction);
+  }
+
   public onDeleteTransaction(aId: string) {
     this.dataService.deleteOrder(aId).subscribe({
       next: () => {
@@ -123,10 +127,6 @@ export class TransactionsPageComponent implements OnInit {
     });
   }
 
-  public onDuplicateTransaction(aTransaction: OrderModel) {
-    this.openCreateTransactionDialog(aTransaction);
-  }
-
   public openUpdateTransactionDialog({
     accountId,
     currency,
@@ -184,14 +184,14 @@ export class TransactionsPageComponent implements OnInit {
       data: {
         accounts: this.user?.accounts,
         transaction: {
-          accountId: this.user?.accounts.find((account) => {
+          accountId: aTransaction?.accountId ?? this.user?.accounts.find((account) => {
             return account.isDefault;
           })?.id,
-          currency: aTransaction?.currency || null,
+          currency: aTransaction?.currency ?? null,
           date: new Date(),
           fee: 0,
           quantity: null,
-          symbol: aTransaction?.symbol || null,
+          symbol: aTransaction?.symbol ?? null,
           type: 'BUY',
           unitPrice: null
         }
diff --git a/apps/client/src/app/pages/transactions/transactions-page.html b/apps/client/src/app/pages/transactions/transactions-page.html
index 41d9131b9..fc7b9d3a8 100644
--- a/apps/client/src/app/pages/transactions/transactions-page.html
+++ b/apps/client/src/app/pages/transactions/transactions-page.html
@@ -9,8 +9,8 @@
         [showActions]="!hasImpersonationId && hasPermissionToDeleteOrder"
         [transactions]="transactions"
         (transactionDeleted)="onDeleteTransaction($event)"
+        (transactionToClone)="onCloneTransaction($event)"
         (transactionToUpdate)="onUpdateTransaction($event)"
-        (transactionToDuplicate)="onDuplicateTransaction($event)"
       ></gf-transactions-table>
     </div>
   </div>