Feat/why did you render

.env.example

@@ -16,3 +16,4 @@ NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=
 NEXT_PUBLIC_MIXPANEL=
 NEXT_PUBLIC_FIAT_ON_RAMP=true
 NEXT_PUBLIC_SUBGRAPH_API_KEY=
+NEXT_PUBLIC_IS_CYPRESS_ENABLED=false

.github/actions/build/action.yml

@@ -41,6 +41,10 @@ inputs:
     description: subgraph api key
     required: false
     default: ''
+  NEXT_PUBLIC_IS_CYPRESS_ENABLED:
+    description: enables cypress
+    required: false
+    default: 'true'
 
 runs:
   using: 'composite'
@@ -84,3 +88,4 @@ runs:
         NEXT_PUBLIC_FIAT_ON_RAMP: 'false'
         NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: '${{ inputs.NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID }}'
         NEXT_PUBLIC_SUBGRAPH_API_KEY: '${{ inputs.NEXT_PUBLIC_SUBGRAPH_API_KEY }}'
+        NEXT_PUBLIC_IS_CYPRESS_ENABLED: '${{ inputs.NEXT_PUBLIC_IS_CYPRESS_ENABLED }}'

.github/workflows/build-test-deploy-dev.yml

@@ -31,6 +31,7 @@ jobs:
           NEXT_PUBLIC_FIAT_ON_RAMP: 'false'
           NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           NEXT_PUBLIC_SUBGRAPH_API_KEY: ${{ secrets.NEXT_PUBLIC_SUBGRAPH_API_KEY }}
+          NEXT_PUBLIC_IS_CYPRESS_ENABLED: 'true'
 
       - name: Upload artifacts
         uses: ./.github/actions/upload-artifacts

.github/workflows/build-test-deploy.yml

@@ -31,6 +31,7 @@ jobs:
           NEXT_PUBLIC_FIAT_ON_RAMP: 'false'
           NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
           NEXT_PUBLIC_SUBGRAPH_API_KEY: ${{ secrets.NEXT_PUBLIC_SUBGRAPH_API_KEY }}
+          NEXT_PUBLIC_IS_CYPRESS_ENABLED: 'false'
 
       - name: Upload artifacts
         uses: ./.github/actions/upload-artifacts

.github/workflows/dependency-review.yml

@@ -18,3 +18,5 @@ jobs:
         uses: actions/checkout@v3
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v2
+        with:
+          fail-on-severity: high

.github/workflows/update-prod-staging.yml

@@ -13,14 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        environment: [
-          {
-            name: 'Production',
-            domain: 'app.aave.com',
-            artifact: 'out',
-            build_path: 'out'
-          }
-        ]
+        environment:
+          [{ name: 'Production', domain: 'app.aave.com', artifact: 'out', build_path: 'out' }]
     environment:
       name: ${{ matrix.environment.name }}
       url: https://${{ matrix.environment.domain }}
@@ -64,4 +58,4 @@ jobs:
           artifacts: app.tar.gz
           bodyFile: release-notes.md
           commit: '${{ github.sha }}'
-          tag: '${{ env.TAG }}'
+          tag: '${{ env.TAG }}'

custom.d.ts

@@ -14,5 +14,6 @@ namespace NodeJS {
     NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: string;
     NEXT_PUBLIC_FIAT_ON_RAMP: string;
     NEXT_PUBLIC_SUBGRAPH_API_KEY: string;
+    NEXT_PUBLIC_IS_CYPRESS_ENABLED: string;
   }
 }

cypress/e2e/4-gho-ethereum/helpers/token.helper.ts

@@ -73,12 +73,12 @@ const donors: Donors = {
   },
   aMATICPolygonV2: {
     name: 'aMATIC',
-    donorWalletAddress: '0x7068Ea5255cb05931EFa8026Bd04b18F3DeB8b0B',
+    donorWalletAddress: '0xaFDAbFb6227507fF6522b8a242168F6b5F353a6E',
     tokenAddress: '0x8dF3aad3a84da6b69A4DA8aeC3eA40d9091B2Ac4',
   },
   aAVAXAvalancheV2: {
     name: 'aAVAX',
-    donorWalletAddress: '0xe5dbFF893E6120C0d013FB046cd755990E4BE9a9',
+    donorWalletAddress: '0x36cc7B13029B5DEe4034745FB4F24034f3F2ffc6',
     tokenAddress: '0xDFE521292EcE2A4f44242efBcD66Bc594CA9714B',
   },
 };

cypress/support/commands.ts

@@ -1,4 +1,5 @@
 import 'cypress-wait-until';
+// import { Provider } from '@ethersproject/providers';
 
 import { CustomizedBridge } from './tools/bridge';
 

cypress/support/tools/bridge.ts

@@ -15,7 +15,7 @@ export class CustomizedBridge extends Eip1193Bridge {
   chainId: number;
 
   constructor(signer: Signer, provider?: providers.Provider, chainId?: number) {
-    super(signer, provider);
+    super(signer as any, provider);
     this.chainId = chainId || 3030;
   }
 
@@ -76,14 +76,17 @@ export class CustomizedBridge extends Eip1193Bridge {
       );
       return tx;
     }
