Merge pull request #1944 from Solid-Money/mayank/fix/soETH-interst

Mayank/fix/so eth interst

Author: MayankMittal1

app/(protected)/(tabs)/savings.tsx

@@ -93,6 +93,7 @@ export default function Savings() {
 
   const { data: userDepositTransactions, isLoading: isTransactionsLoading } = useUserTransactions(
     user?.safeAddress,
+    currentVault.type,
   );
 
   const { firstDepositTimestamp } = useDepositCalculations(

graphql/clients/index.tsx

@@ -10,11 +10,13 @@ import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client';
 
 // Singleton instances (created on first access)
 let _infoClient: ReturnType<typeof createInfoClient> | null = null;
+let _infoClientFuse: ReturnType<typeof createInfoClient> | null = null;
+let _infoClientEth: ReturnType<typeof createInfoClient> | null = null;
 let _algebraInfoClient: ReturnType<typeof createAlgebraInfoClient> | null = null;
 
-const createInfoClient = () =>
+const createInfoClient = (uri?: string) =>
   new ApolloClient({
-    link: new HttpLink({ uri: process.env.EXPO_PUBLIC_INFO_GRAPH }),
+    link: new HttpLink({ uri: uri ?? process.env.EXPO_PUBLIC_INFO_GRAPH }),
     cache: new InMemoryCache(),
   });
 
@@ -35,6 +37,26 @@ export const getInfoClient = () => {
   return _infoClient;
 };
 
+/**
+ * Get the FUSE vault info graph Apollo client.
+ */
+export const getInfoClientFuse = () => {
+  if (!_infoClientFuse) {
+    _infoClientFuse = createInfoClient(process.env.EXPO_PUBLIC_INFO_GRAPH_FUSE);
+  }
+  return _infoClientFuse;
+};
+
+/**
+ * Get the ETH vault info graph Apollo client.
+ */
+export const getInfoClientEth = () => {
+  if (!_infoClientEth) {
+    _infoClientEth = createInfoClient(process.env.EXPO_PUBLIC_INFO_GRAPH_ETH);
+  }
+  return _infoClientEth;
+};
+
 /**
  * Get the algebra info graph Apollo client.
  * Client is lazily created on first access.

hooks/useAnalytics.ts

@@ -4,7 +4,7 @@ import { formatUnits } from 'viem';
 import { fuse, mainnet } from 'viem/chains';
 
 import { explorerUrls, layerzero } from '@/constants/explorers';
-import { getInfoClient } from '@/graphql/clients';
+import { getInfoClient, getInfoClientEth, getInfoClientFuse } from '@/graphql/clients';
 import {
   GetUserTransactionsDocument,
   GetUserTransactionsQuery,
@@ -51,8 +51,14 @@ const ApyToDays = {
   thirtyDay: 30,
 };
 
-const getAnalyticsVaultKey = (vault?: VaultType): VaultType.USDC | VaultType.FUSE | VaultType.ETH =>
-  vault === VaultType.FUSE ? VaultType.FUSE : vault === VaultType.ETH ? VaultType.ETH : VaultType.USDC;
+const getAnalyticsVaultKey = (
+  vault?: VaultType,
+): VaultType.USDC | VaultType.FUSE | VaultType.ETH =>
+  vault === VaultType.FUSE
+    ? VaultType.FUSE
+    : vault === VaultType.ETH
+      ? VaultType.ETH
+      : VaultType.USDC;
 
 const safeFormatUnits = (
   value: string | number | bigint | null | undefined,
@@ -133,11 +139,20 @@ const filterTransfers = (transfers: BlockscoutTransactions) => {
   });
 };
 
-export const userTransactionsQueryOptions = (safeAddress: string | undefined) => ({
-  queryKey: ['user-transactions', safeAddress?.toLowerCase()],
+export const userTransactionsQueryOptions = (
+  safeAddress: string | undefined,
+  vault?: VaultType,
+) => ({
+  queryKey: ['user-transactions', safeAddress?.toLowerCase(), vault],
   queryFn: async () => {
     if (!safeAddress) return undefined;
-    const { data } = await getInfoClient().query<GetUserTransactionsQuery>({
+    const client =
+      vault === VaultType.ETH
+        ? getInfoClientEth()
+        : vault === VaultType.FUSE
+          ? getInfoClientFuse()
+          : getInfoClient();
+    const { data } = await client.query<GetUserTransactionsQuery>({
       query: GetUserTransactionsDocument,
       variables: {
         address: safeAddress.toLowerCase(),
@@ -150,11 +165,11 @@ export const userTransactionsQueryOptions = (safeAddress: string | undefined) =>
   staleTime: secondsToMilliseconds(30), // Data is fresh for 30 seconds
   gcTime: secondsToMilliseconds(300), // Keep in cache for 5 minutes
   refetchInterval: secondsToMilliseconds(30), // Poll every 30 seconds
-  placeholderData: keepPreviousData, // Show stale data while fetching new data
+  // placeholderData: vault ? undefined : keepPreviousData, // Disable placeholder when vault changes to avoid cross-vault data contamination
 });
 
-export const useUserTransactions = (safeAddress: string | undefined) => {
-  return useQuery(userTransactionsQueryOptions(safeAddress));
+export const useUserTransactions = (safeAddress: string | undefined, vault?: VaultType) => {
+  return useQuery(userTransactionsQueryOptions(safeAddress, vault));
 };
 
 export const useSendTransactions = (address: string) => {

hooks/useDepositCalculations.ts

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef } from 'react';
+import { useMemo } from 'react';
 
 import { calculateOriginalDepositAmount, getEarliestDepositTimestamp } from '@/lib/financial';
 
@@ -8,34 +8,27 @@ export const useDepositCalculations = (
   lastTimestamp?: number,
   decimals: number = 6,
 ) => {
-  // Stabilize userDepositTransactions reference using JSON comparison
-  // This prevents infinite re-renders when React Query returns new object references
+  // Stabilize userDepositTransactions using JSON comparison
+  // This prevents re-computation when React Query returns new object references
   // with identical data
-  const transactionsRef = useRef(userDepositTransactions);
   const transactionsKey = useMemo(
     () => JSON.stringify(userDepositTransactions ?? null),
     [userDepositTransactions],
   );
 
-  // Update ref only when actual data changes (not just reference)
-  useEffect(() => {
-    transactionsRef.current = userDepositTransactions;
-  }, [transactionsKey, userDepositTransactions]);
-
   const originalDepositAmount = useMemo(() => {
     if (!balance || balance <= 0) return 0;
 
-    const calculated = calculateOriginalDepositAmount(transactionsRef.current, decimals);
+    const calculated = calculateOriginalDepositAmount(userDepositTransactions, decimals);
     return calculated > 0 ? calculated : balance;
     // eslint-disable-next-line react-hooks/exhaustive-deps -- transactionsKey is intentional: stable JSON key replaces unstable object reference
   }, [transactionsKey, balance, decimals]);
 
   const firstDepositTimestamp = useMemo(() => {
     if (!balance || balance <= 0) return undefined;
 
-    const fromSubgraph = getEarliestDepositTimestamp(transactionsRef.current, lastTimestamp);
+    const fromSubgraph = getEarliestDepositTimestamp(userDepositTransactions, lastTimestamp);
     const now = Math.floor(Date.now() / 1000);
-    const depositsLength = transactionsRef.current?.deposits?.length ?? 0;
 
     let result: number | undefined;
     if (fromSubgraph && fromSubgraph > 0 && fromSubgraph <= now) {
@@ -44,7 +37,7 @@ export const useDepositCalculations = (
       result = lastTimestamp && lastTimestamp > 0 ? lastTimestamp : undefined;
     }
     return result;
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- transactionsKey is intentional: stable JSON key replaces unstable object reference
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [transactionsKey, lastTimestamp, balance]);
 
   return {

hooks/useSavingsYield.ts

@@ -97,7 +97,7 @@ export function useSavingsYield({
       return;
     }
 
-    // soUSD: subgraph-based calculation
+    // soUSD / soETH: subgraph-based calculation
     let cancelled = false;
     const now = Math.floor(Date.now() / 1000);
     calculateYield(