diff --git a/centrifuge-app/src/components/Report/CashflowStatement.tsx b/centrifuge-app/src/components/Report/CashflowStatement.tsx
index f2d20ab4da..56b100678d 100644
--- a/centrifuge-app/src/components/Report/CashflowStatement.tsx
+++ b/centrifuge-app/src/components/Report/CashflowStatement.tsx
@@ -202,37 +202,31 @@ export function CashflowStatement({ pool }: { pool: Pool }) {
 
   const netCashflowRecords: Row[] = React.useMemo(() => {
     return [
-      ...(poolFeeStates
-        ?.map((poolFeeStateByPeriod) => {
-          return Object.values(poolFeeStateByPeriod)
-            ?.map((feeState) => {
-              // some fee data may be incomplete since fees may have been added sometime after pool creation
-              // this fill the nonexistant fee data with zero values
-              let missingStates: {
-                timestamp: string
-                sumPaidAmountByPeriod: CurrencyBalance
-              }[] = []
-              if (feeState.length !== poolStates?.length) {
-                const missingTimestamps = poolStates
-                  ?.map((state) => state.timestamp)
-                  .filter((timestamp) => !feeState.find((state) => state.timestamp === timestamp))
-                missingStates =
-                  missingTimestamps?.map((timestamp) => {
-                    return {
-                      timestamp,
-                      sumPaidAmountByPeriod: CurrencyBalance.fromFloat(0, pool.currency.decimals),
-                    }
-                  }) || []
-              }
+      ...(Object.entries(poolFeeStates || {})?.flatMap(([, feeState]) => {
+        // some fee data may be incomplete since fees may have been added sometime after pool creation
+        // this fill the nonexistant fee data with zero values
+        let missingStates: {
+          timestamp: string
+          sumPaidAmountByPeriod: CurrencyBalance
+        }[] = []
+        if (feeState.length !== poolStates?.length) {
+          const missingTimestamps = poolStates
+            ?.map((state) => state.timestamp)
+            .filter((timestamp) => !feeState.find((state) => state.timestamp.slice(0, 10) === timestamp.slice(0, 10)))
+          missingStates =
+            missingTimestamps?.map((timestamp) => {
               return {
-                name: feeState[0].poolFee.name,
-                value: [...missingStates, ...feeState].map((state) => state.sumPaidAmountByPeriod.toDecimal().neg()),
-                formatter: (v: any) => `${formatBalance(v, pool.currency.displayName, 2)}`,
+                timestamp,
+                sumPaidAmountByPeriod: CurrencyBalance.fromFloat(0, pool.currency.decimals),
               }
-            })
-            .flat()
-        })
-        .flat() || []),
+            }) || []
+        }
+        return {
+          name: feeState[0].poolFee.name,
+          value: [...missingStates, ...feeState].map((state) => state.sumPaidAmountByPeriod.toDecimal().neg()),
+          formatter: (v: any) => `${formatBalance(v, pool.currency.displayName, 2)}`,
+        }
+      }) || []),
       {
         name: 'Net cash flow after fees',
         value:
diff --git a/centrifuge-app/src/pages/Loan/ErrorMessage.tsx b/centrifuge-app/src/pages/Loan/ErrorMessage.tsx
index d27bde3308..f5d21ec067 100644
--- a/centrifuge-app/src/pages/Loan/ErrorMessage.tsx
+++ b/centrifuge-app/src/pages/Loan/ErrorMessage.tsx
@@ -2,7 +2,7 @@ import { Box, InlineFeedback, Text } from '@centrifuge/fabric'
 
 type Props = {
   children: React.ReactNode
-  type: 'default' | 'critical'
+  type: 'default' | 'critical' | 'warning'
   condition: boolean
 }
 
@@ -15,6 +15,10 @@ const styles: Record<Props['type'], { bg: string; color: string }> = {
     bg: 'statusCriticalBg',
     color: 'statusCritical',
   },
+  warning: {
+    bg: 'statusWarningBg',
+    color: 'statusWarning',
+  },
 }
 
 export function ErrorMessage({ children, condition, type }: Props) {
diff --git a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
index db070c8f54..d22c6951b9 100644
--- a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
@@ -102,6 +102,10 @@ export function ExternalFinanceForm({ loan, source }: { loan: ExternalLoan; sour
     validateOnMount: true,
   })
 
+  React.useEffect(() => {
+    financeForm.validateForm()
+  }, [source])
+
   const financeFormRef = React.useRef<HTMLFormElement>(null)
   useFocusInvalidInput(financeForm, financeFormRef)
 
@@ -109,7 +113,7 @@ export function ExternalFinanceForm({ loan, source }: { loan: ExternalLoan; sour
   const maxAvailable =
     source === 'reserve' ? pool.reserve.available.toDecimal() : sourceLoan.outstandingDebt.toDecimal()
 
-  const withdraw = useWithdraw(loan.poolId, account!, totalFinance)
+  const withdraw = useWithdraw(loan.poolId, account!, totalFinance, source)
 
   if (loan.status === 'Closed' || ('valuationMethod' in loan.pricing && loan.pricing.valuationMethod !== 'oracle')) {
     return null
@@ -244,7 +248,10 @@ export function ExternalFinanceForm({ loan, source }: { loan: ExternalLoan; sour
                 type="submit"
                 loading={isFinanceLoading}
                 disabled={
-                  !withdraw.isValid || !poolFees.isValid(financeForm) || !financeForm.isValid || maxAvailable.eq(0)
+                  !withdraw.isValid(financeForm) ||
+                  !poolFees.isValid(financeForm) ||
+                  !financeForm.isValid ||
+                  maxAvailable.eq(0)
                 }
               >
                 Purchase
diff --git a/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx b/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx
index 975e2bd86a..b193b773a3 100644
--- a/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx
+++ b/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx
@@ -144,6 +144,10 @@ export function ExternalRepayForm({ loan, destination }: { loan: ExternalLoan; d
     validateOnMount: true,
   })
 
+  React.useEffect(() => {
+    repayForm.validateForm()
+  }, [destination])
+
   const repayFormRef = React.useRef<HTMLFormElement>(null)
   useFocusInvalidInput(repayForm, repayFormRef)
 
diff --git a/centrifuge-app/src/pages/Loan/FinanceForm.tsx b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
index ee8aa98546..4c2e69a321 100644
--- a/centrifuge-app/src/pages/Loan/FinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
@@ -161,10 +161,14 @@ function InternalFinanceForm({ loan, source }: { loan: LoanType; source: string
     validateOnMount: true,
   })
 
+  React.useEffect(() => {
+    financeForm.validateForm()
+  }, [source])
+
   const financeFormRef = React.useRef<HTMLFormElement>(null)
   useFocusInvalidInput(financeForm, financeFormRef)
 
-  const withdraw = useWithdraw(loan.poolId, account!, Dec(financeForm.values.principal || 0))
+  const withdraw = useWithdraw(loan.poolId, account!, Dec(financeForm.values.principal || 0), source)
 
   if (loan.status === 'Closed') {
     return null
@@ -318,7 +322,7 @@ function InternalFinanceForm({ loan, source }: { loan: LoanType; source: string
                 loading={isFinanceLoading}
                 disabled={
                   !financeForm.values.principal ||
-                  !withdraw.isValid ||
+                  !withdraw.isValid(financeForm) ||
                   !poolFees.isValid(financeForm) ||
                   !financeForm.isValid ||
                   maxAvailable.eq(0)
@@ -334,7 +338,7 @@ function InternalFinanceForm({ loan, source }: { loan: LoanType; source: string
   )
 }
 
-function WithdrawSelect({ withdrawAddresses }: { withdrawAddresses: WithdrawAddress[] }) {
+function WithdrawSelect({ withdrawAddresses, poolId }: { withdrawAddresses: WithdrawAddress[]; poolId: string }) {
   const form = useFormikContext<Pick<FinanceValues, 'withdraw'>>()
   const utils = useCentrifugeUtils()
   const getName = useGetNetworkName()
@@ -357,7 +361,15 @@ function WithdrawSelect({ withdrawAddresses }: { withdrawAddresses: WithdrawAddr
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [withdrawAddresses.length])
 
-  if (!withdrawAddresses.length) return null
+  if (!withdrawAddresses.length)
+    return (
+      <ErrorMessage type="warning" condition={!withdrawAddresses.length}>
+        <Stack gap={1}>
+          To purchase/finance this asset, the pool must set trusted withdrawal addresses to which funds will be sent.
+          <AnchorTextLink href={`#/issuer/${poolId}/access`}>Add trusted addresses</AnchorTextLink>
+        </Stack>
+      </ErrorMessage>
+    )
 
   return (
     <Select
@@ -377,9 +389,11 @@ function Mux({
   withdrawAmounts,
   selectedAddressIndexByCurrency,
   setSelectedAddressIndex,
+  poolId,
 }: {
   amount: Decimal
   total: Decimal
+  poolId: string
   withdrawAmounts: WithdrawBucket[]
   selectedAddressIndexByCurrency: Record<string, number>
   setSelectedAddressIndex: (currency: string, index: number) => void
@@ -389,73 +403,79 @@ function Mux({
   const getIcon = useGetNetworkIcon()
   return (
     <Stack gap={1}>
-      <Text variant="body2">Transactions per network</Text>
-      <Grid columns={3} rowGap={1}>
-        <GridRow borderBottomColor="borderPrimary" borderBottomWidth="1px" borderBottomStyle="solid" pb="4px">
-          <Text variant="label2">Amount</Text>
-          <Text variant="label2">Address</Text>
-          <Text variant="label2">Network</Text>
-        </GridRow>
-        {!withdrawAmounts.length && (
-          <Text variant="body3" color="statusCritical">
-            No suitable withdraw addresses
-          </Text>
-        )}
-        {withdrawAmounts.map(({ currency, amount, addresses, currencyKey }) => {
-          const index = selectedAddressIndexByCurrency[currencyKey] ?? 0
-          const address = addresses.at(index >>> 0) // undefined when index is -1
-          return (
-            <GridRow>
-              <Text variant="body3">{formatBalance(amount, currency.symbol)}</Text>
-              <Text variant="body3">
-                <Flex pr={1}>
-                  <SelectInner
-                    options={[
-                      { label: 'Ignore', value: '-1' },
-                      ...addresses.map((addr, index) => ({
-                        label: truncateAddress(utils.formatAddress(addr.address)),
-                        value: index.toString(),
-                      })),
-                    ]}
-                    value={index.toString()}
-                    onChange={(event) => setSelectedAddressIndex(currencyKey, parseInt(event.target.value))}
-                    small
-                  />
-                </Flex>
-              </Text>
-              <Text variant="body3">
-                {address && (
-                  <Shelf gap="4px">
-                    <Box
-                      as="img"
-                      src={
-                        typeof address.location !== 'string' && 'parachain' in address.location
-                          ? parachainIcons[address.location.parachain]
-                          : getIcon(typeof address.location === 'string' ? address.location : address.location.evm)
-                      }
-                      alt=""
-                      width="iconSmall"
-                      height="iconSmall"
-                      style={{ objectFit: 'contain' }}
-                      bleedY="4px"
-                    />
-                    {typeof address.location === 'string'
-                      ? getName(address.location as any)
-                      : 'parachain' in address.location
-                      ? parachainNames[address.location.parachain]
-                      : getName(address.location.evm)}
-                  </Shelf>
-                )}
-              </Text>
+      {!withdrawAmounts.length ? (
+        <ErrorMessage type="warning" condition={!withdrawAmounts.length}>
+          <Stack gap={1}>
+            To purchase/finance this asset, the pool must set trusted withdrawal addresses to which funds will be sent.
+            <AnchorTextLink href={`#/issuer/${poolId}/access`}>Add trusted addresses</AnchorTextLink>
+          </Stack>
+        </ErrorMessage>
+      ) : (
+        <>
+          <Text variant="body2">Transactions per network</Text>
+          <Grid columns={3} rowGap={1}>
+            <GridRow borderBottomColor="borderPrimary" borderBottomWidth="1px" borderBottomStyle="solid" pb="4px">
+              <Text variant="label2">Amount</Text>
+              <Text variant="label2">Address</Text>
+              <Text variant="label2">Network</Text>
             </GridRow>
-          )
-        })}
-      </Grid>
+            {withdrawAmounts.map(({ currency, amount, addresses, currencyKey }) => {
+              const index = selectedAddressIndexByCurrency[currencyKey] ?? 0
+              const address = addresses.at(index >>> 0) // undefined when index is -1
+              return (
+                <GridRow>
+                  <Text variant="body3">{formatBalance(amount, currency.symbol)}</Text>
+                  <Text variant="body3">
+                    <Flex pr={1}>
+                      <SelectInner
+                        options={[
+                          { label: 'Ignore', value: '-1' },
+                          ...addresses.map((addr, index) => ({
+                            label: truncateAddress(utils.formatAddress(addr.address)),
+                            value: index.toString(),
+                          })),
+                        ]}
+                        value={index.toString()}
+                        onChange={(event) => setSelectedAddressIndex(currencyKey, parseInt(event.target.value))}
+                        small
+                      />
+                    </Flex>
+                  </Text>
+                  <Text variant="body3">
+                    {address && (
+                      <Shelf gap="4px">
+                        <Box
+                          as="img"
+                          src={
+                            typeof address.location !== 'string' && 'parachain' in address.location
+                              ? parachainIcons[address.location.parachain]
+                              : getIcon(typeof address.location === 'string' ? address.location : address.location.evm)
+                          }
+                          alt=""
+                          width="iconSmall"
+                          height="iconSmall"
+                          style={{ objectFit: 'contain' }}
+                          bleedY="4px"
+                        />
+                        {typeof address.location === 'string'
+                          ? getName(address.location as any)
+                          : 'parachain' in address.location
+                          ? parachainNames[address.location.parachain]
+                          : getName(address.location.evm)}
+                      </Shelf>
+                    )}
+                  </Text>
+                </GridRow>
+              )
+            })}
+          </Grid>
+        </>
+      )}
     </Stack>
   )
 }
 
-export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount, amount: Decimal) {
+export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount, amount: Decimal, source: string) {
   const pool = usePool(poolId)
   const isLocalAsset = typeof pool.currency.key !== 'string' && 'LocalAsset' in pool.currency.key
   const access = usePoolAccess(poolId)
@@ -467,16 +487,12 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
   const ao = access.assetOriginators.find((a) => a.address === borrower.actingAddress)
   const withdrawAddresses = ao?.transferAllowlist ?? []
 
-  if (!isLocalAsset || !withdrawAddresses.length) {
-    if (!withdrawAddresses.length)
-      return {
-        render: () => null,
-        isValid: true,
-        getBatch: () => of([]),
-      }
+  if (!isLocalAsset) {
     return {
-      render: () => <WithdrawSelect withdrawAddresses={withdrawAddresses} />,
-      isValid: true,
+      render: () => <WithdrawSelect withdrawAddresses={withdrawAddresses} poolId={poolId} />,
+      isValid: ({ values }: { values: Pick<FinanceValues, 'withdraw'> }) => {
+        return source === 'reserve' ? !!values.withdraw : true
+      },
       getBatch: ({ values }: { values: Pick<FinanceValues, 'withdraw'> }) => {
         if (!values.withdraw) return of([])
         return cent.pools
@@ -511,6 +527,7 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
   return {
     render: () => (
       <Mux
+        poolId={poolId}
         withdrawAmounts={withdrawAmounts}
         selectedAddressIndexByCurrency={selectedAddressIndexByCurrency}
         setSelectedAddressIndex={(currencyKey, index) => {
@@ -523,7 +540,9 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
         amount={amount}
       />
     ),
-    isValid: amount.lte(totalAvailable),
+    isValid: ({ values }: { values: Pick<FinanceValues, 'withdraw'> }) => {
+      return source === 'reserve' ? amount.lte(totalAvailable) && !!values.withdraw : true
+    },
     getBatch: () => {
       return combineLatest(
         withdrawAmounts.flatMap((bucket) => {
diff --git a/centrifuge-app/src/pages/Loan/RepayForm.tsx b/centrifuge-app/src/pages/Loan/RepayForm.tsx
index ed38e275cd..81b21a2d33 100644
--- a/centrifuge-app/src/pages/Loan/RepayForm.tsx
+++ b/centrifuge-app/src/pages/Loan/RepayForm.tsx
@@ -179,6 +179,10 @@ function InternalRepayForm({ loan, destination }: { loan: ActiveLoan | CreatedLo
     validateOnMount: true,
   })
 
+  React.useEffect(() => {
+    repayForm.validateForm()
+  }, [destination])
+
   const repayFormRef = React.useRef<HTMLFormElement>(null)
   useFocusInvalidInput(repayForm, repayFormRef)
 
diff --git a/centrifuge-app/src/utils/useCFGTokenPrice.ts b/centrifuge-app/src/utils/useCFGTokenPrice.ts
index d06f4176ef..edd0675983 100644
--- a/centrifuge-app/src/utils/useCFGTokenPrice.ts
+++ b/centrifuge-app/src/utils/useCFGTokenPrice.ts
@@ -15,7 +15,9 @@ async function getWCFGPrice() {
 }
 
 export const useCFGTokenPrice = () => {
-  const { data: CFGPrice } = useQuery('wCFGPrice', () => getWCFGPrice())
+  const { data: CFGPrice } = useQuery('wCFGPrice', () => {
+    return getWCFGPrice()
+  })
   return CFGPrice
 }
 
@@ -61,7 +63,10 @@ export const useDailyCFGPrice = (filter: 'YTD' | '30days' | '90days') => {
       }),
     }
 
-    const res = await fetch('https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3', options)
+    const res = await fetch(
+      `https://gateway.thegraph.com/api/9cdc906f79cb4b557d79846a994f6564/subgraphs/id/5zvR82QoaXYFyDEKLZ9t6v9adgnptxYpKpSbxtgVENFV`,
+      options
+    )
     return res.json()
   })
 }
diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index 37a497d143..8d050ee179 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -2301,7 +2301,7 @@ export function getPoolsModule(inst: Centrifuge) {
       poolSnapshots(
         orderBy: BLOCK_NUMBER_ASC,
         filter: {
-          id: { startsWith: $poolId },
+          poolId: { equalTo: $poolId },
           timestamp: { greaterThan: $from, lessThan: $to }
         }
         after: $poolCursor
@@ -2791,23 +2791,45 @@ export function getPoolsModule(inst: Centrifuge) {
       )
   }
 
-  function getPoolFeeStatesByGroup(args: [poolId: string, from?: Date, to?: Date], groupBy: GroupBy = 'month') {
+  function getPoolFeeStatesByGroup(
+    args: [poolId: string, from?: Date, to?: Date],
+    groupBy: GroupBy = 'month'
+  ): Observable<Record<string, DailyPoolFeesState[]>> {
     return getDailyPoolFeeStates(args).pipe(
       map((poolFees) => {
-        return Object.entries(poolFees).map(([feeId, feeStates]) => {
-          if (!feeStates.length) return []
-          const poolStatesByGroup: { [period: string]: DailyPoolFeesState } = {}
+        return Object.fromEntries(
+          Object.entries(poolFees).map(([feeId, feeStates]) => {
+            if (!feeStates.length) return []
+            const poolStatesByGroup: { [period: string]: DailyPoolFeesState } = {}
+
+            feeStates.forEach((feeState) => {
+              const date = new Date(feeState.timestamp)
+              const period = getGroupByPeriod(date, groupBy)
+              if (!poolStatesByGroup[period]) {
+                poolStatesByGroup[period] = feeState
+              } else {
+                const existing = poolStatesByGroup[period]
+                poolStatesByGroup[period] = {
+                  ...feeState,
+                  sumAccruedAmountByPeriod: new CurrencyBalance(
+                    feeState.sumAccruedAmountByPeriod.add(existing?.sumAccruedAmountByPeriod ?? new BN(0)),
+                    feeState.sumAccruedAmountByPeriod.decimals
+                  ),
+                  sumChargedAmountByPeriod: new CurrencyBalance(
+                    feeState.sumChargedAmountByPeriod.add(existing?.sumChargedAmountByPeriod ?? new BN(0)),
+                    feeState.sumChargedAmountByPeriod.decimals
+                  ),
+                  sumPaidAmountByPeriod: new CurrencyBalance(
+                    feeState.sumPaidAmountByPeriod.add(existing?.sumPaidAmountByPeriod ?? new BN(0)),
+                    feeState.sumPaidAmountByPeriod.decimals
+                  ),
+                }
+              }
+            })
 
-          feeStates.forEach((feeState) => {
-            const date = new Date(feeState.timestamp)
-            const period = getGroupByPeriod(date, groupBy)
-            if (!poolStatesByGroup[period] || new Date(poolStatesByGroup[period].timestamp) < date) {
-              poolStatesByGroup[period] = feeState
-            }
+            return [feeId, Object.values(poolStatesByGroup)]
           })
-
-          return { [feeId]: Object.values(poolStatesByGroup) }
-        })
+        )
       })
     )
   }