From 4d47312b9bd5e0afe68cb0bceb37f6009077bb0e Mon Sep 17 00:00:00 2001
From: Alec Menconi <amenconiusa@gmail.com>
Date: Thu, 14 Mar 2024 23:48:07 -0400
Subject: [PATCH] Additional merge edits

---
 src/app/@api/nft.api.ts                                |  4 ----
 .../nft/components/nft-card/nft-card.component.ts      | 10 ++++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/app/@api/nft.api.ts b/src/app/@api/nft.api.ts
index 2b84093..a228a40 100644
--- a/src/app/@api/nft.api.ts
+++ b/src/app/@api/nft.api.ts
@@ -71,10 +71,6 @@ export class NftApi extends BaseApi<Nft> {
     req: Build5Request<NftTransferRequest>,
   ): Observable<{ [key: string]: number } | undefined> => this.request(WEN_FUNC.nftTransfer, req);
 
-  public getNftById(nftId: string): Observable<Nft | undefined> {
-    return this.listen(nftId);
-  }
-
   public successfullOrders(
     nftId: string,
     network?: Network,
diff --git a/src/app/components/nft/components/nft-card/nft-card.component.ts b/src/app/components/nft/components/nft-card/nft-card.component.ts
index ff35a05..0a3333b 100644
--- a/src/app/components/nft/components/nft-card/nft-card.component.ts
+++ b/src/app/components/nft/components/nft-card/nft-card.component.ts
@@ -244,6 +244,10 @@ export class NftCardComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
+    if (this.nftSelectionSubscription$) {
+      this.nftSelectionSubscription$.unsubscribe();
+    }
+
     this.cartSubscription$.unsubscribe();
   }
 
@@ -262,10 +266,4 @@ export class NftCardComponent implements OnInit, OnDestroy {
 
     this.cd.markForCheck();
   }
-
-  ngOnDestroy() {
-    if (this.nftSelectionSubscription$) {
-      this.nftSelectionSubscription$.unsubscribe();
-    }
-  }
 }