Merge branch 'main' into feat/v3.6

Author: grothem

package.json

@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@aave/contract-helpers": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44",
-    "@aave/graphql": "^0.8.0",
+    "@aave/graphql": "^0.10.0",
     "@aave/math-utils": "1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3+54d1b44",
-    "@aave/react": "^0.7.1",
+    "@aave/react": "^0.8.1",
     "@amplitude/analytics-browser": "^2.13.0",
     "@bgd-labs/aave-address-book": "^4.38.0",
     "@cowprotocol/cow-sdk": "7.2.4",
@@ -159,4 +159,4 @@
     "budgetPercentIncreaseRed": 20,
     "showDetails": true
   }
-}
+}

public/icons/footer/icons.tsx

@@ -0,0 +1,28 @@
+import { SvgIcon, type SvgIconProps } from '@mui/material';
+
+export const TikTok = (props: SvgIconProps) => (
+  <SvgIcon viewBox="0 0 23 23" {...props}>
+    <g transform="translate(4 3)">
+      <path
+        fill="currentColor"
+        d="M11.304 0H8.271v12.26c0 1.462-1.167 2.662-2.619 2.662s-2.618-1.2-2.618-2.661c0-1.435 1.14-2.609 2.54-2.661V6.522C2.49 6.574 0 9.104 0 12.26 0 15.444 2.54 18 5.678 18s5.678-2.583 5.678-5.74V5.975a7.03 7.03 0 0 0 4.019 1.356V4.252c-2.282-.078-4.07-1.956-4.07-4.252"
+      />
+    </g>
+  </SvgIcon>
+);
+
+export const DuneIcon = (props: SvgIconProps) => (
+  <SvgIcon viewBox="0 0 24 24" {...props}>
+    <g transform="translate(3 3)">
+      <path
+        d="M8.99998 18.0012C13.9705 18.0012 18 13.9718 18 9.00122C18 8.91852 17.9989 8.83607 17.9966 8.75391L1.57538 14.0895C3.19748 16.4519 5.91779 18.0012 8.99998 18.0012Z"
+        fillOpacity="0.5"
+        fill="currentColor"
+      />
+      <path
+        d="M17.9998 9.06516C17.9999 9.04346 18 9.02174 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 10.8888 0.581847 12.6417 1.57608 14.0893L17.9966 8.75391C17.9989 8.83607 18 8.91852 18 9.00122C18 9.02255 17.9999 9.04387 17.9998 9.06516Z"
+        fill="currentColor"
+      />
+    </g>
+  </SvgIcon>
+);

src/layouts/AppFooter.tsx

@@ -1,6 +1,7 @@
 import { Trans } from '@lingui/macro';
-import { GitHub, Instagram, X } from '@mui/icons-material';
+import { GitHub, Instagram, LinkedIn, X } from '@mui/icons-material';
 import { Box, styled, SvgIcon, Typography } from '@mui/material';
+import { DuneIcon, TikTok } from 'public/icons/footer/icons';
 import { Link } from 'src/components/primitives/Link';
 import { useRootStore } from 'src/store/root';
 import { useShallow } from 'zustand/shallow';
@@ -22,30 +23,45 @@ const StyledLink = styled(Link)<StyledLinkProps>(({ theme }) => ({
 }));
 
 const FOOTER_ICONS = [
-  {
-    href: 'https://hey.xyz/u/aave',
-    icon: <LensLogoIcon />,
-    title: 'Aave on Lens',
-  },
   {
     href: 'https://twitter.com/aave',
     icon: <X />,
     title: 'Twitter',
   },
+  {
+    href: 'https://www.instagram.com/aave/',
+    icon: <Instagram />,
+    title: 'Instagram',
+  },
+  {
+    href: 'https://www.tiktok.com/@aavelabs',
+    icon: <TikTok />,
+    title: 'TikTok',
+  },
+  {
+    href: 'https://www.linkedin.com/company/aavelabs/',
+    icon: <LinkedIn />,
+    title: 'Linkedin',
+  },
   {
     href: 'https://discord.com/invite/aave',
     icon: <DiscordIcon />,
     title: 'Discord',
   },
+  {
+    href: 'https://dune.com/aavelabs',
+    icon: <DuneIcon />,
+    title: 'Dune',
+  },
   {
     href: 'https://github.com/aave',
     icon: <GitHub />,
     title: 'Github',
   },
   {
-    href: 'https://www.instagram.com/aave/',
-    icon: <Instagram />,
-    title: 'Instagram',
+    href: 'https://hey.xyz/u/aave',
+    icon: <LensLogoIcon />,
+    title: 'Aave on Lens',
   },
 ];
 

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

@@ -1,9 +1,6 @@
 import { Box } from '@mui/material';
 import { ParentSize } from '@visx/responsive';
-import {
-  type ReserveWithId,
-  useAppDataContext,
-} from 'src/hooks/app-data-provider/useAppDataProvider';
+import { type ReserveWithId } from 'src/hooks/app-data-provider/useAppDataProvider';
 
 import { GraphLegend } from './GraphLegend';
 import { InterestRateModelGraph } from './InterestRateModelGraph';