-    if (method === 'eth_chainId') {
-      if (isCallbackForm) {
-        // @ts-ignore
-        callback(null, { result: this.chainId });
-      } else {
-        return Promise.resolve(this.chainId);
-      }
-    }
+    // if (method === 'eth_chainId') {
+    //   const result = await this.provider.getNetwork();
+    //   const chainId = utils.hexValue(result.chainId);
+
+    //   if (isCallbackForm) {
+    //     // @ts-ignore
+    //     callback(null, { result: chainId });
+    //   } else {
+    //     return Promise.resolve(chainId);
+    //   }
+    // }
     if (method === 'eth_sendTransaction') {
       if (!this.signer) {
         throw new Error('eth_sendTransaction requires an account');
@@ -98,6 +101,10 @@ export class CustomizedBridge extends Eip1193Bridge {
       const req = JsonRpcProvider.hexlifyTransaction(params[0], { from: true, gas: true });
 
       req.gasLimit = req.gas;
+      // @ts-ignore
+      // Work around to force the chainId to be used for the fork environments
+      req.chainId = this.chainId;
+
       delete req.gas;
 
       const tx = await this.signer.sendTransaction(req);

cypress/tsconfig.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "noEmit": true,
     "types": ["cypress", "cypress-wait-until"],
+    "sourceMap": false,
   },
   "include": [
     "../node_modules/cypress",

next.config.js

@@ -25,10 +25,33 @@ module.exports = withBundleAnalyzer({
       ],
     });
     config.experiments = { topLevelAwait: true };
+    config.resolve.fallback = { fs: false, net: false, tls: false };
     return config;
   },
   reactStrictMode: true,
   // assetPrefix: "./",
   trailingSlash: true,
   pageExtensions,
+  // NOTE: Needed for SAFE testing locally
+  // async headers() {
+  //   return [
+  //     {
+  //       source: '/manifest.json',
+  //       headers: [
+  //         {
+  //           key: 'Access-Control-Allow-Origin',
+  //           value: '*',
+  //         },
+  //         {
+  //           key: 'Access-Control-Allow-Methods',
+  //           value: 'GET',
+  //         },
+  //         {
+  //           key: 'Access-Control-Allow-Headers',
+  //           value: 'X-Requested-With, content-type, Authorization',
+  //         },
+  //       ],
+  //     },
+  //   ];
+  // },
 });

package.json

@@ -39,13 +39,14 @@
     "@emotion/server": "latest",
     "@emotion/styled": "11.10.4",
     "@gelatonetwork/relay-sdk": "^5.5.5",
-    "@gnosis.pm/safe-apps-web3-react": "^1.2.0",
     "@heroicons/react": "^1.0.6",
     "@lingui/react": "^3.14.0",
     "@mui/icons-material": "^5.10.14",
     "@mui/lab": "5.0.0-alpha.103",
     "@mui/material": "^5.10.9",
     "@paraswap/sdk": "6.10.0",
+    "@safe-global/safe-apps-provider": "^0.18.4",
+    "@safe-global/safe-apps-sdk": "^9.1.0",
     "@tanstack/react-query": "^4.28.0",
     "@visx/annotation": "^3.3.0",
     "@visx/axis": "^2.14.0",
@@ -57,16 +58,8 @@
     "@visx/scale": "^2.2.2",
     "@visx/shape": "^2.12.2",
     "@visx/tooltip": "^2.16.0",
-    "@walletconnect/ethereum-provider": "^2.13.3",
-    "@walletconnect/modal": "2.7.0",
-    "@web3-react/abstract-connector": "^6.0.7",
-    "@web3-react/core": "^6.1.9",
-    "@web3-react/frame-connector": "^6.0.9",
-    "@web3-react/injected-connector": "^6.0.7",
-    "@web3-react/torus-connector": "^6.2.9",
-    "@web3-react/types": "^6.0.7",
-    "@web3-react/walletlink-connector": "^6.2.14",
     "blo": "^1.1.1",
+    "connectkit": "^1.8.2",
     "d3-array": "^3.2.0",
     "d3-time-format": "^4.1.0",
     "dayjs": "^1.11.5",
@@ -78,25 +71,27 @@
     "immer": "^9.0.15",
     "micro-memoize": "^4.1.2",
     "mixpanel-browser": "^2.45.0",
-    "next": "12.1.1",
-    "react": "latest",
+    "next": "12.3.4",
+    "react": "^18.0.0",
     "react-cookie-consent": "^8.0.1",
-    "react-dom": "latest",
+    "react-dom": "^18.0.0",
     "react-infinite-scroller": "^1.2.6",
     "react-lazy-load": "^4.0.1",
     "react-markdown": "^8.0.7",
     "react-number-format": "^4.9.1",
     "reflect-metadata": "^0.1.13",
     "remark-gfm": "^3.0.1",
     "tiny-invariant": "^1.3.1",
+    "viem": "2.x",
+    "wagmi": "^2.13.5",
     "zustand": "^4.1.4"
   },
   "devDependencies": {
     "@babel/core": "^7.19.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.1.0",
-    "@ethersproject/experimental": "^5.5.0",
+    "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.5.3",
     "@lingui/cli": "^3.15.0",
     "@lingui/macro": "^3.15.0",
@@ -113,6 +108,7 @@
     "@types/react": "latest",
     "@types/react-infinite-scroller": "^1.2.3",
     "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@welldone-software/why-did-you-render": "^8.0.3",
     "axios": "^1.6.2",
     "babel-plugin-macros": "^3.1.0",
     "cypress": "10.9.0",
@@ -125,15 +121,12 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-simple-import-sort": "^8.0.0",
-    "husky": ">=8",
+    "husky": "^8.0.3",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^13.0.3",
     "prettier": "^2.8.1",
-    "typescript": "^4.9.4"
-  },
-  "resolutions": {
-    "@web3-react/walletlink-connector/@coinbase/wallet-sdk": "3.1.0"
+    "typescript": "^5.0.4"
   },
   "contributors": [
     "Anastasia Khovaeva <[email protected]>",