Merge branch 'develop' into picker-network-updates

.github/workflows/check-issue-template-and-add-labels.yml

@@ -0,0 +1,31 @@
+name: Check issue template and add labels
+
+on:
+  issues:
+    types:
+      - opened
+      - edited
+
+jobs:
+  add-regression-prod-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+            fetch-depth: 1 # This retrieves only the latest commit.
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn --immutable
+
+      - name: Check issue template and add labels
+        id: check-issue-template-and-add-labels
+        env:
+          LABEL_TOKEN: ${{ secrets.LABEL_TOKEN }}
+        run: npm run check-issue-template-and-add-labels

app/scripts/controllers/transactions/index.js

@@ -68,6 +68,7 @@ import {
   TRANSACTION_ENVELOPE_TYPE_NAMES,
 } from '../../../../shared/lib/transactions-controller-utils';
 import { Numeric } from '../../../../shared/modules/Numeric';
+import getSnapAndHardwareInfoForMetrics from '../../lib/snap-keyring/metrics';
 import TransactionStateManager from './tx-state-manager';
 import TxGasUtil from './tx-gas-utils';
 import PendingTransactionTracker from './pending-tx-tracker';
@@ -166,10 +167,12 @@ export default class TransactionController extends EventEmitter {
     this.updateEventFragment = opts.updateEventFragment;
     this.finalizeEventFragment = opts.finalizeEventFragment;
     this.getEventFragmentById = opts.getEventFragmentById;
-    this.getDeviceModel = opts.getDeviceModel;
-    this.getAccountType = opts.getAccountType;
     this.getTokenStandardAndDetails = opts.getTokenStandardAndDetails;
     this.securityProviderRequest = opts.securityProviderRequest;
+    this.getSelectedAddress = opts.getSelectedAddress;
+    this.getAccountType = opts.getAccountType;
+    this.getDeviceModel = opts.getDeviceModel;
+    this.snapAndHardwareMessenger = opts.snapAndHardwareMessenger;
     this.messagingSystem = opts.messenger;
     this._hasCompletedOnboarding = opts.hasCompletedOnboarding;
 
@@ -2496,8 +2499,6 @@ export default class TransactionController extends EventEmitter {
       eip_1559_version: eip1559Version,
       gas_edit_type: 'none',
       gas_edit_attempted: 'none',
-      account_type: await this.getAccountType(this.getSelectedAddress()),
-      device_model: await this.getDeviceModel(this.getSelectedAddress()),
       asset_type: assetType,
       token_standard: tokenStandard,
       transaction_type: transactionType,
@@ -2511,6 +2512,16 @@ export default class TransactionController extends EventEmitter {
       ///: END:ONLY_INCLUDE_IN
     };
 
+    const snapAndHardwareInfo = await getSnapAndHardwareInfoForMetrics(
+      this.getSelectedAddress,
+      this.getAccountType,
+      this.getDeviceModel,
+      this.snapAndHardwareMessenger,
+    );
+
+    // merge the snapAndHardwareInfo into the properties
+    Object.assign(properties, snapAndHardwareInfo);
+
     if (transactionContractMethod === contractMethodNames.APPROVE) {
       properties = {
         ...properties,

app/scripts/controllers/transactions/index.test.js

@@ -154,8 +154,6 @@ describe('Transaction Controller', function () {
       getEventFragmentById: () =>
         fragmentExists === false ? undefined : { id: 0 },
       getEIP1559GasFeeEstimates: () => undefined,
-      getAccountType: () => 'MetaMask',
-      getDeviceModel: () => 'N/A',
       securityProviderRequest: () => undefined,
       preferencesStore,
       messenger: messengerMock,
@@ -2180,10 +2178,8 @@ describe('Transaction Controller', function () {
             referrer: ORIGIN_METAMASK,
             source: MetaMetricsTransactionEventSource.User,
             transaction_type: TransactionType.simpleSend,
-            account_type: 'MetaMask',
             asset_type: AssetType.native,
             token_standard: TokenStandard.none,
-            device_model: 'N/A',
             transaction_speed_up: false,
             ui_customizations: null,
             security_alert_reason: BlockaidReason.notApplicable,
@@ -2269,10 +2265,8 @@ describe('Transaction Controller', function () {
             referrer: ORIGIN_METAMASK,
             source: MetaMetricsTransactionEventSource.User,
             transaction_type: TransactionType.simpleSend,
-            account_type: 'MetaMask',
             asset_type: AssetType.native,
             token_standard: TokenStandard.none,
-            device_model: 'N/A',
             transaction_speed_up: false,
             ui_customizations: null,
             security_alert_reason: BlockaidReason.notApplicable,
@@ -2370,10 +2364,8 @@ describe('Transaction Controller', function () {
             referrer: 'other',
             source: MetaMetricsTransactionEventSource.Dapp,
             transaction_type: TransactionType.simpleSend,
-            account_type: 'MetaMask',
             asset_type: AssetType.native,
             token_standard: TokenStandard.none,
-            device_model: 'N/A',
             transaction_speed_up: false,
             ui_customizations: null,
             security_alert_reason: BlockaidReason.notApplicable,
@@ -2461,10 +2453,8 @@ describe('Transaction Controller', function () {
             referrer: 'other',
             source: MetaMetricsTransactionEventSource.Dapp,
             transaction_type: TransactionType.simpleSend,
-            account_type: 'MetaMask',
             asset_type: AssetType.native,
             token_standard: TokenStandard.none,
-            device_model: 'N/A',
             transaction_speed_up: false,
             ui_customizations: null,
             security_alert_reason: BlockaidReason.notApplicable,
@@ -2558,10 +2548,8 @@ describe('Transaction Controller', function () {
           referrer: 'other',
           source: MetaMetricsTransactionEventSource.Dapp,
           transaction_type: TransactionType.simpleSend,
-          account_type: 'MetaMask',
           asset_type: AssetType.native,
           token_standard: TokenStandard.none,
-          device_model: 'N/A',
           transaction_speed_up: false,
           ui_customizations: null,
           security_alert_reason: BlockaidReason.notApplicable,
@@ -2632,10 +2620,8 @@ describe('Transaction Controller', function () {
           eip_1559_version: '0',
           gas_edit_attempted: 'none',
           gas_edit_type: 'none',
-          account_type: 'MetaMask',
           asset_type: AssetType.native,
           token_standard: TokenStandard.none,
-          device_model: 'N/A',
           transaction_speed_up: false,
           ui_customizations: null,
           security_alert_reason: BlockaidReason.notApplicable,
@@ -2710,10 +2696,8 @@ describe('Transaction Controller', function () {
           eip_1559_version: '0',
           gas_edit_attempted: 'none',
           gas_edit_type: 'none',
-          account_type: 'MetaMask',
           asset_type: AssetType.native,
           token_standard: TokenStandard.none,
-          device_model: 'N/A',
           transaction_speed_up: false,
           ui_customizations: ['security_alert_failed'],
           security_alert_reason: 'some error',
@@ -2785,10 +2769,8 @@ describe('Transaction Controller', function () {
           eip_1559_version: '0',
           gas_edit_attempted: 'none',
           gas_edit_type: 'none',
-          account_type: 'MetaMask',
           asset_type: AssetType.native,
           token_standard: TokenStandard.none,
-          device_model: 'N/A',
           transaction_speed_up: false,
           ui_customizations: ['flagged_as_malicious'],
           security_alert_reason: BlockaidReason.notApplicable,
@@ -2861,10 +2843,8 @@ describe('Transaction Controller', function () {
           eip_1559_version: '0',
           gas_edit_attempted: 'none',
           gas_edit_type: 'none',
-          account_type: 'MetaMask',
           asset_type: AssetType.native,
           token_standard: TokenStandard.none,
-          device_model: 'N/A',
           transaction_speed_up: false,
           ui_customizations: ['flagged_as_safety_unknown'],
           security_alert_reason: BlockaidReason.notApplicable,
@@ -2945,10 +2925,8 @@ describe('Transaction Controller', function () {
           referrer: 'other',
           source: MetaMetricsTransactionEventSource.Dapp,
           transaction_type: TransactionType.simpleSend,
-          account_type: 'MetaMask',
           asset_type: AssetType.native,
           token_standard: TokenStandard.none,
-          device_model: 'N/A',
           transaction_speed_up: false,
           ui_customizations: null,
           security_alert_reason: BlockaidReason.notApplicable,