Skip to content

Commit a064278

Browse files
authored
feat: remove old Merit stkgho warning for cooldown period [skip cypress] (#2408)
1 parent 0e1b3b8 commit a064278

File tree

6 files changed

+5
-27
lines changed

6 files changed

+5
-27
lines changed

src/components/transactions/StakeCooldown/StakeCooldownModalContent.tsx

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ import { TokenIcon } from 'src/components/primitives/TokenIcon';
1212
import { Warning } from 'src/components/primitives/Warning';
1313
import { useGeneralStakeUiData } from 'src/hooks/stake/useGeneralStakeUiData';
1414
import { useUserStakeUiData } from 'src/hooks/stake/useUserStakeUiData';
15-
import { useMeritIncentives } from 'src/hooks/useMeritIncentives';
1615
import { useModalContext } from 'src/hooks/useModal';
1716
import { useWeb3Context } from 'src/libs/hooks/useWeb3Context';
1817
import { useRootStore } from 'src/store/root';
1918
import { stakeConfig } from 'src/ui-config/stakeConfig';
20-
import { CustomMarket, getNetworkConfig } from 'src/utils/marketsAndNetworksConfig';
19+
import { getNetworkConfig } from 'src/utils/marketsAndNetworksConfig';
2120
import { GENERAL } from 'src/utils/mixPanelEvents';
2221

2322
import { formattedTime, timeText } from '../../../helpers/timeHelper';
@@ -58,12 +57,6 @@ export const StakeCooldownModalContent = ({ stakeAssetName, icon }: StakeCooldow
5857
const { data: stakeUserResult } = useUserStakeUiData(currentMarketData, stakeAssetName);
5958
const { data: stakeGeneralResult } = useGeneralStakeUiData(currentMarketData, stakeAssetName);
6059

61-
const { data: meritIncentives } = useMeritIncentives({
62-
symbol: 'GHO',
63-
market: CustomMarket.proto_mainnet_v3,
64-
});
65-
const usersStkGhoIncentives = meritIncentives?.incentiveAPR || 0;
66-
6760
// states
6861
const [cooldownCheck, setCooldownCheck] = useState(false);
6962

@@ -341,17 +334,6 @@ export const StakeCooldownModalContent = ({ stakeAssetName, icon }: StakeCooldow
341334
)}
342335

343336
<Warning severity="error">
344-
{stakeAssetName === 'gho' && usersStkGhoIncentives !== 0 && (
345-
<>
346-
<Typography variant="caption">
347-
<Trans>
348-
During the cooldown period, you will not earn any merit rewards. However, rewards
349-
earned up to this point will remain unaffected.
350-
</Trans>
351-
</Typography>
352-
<br />
353-
</>
354-
)}
355337
<Typography variant="caption">
356338
<Trans>
357339
If you DO NOT unstake within {timeMessage(stakeUnstakeWindow)} of unstake window, you

src/locales/el/messages.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/locales/en/messages.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/locales/en/messages.po

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2663,10 +2663,6 @@ msgstr "With a voting power of <0/>"
26632663
msgid "French"
26642664
msgstr "French"
26652665

2666-
#: src/components/transactions/StakeCooldown/StakeCooldownModalContent.tsx
2667-
msgid "During the cooldown period, you will not earn any merit rewards. However, rewards earned up to this point will remain unaffected."
2668-
msgstr "During the cooldown period, you will not earn any merit rewards. However, rewards earned up to this point will remain unaffected."
2669-
26702666
#: src/modules/migration/MigrationBottomPanel.tsx
26712667
msgid "Migrating multiple collaterals and borrowed assets at the same time can be an expensive operation and might fail in certain situations.<0>Therefore it’s not recommended to migrate positions with more than 5 assets (deposited + borrowed) at the same time.</0>"
26722668
msgstr "Migrating multiple collaterals and borrowed assets at the same time can be an expensive operation and might fail in certain situations.<0>Therefore it’s not recommended to migrate positions with more than 5 assets (deposited + borrowed) at the same time.</0>"

src/locales/es/messages.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/locales/fr/messages.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)