diff --git a/src/status/InvoicePending.tsx b/src/status/InvoicePending.tsx
index ddcfc4d6..e4db2f57 100644
--- a/src/status/InvoicePending.tsx
+++ b/src/status/InvoicePending.tsx
@@ -12,7 +12,7 @@ const InvoicePending = () => {
         <div>
             <p>{t("invoice_pending")}</p>
             <LoadingSpinner />
-            <Show when={swapStatusTransaction() !== null}>
+            <Show when={swapStatusTransaction()}>
                 <BlockExplorer
                     asset={swap().assetSend}
                     txId={swapStatusTransaction().id}
diff --git a/src/status/TransactionConfirmed.tsx b/src/status/TransactionConfirmed.tsx
index b9b3a618..1dfb1e60 100644
--- a/src/status/TransactionConfirmed.tsx
+++ b/src/status/TransactionConfirmed.tsx
@@ -91,7 +91,7 @@ const TransactionConfirmed = () => {
             <h2>{t("tx_confirmed")}</h2>
             <p>{t("tx_ready_to_claim")}</p>
             <LoadingSpinner />
-            <Show when={swapStatusTransaction() !== null}>
+            <Show when={swapStatusTransaction()}>
                 <BlockExplorer
                     asset={swap().assetSend}
                     txId={swapStatusTransaction().id}
diff --git a/src/status/TransactionMempool.tsx b/src/status/TransactionMempool.tsx
index 194ce831..3188cd90 100644
--- a/src/status/TransactionMempool.tsx
+++ b/src/status/TransactionMempool.tsx
@@ -13,7 +13,7 @@ const TransactionMempool = () => {
             <h2>{t("tx_in_mempool")}</h2>
             <p>{t("tx_in_mempool_subline")}</p>
             <LoadingSpinner />
-            <Show when={swapStatusTransaction() !== null}>
+            <Show when={swapStatusTransaction()}>
                 <BlockExplorer
                     asset={swap().assetSend}
                     txId={swapStatusTransaction().id}
diff --git a/src/utils/boltzClient.ts b/src/utils/boltzClient.ts
index b294145c..0f946f8b 100644
--- a/src/utils/boltzClient.ts
+++ b/src/utils/boltzClient.ts
@@ -155,13 +155,6 @@ type ChainSwapCreatedResponse = {
     lockupDetails: ChainSwapDetails;
 };
 
-export type LockupTransaction = {
-    id: string;
-    hex: string;
-    timeoutBlockHeight: number;
-    timeoutEta?: number;
-};
-
 type ChainSwapTransaction = {
     transaction: {
         id: string;
@@ -369,6 +362,13 @@ export const broadcastTransaction = (asset: string, txHex: string) =>
         hex: txHex,
     });
 
+export type LockupTransaction = {
+    id: string;
+    hex: string;
+    timeoutBlockHeight: number;
+    timeoutEta?: number;
+};
+
 export const getLockupTransaction = async (
     asset: string,
     id: string,
@@ -404,16 +404,18 @@ export const getReverseTransaction = (asset: string, id: string) =>
         timeoutBlockHeight: number;
     }>(`/v2/swap/reverse/${id}/transaction`, asset);
 
+export type SwapStatus = {
+    status: string;
+    failureReason?: string;
+    zeroConfRejected?: boolean;
+    transaction?: {
+        id: string;
+        hex: string;
+    };
+};
+
 export const getSwapStatus = (asset: string, id: string) =>
-    fetcher<{
-        status: string;
-        failureReason?: string;
-        zeroConfRejected?: boolean;
-        transaction?: {
-            id: string;
-            hex: string;
-        };
-    }>(`/v2/swap/${id}`, asset);
+    fetcher<SwapStatus>(`/v2/swap/${id}`, asset);
 
 export const getChainSwapClaimDetails = (asset: string, id: string) =>
     fetcher<{