fix: revert back subquery until url is whitelisted (#2764)

* fix: revert back subquery until url is whitelisted

* fix: revert back subquery until url is whitelisted

* feat: add expense ratio to poolmetadata

Author: kattylucy

centrifuge-app/.env-config/.env.ff-prod

@@ -8,7 +8,7 @@ REACT_APP_ONBOARDING_API_URL=https://europe-central2-centrifuge-production-x.clo
 REACT_APP_PINNING_API_URL=https://europe-central2-centrifuge-production-x.cloudfunctions.net/pinning-api-production
 REACT_APP_POOL_CREATION_TYPE=propose
 REACT_APP_RELAY_WSS_URL=wss://rpc.polkadot.io
-REACT_APP_SUBQUERY_URL=https://api-main.cfg.embrio.tech/
+REACT_APP_SUBQUERY_URL=https://api.centrifuge.io
 REACT_APP_SUBSCAN_URL=https://centrifuge.subscan.io
 REACT_APP_TINLAKE_NETWORK=mainnet
 REACT_APP_INFURA_KEY=8ed99a9a115349bbbc01dcf3a24edc96

centrifuge-app/.env-config/.env.production

@@ -8,7 +8,7 @@ REACT_APP_ONBOARDING_API_URL=https://europe-central2-centrifuge-production-x.clo
 REACT_APP_PINNING_API_URL=https://europe-central2-centrifuge-production-x.cloudfunctions.net/pinning-api-production
 REACT_APP_POOL_CREATION_TYPE=propose
 REACT_APP_RELAY_WSS_URL=wss://rpc.polkadot.io
-REACT_APP_SUBQUERY_URL=https://api-main.cfg.embrio.tech/
+REACT_APP_SUBQUERY_URL=https://api.centrifuge.io
 REACT_APP_SUBSCAN_URL=https://centrifuge.subscan.io
 REACT_APP_TINLAKE_NETWORK=mainnet
 REACT_APP_INFURA_KEY=8ed99a9a115349bbbc01dcf3a24edc96

centrifuge-app/src/components/Dashboard/LandingPage/PoolConfigurationDrawer.tsx

@@ -231,6 +231,10 @@ export function PoolConfigurationDrawer({ open, setOpen }: PoolConfigurationDraw
 
       const newPoolMetadata: PoolMetadata = {
         ...pool.meta,
+        pool: {
+          ...pool.meta.pool,
+          expenseRatio: values.pool.expenseRatio,
+        },
         holdings: values.holdings,
         tranches: values.tranches.reduce((acc, tranche) => {
           acc[tranche.id] = {
@@ -337,6 +341,8 @@ export function PoolConfigurationDrawer({ open, setOpen }: PoolConfigurationDraw
         })),
       ]
 
+      console.log('newPoolMetadata', newPoolMetadata)
+
       execute([values.id, newPoolMetadata, hasTrancheChanges ? tranches : undefined], { account })
       actions.setSubmitting(false)
     },
@@ -358,7 +364,6 @@ export function PoolConfigurationDrawer({ open, setOpen }: PoolConfigurationDraw
     <LoadBoundary>
       <Drawer isOpen={open} onClose={resetToDefault} title="Edit configuration" width="33%">
         <Divider color="backgroundSecondary" />
-
         <Select
           label="Select pool"
           options={poolsWithMetadata.map((pool) => ({

centrifuge-app/src/components/Dashboard/LandingPage/PoolDescriptionSection.tsx

@@ -1,5 +1,5 @@
 import { useCentrifuge } from '@centrifuge/centrifuge-react'
-import { Box, Grid, ImageUpload, Select, Text, TextInput } from '@centrifuge/fabric'
+import { Box, Grid, ImageUpload, NumberInput, Select, Text, TextInput } from '@centrifuge/fabric'
 import { Field, FieldProps, useFormikContext } from 'formik'
 import { useEffect, useState } from 'react'
 import { useTheme } from 'styled-components'
@@ -146,6 +146,15 @@ export function PoolDescriptionSection({ isUpdating }: { isUpdating?: boolean })
             />
           )}
         </Field>
+        <Field
+          name="expenseRatio"
+          as={NumberInput}
+          label="Expense ratio"
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => form.setFieldValue('pool.expenseRatio', e.target.value)}
+          value={form.values.pool?.expenseRatio}
+          placeholder="0.00"
+          symbol="%"
+        />
       </Grid>
     </Box>
   )

centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx

@@ -20,7 +20,7 @@ import { Decimal } from '../../../src/utils/Decimal'
 import { evmChains } from '../../config'
 import { formatBalance, formatPercentage } from '../../utils/formatting'
 import { useActiveDomains } from '../../utils/useLiquidityPools'
-import { useDailyTranchesStates, usePool, usePoolFees, usePoolMetadata } from '../../utils/usePools'
+import { useDailyTranchesStates, usePool, usePoolMetadata } from '../../utils/usePools'
 import { PoolStatus } from '../PoolCard/PoolStatus'
 import { getPoolStatus } from '../PoolList'
 import { Spinner } from '../Spinner'
@@ -88,16 +88,9 @@ export const KeyMetrics = ({ poolId }: Props) => {
   const isTinlakePool = poolId.startsWith('0x')
   const pool = usePool(poolId)
   const { data: metadata } = usePoolMetadata(pool)
-  const poolFees = usePoolFees(poolId)
   const tranchesIds = pool.tranches.map((tranche) => tranche.id)
   const dailyTranches = useDailyTranchesStates(tranchesIds)
 
-  const expenseRatio = useMemo(() => {
-    return (
-      poolFees?.map((f) => f.amounts?.percentOfNav.toPercent().toNumber()).reduce((acc, f) => acc + (f ?? 0), 0) ?? 0
-    )
-  }, [poolFees])
-
   const tranchesAPY = useMemo(() => {
     // TODO: fix when we apy issue is solve, for now we will just use target
     // const apy = getTodayValue(dailyTranches)
@@ -187,7 +180,7 @@ export const KeyMetrics = ({ poolId }: Props) => {
       : []),
     {
       metric: <Tooltips type="expenseRatio" size="med" />,
-      value: expenseRatio ? `${formatBalance(expenseRatio, '', 2)}%` : '-',
+      value: metadata?.pool?.expenseRatio ? `${formatBalance(metadata?.pool?.expenseRatio, '', 2)}%` : '-',
     },
     {
       metric: 'Weighted Average Maturity',

centrifuge-app/src/components/Report/useReportsQuery.tsx

@@ -45,7 +45,7 @@ type ReportsType = Report | DataReport
 
 const centrifuge = new Centrifuge({
   environment: 'mainnet',
-  indexerUrl: 'https://api-main.cfg.embrio.tech/',
+  indexerUrl: 'https://api.centrifuge.io/',
 })
 
 export function useReport<T extends ReportsType>(

centrifuge-js/src/modules/pools.ts

@@ -694,6 +694,7 @@ export interface PoolMetadataInput {
   website: string
   forum: string
   email: string
+  expenseRatio: number
   executiveSummary: FileType | null
   details?: IssuerDetail[]
   issuerCategories: { type: string; value: string; description?: string }[]
@@ -751,6 +752,7 @@ export type PoolMetadata = {
     }
     investorType: string
     poolStructure: string
+    expenseRatio?: number
     poolFees?: {
       id: number
       name: string
@@ -1173,6 +1175,7 @@ export function getPoolsModule(inst: Centrifuge) {
           shortDescription: metadata.issuerShortDescription,
           categories: metadata.issuerCategories,
         },
+        expenseRatio: metadata.expenseRatio ?? 0,
         poolStructure: metadata.poolStructure,
         investorType: metadata.investorType,
         links: {