Merge branch 'main' into chore/change_profile_sync_ownership

MetaMask · Dec 4, 2024 · a98eb8a · a98eb8a
2 parents cc0fb07 + fc8e51e
commit a98eb8a
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 18 deletions.
diff --git a/...m/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx b/...m/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.test.tsx
@@ -41,6 +41,23 @@ const decodingDataListing: DecodingDataStateChanges = [
   },
 ];
 
+const decodingDataListingERC1155: DecodingDataStateChanges = [
+  {
+    assetType: 'NATIVE',
+    changeType: DecodingDataChangeType.Receive,
+    address: '',
+    amount: '900000000000000000',
+    contractAddress: '',
+  },
+  {
+    assetType: 'ERC1155',
+    changeType: DecodingDataChangeType.Listing,
+    address: '',
+    amount: '',
+    contractAddress: '0xafd4896984CA60d2feF66136e57f958dCe9482d5',
+    tokenID: '2233',
+  },
+];
 const decodingDataBidding: DecodingDataStateChanges = [
   {
     assetType: 'ERC721',
@@ -78,6 +95,44 @@ describe('DecodedSimulation', () => {
     expect(await findByText('1,461,501,637,3...')).toBeInTheDocument();
   });
 
+  it('render correctly for ERC712 token', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: false,
+      decodingData: { stateChanges: decodingDataListing },
+    });
+    const mockStore = configureMockStore([])(state);
+
+    const { findByText } = renderWithConfirmContextProvider(
+      <PermitSimulation />,
+      mockStore,
+    );
+
+    expect(await findByText('Estimated changes')).toBeInTheDocument();
+    expect(await findByText('You receive')).toBeInTheDocument();
+    expect(await findByText('You list')).toBeInTheDocument();
+    expect(await findByText('#2101')).toBeInTheDocument();
+  });
+
+  it('render correctly for ERC1155 token', async () => {
+    const state = getMockTypedSignConfirmStateForRequest({
+      ...permitSignatureMsg,
+      decodingLoading: false,
+      decodingData: { stateChanges: decodingDataListingERC1155 },
+    });
+    const mockStore = configureMockStore([])(state);
+
+    const { findByText } = renderWithConfirmContextProvider(
+      <PermitSimulation />,
+      mockStore,
+    );
+
+    expect(await findByText('Estimated changes')).toBeInTheDocument();
+    expect(await findByText('You receive')).toBeInTheDocument();
+    expect(await findByText('You list')).toBeInTheDocument();
+    expect(await findByText('#2233')).toBeInTheDocument();
+  });
+
   it('renders unavailable message if no state change is returned', async () => {
     const state = getMockTypedSignConfirmStateForRequest(permitSignatureMsg);
     const mockStore = configureMockStore([])(state);

diff --git a/...onfirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx b/...onfirm/info/typed-sign/typed-sign-v4-simulation/decoded-simulation/decoded-simulation.tsx
@@ -75,7 +75,8 @@ const StateChangeRow = ({
       tooltip={tooltip}
     >
       {(assetType === TokenStandard.ERC20 ||
-        assetType === TokenStandard.ERC721) && (
+        assetType === TokenStandard.ERC721 ||
+        assetType === TokenStandard.ERC1155) && (
         <TokenValueDisplay
           tokenContract={contractAddress}
           value={amount}

diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -17,7 +17,6 @@ import {
   setDataCollectionForMarketing,
 } from '../../../store/actions';
 import {
-  getParticipateInMetaMetrics,
   getDataCollectionForMarketing,
   getFirstTimeFlowType,
   getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn,
@@ -53,7 +52,6 @@ export default function OnboardingMetametrics() {
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
 
   const dataCollectionForMarketing = useSelector(getDataCollectionForMarketing);
-  const participateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
 
   const trackEvent = useContext(MetaMetricsContext);
 
@@ -82,22 +80,20 @@ export default function OnboardingMetametrics() {
         },
       );
 
-      if (participateInMetaMetrics) {
-        trackEvent({
-          category: MetaMetricsEventCategory.Onboarding,
-          event: MetaMetricsEventName.AppInstalled,
-        });
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.AppInstalled,
+      });
 
-        trackEvent({
-          category: MetaMetricsEventCategory.Onboarding,
-          event: MetaMetricsEventName.AnalyticsPreferenceSelected,
-          properties: {
-            is_metrics_opted_in: true,
-            has_marketing_consent: Boolean(dataCollectionForMarketing),
-            location: 'onboarding_metametrics',
-          },
-        });
-      }
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        properties: {
+          is_metrics_opted_in: true,
+          has_marketing_consent: Boolean(dataCollectionForMarketing),
+          location: 'onboarding_metametrics',
+        },
+      });
     } finally {
       history.push(nextRoute);
     }