From b930b9bf4f612dbd5f03b7cd327d52666dcdc93e Mon Sep 17 00:00:00 2001
From: Antoni Spaanderman <56turtle56@gmail.com>
Date: Fri, 3 Jun 2022 18:47:44 +0200
Subject: [PATCH] stricter multisig check + detect bare multisig when spent

---
 .../components/address-labels/address-labels.component.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/components/address-labels/address-labels.component.ts b/frontend/src/app/components/address-labels/address-labels.component.ts
index 34c82c851..c5892fd8a 100644
--- a/frontend/src/app/components/address-labels/address-labels.component.ts
+++ b/frontend/src/app/components/address-labels/address-labels.component.ts
@@ -85,6 +85,8 @@ export class AddressLabelsComponent implements OnInit {
     }
 
     this.detectMultisig(this.vin.inner_redeemscript_asm);
+
+    this.detectMultisig(this.vin.prevout.scriptpubkey_asm);
   }
 
   detectMultisig(script: string) {
@@ -118,7 +120,11 @@ export class AddressLabelsComponent implements OnInit {
     }
     const m = parseInt(opM.match(/[0-9]+/)[0], 10);
 
-    this.label = $localize`:@@address-label.multisig:Multisig ${m}:multisigM: of ${n}:multisigN:`
+    if (ops.length) {
+      return;
+    }
+
+    this.label = $localize`:@@address-label.multisig:Multisig ${m}:multisigM: of ${n}:multisigN:`;
   }
 
   handleVout() {