Skip to content

Commit 05df57b

Browse files
grothemfoodaka
grothem
and
foodaka
authored
feat: use sdk for reserve rate history (#2588)
Co-authored-by: mark hinschberger <[email protected]>
1 parent 213439a commit 05df57b

20 files changed

+432
-456
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"dependencies": {
3434
"@aave/contract-helpers": "1.36.1",
3535
"@aave/math-utils": "1.36.1",
36+
"@aave/react": "^0.4.0",
3637
"@amplitude/analytics-browser": "^2.13.0",
3738
"@bgd-labs/aave-address-book": "^4.25.1",
3839
"@cowprotocol/app-data": "^3.1.0",

‎pages/_app.page.tsx‎

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import '/public/fonts/inter/inter.css';
22
import '/src/styles/variables.css';
33

4+
import { AaveClient, AaveProvider } from '@aave/react';
45
import { CacheProvider, EmotionCache } from '@emotion/react';
56
import { NoSsr } from '@mui/material';
67
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
@@ -92,6 +93,8 @@ type NextPageWithLayout = NextPage & {
9293
getLayout?: (page: React.ReactElement) => React.ReactNode;
9394
};
9495

96+
export const client = AaveClient.create();
97+
9598
interface MyAppProps extends AppProps {
9699
emotionCache?: EmotionCache;
97100
Component: NextPageWithLayout;
@@ -138,51 +141,53 @@ export default function MyApp(props: MyAppProps) {
138141
imageUrl="https://app.aave.com/aave-com-opengraph.png"
139142
/>
140143
<NoSsr>
141-
<LanguageProvider>
142-
<WagmiProvider config={wagmiConfig}>
143-
<QueryClientProvider client={queryClient}>
144-
<ConnectKitProvider
145-
onDisconnect={cleanLocalStorage}
146-
onConnect={({ connectorId }) => setWalletType(connectorId)}
147-
>
148-
<Web3ContextProvider>
149-
<AppGlobalStyles>
150-
<AddressBlocked>
151-
<CowOrderToastProvider>
152-
<ModalContextProvider>
153-
<SharedDependenciesProvider>
154-
<AppDataProvider>
155-
<GasStationProvider>
156-
{getLayout(<Component {...pageProps} />)}
157-
<SupplyModal />
158-
<WithdrawModal />
159-
<BorrowModal />
160-
<RepayModal />
161-
<CollateralChangeModal />
162-
<DebtSwitchModal />
163-
<ClaimRewardsModal />
164-
<EmodeModal />
165-
<SwapModal />
166-
<FaucetModal />
167-
<TransactionEventHandler />
168-
<SwitchModal />
169-
<StakingMigrateModal />
170-
<BridgeModal />
171-
<ReadOnlyModal />
172-
<CowOrderToast />
173-
</GasStationProvider>
174-
</AppDataProvider>
175-
</SharedDependenciesProvider>
176-
</ModalContextProvider>
177-
</CowOrderToastProvider>
178-
</AddressBlocked>
179-
</AppGlobalStyles>
180-
</Web3ContextProvider>
181-
</ConnectKitProvider>
182-
<ReactQueryDevtools initialIsOpen={false} />
183-
</QueryClientProvider>
184-
</WagmiProvider>
185-
</LanguageProvider>
144+
<AaveProvider client={client}>
145+
<LanguageProvider>
146+
<WagmiProvider config={wagmiConfig}>
147+
<QueryClientProvider client={queryClient}>
148+
<ConnectKitProvider
149+
onDisconnect={cleanLocalStorage}
150+
onConnect={({ connectorId }) => setWalletType(connectorId)}
151+
>
152+
<Web3ContextProvider>
153+
<AppGlobalStyles>
154+
<AddressBlocked>
155+
<CowOrderToastProvider>
156+
<ModalContextProvider>
157+
<SharedDependenciesProvider>
158+
<AppDataProvider>
159+
<GasStationProvider>
160+
{getLayout(<Component {...pageProps} />)}
161+
<SupplyModal />
162+
<WithdrawModal />
163+
<BorrowModal />
164+
<RepayModal />
165+
<CollateralChangeModal />
166+
<DebtSwitchModal />
167+
<ClaimRewardsModal />
168+
<EmodeModal />
169+
<SwapModal />
170+
<FaucetModal />
171+
<TransactionEventHandler />
172+
<SwitchModal />
173+
<StakingMigrateModal />
174+
<BridgeModal />
175+
<ReadOnlyModal />
176+
<CowOrderToast />
177+
</GasStationProvider>
178+
</AppDataProvider>
179+
</SharedDependenciesProvider>
180+
</ModalContextProvider>
181+
</CowOrderToastProvider>
182+
</AddressBlocked>
183+
</AppGlobalStyles>
184+
</Web3ContextProvider>
185+
</ConnectKitProvider>
186+
<ReactQueryDevtools initialIsOpen={false} />
187+
</QueryClientProvider>
188+
</WagmiProvider>
189+
</LanguageProvider>
190+
</AaveProvider>
186191
</NoSsr>
187192
</CacheProvider>
188193
);

‎src/hooks/useReservesHistory.tsx‎

Lines changed: 0 additions & 155 deletions
This file was deleted.

‎src/hooks/useSGhoApyHistory.ts‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1+
import { TimeWindow } from '@aave/react';
12
import dayjs from 'dayjs';
23
import { sghoConfig } from 'pages/api/SGhoService';
34
import { useCallback, useEffect, useMemo, useState } from 'react';
45
import { MeritApyDataItem } from 'src/modules/reserve-overview/graphs/MeritApyGraph';
5-
import { ESupportedTimeRanges } from 'src/modules/reserve-overview/TimeRangeSelector';
6-
7-
export const sghoTimeRangeOptions = [
8-
ESupportedTimeRanges.OneWeek,
9-
ESupportedTimeRanges.OneMonth,
10-
ESupportedTimeRanges.SixMonths,
11-
];
12-
13-
export type SGhoTimeRange = (typeof sghoTimeRangeOptions)[number];
146

157
type SGhoApyApiResponse = {
168
data?: MeritApyDataItem[];
@@ -28,24 +20,24 @@ type UseSGhoApyHistoryOptions = {
2820
limit?: number;
2921
startDate?: string;
3022
endDate?: string;
31-
timeRange?: SGhoTimeRange;
23+
timeRange?: TimeWindow;
3224
};
3325

3426
/**
3527
* Convert time range to start/end dates
3628
*/
37-
const timeRangeToDateRange = (timeRange: SGhoTimeRange): { startDate: string; endDate: string } => {
29+
const timeRangeToDateRange = (timeRange: TimeWindow): { startDate: string; endDate: string } => {
3830
const endDate = dayjs().format('YYYY-MM-DD');
3931
let startDate: string;
4032

4133
switch (timeRange) {
42-
case ESupportedTimeRanges.OneWeek:
34+
case TimeWindow.LastWeek:
4335
startDate = dayjs().subtract(7, 'day').format('YYYY-MM-DD');
4436
break;
45-
case ESupportedTimeRanges.OneMonth:
37+
case TimeWindow.LastMonth:
4638
startDate = dayjs().subtract(1, 'month').format('YYYY-MM-DD');
4739
break;
48-
case ESupportedTimeRanges.SixMonths:
40+
case TimeWindow.LastSixMonths:
4941
startDate = dayjs().subtract(6, 'month').format('YYYY-MM-DD');
5042
break;
5143
default:

‎src/locales/el/messages.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/locales/en/messages.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/locales/en/messages.po‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,6 @@ msgstr "Claim all"
574574
msgid "Time remaining until the withdraw period ends."
575575
msgstr "Time remaining until the withdraw period ends."
576576

577-
#: src/modules/reserve-overview/graphs/ApyGraphContainer.tsx
578577
#: src/modules/reserve-overview/graphs/MeritApyGraphContainer.tsx
579578
msgid "Data couldn't be fetched, please reload graph."
580579
msgstr "Data couldn't be fetched, please reload graph."
@@ -1100,7 +1099,6 @@ msgstr "{d}d"
11001099
msgid "Unstake window"
11011100
msgstr "Unstake window"
11021101

1103-
#: src/modules/reserve-overview/graphs/ApyGraphContainer.tsx
11041102
#: src/modules/reserve-overview/graphs/MeritApyGraphContainer.tsx
11051103
msgid "Reload"
11061104
msgstr "Reload"
@@ -2367,6 +2365,10 @@ msgstr "You don’t have enough funds in your wallet to repay the full amount. I
23672365
msgid "Assets to borrow"
23682366
msgstr "Assets to borrow"
23692367

2368+
#: src/modules/reserve-overview/graphs/ApyGraphContainer.tsx
2369+
msgid "Data couldn't be loaded."
2370+
msgstr "Data couldn't be loaded."
2371+
23702372
#: src/components/Warnings/BorrowDisabledWarning.tsx
23712373
msgid "Borrowing is disabled due to an Aave community decision. <0>More details</0>"
23722374
msgstr "Borrowing is disabled due to an Aave community decision. <0>More details</0>"

‎src/locales/es/messages.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/locales/fr/messages.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/modules/reserve-overview/BorrowInfo.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { GENERAL } from 'src/utils/events';
1717
import { displayGhoForMintableMarket } from 'src/utils/ghoUtilities';
1818
import { MarketDataType, NetworkConfig } from 'src/utils/marketsAndNetworksConfig';
1919

20-
import { ApyGraphContainer } from './graphs/ApyGraphContainer';
20+
import { BorrowApyGraph } from './graphs/ApyGraphContainer';
2121
import { ReserveFactorOverview } from './ReserveFactorOverview';
2222
import { PanelItem } from './ReservePanels';
2323

@@ -192,10 +192,10 @@ export const BorrowInfo = ({
192192
)}
193193
</Box>
194194
{renderCharts && (
195-
<ApyGraphContainer
196-
graphKey="borrow"
197-
reserve={reserve}
198-
currentMarketData={currentMarketData}
195+
<BorrowApyGraph
196+
chain={currentMarketData.chainId}
197+
underlyingToken={reserve.underlyingAsset}
198+
market={currentMarketData.addresses.LENDING_POOL}
199199
/>
200200
)}
201201
<Box

0 commit comments

Comments
 (0)