Merge branch 'master' into fix/pagetitle

getAlby · Nov 14, 2024 · a98e9ad · a98e9ad
2 parents 518e8cb + d19935c
commit a98e9ad
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/src/app/screens/Home/DefaultView/index.tsx b/src/app/screens/Home/DefaultView/index.tsx
@@ -180,15 +180,23 @@ const DefaultView: FC<Props> = (props) => {
               </div>
               <span className="text-sm">
                 <Trans
-                  i18nKey={"default_view.node_required"}
-                  t={t}
+                  i18nKey={"node_required"}
+                  t={tCommon}
                   components={[
                     // eslint-disable-next-line react/jsx-key
-                    <a
+                    <Hyperlink
                       className="underline"
                       href="https://getalby.com/onboarding/node/new"
                       target="_blank"
-                      rel="noreferrer"
+                      rel="noopener nofollow"
+                    />,
+
+                    // eslint-disable-next-line react/jsx-key
+                    <Hyperlink
+                      className="underline"
+                      href="https://guides.getalby.com/user-guide/alby-account-and-browser-extension/alby-account/faqs-alby-account/what-are-fee-credits-in-my-alby-account"
+                      target="_blank"
+                      rel="noopener nofollow"
                     />,
                   ]}
                 />

diff --git a/src/app/screens/Options/TestConnection/index.tsx b/src/app/screens/Options/TestConnection/index.tsx
@@ -8,6 +8,7 @@ import { useEffect, useState } from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import Alert from "~/app/components/Alert";
+import Hyperlink from "~/app/components/Hyperlink";
 import { useAccount } from "~/app/context/AccountContext";
 import { useAccounts } from "~/app/context/AccountsContext";
 import { useSettings } from "~/app/context/SettingsContext";
@@ -127,14 +128,22 @@ export default function TestConnection() {
                         <span className="text-sm">
                           <Trans
                             i18nKey={"node_required"}
-                            t={t}
+                            t={tCommon}
                             components={[
                               // eslint-disable-next-line react/jsx-key
-                              <a
+                              <Hyperlink
                                 className="underline"
                                 href="https://getalby.com/onboarding/node/new"
                                 target="_blank"
-                                rel="noreferrer"
+                                rel="noopener nofollow"
+                              />,
+
+                              // eslint-disable-next-line react/jsx-key
+                              <Hyperlink
+                                className="underline"
+                                href="https://guides.getalby.com/user-guide/alby-account-and-browser-extension/alby-account/faqs-alby-account/what-are-fee-credits-in-my-alby-account"
+                                target="_blank"
+                                rel="noopener nofollow"
                               />,
                             ]}
                           />

diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json
@@ -26,8 +26,7 @@
         "initializing": "Dein Konto wird initialisiert. Bitte warte, dies kann eine Minute dauern...",
         "connection_error": "Verbindungsfehler",
         "connection_taking_long": "Der Verbindungsversuch dauert länger als erwartet... Sind deine Angaben korrekt? Ist deine Node erreichbar?",
-        "contact_support": "Wenn du Hilfe benötigst, wende dich bitte an [email protected]",
-        "node_required": "Die Erweiterung ist konfiguriert, aber um Zahlungen senden und empfangen zu können, musst du die Konfiguration der Wallet für Ihr <0>Alby-Konto</0> abschließen."
+        "contact_support": "Wenn du Hilfe benötigst, wende dich bitte an [email protected]"
       },
       "pin_extension": {
         "title": "Die Alby Erweiterung anpinnen",
@@ -423,8 +422,7 @@
             "description": "Erstelle einen Master Key für Bitcoin, Nostr und Liquid oder importiere ein bestehendes Nostr-Konto."
           }
         },
-        "upgrade_account": "Du verwendest die alte LNDHub-Einstellung. <0>Bitte verbinde dich erneut</0> mit deinem Alby-Konto, um Zugang zu den neuesten Funktionen zu erhalten.",
-        "node_required": "Ihr Alby-Konto hat keine Wallet konfiguriert. Um Zahlungen senden und empfangen zu können, schließe die Konfiguration der Wallet für dein <0>Alby-Konto</0> ab."
+        "upgrade_account": "Du verwendest die alte LNDHub-Einstellung. <0>Bitte verbinde dich erneut</0> mit deinem Alby-Konto, um Zugang zu den neuesten Funktionen zu erhalten."
       },
       "allowance_view": {
         "sats": "sats",

diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -24,7 +24,6 @@
         "review_connection_details": "Please review your connection details.",
         "connection_taking_long": "Trying to connect takes longer than expected... Are your details correct? Is your node reachable?",
         "contact_support": "If you need help please contact [email protected]",
-        "node_required": "The extension is configured, but to be able to send and receive payments finish the wallet configuration for your <0>Alby account</0>.",
         "actions": {
           "delete_edit_account": "Delete invalid account and edit again"
         }
@@ -414,7 +413,6 @@
             "description": "Fund your account and receive via your lightning address or an invoice"
           }
         },
-        "node_required": "Your Alby Account does not have a wallet configured. To be able to send and receive payments finish the wallet configuration for your <0>Alby account</0>.",
         "upgrade_account": "You are using the old LNDHub setup. <0>Please re-connect</0> your Alby account to get access to the latest features."
       }
     },
@@ -1139,6 +1137,7 @@
     "website": "Website",
     "wallet_settings": "Wallet Settings",
     "apps": "Apps",
+    "node_required": "Finish setting up your wallet to start sending and receiving unlimited payments <0>here</0>. Until then, you can receive up to 50,000 sats as <1>fee credits</1> only.",
     "actions": {
       "back": "Back",
       "delete": "Delete",

diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json
@@ -26,8 +26,7 @@
         "contact_support": "Si vous avez besoin d'aide, veuillez contacter [email protected]",
         "actions": {
           "delete_edit_account": "Supprimer le compte invalide et modifier à nouveau"
-        },
-        "node_required": "L'extension est configurée, mais pour être en mesure de recevoir des paiements, il est nécessaire de configurer votre <0>compte Alby</0>."
+        }
       },
       "pin_extension": {
         "title": "Épingler Alby",

diff --git a/src/i18n/locales/ru/translation.json b/src/i18n/locales/ru/translation.json
@@ -26,8 +26,7 @@
         "contact_support": "Если вам нужна помощь, пожалуйста, свяжитесь с [email protected]",
         "actions": {
           "delete_edit_account": ""
-        },
-        "node_required": "Расширение настроено, но чтобы отправлять и получать платежи завершите настройку кошелька для вашего <0>аккаунта Alby</0>."
+        }
       },
       "pin_extension": {
         "title": "Закрепите расширение",