optimise metrics settings

MetaMask · Feb 20, 2024 · 502a9ff · 502a9ff
1 parent af34152
commit 502a9ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/app/components/Views/Settings/SecuritySettings/Sections/DeleteMetaMetricsData.tsx b/app/components/Views/Settings/SecuritySettings/Sections/DeleteMetaMetricsData.tsx
@@ -87,6 +87,8 @@ const DeleteMetaMetricsData = (props: DeleteMetaMetricsDataProps) => {
     setDataTrackedSinceLastDeletion,
   } = useDataDeletion();
 
+  const dataDeletionAvailable = isDataDeletionAvailable();
+
   const checkInitialStatus = useCallback(async () => {
     const {
       deletionRequestDate,
@@ -167,7 +169,7 @@ const DeleteMetaMetricsData = (props: DeleteMetaMetricsDataProps) => {
       sectionTitle={strings('app_settings.delete_metrics_title')}
       sectionButtonText={strings('app_settings.delete_metrics_button')}
       descriptionText={
-        isDataDeletionAvailable() ? (
+        dataDeletionAvailable ? (
           <>
             <Text variant={TextVariant.BodyMD} color={TextColor.Alternative}>
               {strings('app_settings.delete_metrics_description_part_one')}
@@ -208,7 +210,7 @@ const DeleteMetaMetricsData = (props: DeleteMetaMetricsDataProps) => {
           </>
         )
       }
-      buttonDisabled={!isDataDeletionAvailable()}
+      buttonDisabled={!dataDeletionAvailable}
       modalTitleText={strings(
         'app_settings.delete_metrics_confirm_modal_title',
       )}

diff --git a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
@@ -231,16 +231,18 @@ const Settings: React.FC = () => {
     setHintText(manualBackup);
   }, []);
 
-  const checkAnalyticsEnabled = useCallback(() => {
-    trackEvent(MetaMetricsEvents.VIEW_SECURITY_SETTINGS, {});
-    setAnalyticsEnabled(isEnabled());
-  }, [trackEvent, isEnabled]);
-
   useEffect(() => {
     updateNavBar();
     handleHintText();
-    checkAnalyticsEnabled();
-  }, [handleHintText, updateNavBar, checkAnalyticsEnabled]);
+    setAnalyticsEnabled(isEnabled());
+    trackEvent(MetaMetricsEvents.VIEW_SECURITY_SETTINGS, {});
+  }, [
+    handleHintText,
+    updateNavBar,
+    setAnalyticsEnabled,
+    isEnabled,
+    trackEvent,
+  ]);
 
   const scrollToDetectNFTs = useCallback(() => {
     if (detectNftComponentRef.current) {

diff --git a/app/core/Analytics/MetaMetrics.ts b/app/core/Analytics/MetaMetrics.ts
@@ -528,9 +528,7 @@ class MetaMetrics implements IMetaMetrics {
    *
    * @returns Boolean indicating if MetaMetrics is enabled or disabled
    */
-  isEnabled() {
-    return this.enabled;
-  }
+  isEnabled = () => this.enabled;
 
   /**
    * Add traits to the user and identify them
@@ -686,7 +684,7 @@ class MetaMetrics implements IMetaMetrics {
    *
    * @returns true if events have been recorded since the last deletion request
    */
-  isDataRecorded = (): boolean => this.dataRecorded;
+  isDataRecorded = () => this.dataRecorded;
 
   /**
    * Get the current MetaMetrics ID