fix: BX-718 & BX-722 & BX-720 (#571)

rainbow-me · May 31, 2023 · 45b3755 · 45b3755
1 parent abd69ca
commit 45b3755
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git 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
@@ -30,14 +30,13 @@ const ConnectingToLedger = () => {
               color="labelTertiary"
               align="center"
             >
-              {i18n.t('hw.connect_ledger_description')}
+              {i18n.t('hw.connect_ledger_description')}{' '}
               <TextLink
                 color="blue"
                 onClick={() => goToNewTab({ url: 'https://learn.rainbow.me/' })}
               >
                 {i18n.t('hw.learn_more')}
               </TextLink>
-              .
             </Text>
           </Stack>
         </Box>

diff --git 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')}
-            <a
-              href="https://learn.rainbow.me/"
-              target="_blank"
-              style={{ color: accentColorAsHsl }}
-              rel="noreferrer"
+            {i18n.t('hw.connect_trezor_description')}{' '}
+            <TextLink
+              color="blue"
+              onClick={() => goToNewTab({ url: 'https://learn.rainbow.me/' })}
             >
               {i18n.t('hw.learn_more')}
-            </a>
-            .
+            </TextLink>
           </Text>
         </Box>
       </Box>