From be7ca6b428a157e41ed367462072a8b0a235af6f Mon Sep 17 00:00:00 2001 From: Alunara Date: Sat, 8 Nov 2025 15:45:57 +0100 Subject: [PATCH 1/2] refactor: remove dead fetchLoansDetailsHealth usage --- apps/main/src/lend/lib/apiLending.ts | 21 --------------------- apps/main/src/lend/store/createUserSlice.ts | 4 ---- apps/main/src/lend/types/lend.types.ts | 2 -- 3 files changed, 27 deletions(-) diff --git a/apps/main/src/lend/lib/apiLending.ts b/apps/main/src/lend/lib/apiLending.ts index 9722a93f8..e2e5b4314 100644 --- a/apps/main/src/lend/lib/apiLending.ts +++ b/apps/main/src/lend/lib/apiLending.ts @@ -30,7 +30,6 @@ import { RewardCrv, RewardOther, UserLoanDetails, - UserLoanHealth, UserLoanState, UserLoss, UserMarketBalances, @@ -316,26 +315,6 @@ const market = { } const user = { - fetchLoansDetailsHealth: async (api: Api, markets: OneWayMarketTemplate[]) => { - log('fetchUsersLoansDetailsHealth', api.chainId, markets.length) - const results: { [userActiveKey: string]: UserLoanHealth } = {} - - await PromisePool.for(markets) - .handleError((errorObj, market) => { - console.error(errorObj) - const error = getErrorMessage(errorObj, 'error-api') - const userActiveKey = helpers.getUserActiveKey(api, market) - results[userActiveKey] = { healthFull: '', healthNotFull: '', error } - }) - .process(async (market) => { - const userActiveKey = helpers.getUserActiveKey(api, market) - const [healthFull, healthNotFull] = await Promise.all([market.userHealth(), market.userHealth(false)]) - - results[userActiveKey] = { healthFull, healthNotFull, error: '' } - }) - - return results - }, fetchLoansDetailsState: async (api: Api, markets: OneWayMarketTemplate[]) => { log('fetchUsersLoansDetailsState', api.chainId, markets.length) const results: { [userActiveKey: string]: UserLoanState } = {} diff --git a/apps/main/src/lend/store/createUserSlice.ts b/apps/main/src/lend/store/createUserSlice.ts index de0156158..93871164f 100644 --- a/apps/main/src/lend/store/createUserSlice.ts +++ b/apps/main/src/lend/store/createUserSlice.ts @@ -9,7 +9,6 @@ import { UserLoanState, UserMarketBalances, UsersLoansDetailsMapper, - UsersLoansHealthsMapper, UsersLoansStatesMapper, UsersMarketsBalancesMapper, } from '@/lend/types/lend.types' @@ -24,7 +23,6 @@ type SliceState = { marketsBalancesMapper: UsersMarketsBalancesMapper // for market list - loansHealthsMapper: UsersLoansHealthsMapper loansStatesMapper: UsersLoansStatesMapper } @@ -56,7 +54,6 @@ const DEFAULT_STATE: SliceState = { marketsBalancesMapper: {}, // for market list - loansHealthsMapper: {}, loansStatesMapper: {}, } @@ -95,7 +92,6 @@ const createUserSlice = (set: StoreApi['setState'], get: StoreApi[ const fnMapper = { loansDetailsMapper: apiLending.user.fetchLoansDetails, - loansHealthsMapper: apiLending.user.fetchLoansDetailsHealth, loansStatesMapper: apiLending.user.fetchLoansDetailsState, marketsBalancesMapper: apiLending.user.fetchMarketBalances, } diff --git a/apps/main/src/lend/types/lend.types.ts b/apps/main/src/lend/types/lend.types.ts index bb3857293..2c66db3ed 100644 --- a/apps/main/src/lend/types/lend.types.ts +++ b/apps/main/src/lend/types/lend.types.ts @@ -211,8 +211,6 @@ export type UserLoss = { loss: string loss_pct: string } -export type UserLoanHealth = { healthFull: string; healthNotFull: string; error: string } -export type UsersLoansHealthsMapper = { [userActiveKey: string]: UserLoanHealth } export type UserLoanState = { collateral: string; borrowed: string; debt: string; N: string; error: string } export type UsersLoansStatesMapper = { [userActiveKey: string]: UserLoanState } export type UserLoanDetails = { From 530732dbf7ac48e35580c0538167830a2aa41e97 Mon Sep 17 00:00:00 2001 From: Alunara Date: Sat, 8 Nov 2025 16:00:38 +0100 Subject: [PATCH 2/2] refactor: remove loanStatesMapper --- apps/main/src/lend/lib/apiLending.ts | 20 ------------------- .../src/lend/store/createLoanRepaySlice.ts | 10 ++++++---- apps/main/src/lend/store/createUserSlice.ts | 16 --------------- apps/main/src/lend/types/lend.types.ts | 1 - 4 files changed, 6 insertions(+), 41 deletions(-) diff --git a/apps/main/src/lend/lib/apiLending.ts b/apps/main/src/lend/lib/apiLending.ts index e2e5b4314..6e46747c6 100644 --- a/apps/main/src/lend/lib/apiLending.ts +++ b/apps/main/src/lend/lib/apiLending.ts @@ -30,7 +30,6 @@ import { RewardCrv, RewardOther, UserLoanDetails, - UserLoanState, UserLoss, UserMarketBalances, } from '@/lend/types/lend.types' @@ -315,25 +314,6 @@ const market = { } const user = { - fetchLoansDetailsState: async (api: Api, markets: OneWayMarketTemplate[]) => { - log('fetchUsersLoansDetailsState', api.chainId, markets.length) - const results: { [userActiveKey: string]: UserLoanState } = {} - - await PromisePool.for(markets) - .handleError((errorObj, market) => { - console.error(errorObj) - const error = getErrorMessage(errorObj, 'error-api') - const userActiveKey = helpers.getUserActiveKey(api, market) - results[userActiveKey] = { collateral: '', borrowed: '', debt: '', N: '', error } - }) - .process(async (market) => { - const userActiveKey = helpers.getUserActiveKey(api, market) - const state = await market.userState() - results[userActiveKey] = { ...state, error: '' } - }) - - return results - }, fetchLoansDetails: async (api: Api, markets: OneWayMarketTemplate[]) => { log('fetchUsersLoansDetails', api.chainId, markets.length) const results: { [userActiveKey: string]: UserLoanDetails } = {} diff --git a/apps/main/src/lend/store/createLoanRepaySlice.ts b/apps/main/src/lend/store/createLoanRepaySlice.ts index 229b66035..320c0499c 100644 --- a/apps/main/src/lend/store/createLoanRepaySlice.ts +++ b/apps/main/src/lend/store/createLoanRepaySlice.ts @@ -179,10 +179,12 @@ const createLoanRepaySlice = (set: StoreApi['setState'], get: StoreApi fetchUserMarketBalances(api: Api, market: OneWayMarketTemplate, shouldRefetch?: boolean): Promise - fetchUserLoanState(api: Api, market: OneWayMarketTemplate, shouldRefetch?: boolean): Promise fetchAll(api: Api, market: OneWayMarketTemplate, shouldRefetch?: boolean): Promise<{ userLoanDetailsResp: UserLoanDetails | null; userLoanBalancesResp: UserMarketBalances; }> // helpers @@ -52,9 +46,6 @@ export type UserSlice = { const DEFAULT_STATE: SliceState = { loansDetailsMapper: {}, marketsBalancesMapper: {}, - - // for market list - loansStatesMapper: {}, } const createUserSlice = (set: StoreApi['setState'], get: StoreApi['getState']): UserSlice => ({ @@ -92,7 +83,6 @@ const createUserSlice = (set: StoreApi['setState'], get: StoreApi[ const fnMapper = { loansDetailsMapper: apiLending.user.fetchLoansDetails, - loansStatesMapper: apiLending.user.fetchLoansDetailsState, marketsBalancesMapper: apiLending.user.fetchMarketBalances, } @@ -143,12 +133,6 @@ const createUserSlice = (set: StoreApi['setState'], get: StoreApi[ const userActiveKey = helpers.getUserActiveKey(api, market) return get()[sliceKey][key][userActiveKey] }, - fetchUserLoanState: async (api, market, shouldRefetch) => { - const key = 'loansStatesMapper' - await get()[sliceKey].fetchLoanDatas(key, api, [market], shouldRefetch) - const userActiveKey = helpers.getUserActiveKey(api, market) - return get()[sliceKey][key][userActiveKey] - }, fetchUserMarketBalances: async (api, market, shouldRefetch) => { const key = 'marketsBalancesMapper' await get()[sliceKey].fetchDatas(key, api, [market], shouldRefetch) diff --git a/apps/main/src/lend/types/lend.types.ts b/apps/main/src/lend/types/lend.types.ts index 2c66db3ed..91e5d6867 100644 --- a/apps/main/src/lend/types/lend.types.ts +++ b/apps/main/src/lend/types/lend.types.ts @@ -212,7 +212,6 @@ export type UserLoss = { loss_pct: string } export type UserLoanState = { collateral: string; borrowed: string; debt: string; N: string; error: string } -export type UsersLoansStatesMapper = { [userActiveKey: string]: UserLoanState } export type UserLoanDetails = { details: { health: string