Merge branch 'staging-beta' into songbird-release

Author: JeznaSpianca

src/api/agent.ts

@@ -21,7 +21,7 @@ import {
     IOwnerUnderlyingBalance,
     IOwnerFassetBalance,
     IRedemptionQueueData,
-    IOtherBot
+    IOtherBot, IFullAgentFund
 } from "@/types";
 import { orderBy } from "lodash";
 
@@ -45,7 +45,8 @@ const AGENT_KEY = {
     OWNER_UNDERLYING_BALANCE: 'agent.ownerUnderlyingBalance',
     OWNER_FASSET_BALANCE: 'agent.ownerFassetBalance',
     REDEMPTION_QUEUE_DATA: 'agent.redemptionQueueData',
-    OTHER_BOTS: 'agent.otherBots'
+    OTHER_BOTS: 'agent.otherBots',
+    FULL_AGENT_FUNDS: 'agent.fullAgentFunds'
 }
 
 export function useWorkAddress(enabled: boolean = true) {
@@ -403,3 +404,14 @@ export function useOtherBots(enabled: boolean = true) {
     })
 }
 
+export function useFullAgentFunds(enabled: boolean = true) {
+    return useQuery({
+        queryKey: [AGENT_KEY.FULL_AGENT_FUNDS],
+        queryFn: async () => {
+            const response = await apiClient.get(`${resource}/fullAgentFunds`);
+            return response.data.data as IFullAgentFund[];
+        },
+        enabled: enabled
+    })
+}
+

src/components/cards/AgentBotsCard.tsx

@@ -27,7 +27,7 @@ interface IAgentBotsCard {
     balances: UseQueryResult<IBalance[], Error>;
 }
 
-export default function AgentBotsCard({ className,  balances}: IAgentBotsCard) {
+export default function AgentBotsCard({ className,  balances }: IAgentBotsCard) {
     const { t } = useTranslation();
     const workAddress = useWorkAddress();
     const botStatus = useBotStatus();

src/components/cards/ManagementAddressCard.tsx

@@ -5,7 +5,7 @@ import {
     Anchor,
     rem
 } from "@mantine/core";
-import { useIsWhitelisted, useManagementAddress, useUnderlyingAddresses } from "@/api/agent";
+import { useFullAgentFunds, useIsWhitelisted, useManagementAddress, useUnderlyingAddresses } from "@/api/agent";
 import { useTranslation, Trans } from "react-i18next";
 import { IconArrowUpRight } from "@tabler/icons-react";
 import { truncateString } from "@/utils";
@@ -20,6 +20,7 @@ export default function ManagementAddressCard({ className }: IManagementAddressC
     const isWhitelisted = useIsWhitelisted();
     const managementAddress= useManagementAddress();
     const underlyingAddresses = useUnderlyingAddresses();
+    const fullAgentFunds = useFullAgentFunds();
 
     return (
         <Paper
@@ -94,6 +95,24 @@ export default function ManagementAddressCard({ className }: IManagementAddressC
                     </div>
                 </div>
             </div>
+            <div className="flex justify-between flex-wrap md:flex-nowrap mt-2">
+                <div className="flex justify-between sm:justify-normal w-full sm:w-auto flex-wrap">
+                    <Text
+                        className="mr-3"
+                        c="var(--flr-darkest-gray)"
+                        size="sm"
+                    >
+                        {t('management_address_card.total_agent_funds_label')}
+                    </Text>
+                    <div>
+                        {fullAgentFunds.data?.map((fund, index) => (
+                            <Text size="sm" key={index}>
+                                {fund.symbol}: {fund.balance}
+                            </Text>
+                        ))}
+                    </div>
+                </div>
+            </div>
             {isWhitelisted.data === false &&
                 <Paper
                     className="px-7 py-4 mt-6 max-w-full sm:max-w-xl"

src/components/cards/VaultsCard.tsx

@@ -373,6 +373,29 @@ export default function VaultsCard({ className, collateral }: IVaultsCard) {
                 );
             }
         },
+        {
+            id: 'agentCollateral',
+            label: t('vaults_card.table.agent_collateral_label'),
+            render: (vault: IVault) => {
+                return (
+                    <div>
+                        <Text
+                            size="sm"
+                        >
+                            {vault.agentOnlyPoolCollateral}
+                            <span className="mx-1 text-[var(--flr-darker-gray)]">{process.env.NATIVE_TOKEN}</span>
+                            ({vault?.agentOnlyPoolCollateralUSD} <span className="ml-1 text-[var(--flr-darker-gray)]">$</span>)
+                        </Text>
+                        <Text
+                            size="xs"
+                            c="var(--flr-darker-gray)"
+                        >
+                            {t('vaults_card.table.amount_label')}
+                        </Text>
+                    </div>
+                )
+            }
+        },
         {
             id: 'poolFee',
             label: t('vaults_card.table.pool_fee'),

src/languages/en.json

@@ -348,7 +348,8 @@
         "address_whitelisted_label": "Address whitelisted",
         "how_to_whitelist_agent_description": "To get your Agent (Management address) on whitelist please register your Agent via the<a>Fassets Telegram bot<icon></icon></a>",
         "management_address_label": "Management address",
-        "underlying_addresses_label": "Underyling addresses"
+        "total_agent_funds_label": "Total Agent funds (All owner and vault addresses)",
+        "underlying_addresses_label": "Underlying addresses"
     },
     "notifications": {
         "error_title": "Error",
@@ -551,6 +552,7 @@
                 "withdraw_collateral_pool_tokens_label": "Withdraw Collateral pool tokens",
                 "withdraw_vault_collateral_label": "Withdraw Vault Collateral"
             },
+            "agent_collateral_label": "Agent collateral",
             "agent_label": "Agent",
             "amount_label": "Amount",
             "cr_label": "CR",

src/types.ts

@@ -63,6 +63,8 @@ export interface INotification {
 
 export interface IVault {
     address: string;
+    agentOnlyPoolCollateral: string;
+    agentOnlyPoolCollateralUSD: string;
     allLots: string;
     freeLots: string;
     mintedAmount: string;
@@ -274,4 +276,9 @@ export interface IOtherBot {
         symbol: string;
         balance: string;
     }[];
+}
+
+export interface IFullAgentFund {
+    balance: string;
+    symbol: string;
 }