From c921cb816b8fb35dfd633281d14f5f195761ef7b Mon Sep 17 00:00:00 2001 From: MartinGbz Date: Wed, 20 Aug 2025 21:54:59 +0200 Subject: [PATCH 1/7] fix: disable self campaign (#2595) --- src/components/incentives/MeritIncentivesTooltipContent.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/incentives/MeritIncentivesTooltipContent.tsx b/src/components/incentives/MeritIncentivesTooltipContent.tsx index 9336a5b4a6..fc0d18c47c 100644 --- a/src/components/incentives/MeritIncentivesTooltipContent.tsx +++ b/src/components/incentives/MeritIncentivesTooltipContent.tsx @@ -23,6 +23,8 @@ interface CampaignConfig { hasSpecialContent: boolean; } +const ENABLE_SAFE_CAMPAIGN = false; + const isCeloAction = (action: MeritAction): boolean => { return [ MeritAction.CELO_SUPPLY_CELO, @@ -37,7 +39,7 @@ const isCeloAction = (action: MeritAction): boolean => { ].includes(action); }; const isSelfVerificationCampaign = (action: MeritAction): boolean => - action === MeritAction.CELO_SUPPLY_USDT; + ENABLE_SAFE_CAMPAIGN && action === MeritAction.CELO_SUPPLY_USDT; const getCampaignConfig = (action: MeritAction): CampaignConfig => { if (isSelfVerificationCampaign(action)) { From 95db832b6aaf946a82d898d9a9321ad27c4ddb0b Mon Sep 17 00:00:00 2001 From: Martin Grabina Date: Mon, 25 Aug 2025 15:09:13 -0300 Subject: [PATCH 2/7] chore: add walletType to transaction event (#2601) --- src/components/TransactionEventHandler.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/TransactionEventHandler.tsx b/src/components/TransactionEventHandler.tsx index 3968bb36d7..a95746127d 100644 --- a/src/components/TransactionEventHandler.tsx +++ b/src/components/TransactionEventHandler.tsx @@ -2,12 +2,14 @@ import { useEffect, useRef } from 'react'; import { useRootStore } from 'src/store/root'; import { GENERAL } from 'src/utils/events'; import { getNetworkConfig } from 'src/utils/marketsAndNetworksConfig'; +import { useShallow } from 'zustand/react/shallow'; export const TransactionEventHandler = () => { const postedTransactionsRef = useRef<{ [chainId: string]: string[] }>({}); - const trackEvent = useRootStore((store) => store.trackEvent); - const transactions = useRootStore((store) => store.transactions); + const [trackEvent, transactions, walletType] = useRootStore( + useShallow((store) => [store.trackEvent, store.transactions, store.walletType]) + ); //tx's currently tracked: supply, borrow, withdraw, repay, repay with coll, collateral switch @@ -42,6 +44,7 @@ export const TransactionEventHandler = () => { outAmountUsd: tx.outAmountUsd, chainId: chainIdNumber, chainName: networkConfig.displayName || networkConfig.name, + walletType, }); // update ref From bf2ebaeabdf0d9d39a8e87c5c761b57e46453db6 Mon Sep 17 00:00:00 2001 From: Alejandro <95312462+AGMASO@users.noreply.github.com> Date: Tue, 26 Aug 2025 09:54:51 +0200 Subject: [PATCH 3/7] fix: text-inside-blocked-address-comp (#2594) --- src/components/AddressBlockedModal.tsx | 9 +-------- src/locales/el/messages.js | 2 +- src/locales/en/messages.js | 2 +- src/locales/en/messages.po | 12 ++++-------- src/locales/es/messages.js | 2 +- src/locales/fr/messages.js | 2 +- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/components/AddressBlockedModal.tsx b/src/components/AddressBlockedModal.tsx index 3da0f27818..66a96c95de 100644 --- a/src/components/AddressBlockedModal.tsx +++ b/src/components/AddressBlockedModal.tsx @@ -3,7 +3,6 @@ import { Trans } from '@lingui/macro'; import { Box, Button, SvgIcon, Typography } from '@mui/material'; import { BasicModal } from './primitives/BasicModal'; -import { Link } from './primitives/Link'; export interface AddressBlockedProps { address: string; @@ -34,13 +33,7 @@ export const AddressBlockedModal = ({ address, onDisconnectWallet }: AddressBloc {address} - - This address is blocked on app.aave.com because it is associated with one or more - {' '} - - blocked activities - - {'.'} + This address is blocked on app.aave.com.