From d3955fed264b7a9bcf1a8c14555c3d682c0e96bc Mon Sep 17 00:00:00 2001
From: kyranjamie <kyran.burraston@gmail.com>
Date: Mon, 23 Dec 2024 14:42:30 +0000
Subject: [PATCH] fix: styles for inscription options

---
 .../collectibles/components/bitcoin/inscription.tsx       | 8 +++++++-
 .../bitcoin/ordinals/inscriptions/inscriptions.query.ts   | 5 ++++-
 .../store/accounts/blockchain/bitcoin/bitcoin.hooks.ts    | 8 +++++---
 tests/specs/ledger/ledger.spec.ts                         | 5 ++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/app/features/collectibles/components/bitcoin/inscription.tsx b/src/app/features/collectibles/components/bitcoin/inscription.tsx
index 5ced101c31..e09217acb1 100644
--- a/src/app/features/collectibles/components/bitcoin/inscription.tsx
+++ b/src/app/features/collectibles/components/bitcoin/inscription.tsx
@@ -123,7 +123,13 @@ export function Inscription({ inscription }: InscriptionProps) {
     <Box position="relative" {...bind}>
       <Box opacity={hasInscriptionBeenDiscarded(inscription) ? 0.5 : 1}>{content}</Box>
       {isHovered && (
-        <Box bg="ink.background-primary" right="space.03" top="space.03" zIndex="90">
+        <Box
+          bg="ink.background-primary"
+          position="absolute"
+          right="space.03"
+          top="space.03"
+          zIndex="90"
+        >
           <DropdownMenu.Root>
             <DropdownMenu.Trigger>
               <IconButton
diff --git a/src/app/query/bitcoin/ordinals/inscriptions/inscriptions.query.ts b/src/app/query/bitcoin/ordinals/inscriptions/inscriptions.query.ts
index 98b5482284..841d8173c2 100644
--- a/src/app/query/bitcoin/ordinals/inscriptions/inscriptions.query.ts
+++ b/src/app/query/bitcoin/ordinals/inscriptions/inscriptions.query.ts
@@ -14,6 +14,7 @@ import {
   useGetTaprootUtxosByAddressQuery,
   utxosToBalance,
 } from '@leather.io/query';
+import { isString } from '@leather.io/utils';
 
 import { useCurrentAccountIndex } from '@app/store/accounts/account';
 import {
@@ -33,6 +34,7 @@ export function useInscriptions({ xpubs }: UseInscriptionArgs) {
 
 export function useNumberOfInscriptionsOnUtxo() {
   const xpubs = useCurrentBitcoinAccountXpubs();
+
   const inscriptionQueries = useInscriptions({ xpubs });
 
   // Unsafe as implementation doesn't wait for all results to be successful,
@@ -47,7 +49,8 @@ export function useCurrentNativeSegwitInscriptions() {
   const client = useBitcoinClient();
   const nativeSegwitXpub = useCurrentBitcoinAccountNativeSegwitXpub();
   return useQuery({
-    ...createInscriptionByXpubQuery(client, nativeSegwitXpub),
+    ...createInscriptionByXpubQuery(client, nativeSegwitXpub ?? ''),
+    enabled: isString(nativeSegwitXpub),
     select(data) {
       return data.data.map(createBestInSlotInscription);
     },
diff --git a/src/app/store/accounts/blockchain/bitcoin/bitcoin.hooks.ts b/src/app/store/accounts/blockchain/bitcoin/bitcoin.hooks.ts
index 14cf197f1a..52c57c8741 100644
--- a/src/app/store/accounts/blockchain/bitcoin/bitcoin.hooks.ts
+++ b/src/app/store/accounts/blockchain/bitcoin/bitcoin.hooks.ts
@@ -13,7 +13,7 @@ import {
 import { extractAddressIndexFromPath } from '@leather.io/crypto';
 import { bitcoinNetworkToNetworkMode } from '@leather.io/models';
 import { PaymentTypes } from '@leather.io/rpc';
-import { isNumber, isUndefined } from '@leather.io/utils';
+import { isNumber, isString, isUndefined } from '@leather.io/utils';
 
 import {
   BitcoinInputSigningConfig,
@@ -289,17 +289,19 @@ export function useSignBitcoinTx() {
 
 export function useCurrentBitcoinAccountNativeSegwitXpub() {
   const nativeSegwitAccount = useCurrentNativeSegwitAccount();
+  if (!nativeSegwitAccount) return null;
   return `wpkh(${nativeSegwitAccount?.keychain.publicExtendedKey})`;
 }
 
 function useCurrentBitcoinAccountTaprootXpub() {
   const taprootAccount = useCurrentTaprootAccount();
+  if (!taprootAccount) return null;
   return `tr(${taprootAccount?.keychain.publicExtendedKey})`;
 }
 
 export function useCurrentBitcoinAccountXpubs() {
   const taprootXpub = useCurrentBitcoinAccountTaprootXpub();
   const nativeSegwitXpub = useCurrentBitcoinAccountNativeSegwitXpub();
-
-  return [taprootXpub, nativeSegwitXpub];
+  // Not sure why this type cast is necessary, but thinks its string | null without
+  return [taprootXpub, nativeSegwitXpub].filter(xpub => isString(xpub)) as string[];
 }
diff --git a/tests/specs/ledger/ledger.spec.ts b/tests/specs/ledger/ledger.spec.ts
index f74143234d..1e4936de1c 100644
--- a/tests/specs/ledger/ledger.spec.ts
+++ b/tests/specs/ledger/ledger.spec.ts
@@ -50,7 +50,10 @@ test.describe('App with Ledger', () => {
 
           await homePage.page.getByTestId(SettingsSelectors.CurrentAccountDisplayName).click();
 
-          test.expect(async () => await test.expect(requestPromise).rejects.toThrowError());
+          await test
+            .expect(async () => await test.expect(requestPromise).rejects.toThrowError())
+            .toPass()
+            .catch();
         });
       }