From 9c63dfca89386c32424ac709d8a41a6799c8ac92 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Thu, 4 May 2023 23:51:46 +0530 Subject: [PATCH] Changes in blockaid texts (#19001) --- app/_locales/de/messages.json | 3 --- app/_locales/el/messages.json | 3 --- app/_locales/en/messages.json | 13 ++++++---- app/_locales/es/messages.json | 3 --- app/_locales/fr/messages.json | 3 --- app/_locales/hi/messages.json | 3 --- app/_locales/id/messages.json | 3 --- app/_locales/ja/messages.json | 3 --- app/_locales/ko/messages.json | 3 --- app/_locales/pt/messages.json | 3 --- app/_locales/ru/messages.json | 3 --- app/_locales/tl/messages.json | 3 --- app/_locales/tr/messages.json | 3 --- app/_locales/vi/messages.json | 3 --- app/_locales/zh_CN/messages.json | 3 --- test/e2e/tests/settings-search.spec.js | 2 +- ...m-page-container-content.component.test.js | 6 ++--- .../security-provider-banner-message.js | 26 +++++++++++++------ .../security-provider-banner-message.test.js | 2 +- .../signature-request-original.test.js | 6 ++--- .../signature-request.component.test.js | 6 ++--- .../experimental-tab.test.js.snap | 4 +-- 22 files changed, 36 insertions(+), 71 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 4c554e0c6..b8b8c19df 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Was Sie beachten sollten:" }, - "thisIsBasedOn": { - "message": "Dies basiert auf Informationen von " - }, "time": { "message": "Zeit" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index e31f46d2b..06ebced86 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Πράγματα που πρέπει να έχετε υπόψη σας:" }, - "thisIsBasedOn": { - "message": "Αυτό βασίζεται σε πληροφορίες από" - }, "time": { "message": "Ώρα" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index ab3ffae0c..1fae0fd7f 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -552,6 +552,9 @@ "message": "View account at $1", "description": "$1 replaced by URL for custom block explorer" }, + "blockaid": { + "message": "Blockaid" + }, "blockies": { "message": "Blockies" }, @@ -2863,7 +2866,7 @@ "message": "Open in block explorer" }, "openSea": { - "message": "OpenSea (Beta)" + "message": "OpenSea + Blockaid (Beta)" }, "openSeaNew": { "message": "OpenSea" @@ -3496,6 +3499,9 @@ "security": { "message": "Security" }, + "securityAlert": { + "message": "Security alert from $1 and $2" + }, "securityAndPrivacy": { "message": "Security & privacy" }, @@ -4429,9 +4435,6 @@ "thisCollection": { "message": "this collection" }, - "thisIsBasedOn": { - "message": "This is based on information from " - }, "thisServiceIsExperimental": { "message": "This service is experimental. By enabling this feature, you agree to OpenSea's $1.", "description": "$1 is link to open sea terms of use" @@ -4650,7 +4653,7 @@ "message": "Transaction resubmitted with estimated gas fee increased to $1 at $2" }, "transactionSecurityCheck": { - "message": "Enable transaction security providers" + "message": "Enable security alerts" }, "transactionSecurityCheckDescription": { "message": "We use third-party APIs to detect and display risks involved in unsigned transaction and signature requests before you sign them. These services will have access to your unsigned transaction and signature requests, your account address, and your preferred language." diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 34a984b51..67a3b012a 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Cosas a tener en cuenta:" }, - "thisIsBasedOn": { - "message": "Esto se basa en información de " - }, "time": { "message": "Tiempo" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index d0ea3e1fb..b543b2114 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Les choses que vous devez garder à l’esprit :" }, - "thisIsBasedOn": { - "message": "Ces informations proviennent de " - }, "time": { "message": "Temps" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index c845b2fa9..e9781a768 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "ध्यान रखने योग्य बातें" }, - "thisIsBasedOn": { - "message": "से प्राप्त जानकारी पर आधारित है" - }, "time": { "message": "समय" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 4895a2f11..97df69b6f 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Hal-hal yang perlu diingat:" }, - "thisIsBasedOn": { - "message": "Hal ini berdasarkan informasi dari " - }, "time": { "message": "Waktu" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 023a1a417..a3c0dd28e 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "留意点:" }, - "thisIsBasedOn": { - "message": "これは次の情報源からの情報に基づくものです: " - }, "time": { "message": "時間" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 11d60baaf..c4de64fc4 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "유의 사항:" }, - "thisIsBasedOn": { - "message": "다음에 기반한 정보입니다: " - }, "time": { "message": "시간" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 2f2352b27..d52ed995d 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Informações importantes:" }, - "thisIsBasedOn": { - "message": "Isso se baseia em informações de " - }, "time": { "message": "Hora" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index b1a5efb92..1b9a1a6e8 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Что нужно помнить:" }, - "thisIsBasedOn": { - "message": "Это основано на информации от " - }, "time": { "message": "Время" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index f5f608133..479683256 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Mga bagay na dapat tandaan:" }, - "thisIsBasedOn": { - "message": "Ito ay batay sa impormasyon mula sa " - }, "time": { "message": "Oras" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index d957149c2..1479da53f 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Unutulmaması gerekenler:" }, - "thisIsBasedOn": { - "message": "Bu, şu kaynaktan alınan bilgilere dayanır: " - }, "time": { "message": "Zaman" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 54687ced6..4bb67b89e 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "Những điều cần lưu ý:" }, - "thisIsBasedOn": { - "message": "Điều này dựa trên thông tin từ " - }, "time": { "message": "Thời gian" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 272f38acd..3bbbf0165 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -3920,9 +3920,6 @@ "thingsToKeep": { "message": "注意事项:" }, - "thisIsBasedOn": { - "message": "所根据的信息是来自" - }, "time": { "message": "时间" }, diff --git a/test/e2e/tests/settings-search.spec.js b/test/e2e/tests/settings-search.spec.js index d694a34bf..c4af0ccc2 100644 --- a/test/e2e/tests/settings-search.spec.js +++ b/test/e2e/tests/settings-search.spec.js @@ -19,7 +19,7 @@ describe('Settings Search', function () { security: 'Reveal Secret', alerts: 'Browsing a website', networks: 'Ethereum Mainnet', - experimental: 'Enable transaction security', + experimental: 'Enable security alerts', about: 'Terms of Use', }; diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js index 5d6e5dfdc..1814751fe 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js @@ -150,9 +150,7 @@ describe('Confirm Page Container Content', () => { 'Because of an error, this request was not verified by the security provider. Proceed with caution.', ), ).toBeInTheDocument(); - expect( - queryByText('This is based on information from'), - ).toBeInTheDocument(); + expect(queryByText('OpenSea')).toBeInTheDocument(); }); it('should not render SecurityProviderBannerMessage component when flagAsDangerous is not malicious', () => { @@ -171,7 +169,7 @@ describe('Confirm Page Container Content', () => { 'Because of an error, this request was not verified by the security provider. Proceed with caution.', ), ).toBeNull(); - expect(queryByText('This is based on information from')).toBeNull(); + expect(queryByText('OpenSea')).toBeNull(); }); it('should show insufficient funds error for EIP-1559 network', () => { diff --git a/ui/components/app/security-provider-banner-message/security-provider-banner-message.js b/ui/components/app/security-provider-banner-message/security-provider-banner-message.js index 2a4ff35ee..71c928edd 100644 --- a/ui/components/app/security-provider-banner-message/security-provider-banner-message.js +++ b/ui/components/app/security-provider-banner-message/security-provider-banner-message.js @@ -57,14 +57,24 @@ export default function SecurityProviderBannerMessage({ {messageText} - {t('thisIsBasedOn')} - - {t('openSeaNew')} - + {t('securityAlert', [ + + {t('openSeaNew')} + , + + {t('blockaid')} + , + ])} ); diff --git a/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js b/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js index ef5b59efd..4fd21f7e9 100644 --- a/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js +++ b/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js @@ -8,7 +8,7 @@ import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from './security-provider-banner describe('Security Provider Banner Message', () => { const store = configureMockStore()({}); - const thisIsBasedOnText = 'This is based on information from'; + const thisIsBasedOnText = 'OpenSea'; it('should render SecurityProviderBannerMessage component properly when flagAsDangerous is malicious', () => { const securityProviderResponse = { diff --git a/ui/components/app/signature-request-original/signature-request-original.test.js b/ui/components/app/signature-request-original/signature-request-original.test.js index 63bda7546..811648274 100644 --- a/ui/components/app/signature-request-original/signature-request-original.test.js +++ b/ui/components/app/signature-request-original/signature-request-original.test.js @@ -133,9 +133,7 @@ describe('SignatureRequestOriginal', () => { 'Because of an error, this request was not verified by the security provider. Proceed with caution.', ), ).toBeInTheDocument(); - expect( - screen.getByText('This is based on information from'), - ).toBeInTheDocument(); + expect(screen.getByText('OpenSea')).toBeInTheDocument(); }); it('should not render SecurityProviderBannerMessage component when flagAsDangerous is not malicious', () => { @@ -150,6 +148,6 @@ describe('SignatureRequestOriginal', () => { 'Because of an error, this request was not verified by the security provider. Proceed with caution.', ), ).toBeNull(); - expect(screen.queryByText('This is based on information from')).toBeNull(); + expect(screen.queryByText('OpenSea')).toBeNull(); }); }); diff --git a/ui/components/app/signature-request/signature-request.component.test.js b/ui/components/app/signature-request/signature-request.component.test.js index 935485840..eebae4d46 100644 --- a/ui/components/app/signature-request/signature-request.component.test.js +++ b/ui/components/app/signature-request/signature-request.component.test.js @@ -291,9 +291,7 @@ describe('Signature Request Component', () => { 'Because of an error, this request was not verified by the security provider. Proceed with caution.', ), ).toBeInTheDocument(); - expect( - queryByText('This is based on information from'), - ).toBeInTheDocument(); + expect(queryByText('OpenSea')).toBeInTheDocument(); }); it('should not render SecurityProviderBannerMessage component when flagAsDangerous is not malicious', () => { @@ -325,7 +323,7 @@ describe('Signature Request Component', () => { 'Because of an error, this request was not verified by the security provider. Proceed with caution.', ), ).toBeNull(); - expect(queryByText('This is based on information from')).toBeNull(); + expect(queryByText('OpenSea')).toBeNull(); }); it('should render a warning when the selected account is not the one being used to sign', () => { diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap index 940e72647..81a8427b6 100644 --- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap +++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap @@ -17,7 +17,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component class="settings-page__content-item" > - Enable transaction security providers + Enable security alerts
- OpenSea (Beta) + OpenSea + Blockaid (Beta)