Merge branch 'stage' into staging-beta

Author: JeznaSpianca

src/api/agent.ts

@@ -20,7 +20,8 @@ import {
     IVaultCollateral,
     IOwnerUnderlyingBalance,
     IOwnerFassetBalance,
-    IRedemptionQueueData
+    IRedemptionQueueData,
+    IOtherBot
 } from "@/types";
 import { orderBy } from "lodash";
 
@@ -43,7 +44,8 @@ const AGENT_KEY = {
     UNDERLYING_ADDRESSES: 'agent.underlyingAddresses',
     OWNER_UNDERLYING_BALANCE: 'agent.ownerUnderlyingBalance',
     OWNER_FASSET_BALANCE: 'agent.ownerFassetBalance',
-    REDEMPTION_QUEUE_DATA: 'agent.redemptionQueueData'
+    REDEMPTION_QUEUE_DATA: 'agent.redemptionQueueData',
+    OTHER_BOTS: 'agent.otherBots'
 }
 
 export function useWorkAddress(enabled: boolean = true) {
@@ -389,3 +391,15 @@ export function useRedemptionQueueData(enabled: boolean = true) {
         enabled: enabled
     })
 }
+
+export function useOtherBots(enabled: boolean = true) {
+    return useQuery({
+        queryKey: [AGENT_KEY.OTHER_BOTS],
+        queryFn: async () => {
+            const response = await apiClient.get(`${resource}/otherBots`);
+            return response.data.data as IOtherBot[];
+        },
+        enabled: enabled
+    })
+}
+

src/components/cards/AgentBotsCard.tsx

@@ -88,8 +88,8 @@ export default function AgentBotsCard({ className,  balances}: IAgentBotsCard) {
                                                 <span className="status-dot mr-2"
                                                       style={{backgroundColor: textColorStatus}}></span>
                                                 <span style={{color: textColorStatus}}>
-                                                        {t(`agent_bots_card.table.agent_${botStatus.data ? 'live' : 'offline'}_label`)}
-                                                    </span>
+                                                    {t(`agent_bots_card.table.agent_${botStatus.data ? 'live' : 'offline'}_label`)}
+                                                </span>
                                             </div>
                                         </Badge>
                                     </div>

src/components/cards/OtherBotsCard.tsx

@@ -0,0 +1,95 @@
+import { Badge, Loader, Paper, Table } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+import { truncateString } from "@/utils";
+import CopyIcon from "@/components/icons/CopyIcon";
+import { IOtherBot } from "@/types";
+
+interface IOtherBotsCard {
+    className?: string;
+    otherBots: IOtherBot[];
+}
+
+export default function OtherBotsCard({ otherBots, className }: IOtherBotsCard) {
+    const { t } = useTranslation();
+
+    const tokenColumns: string[] = otherBots[0]
+        ? otherBots[0].balances.map(balance => balance.symbol)
+        : [];
+
+    return (
+        <Paper
+            className={`${className}`}
+            withBorder
+        >
+            <Table.ScrollContainer minWidth={470}>
+                <Table
+                    verticalSpacing="md"
+                >
+                    <Table.Thead>
+                        <Table.Tr>
+                            <Table.Th className="uppercase">#</Table.Th>
+                            <Table.Th className="uppercase">{t('other_bots_card.table.type_label')}</Table.Th>
+                            <Table.Th className="uppercase">{t('other_bots_card.table.status_label')}</Table.Th>
+                            <Table.Th className="uppercase">{t('other_bots_card.table.working_address_label')}</Table.Th>
+                            {tokenColumns.map(column => (
+                                <Table.Th
+                                    key={column}
+                                    className="uppercase"
+                                >
+                                    {column}
+                                </Table.Th>
+                            ))}
+                        </Table.Tr>
+                    </Table.Thead>
+                    <Table.Tbody>
+                        {otherBots.map(((bot, index) => (
+                            <Table.Tr key={index}>
+                                <Table.Td>
+                                    {index + 1}
+                                </Table.Td>
+                                <Table.Td>
+                                    {bot.type}
+                                </Table.Td>
+                                <Table.Td>
+                                    <div className="flex items-center mb-1">
+                                        <Badge
+                                            variant="outline"
+                                            color={bot.status ? 'var(--green-default)' : 'var(--dark-red-default)'}
+                                            radius="xs"
+                                            className={`font-normal`}
+                                        >
+                                            <div className="flex items-center">
+                                                <span
+                                                    className="status-dot mr-2"
+                                                    style={{
+                                                        backgroundColor: bot.status ? 'var(--green-default)' : 'var(--dark-red-default)'
+                                                    }}
+                                                />
+                                                <span style={{color: bot.status ? 'var(--green-default)' : 'var(--dark-red-default)'}}>
+                                                    {t(`other_bots_card.table.agent_${bot.status ? 'live' : 'offline'}_label`)}
+                                                </span>
+                                            </div>
+                                        </Badge>
+                                    </div>
+                                </Table.Td>
+                                <Table.Td>
+                                    <div className="flex items-center">
+                                        {truncateString(bot.address ?? '', 5, 5)}
+                                        <CopyIcon
+                                            text={bot.address ?? ''}
+                                        />
+                                    </div>
+                                </Table.Td>
+                                {bot.balances.map(balance => (
+                                    <Table.Td key={balance.symbol}>
+                                        {balance.balance}
+                                    </Table.Td>
+                                ))}
+                            </Table.Tr>
+                        )))}
+                    </Table.Tbody>
+                </Table>
+            </Table.ScrollContainer>
+        </Paper>
+    );
+}

src/components/forms/VaultForm.tsx

@@ -33,6 +33,7 @@ interface ICollateralTemplate {
     mintingPoolCollateralRatio: number;
     poolExitCollateralRatio: number;
     buyFAssetByAgentFactor: number;
+    redemptionPoolFeeShare: string;
 }
 interface IFormValues {
     name: string | undefined;
@@ -46,6 +47,7 @@ interface IFormValues {
     mintingPoolCollateralRatio: number | undefined;
     poolExitCollateralRatio: number | undefined;
     buyFAssetByAgentFactor: number | undefined;
+    redemptionPoolFeeShare: number | undefined;
 }
 export type FormRef = {
     form: () => UseFormReturnType<any>;
@@ -110,6 +112,16 @@ const VaultForm = forwardRef<FormRef, IForm>(({ vault, disabled }: IForm, ref) =
             });
         }
 
+        if (!vault) {
+            schema = schema.shape({
+                redemptionPoolFeeShare: yup
+                    .string()
+                    .required(
+                        t('validation.messages.required', { field: t('forms.vault.redemption_pool_fee_share_label') })
+                    ),
+            });
+        }
+
         return schema;
     }
 
