Skip to content
Open
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@aave/contract-helpers": "1.33.0",
"@aave/math-utils": "1.33.0",
"@bgd-labs/aave-address-book": "^4.15.0",
"@bgd-labs/aave-address-book": "^4.17.1",
"@emotion/cache": "11.10.3",
"@emotion/react": "11.10.4",
"@emotion/server": "latest",
Expand Down
2 changes: 1 addition & 1 deletion public/icons/tokens/rseth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/icons/tokens/wrseth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 17 additions & 2 deletions src/components/incentives/EthenaIncentivesTooltipContent.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
import { AaveV3Ethereum, AaveV3EthereumLido } from '@bgd-labs/aave-address-book';
import { Trans } from '@lingui/macro';
import { Box } from '@mui/material';

import { Link } from '../primitives/Link';

export const EthenaAirdropTooltipContent = ({ points }: { points: number }) => {
export const EthenaAirdropTooltipContent = ({
points,
rewardedAsset,
}: {
points: number;
rewardedAsset?: string;
}) => {
return (
<Box>
<Trans>{`This asset is eligible for ${(<b>{points}x</b>)} Ethena Rewards.\n`}</Trans>
<Trans>
{`This asset is eligible for ${(<b>{points}x</b>)} Ethena Rewards`}
{rewardedAsset &&
(rewardedAsset === AaveV3Ethereum.ASSETS.GHO.V_TOKEN ||
rewardedAsset === AaveV3EthereumLido.ASSETS.GHO.V_TOKEN)
? ' if you have USDe or sUSDe in collateral'
: ''}
{`.\n`}
</Trans>
<br />
<Trans>{'Learn more about Ethena Rewards program'}</Trans>{' '}
<Link
Expand Down
6 changes: 4 additions & 2 deletions src/components/incentives/IncentivesButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,15 @@ export const EthenaIncentivesButton = ({ rewardedAsset }: { rewardedAsset?: stri
const [open, setOpen] = useState(false);
const points = useEthenaIncentives(rewardedAsset);

if (!points) {
const incentivesEnabled = Date.now() < new Date('09-23-2025').getTime(); // End of season 4

if (!points || !incentivesEnabled) {
return null;
}

return (
<ContentWithTooltip
tooltipContent={<EthenaAirdropTooltipContent points={points} />}
tooltipContent={<EthenaAirdropTooltipContent points={points} rewardedAsset={rewardedAsset} />}
withoutHover
setOpen={setOpen}
open={open}
Expand Down
2 changes: 1 addition & 1 deletion src/locales/el/messages.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/locales/en/messages.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/locales/en/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@ msgstr "Collateral change"
msgid "This is the total amount that you are able to supply to in this reserve. You are able to supply your wallet balance up until the supply cap is reached."
msgstr "This is the total amount that you are able to supply to in this reserve. You are able to supply your wallet balance up until the supply cap is reached."

#: src/components/incentives/EthenaIncentivesTooltipContent.tsx
msgid "This asset is eligible for {0} Ethena Rewards."
msgstr "This asset is eligible for {0} Ethena Rewards."

#: src/modules/history/PriceUnavailable.tsx
msgid "Price data is not currently available for this reserve on the protocol subgraph"
msgstr "Price data is not currently available for this reserve on the protocol subgraph"
Expand Down Expand Up @@ -2728,6 +2724,10 @@ msgstr "Your health factor and loan to value determine the assurance of your col
msgid "AToken supply is not zero"
msgstr "AToken supply is not zero"

#: src/components/incentives/EthenaIncentivesTooltipContent.tsx
msgid "This asset is eligible for {0} Ethena Rewards{1}."
msgstr "This asset is eligible for {0} Ethena Rewards{1}."

#: src/components/transactions/DebtSwitch/DebtSwitchModalContent.tsx
msgid "Borrow APY"
msgstr "Borrow APY"
Expand Down
2 changes: 1 addition & 1 deletion src/locales/es/messages.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/locales/fr/messages.js

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/ui-config/networksConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,9 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
name: 'Ethereum',
privateJsonRPCUrl: 'https://eth-mainnet.g.alchemy.com/v2/ZiMMq2478EVIEJdsxC5dMal_ccQwtb31',
publicJsonRPCUrl: [
'https://rpc.ankr.com/eth',
'https://rpc.flashbots.net',
'https://eth.llamarpc.com',
'https://eth-mainnet.public.blastapi.io',
//'https://cloudflare-eth.com/v1/mainnet',
],
publicJsonRPCWSUrl: 'wss://eth-mainnet.alchemyapi.io/v2/demo',
baseUniswapAdapter: '0xc3efa200a60883a96ffe3d5b492b121d6e9a1f3f',
Expand Down
2 changes: 1 addition & 1 deletion src/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const showExternalIncentivesTooltip = (
currentMarket === CustomMarket.proto_base_v3 ||
currentMarket === CustomMarket.proto_arbitrum_v3) &&
protocolAction === ProtocolAction.supply &&
symbol == 'rsETH'
(symbol == 'rsETH' || symbol == 'wrsETH')
) {
tooltipsConfig.kernelPoints = true;
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1066,10 +1066,10 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

"@bgd-labs/aave-address-book@^4.15.0":
version "4.15.0"
resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.15.0.tgz#c121387b390367725a1c4c05776f41e124ef81f3"
integrity sha512-swxGoppvEegmzgabz8KmY8ESNFlSeFjuAIYOlnE70pK+gVgn7zyh4SlRs4KvHzxTNZ5rdWFuEWKxf5pkxWiYSg==
"@bgd-labs/aave-address-book@^4.17.1":
version "4.17.1"
resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.17.1.tgz#beac023bcb925bfe51b1b789ba90cf406b2a6183"
integrity sha512-QX1Kifpb6J4G85phtnWSndDyPjsG5F6MXiuCEodM+gZ9IqgJOQ9dw3wi3Az2nRlWjdkRlCr7F9xwYqqkDunZsw==

"@coinbase/wallet-sdk@4.2.3":
version "4.2.3"
Expand Down
Loading