Merge branch 'develop' into fix/popover-overlay

MetaMask · Feb 22, 2024 · 901c8c5 · 901c8c5
2 parents 60d401b + 4d2c1ff
commit 901c8c5
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 11 deletions.
diff --git a/development/ts-migration-dashboard/app/styles/custom-elements.scss b/development/ts-migration-dashboard/app/styles/custom-elements.scss
@@ -1,3 +1,7 @@
+/*
+Disabling Stylelint's hex color rule here because the TypeScript migration dashboard, being external to the main app, doesn't use design tokens.
+*/
+/* stylelint-disable color-no-hex */
 :root {
   --blue-gray-350: hsl(209deg 13.7% 62.4%);
   --blue-gray-100: hsl(209.8deg 16.5% 89%);

diff --git a/development/ts-migration-dashboard/app/styles/tippy.scss b/development/ts-migration-dashboard/app/styles/tippy.scss
@@ -1,3 +1,7 @@
+/*
+Disabling Stylelint's hex color rule here because the TypeScript migration dashboard, being external to the main app, doesn't use design tokens.
+*/
+/* stylelint-disable color-no-hex */
 .tippy-touch {
   cursor: pointer !important;
 }

diff --git a/test/e2e/tests/ppom-blockaid-alert-erc20-approval.spec.js b/test/e2e/tests/ppom-blockaid-alert-erc20-approval.spec.js
@@ -210,7 +210,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Malicious ERC20 Approval @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/test/e2e/tests/ppom-blockaid-alert-erc20-transfer.spec.js b/test/e2e/tests/ppom-blockaid-alert-erc20-transfer.spec.js
@@ -161,7 +161,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Malicious ERC20 Transfer @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/test/e2e/tests/ppom-blockaid-alert-networks-support.spec.js b/test/e2e/tests/ppom-blockaid-alert-networks-support.spec.js
@@ -47,7 +47,8 @@ async function mockInfuraWithMaliciousResponses(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Multiple Networks Support @no-mmi', function () {
-  it('should show banner alert after switchinig to another supported network', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert after switchinig to another supported network', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/test/e2e/tests/ppom-blockaid-alert-simple-send.spec.js b/test/e2e/tests/ppom-blockaid-alert-simple-send.spec.js
@@ -126,7 +126,8 @@ async function mockInfuraWithFailedResponses(mockServer) {
  * @see {@link https://wobbly-nutmeg-8a5.notion.site/MM-E2E-Testing-1e51b617f79240a49cd3271565c6e12d}
  */
 describe('Simple Send Security Alert - Blockaid @no-mmi', function () {
-  it('should not show security alerts for benign requests', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should not show security alerts for benign requests', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -158,7 +159,8 @@ describe('Simple Send Security Alert - Blockaid @no-mmi', function () {
    * 'malicious_domain'. Some other tests are found in other files:
    * e.g. test/e2e/flask/ppom-blockaid-alert-<name>.spec.js
    */
-  it('should show security alerts for malicious requests', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show security alerts for malicious requests', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -201,7 +203,8 @@ describe('Simple Send Security Alert - Blockaid @no-mmi', function () {
     );
   });
 
-  it('should show "Request may not be safe" if the PPOM request fails to check transaction', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show "Request may not be safe" if the PPOM request fails to check transaction', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/test/e2e/tests/ppom-blockaid-alert-trade-order-farming.spec.js b/test/e2e/tests/ppom-blockaid-alert-trade-order-farming.spec.js
@@ -90,7 +90,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Set Trade farming order @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/test/e2e/tests/ppom-blockaid-setApprovalForAll-farming.spec.js b/test/e2e/tests/ppom-blockaid-setApprovalForAll-farming.spec.js
@@ -248,7 +248,8 @@ async function mockInfura(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Set Approval to All @no-mmi', function () {
-  it('should show banner alert', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show banner alert', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/test/e2e/tests/ppom-blockaid-toggle-metrics.spec.js b/test/e2e/tests/ppom-blockaid-toggle-metrics.spec.js
@@ -52,7 +52,8 @@ async function mockServerCalls(mockServer) {
 }
 
 describe('PPOM Blockaid Alert - Metrics @no-mmi', function () {
-  it('Successfully track button toggle on/off', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('Successfully track button toggle on/off', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/test/e2e/tests/ppom-toggle-settings.spec.js b/test/e2e/tests/ppom-toggle-settings.spec.js
@@ -9,7 +9,8 @@ const {
 const FixtureBuilder = require('../fixture-builder');
 
 describe('PPOM Settings @no-mmi', function () {
-  it('should not show the PPOM warning when toggle is off', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should not show the PPOM warning when toggle is off', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -47,7 +48,8 @@ describe('PPOM Settings @no-mmi', function () {
     );
   });
 
-  it('should show the PPOM warning when the toggle is on', async function () {
+  // eslint-disable-next-line mocha/no-skipped-tests
+  it.skip('should show the PPOM warning when the toggle is on', async function () {
     await withFixtures(
       {
         dapp: true,

diff --git a/ui/css/design-system/pending-colors.scss b/ui/css/design-system/pending-colors.scss
@@ -1,6 +1,9 @@
 /**
   These colors are pending to be approved for the design system's design-token package
+  Disabling Stylelint's hex color rule so this file is ignored.
+  Before adding a color here make sure that there isn't a design token available.
 **/
+/* stylelint-disable color-no-hex */
 
 /**
  * Dark Theme Colors

diff --git a/ui/css/utilities/colors.scss b/ui/css/utilities/colors.scss
@@ -1,3 +1,8 @@
+/*
+Disabling Stylelint's hex color rule so this file is ignored.
+Before adding a color here make sure that there isn't a design token available.
+*/
+/* stylelint-disable color-no-hex */
 :root {
   // Accents
   // Everything below this line is part of the new color system