feat: Combine PoolState into one endpoint

contracts/loan_pool/src/contract.rs

@@ -1,3 +1,4 @@
+use crate::dto::PoolState;
 use crate::interest::{self, get_interest};
 use crate::pool::Currency;
 use crate::positions;
@@ -223,6 +224,15 @@ impl LoanPoolContract {
         interest::get_interest(e)
     }
 
+    pub fn get_pool_state(e: Env) -> PoolState {
+        PoolState {
+            total_balance: pool::read_total_balance(&e),
+            available_balance: pool::read_available_balance(&e),
+            total_shares: pool::read_total_shares(&e),
+            annual_interest_rate: interest::get_interest(e),
+        }
+    }
+
     pub fn increase_liabilities(e: Env, user: Address, amount: i128) {
         let loan_manager_addr = pool::read_loan_manager_addr(&e);
         loan_manager_addr.require_auth();

contracts/loan_pool/src/dto.rs

@@ -0,0 +1,9 @@
+use soroban_sdk::contracttype;
+
+#[contracttype]
+pub struct PoolState {
+    pub total_balance: i128,
+    pub available_balance: i128,
+    pub total_shares: i128,
+    pub annual_interest_rate: i128,
+}

contracts/loan_pool/src/lib.rs

@@ -2,6 +2,7 @@
 #![allow(clippy::unused_unit)]
 
 mod contract;
+mod dto;
 mod interest;
 mod pool;
 mod positions;

src/contexts/pool-context.tsx

@@ -11,7 +11,8 @@ export type PriceRecord = {
 export type PoolState = {
   totalBalance: bigint;
   availableBalance: bigint;
-  apr: bigint;
+  totalShares: bigint;
+  annualInterestRate: bigint;
 };
 
 export type PoolRecord = {
@@ -53,10 +54,13 @@ const fetchPriceData = async (ticker: string): Promise<bigint> => {
 
 const fetchPoolState = async (ticker: SupportedCurrency): Promise<PoolState> => {
   const { contractClient } = CURRENCY_BINDINGS[ticker];
-  const { result: totalBalance } = await contractClient.get_contract_balance();
-  const { result: availableBalance } = await contractClient.get_available_balance();
-  const { result: apr } = await contractClient.get_interest();
-  return { totalBalance, availableBalance, apr };
+  const { result } = await contractClient.get_pool_state();
+  return {
+    totalBalance: result.total_balance,
+    availableBalance: result.available_balance,
+    totalShares: result.total_shares,
+    annualInterestRate: result.annual_interest_rate,
+  };
 };
 
 const fetchPools = async (): Promise<PoolRecord> => {

src/pages/_borrow/BorrowModal/BorrowStep.tsx

@@ -32,7 +32,7 @@ export const BorrowStep = ({ onClose, currency }: BorrowStepProps) => {
 
   if (!pools || !prices || !walletBalances) return null;
 
-  const { apr, availableBalance } = pools[ticker];
+  const { annualInterestRate, availableBalance } = pools[ticker];
 
   const collateralOptions: SupportedCurrency[] = CURRENCY_BINDINGS_ARR.filter((c) => c.ticker !== ticker).map(
     ({ ticker }) => ticker,
@@ -146,7 +146,7 @@ export const BorrowStep = ({ onClose, currency }: BorrowStepProps) => {
         collateral, causing you to lose some of your collateral.
       </p>
       <p className="my-4">The interest rate changes as the amount of assets borrowed from the pools changes.</p>
-      <p className="my-4">The annual interest rate is currently {formatAPR(apr)}.</p>
+      <p className="my-4">The annual interest rate is currently {formatAPR(annualInterestRate)}.</p>
 
       <p className="font-bold mb-2 mt-6">Amount to borrow</p>
       <CryptoAmountSelector

src/pages/_borrow/BorrowableAsset.tsx

@@ -70,7 +70,9 @@ export const BorrowableAsset = ({ currency }: BorrowableAssetCardProps) => {
       </td>
 
       <td>
-        <p className="text-xl font-semibold leading-6">{pool ? formatAPR(pool.apr) : <Loading size="xs" />}</p>
+        <p className="text-xl font-semibold leading-6">
+          {pool ? formatAPR(pool.annualInterestRate) : <Loading size="xs" />}
+        </p>
       </td>
 
       <td>