fix type instead of desconstruct deviceMetadata

MetaMask · Feb 23, 2024 · 829882a · 829882a
1 parent c14f660
commit 829882a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/app/components/Views/RestoreWallet/RestoreWallet.tsx b/app/components/Views/RestoreWallet/RestoreWallet.tsx
@@ -64,9 +64,10 @@ const RestoreWallet = () => {
 
   const handleOnNext = useCallback(async (): Promise<void> => {
     setLoading(true);
+
     trackEvent(
       MetaMetricsEvents.VAULT_CORRUPTION_RESTORE_WALLET_BUTTON_PRESSED,
-      { ...deviceMetaData },
+      deviceMetaData,
     );
     const restoreResult = await EngineService.initializeVaultFromBackup();
     if (restoreResult.success) {

diff --git a/app/components/Views/RestoreWallet/WalletResetNeeded.tsx b/app/components/Views/RestoreWallet/WalletResetNeeded.tsx
@@ -37,14 +37,14 @@ const WalletResetNeeded = () => {
   useEffect(() => {
     trackEvent(
       MetaMetricsEvents.VAULT_CORRUPTION_WALLET_RESET_NEEDED_SCREEN_VIEWED,
-      { ...deviceMetaData },
+      deviceMetaData,
     );
   }, [trackEvent, deviceMetaData]);
 
   const handleCreateNewWallet = useCallback(async () => {
     trackEvent(
       MetaMetricsEvents.VAULT_CORRUPTION_WALLET_RESET_NEEDED_CREATE_NEW_WALLET_BUTTON_PRESSED,
-      { ...deviceMetaData },
+      deviceMetaData,
     );
     navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
       screen: Routes.MODAL.DELETE_WALLET,
@@ -54,7 +54,7 @@ const WalletResetNeeded = () => {
   const handleTryAgain = useCallback(async () => {
     trackEvent(
       MetaMetricsEvents.VAULT_CORRUPTION_WALLET_RESET_NEEDED_TRY_AGAIN_BUTTON_PRESSED,
-      { ...deviceMetaData },
+      deviceMetaData,
     );
     navigation.replace(
       ...createRestoreWalletNavDetails({

diff --git a/app/components/Views/RestoreWallet/WalletRestored.tsx b/app/components/Views/RestoreWallet/WalletRestored.tsx
@@ -45,7 +45,7 @@ const WalletRestored = () => {
   useEffect(() => {
     trackEvent(
       MetaMetricsEvents.VAULT_CORRUPTION_WALLET_SUCCESSFULLY_RESTORED_SCREEN_VIEWED,
-      { ...deviceMetaData },
+      deviceMetaData,
     );
   }, [deviceMetaData, trackEvent]);
 
@@ -72,7 +72,7 @@ const WalletRestored = () => {
     setLoading(true);
     trackEvent(
       MetaMetricsEvents.VAULT_CORRUPTION_WALLET_SUCCESSFULLY_RESTORED_CONTINUE_BUTTON_PRESSED,
-      { ...deviceMetaData },
+      deviceMetaData,
     );
     await finishWalletRestore();
   }, [deviceMetaData, finishWalletRestore, trackEvent]);

diff --git a/app/util/metrics/DeviceAnalyticsMetaData/DeviceAnalyticsMetaData.types.ts b/app/util/metrics/DeviceAnalyticsMetaData/DeviceAnalyticsMetaData.types.ts
@@ -1,4 +1,7 @@
-export interface DeviceMetaData {
+interface AnalyticsProperties {
+  [key: string]: string;
+}
+export interface DeviceMetaData extends AnalyticsProperties {
   platform: string;
   currentBuildNumber: string;
   applicationVersion: string;