chore: sync main

aave · Dec 18, 2024 · 44a505a · 44a505a
2 parents fb3662b + f73b2cd
commit 44a505a
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 22 deletions.
diff --git a/public/icons/other/spark.svg b/public/icons/other/spark.svg
diff --git a/public/icons/tokens/usds.svg b/public/icons/tokens/usds.svg
diff --git a/src/components/incentives/IncentivesTooltipContent.tsx b/src/components/incentives/IncentivesTooltipContent.tsx
@@ -43,6 +43,11 @@ const IncentivesSymbolMap: {
     symbol: 'aUSDT',
     aToken: true,
   },
+  aEthPYUSD: {
+    tokenIconSymbol: 'PYUSD',
+    symbol: 'aPYUSD',
+    aToken: true,
+  },
   aAvaSAVAX: {
     tokenIconSymbol: 'sAVAX',
     symbol: 'asAVAX',

diff --git a/src/components/incentives/MeritIncentivesTooltipContent.tsx b/src/components/incentives/MeritIncentivesTooltipContent.tsx
@@ -27,7 +27,7 @@ export const MeritIncentivesTooltipContent = ({
       }}
     >
       <Typography variant="caption" color="text.primary" mb={3}>
-        <Trans>Eligible for the merit program.</Trans>
+        <Trans>Eligible for the Merit program.</Trans>
       </Typography>
 
       <Typography variant="caption" color="text.secondary" mb={3}>
@@ -36,7 +36,11 @@ export const MeritIncentivesTooltipContent = ({
           does not guarantee the program and accepts no liability.
         </Trans>{' '}
         <Link
-          href="https://governance.aave.com/t/arfc-merit-a-new-aave-alignment-user-reward-system/16646"
+          href={
+            meritIncentives.customForumLink
+              ? meritIncentives.customForumLink
+              : 'https://governance.aave.com/t/arfc-merit-a-new-aave-alignment-user-reward-system/16646'
+          }
           sx={{ textDecoration: 'underline' }}
           variant="caption"
           color="text.secondary"

diff --git a/src/hooks/useMeritIncentives.ts b/src/hooks/useMeritIncentives.ts
@@ -6,6 +6,7 @@ import { CustomMarket } from 'src/ui-config/marketsConfig';
 
 export enum MeritAction {
   ETHEREUM_STKGHO = 'ethereum-stkgho',
+  ETHEREUM_SUPPLY_PYUSD = 'ethereum-supply-pyusd',
   SUPPLY_CBBTC_BORROW_USDC = 'ethereum-supply-cbbtc-borrow-usdc',
   SUPPLY_WBTC_BORROW_USDT = 'ethereum-supply-wbtc-borrow-usdt',
   BASE_SUPPLY_CBBTC = 'base-supply-cbbtc',
@@ -26,6 +27,7 @@ type MeritIncentives = {
 
 export type ExtendedReserveIncentiveResponse = ReserveIncentiveResponse & {
   customMessage: string;
+  customForumLink: string;
 };
 
 const url = 'https://apps.aavechan.com/api/merit/aprs';
@@ -34,6 +36,7 @@ export type MeritReserveIncentiveData = Omit<ReserveIncentiveResponse, 'incentiv
   action: MeritAction;
   protocolAction?: ProtocolAction;
   customMessage?: string;
+  customForumLink?: string;
 };
 
 const getMeritData = (market: string, symbol: string): MeritReserveIncentiveData[] | undefined =>
@@ -84,6 +87,18 @@ const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentiveData[]>
         customMessage: 'You must supply wBTC and borrow USDT in order to receive merit rewards.',
       },
     ],
+    PYUSD: [
+      {
+        action: MeritAction.ETHEREUM_SUPPLY_PYUSD,
+        rewardTokenAddress: AaveV3Ethereum.ASSETS.PYUSD.A_TOKEN,
+        rewardTokenSymbol: 'aEthPYUSD',
+        protocolAction: ProtocolAction.supply,
+        customForumLink:
+          'https://governance.aave.com/t/arfc-pyusd-reserve-configuration-update-incentive-campaign/19573',
+        customMessage:
+          'Borrowing of some assets may impact the amount of rewards you are eligible for. Please check the forum post for the full eligibility criteria.',
+      },
+    ],
   },
   [CustomMarket.proto_base_v3]: {
     cbBTC: [
@@ -188,6 +203,7 @@ export const useMeritIncentives = ({
         rewardTokenAddress: incentive.rewardTokenAddress,
         rewardTokenSymbol: incentive.rewardTokenSymbol,
         customMessage: incentive.customMessage,
+        customForumLink: incentive.customForumLink,
       } as ExtendedReserveIncentiveResponse;
     },
   });

diff --git a/src/locales/de/messages.po b/src/locales/de/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Language: de\n"
 "Project-Id-Version: aave-interface\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-11-27 18:06\n"
+"PO-Revision-Date: 2024-12-11 18:06\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -1006,7 +1006,7 @@ msgid "Efficiency mode (E-Mode)"
 msgstr "Effizienz-Modus (E-Modus)"
 
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
-msgid "Eligible for the merit program."
+msgid "Eligible for the Merit program."
 msgstr ""
 
 #: src/layouts/FeedbackDialog.tsx

diff --git a/src/locales/el/messages.js b/src/locales/el/messages.js
diff --git a/src/locales/el/messages.po b/src/locales/el/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Language: el\n"
 "Project-Id-Version: aave-interface\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-11-27 18:06\n"
+"PO-Revision-Date: 2024-12-11 18:06\n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -1006,7 +1006,7 @@ msgid "Efficiency mode (E-Mode)"
 msgstr "Λειτουργία αποδοτικότητας (E-Mode)"
 
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
-msgid "Eligible for the merit program."
+msgid "Eligible for the Merit program."
 msgstr ""
 
 #: src/layouts/FeedbackDialog.tsx

diff --git a/src/locales/en/messages.js b/src/locales/en/messages.js
diff --git a/src/locales/en/messages.po b/src/locales/en/messages.po
@@ -1001,8 +1001,8 @@ msgid "Efficiency mode (E-Mode)"
 msgstr "Efficiency mode (E-Mode)"
 
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
-msgid "Eligible for the merit program."
-msgstr "Eligible for the merit program."
+msgid "Eligible for the Merit program."
+msgstr "Eligible for the Merit program."
 
 #: src/layouts/FeedbackDialog.tsx
 msgid "Email"

diff --git a/src/locales/es/messages.js b/src/locales/es/messages.js
diff --git a/src/locales/es/messages.po b/src/locales/es/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Language: es\n"
 "Project-Id-Version: aave-interface\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-11-27 18:06\n"
+"PO-Revision-Date: 2024-12-11 18:07\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -1006,7 +1006,7 @@ msgid "Efficiency mode (E-Mode)"
 msgstr "Modo de eficiencia (E-Mode)"
 
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
-msgid "Eligible for the merit program."
+msgid "Eligible for the Merit program."
 msgstr ""
 
 #: src/layouts/FeedbackDialog.tsx

diff --git a/src/locales/fr/messages.js b/src/locales/fr/messages.js
diff --git a/src/locales/fr/messages.po b/src/locales/fr/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Language: fr\n"
 "Project-Id-Version: aave-interface\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-11-27 18:06\n"
+"PO-Revision-Date: 2024-12-11 18:06\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -1006,7 +1006,7 @@ msgid "Efficiency mode (E-Mode)"
 msgstr "Mode efficacité (E-Mode)"
 
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
-msgid "Eligible for the merit program."
+msgid "Eligible for the Merit program."
 msgstr ""
 
 #: src/layouts/FeedbackDialog.tsx

diff --git a/src/locales/ru/messages.po b/src/locales/ru/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Language: ru\n"
 "Project-Id-Version: aave-interface\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-11-27 18:06\n"
+"PO-Revision-Date: 2024-12-11 18:06\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
 "Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
@@ -1006,7 +1006,7 @@ msgid "Efficiency mode (E-Mode)"
 msgstr "Режим эффективности (E-Mode)"
 
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
-msgid "Eligible for the merit program."
+msgid "Eligible for the Merit program."
 msgstr ""
 
 #: src/layouts/FeedbackDialog.tsx

diff --git a/src/locales/zh/messages.po b/src/locales/zh/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Language: zh\n"
 "Project-Id-Version: aave-interface\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-11-27 18:06\n"
+"PO-Revision-Date: 2024-12-11 18:06\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -1006,7 +1006,7 @@ msgid "Efficiency mode (E-Mode)"
 msgstr "效率模式（E-Mode）"
 
 #: src/components/incentives/MeritIncentivesTooltipContent.tsx
-msgid "Eligible for the merit program."
+msgid "Eligible for the Merit program."
 msgstr ""
 
 #: src/layouts/FeedbackDialog.tsx