Skip to content

fix: transaction event #2479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 5, 2025
Merged

fix: transaction event #2479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
013556a
fix: transaction event
foodaka May 27, 2025
ef62523
Merge branch 'main' into feat/enable-tx
foodaka Jun 5, 2025
241437c
feat: analytics umbrella
foodaka Jun 5, 2025
81c5adc
feat: more events
foodaka Jun 5, 2025
e5703cf
fix: undo use hook
foodaka Jun 5, 2025
e78f6b8
feat: events umbrella
foodaka Jun 5, 2025
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
174 changes: 152 additions & 22 deletions pages/safety-module.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { GhoStakingPanel } from 'src/modules/staking/GhoStakingPanel';
import { StakingHeader } from 'src/modules/staking/StakingHeader';
import { StakingPanel } from 'src/modules/staking/StakingPanel';
import { useRootStore } from 'src/store/root';
import { SAFETY_MODULE } from 'src/utils/events';
import { ENABLE_TESTNET, STAGING_ENV } from 'src/utils/marketsAndNetworksConfig';

import { useWeb3Context } from '../src/libs/hooks/useWeb3Context';
Expand Down Expand Up @@ -104,7 +105,7 @@ export default function Staking() {

useEffect(() => {
trackEvent('Page Viewed', {
'Page Name': 'Staking',
'Page Name': 'Safety Module',
});
}, [trackEvent]);

Expand Down Expand Up @@ -189,13 +190,48 @@ export default function Staking() {
icon="aave"
stakeData={stkAave}
stakeUserData={stkAaveUserData}
onStakeAction={() => openStake(Stake.aave, 'AAVE')}
onCooldownAction={() => openStakeCooldown(Stake.aave, 'AAVE')}
onUnstakeAction={() => openUnstake(Stake.aave, 'AAVE')}
onStakeRewardClaimAction={() => openStakeRewardsClaim(Stake.aave, 'AAVE')}
onStakeRewardClaimRestakeAction={() =>
openStakeRewardsRestakeClaim(Stake.aave, 'AAVE')
}
onStakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_STAKE_MODAL,
asset: 'AAVE',
stakeType: 'Safety Module',
});
openStake(Stake.aave, 'AAVE');
}}
onCooldownAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_COOLDOWN_MODAL,
asset: 'AAVE',
stakeType: 'Safety Module',
});
openStakeCooldown(Stake.aave, 'AAVE');
}}
onUnstakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_WITHDRAW_MODAL,
asset: 'AAVE',
stakeType: 'Safety Module',
});
openUnstake(Stake.aave, 'AAVE');
}}
onStakeRewardClaimAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_CLAIM_MODAL,
asset: 'AAVE',
stakeType: 'Safety Module',
rewardType: 'Claim',
});
openStakeRewardsClaim(Stake.aave, 'AAVE');
}}
onStakeRewardClaimRestakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_CLAIM_MODAL,
asset: 'AAVE',
stakeType: 'Safety Module',
rewardType: 'Restake',
});
openStakeRewardsRestakeClaim(Stake.aave, 'AAVE');
}}
>
<Box
sx={{
Expand Down Expand Up @@ -233,10 +269,39 @@ export default function Staking() {
maxSlash={stkGho?.maxSlashablePercentageFormatted || '0'}
stakeData={stkGho}
stakeUserData={stkGhoUserData}
onStakeAction={() => openSavingsGhoDeposit()}
onCooldownAction={() => openSavingsGhoWithdraw()}
onUnstakeAction={() => openSavingsGhoWithdraw()}
onStakeRewardClaimAction={() => openStakeRewardsClaim(Stake.gho, 'AAVE')}
onStakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_STAKE_MODAL,
asset: 'GHO',
stakeType: 'Safety Module',
});
openSavingsGhoDeposit();
}}
onCooldownAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_WITHDRAW_MODAL,
asset: 'GHO',
stakeType: 'Safety Module',
});
openSavingsGhoWithdraw();
}}
onUnstakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_WITHDRAW_MODAL,
asset: 'GHO',
stakeType: 'Safety Module',
});
openSavingsGhoWithdraw();
}}
onStakeRewardClaimAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_CLAIM_MODAL,
asset: 'GHO',
stakeType: 'Safety Module',
rewardType: 'Claim',
});
openStakeRewardsClaim(Stake.gho, 'AAVE');
}}
/>
</Grid>

