Merge branch 'main' into fix/redeposits-not-shown

Author: juanmigdr

app/_locales/en/messages.json

@@ -790,6 +790,7 @@ describe('AppStateController', () => {
               "notificationGasPollTokens": [],
               "onboardingDate": null,
               "outdatedBrowserWarningLastShown": null,
+              "pendingShieldCohort": null,
               "popupGasPollTokens": [],
               "productTour": "accountIcon",
               "recoveryPhraseReminderHasBeenShown": false,
@@ -879,6 +880,7 @@ describe('AppStateController', () => {
               "notificationGasPollTokens": [],
               "onboardingDate": null,
               "outdatedBrowserWarningLastShown": null,
+              "pendingShieldCohort": null,
               "popupGasPollTokens": [],
               "productTour": "accountIcon",
               "recoveryPhraseReminderHasBeenShown": false,
@@ -1045,6 +1047,7 @@ describe('AppStateController', () => {
               "notificationGasPollTokens": [],
               "onboardingDate": null,
               "outdatedBrowserWarningLastShown": null,
+              "pendingShieldCohort": null,
               "popupGasPollTokens": [],
               "productTour": "accountIcon",
               "recoveryPhraseReminderHasBeenShown": false,

app/_locales/en_GB/messages.json

@@ -123,6 +123,7 @@ export type AppStateControllerState = {
   updateModalLastDismissedAt: number | null;
   hasShownMultichainAccountsIntroModal: boolean;
   showShieldEntryModalOnce: boolean | null;
+  pendingShieldCohort: string | null;
 
   /**
    * Whether the wallet reset is in progress.
@@ -275,6 +276,7 @@ const getDefaultAppStateControllerState = (): AppStateControllerState => ({
   updateModalLastDismissedAt: null,
   hasShownMultichainAccountsIntroModal: false,
   showShieldEntryModalOnce: null,
+  pendingShieldCohort: null,
   isWalletResetInProgress: false,
 
   ...getInitialStateOverrides(),
@@ -614,6 +616,12 @@ const controllerMetadata: StateMetadata<AppStateControllerState> = {
     includeInDebugSnapshot: true,
     usedInUi: true,
   },
+  pendingShieldCohort: {
+    includeInStateLogs: true,
+    persist: false,
+    includeInDebugSnapshot: true,
+    usedInUi: true,
+  },
   isWalletResetInProgress: {
     persist: true,
     includeInDebugSnapshot: true,
@@ -1528,6 +1536,12 @@ export class AppStateController extends BaseController<
     });
   }
 
+  setPendingShieldCohort(cohort: string | null): void {
+    this.update((state) => {
+      state.pendingShieldCohort = cohort;
+    });
+  }
+
   setCanTrackWalletFundsObtained(enabled: boolean): void {
     this.update((state) => {
       state.canTrackWalletFundsObtained = enabled;

app/images/riv_animations/shield_icon.riv

@@ -129,7 +129,7 @@ import {
   SecretType,
   RecoveryError,
 } from '@metamask/seedless-onboarding-controller';
-import { PRODUCT_TYPES } from '@metamask/subscription-controller';
+import { COHORT_NAMES, PRODUCT_TYPES } from '@metamask/subscription-controller';
 import { isSnapId } from '@metamask/snaps-utils';
 import {
   findAtomicBatchSupportForChain,
@@ -2529,6 +2529,9 @@ export default class MetamaskController extends EventEmitter {
         this.subscriptionController.getSubscriptionsEligibilities.bind(
           this.subscriptionController,
         ),
+      assignUserToCohort: this.subscriptionController.assignUserToCohort.bind(
+        this.subscriptionController,
+      ),
       getSubscriptions: this.subscriptionController.getSubscriptions.bind(
         this.subscriptionController,
       ),
@@ -2911,6 +2914,8 @@ export default class MetamaskController extends EventEmitter {
         ),
       setShowShieldEntryModalOnce:
         appStateController.setShowShieldEntryModalOnce.bind(appStateController),
+      setPendingShieldCohort:
+        appStateController.setPendingShieldCohort.bind(appStateController),
       setShieldPausedToastLastClickedOrClosed:
         appStateController.setShieldPausedToastLastClickedOrClosed.bind(
           appStateController,
@@ -8527,6 +8532,19 @@ export default class MetamaskController extends EventEmitter {
       transactionMeta,
       isSponsored,
     );
+
+    // Mark send/transfer/swap transactions for Shield post_tx cohort evaluation
+    const isPostTxTransaction = [
+      TransactionType.simpleSend,
+      TransactionType.tokenMethodTransfer,
+      TransactionType.swap,
+      TransactionType.swapAndSend,
+    ].includes(transactionMeta.type);
+
+    const { pendingShieldCohort } = this.appStateController.state;
+    if (isPostTxTransaction && !pendingShieldCohort) {
+      this.appStateController.setPendingShieldCohort(COHORT_NAMES.POST_TX);
+    }
   }
 
   /**

app/scripts/controllers/app-state-controller.test.ts

@@ -942,6 +942,9 @@ export enum MetaMetricsEventName {
   ExtensionPinned = 'Extension Pinned',
   // Extension Port Stream
   PortStreamChunked = 'Port Stream Chunked',
+  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
+  ViewportSwitched = 'Viewport Switched',
+  ///: END:ONLY_INCLUDE_IF
 }
 
 export enum MetaMetricsEventAccountType {

app/scripts/controllers/app-state-controller.ts

@@ -139,6 +139,7 @@ export type ControllerStatePropertiesEnumerated = {
   lastUpdatedAt: AppStateControllerState['lastUpdatedAt'];
   lastUpdatedFromVersion: AppStateControllerState['lastUpdatedFromVersion'];
   showShieldEntryModalOnce: AppStateControllerState['showShieldEntryModalOnce'];
+  pendingShieldCohort: AppStateControllerState['pendingShieldCohort'];
   throttledOrigins: AppStateControllerState['throttledOrigins'];
   enableEnforcedSimulations: AppStateControllerState['enableEnforcedSimulations'];
   enableEnforcedSimulationsForTransactions: AppStateControllerState['enableEnforcedSimulationsForTransactions'];

app/scripts/metamask-controller.js

@@ -123,6 +123,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
         snapsInstallPrivacyWarningShown: true,
         hasShownMultichainAccountsIntroModal: true,
         showShieldEntryModalOnce: false,
+        pendingShieldCohort: null,
         appActiveTab: {
           id: 1,
           title: 'E2E Test Dapp',

shared/constants/metametrics.ts

@@ -72,6 +72,7 @@
       "showNetworkBanner": true,
       "showPermissionsTour": true,
       "showShieldEntryModalOnce": null,
+      "pendingShieldCohort": null,
       "showTestnetMessageInDropdown": true,
       "slides": [],
       "surveyLinkLastClickedOrClosed": null,