fix: improve currency amount formatting and null handling

src/components/payment-table.tsx

@@ -97,11 +97,14 @@ export const columns: ColumnDef<Payment>[] = [
   {
     accessorKey: 'amountInCrypto',
     header: 'Amount',
-    cell: ({ row }) =>
-      getAmountWithCurrencySymbol(
-        row.getValue('amountInCrypto'),
-        row.original?.tokenAddress,
-      ),
+    cell: ({ row }) => {
+      const data= row.original
+
+      return getAmountWithCurrencySymbol(
+        BigInt(data.amountInCrypto || data.amount),
+        data.tokenAddress,
+      )
+    },
   },
   {
     accessorKey: 'networkFee',
@@ -117,7 +120,15 @@ export const columns: ColumnDef<Payment>[] = [
   {
     accessorKey: 'feeAmount',
     header: 'Service Fee',
-    cell: ({ row }) => row.getValue('feeAmount'),
+    cell: ({ row }) => {
+      const data = row.original
+
+      return getAmountWithCurrencySymbol(
+        BigInt(data.feeAmountInCrypto || data.feeAmount),
+        data.tokenAddress,
+      )
+
+    },
   },
   {
     accessorKey: 'feeAddress',

src/lib/utils.ts

@@ -48,11 +48,13 @@ export const getAmountWithCurrencySymbol = (
   currency: string
 ) => {
   const currencyDetails: { symbol: string; decimals: number } | undefined =
-    isAddress(currency)
+    currency && isAddress(currency)
       ? currencyManager.fromAddress(currency)
-      : currencyManager.fromSymbol(currency);
+      : currency
+        ? currencyManager.fromSymbol(currency)
+        : undefined;
 
-  return `${formatUnits(amount, currencyDetails?.decimals || 18)} ${currencyDetails?.symbol || ""}`;
+  return `${formatUnits(amount, currencyDetails?.decimals || 18)} ${currencyDetails?.symbol || ""}`.trim();
 };
 
 /**