Expand All @@ -253,10 +318,39 @@ export default function Staking() {
icon="stkbptv2"
stakeData={stkBptV2}
stakeUserData={stkBptV2UserData}
onStakeAction={() => openStake(Stake.bptv2, 'stkbptv2')}
onCooldownAction={() => openStakeCooldown(Stake.bptv2, 'stkbptv2')}
onUnstakeAction={() => openUnstake(Stake.bptv2, 'stkbptv2')}
onStakeRewardClaimAction={() => openStakeRewardsClaim(Stake.bptv2, 'AAVE')}
onStakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_STAKE_MODAL,
asset: 'ABPTV2',
stakeType: 'Safety Module',
});
openStake(Stake.bptv2, 'stkbptv2');
}}
onCooldownAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_COOLDOWN_MODAL,
asset: 'ABPTV2',
stakeType: 'Safety Module',
});
openStakeCooldown(Stake.bptv2, 'stkbptv2');
}}
onUnstakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_WITHDRAW_MODAL,
asset: 'ABPTV2',
stakeType: 'Safety Module',
});
openUnstake(Stake.bptv2, 'stkbptv2');
}}
onStakeRewardClaimAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_CLAIM_MODAL,
asset: 'ABPTV2',
stakeType: 'Safety Module',
rewardType: 'Claim',
});
openStakeRewardsClaim(Stake.bptv2, 'AAVE');
}}
headerAction={<GetABPToken />}
/>
</Grid>
Expand All @@ -275,11 +369,47 @@ export default function Staking() {
icon="stkbpt"
stakeData={stkBpt}
stakeUserData={stkBptUserData}
onStakeAction={() => openStake(Stake.bpt, 'stkBPT')}
onCooldownAction={() => openStakeCooldown(Stake.bpt, 'stkbpt')}
onUnstakeAction={() => openUnstake(Stake.bpt, 'stkBPT')}
onStakeRewardClaimAction={() => openStakeRewardsClaim(Stake.bpt, 'AAVE')}
onMigrateAction={() => openStakingMigrate()}
onStakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_STAKE_MODAL,
asset: 'ABPT',
stakeType: 'Safety Module',
});
openStake(Stake.bpt, 'stkBPT');
}}
onCooldownAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_COOLDOWN_MODAL,
asset: 'ABPT',
stakeType: 'Safety Module',
});
openStakeCooldown(Stake.bpt, 'stkbpt');
}}
onUnstakeAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_WITHDRAW_MODAL,
asset: 'ABPT',
stakeType: 'Safety Module',
});
openUnstake(Stake.bpt, 'stkBPT');
}}
onStakeRewardClaimAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: SAFETY_MODULE.OPEN_CLAIM_MODAL,
asset: 'ABPT',
stakeType: 'Safety Module',
rewardType: 'Claim',
});
openStakeRewardsClaim(Stake.bpt, 'AAVE');
}}
onMigrateAction={() => {
trackEvent(SAFETY_MODULE.STAKE_SAFETY_MODULE, {
action: 'Open Migration Modal',
asset: 'ABPT',
stakeType: 'Safety Module',
});
openStakingMigrate();
}}
headerAction={
stkBpt?.inPostSlashingPeriod ? (
<Stack direction="row" alignItems="center" gap={3}>
Expand Down Expand Up @@ -337,7 +467,7 @@ export default function Staking() {
<ConnectWalletPaperStaking
description={
<Trans>
We couldn’t detect a wallet. Connect a wallet to stake and view your balance.
We couldn&apos;t detect a wallet. Connect a wallet to stake and view your balance.
</Trans>
}
/>
Expand Down
9 changes: 9 additions & 0 deletions pages/staking.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import dynamic from 'next/dynamic';
import { useEffect } from 'react';
import { ContentContainer } from 'src/components/ContentContainer';
import { MainLayout } from 'src/layouts/MainLayout';
import { UmbrellaAssetsListContainer } from 'src/modules/umbrella/StakeAssets/UmbrellaAssetsListContainer';
import { UmrellaAssetsDefaultListContainer } from 'src/modules/umbrella/UmbrellaAssetsDefault';
import { UmbrellaHeader } from 'src/modules/umbrella/UmbrellaHeader';
import { useRootStore } from 'src/store/root';

import { useWeb3Context } from '../src/libs/hooks/useWeb3Context';

Expand Down Expand Up @@ -32,6 +34,13 @@ const UmbrellaClaimModal = dynamic(() =>

export default function UmbrellaStaking() {
const { currentAccount } = useWeb3Context();
const trackEvent = useRootStore((store) => store.trackEvent);

useEffect(() => {
trackEvent('Page Viewed', {
'Page Name': 'Staking',
});
}, [trackEvent]);

return (
<>
Expand Down
103 changes: 50 additions & 53 deletions src/components/TransactionEventHandler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,59 @@
// import { useEffect, useState } from 'react';
// import { useRootStore } from 'src/store/root';
// import { selectSuccessfulTransactions } from 'src/store/transactionsSelectors';
// import { getNetworkConfig } from 'src/utils/marketsAndNetworksConfig';
// import { GENERAL } from 'src/utils/mixPanelEvents';
// import { useShallow } from 'zustand/shallow';
import { useEffect, useRef } from 'react';
import { useRootStore } from 'src/store/root';
import { GENERAL } from 'src/utils/events';
import { getNetworkConfig } from 'src/utils/marketsAndNetworksConfig';

export const TransactionEventHandler = () => {
// const [postedTransactions, setPostedTransactions] = useState<{ [chainId: string]: string[] }>({});
const postedTransactionsRef = useRef<{ [chainId: string]: string[] }>({});

// const trackEvent = useRootStore((store) => store.trackEvent);
// const successfulTransactions = useRootStore(useShallow(selectSuccessfulTransactions));
const trackEvent = useRootStore((store) => store.trackEvent);
const transactions = useRootStore((store) => store.transactions);

//tx's currently tracked: supply, borrow, withdraw, repay, repay with coll, collateral switch

// useEffect(() => {
// Object.keys(successfulTransactions).forEach((chainId) => {
// const chainIdNumber = +chainId;
// const networkConfig = getNetworkConfig(chainIdNumber);
// Object.keys(successfulTransactions[chainIdNumber]).forEach((txHash) => {
// if (!postedTransactions[chainIdNumber]?.includes(txHash)) {
// const tx = successfulTransactions[chainIdNumber][txHash];
// // const event = actionToEvent(tx.action);
// trackEvent(GENERAL.TRANSACTION, {
// transactionType: tx.action,
// tokenAmount: tx.amount,
// assetName: tx.assetName,
// asset: tx.asset,
// market: tx.market === null ? undefined : tx.market,
// txHash: txHash,
// proposalId: tx.proposalId,
// support: tx.support,
// previousState: tx.previousState,
// newState: tx.newState,
// outAsset: tx.outAsset,
// outAmount: tx.outAmount,
// outAssetName: tx.outAssetName,
// amountUsd: tx.amountUsd,
// outAmountUsd: tx.outAmountUsd,
// chainId: chainIdNumber,
// chainName: networkConfig.displayName || networkConfig.name,
// });

// // update local state
// if (postedTransactions[chainIdNumber]) {
// setPostedTransactions((prev) => ({
// ...prev,
// [chainIdNumber]: [...prev[chainIdNumber], txHash],
// }));
// } else {
// setPostedTransactions((prev) => ({
// ...prev,
// [+chainId]: [txHash],
// }));
// }
// }
// });
// });
// }, [trackEvent, postedTransactions, successfulTransactions]);
useEffect(() => {
Object.keys(transactions).forEach((chainId) => {
const chainIdNumber = +chainId;
const networkConfig = getNetworkConfig(chainIdNumber);

Object.keys(transactions[chainIdNumber] || {}).forEach((txHash) => {
const tx = transactions[chainIdNumber][txHash];

// Only process successful transactions that haven't been posted yet
if (
tx.txState === 'success' &&
!postedTransactionsRef.current[chainIdNumber]?.includes(txHash)
) {
trackEvent(GENERAL.TRANSACTION, {
transactionType: tx.action,
tokenAmount: tx.amount,
assetName: tx.assetName,
asset: tx.asset,
market: tx.market === null ? undefined : tx.market,
txHash: txHash,
proposalId: tx.proposalId,
support: tx.support,
previousState: tx.previousState,
newState: tx.newState,
outAsset: tx.outAsset,
outAmount: tx.outAmount,
outAssetName: tx.outAssetName,
amountUsd: tx.amountUsd,
outAmountUsd: tx.outAmountUsd,
chainId: chainIdNumber,
chainName: networkConfig.displayName || networkConfig.name,
});

// update ref
if (postedTransactionsRef.current[chainIdNumber]) {
postedTransactionsRef.current[chainIdNumber].push(txHash);
} else {
postedTransactionsRef.current[chainIdNumber] = [txHash];
}
}
});
});
}, [trackEvent, transactions]);

return null;
};
4 changes: 2 additions & 2 deletions src/components/transactions/Stake/StakeModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useModalContext } from 'src/hooks/useModal';
import { useWeb3Context } from 'src/libs/hooks/useWeb3Context';
import { useRootStore } from 'src/store/root';
import { stakeAssetNameFormatted, stakeConfig } from 'src/ui-config/stakeConfig';
import { STAKE } from 'src/utils/events';
import { SAFETY_MODULE } from 'src/utils/events';
import { getNetworkConfig } from 'src/utils/marketsAndNetworksConfig';

import { CooldownWarning } from '../../Warnings/CooldownWarning';
Expand Down Expand Up @@ -150,7 +150,7 @@ export const StakeModalContent = ({ stakeAssetName, icon }: StakeProps) => {
symbol={nameFormatted}
blocked={blockingError !== undefined}
selectedToken={stakeAssetName}
event={STAKE.STAKE_TOKEN}
event={SAFETY_MODULE.STAKE_SAFETY_MODULE}
/>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion src/locales/el/messages.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/locales/en/messages.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading