Skip to content

Commit c70c14c

Browse files
AGMASOAGMASO
authored
fix: fixed wording for Merit Campaings in Base & token icon aHorRwaRLUSD not showing (#2621)
1 parent 86add40 commit c70c14c

2 files changed

Lines changed: 35 additions & 19 deletions

File tree

‎src/components/incentives/IncentivesTooltipContent.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ const IncentivesSymbolMap: {
101101
symbol: 'aRLUSD',
102102
aToken: true,
103103
},
104+
aHorRwaRLUSD: {
105+
tokenIconSymbol: 'RLUSD',
106+
symbol: 'aRLUSD',
107+
aToken: true,
108+
},
104109
aSonwS: {
105110
tokenIconSymbol: 'wS',
106111
symbol: 'awS',

‎src/hooks/useMeritIncentives.ts‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -124,34 +124,39 @@ const StSLoopIncentiveProgramMessage =
124124
const weethUsdcCampaignMessage =
125125
'You must supply weETH and borrow new USDC, while maintaining a health factor of 2 or below, in order to receive merit rewards. Eligibility criteria for this campaign are different from usual, please refer to the forum post for full details.';
126126

127+
const baseIncentivesUSDCCampaignsMessage =
128+
'Users must have Moonwell and Gauntlet Morpho Vault positions on Base and must migrate all their positions to Aave on Base to receive rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.';
129+
130+
const baseIncentivesGHOCampaignsMessage =
131+
'Users must have Moonwell and Gauntlet Morpho Vault positions on Base and must migrate all their positions to Aave on Base to receive rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.';
127132
const baseIncentivesCbbtcCampaignsMessage =
128-
'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.';
133+
'You must supply cbBTC and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Users must have Morpho positions on Base and/or Ethereum and must migrate all their positions to Aave on Base to receive rewards. Please check the forum post for the full eligibility criteria.';
129134

130135
const baseIncentivesWstETHCampaignsMessage =
131-
'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.';
136+
'You must supply wstETH and borrow USDC, GHO, EURC or wETH to receive Merit rewards. Users must have Morpho positions on Base and must migrate all their positions to Aave on Base to receive rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.';
132137

133138
const baseIncentivesETHCampaignsMessage =
134-
'Supplying ETH alone earns 1.25%, supplying ETH and borrowing USDC or EURC earns 1.50%, supplying ETH and borrowing GHO earns 1.75%. Some assets holding or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.';
139+
'Supplying ETH alone earns 1.25%, supplying ETH and borrowing USDC or EURC earns 1.50%, supplying ETH and borrowing GHO earns 1.75%. Users must have Moonwell and Gauntlet Morpho Vault positions on Base and must migrate all their positions to Aave on Base to receive rewards. Holding some assets or positions on other protocols may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.';
135140

136141
const celoSupplyMultipleBorrowUsdtMessage =
137142
'You must supply (CELO or ETH) and borrow USDT, in order to receive merit rewards. Please check the forum post for the full eligibility criteria.';
138143

139144
const joinedEthCorrelatedIncentiveForumLink =
140145
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/56';
141146

142-
const joinedEthCorrelatedIncentivePhase2ForumLink =
143-
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/70';
147+
// const joinedEthCorrelatedIncentivePhase2ForumLink =
148+
// 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/70';
144149

145-
const eurcForumLink =
146-
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/77';
150+
// const eurcForumLink =
151+
// 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/77';
147152

148153
const AusdRenewalForumLink =
149154
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/88';
150155
const AvalancheRenewalForumLink =
151156
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/146';
152157

153-
const lbtcCbbtcForumLink =
154-
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/91';
158+
// const lbtcCbbtcForumLink =
159+
// 'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/91';
155160

156161
const weethUsdcForumLink =
157162
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/120';
@@ -363,7 +368,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
363368
rewardTokenSymbol: 'aBasUSDC',
364369
protocolAction: ProtocolAction.borrow,
365370
customMessage: lbtcCbbtcCampaignMessage,
366-
customForumLink: lbtcCbbtcForumLink,
371+
customForumLink: baseIncentivesForumLink,
367372
},
368373
],
369374
USDC: [
@@ -372,12 +377,16 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
372377
rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN,
373378
rewardTokenSymbol: 'aBasUSDC',
374379
protocolAction: ProtocolAction.supply,
380+
customMessage: baseIncentivesUSDCCampaignsMessage,
381+
customForumLink: baseIncentivesForumLink,
375382
},
376383
{
377384
action: MeritAction.BASE_BORROW_USDC,
378385
rewardTokenAddress: AaveV3Base.ASSETS.USDC.A_TOKEN,
379386
rewardTokenSymbol: 'aBasUSDC',
380387
protocolAction: ProtocolAction.borrow,
388+
customMessage: antiLoopBorrowMessage,
389+
customForumLink: baseIncentivesForumLink,
381390
},
382391
],
383392
wstETH: [
@@ -403,7 +412,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
403412
rewardTokenSymbol: 'aBaswstETH',
404413
protocolAction: ProtocolAction.borrow,
405414
customMessage: antiLoopBorrowMessage,
406-
customForumLink: joinedEthCorrelatedIncentivePhase2ForumLink,
415+
customForumLink: baseIncentivesForumLink,
407416
},
408417
],
409418
ezETH: [
@@ -413,7 +422,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
413422
rewardTokenSymbol: 'REZ',
414423
protocolAction: ProtocolAction.supply,
415424
customMessage: antiLoopMessage,
416-
customForumLink: joinedEthCorrelatedIncentiveForumLink,
425+
customForumLink: baseIncentivesForumLink,
417426
},
418427
],
419428
weETH: [
@@ -423,7 +432,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
423432
rewardTokenSymbol: 'aBasweETH',
424433
protocolAction: ProtocolAction.supply,
425434
customMessage: antiLoopMessage,
426-
customForumLink: joinedEthCorrelatedIncentivePhase2ForumLink,
435+
customForumLink: baseIncentivesForumLink,
427436
},
428437
],
429438
EURC: [
@@ -433,15 +442,15 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
433442
rewardTokenSymbol: 'aBasEURC',
434443
protocolAction: ProtocolAction.supply,
435444
customMessage: antiLoopMessage,
436-
customForumLink: eurcForumLink,
445+
customForumLink: baseIncentivesForumLink,
437446
},
438447
{
439448
action: MeritAction.BASE_BORROW_EURC,
440449
rewardTokenAddress: AaveV3Base.ASSETS.EURC.A_TOKEN,
441450
rewardTokenSymbol: 'aBasEURC',
442451
protocolAction: ProtocolAction.borrow,
443452
customMessage: antiLoopBorrowMessage,
444-
customForumLink: eurcForumLink,
453+
customForumLink: baseIncentivesForumLink,
445454
},
446455
],
447456
LBTC: [
@@ -451,7 +460,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
451460
rewardTokenSymbol: 'aBasUSDC',
452461
protocolAction: ProtocolAction.supply,
453462
customMessage: lbtcCbbtcCampaignMessage,
454-
customForumLink: lbtcCbbtcForumLink,
463+
customForumLink: baseIncentivesForumLink,
455464
},
456465
],
457466
GHO: [
@@ -460,16 +469,16 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
460469
rewardTokenAddress: AaveV3Base.ASSETS.GHO.A_TOKEN,
461470
rewardTokenSymbol: 'aBasGHO',
462471
protocolAction: ProtocolAction.supply,
463-
customMessage: antiLoopMessage,
472+
customMessage: baseIncentivesGHOCampaignsMessage,
473+
customForumLink: baseIncentivesForumLink,
464474
},
465475
{
466476
action: MeritAction.BASE_BORROW_GHO,
467477
rewardTokenAddress: AaveV3Base.ASSETS.GHO.A_TOKEN,
468478
rewardTokenSymbol: 'aBasGHO',
469479
protocolAction: ProtocolAction.borrow,
470480
customMessage: antiLoopBorrowMessage,
471-
customForumLink:
472-
'https://governance.aave.com/t/arfc-set-aci-as-emission-manager-for-liquidity-mining-programs/17898/94',
481+
customForumLink: baseIncentivesForumLink,
473482
},
474483
],
475484
WETH: [
@@ -479,6 +488,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
479488
rewardTokenSymbol: 'aBasWETH',
480489
protocolAction: ProtocolAction.supply,
481490
customMessage: baseIncentivesETHCampaignsMessage,
491+
customForumLink: baseIncentivesForumLink,
482492
},
483493
],
484494
ETH: [
@@ -488,6 +498,7 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
488498
rewardTokenSymbol: 'aBasWETH',
489499
protocolAction: ProtocolAction.supply,
490500
customMessage: baseIncentivesETHCampaignsMessage,
501+
customForumLink: baseIncentivesForumLink,
491502
},
492503
],
493504
},

0 commit comments

Comments
 (0)