Merge branch 'main' into refactor/actions-reserve-overview

Author: AGMASO

src/components/transactions/Swap/errors/shared/SupplyCapBlockingGuard.tsx

@@ -13,7 +13,7 @@ import { isProtocolSwapState } from '../../types/state.types';
 import { SupplyCapBlockingError } from './SupplyCapBlockingError';
 
 export const hasSupplyCapBlocking = (state: SwapState) => {
-  if (!isProtocolSwapState(state) || state.swapType === SwapType.RepayWithCollateral) return false;
+  if (!isProtocolSwapState(state) || state.swapType !== SwapType.CollateralSwap) return false;
   const reserve = state.isInvertedSwap
     ? state.sourceReserve?.reserve
     : state.destinationReserve?.reserve;

src/modules/reserve-overview/graphs/InterestRateModelGraphContainer.tsx

@@ -21,6 +21,7 @@ export const InterestRateModelGraphContainer = ({
   reserve,
 }: InteresetRateModelGraphContainerProps): JSX.Element => {
   const { reserves: reservesLegacy } = useAppDataContext();
+
   const reserveData = reservesLegacy.find(
     (r) => r.underlyingAsset.toLowerCase() === reserve.underlyingToken.address.toLowerCase()
   );