chore: improve text around sgho (#2542)

Author: foodaka

src/hooks/useMeritIncentives.ts

@@ -1,6 +1,7 @@
 import { ProtocolAction } from '@aave/contract-helpers';
 import { ReserveIncentiveResponse } from '@aave/math-utils/dist/esm/formatters/incentive/calculate-reserve-incentives';
 import {
+  AaveSafetyModule,
   AaveV3Arbitrum,
   AaveV3Avalanche,
   AaveV3Base,
@@ -123,8 +124,8 @@ const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentiveData[]>
     GHO: [
       {
         action: MeritAction.ETHEREUM_SGHO,
-        rewardTokenAddress: AaveV3Ethereum.ASSETS.GHO.UNDERLYING,
-        rewardTokenSymbol: 'GHO',
+        rewardTokenAddress: AaveSafetyModule.STK_GHO,
+        rewardTokenSymbol: 'sGHO',
         customForumLink:
           'https://governance.aave.com/t/arfc-merit-a-new-aave-alignment-user-reward-system/16646',
       },

src/locales/el/messages.js

@@ -2214,6 +2214,10 @@ msgstr "Borrowing is unavailable because you’ve enabled Efficiency Mode (E-Mod
 msgid "Something went wrong fetching bridge message, please try again later."
 msgstr "Something went wrong fetching bridge message, please try again later."
 
+#: src/modules/staking/StakingPanelNoWallet.tsx
+msgid "Incentives APR"
+msgstr "Incentives APR"
+
 #: src/modules/governance/VotingPowerInfoPanel.tsx
 msgid "To submit a proposal for minor changes to the protocol, you'll need at least 80.00K power. If you want to change the core code base, you'll need 320k power.<0>Learn more.</0>"
 msgstr "To submit a proposal for minor changes to the protocol, you'll need at least 80.00K power. If you want to change the core code base, you'll need 320k power.<0>Learn more.</0>"
@@ -2966,7 +2970,6 @@ msgid "Target liquidity"
 msgstr "Target liquidity"
 
 #: src/modules/staking/StakingPanel.tsx
-#: src/modules/staking/StakingPanelNoWallet.tsx
 msgid "The current incentives period, decided on by the Aave community, has ended. Governance is in the process on renewing, check for updates. <0>Learn more</0>."
 msgstr "The current incentives period, decided on by the Aave community, has ended. Governance is in the process on renewing, check for updates. <0>Learn more</0>."
 

src/locales/en/messages.js

@@ -61,7 +61,7 @@ export const SavingsGho = () => {
     <Stack direction="column" gap={4}>
       <Typography gutterBottom>
         Stake GHO is now Savings GHO. With no risk of slashing and immediate withdraws available,
-        earn up to {aprFormatted}%.
+        earn up to {aprFormatted}% APR and claim rewards weekly.
       </Typography>
       <Stack direction="row">
         <Stack direction="row" alignItems="center" gap={1}>

src/locales/en/messages.po

@@ -254,7 +254,7 @@ export const GhoStakingPanel: React.FC<GhoStakingPanelProps> = ({
               variant={xsm ? 'subheader2' : 'description'}
               color={xsm ? 'text.secondary' : 'text.primary'}
             >
-              <Trans>Deposit APR</Trans>
+              <Trans>Deposit APR </Trans>
             </Typography>
           </Stack>
           <Stack direction="row" alignItems="center">

src/locales/es/messages.js

@@ -3,9 +3,7 @@ import { Box, Stack, Typography } from '@mui/material';
 import React from 'react';
 import { MeritIncentivesButton } from 'src/components/incentives/IncentivesButton';
 import { FormattedNumber } from 'src/components/primitives/FormattedNumber';
-import { Link } from 'src/components/primitives/Link';
 import { TokenIcon } from 'src/components/primitives/TokenIcon';
-import { TextWithTooltip } from 'src/components/TextWithTooltip';
 import { StakeTokenFormatted, useGeneralStakeUiData } from 'src/hooks/stake/useGeneralStakeUiData';
 import { useRootStore } from 'src/store/root';
 import { CustomMarket } from 'src/ui-config/marketsConfig';
@@ -39,8 +37,6 @@ export const StakingPanelNoWallet: React.FC<StakingPanelNoWalletProps> = ({
   if (stakedToken == 'GHO') stakingAPY = stkGho?.stakeApy || '0';
   if (stakedToken == 'ABPT V2') stakingAPY = stkBptV2?.stakeApy || '0';
 
-  const distributionEnded = Date.now() / 1000 > Number(stkGho?.distributionEnd);
-
   return (
     <Box
       sx={(theme) => ({
@@ -79,11 +75,6 @@ export const StakingPanelNoWallet: React.FC<StakingPanelNoWalletProps> = ({
           <Typography variant="subheader1" color="text.primary" ml={2}>
             {stakedToken}
           </Typography>
-          {stakedToken === 'GHO' && (
-            <Box sx={{ mx: 2 }}>
-              <MeritIncentivesButton symbol={stakedToken} market={CustomMarket.proto_mainnet_v3} />
-            </Box>
-          )}
         </Stack>
       </Box>
       <Box
@@ -94,36 +85,30 @@ export const StakingPanelNoWallet: React.FC<StakingPanelNoWalletProps> = ({
           alignItems: 'center',
         }}
       >
-        <Box display={'flex'} alignItems={'center'}>
-          <Typography variant="subheader2" color="text.secondary">
-            <Trans>Staking APR</Trans>
-          </Typography>
-
-          {distributionEnded && stakedToken === 'GHO' && (
-            <TextWithTooltip wrapperProps={{ marginBottom: '1px' }} iconColor="warning.main">
-              <Trans>
-                The current incentives period, decided on by the Aave community, has ended.
-                Governance is in the process on renewing, check for updates.{' '}
-                <Link
-                  href="https://governance.aave.com"
-                  sx={{ textDecoration: 'underline' }}
-                  variant="caption"
-                  color="text.secondary"
-                >
-                  Learn more
-                </Link>
-                .
-              </Trans>
-            </TextWithTooltip>
-          )}
-        </Box>
+        {stakedToken !== 'GHO' && (
+          <Box display={'flex'} alignItems={'center'}>
+            <Typography variant="subheader2" color="text.secondary">
+              <Trans>Staking APR</Trans>
+            </Typography>
+          </Box>
+        )}
+        {stakedToken !== 'GHO' && (
+          <FormattedNumber
+            value={parseFloat(stakingAPY || '0') / 10000}
+            percent
+            variant="secondary14"
+            color="text.primary"
+          />
+        )}
 
-        <FormattedNumber
-          value={parseFloat(stakingAPY || '0') / 10000}
-          percent
-          variant="secondary14"
-          color="text.primary"
-        />
+        {stakedToken === 'GHO' && (
+          <Box mt={1} display={'flex'} alignItems={'center'} flexDirection={'column'}>
+            <Typography variant="subheader2" color="text.secondary">
+              <Trans>Incentives APR</Trans>
+            </Typography>
+            <MeritIncentivesButton symbol={stakedToken} market={CustomMarket.proto_mainnet_v3} />
+          </Box>
+        )}
       </Box>
     </Box>
   );