Mitchell/payment-backoffice
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat/build-branch #4

Open
Mitchell wants to merge 12 commits from feat/build-branch into main
pull from: feat/build-branch
merge into: Mitchell:main
Conversation 0 Commits 12 Files Changed 102 +5 -8
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7d4dfd73f - Show all commits

7
app/features/Pages/DashboardHomePage/DashboardHomePage.tsx
View File

@ -4,7 +4,7 @@ import { Range } from "react-date-range";
import { Box } from "@mui/material";
import { GeneralHealthCard } from "../../GeneralHealthCard/GeneralHealthCard";
import { TransactionsWaitingApproval } from "../../TransactionsWaitingApproval/TransactionsWaitingApproval";
import { TransactionsOverView } from "../../TransactionsOverView/TransactionsOverview";
import { TransactionsOverview } from "../../TransactionsOverview/TransactionsOverview";
import {
type ITransactionsOverviewData,
type IReviewTransactionsData,
@ -59,14 +59,11 @@ export const DashboardHomePage = ({
initialDateRange={initialDateRange}
/>
</Box>
<TransactionsOverView initialOverviewData={initialOverviewData} />
<TransactionsOverview initialOverviewData={initialOverviewData} />
{/* <FetchReport /> */}
<TransactionsWaitingApproval
initialReviewTransactions={initialReviewTransactions}
/>
{/* <Documentation />
<AccountIQ />
<WhatsNew /> */}
</>
);
};

6
app/features/TransactionsOverview/TransactionsOverview.tsx
View File

@ -6,22 +6,22 @@ import { Box, Button, IconButton, Paper, Typography } from "@mui/material";
import { PieCharts } from "../PieCharts/PieCharts";
import MoreVertIcon from "@mui/icons-material/MoreVert";
import { TransactionsOverViewTable } from "./components/TransactionsOverViewTable";
import { type ITransactionsOverviewData } from "@/app/services/types";
import { dashboardService } from "@/app/services/dashboardService";
import {
transformOverviewResponse,
calculatePercentages,
enrichOverviewData,
} from "./utils";
} from "../TransactionsOverview/utils";
import "./TransactionsOverView.scss";
import { TransactionsOverViewTable } from "./components/TransactionsOverViewTable";
interface ITransactionsOverviewProps {
initialOverviewData?: ITransactionsOverviewData | null;
}
export const TransactionsOverView = ({
export const TransactionsOverview = ({
initialOverviewData = null,
}: ITransactionsOverviewProps) => {
const router = useRouter();