+ {t('codefiCompliance')}
+ {complianceActivated && (
+ 
](assets/confirmation.png)
diff --git a/package.json b/package.json
index e76f1c517b2b..ec932113371b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "metamask-crx",
- "version": "10.26.2",
+ "version": "10.27.0",
"private": true,
"repository": {
"type": "git",
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index a9691d5a29a2..de3244c42af2 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -462,17 +462,19 @@ export const CONTEXT_PROPS = {
};
/**
- * These types correspond to the keys in the METAMETRIC_KEY_OPTIONS object
+ * These types correspond to the keys in the METAMETRIC_KEY_OPT object
*/
export const METAMETRIC_KEY = {
UI_CUSTOMIZATIONS: `ui_customizations`,
};
/**
- * This object maps a method name to a METAMETRIC_KEY
+ * This object maps a METAMETRIC_KEY to an object of possible options
*/
-export const METAMETRIC_KEY_OPTIONS = {
+export const METAMETRIC_KEY_OPT = {
[METAMETRIC_KEY.UI_CUSTOMIZATIONS]: {
+ flaggedAsMalicious: 'flagged_as_malicious',
+ flaggedAsSafetyUnknown: 'flagged_as_safety_unknown',
SIWE: 'sign_in_with_ethereum',
},
};
diff --git a/test/e2e/snaps/test-snap-bip-32.spec.js b/test/e2e/snaps/test-snap-bip-32.spec.js
index 2a5174498b1d..2babba866499 100644
--- a/test/e2e/snaps/test-snap-bip-32.spec.js
+++ b/test/e2e/snaps/test-snap-bip-32.spec.js
@@ -63,7 +63,10 @@ describe('Test Snap bip-32', function () {
// wait for permissions popover, click checkboxes and confirm
await driver.delay(1000);
await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
- await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+ await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-1');
+ await driver.clickElement(
+ '#public-key-access-bip32-m-44h-0h-secp256k1-0',
+ );
await driver.clickElement({
text: 'Confirm',
tag: 'button',
diff --git a/test/e2e/snaps/test-snap-rpc.spec.js b/test/e2e/snaps/test-snap-rpc.spec.js
index 0f512c6fedc1..3c596ba08a98 100644
--- a/test/e2e/snaps/test-snap-rpc.spec.js
+++ b/test/e2e/snaps/test-snap-rpc.spec.js
@@ -64,7 +64,10 @@ describe('Test Snap RPC', function () {
// wait for permissions popover, click checkboxes and confirm
await driver.delay(1000);
await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
- await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+ await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-1');
+ await driver.clickElement(
+ '#public-key-access-bip32-m-44h-0h-secp256k1-0',
+ );
await driver.clickElement({
text: 'Confirm',
tag: 'button',
diff --git a/test/e2e/snaps/test-snap-update.spec.js b/test/e2e/snaps/test-snap-update.spec.js
index 523356bac7a5..eaf0b847c8f5 100644
--- a/test/e2e/snaps/test-snap-update.spec.js
+++ b/test/e2e/snaps/test-snap-update.spec.js
@@ -64,7 +64,10 @@ describe('Test Snap update', function () {
// wait for permissions popover, click checkboxes and confirm
await driver.delay(1000);
await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
- await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+ await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-1');
+ await driver.clickElement(
+ '#public-key-access-bip32-m-44h-0h-secp256k1-0',
+ );
await driver.clickElement({
text: 'Confirm',
tag: 'button',
diff --git a/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js b/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
index 641dc6e70ff8..10f032424c86 100644
--- a/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
+++ b/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
@@ -20,7 +20,11 @@ const ConnectedAccountsPermissions = ({ permissions }) => {
const permissionLabels = flatten(
permissions.map(({ key, value }) =>
- getPermissionDescription(t, key, value),
+ getPermissionDescription({
+ t,
+ permissionName: key,
+ permissionValue: value,
+ }),
),
);
diff --git a/ui/components/app/flask/snap-install-warning/index.scss b/ui/components/app/flask/snap-install-warning/index.scss
index bc7d078bdb89..ddbf9c8d4a5b 100644
--- a/ui/components/app/flask/snap-install-warning/index.scss
+++ b/ui/components/app/flask/snap-install-warning/index.scss
@@ -1,4 +1,8 @@
.snap-install-warning {
+ .popover-header {
+ padding-bottom: 0;
+ }
+
.checkbox-label {
@include H7;
diff --git a/ui/components/app/flask/snap-install-warning/snap-install-warning.js b/ui/components/app/flask/snap-install-warning/snap-install-warning.js
index 70cedf0d2245..15c593c74a9c 100644
--- a/ui/components/app/flask/snap-install-warning/snap-install-warning.js
+++ b/ui/components/app/flask/snap-install-warning/snap-install-warning.js
@@ -6,12 +6,17 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
import CheckBox from '../../../ui/check-box/check-box.component';
import {
+ BackgroundColor,
+ IconColor,
TextVariant,
TEXT_ALIGN,
+ Size,
+ JustifyContent,
} from '../../../../helpers/constants/design-system';
import Popover from '../../../ui/popover';
import Button from '../../../ui/button';
-import { Text } from '../../../component-library';
+import { AvatarIcon, ICON_NAMES, Text } from '../../../component-library';
+import Box from '../../../ui/box/box';
/**
* a very simple reducer using produce from Immer to keep checkboxes state manipulation
@@ -45,13 +50,6 @@ export default function SnapInstallWarning({ onCancel, onSubmit, warnings }) {
const SnapInstallWarningFooter = () => {
return (
+ DeFi raises AML/CFT risk for institutions, given the decentralised pools and pseudonymous counterparties. +
++ Codefi Compliance is the only product capable of running AML/CFT analysis on DeFi pools. This allows you to identify and avoid pools and counterparties that fail your risk setting. +
++ Steps to enable AML/CFT Compliance: +
+
+ {t('codefiCompliance')}
+ {complianceActivated && (
+