standalone balance query

src/pages/Admin/Charity/Dashboard/Dashboard.tsx

@@ -1,14 +1,14 @@
 import { PropsWithChildren } from "react";
 import { useAdminContext } from "pages/Admin/Context";
-import { useProfileQuery } from "services/aws/aws";
+import { useEndowBalanceQuery } from "services/apes";
 import ContentLoader from "components/ContentLoader";
 import QueryLoader from "components/QueryLoader";
 import Seo from "../Seo";
 import Balance from "./Balance";
 
 export default function Dashboard() {
  const { id } = useAdminContext();
- const queryState = useProfileQuery({ endowId: id }, { skip: !id });
+ const queryState = useEndowBalanceQuery(id, { skip: !id });
 
  return (
  <div className="@container w-full max-w-4xl grid content-start mt-6">

src/pages/Profile/Body/GeneralInfo/DetailsColumn/Balances.tsx

@@ -1,12 +1,17 @@
 import { useProfileContext } from "pages/Profile/ProfileContext";
+import { useEndowBalanceQuery } from "services/apes";
 import { humanize } from "helpers";
 
 export default function Balances() {
- const { totalContributions } = useProfileContext();
+ const { id } = useProfileContext();
+ const { data } = useEndowBalanceQuery(id);
 
  return (
  <div className="flex flex-col items-center gap-4 w-full">
- <Balance title="Total Contributions" amount={totalContributions || 0} />
+ <Balance
+ title="Total Contributions"
+ amount={data?.totalContributions ?? 0}
+ />
  </div>
  );
 }

src/services/apes/apes.ts

@@ -1,5 +1,5 @@
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import { Token } from "types/aws";
+import { EndowmentBalances, Token } from "types/aws";
 import { ChainID } from "types/chain";
 import { appRoutes } from "constants/routes";
 import { APIs } from "constants/urls";
@@ -37,12 +37,17 @@ export const apes = createApi({
  }),
  }
  ),
+ endowBalance: builder.query<EndowmentBalances, number>({
+ providesTags: ["balance"],
+ query: (endowId) => `${v(1)}/balances/${endowId}`,
+ }),
  }),
 });
 
 export const {
  useTokensQuery,
  useStripeSessionURLMutation,
+ useEndowBalanceQuery,
  util: {
  invalidateTags: invalidateApesTags,
  updateQueryData: updateApesQueryData,

src/services/apes/tags.ts

@@ -1 +1 @@
-export const tags = ["chain", "donations", "tokens"] as const;
+export const tags = ["chain", "donations", "tokens", "balance"] as const;

src/types/aws/ap/index.ts

@@ -2,16 +2,6 @@ import { APIEnvironment, EndowmentType, UNSDG_NUMS } from "../../lists";
 
 export type EndowmentTierNum = 1 | 2 | 3;
 
-type EndowmentBalances = {
- contributionsCount: number;
- donationsBal: number;
- payoutsMade: number;
- payoutsPending: number;
- sustainabilityFundBal: number;
- totalContributions: number;
- totalEarnings: number;
-};
-
 export type MileStone = {
  milestone_date: string; //isoDate
  milestone_description: string;
@@ -68,7 +58,7 @@ export type EndowmentProfile = EndowmentBase & {
  street_address: string; //or empty
  url: string;
  wise_recipient_id: number;
-} & EndowmentBalances;
+};
 
 export type EndowmentCard = EndowmentBase & {
  endow_type: EndowmentType;

src/types/aws/apes/index.ts

@@ -20,3 +20,13 @@ export type Token = {
  coingecko_denom: string;
  type: TokenType;
 };
+
+export type EndowmentBalances = {
+ contributionsCount: number;
+ donationsBal: number;
+ payoutsMade: number;
+ payoutsPending: number;
+ sustainabilityFundBal: number;
+ totalContributions: number;
+ totalEarnings: number;
+};