Pw/various-refinance-fixes (#3927)

* Added portfolio banners

* refactor

* Fixed aave borrow rate

* fix comment

* Fixed maxLTV aave

* Fixed liq price for the simulated position

* bump client package

* Fixed formatting

* updated deps

* updated deps

* imports fix

* Fixed borrow rate and liq price for maker

* Fixed liq price confusion
Fixed MaxLTV change

* Fixed borrow rate change value

* Fix lint

Author: piotrwitek

features/omni-kit/helpers/isShortPosition.ts

@@ -1,3 +1,5 @@
+import { stablecoinTokensUpperCase } from 'features/refinance/stablecoinTokensUpperCase'
+
 export function isShortPosition({ collateralToken }: { collateralToken: string }): boolean {
-  return ['SDAI', 'DAI', 'USDC'].includes(collateralToken)
+  return stablecoinTokensUpperCase.includes(collateralToken.toUpperCase())
 }

features/refinance/components/RefinancePortfolioBanner.tsx

@@ -1,3 +1,4 @@
+import { ProtocolName } from '@summer_fi/summerfi-sdk-common'
 import { useAccountContext } from 'components/context/AccountContextProvider'
 import { useRefinanceGeneralContext } from 'features/refinance/contexts/RefinanceGeneralContext'
 import { RefinanceModalController } from 'features/refinance/controllers'
@@ -131,14 +132,36 @@ export const RefinancePortfolioBanner: FC<RefinancePortfolioBannerProps> = ({ po
       <Text as="span" variant="boldParagraph3" color="primary100">
         {tPortfolio('refinance.banner.default', {
           id: vaultId,
+          protocol: ProtocolName.Maker,
         })}
       </Text>
     ),
     [LendingProtocol.Ajna]: null,
-    [LendingProtocol.AaveV3]: null,
+    [LendingProtocol.AaveV3]: (
+      <Text as="span" variant="boldParagraph3" color="primary100">
+        {tPortfolio('refinance.banner.default', {
+          id: vaultId,
+          protocol: ProtocolName.AaveV3,
+        })}
+      </Text>
+    ),
     [LendingProtocol.AaveV2]: null,
-    [LendingProtocol.SparkV3]: null,
-    [LendingProtocol.MorphoBlue]: null,
+    [LendingProtocol.SparkV3]: (
+      <Text as="span" variant="boldParagraph3" color="primary100">
+        {tPortfolio('refinance.banner.default', {
+          id: vaultId,
+          protocol: ProtocolName.Spark,
+        })}
+      </Text>
+    ),
+    [LendingProtocol.MorphoBlue]: (
+      <Text as="span" variant="boldParagraph3" color="primary100">
+        {tPortfolio('refinance.banner.default', {
+          id: vaultId,
+          protocol: ProtocolName.MorphoBlue,
+        })}
+      </Text>
+    ),
   }[protocol]
 
   const contextId = `${vaultId}${primaryToken}${secondaryToken}`.toLowerCase()

features/refinance/components/RefinancePositionView.tsx

@@ -15,7 +15,6 @@ import {
   formatDecimalAsPercent,
   formatLtvDecimalAsPercent,
 } from 'helpers/formatters/format'
-import { one } from 'helpers/zero'
 import type { LendingProtocol } from 'lendingProtocols'
 import { useTranslation } from 'next-i18next'
 import React from 'react'
@@ -123,13 +122,11 @@ export const RefinancePositionView = <Type extends RefinancePositionViewType>(
     ? `${secondaryToken}/${primaryToken}`
     : `${primaryToken}/${secondaryToken}`
 
+  const formattedLiquidationPrice = positionData?.liquidationPrice
+
   const formatted = {
     ltv: positionData?.ltv && formatLtvDecimalAsPercent(positionData.ltv),
-    liquidationPrice:
-      positionData?.liquidationPrice &&
-      formatCryptoBalance(
-        isShort ? one.div(positionData.liquidationPrice) : positionData.liquidationPrice,
-      ),
+    liquidationPrice: formattedLiquidationPrice && formatCryptoBalance(formattedLiquidationPrice),
     collateral: positionData?.collateral && (
       <ItemValueWithIcon tokens={[primaryToken]}>
         {formatCryptoBalance(positionData.collateral)}

features/refinance/components/RefinanceSimulation.tsx

@@ -13,7 +13,7 @@ export const RefinanceSimulation = () => {
       state: { strategy },
     },
     poolData: { maxLtv: currentMaxLtv },
-    position: { netApy: currentBorrowRate },
+    position: { borrowRate: currentBorrowRate },
   } = useRefinanceContext()
 
   const positionData = useSimulationPositionData()

features/refinance/components/steps/RefinanceReviewChangesSection.tsx

@@ -2,11 +2,7 @@ import BigNumber from 'bignumber.js'
 import { InfoSection } from 'components/infoSection/InfoSection'
 import { ItemValueWithIcon } from 'components/infoSection/ItemValueWithIcon'
 import { useRefinanceContext } from 'features/refinance/contexts'
-import {
-  formatCryptoBalance,
-  formatDecimalAsPercent,
-  formatLtvDecimalAsPercent,
-} from 'helpers/formatters/format'
+import { formatCryptoBalance, formatLtvDecimalAsPercent } from 'helpers/formatters/format'
 import { useTranslation } from 'next-i18next'
 import React from 'react'
 import { Text } from 'theme-ui'
@@ -38,39 +34,43 @@ const getChangeVariant = (
 export const RefinanceReviewChangesSection = () => {
   const { t } = useTranslation()
 
-  const { poolData, position, simulation, automations } = useRefinanceContext()
+  const {
+    poolData,
+    position,
+    simulation,
+    automations,
+    form: {
+      state: { strategy },
+    },
+  } = useRefinanceContext()
 
   const ltv = new BigNumber(poolData.maxLtv.loanToValue)
   const liquidationPrice = new BigNumber(position.liquidationPrice)
   const debt = new BigNumber(position.debtTokenData.amount)
   const debtToken = position.debtTokenData.token.symbol
 
-  if (!simulation.refinanceSimulation) {
+  if (!simulation.refinanceSimulation || !strategy?.maxLtv) {
     return null
   }
   const targetPosition = simulation.refinanceSimulation.targetPosition
 
   const isAutomationEnabled = Object.values(automations).some((item) => item.enabled)
 
-  const afterLtv = new BigNumber(
-    simulation.liquidationThreshold ? simulation.liquidationThreshold.toProportion() : 0,
-  )
+  const afterLtv = new BigNumber(strategy.maxLtv)
 
   const afterLiquidationPriceInUsd = simulation.liquidationPrice
   const afterLiquidationPrice = new BigNumber(afterLiquidationPriceInUsd)
   const afterDebt = new BigNumber(targetPosition.debtAmount.amount)
   const afterDebtToken = targetPosition.debtAmount.token.symbol
 
-  const ltvChange = afterLtv.minus(ltv).div(ltv)
-  const liquidationPriceChange = afterLiquidationPrice.minus(liquidationPrice).div(liquidationPrice)
+  const ltvChange = afterLtv.minus(ltv)
 
   const formatted = {
     ltv: formatLtvDecimalAsPercent(ltv),
     afterLtv: formatLtvDecimalAsPercent(afterLtv),
     ltvChange: formatLtvDecimalAsPercent(ltvChange),
     liquidationPrice: formatCryptoBalance(liquidationPrice),
     afterLiquidationPrice: formatCryptoBalance(afterLiquidationPrice),
-    liquidationPriceChange: formatDecimalAsPercent(liquidationPriceChange),
     debt: <ItemValueWithIcon tokens={[debtToken]}>{formatCryptoBalance(debt)}</ItemValueWithIcon>,
     afterDebt: (
       <ItemValueWithIcon tokens={[afterDebtToken]}>
@@ -89,14 +89,6 @@ export const RefinanceReviewChangesSection = () => {
               label: t('system.liq-price-short'),
               value: formatted.liquidationPrice,
               change: formatted.afterLiquidationPrice,
-              secondary: {
-                value: formatted.liquidationPriceChange,
-                variant: getChangeVariant(
-                  'liquidationPrice',
-                  liquidationPriceChange,
-                  position.isShort,
-                ),
-              },
             },
             {
               label: t('max-ltv'),

features/refinance/ethCorrelatedUpperCase.ts

@@ -0,0 +1,21 @@
+export const ethCorrelatedUpperCase = [
+  'AETHCBETH',
+  'AETHRETH',
+  'AETHWETH',
+  'AETHWSTETH',
+  'ASETH',
+  'AWETH',
+  'AWSTETH',
+  'CBETH',
+  'CETH',
+  'CWETHV3',
+  'ETH',
+  'EZETH',
+  'OSETH',
+  'RETH',
+  'STETH',
+  'WEETH',
+  'WETH',
+  'WSTETH',
+  'WOETH',
+]

features/refinance/helpers/getEmode.tsx

@@ -1,56 +1,7 @@
 import { EmodeType } from '@summer_fi/summerfi-sdk-client'
 import type { IToken } from '@summer_fi/summerfi-sdk-common'
-
-const stablecoinTokensUpperCase = [
-  'ADAI',
-  'AETHDAI',
-  'AETHLUSD',
-  'AETHPYUSD',
-  'AETHSDAI',
-  'AETHUSDC',
-  'AETHUSDT',
-  'AUSDC',
-  'AUSDT',
-  'CDAI',
-  'CRVUSD',
-  'CUSDC',
-  'CUSDCV3',
-  'DAI',
-  'FRAX',
-  'GHO',
-  'GUSD',
-  'LUSD',
-  'PYUSD',
-  'SDAI',
-  'SUSD',
-  'SUSDE',
-  'USDC.E',
-  'USDC',
-  'USDE',
-  'USDT',
-]
-const ethCorrelatedUpperCase = [
-  'AETHCBETH',
-  'AETHRETH',
-  'AETHWETH',
-  'AETHWSTETH',
-  'ASETH',
-  'AWETH',
-  'AWSTETH',
-  'CBETH',
-  'CBETH',
-  'CETH',
-  'CWETHV3',
-  'ETH',
-  'EZETH',
-  'OSETH',
-  'RETH',
-  'STETH',
-  'WEETH',
-  'WETH',
-  'WSTETH',
-  'WOETH',
-]
+import { ethCorrelatedUpperCase } from 'features/refinance/ethCorrelatedUpperCase'
+import { stablecoinTokensUpperCase } from 'features/refinance/stablecoinTokensUpperCase'
 
 export function getEmode(collateralToken: IToken, debtToken: IToken) {
   const collateralTokenSymbolUpperCase = collateralToken.symbol.toUpperCase()

features/refinance/hooks/useAaveLikeRefinanceContextInputs.ts

@@ -57,7 +57,7 @@ export const useAaveLikeRefinanceContextInputs = ({
 
   const castedPosition = position as AaveLikePositionV2
 
-  const borrowRate = castedPosition.category.liquidationThreshold.toString()
+  const borrowRate = castedPosition.borrowRate.toString()
   const ltv = castedPosition.riskRatio.loanToValue.toString()
   const maxLtv = castedPosition.maxRiskRatio.loanToValue.toString()
   const liquidationPrice = castedPosition.liquidationPrice.toString()

features/refinance/hooks/useSdkSimulation.tsx

@@ -15,8 +15,10 @@ import {
   Percentage,
   ProtocolName,
 } from '@summer_fi/summerfi-sdk-common'
+import BigNumber from 'bignumber.js'
 import { getTokenPrice } from 'blockchain/prices'
 import { tokenPriceStore } from 'blockchain/prices.constants'
+import { isShortPosition } from 'features/omni-kit/helpers'
 import { useRefinanceGeneralContext } from 'features/refinance/contexts'
 import { getPosition } from 'features/refinance/helpers/getPosition'
 import { getProtocolNameByLendingProtocol } from 'features/refinance/helpers/getProtocolNameByLendingProtocol'
@@ -108,7 +110,7 @@ export function useSdkSimulation(): SDKSimulation {
     const _collateralPrice = getTokenPrice(
       collateralTokenData.token.symbol,
       tokenPriceStore.prices,
-      'collateral price - refinance modal controller',
+      'collateral price - useSdkSimulation',
     ).toString()
     setCollateralPrice(_collateralPrice)
 
@@ -162,13 +164,13 @@ export function useSdkSimulation(): SDKSimulation {
       })
       setSourcePosition(_sourcePosition)
 
-      const _liquidationThreshold = (
+      const _targetLiquidationThreshold = (
         targetPoolInfo as ILendingPoolInfo
       ).collateral.liquidationThreshold.toLTV()
-      if (_liquidationThreshold == null) {
+      if (_targetLiquidationThreshold == null) {
         return
       }
-      setLiquidationThreshold(_liquidationThreshold)
+      setLiquidationThreshold(_targetLiquidationThreshold)
 
       const refinanceParameters: IRefinanceParameters = {
         sourcePosition: _sourcePosition,
@@ -198,12 +200,24 @@ export function useSdkSimulation(): SDKSimulation {
         setImportPositionSimulation(_importPositionSimulation)
       }
 
-      const afterLiquidationPriceInUsd = PositionUtils.getLiquidationPriceInUsd({
-        liquidationThreshold: _liquidationThreshold,
-        debtPriceInUsd: _debtPrice,
-        position: _refinanceSimulation?.targetPosition,
+      const targetDebtPrice = getTokenPrice(
+        _refinanceSimulation.targetPosition.debtAmount.token.symbol,
+        tokenPriceStore.prices,
+        'target debt price - useSdkSimulation',
+      ).toString()
+
+      const targetLiquidationPriceInUsd = PositionUtils.getLiquidationPriceInDebtTokens({
+        liquidationThreshold: _targetLiquidationThreshold,
+        debtPriceInUsd: targetDebtPrice,
+        position: _refinanceSimulation.targetPosition,
+      })
+      const isShort = isShortPosition({
+        collateralToken: _refinanceSimulation.targetPosition.collateralAmount.token.symbol,
       })
-      setLiquidationPrice(afterLiquidationPriceInUsd)
+      const _liquidationPrice = isShort
+        ? new BigNumber(1).div(targetLiquidationPriceInUsd).toString()
+        : targetLiquidationPriceInUsd
+      setLiquidationPrice(_liquidationPrice)
     }
     void fetchData().catch((err) => {
       setError(err.message)

features/refinance/hooks/useSdkTransaction.tsx

@@ -1,6 +1,6 @@
 import { makeSDK } from '@summer_fi/summerfi-sdk-client'
 import type { ISimulation, Order, SimulationType } from '@summer_fi/summerfi-sdk-common'
-import { Address, AddressType, Wallet } from '@summer_fi/summerfi-sdk-common'
+import { Address, AddressType, PositionsManager, Wallet } from '@summer_fi/summerfi-sdk-common'
 import { useRefinanceContext } from 'features/refinance/contexts'
 import { RefinanceSidebarStep } from 'features/refinance/types'
 import { LendingProtocol } from 'lendingProtocols'
@@ -43,12 +43,7 @@ export function useSdkRefinanceTransaction({
   }, [currentStep])
 
   useEffect(() => {
-    if (
-      !strategy ||
-      !dpm?.address ||
-      refinanceSimulation == null ||
-      (importPositionSimulation == null && lendingProtocol === LendingProtocol.Maker)
-    ) {
+    if (!strategy || !dpm?.address || refinanceSimulation == null) {
       return
     }
     const fetchData = async () => {
@@ -63,28 +58,28 @@ export function useSdkRefinanceTransaction({
         walletAddress: wallet.address,
       })
 
-      const [_importPositionOrder, _refinanceOrder] = await Promise.all([
-        lendingProtocol === LendingProtocol.Maker
-          ? user.newOrder({
-              positionsManager: {
-                address: Address.createFromEthereum({
-                  value: dpm.address as `0x${string}`,
-                }),
-              },
-              simulation: importPositionSimulation,
-            })
-          : Promise.resolve(null),
-        user.newOrder({
-          positionsManager: {
+      const _refinanceOrder = await user.newOrder({
+        positionsManager: PositionsManager.createFrom({
+          address: Address.createFromEthereum({
+            value: dpm.address as `0x${string}`,
+          }),
+        }),
+        simulation: refinanceSimulation,
+      })
+      setTxRefinance(_refinanceOrder)
+
+      // for maker
+      if (lendingProtocol === LendingProtocol.Maker && importPositionSimulation != null) {
+        const _importPositionOrder = await user.newOrder({
+          positionsManager: PositionsManager.createFrom({
             address: Address.createFromEthereum({
               value: dpm.address as `0x${string}`,
             }),
-          },
-          simulation: refinanceSimulation,
-        }),
-      ])
-      setTxImportPosition(_importPositionOrder)
-      setTxRefinance(_refinanceOrder)
+          }),
+          simulation: importPositionSimulation,
+        })
+        setTxImportPosition(_importPositionOrder)
+      }
     }
     void fetchData().catch((err) => {
       setError(err.message)