@@ -126,7 +138,8 @@ const VaultForm = forwardRef<FormRef, IForm>(({ vault, disabled }: IForm, ref) =
             mintingVaultCollateralRatio: undefined,
             mintingPoolCollateralRatio: undefined,
             poolExitCollateralRatio: undefined,
-            buyFAssetByAgentFactor: undefined
+            buyFAssetByAgentFactor: undefined,
+            redemptionPoolFeeShare: undefined
         },
         //@ts-ignore
         validate: yupResolver(getSchema(vault)),
@@ -208,6 +221,7 @@ const VaultForm = forwardRef<FormRef, IForm>(({ vault, disabled }: IForm, ref) =
             mintingVaultCollateralRatio: Number(collateralTemplate.mintingVaultCollateralRatio),
             poolExitCollateralRatio: Number(collateralTemplate.poolExitCollateralRatio),
             buyFAssetByAgentFactor: Number(collateralTemplate.buyFAssetByAgentFactor),
+            redemptionPoolFeeShare: Number(collateralTemplate.redemptionPoolFeeShare.replace('%', '')),
         });
     }, [collateralTemplate]);
 
@@ -428,6 +442,23 @@ const VaultForm = forwardRef<FormRef, IForm>(({ vault, disabled }: IForm, ref) =
                         className="mt-4"
                         onKeyDownCapture={onKeyDownCapture}
                     />
+                    {vault == undefined &&
+                        <NumberInput
+                            {...form.getInputProps('redemptionPoolFeeShare')}
+                            //@ts-ignore
+                            key={form.key('redemptionPoolFeeShareBIPS')}
+                            label={t('forms.vault.redemption_pool_fee_share_label')}
+                            description={t('forms.vault.redemption_pool_fee_share_description_label')}
+                            disabled={isHiddenInputDisabled || disabled}
+                            placeholder={t('forms.vault.enter_placeholder')}
+                            withAsterisk
+                            allowNegative={false}
+                            step={1}
+                            suffix="%"
+                            className="mt-4"
+                            onKeyDownCapture={onKeyDownCapture}
+                        />
+                    }
                 </>
             }
             {minAmountDescriptionLabel &&

src/languages/en.json

@@ -188,6 +188,7 @@
     "dashboard": {
         "agent_title": "Agent Bots",
         "alerts_title": "Alerts & Notifications",
+        "other_title": "Other",
         "title": "Overview",
         "vaults_title": "Vaults",
         "xrp_supply_title": "{{token}} Supply"
@@ -358,6 +359,15 @@
         "show_all_button": "Show all",
         "title": "Notifications from Flare"
     },
+    "other_bots_card": {
+        "table": {
+            "agent_live_label": "Online",
+            "agent_offline_label": "Offline",
+            "status_label": "Status",
+            "type_label": "Type",
+            "working_address_label": "Working address"
+        }
+    },
     "select_wallet_button": {
         "connect_label": "Connect",
         "disconnect_label": "Disconnect",
@@ -521,8 +531,8 @@
                 "cancel_underlying_withdrawal_label": "Cancel underlying withdrawal",
                 "cancel_withdraw_from_core_vault_label": "Cancel withdraw from Core Vault",
                 "claim_rewards_label": "Claim Rewards",
-                "close_vault_label": "Close Vault (Exit)",
-                "deactivate_vault_label": "Deactivate Vault",
+                "close_vault_label": "Close Vault",
+                "deactivate_vault_label": "Deactivate Vault (Exit)",
                 "delegate_pool_collateral_label": "Delegate Pool Collateral",
                 "deposit_collateral_lots_label": "Deposit Collateral (Lots)",
                 "deposit_pool_collateral_label": "Deposit Pool Collateral",

src/pages/index.tsx

@@ -8,12 +8,14 @@ import AgentBotsCard from '@/components/cards/AgentBotsCard';
 import ManagementAddressCard from '@/components/cards/ManagementAddressCard';
 import VaultsCard from '@/components/cards/VaultsCard';
 import XrpSupplyCard from "@/components/cards/XrpSupplyCard";
-import { useBalances, useCollaterals } from '@/api/agent';
+import OtherBotsCard from "@/components/cards/OtherBotsCard";
+import { useBalances, useCollaterals, useOtherBots } from '@/api/agent';
 
 export default function Dashboard() {
     const { t } = useTranslation();
     const balances = useBalances();
     const collateral = useCollaterals();
+    const otherBots = useOtherBots();
 
     const xrpBalance = balances.data?.find(balance => balance.symbol.toLowerCase().includes('xrp'));
 
@@ -37,7 +39,20 @@ export default function Dashboard() {
                     >
                         {t('dashboard.agent_title')}
                     </Title>
-                    <AgentBotsCard balances={balances} />
+                    <AgentBotsCard
+                        balances={balances}
+                    />
+                    {otherBots?.data && otherBots.data.length > 0 &&
+                        <>
+                            <Title
+                                order={1}
+                                className="mt-10 mb-3"
+                            >
+                                {t('dashboard.other_title')}
+                            </Title>
+                            <OtherBotsCard otherBots={otherBots.data} />
+                        </>
+                    }
                 </div>
                 <div className="hidden lg:block w-full lg:w-2/5">
                     <Title

src/pages/vault/add.tsx

@@ -85,7 +85,8 @@ export default function AddVault() {
                 mintingVaultCollateralRatio: data.mintingVaultCollateralRatio,
                 mintingPoolCollateralRatio: data.mintingPoolCollateralRatio,
                 poolExitCollateralRatio: data.poolExitCollateralRatio,
-                buyFAssetByAgentFactor: data.buyFAssetByAgentFactor
+                buyFAssetByAgentFactor: data.buyFAssetByAgentFactor,
+                redemptionPoolFeeShare: `${data.redemptionPoolFeeShare}%`,
             }
 
             createVault.mutateAsync({

src/types.ts

@@ -107,6 +107,7 @@ export interface IAgentSettingsConfig {
     poolExitCollateralRatio: string;
     buyFAssetByAgentFactor: string;
     redemptionPoolFeeShareBIPS?: string;
+    redemptionPoolFeeShare?: string;
 }
 
 export interface IAgentVault {
@@ -264,3 +265,13 @@ export interface IRedemptionQueueData {
     mintedLots: number;
     redemptionQueueLots: number;
 }
+
+export interface IOtherBot {
+    type: string;
+    address: string;
+    status: boolean;
+    balances: {
+        symbol: string;
+        balance: string;
+    }[];
+}