Merge branch 'move-and-register-page-refactor' of github.com:Outblock…

…/FRW-Extension into move-and-register-page-refactor # Conflicts: # src/ui/FRWComponent/LandingPages/AllSet.tsx # src/ui/views/LandingPages/Welcome/Register/SetPassword.tsx
Outblock · Dec 17, 2024 · ddfa4d2 · ddfa4d2
2 parents b28ef8a + ac1a718
commit ddfa4d2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/src/ui/FRWComponent/LandingPages/AllSet.tsx b/src/ui/FRWComponent/LandingPages/AllSet.tsx
@@ -4,31 +4,21 @@ import React, { useCallback, useEffect } from 'react';
 
 import { storage } from 'background/webapi';
 import AllSetIcon from 'ui/FRWAssets/svg/allset.svg';
-import { useWallet, mixpanelBrowserService } from 'ui/utils';
+import { useWallet } from 'ui/utils';
 
 interface AllSetProps {
   handleClick: () => void;
   variant?: 'register' | 'recover' | 'sync' | 'add';
 }
 
 const AllSet = ({ handleClick, variant = 'register' }: AllSetProps) => {
-  const wallet = useWallet();
+  const usewallet = useWallet();
 
   const loadScript = useCallback(async () => {
     if (variant === 'register') {
-      await wallet.getCadenceScripts();
+      await usewallet.getCadenceScripts();
     }
-  }, [wallet, variant]);
-
-  const trackAccountRecovered = useCallback(async () => {
-    if (variant === 'register') {
-      mixpanelBrowserService.track('account_recovered', {
-        address: (await wallet.getMainAddress()) || '',
-        mechanism: 'multi-backup',
-        methods: [],
-      });
-    }
-  }, [wallet, variant]);
+  }, [usewallet, variant]);
 
   useEffect(() => {
     const removeTempPass = () => {
@@ -39,12 +29,12 @@ const AllSet = ({ handleClick, variant = 'register' }: AllSetProps) => {
 
     if (variant === 'register') {
       loadScript().then(() => {
-        trackAccountRecovered();
+        usewallet.trackAccountRecovered();
       });
     } else if (variant === 'add') {
       removeTempPass();
     }
-  }, [variant, loadScript, trackAccountRecovered]);
+  }, [variant, loadScript, usewallet]);
 
   const getMessage = () => {
     if (variant === 'recover') {

diff --git a/src/ui/views/LandingPages/Welcome/Register/SetPassword.tsx b/src/ui/views/LandingPages/Welcome/Register/SetPassword.tsx
@@ -13,7 +13,7 @@ import {
 } from '@/ui/FRWComponent/LandingPages/SetPassword';
 import SlideRelative from '@/ui/FRWComponent/SlideRelative';
 import { type AccountKey } from 'background/service/networkModel';
-import { useWallet, saveIndex, mixpanelBrowserService } from 'ui/utils';
+import { useWallet, saveIndex } from 'ui/utils';
 
 import CheckCircleIcon from '../../../../../components/iconfont/IconCheckmark';
 import CancelIcon from '../../../../../components/iconfont/IconClose';
@@ -126,8 +126,6 @@ const SetPassword = ({ handleClick, mnemonic, username, setExPassword, tempPassw
 
     await saveIndex(username);
     const accountKey = getAccountKey(mnemonic);
-    // track the time until account_created is called
-    mixpanelBrowserService.time('account_created');
     wallet.openapi
       .register(accountKey, username)
       .then((response) => {

diff --git a/src/ui/views/LandingPages/Welcome/Sync/SyncQr.tsx b/src/ui/views/LandingPages/Welcome/Sync/SyncQr.tsx
@@ -276,7 +276,8 @@ const SyncQr = ({
     };
 
     createWeb3Wallet();
-  }, [_subscribeToEvents, currentNetwork, onSessionConnected, sendRequest]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   return (
     <>