Rays in omni overview

features/omni-kit/controllers/OmniOverviewController.tsx

@@ -4,6 +4,7 @@ import { DetailsSectionFooterItemWrapper } from 'components/DetailsSectionFooter
 import { SimulateTitle } from 'components/SimulateTitle'
 import { OmniDetailSectionErc20Claims } from 'features/omni-kit/components/details-section/OmniDetailSectionErc20Claims'
 import { useOmniGeneralContext, useOmniProductContext } from 'features/omni-kit/contexts'
+import { getOmniDetailsSectionRaysTitle } from 'features/omni-kit/helpers/getOmniDetailsSectionRaysTitle'
 import { useOmniInPositionAmount } from 'features/omni-kit/hooks'
 import { OmniProductType } from 'features/omni-kit/types'
 import { useTranslation } from 'next-i18next'
@@ -14,7 +15,7 @@ export function OmniOverviewController() {
   const { t } = useTranslation()
 
   const {
-    environment: { productType, isOpening, quoteToken, entryToken },
+    environment: { productType, isOpening, quoteToken, entryToken, positionRaysMultipliersData },
   } = useOmniGeneralContext()
   const {
     dynamicMetadata: {
@@ -28,10 +29,18 @@ export function OmniOverviewController() {
       },
       notifications,
     },
+    position: {
+      currentPosition: { position },
+    },
   } = useOmniProductContext(productType)
 
   const amountInPosition = useOmniInPositionAmount()
 
+  const raysPerYearElement = getOmniDetailsSectionRaysTitle({
+    position,
+    positionRaysMultipliersData,
+  })
+
   return (
     <Grid sx={{ rowGap: 3 }}>
       <DetailsSection
@@ -44,6 +53,7 @@ export function OmniOverviewController() {
           )) ||
           t('system.overview')
         }
+        extra={!isOpening && raysPerYearElement}
         notifications={notifications}
         content={
           (productType === OmniProductType.Earn || overviewWithSimulation) && isOpening ? (

features/omni-kit/helpers/getOmniDetailsSectionRaysTitle.tsx

@@ -0,0 +1,41 @@
+import type { LendingPosition, SupplyPosition } from '@oasisdex/dma-library'
+import BigNumber from 'bignumber.js'
+import type { PositionRaysMultipliersData } from 'features/rays/types'
+import { getPositionPortfolioRaysWithBoosts } from 'handlers/portfolio/positions/helpers/getPositionPortfolioRaysWithBoosts'
+import { formatCryptoBalance } from 'helpers/formatters/format'
+import { getGradientColor } from 'helpers/getGradientColor'
+import { getPointsPerYear } from 'helpers/rays'
+import React from 'react'
+import { Text } from 'theme-ui'
+
+export const getOmniDetailsSectionRaysTitle = ({
+  position,
+  positionRaysMultipliersData,
+}: {
+  position: LendingPosition | SupplyPosition
+  positionRaysMultipliersData: PositionRaysMultipliersData
+}) => {
+  // In general all positions should have `netValue` field since all positions extend either Lending or Supply interface
+  const positionNetValue = position && 'netValue' in position ? position.netValue.toNumber() : 0
+
+  const rawRaysPerYear = getPointsPerYear(positionNetValue)
+
+  const raysPerYear = getPositionPortfolioRaysWithBoosts({
+    rawRaysPerYear,
+    positionRaysMultipliersData,
+  })
+
+  return (
+    <Text
+      variant="paragraph3"
+      sx={{
+        fontWeight: 'semiBold',
+        ...getGradientColor(
+          'linear-gradient(270.13deg, #007DA3 0.02%, #E7A77F 56.92%, #E97047 98.44%)',
+        ),
+      }}
+    >
+      + {formatCryptoBalance(new BigNumber(raysPerYear))} Rays / year
+    </Text>
+  )
+}

features/omni-kit/protocols/aave-like/helpers/mapAaveLikeRaysMultipliers.ts

@@ -42,8 +42,8 @@ export const mapAaveLikeRaysMultipliers = ({
         _network === resolvedNetwork &&
         _proxy.toLowerCase() === dpmProxy.toLowerCase() &&
         resolvedProtocol.includes(_protocol) &&
-        _collateralTokenAddress === collateralTokenAddress &&
-        _debtTokenAddress === quoteTokenAddress
+        _collateralTokenAddress === collateralTokenAddress.toLowerCase() &&
+        _debtTokenAddress === quoteTokenAddress.toLowerCase()
       )
     })
 

features/omni-kit/protocols/aave-like/hooks/useAaveLikeData.ts

@@ -120,7 +120,7 @@ export function useAaveLikeData({
   const positionRaysMultipliersData = mapAaveLikeRaysMultipliers({
     multipliers,
     collateralTokenAddress: dpmPositionData?.collateralTokenAddress,
-    quoteTokenAddress: dpmPositionData?.collateralTokenAddress,
+    quoteTokenAddress: dpmPositionData?.quoteTokenAddress,
     dpmProxy: dpmPositionData?.proxy,
     protocol,
     networkName,

features/omni-kit/protocols/ajna/helpers/mapAjnaRaysMultipliers.ts

@@ -7,12 +7,10 @@ import { LendingProtocol } from 'lendingProtocols'
 
 export const mapAjnaRaysMultipliers = ({
   multipliers,
-  protocol,
   dpmProxy,
   networkName,
   poolId,
 }: {
-  protocol: LendingProtocol
   networkName: NetworkNames
   dpmProxy?: string
   multipliers?: RaysUserMultipliersResponse
@@ -26,7 +24,7 @@ export const mapAjnaRaysMultipliers = ({
     }
   }
 
-  const resolvedProtocol = getRaysMappedProtocol(protocol)
+  const resolvedProtocol = getRaysMappedProtocol(LendingProtocol.Ajna)
   const resolvedNetwork = getRaysMappedNetwork(networkName)
 
   const positionMultipliersKey = Object.keys(multipliers.positionMultipliers)

features/omni-kit/protocols/ajna/hooks/useAjnaData.ts

@@ -19,7 +19,6 @@ export function useAjnaData({
   tokenPriceUSDData,
   isOpening,
   walletAddress,
-  protocol,
 }: OmniProtocolHookProps) {
   const { ajnaPosition$ } = useProductContext()
 
@@ -91,7 +90,6 @@ export function useAjnaData({
   const positionRaysMultipliersData = mapAjnaRaysMultipliers({
     multipliers,
     dpmProxy: dpmPositionData?.proxy,
-    protocol,
     networkName,
     poolId,
   })

handlers/portfolio/positions/handlers/ajna/index.ts

@@ -148,7 +148,6 @@ async function getAjnaPositions({
           const positionRaysMultipliersData = mapAjnaRaysMultipliers({
             multipliers: raysUserMultipliers,
             dpmProxy: proxyAddress,
-            protocol: LendingProtocol.MorphoBlue,
             networkName,
           })