From b8b6301f4885003aecb61d5db49241ebd45523be Mon Sep 17 00:00:00 2001 From: pavanjoshi914 Date: Mon, 11 Nov 2024 18:46:20 +0530 Subject: [PATCH 1/5] feat: update node_required copy --- src/app/screens/Home/DefaultView/index.tsx | 12 +++++++++--- src/app/screens/Options/TestConnection/index.tsx | 13 ++++++++++--- src/i18n/locales/en/translation.json | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/app/screens/Home/DefaultView/index.tsx b/src/app/screens/Home/DefaultView/index.tsx index fda3b30d99..10de87b71f 100644 --- a/src/app/screens/Home/DefaultView/index.tsx +++ b/src/app/screens/Home/DefaultView/index.tsx @@ -184,11 +184,17 @@ const DefaultView: FC = (props) => { t={t} components={[ // eslint-disable-next-line react/jsx-key - , + + // eslint-disable-next-line react/jsx-key + , ]} /> diff --git a/src/app/screens/Options/TestConnection/index.tsx b/src/app/screens/Options/TestConnection/index.tsx index b931a801b1..3495de5ac5 100644 --- 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"; @@ -130,11 +131,17 @@ export default function TestConnection() { t={t} components={[ // eslint-disable-next-line react/jsx-key - , + + // eslint-disable-next-line react/jsx-key + , ]} /> diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json index f4837b27f5..ed2f55145b 100644 --- a/src/i18n/locales/en/translation.json +++ b/src/i18n/locales/en/translation.json @@ -401,7 +401,7 @@ "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.", + "node_required": "Complete your wallet setup to start sending and receiving unlimited payments <0>here.Until setup is complete, you can receive up to 50k sats as <1>fee credits only.", "upgrade_account": "You are using the old LNDHub setup. <0>Please re-connect your Alby account to get access to the latest features." } }, From f87afac9452cbf83e2744fa08f637a3a24c43dbc Mon Sep 17 00:00:00 2001 From: pavanjoshi914 Date: Mon, 11 Nov 2024 18:50:54 +0530 Subject: [PATCH 2/5] chore: move node_required to common --- src/app/screens/Home/DefaultView/index.tsx | 4 ++-- src/app/screens/Options/TestConnection/index.tsx | 2 +- src/i18n/locales/de/translation.json | 3 +-- src/i18n/locales/en/translation.json | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/screens/Home/DefaultView/index.tsx b/src/app/screens/Home/DefaultView/index.tsx index 10de87b71f..5d4480c34c 100644 --- a/src/app/screens/Home/DefaultView/index.tsx +++ b/src/app/screens/Home/DefaultView/index.tsx @@ -180,8 +180,8 @@ const DefaultView: FC = (props) => { Bitte verbinde dich erneut 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 ab." + "upgrade_account": "Du verwendest die alte LNDHub-Einstellung. <0>Bitte verbinde dich erneut 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 index ed2f55145b..7ce7bd1866 100644 --- 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 support@getalby.com", - "node_required": "The extension is configured, but to be able to send and receive payments finish the wallet configuration for your <0>Alby account.", "actions": { "delete_edit_account": "Delete invalid account and edit again" } @@ -401,7 +400,6 @@ "description": "Fund your account and receive via your lightning address or an invoice" } }, - "node_required": "Complete your wallet setup to start sending and receiving unlimited payments <0>here.Until setup is complete, you can receive up to 50k sats as <1>fee credits only.", "upgrade_account": "You are using the old LNDHub setup. <0>Please re-connect your Alby account to get access to the latest features." } }, @@ -1126,6 +1124,7 @@ "website": "Website", "wallet_settings": "Wallet Settings", "apps": "Apps", + "node_required": "Complete your wallet setup to start sending and receiving unlimited payments <0>here.Until setup is complete, you can receive up to 50k sats as <1>fee credits only.", "actions": { "back": "Back", "delete": "Delete", From ce61128141d3062d8a8b8a7e303f7e76edbcdfa0 Mon Sep 17 00:00:00 2001 From: pavanjoshi914 Date: Mon, 11 Nov 2024 18:53:46 +0530 Subject: [PATCH 3/5] feat: remove outdated translations --- src/i18n/locales/de/translation.json | 3 +-- src/i18n/locales/fr/translation.json | 3 +-- src/i18n/locales/ru/translation.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json index a0ae001aef..f8712ef611 100644 --- 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 support@getalby.com", - "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 abschließen." + "contact_support": "Wenn du Hilfe benötigst, wende dich bitte an support@getalby.com" }, "pin_extension": { "title": "Die Alby Erweiterung anpinnen", diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json index 4be48bd86c..87b8f0cf02 100644 --- 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 support@getalby.com", "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." + } }, "pin_extension": { "title": "Épingler Alby", diff --git a/src/i18n/locales/ru/translation.json b/src/i18n/locales/ru/translation.json index f335268a93..a29fe5a1bf 100644 --- a/src/i18n/locales/ru/translation.json +++ b/src/i18n/locales/ru/translation.json @@ -26,8 +26,7 @@ "contact_support": "Если вам нужна помощь, пожалуйста, свяжитесь с support@getalby.com", "actions": { "delete_edit_account": "" - }, - "node_required": "Расширение настроено, но чтобы отправлять и получать платежи завершите настройку кошелька для вашего <0>аккаунта Alby." + } }, "pin_extension": { "title": "Закрепите расширение", From f2af63bfc696820d1d2de2a38c3a6a56c426a4b4 Mon Sep 17 00:00:00 2001 From: pavanjoshi914 Date: Mon, 11 Nov 2024 22:32:02 +0530 Subject: [PATCH 4/5] chore: underline links --- src/app/screens/Home/DefaultView/index.tsx | 2 ++ src/app/screens/Options/TestConnection/index.tsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/app/screens/Home/DefaultView/index.tsx b/src/app/screens/Home/DefaultView/index.tsx index 5d4480c34c..8a22a4c5f9 100644 --- a/src/app/screens/Home/DefaultView/index.tsx +++ b/src/app/screens/Home/DefaultView/index.tsx @@ -185,6 +185,7 @@ const DefaultView: FC = (props) => { components={[ // eslint-disable-next-line react/jsx-key = (props) => { // eslint-disable-next-line react/jsx-key Date: Wed, 13 Nov 2024 13:23:11 +0530 Subject: [PATCH 5/5] chore: update copy --- src/i18n/locales/en/translation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json index 7ce7bd1866..38c82a2688 100644 --- a/src/i18n/locales/en/translation.json +++ b/src/i18n/locales/en/translation.json @@ -1124,7 +1124,7 @@ "website": "Website", "wallet_settings": "Wallet Settings", "apps": "Apps", - "node_required": "Complete your wallet setup to start sending and receiving unlimited payments <0>here.Until setup is complete, you can receive up to 50k sats as <1>fee credits only.", + "node_required": "Finish setting up your wallet to start sending and receiving unlimited payments <0>here. Until then, you can receive up to 50,000 sats as <1>fee credits only.", "actions": { "back": "Back", "delete": "Delete",