Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/incentives/IncentivesTooltipContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ const IncentivesSymbolMap: {
symbol: 'aOP',
aToken: true,
},
'aUSD₮': {
tokenIconSymbol: 'usdt',
symbol: 'aUSDT',
aToken: true,
},
};

interface IncentivesTooltipContentProps {
Expand Down
46 changes: 23 additions & 23 deletions src/hooks/useMeritIncentives.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import {
AaveV3Arbitrum,
AaveV3Avalanche,
AaveV3Base,
AaveV3Celo,
AaveV3Ethereum,
AaveV3EthereumLido,
AaveV3Gnosis,
AaveV3Optimism,
AaveV3Sonic,
} from '@bgd-labs/aave-address-book';
import { useQuery } from '@tanstack/react-query';
Expand Down Expand Up @@ -632,84 +632,84 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
CELO: [
{
action: MeritAction.CELO_SUPPLY_CELO,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.supply,
customMessage: antiLoopMessage,
},
{
action: MeritAction.CELO_SUPPLY_MULTIPLE_BORROW_USDT,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.supply,
customMessage: celoSupplyMultipleBorrowUsdtMessage,
},
{
action: MeritAction.CELO_BORROW_CELO,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.borrow,
customMessage: antiLoopBorrowMessage,
},
],
['USD₮']: [
{
action: MeritAction.CELO_SUPPLY_USDT,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.supply,
customMessage: antiLoopMessage,
},
{
action: MeritAction.CELO_BORROW_USDT,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.borrow,
customMessage: antiLoopBorrowMessage,
},
{
action: MeritAction.CELO_SUPPLY_MULTIPLE_BORROW_USDT,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.borrow,
customMessage: celoSupplyMultipleBorrowUsdtMessage,
},
],
USDC: [
{
action: MeritAction.CELO_SUPPLY_USDC,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.supply,
customMessage: antiLoopMessage,
},
{
action: MeritAction.CELO_BORROW_USDC,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.borrow,
customMessage: antiLoopBorrowMessage,
},
],
WETH: [
{
action: MeritAction.CELO_SUPPLY_WETH,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.supply,
customMessage: antiLoopMessage,
},
{
action: MeritAction.CELO_SUPPLY_MULTIPLE_BORROW_USDT,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.supply,
customMessage: celoSupplyMultipleBorrowUsdtMessage,
},
{
action: MeritAction.CELO_BORROW_WETH,
rewardTokenAddress: AaveV3Optimism.ASSETS.OP.A_TOKEN,
rewardTokenSymbol: 'aOP',
rewardTokenAddress: AaveV3Celo.ASSETS.USDT.A_TOKEN,
rewardTokenSymbol: 'aUSD₮',
protocolAction: ProtocolAction.borrow,
customMessage: antiLoopBorrowMessage,
},
Expand Down
9 changes: 7 additions & 2 deletions src/modules/reserve-overview/AddTokenDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { RESERVE_DETAILS } from 'src/utils/events';

interface AddTokenDropdownProps {
poolReserve: ReserveWithId;
iconSymbol?: string;
downToSM: boolean;
switchNetwork: (chainId: number) => Promise<void>;
addERC20Token: (args: ERC20TokenType) => Promise<boolean>;
Expand All @@ -24,6 +25,7 @@ interface AddTokenDropdownProps {

export const AddTokenDropdown = ({
poolReserve,
iconSymbol,
downToSM,
switchNetwork,
addERC20Token,
Expand Down Expand Up @@ -164,7 +166,10 @@ export const AddTokenDropdown = ({
handleClose();
}}
>
<TokenIcon symbol={poolReserve.underlyingToken.symbol} sx={{ fontSize: '20px' }} />
<TokenIcon
symbol={iconSymbol ?? poolReserve.underlyingToken.symbol}
sx={{ fontSize: '20px' }}
/>
<Typography variant="subheader1" sx={{ ml: 3 }} noWrap data-cy={`assetName`}>
{poolReserve.underlyingToken.symbol}
</Typography>
Expand Down Expand Up @@ -201,7 +206,7 @@ export const AddTokenDropdown = ({
}}
>
<TokenIcon
symbol={poolReserve.underlyingToken.symbol}
symbol={iconSymbol ?? poolReserve.underlyingToken.symbol}
sx={{ fontSize: '20px' }}
aToken={true}
/>
Expand Down
4 changes: 4 additions & 0 deletions src/modules/reserve-overview/ReserveTopDetailsWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,14 @@ export const ReserveTopDetailsWrapper = ({ underlyingAsset }: ReserveTopDetailsP
<Box sx={{ display: 'flex' }}>
<TokenLinkDropdown
poolReserve={poolReserve}
iconSymbol={displayIconSymbol}
downToSM={downToSM}
hideAToken={isGho}
/>
{currentAccount && (
<AddTokenDropdown
poolReserve={poolReserve}
iconSymbol={displayIconSymbol}
downToSM={downToSM}
switchNetwork={switchNetwork}
addERC20Token={addERC20Token}
Expand Down Expand Up @@ -205,12 +207,14 @@ export const ReserveTopDetailsWrapper = ({ underlyingAsset }: ReserveTopDetailsP
<Box sx={{ display: 'flex' }}>
<TokenLinkDropdown
poolReserve={poolReserve}
iconSymbol={displayIconSymbol}
downToSM={downToSM}
hideAToken={isGho}
/>
{currentAccount && (
<AddTokenDropdown
poolReserve={poolReserve}
iconSymbol={displayIconSymbol}
downToSM={downToSM}
switchNetwork={switchNetwork}
addERC20Token={addERC20Token}
Expand Down
11 changes: 8 additions & 3 deletions src/modules/reserve-overview/TokenLinkDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ import { RESERVE_DETAILS } from '../../utils/events';

interface TokenLinkDropdownProps {
poolReserve: ReserveWithId;
iconSymbol?: string;
downToSM: boolean;
hideAToken?: boolean;
hideVariableDebtToken?: boolean;
}

export const TokenLinkDropdown = ({
poolReserve,
iconSymbol,
downToSM,
hideAToken,
hideVariableDebtToken,
Expand Down Expand Up @@ -107,7 +109,10 @@ export const TokenLinkDropdown = ({
target="_blank"
divider={showVariableDebtToken}
>
<TokenIcon symbol={poolReserve.underlyingToken.symbol} sx={{ fontSize: '20px' }} />
<TokenIcon
symbol={iconSymbol ?? poolReserve.underlyingToken.symbol}
sx={{ fontSize: '20px' }}
/>
<Typography variant="subheader1" sx={{ ml: 3 }} noWrap data-cy={`assetName`}>
{poolReserve.underlyingToken.symbol}
</Typography>
Expand Down Expand Up @@ -140,7 +145,7 @@ export const TokenLinkDropdown = ({
divider={showVariableDebtToken}
>
<TokenIcon
symbol={poolReserve.underlyingToken.symbol}
symbol={iconSymbol ?? poolReserve.underlyingToken.symbol}
aToken={true}
sx={{ fontSize: '20px' }}
/>
Expand Down Expand Up @@ -177,7 +182,7 @@ export const TokenLinkDropdown = ({
}}
>
<TokenIcon
symbol={poolReserve.underlyingToken.symbol}
symbol={iconSymbol ?? poolReserve.underlyingToken.symbol}
waToken={true} //TODO: get a specific icon for variable debt token or apply waToken style
sx={{ fontSize: '20px' }}
/>
Expand Down
Loading