Fix type issues

Author: ebma

apps/api/src/api/services/ramp/ramp.service.ts

@@ -547,6 +547,13 @@ export class RampService extends BaseRampService {
       rampStates.map(async ramp => {
         const quote = quoteMap.get(ramp.quoteId);
 
+        if (!quote) {
+          throw new APIError({
+            message: `Associated quote not found for ramp ${ramp.id}`,
+            status: httpStatus.NOT_FOUND
+          });
+        }
+
         // Get or compute final transaction hash and explorer link (similar to getRampStatus)
         let transactionHash = ramp.state.finalTransactionHash;
         let transactionExplorerLink = ramp.state.finalTransactionExplorerLink;
@@ -555,8 +562,7 @@ export class RampService extends BaseRampService {
         if (
           ramp.type === RampDirection.BUY &&
           ramp.currentPhase === "complete" &&
-          (!transactionHash || !transactionExplorerLink) &&
-          quote
+          (!transactionHash || !transactionExplorerLink)
         ) {
           const result = await getFinalTransactionHashForRamp(ramp, quote);
           transactionHash = result.transactionHash;
@@ -578,14 +584,14 @@ export class RampService extends BaseRampService {
           date: ramp.createdAt.toISOString(),
           externalTxExplorerLink: transactionExplorerLink,
           externalTxHash: transactionHash,
-          fromAmount: quote?.inputAmount || "",
-          fromCurrency: quote?.inputCurrency || "",
-          fromNetwork: ramp.from,
+          from: ramp.from,
+          fromAmount: quote.inputAmount,
+          fromCurrency: quote.inputCurrency,
           id: ramp.id,
           status: this.mapPhaseToStatus(ramp.currentPhase),
-          toAmount: quote?.outputAmount || "",
-          toCurrency: quote?.outputCurrency || "",
-          toNetwork: ramp.to,
+          to: ramp.to,
+          toAmount: quote.outputAmount,
+          toCurrency: quote.outputCurrency,
           type: ramp.type
         };
       })

apps/frontend/src/components/StatusBadge/index.tsx

@@ -1,9 +1,9 @@
 import { ArrowTopRightOnSquareIcon } from "@heroicons/react/20/solid";
-import { AnimatePresence, LayoutGroup, motion } from "framer-motion";
+import { TransactionStatus } from "@vortexfi/shared";
+import { AnimatePresence, motion } from "framer-motion";
 import { FC } from "react";
 import { useTranslation } from "react-i18next";
 import { cn } from "../../helpers/cn";
-import { TransactionStatus } from "../menus/HistoryMenu/types";
 
 interface StatusBadgeProps {
   status: TransactionStatus;

apps/frontend/src/components/menus/HistoryMenu/TransactionItem/index.tsx

@@ -27,7 +27,7 @@ const formatTooltipDate = (date: Date) =>
     year: "numeric"
   });
 
-const getNetworkName = (network: Transaction["fromNetwork"] | Transaction["toNetwork"]) => {
+const getNetworkName = (network: Transaction["from"] | Transaction["to"]) => {
   if (typeof network === "string" && ["pix", "sepa", "cbu"].includes(network)) {
     return network.toUpperCase();
   }
@@ -54,9 +54,9 @@ export const TransactionItem: FC<TransactionItemProps> = ({ transaction }) => {
         </div>
         <div>
           <div className="flex items-center">
-            <span className="text-gray-500">{getNetworkName(transaction.fromNetwork)}</span>
+            <span className="text-gray-500">{getNetworkName(transaction.from)}</span>
             <ChevronRightIcon className="h-4 w-4 text-gray-400" />
-            <span className="text-gray-500">{getNetworkName(transaction.toNetwork)}</span>
+            <span className="text-gray-500">{getNetworkName(transaction.to)}</span>
           </div>
           <div className="flex items-center">
             <span className="font-medium">{roundDownToSignificantDecimals(Big(transaction.fromAmount), 2).toString()}</span>

apps/frontend/src/components/menus/HistoryMenu/types.ts

@@ -1,13 +1,11 @@
-import { Networks, PaymentMethod } from "@vortexfi/shared";
-
-export type TransactionStatus = "pending" | "failed" | "complete";
+import { Networks, PaymentMethod, TransactionStatus } from "@vortexfi/shared";
 
 export type TransactionDestination = Networks | PaymentMethod;
 
 export interface Transaction {
   id: string;
-  fromNetwork: TransactionDestination;
-  toNetwork: TransactionDestination;
+  from: TransactionDestination;
+  to: TransactionDestination;
   fromAmount: string;
   toAmount: string;
   status: TransactionStatus;

apps/frontend/src/hooks/useRampHistory.ts

@@ -2,17 +2,14 @@ import { useQuery } from "@tanstack/react-query";
 import { GetRampHistoryTransaction } from "@vortexfi/shared";
 import { useAccount } from "wagmi";
 
-import { Transaction, TransactionDestination, TransactionStatus } from "../components/menus/HistoryMenu/types";
+import { Transaction } from "../components/menus/HistoryMenu/types";
 import { usePolkadotWalletState } from "../contexts/polkadotWallet";
 import { RampService } from "../services/api/ramp.service";
 
 function formatTransaction(tx: GetRampHistoryTransaction): Transaction {
   return {
     ...tx,
-    date: new Date(tx.date),
-    fromNetwork: tx.fromNetwork as TransactionDestination,
-    status: tx.status as TransactionStatus,
-    toNetwork: tx.toNetwork as TransactionDestination
+    date: new Date(tx.date)
   };
 }
 

packages/shared/src/endpoints/ramp.endpoints.ts

@@ -195,8 +195,8 @@ export interface GetRampHistoryRequest {
 export interface GetRampHistoryTransaction {
   id: string;
   type: RampDirection;
-  fromNetwork: Networks;
-  toNetwork: Networks;
+  from: Networks | PaymentMethod;
+  to: Networks | PaymentMethod;
   fromAmount: string;
   toAmount: string;
   fromCurrency: RampCurrency;