From 45b3755a89f49786519519356a62e2f9f4158cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Mi=C3=B1o?= Date: Wed, 31 May 2023 12:03:48 -0400 Subject: [PATCH] fix: BX-718 & BX-722 & BX-720 (#571) --- src/core/languages/_english.json | 4 ++-- src/entries/popup/pages/hw/ledger.tsx | 3 +-- src/entries/popup/pages/hw/trezor.tsx | 16 +++++++--------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/core/languages/_english.json b/src/core/languages/_english.json index a51e8dbc96..8d73db741a 100644 --- a/src/core/languages/_english.json +++ b/src/core/languages/_english.json @@ -786,7 +786,7 @@ "needs_app_ledger_description_2": "Enter your passcode to unlock your Ledger. Once unlocked, open the Ethereum app by pressing both buttons at once.", "connect_trezor_title": "Complete your Trezor set up", "connect_trezor_description": "Continue to connect your Trezor to Rainbow through the web interface.", - "learn_more": "Learn more", + "learn_more": "Learn more.", "connect_wallets_title": "Connect your wallets", "connect_wallets_found": "We’ve found wallets on your Ledger with a balance or activity. Select which to connect.", "connect_wallets_not_found": "Some text about how this looks like a new device, so select from empty accounts?", @@ -796,7 +796,7 @@ "add_by_index": "Add by index", "index_label": "Index", "connection_successful_title": "Connected successful", - "connection_successful_description": "Something about how we imported N wallets and they will be labeled with the badge?", + "connection_successful_description": "You’ve successfully added 12 wallets. They’re easy to identify in your wallet list with the Ledger badge. You can add more at any time.", "done": "Done", "add_wallet": "Add wallet", "add_by_index_title": "Add a wallet by its index", diff --git a/src/entries/popup/pages/hw/ledger.tsx b/src/entries/popup/pages/hw/ledger.tsx index 9160029050..7469e0b300 100644 --- a/src/entries/popup/pages/hw/ledger.tsx +++ b/src/entries/popup/pages/hw/ledger.tsx @@ -30,14 +30,13 @@ const ConnectingToLedger = () => { color="labelTertiary" align="center" > - {i18n.t('hw.connect_ledger_description')} + {i18n.t('hw.connect_ledger_description')}{' '} goToNewTab({ url: 'https://learn.rainbow.me/' })} > {i18n.t('hw.learn_more')} - . diff --git a/src/entries/popup/pages/hw/trezor.tsx b/src/entries/popup/pages/hw/trezor.tsx index 11435f3df9..b1852ce201 100644 --- a/src/entries/popup/pages/hw/trezor.tsx +++ b/src/entries/popup/pages/hw/trezor.tsx @@ -2,8 +2,9 @@ import React, { useEffect } from 'react'; import trezorDevice from 'static/assets/hw/trezor-device.png'; import { i18n } from '~/core/languages'; +import { goToNewTab } from '~/core/utils/tabs'; import { Box, Separator, Text } from '~/design-system'; -import { accentColorAsHsl } from '~/design-system/styles/core.css'; +import { TextLink } from '~/design-system/components/TextLink/TextLink'; import { FullScreenContainer } from '../../components/FullScreen/FullScreenContainer'; import * as wallet from '../../handlers/wallet'; @@ -40,16 +41,13 @@ export function ConnectTrezor() { color="labelTertiary" align="center" > - {i18n.t('hw.connect_trezor_description')} - goToNewTab({ url: 'https://learn.rainbow.me/' })} > {i18n.t('hw.learn_more')} - - . +