diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index b194112a5..17a25f726 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1365,6 +1365,10 @@ "ethGasPriceFetchWarning": { "message": "Backup gas price is provided as the main gas estimation service is unavailable right now." }, + "ethereumProviderAccess": { + "message": "Grant Ethereum provider access to $1", + "description": "The parameter is the name of the requesting origin" + }, "ethereumPublicAddress": { "message": "Ethereum public address" }, @@ -3572,7 +3576,11 @@ "message": "Proceed with caution" }, "snapInstallWarningKeyAccess": { - "message": "Grant $2 key access to $1", + "message": "Grant $2 account control to $1", + "description": "The first parameter is the name of the snap and the second one is the protocol" + }, + "snapInstallWarningPublicKeyAccess": { + "message": "Grant $2 public key access to $1", "description": "The first parameter is the name of the snap and the second one is the protocol" }, "snapResultError": { diff --git a/test/e2e/snaps/test-snap-bip-32.spec.js b/test/e2e/snaps/test-snap-bip-32.spec.js index 2a5174498..2babba866 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 0f512c6fe..3c596ba08 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 523356bac..eaf0b847c 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 641dc6e70..10f032424 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 bc7d078bd..ddbf9c8d4 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 70cedf0d2..15c593c74 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 (
-