Feat/v3.2 [skip cypress]

.prettierignore

@@ -5,6 +5,7 @@
 .gitattributes
 node_modules/
 public/
+.nvmrc
 
 # Artifacts
 .next/

cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/usdt.aave-v2.cy.ts

@@ -9,10 +9,7 @@ import {
   supply,
   withdraw,
 } from '../../../../support/steps/main.steps';
-import {
-  changeBorrowTypeBlocked,
-  dashboardAssetValuesVerification,
-} from '../../../../support/steps/verification.steps';
+import { dashboardAssetValuesVerification } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
 const tokensToRequest: RequestedTokens = {
@@ -123,6 +120,5 @@ describe.skip('USDT INTEGRATION SPEC, AAVE V2 MARKET', () => {
     repay(repayCase, skipTestState, false);
   });
   withdraw(testData.testCases.withdraw, skipTestState, false);
-  changeBorrowTypeBlocked(testData.testCases.checkBorrowTypeBlocked, skipTestState);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/usdt.polygon-v2.cy.ts

@@ -3,10 +3,7 @@ import constants from '../../../../fixtures/constans.json';
 import { skipState } from '../../../../support/steps/common';
 import { configEnvWithTenderlyPolygonFork } from '../../../../support/steps/configuration.steps';
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
-import {
-  changeBorrowTypeBlocked,
-  dashboardAssetValuesVerification,
-} from '../../../../support/steps/verification.steps';
+import { dashboardAssetValuesVerification } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
 const tokensToRequest: RequestedTokens = {
@@ -82,6 +79,5 @@ describe.skip('USDT INTEGRATION SPEC, POLYGON MARKET', () => {
     repay(repayCase, skipTestState, false);
   });
   withdraw(testData.testCases.withdraw, skipTestState, false);
-  changeBorrowTypeBlocked(testData.testCases.checkDisabledCollateral, skipTestState);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/dai.avalanche-v2.cy.ts

@@ -3,10 +3,7 @@ import constants from '../../../../fixtures/constans.json';
 import { skipState } from '../../../../support/steps/common';
 import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/configuration.steps';
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
-import {
-  dashboardAssetValuesVerification,
-  switchApyBlocked,
-} from '../../../../support/steps/verification.steps';
+import { dashboardAssetValuesVerification } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
 const tokensToRequest: RequestedTokens = {
@@ -71,6 +68,5 @@ describe('DAI INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
   supply(testData.testCases.deposit, skipTestState, true);
   repay(testData.testCases.repay, skipTestState, false);
   withdraw(testData.testCases.withdraw, skipTestState, false);
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdc.avalanche-v2.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/co
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -82,6 +81,5 @@ describe('USDC INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
     repay(repayCase, skipTestState, false);
   });
   withdraw(testData.testCases.withdraw, skipTestState, false);
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdt.avalanche-v2.cy.ts

@@ -4,9 +4,7 @@ import { skipState } from '../../../../support/steps/common';
 import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/configuration.steps';
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
-  changeBorrowTypeBlocked,
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -87,7 +85,5 @@ describe.skip('USDT INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
     repay(repayCase, skipTestState, false);
   });
   withdraw(testData.testCases.withdraw, skipTestState, false);
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
-  changeBorrowTypeBlocked(testData.testCases.checkBorrowTypeBlocked, skipTestState);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/wbtc.avalanche-v2.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/co
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -71,6 +70,5 @@ describe.skip('WBTC INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
   supply(testData.testCases.deposit, skipTestState, true);
   repay(testData.testCases.repay, skipTestState, false);
   withdraw(testData.testCases.withdraw, skipTestState, false);
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/weth.avalanche-v2.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/co
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -71,6 +70,5 @@ describe('WETH INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
   supply(testData.testCases.deposit, skipTestState, true);
   repay(testData.testCases.repay, skipTestState, false);
   withdraw(testData.testCases.withdraw, skipTestState, false);
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/link.ethereum-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAEthereumV3Fork } from '../../../../support/steps/
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -85,7 +84,6 @@ describe('LINK INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/0-ethereum-v3-market/0-assets/wbtc.ethereum-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAEthereumV3Fork } from '../../../../support/steps/
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -85,7 +84,6 @@ describe('WBTC INTEGRATION SPEC, ETHEREUM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/link.arbitrum-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyArbitrumFork } from '../../../../support/steps/con
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -85,7 +84,6 @@ describe('LINK INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/1-arbitrum-v3-market/0-assets/wbtc.arbitrum-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyArbitrumFork } from '../../../../support/steps/con
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -84,7 +83,6 @@ describe('WBTC INTEGRATION SPEC, ARBITRUM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/2-avalanche-v3-market/0-assets/link.avalanche-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/co
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -85,7 +84,6 @@ describe('LINK INTEGRATION SPEC, AVALANCHE V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/2-avalanche-v3-market/0-assets/wbtc.avalanche-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/co
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -85,7 +84,6 @@ describe('WBTC INTEGRATION SPEC, AVALANCHE V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/2-avalanche-v3-market/0-assets/weth.avalanche-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyAvalancheFork } from '../../../../support/steps/co
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -85,7 +84,6 @@ describe('WETH INTEGRATION SPEC, AVALANCHE V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/3-polygon-v3-market/0-assets/link.polygon-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyPolygonFork } from '../../../../support/steps/conf
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -86,7 +85,6 @@ describe.skip('LINK INTEGRATION SPEC, POLYGON V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/3-polygon-v3-market/0-assets/wbtc.polygon-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyPolygonFork } from '../../../../support/steps/conf
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -87,7 +86,6 @@ describe('WBTC INTEGRATION SPEC, POLYGON V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/3-polygon-v3-market/0-assets/weth.polygon-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyPolygonFork } from '../../../../support/steps/conf
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -87,7 +86,6 @@ describe('WETH INTEGRATION SPEC, POLYGON V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/4-optimism-v3-market/0-assets/link.optimism-v3.cy.ts

@@ -3,10 +3,7 @@ import constants from '../../../../fixtures/constans.json';
 import { skipState } from '../../../../support/steps/common';
 import { configEnvWithTenderlyOptimismFork } from '../../../../support/steps/configuration.steps';
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
-import {
-  dashboardAssetValuesVerification,
-  switchApyBlocked,
-} from '../../../../support/steps/verification.steps';
+import { dashboardAssetValuesVerification } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
 const tokensToRequest: RequestedTokens = {
@@ -84,7 +81,6 @@ describe('LINK INTEGRATION SPEC, OPTIMISM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/4-optimism-v3-market/0-assets/wbtc.optimism-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyOptimismFork } from '../../../../support/steps/con
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 import { RequestedTokens, tokenSet } from '../../../4-gho-ethereum/helpers/token.helper';
 
@@ -87,7 +86,6 @@ describe.skip('WBTC INTEGRATION SPEC, OPTIMISM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/5-fantom-v3-market/0-assets/link.fantom-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyFantomFork } from '../../../../support/steps/confi
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 
 const testData = {
@@ -87,7 +86,6 @@ describe('LINK INTEGRATION SPEC, FANTOM V3 MARKET', () => {
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   withdraw(testData.testCases.withdraw, skipTestState, false);
   dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
 });

cypress/e2e/1-v3-markets/5-fantom-v3-market/0-assets/wbtc.fantom-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyFantomFork } from '../../../../support/steps/confi
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 
 const testData = {
@@ -83,7 +82,6 @@ describe('WBTC INTEGRATION SPEC, FANTOM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/e2e/1-v3-markets/5-fantom-v3-market/0-assets/weth.fantom-v3.cy.ts

@@ -5,7 +5,6 @@ import { configEnvWithTenderlyFantomFork } from '../../../../support/steps/confi
 import { borrow, repay, supply, withdraw } from '../../../../support/steps/main.steps';
 import {
   dashboardAssetValuesVerification,
-  switchApyBlocked,
 } from '../../../../support/steps/verification.steps';
 
 const testData = {
@@ -83,7 +82,6 @@ describe('WETH INTEGRATION SPEC, FANTOM V3 MARKET', () => {
   testData.testCases.borrow.forEach((borrowCase) => {
     borrow(borrowCase, skipTestState, true);
   });
-  switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
   supply(testData.testCases.deposit, skipTestState, true);
   testData.testCases.repay.forEach((repayCase) => {
     repay(repayCase, skipTestState, false);

cypress/support/commands.ts

@@ -97,10 +97,8 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add('getDashBoardBorrowedRow', (assetName: string, apyType: string) => {
-  return cy
-    .get(`[data-cy='dashboardBorrowedListItem_${assetName.toUpperCase()}_${apyType}']`)
-    .first();
+Cypress.Commands.add('getDashBoardBorrowedRow', (assetName: string) => {
+  return cy.get(`[data-cy='dashboardBorrowedListItem_${assetName.toUpperCase()}']`).first();
 });
 
 Cypress.Commands.add('getDashBoardSuppliedRow', (assetName: string, isCollateralType?: boolean) => {

cypress/support/helpers/dashboard.helper.ts

@@ -1,9 +1,8 @@
 import assets from '../../fixtures/assets.json';
 
 export class DashboardHelpers {
-  public static getApyBorrowedRate(tokenName: string, isVariable = true) {
-    const typeToken = isVariable ? 'Variable' : 'Stable';
-    const _selector = `[data-cy="dashboardBorrowedListItem_${tokenName}_${typeToken}"]`;
+  public static getApyBorrowedRate(tokenName: string) {
+    const _selector = `[data-cy="dashboardBorrowedListItem_${tokenName}"]`;
     cy.doSwitchToDashboardBorrowView();
     return this.getApyRate(_selector);
   }