diff --git a/src/app/features/clipboard/base-clipboard.ts b/src/app/features/clipboard/base-clipboard.ts
index f3dfb42..b58ad9e 100644
--- a/src/app/features/clipboard/base-clipboard.ts
+++ b/src/app/features/clipboard/base-clipboard.ts
@@ -4,7 +4,7 @@ import { getIcon } from '../../shared/models/wallet.model';
 export class BaseClipboardComponent {
     getIcon = getIcon;
 
-    isAddressClipboardItem(item: ClipboardItem): item is AddressClipboardItem {
+    isWalletAddressClipboardItem(item: ClipboardItem): item is AddressClipboardItem {
         return 'address' in item && 'wallet' in item && 'derivationPath' in item;
     }
 
diff --git a/src/app/features/clipboard/clipboard-details/clipboard-details.component.html b/src/app/features/clipboard/clipboard-details/clipboard-details.component.html
index 89782ae..c20ca39 100644
--- a/src/app/features/clipboard/clipboard-details/clipboard-details.component.html
+++ b/src/app/features/clipboard/clipboard-details/clipboard-details.component.html
@@ -1,12 +1,12 @@
 <div class="container">
-    @if (!clipboardItem || isAddressClipboardItem(clipboardItem)) {
+    @if (!clipboardItem || isWalletAddressClipboardItem(clipboardItem)) {
         <div class="header">Clipboard</div>
     } @else {
         <div class="header">Clipboard: {{ clipboardItem.name }}</div>
     }
     <div class="content">
         @if (clipboardItem) {
-            @if (isAddressClipboardItem(clipboardItem)) {
+            @if (isWalletAddressClipboardItem(clipboardItem)) {
                 <div class="item">
                     <div class="title">Address:</div>
                     <app-expandable-text class="value" [text]="clipboardItem.value" [isAddress]="true" />
@@ -73,7 +73,7 @@
             <div class="default">No Bitcoin/Nostr content detected.</div>
         }
     </div>
-    @if (clipboardItem && !isPaymentClipboardItem(clipboardItem)) {
+    @if (clipboardItem && (clipboardItem.type == 'Address' || clipboardItem.type == 'Bolt11')) {
         <div class="verify-container">
             <button mat-button color="primary" (click)="onVerify()">Verify with Branta Guardrail</button>
             <mat-icon class="icon material-symbols-outlined" color="primary" [matTooltip]="verifyTooltip">info</mat-icon>
diff --git a/src/app/features/clipboard/clipboard-history/clipboard-history.component.html b/src/app/features/clipboard/clipboard-history/clipboard-history.component.html
index 03520a4..40f0eec 100644
--- a/src/app/features/clipboard/clipboard-history/clipboard-history.component.html
+++ b/src/app/features/clipboard/clipboard-history/clipboard-history.component.html
@@ -7,13 +7,13 @@
                     <div class="text">
                         <app-expandable-text [text]="item.value" [isAddress]="true" />
                     </div>
-                    @if (isAddressClipboardItem(item) && item.wallet) {
+                    @if (isWalletAddressClipboardItem(item) && item.wallet) {
                         <div class="details">
                             <div class="type">Wallet:</div>
                             <img [src]="'assets/wallet/icon/' + getIcon(item.wallet).icon" height="20" />
                             <div class="name">{{ item.wallet.name }}</div>
                         </div>
-                    } @else if (isAddressClipboardItem(item) && !item.wallet) {
+                    } @else if (isWalletAddressClipboardItem(item) && !item.wallet) {
                         <div class="secondary">No wallet found.</div>
                     } @else if (isPaymentClipboardItem(item)) {
                         <div class="details">