From 76238f5943e0e51238194506eb621dede7b7f859 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 16 Nov 2020 16:21:37 +0700
Subject: [PATCH] Display P2PK instead of OP_RETURN fixes #161

---
 .../transactions-list/transactions-list.component.html       | 5 ++++-
 .../pipes/scriptpubkey-type-pipe/scriptpubkey-type.pipe.ts   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html
index 957253b4a..7c65c0981 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -128,7 +128,10 @@
                       </a>
                     </ng-template>
                     <ng-template #defaultscriptpubkey_type>
-                      <a placement="bottom" [ngbTooltip]="vout.scriptpubkey | hex2ascii">{{ vout.scriptpubkey_type | scriptpubkeyType }}</a>&nbsp;<span class="badge badge-secondary scriptmessage">{{ vout.scriptpubkey_asm | hex2ascii }}</span>
+                      <ng-template [ngIf]="vout.scriptpubkey_type === 'op_return'" [ngIfElse]="otherPubkeyType">
+                        <a placement="bottom" [ngbTooltip]="vout.scriptpubkey | hex2ascii">OP_RETURN</a>&nbsp;<span class="badge badge-secondary scriptmessage">{{ vout.scriptpubkey_asm | hex2ascii }}</span>
+                      </ng-template>
+                      <ng-template #otherPubkeyType>{{ vout.scriptpubkey_type | scriptpubkeyType }}</ng-template>
                     </ng-template>
                   </ng-template>
                 </td>
diff --git a/frontend/src/app/shared/pipes/scriptpubkey-type-pipe/scriptpubkey-type.pipe.ts b/frontend/src/app/shared/pipes/scriptpubkey-type-pipe/scriptpubkey-type.pipe.ts
index d4725a2c5..1ab77f965 100644
--- a/frontend/src/app/shared/pipes/scriptpubkey-type-pipe/scriptpubkey-type.pipe.ts
+++ b/frontend/src/app/shared/pipes/scriptpubkey-type-pipe/scriptpubkey-type.pipe.ts
@@ -9,9 +9,12 @@ export class ScriptpubkeyTypePipe implements PipeTransform {
     switch (value) {
       case 'fee':
         return 'Transaction fee';
+      case 'p2pk':
+        return 'P2PK';
       case 'op_return':
+        return 'OP_RETURN';
       default:
-          return 'OP_RETURN';
+        return value.toUpperCase();
     }
   }