Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/app/expense-tracker/ReviewExpenses.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function ReviewExpenses({
<div className="flex items-center justify-between">
<div className="">
<h2 className="text-[24px] text-nowrap font-bold">Review Expenses</h2>
<p className="text-[15px] text-nowrap text-charcoal">Expenses from your current claim</p>
<p className="text-[15px] text-nowrap text-charcoal">Track Disaster Related Expenses</p>
</div>
<Button
className="w-[35px] h-[35px] bg-[var(--slate)] self-start"
Expand Down
36 changes: 24 additions & 12 deletions frontend/app/expense-tracker/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import NetDisasterExpense, { NetDisasterExpenseNoData } from "@/components/dashb
import { getDashboardBannerData } from "@/api/dashboard";
import { useQuery } from "@tanstack/react-query";
import ReviewExpenses from "./ReviewExpenses";
import { getPurchaseLineItemsFromClaim } from "@/api/claim";
import { PurchaseLineItemType } from "@/types/purchase";
import { companyHasData } from "@/api/company";
import { GoSync } from "react-icons/go";
Expand All @@ -31,19 +30,32 @@ export default function ExpenseTracker() {
queryFn: getDashboardBannerData,
});

let claimId = "";
if (bannerData && bannerData.status === "has-claim" && bannerData.claim) {
// If claim is an array, use [0] to get the first claim
claimId = bannerData.claim.id;
}

const purchaseLineItemsConfirmed = useQuery({
queryKey: ["purchaseLineItems-for-company", claimId],
queryFn: () => getPurchaseLineItemsFromClaim({ claimId }),
const exExpenses = useFetchPurchases({
pageNumber: 0,
resultsPerPage: 100,
type: PurchaseLineItemType.EXTRANEOUS,
});
const typicalExpenses = useFetchPurchases({
pageNumber: 0,
resultsPerPage: 100,
type: PurchaseLineItemType.TYPICAL,
});
const exExpensesLineItems =
exExpenses.data?.purchases
?.flatMap((purchase) => purchase.lineItems)
.filter((lineItem) => {
return lineItem.type === "extraneous";
}) ?? [];
const typicalExpensesLineItems =
typicalExpenses.data?.purchases
?.flatMap((purchase) => purchase.lineItems)
.filter((lineItem) => {
return lineItem.type === "typical";
}) ?? [];

const expenses = purchaseLineItemsConfirmed.data
? purchaseLineItemsConfirmed.data.map((purchase) => ({
const lineItems = [...exExpensesLineItems, ...typicalExpensesLineItems];
const expenses = lineItems
? lineItems.map((purchase) => ({
name: purchase.description,
amount: purchase.amountCents / 100.0, // convert cents to dollars
}))
Expand Down
Loading