Skip to content

Commit 8a32435

Browse files
AGMASOAGMASO
committed
Merge remote-tracking branch 'origin/main' into feat/plain-integration-for-support
2 parents 940c03c + c921cb8 commit 8a32435

22 files changed

+450
-463
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/components/incentives/MeritIncentivesTooltipContent.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ interface CampaignConfig {
2323
hasSpecialContent: boolean;
2424
}
2525

26+
const ENABLE_SAFE_CAMPAIGN = false;
27+
2628
const isCeloAction = (action: MeritAction): boolean => {
2729
return [
2830
MeritAction.CELO_SUPPLY_CELO,
@@ -37,7 +39,7 @@ const isCeloAction = (action: MeritAction): boolean => {
3739
].includes(action);
3840
};
3941
const isSelfVerificationCampaign = (action: MeritAction): boolean =>
40-
action === MeritAction.CELO_SUPPLY_USDT;
42+
ENABLE_SAFE_CAMPAIGN && action === MeritAction.CELO_SUPPLY_USDT;
4143

4244
const getCampaignConfig = (action: MeritAction): CampaignConfig => {
4345
if (isSelfVerificationCampaign(action)) {

‎src/hooks/useMeritIncentives.ts‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export enum MeritAction {
5050
AVALANCHE_SUPPLY_SAVAX = 'avalanche-supply-savax',
5151
AVALANCHE_SUPPLY_AUSD = 'avalanche-supply-ausd',
5252
AVALANCHE_SUPPLY_GHO = 'avalanche-supply-gho',
53+
AVALANCHE_BORROW_USDC = 'avalanche-borrow-usdc',
5354
SONIC_SUPPLY_USDCE = 'sonic-supply-usdce',
5455
SONIC_SUPPLY_STS_BORROW_WS = 'sonic-supply-sts-borrow-ws',
5556
GNOSIS_BORROW_EURE = 'gnosis-borrow-eure',
@@ -143,7 +144,7 @@ const eurcForumLink =
143144
const AusdRenewalForumLink =
144145
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/88';
145146
const AvalancheRenewalForumLink =
146-
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/89';
147+
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/146';
147148

148149
const lbtcCbbtcForumLink =
149150
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/91';
@@ -490,7 +491,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
490491
['BTC.b']: [
491492
{
492493
action: MeritAction.AVALANCHE_SUPPLY_BTCB,
493-
rewardTokenAddress: AaveV3Avalanche.ASSETS.BTCb.A_TOKEN,
494+
rewardTokenAddress: AaveV3Avalanche.ASSETS.sAVAX.A_TOKEN,
494495
rewardTokenSymbol: 'aAvaSAVAX',
495496
protocolAction: ProtocolAction.supply,
496497
customMessage: antiLoopMessage,
@@ -500,17 +501,25 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
500501
USDC: [
501502
{
502503
action: MeritAction.AVALANCHE_SUPPLY_USDC,
503-
rewardTokenAddress: AaveV3Avalanche.ASSETS.USDC.A_TOKEN,
504+
rewardTokenAddress: AaveV3Avalanche.ASSETS.sAVAX.A_TOKEN,
504505
rewardTokenSymbol: 'aAvaSAVAX',
505506
protocolAction: ProtocolAction.supply,
506507
customMessage: antiLoopMessage,
507508
customForumLink: AvalancheRenewalForumLink,
508509
},
510+
{
511+
action: MeritAction.AVALANCHE_BORROW_USDC,
512+
rewardTokenAddress: AaveV3Avalanche.ASSETS.sAVAX.A_TOKEN,
513+
rewardTokenSymbol: 'aAvaSAVAX',
514+
protocolAction: ProtocolAction.borrow,
515+
customMessage: antiLoopBorrowMessage,
516+
customForumLink: AvalancheRenewalForumLink,
517+
},
509518
],
510519
USDt: [
511520
{
512521
action: MeritAction.AVALANCHE_SUPPLY_USDT,
513-
rewardTokenAddress: AaveV3Avalanche.ASSETS.USDt.A_TOKEN,
522+
rewardTokenAddress: AaveV3Avalanche.ASSETS.sAVAX.A_TOKEN,
514523
rewardTokenSymbol: 'aAvaSAVAX',
515524
protocolAction: ProtocolAction.supply,
516525
customMessage: antiLoopMessage,
@@ -530,7 +539,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
530539
AUSD: [
531540
{
532541
action: MeritAction.AVALANCHE_SUPPLY_AUSD,
533-
rewardTokenAddress: AaveV3Avalanche.ASSETS.AUSD.A_TOKEN,
542+
rewardTokenAddress: AaveV3Avalanche.ASSETS.sAVAX.A_TOKEN,
534543
rewardTokenSymbol: 'aAvaSAVAX',
535544
protocolAction: ProtocolAction.supply,
536545
customMessage: antiLoopMessage,
@@ -540,7 +549,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
540549
GHO: [
541550
{
542551
action: MeritAction.AVALANCHE_SUPPLY_GHO,
543-
rewardTokenAddress: AaveV3Avalanche.ASSETS.GHO.A_TOKEN,
552+
rewardTokenAddress: AaveV3Avalanche.ASSETS.sAVAX.A_TOKEN,
544553
rewardTokenSymbol: 'aAvaSAVAX',
545554
protocolAction: ProtocolAction.supply,
546555
customMessage: antiLoopMessage,

‎src/hooks/useReservesHistory.tsx‎

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

0 commit comments

Comments
 (0)