diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 27b347e28..6034f233c 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -359,9 +359,6 @@ "message": "Erlauben Sie den Zugriff auf und die Übertragung von all Ihren $1?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Genehmigen und installieren" - }, "approveButtonText": { "message": "Genehmigen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 2bcb79798..3dc176724 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -359,9 +359,6 @@ "message": "Δίνετε άδεια για να αποκτήσετε πρόσβαση σε όλα σας τα $1;", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Έγκριση και Εγκατάσταση" - }, "approveButtonText": { "message": "Έγκριση" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 1647b6d2a..b60a9c606 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -398,9 +398,6 @@ "message": "Allow access to and transfer all of your NFTs from $1?", "description": "$1 a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name" }, - "approveAndInstall": { - "message": "Approve & install" - }, "approveButtonText": { "message": "Approve" }, @@ -3784,8 +3781,11 @@ "description": "$1 is the dApp origin requesting the snap and $2 is the snap name" }, "snapInstallRequestsPermission": { - "message": "$1 wants to install $2, which is requesting the following permissions. Make sure you trust the authors before you proceed.", - "description": "$1 is the dApp origin requesting the snap and $2 is the snap name" + "message": "Installing $1 gives it the following permissions. Only continue if you trust $1.", + "description": "$1 is the snap name." + }, + "snapInstallSuccess": { + "message": "Installation complete" }, "snapInstallWarningCheck": { "message": "Ensure that the permission below aligns with your intended actions. Only proceed with authors you trust." @@ -3804,6 +3804,14 @@ "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" }, + "snapInstallationErrorDescription": { + "message": "$1 couldn’t be installed.", + "description": "Error description used when snap installation fails. $1 is the snap name." + }, + "snapInstallationErrorTitle": { + "message": "Installation failed", + "description": "Error title used when snap installation fails." + }, "snapResultError": { "message": "Error" }, @@ -3811,15 +3819,26 @@ "message": "Success" }, "snapResultSuccessDescription": { - "message": "$1 is now available to use." + "message": "$1 is ready to use" }, "snapUpdate": { "message": "Update snap" }, + "snapUpdateErrorDescription": { + "message": "$1 couldn’t be updated.", + "description": "Error description used when snap update fails. $1 is the snap name." + }, + "snapUpdateErrorTitle": { + "message": "Update failed", + "description": "Error title used when snap update fails." + }, "snapUpdateRequest": { "message": "$1 wants to update $2 to $3 which gives it the following permissions. Only continue if you trust $2.", "description": "$1 is the dApp origin requesting the snap, $2 is the snap name and $3 is the snap version." }, + "snapUpdateSuccess": { + "message": "Update complete" + }, "snaps": { "message": "Snaps" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 5fe3898ae..dc987c1b1 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -359,9 +359,6 @@ "message": "¿Dar permiso para acceder a todo su $1?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Aprobar e instalar" - }, "approveButtonText": { "message": "Aprobar" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index aff1b2a2d..c0a0bb25d 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -359,9 +359,6 @@ "message": "Voulez-vous lui accorder l’autorisation d’accéder et de transférer tous vos $1 ?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Approuver et installer" - }, "approveButtonText": { "message": "Approuver" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index ddfc2b327..b755fbe8a 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -359,9 +359,6 @@ "message": "आपके सभी $1 को एक्सेस और ट्रांसफर करने के लिए अनुमति दें", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "स्वीकृत और इंस्टॉल करें" - }, "approveButtonText": { "message": "अनुमोदित करें" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 77e6d4d40..b4d8b9460 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -359,9 +359,6 @@ "message": "Berikan izin untuk mengakses dan mentransfer seluruh $1 Anda?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Setujui & instal" - }, "approveButtonText": { "message": "Setujui" }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 4bede07dd..553c6418f 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -290,9 +290,6 @@ "message": "Consenti l'accesso e il trasferimento di tutti i tuoi $1?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Approva & installa" - }, "approveButtonText": { "message": "Approva" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 938d0e20d..805a81bef 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -359,9 +359,6 @@ "message": "すべての $1 へのアクセスとその送金を許可しますか？", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "承認してインストール" - }, "approveButtonText": { "message": "承認" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 03cbe4282..13476df6b 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -359,9 +359,6 @@ "message": "내 모든 $1에 액세스 및 전송할 수 있는 권한을 부여할까요?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "승인 및 설치" - }, "approveButtonText": { "message": "승인" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 2396adc61..53e9e339a 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -359,9 +359,6 @@ "message": "Permitir acesso a todos os seus $1?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Aprovar e instalar" - }, "approveButtonText": { "message": "Aprovar" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index f02aa5c9a..f72e4137c 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -359,9 +359,6 @@ "message": "Разрешить доступ ко всем вашим $1?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Одобрить и установить" - }, "approveButtonText": { "message": "Одобрить" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index af6822cb6..056196ee4 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -359,9 +359,6 @@ "message": "Payagan ang pag-access at paglipat ng lahat ng iyong $1?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Aprubahan at I-install" - }, "approveButtonText": { "message": "Aprubahan" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 3cde2ba49..072e39649 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -359,9 +359,6 @@ "message": "Sahip olduğun tüm $1 için erişim ve transfer izni verilsin mi?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Onayla ve Yükle" - }, "approveButtonText": { "message": "Onayla" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 9be08a18c..f50298ce6 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -359,9 +359,6 @@ "message": "Cấp quyền truy cập vào và chuyển tất cả $1 của bạn?", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "Chấp nhận và cài đặt" - }, "approveButtonText": { "message": "Phê duyệt" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 89f2e6bbe..e7468ca3b 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -359,9 +359,6 @@ "message": "是否允许访问您的所有$1？", "description": "$1 is the symbol of the token for which the user is granting approval" }, - "approveAndInstall": { - "message": "批准并安装" - }, "approveButtonText": { "message": "批准" }, diff --git a/test/e2e/snaps/test-snap-bip-32.spec.js b/test/e2e/snaps/test-snap-bip-32.spec.js index b477fade4..22528373d 100644 --- a/test/e2e/snaps/test-snap-bip-32.spec.js +++ b/test/e2e/snaps/test-snap-bip-32.spec.js @@ -52,10 +52,10 @@ describe('Test Snap bip-32', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); @@ -71,9 +71,9 @@ describe('Test Snap bip-32', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js index cbee5ff15..5df417861 100644 --- a/test/e2e/snaps/test-snap-bip-44.spec.js +++ b/test/e2e/snaps/test-snap-bip-44.spec.js @@ -52,9 +52,9 @@ describe('Test Snap bip-44', function () { text: 'Connect', tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); @@ -65,9 +65,9 @@ describe('Test Snap bip-44', function () { text: 'Confirm', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-cronjob.spec.js b/test/e2e/snaps/test-snap-cronjob.spec.js index 78a15490a..e4e6e93fe 100644 --- a/test/e2e/snaps/test-snap-cronjob.spec.js +++ b/test/e2e/snaps/test-snap-cronjob.spec.js @@ -52,17 +52,17 @@ describe('Test Snap Cronjob', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-dialog.spec.js b/test/e2e/snaps/test-snap-dialog.spec.js index f2b51321b..0edb3b85b 100644 --- a/test/e2e/snaps/test-snap-dialog.spec.js +++ b/test/e2e/snaps/test-snap-dialog.spec.js @@ -52,17 +52,17 @@ describe('Test Snap Dialog', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-error.spec.js b/test/e2e/snaps/test-snap-error.spec.js index 3e116c6e3..c8e17efdc 100644 --- a/test/e2e/snaps/test-snap-error.spec.js +++ b/test/e2e/snaps/test-snap-error.spec.js @@ -53,17 +53,17 @@ describe('Test Snap Error', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-ethprovider.spec.js b/test/e2e/snaps/test-snap-ethprovider.spec.js index bd18fede1..694c25aef 100644 --- a/test/e2e/snaps/test-snap-ethprovider.spec.js +++ b/test/e2e/snaps/test-snap-ethprovider.spec.js @@ -51,17 +51,17 @@ describe('Test Snap ethereum_provider', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-getentropy.spec.js b/test/e2e/snaps/test-snap-getentropy.spec.js index c29da48d1..8b5586d24 100644 --- a/test/e2e/snaps/test-snap-getentropy.spec.js +++ b/test/e2e/snaps/test-snap-getentropy.spec.js @@ -51,17 +51,17 @@ describe('Test Snap getEntropy', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-installed.spec.js b/test/e2e/snaps/test-snap-installed.spec.js index d14852a52..71614a6f0 100644 --- a/test/e2e/snaps/test-snap-installed.spec.js +++ b/test/e2e/snaps/test-snap-installed.spec.js @@ -51,17 +51,17 @@ describe('Test Snap Installed', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); @@ -90,17 +90,17 @@ describe('Test Snap Installed', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-management.spec.js b/test/e2e/snaps/test-snap-management.spec.js index 23878cfe7..df520d30a 100644 --- a/test/e2e/snaps/test-snap-management.spec.js +++ b/test/e2e/snaps/test-snap-management.spec.js @@ -54,17 +54,17 @@ describe('Test Snap Management', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js index 7e209d01a..5bcc9bcbb 100644 --- a/test/e2e/snaps/test-snap-managestate.spec.js +++ b/test/e2e/snaps/test-snap-managestate.spec.js @@ -55,17 +55,17 @@ describe('Test Snap manageState', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-networkaccess.spec.js b/test/e2e/snaps/test-snap-networkaccess.spec.js index 8ea925712..6cb1b743b 100644 --- a/test/e2e/snaps/test-snap-networkaccess.spec.js +++ b/test/e2e/snaps/test-snap-networkaccess.spec.js @@ -54,17 +54,17 @@ describe('Test Snap networkAccess', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js index 959dcbf85..d53fe06b9 100644 --- a/test/e2e/snaps/test-snap-notification.spec.js +++ b/test/e2e/snaps/test-snap-notification.spec.js @@ -55,17 +55,17 @@ describe('Test Snap Notification', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-rpc.spec.js b/test/e2e/snaps/test-snap-rpc.spec.js index 3505a6c85..d329ce24c 100644 --- a/test/e2e/snaps/test-snap-rpc.spec.js +++ b/test/e2e/snaps/test-snap-rpc.spec.js @@ -53,10 +53,10 @@ describe('Test Snap RPC', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); @@ -72,10 +72,10 @@ describe('Test Snap RPC', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); @@ -98,17 +98,17 @@ describe('Test Snap RPC', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-txinsights.spec.js b/test/e2e/snaps/test-snap-txinsights.spec.js index 138e42897..cb8bfc3b1 100644 --- a/test/e2e/snaps/test-snap-txinsights.spec.js +++ b/test/e2e/snaps/test-snap-txinsights.spec.js @@ -53,17 +53,17 @@ describe('Test Snap TxInsights', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-update.spec.js b/test/e2e/snaps/test-snap-update.spec.js index 0ee11e724..5898957ce 100644 --- a/test/e2e/snaps/test-snap-update.spec.js +++ b/test/e2e/snaps/test-snap-update.spec.js @@ -53,10 +53,10 @@ describe('Test Snap update', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); @@ -72,10 +72,10 @@ describe('Test Snap update', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); @@ -110,10 +110,10 @@ describe('Test Snap update', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/test/e2e/snaps/test-snap-wasm.spec.js b/test/e2e/snaps/test-snap-wasm.spec.js index 55326ac32..1af49492f 100644 --- a/test/e2e/snaps/test-snap-wasm.spec.js +++ b/test/e2e/snaps/test-snap-wasm.spec.js @@ -52,17 +52,17 @@ describe('Test Snap WASM', function () { tag: 'button', }); - await driver.waitForSelector({ text: 'Approve & install' }); + await driver.waitForSelector({ text: 'Install' }); await driver.clickElement({ - text: 'Approve & install', + text: 'Install', tag: 'button', }); - await driver.waitForSelector({ text: 'Ok' }); + await driver.waitForSelector({ text: 'OK' }); await driver.clickElement({ - text: 'Ok', + text: 'OK', tag: 'button', }); diff --git a/ui/components/app/permission-cell/permission-cell.js b/ui/components/app/permission-cell/permission-cell.js index cb9a10d8d..e325e3000 100644 --- a/ui/components/app/permission-cell/permission-cell.js +++ b/ui/components/app/permission-cell/permission-cell.js @@ -95,9 +95,8 @@ const PermissionCell = ({ {title} {!revoked && diff --git a/ui/components/app/snaps/install-error/install-error.js b/ui/components/app/snaps/install-error/install-error.js index 39ecddf65..02b051ea7 100644 --- a/ui/components/app/snaps/install-error/install-error.js +++ b/ui/components/app/snaps/install-error/install-error.js @@ -3,16 +3,19 @@ import PropTypes from 'prop-types'; import Box from '../../../ui/box/box'; import { AlignItems, + BackgroundColor, BLOCK_SIZES, FLEX_DIRECTION, FONT_WEIGHT, + IconColor, JustifyContent, + TextAlign, TextVariant, } from '../../../../helpers/constants/design-system'; import ActionableMessage from '../../../ui/actionable-message/actionable-message'; -import { Text } from '../../../component-library'; +import { AvatarIcon, IconSize, Text } from '../../../component-library'; -const InstallError = ({ title, error }) => { +const InstallError = ({ title, error, description, iconName }) => { return ( { height={BLOCK_SIZES.FULL} padding={2} > + {iconName && ( + + )} {title} + {description && {description}} @@ -34,6 +50,8 @@ const InstallError = ({ title, error }) => { InstallError.propTypes = { title: PropTypes.node.isRequired, error: PropTypes.string.isRequired, + description: PropTypes.string, + iconName: PropTypes.string, }; export default InstallError; diff --git a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js index 290ab8e10..d5103e58e 100644 --- a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js +++ b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js @@ -4,11 +4,11 @@ import { isComponent } from '@metamask/snaps-ui'; import { useSelector } from 'react-redux'; import MetaMaskTemplateRenderer from '../../metamask-template-renderer/metamask-template-renderer'; import { - TypographyVariant, - FONT_WEIGHT, DISPLAY, FLEX_DIRECTION, - OVERFLOW_WRAP, + TypographyVariant, + OverflowWrap, + FontWeight, TextVariant, } from '../../../../helpers/constants/design-system'; import { SnapDelineator } from '../snap-delineator'; @@ -37,9 +37,9 @@ export const UI_MAPPING = { element: 'Typography', children: props.value, props: { - variant: TypographyVariant.H3, - fontWeight: FONT_WEIGHT.BOLD, - overflowWrap: OVERFLOW_WRAP.BREAK_WORD, + variant: TypographyVariant.H4, + fontWeight: FontWeight.Bold, + overflowWrap: OverflowWrap.BreakWord, }, }), text: (props) => ({ diff --git a/ui/pages/permissions-connect/snaps/snap-install/index.scss b/ui/pages/permissions-connect/snaps/snap-install/index.scss index b33f2d5fc..59fff9fd0 100644 --- a/ui/pages/permissions-connect/snaps/snap-install/index.scss +++ b/ui/pages/permissions-connect/snaps/snap-install/index.scss @@ -7,10 +7,6 @@ &__loader-container { height: 100%; } - - &__permission-description { - border-bottom: 1px solid var(--color-border-default); - } } .page-container__footer { diff --git a/ui/pages/permissions-connect/snaps/snap-install/snap-install.js b/ui/pages/permissions-connect/snaps/snap-install/snap-install.js index d0b7c44c2..417243fc4 100644 --- a/ui/pages/permissions-connect/snaps/snap-install/snap-install.js +++ b/ui/pages/permissions-connect/snaps/snap-install/snap-install.js @@ -12,12 +12,13 @@ import { JustifyContent, TextVariant, TEXT_ALIGN, + FontWeight, } from '../../../../helpers/constants/design-system'; import { getSnapInstallWarnings } from '../util'; import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader'; import InstallError from '../../../../components/app/snaps/install-error/install-error'; import SnapAuthorship from '../../../../components/app/snaps/snap-authorship'; -import { Text } from '../../../../components/component-library'; +import { Text, ValidTag } from '../../../../components/component-library'; import { useOriginMetadata } from '../../../../hooks/useOriginMetadata'; import { getSnapName } from '../../../../helpers/utils/util'; import SnapPermissionsList from '../../../../components/app/snaps/snap-permissions-list'; @@ -125,8 +126,14 @@ export default function SnapInstall({ textAlign={TEXT_ALIGN.CENTER} > {t('snapInstallRequestsPermission', [ - {originMetadata?.hostname}, - {snapName}, + + {snapName} + , ])} diff --git a/ui/pages/permissions-connect/snaps/snap-result/snap-result.js b/ui/pages/permissions-connect/snaps/snap-result/snap-result.js index 5b9ce0325..825da1f1e 100644 --- a/ui/pages/permissions-connect/snaps/snap-result/snap-result.js +++ b/ui/pages/permissions-connect/snaps/snap-result/snap-result.js @@ -12,9 +12,18 @@ import { FONT_WEIGHT, JustifyContent, TextVariant, - TEXT_ALIGN, + BackgroundColor, + IconColor, + TextAlign, + FontWeight, } from '../../../../helpers/constants/design-system'; -import { Text } from '../../../../components/component-library'; +import { + AvatarIcon, + IconName, + IconSize, + Text, + ValidTag, +} from '../../../../components/component-library'; import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader'; import InstallError from '../../../../components/app/snaps/install-error/install-error'; import SnapAuthorship from '../../../../components/app/snaps/snap-authorship'; @@ -34,11 +43,95 @@ export default function SnapResult({ ); const hasError = !requestState.loading && requestState.error; - const isLoading = requestState.loading; - const snapName = getSnapName(targetSubjectMetadata.origin); + function getSuccessScreen(requestType, snapNameToRender) { + let successScreenTitle; + switch (requestType) { + case 'wallet_installSnap': + successScreenTitle = t('snapInstallSuccess'); + break; + case 'wallet_updateSnap': + successScreenTitle = t('snapUpdateSuccess'); + break; + default: + successScreenTitle = t('snapResultSuccess'); + } + + return ( + + + + {successScreenTitle} + + + {t('snapResultSuccessDescription', [ + + {snapNameToRender} + , + ])} + + + ); + } + + function getFailedScreen(requestType, snapNameToRender) { + let failedScreenTitle; + let failedScreenDescription; + + switch (requestType) { + case 'wallet_installSnap': + failedScreenTitle = t('snapInstallationErrorTitle'); + failedScreenDescription = t('snapInstallationErrorDescription', [ + + {snapNameToRender} + , + ]); + break; + case 'wallet_updateSnap': + failedScreenTitle = t('snapUpdateErrorTitle'); + failedScreenDescription = t('snapUpdateErrorDescription', [ + + {snapNameToRender} + , + ]); + break; + default: + failedScreenTitle = t('snapResultError'); + } + + return ( + + ); + } + return ( )} - {!isLoading && !hasError && ( - - - {t('snapResultSuccess')} - - - {t('snapResultSuccessDescription', [{snapName}])} - - - )} - {hasError && ( - - )} + {!isLoading && + !hasError && + getSuccessScreen(requestState.type, snapName)} + {hasError && getFailedScreen(requestState.type, snapName)}