@@ -20,12 +17,6 @@ export type Fields = { name: Field; color: string; text: string }[];
 export const InterestRateModelGraphContainer = ({
   reserve,
 }: InteresetRateModelGraphContainerProps): JSX.Element => {
-  const { reserves: reservesLegacy } = useAppDataContext();
-
-  const reserveData = reservesLegacy.find(
-    (r) => r.underlyingAsset.toLowerCase() === reserve.underlyingToken.address.toLowerCase()
-  );
-
   const CHART_HEIGHT = 155;
   const fields: Fields = [
     { name: 'variableBorrowRate', text: 'Borrow APR, variable', color: '#B6509E' },
@@ -50,7 +41,7 @@ export const InterestRateModelGraphContainer = ({
             height={CHART_HEIGHT}
             fields={fields}
             reserve={{
-              baseVariableBorrowRate: String(reserveData?.baseVariableBorrowRate),
+              baseVariableBorrowRate: String(reserve.borrowInfo?.baseVariableBorrowRate.raw),
               optimalUsageRatio: String(reserve.borrowInfo?.optimalUsageRate.raw),
               utilizationRate: String(reserve.borrowInfo?.utilizationRate.value),
               variableRateSlope1: String(reserve.borrowInfo?.variableRateSlope1.raw),

yarn.lock

@@ -15,13 +15,13 @@
     "@gql.tada/internal" "^1.0.0"
     graphql "^15.5.0 || ^16.0.0 || ^17.0.0"
 
-"@aave/client@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@aave/client/-/client-0.8.0.tgz#ef3e37d330fc454c1abe7a9e26ec01bd66ce3fd6"
-  integrity sha512-QW2IKOuae0jp7XV9YCUwtB00QNdO2LbybGXRV0SkehcCIgFAx6SeY3daXrtm/s1d6ysqvEJJEvXkoaXhAt76QQ==
+"@aave/client@0.9.1":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@aave/client/-/client-0.9.1.tgz#5a11908715e67bb2a3992d30f9df16c049d9c162"
+  integrity sha512-pWwICirnQdG37sbNBTYqrFCDRN+rRnCGjNPGZtKZj/QxIbQ2p0GEZcGFpUfDw2lDSBsa4VK75T6IFiNn50zmNQ==
   dependencies:
     "@aave/core" "0.1.0"
-    "@aave/graphql" "0.8.0"
+    "@aave/graphql" "0.10.0"
     "@aave/types" "0.2.0"
     "@urql/core" "^5.2.0"
     graphql "^16.11.0"
@@ -42,10 +42,10 @@
     "@urql/core" "^5.2.0"
     graphql "^16.11.0"
 
-"@aave/graphql@0.8.0", "@aave/graphql@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@aave/graphql/-/graphql-0.8.0.tgz#b999862b5c22bf3119f5c4ba5de46aef34df197d"
-  integrity sha512-S5NoQk50ypHjdTP6hJvNQW336J2fgqRrFdDlgmr6u3j7DShVTIKw3taP9spbyfGQnkIYmgzs2ZCQN/8Xq81f3Q==
+"@aave/graphql@0.10.0", "@aave/graphql@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@aave/graphql/-/graphql-0.10.0.tgz#953ad5c74d2c104fe4f4bd6f55d220b99d05b1f1"
+  integrity sha512-CRYjJbd04dUIuQjHcKHmd43y/agQ55NKiW+wKwz8M2vhyUb2qNP9I/fPKmEo+K+Stdr+ybcF8QMXBupRbMvEUA==
   dependencies:
     "@aave/types" "0.2.0"
     gql.tada "^1.8.13"
@@ -57,13 +57,13 @@
   resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.36.4-0f9a3a0a66000c25b22fad296520939bb1929e1b.3.tgz#45c38aad2068ed9dc33125b6e84fb10c557c9234"
   integrity sha512-7od7jo2oYBMBCL25MReAEDqNgcUN2X12wYR8w9M09upCxBMOghMuTL/zWdFjotngIUf6iRluMI335Yd/OQti8w==
 
-"@aave/react@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@aave/react/-/react-0.7.1.tgz#222f8551d927cbbb0ba1bb0f6f2d0605c978bf9b"
-  integrity sha512-ycnzgCz3RVrhfruuhi1P93e470KE3RyzVdTh71KgM7bM4Z8b/Gr8ocMqhkK/WCnue9p1QZGNVt00/l3d9DtY0A==
+"@aave/react@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@aave/react/-/react-0.8.1.tgz#11a92ad9f193700ac10d5b9fe1e3a6244e7b50dd"
+  integrity sha512-XZdWocic1xKNCb4x+cSsbAMHEJwsJf0D1hQmhQ5s9kisQOWGde23OsMaXPcS0Zh4XB4u5KMQWCrM7/CFMZqAQA==
   dependencies:
-    "@aave/client" "0.8.0"
-    "@aave/graphql" "0.8.0"
+    "@aave/client" "0.9.1"
+    "@aave/graphql" "0.10.0"
     "@aave/types" "0.2.0"
     urql "^4.2.2"