feat: merge branch 'main' into feature/v2-v3-migration

Author: satanworker

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

@@ -98,7 +98,7 @@ const testData = {
   },
 };
 
-describe('MANA INTEGRATION SPEC, AAVE V2 MARKET', () => {
+describe.skip('MANA INTEGRATION SPEC, AAVE V2 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyMainnetFork({});
   supply(testData.depositETH, skipTestState, true);

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

@@ -98,7 +98,7 @@ const testData = {
   },
 };
 
-describe('MKR INTEGRATION SPEC, AAVE V2 MARKET', () => {
+describe.skip('MKR INTEGRATION SPEC, AAVE V2 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyMainnetFork({});
   supply(testData.depositETH, skipTestState, true);

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

@@ -57,7 +57,8 @@ const testData = {
   },
 };
 
-describe('BAL INTEGRATION SPEC, POLYGON V2 MARKET', () => {
+// asset is not visible in the borrow list on Polygon V2
+describe.skip('BAL INTEGRATION SPEC, POLYGON V2 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyPolygonFork({});
 

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

@@ -56,8 +56,8 @@ const testData = {
     ],
   },
 };
-
-describe('CRV INTEGRATION SPEC, POLYGON V2 MARKET', () => {
+//asset is not visible in the borrow list on Polygon V2
+describe.skip('CRV INTEGRATION SPEC, POLYGON V2 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyPolygonFork({});
 

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

@@ -56,8 +56,8 @@ const testData = {
     ],
   },
 };
-
-describe('LINK INTEGRATION SPEC, POLYGON V2 MARKET', () => {
+//asset is not visible in the borrow list on Polygon V2
+describe.skip('LINK INTEGRATION SPEC, POLYGON V2 MARKET', () => {
   const skipTestState = skipState(false);
   configEnvWithTenderlyPolygonFork({});
 

pages/governance/proposal/[proposalId].governance.tsx

@@ -239,7 +239,14 @@ export default function ProposalPage({
                     <ReactMarkdown
                       remarkPlugins={[remarkGfm]}
                       components={{
-                        img({ src, alt }) {
+                        img({ src: _src, alt }) {
+                          if (!_src) return null;
+                          const src = /^\.\.\//.test(_src)
+                            ? _src.replace(
+                                '../',
+                                'https://raw.githubusercontent.com/aave/aip/main/content/'
+                              )
+                            : _src;
                           return <CenterAlignedImage src={src} alt={alt} />;
                         },
                         a({ node, ...rest }) {

pages/markets.page.tsx

@@ -1,15 +1,14 @@
+import { ContentContainer } from 'src/components/ContentContainer';
 import { MainLayout } from 'src/layouts/MainLayout';
-import MarketAssetsList from 'src/modules/markets/MarketAssetsList';
+import { MarketAssetsListContainer } from 'src/modules/markets/MarketAssetsListContainer';
 import { MarketsTopPanel } from 'src/modules/markets/MarketsTopPanel';
 
-import { ContentContainer } from '../src/components/ContentContainer';
-
 export default function Markets() {
   return (
     <>
       <MarketsTopPanel />
       <ContentContainer>
-        <MarketAssetsList />
+        <MarketAssetsListContainer />
       </ContentContainer>
     </>
   );