clean up

MetaMask · Jul 25, 2024 · 552754a · 552754a
1 parent 9a93288
commit 552754a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/ui/components/app/alert-system/alert-modal/alert-modal.tsx b/ui/components/app/alert-system/alert-modal/alert-modal.tsx
@@ -267,21 +267,21 @@ function ActionButton({
   action?: { key: string; label: string };
   onClose: (request: { recursive?: boolean } | void) => void;
   metrics: {
-    trackAlertsMetrics: ({
+    trackAlertMetrics: ({
       alertKey,
       action,
     }: UseAlertSystemMetricsProps) => void;
     alertKey: string;
   };
 }) {
   const { processAction } = useAlertActionHandler();
-  const { trackAlertsMetrics, alertKey } = metrics;
+  const { trackAlertMetrics, alertKey } = metrics;
 
   const handleClick = useCallback(() => {
     if (!action) {
       return;
     }
-    trackAlertsMetrics({
+    trackAlertMetrics({
       alertKey,
       action: AlertsActionMetrics.AlertActionClicked,
     });
@@ -322,7 +322,7 @@ export function AlertModal({
   enableProvider = true,
 }: AlertModalProps) {
   const { isAlertConfirmed, setAlertConfirmed, alerts } = useAlerts(ownerId);
-  const { trackAlertsMetrics } = useAlertSystemMetrics();
+  const { trackAlertMetrics } = useAlertSystemMetrics();
 
   const handleClose = useCallback(
     (...args) => {
@@ -344,7 +344,7 @@ export function AlertModal({
   }, [isConfirmed, selectedAlert.key]);
 
   useEffect(() => {
-    trackAlertsMetrics({
+    trackAlertMetrics({
       alertKey,
       action: AlertsActionMetrics.AlertVisualized,
     });
@@ -407,7 +407,7 @@ export function AlertModal({
                       action={action}
                       onClose={handleClose}
                       metrics={{
-                        trackAlertsMetrics,
+                        trackAlertMetrics,
                         alertKey: selectedAlert.key,
                       }}
                     />

diff --git a/ui/components/app/alert-system/useAlertSystemMetrics.ts b/ui/components/app/alert-system/useAlertSystemMetrics.ts
@@ -37,7 +37,7 @@ export function useUpdateAlertMetrics() {
   const { alerts, isAlertConfirmed } = useAlerts(ownerId);
   const { updateTransactionEventFragment } = useTransactionEventFragment();
 
-  const trackAlertMetrics = useCallback(() => {
+  const updateAlertMetrics = useCallback(() => {
     const isValidType = REDESIGN_TRANSACTION_TYPES.includes(
       currentConfirmation?.type as TransactionType,
     );
@@ -51,10 +51,10 @@ export function useUpdateAlertMetrics() {
     );
 
     const properties = {
-      alert_triggered_count: alerts.length,
       alert_triggered: getAlertsName(alerts),
-      alert_resolved_count: confirmedAlerts.length,
+      alert_triggered_count: alerts.length,
       alert_resolved: getAlertsName(confirmedAlerts),
+      alert_resolved_count: confirmedAlerts.length,
     };
 
     updateTransactionEventFragment({ properties }, ownerId);
@@ -66,7 +66,7 @@ export function useUpdateAlertMetrics() {
     updateTransactionEventFragment,
   ]);
 
-  return trackAlertMetrics;
+  return { updateAlertMetrics };
 }
 
 export function useAlertSystemMetrics() {
@@ -88,12 +88,12 @@ export function useAlertSystemMetrics() {
   useEffect(() => {
     if (isValidType && alerts.length > 0) {
       const properties = {
-        alert_triggered_count: alerts.length,
         alert_triggered: getAlertsName(alerts),
-        alert_resolved_count: confirmedAlerts.length,
+        alert_triggered_count: alerts.length,
         alert_resolved: getAlertsName(confirmedAlerts),
-        alert_visualized_count: alertVisualized.length,
+        alert_resolved_count: confirmedAlerts.length,
         alert_visualized: alertVisualized,
+        alert_visualized_count: alertVisualized.length,
         alert_key_clicked: alertKeyClicked,
         alert_action_clicked: alertActionClicked,
       };
@@ -109,14 +109,8 @@ export function useAlertSystemMetrics() {
     alertVisualized,
   ]);
 
-  const trackAlertsMetrics = useCallback(
-    ({
-      alertKey,
-      action,
-    }: {
-      alertKey: string;
-      action: AlertsActionMetrics;
-    }) => {
+  const trackAlertMetrics = useCallback(
+    ({ alertKey, action }: UseAlertSystemMetricsProps) => {
       if (!alertKey || !action || !isValidType) {
         return;
       }
@@ -140,7 +134,7 @@ export function useAlertSystemMetrics() {
   );
 
   return {
-    trackAlertsMetrics,
+    trackAlertMetrics,
   };
 }
 

diff --git a/ui/components/app/confirm/info/row/alert-row/alert-row.tsx b/ui/components/app/confirm/info/row/alert-row/alert-row.tsx
@@ -46,7 +46,7 @@ export const ConfirmInfoAlertRow = ({
   variant,
   ...rowProperties
 }: ConfirmInfoAlertRowProps) => {
-  const { trackAlertsMetrics } = useAlertSystemMetrics();
+  const { trackAlertMetrics } = useAlertSystemMetrics();
   const { getFieldAlerts } = useAlerts(ownerId);
   const fieldAlerts = getFieldAlerts(alertKey);
   const hasFieldAlert = fieldAlerts.length > 0;
@@ -61,7 +61,7 @@ export const ConfirmInfoAlertRow = ({
 
   const handleInlineAlertClick = () => {
     setAlertModalVisible(true);
-    trackAlertsMetrics({
+    trackAlertMetrics({
       alertKey: selectedAlertKey,
       action: AlertsActionMetrics.InlineAlertClicked,
     });

diff --git a/ui/pages/confirmations/components/confirm/footer/footer.tsx b/ui/pages/confirmations/components/confirm/footer/footer.tsx
@@ -94,7 +94,7 @@ const ConfirmButton = ({
 };
 
 const Footer = () => {
-  const trackAlertMetrics = useUpdateAlertMetrics();
+  const { updateAlertMetrics } = useUpdateAlertMetrics();
   const dispatch = useDispatch();
   const t = useI18nContext();
   const confirm = useSelector(confirmSelector);
@@ -103,8 +103,6 @@ const Footer = () => {
   const { currentConfirmation, isScrollToBottomNeeded } = confirm;
   const { from } = getConfirmationSender(currentConfirmation);
 
-  trackAlertMetrics();
-
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const { mmiOnSignCallback, mmiSubmitDisabled } = useMMIConfirmations();
   ///: END:ONLY_INCLUDE_IF
@@ -120,6 +118,7 @@ const Footer = () => {
     if (!currentConfirmation) {
       return;
     }
+    updateAlertMetrics();
 
     dispatch(
       rejectPendingApproval(
@@ -133,7 +132,7 @@ const Footer = () => {
     if (!currentConfirmation) {
       return;
     }
-    trackAlertMetrics();
+    updateAlertMetrics();
 
     const isTransactionConfirmation = REDESIGN_TRANSACTION_TYPES.find(
       (type) => type === currentConfirmation?.type,

diff --git a/ui/pages/confirmations/hooks/setConfirmationAlerts.ts b/ui/pages/confirmations/hooks/setConfirmationAlerts.ts
@@ -6,13 +6,16 @@ import {
   updateAlerts,
 } from '../../../ducks/confirm-alerts/confirm-alerts';
 import { currentConfirmationSelector } from '../../../selectors';
+import { useUpdateAlertMetrics } from '../../../components/app/alert-system/useAlertSystemMetrics';
 import useConfirmationAlerts from './useConfirmationAlerts';
 
 const setConfirmationAlerts = () => {
   const dispatch = useDispatch();
   const currentConfirmation = useSelector(currentConfirmationSelector);
   const alerts = useConfirmationAlerts();
   const ownerId = currentConfirmation?.id as string;
+  const { updateAlertMetrics } = useUpdateAlertMetrics();
+  updateAlertMetrics();
 
   useEffect(() => {
     dispatch(updateAlerts(ownerId, alerts));