From f1b924087a7ac2f156519b5eaeccc6993a919849 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 7 Apr 2026 13:40:08 -0300 Subject: [PATCH 1/9] feat: update text and navigate to fundManual instead of fundingAdvanced --- Bitkit/Resources/Localization/en.lproj/Localizable.strings | 4 ++-- Bitkit/Views/Transfer/FundingOptions.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bitkit/Resources/Localization/en.lproj/Localizable.strings b/Bitkit/Resources/Localization/en.lproj/Localizable.strings index 99b505fe3..5effe201b 100644 --- a/Bitkit/Resources/Localization/en.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/en.lproj/Localizable.strings @@ -119,12 +119,12 @@ "lightning__transfer_intro__button" = "Get Started"; "lightning__funding__nav_title" = "Spending Balance"; "lightning__funding__title" = "Fund your spending balance"; -"lightning__funding__text" = "You can use your Bitkit savings or send bitcoin from a different wallet."; +"lightning__funding__text" = "The easiest option is to use your Bitkit savings or send bitcoin from a different wallet."; "lightning__funding__text_blocked" = "Bitkit does not currently provide Lightning services in your country, but you can still connect to other nodes directly."; "lightning__funding__text_blocked_cjit" = "Bitkit does not currently provide Lightning services in your country, but you can still connect to other nodes directly."; "lightning__funding__button1" = "Transfer from Savings"; "lightning__funding__button2" = "Use Other Wallet"; -"lightning__funding__button3" = "Advanced"; +"lightning__funding__button3" = "Manual Setup"; "lightning__funding_advanced__nav_title" = "Spending Balance"; "lightning__funding_advanced__title" = "Advanced setup"; "lightning__funding_advanced__text" = "Scan a QR to claim your LNURL Channel from another LSP, or choose manual setup."; diff --git a/Bitkit/Views/Transfer/FundingOptions.swift b/Bitkit/Views/Transfer/FundingOptions.swift index 047e33e5c..7cbe9b899 100644 --- a/Bitkit/Views/Transfer/FundingOptions.swift +++ b/Bitkit/Views/Transfer/FundingOptions.swift @@ -54,11 +54,11 @@ struct FundingOptions: View { } RectangleButton( - icon: "external", + icon: "pencil", title: t("lightning__funding__button3"), testID: "FundCustom" ) { - navigation.navigate(.fundingAdvanced) + navigation.navigate(.fundManual(nodeUri: nil)) } } From 8bfcd08c27a35e17b410c2f05292d9db9ab44a8e Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 7 Apr 2026 13:46:21 -0300 Subject: [PATCH 2/9] chore: update translations --- Bitkit/Resources/Localization/ca.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/cs.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/de.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/el.lproj/Localizable.strings | 4 ++-- .../Resources/Localization/es-419.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/es.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/fr.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/it.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/nl.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/pl.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/pt-BR.lproj/Localizable.strings | 4 ++-- Bitkit/Resources/Localization/ru.lproj/Localizable.strings | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Bitkit/Resources/Localization/ca.lproj/Localizable.strings b/Bitkit/Resources/Localization/ca.lproj/Localizable.strings index a37fc4119..e3dcc4938 100644 --- a/Bitkit/Resources/Localization/ca.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/ca.lproj/Localizable.strings @@ -112,12 +112,12 @@ "lightning__transfer_intro__button" = "Començar"; "lightning__funding__nav_title" = "Saldo de despesa"; "lightning__funding__title" = "Finança el teu saldo de despesa"; -"lightning__funding__text" = "Pots utilitzar els teus estalvis de Bitkit o enviar bitcoin des d\'una altra cartera."; +"lightning__funding__text" = "La forma més fàcil és utilitzar els teus estalvis de Bitkit o enviar bitcoin des d\'una altra cartera."; "lightning__funding__text_blocked" = "Bitkit actualment no ofereix serveis Lightning al teu país, però encara pots connectar-te directament a altres nodes."; "lightning__funding__text_blocked_cjit" = "Bitkit actualment no ofereix serveis Lightning al teu país, però encara pots connectar-te directament a altres nodes."; "lightning__funding__button1" = "Transferir des d\'estalvis"; "lightning__funding__button2" = "Utilitza un altre moneder"; -"lightning__funding__button3" = "Avançat"; +"lightning__funding__button3" = "Configuració manual"; "lightning__funding_advanced__nav_title" = "Saldo de despesa"; "lightning__funding_advanced__title" = "Configuració avançada"; "lightning__funding_advanced__text" = "Escaneja un QR per reclamar el teu canal LNURL d\'un altre LSP, o tria la configuració manual."; diff --git a/Bitkit/Resources/Localization/cs.lproj/Localizable.strings b/Bitkit/Resources/Localization/cs.lproj/Localizable.strings index c96c4fa4b..826c93988 100644 --- a/Bitkit/Resources/Localization/cs.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/cs.lproj/Localizable.strings @@ -112,12 +112,12 @@ "lightning__transfer_intro__button" = "Začít"; "lightning__funding__nav_title" = "Dostupný zůstatek"; "lightning__funding__title" = "Navyšte svůj disponibilní zůstatek"; -"lightning__funding__text" = "Můžete použít své úspory na BitKitu nebo poslat bitcoin z jiné peněženky."; +"lightning__funding__text" = "Nejjednodušší možností je použít úspory z Bitkitu nebo poslat bitcoin z jiné peněženky."; "lightning__funding__text_blocked" = "Bitkit v současné době neposkytuje služby lightning ve vaší zemi, ale stále se můžete připojit k jiným uzlům přímo."; "lightning__funding__text_blocked_cjit" = "Bitkit v současné době neposkytuje služby lightning ve vaší zemi, ale stále se můžete připojit k jiným uzlům přímo."; "lightning__funding__button1" = "Převod z úspor"; "lightning__funding__button2" = "Použijte jinou peněženku"; -"lightning__funding__button3" = "Pokročilé"; +"lightning__funding__button3" = "Manuální nastavení"; "lightning__funding_advanced__nav_title" = "Dostupný zůstatek"; "lightning__funding_advanced__title" = "Pokročilé nastavení"; "lightning__funding_advanced__text" = "Naskenujte QR kód pro nárokování svého LNURL kanálu od jiného LSP nebo si vyberte ruční nastavení."; diff --git a/Bitkit/Resources/Localization/de.lproj/Localizable.strings b/Bitkit/Resources/Localization/de.lproj/Localizable.strings index b69a465f5..022ea3f64 100644 --- a/Bitkit/Resources/Localization/de.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/de.lproj/Localizable.strings @@ -112,12 +112,12 @@ "lightning__transfer_intro__button" = "Los geht\'s"; "lightning__funding__nav_title" = "Spending Balance"; "lightning__funding__title" = "Fund your spending balance"; -"lightning__funding__text" = "Du kannst dein Bitkit-Sparkonto verwenden oder Bitcoin aus einer anderen Wallet senden."; +"lightning__funding__text" = "Am einfachsten ist es, deine Bitkit-Ersparnisse zu verwenden oder Bitcoin von einer anderen Wallet zu senden."; "lightning__funding__text_blocked" = "Bitkit bietet derzeit keine Lightning-Dienste in deinem Land an, aber du kannst dich trotzdem direkt mit anderen Knotenpunkten verbinden."; "lightning__funding__text_blocked_cjit" = "Bitkit bietet derzeit keine Lightning-Dienste in deinem Land an, aber du kannst dich trotzdem direkt mit anderen Knotenpunkten verbinden."; "lightning__funding__button1" = "Von Sparkonto übertragen"; "lightning__funding__button2" = "Anderes Wallet verwenden"; -"lightning__funding__button3" = "Fortgeschritten"; +"lightning__funding__button3" = "Manuelle Einrichtung"; "lightning__funding_advanced__nav_title" = "Ausgabenkonto"; "lightning__funding_advanced__title" = "Fortgeschrittenesetup"; "lightning__funding_advanced__text" = "Scannen Sie einen QR-Code, um Ihren LNURL-Kanal von einem anderen LSP zu beanspruchen, oder wählen Sie die manuelle Einrichtung."; diff --git a/Bitkit/Resources/Localization/el.lproj/Localizable.strings b/Bitkit/Resources/Localization/el.lproj/Localizable.strings index 5b58e4eab..7b0f34025 100644 --- a/Bitkit/Resources/Localization/el.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/el.lproj/Localizable.strings @@ -110,12 +110,12 @@ "lightning__transfer_intro__button" = "Ξεκινήστε"; "lightning__funding__nav_title" = "Υπόλοιπο Δαπανών"; "lightning__funding__title" = "Χρηματοδοτήστε το υπόλοιπο δαπανών σας"; -"lightning__funding__text" = "Μπορείτε να χρησιμοποιήσετε τις αποταμιεύσεις σας στο Bitkit ή να στείλετε bitcoin από διαφορετικό πορτοφόλι."; +"lightning__funding__text" = "Ο ευκολότερος τρόπος είναι να χρησιμοποιήσεις τις αποταμιεύσεις Bitkit ή να στείλεις bitcoin από διαφορετικό πορτοφόλι."; "lightning__funding__text_blocked" = "Το Bitkit δεν παρέχει αυτή τη στιγμή υπηρεσίες Lightning στη χώρα σας, αλλά μπορείτε να συνδεθείτε απευθείας σε άλλους κόμβους."; "lightning__funding__text_blocked_cjit" = "Το Bitkit δεν παρέχει αυτή τη στιγμή υπηρεσίες Lightning στη χώρα σας, αλλά μπορείτε να συνδεθείτε απευθείας σε άλλους κόμβους."; "lightning__funding__button1" = "Μεταφορά από Αποταμιεύσεις"; "lightning__funding__button2" = "Χρήση Άλλου Πορτοφολιού"; -"lightning__funding__button3" = "Για προχωρημένους"; +"lightning__funding__button3" = "Χειροκίνητη Ρύθμιση"; "lightning__funding_advanced__nav_title" = "Υπόλοιπο Δαπανών"; "lightning__funding_advanced__title" = "Ρυθμίσεις για προχωρημένους"; "lightning__funding_advanced__text" = "Σαρώστε ένα QR για να διεκδικήσετε το LNURL Channel σας από άλλο LSP, ή επιλέξτε χειροκίνητη ρύθμιση."; diff --git a/Bitkit/Resources/Localization/es-419.lproj/Localizable.strings b/Bitkit/Resources/Localization/es-419.lproj/Localizable.strings index 797694c84..fd18b3861 100644 --- a/Bitkit/Resources/Localization/es-419.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/es-419.lproj/Localizable.strings @@ -114,12 +114,12 @@ "lightning__transfer_intro__button" = "Empezar"; "lightning__funding__nav_title" = "Saldo para gastos"; "lightning__funding__title" = "Fondee su saldo de gastos"; -"lightning__funding__text" = "Puedes usar tu balance de ahorros en Bitkit o enviar fondos desde otra cartera."; +"lightning__funding__text" = "La forma más fácil es usar tus ahorros de Bitkit o enviar bitcoin desde una billetera diferente."; "lightning__funding__text_blocked" = "Bitkit no tiene soporte Lightning en tu región, pero puedes usar nodos externos manualmente."; "lightning__funding__text_blocked_cjit" = "Bitkit no tiene soporte Lightning en tu región, pero puedes usar nodos externos manualmente."; "lightning__funding__button1" = "Transferir desde Ahorros"; "lightning__funding__button2" = "Usar Otra Billetera"; -"lightning__funding__button3" = "Avanzado"; +"lightning__funding__button3" = "Configuración Manual"; "lightning__funding_advanced__nav_title" = "Saldo de gastos"; "lightning__funding_advanced__title" = "Avanzado configuracion"; "lightning__funding_advanced__text" = "Escanea un código QR para obtener tu canal LNURL de otro LSP, o selecciona la configuración manual."; diff --git a/Bitkit/Resources/Localization/es.lproj/Localizable.strings b/Bitkit/Resources/Localization/es.lproj/Localizable.strings index e1881b37f..f2c861bb9 100644 --- a/Bitkit/Resources/Localization/es.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/es.lproj/Localizable.strings @@ -111,12 +111,12 @@ "lightning__transfer_intro__button" = "Empezar"; "lightning__funding__nav_title" = "Saldo de gastos"; "lightning__funding__title" = "Rellene su saldo de gastos"; -"lightning__funding__text" = "Puede usar sus ahorros en Bitkit o enviar bitcoin desde un monedero diferente."; +"lightning__funding__text" = "La forma más fácil es usar tus ahorros de Bitkit o enviar bitcoin desde un monedero diferente."; "lightning__funding__text_blocked" = "Bitkit actualmente no proporciona servicios Lightning en su país, pero aún puede conectarse a otros nodos directamente."; "lightning__funding__text_blocked_cjit" = "Bitkit actualmente no proporciona servicios Lightning en su país, pero aún puede conectarse a otros nodos directamente."; "lightning__funding__button1" = "Transferir desde Ahorros"; "lightning__funding__button2" = "Usar Otro Monedero"; -"lightning__funding__button3" = "Avanzado"; +"lightning__funding__button3" = "Configuración Manual"; "lightning__funding_advanced__nav_title" = "Saldo de gastos"; "lightning__funding_advanced__title" = "Configuración avanzada"; "lightning__funding_advanced__text" = "Escanee un QR para reclamar su Canal LNURL de otro LSP, o elija la configuración manual."; diff --git a/Bitkit/Resources/Localization/fr.lproj/Localizable.strings b/Bitkit/Resources/Localization/fr.lproj/Localizable.strings index 371bf3557..3a988cc00 100644 --- a/Bitkit/Resources/Localization/fr.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/fr.lproj/Localizable.strings @@ -116,12 +116,12 @@ "lightning__transfer_intro__button" = "Commencer"; "lightning__funding__nav_title" = "Solde Dépenses"; "lightning__funding__title" = "Financez votre solde Dépenses"; -"lightning__funding__text" = "Vous pouvez utiliser votre épargne Bitkit ou envoyer des bitcoins à partir d\'un autre portefeuille."; +"lightning__funding__text" = "Le plus simple est d\'utiliser vos économies Bitkit ou d\'envoyer des bitcoins depuis un autre portefeuille."; "lightning__funding__text_blocked" = "Bitkit ne fournit pas actuellement de services Lightning dans votre pays, mais vous pouvez toujours vous connecter directement à d\'autres nœuds."; "lightning__funding__text_blocked_cjit" = "Bitkit ne fournit pas actuellement de services Lightning dans votre pays, mais vous pouvez toujours vous connecter directement à d\'autres nœuds."; "lightning__funding__button1" = "Transfert depuis l\'épargne"; "lightning__funding__button2" = "Utiliser un autre portefeuille"; -"lightning__funding__button3" = "Avancé"; +"lightning__funding__button3" = "Configuration manuelle"; "lightning__funding_advanced__nav_title" = "Solde Dépenses"; "lightning__funding_advanced__title" = "Configuration avancée"; "lightning__funding_advanced__text" = "Scannez un QR code pour réclamer votre canal LNURL à un autre LSP, ou choisissez la configuration manuelle."; diff --git a/Bitkit/Resources/Localization/it.lproj/Localizable.strings b/Bitkit/Resources/Localization/it.lproj/Localizable.strings index 773ef6853..bb9c1e1e1 100644 --- a/Bitkit/Resources/Localization/it.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/it.lproj/Localizable.strings @@ -114,12 +114,12 @@ "lightning__transfer_intro__button" = "Inizia"; "lightning__funding__nav_title" = "Conto di Spesa"; "lightning__funding__title" = "Manda fondi al tuo conto di spesa"; -"lightning__funding__text" = "Puoi utilizzare i tuoi risparmi Bitkit o inviare bitcoin da un portafoglio diverso."; +"lightning__funding__text" = "Il modo più semplice è usare i tuoi risparmi Bitkit o inviare bitcoin da un portafoglio diverso."; "lightning__funding__text_blocked" = "Bitkit attualmente non fornisce servizi Lightning nel tuo paese, ma puoi comunque connetterti direttamente ad altri nodi."; "lightning__funding__text_blocked_cjit" = "Bitkit attualmente non fornisce servizi Lightning nel tuo paese, ma puoi comunque connetterti direttamente ad altri nodi."; "lightning__funding__button1" = "Trasferimento da risparmio"; "lightning__funding__button2" = "Usa un altro portafoglio"; -"lightning__funding__button3" = "Avanzate"; +"lightning__funding__button3" = "Configurazione manuale"; "lightning__funding_advanced__nav_title" = "Conto Spendibile"; "lightning__funding_advanced__title" = "Configurazione avanzata"; "lightning__funding_advanced__text" = "Scansiona un QR per richiedere il tuo Canale LNURL da un altro LSP, oppure scegli la configurazione manuale."; diff --git a/Bitkit/Resources/Localization/nl.lproj/Localizable.strings b/Bitkit/Resources/Localization/nl.lproj/Localizable.strings index f5554e5a9..021f07c74 100644 --- a/Bitkit/Resources/Localization/nl.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/nl.lproj/Localizable.strings @@ -115,12 +115,12 @@ "lightning__transfer_intro__button" = "Starten"; "lightning__funding__nav_title" = "Bestedingssaldo"; "lightning__funding__title" = "Vul uw bestedingssaldo"; -"lightning__funding__text" = "U kunt uw Bitkit spaargeld gebruiken of bitcoin versturen vanaf een andere wallet."; +"lightning__funding__text" = "De makkelijkste optie is om je Bitkit-spaargeld te gebruiken of bitcoin te versturen vanuit een andere wallet."; "lightning__funding__text_blocked" = "Bitkit biedt momenteel geen Lightning diensten aan in uw land, maar u kunt nog steeds rechtstreeks verbinding maken met andere nodes."; "lightning__funding__text_blocked_cjit" = "Bitkit biedt momenteel geen Lightning diensten aan in uw land, maar u kunt nog steeds rechtstreeks verbinding maken met andere nodes."; "lightning__funding__button1" = "Overboeking van Spaargeld"; "lightning__funding__button2" = "Gebruik Andere Wallet"; -"lightning__funding__button3" = "Geavanceerd"; +"lightning__funding__button3" = "Handmatige configuratie"; "lightning__funding_advanced__nav_title" = "Bestedingssaldo"; "lightning__funding_advanced__title" = "Geavanceerde configuratie"; "lightning__funding_advanced__text" = "Scan een QR om uw LNURL Kanaal van een andere LSP te claimen, of kies handmatige configuratie."; diff --git a/Bitkit/Resources/Localization/pl.lproj/Localizable.strings b/Bitkit/Resources/Localization/pl.lproj/Localizable.strings index e32b0b5a7..9bfd3be12 100644 --- a/Bitkit/Resources/Localization/pl.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/pl.lproj/Localizable.strings @@ -115,12 +115,12 @@ "lightning__transfer_intro__button" = "Rozpocznij"; "lightning__funding__nav_title" = "Saldo wydatków"; "lightning__funding__title" = "Zasil swoje saldo wydatków"; -"lightning__funding__text" = "Możesz użyć oszczędności zgromadzonych w Twoim portfelu Bitkit lub wysłać bitcoiny z innego portfela."; +"lightning__funding__text" = "Najłatwiejszą opcją jest użycie oszczędności Bitkit lub wysłanie bitcoinów z innego portfela."; "lightning__funding__text_blocked" = "Bitkit nie świadczy obecnie usług Lightning w Twoim kraju, ale nadal możesz łączyć się z innymi węzłami."; "lightning__funding__text_blocked_cjit" = "Bitkit nie świadczy obecnie usług Lightning w Twoim kraju, ale nadal możesz łączyć się bezpośrednio z innymi węzłami."; "lightning__funding__button1" = "Prześlij z Oszczędności"; "lightning__funding__button2" = "Użyj innego portfela"; -"lightning__funding__button3" = "Zaawansowane"; +"lightning__funding__button3" = "Ręczna konfiguracja"; "lightning__funding_advanced__nav_title" = "Saldo do wydawania"; "lightning__funding_advanced__title" = "Ustawienia zaawansowane"; "lightning__funding_advanced__text" = "Zeskanuj kod QR, aby odebrać swój kanał LNURL od innego LSP, lub wybierz ręczną konfigurację."; diff --git a/Bitkit/Resources/Localization/pt-BR.lproj/Localizable.strings b/Bitkit/Resources/Localization/pt-BR.lproj/Localizable.strings index 80bc51d63..f821182a3 100644 --- a/Bitkit/Resources/Localization/pt-BR.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/pt-BR.lproj/Localizable.strings @@ -115,12 +115,12 @@ "lightning__transfer_intro__button" = "Começar"; "lightning__funding__nav_title" = "Saldo de Gastos"; "lightning__funding__title" = "Transfira para seu saldo de gastos"; -"lightning__funding__text" = "Use seu saldo de poupança ou receba bitcoin de outra carteira."; +"lightning__funding__text" = "A forma mais fácil é usar suas economias do Bitkit ou enviar bitcoin de uma carteira diferente."; "lightning__funding__text_blocked" = "Bitkit não fornece serviços de Lightning no seu paús atualmente, mas você ainda pode se conectar diretamente a outros nodes"; "lightning__funding__text_blocked_cjit" = "Bitkit não fornece serviços de Lightning no seu paús atualmente, mas você ainda pode se conectar diretamente a outros nodes"; "lightning__funding__button1" = "Transferir do Saldo de Poupança"; "lightning__funding__button2" = "Transferir de Outra Carteira"; -"lightning__funding__button3" = "Avançado"; +"lightning__funding__button3" = "Configuração manual"; "lightning__funding_advanced__nav_title" = "Saldo de Gastos"; "lightning__funding_advanced__title" = "Configuração avançada"; "lightning__funding_advanced__text" = "Escaneie um QR para reivindicar seu canal LNURL de outro LSP ou escolha o setup manual."; diff --git a/Bitkit/Resources/Localization/ru.lproj/Localizable.strings b/Bitkit/Resources/Localization/ru.lproj/Localizable.strings index cd1fac468..562e29176 100644 --- a/Bitkit/Resources/Localization/ru.lproj/Localizable.strings +++ b/Bitkit/Resources/Localization/ru.lproj/Localizable.strings @@ -115,12 +115,12 @@ "lightning__transfer_intro__button" = "Начать"; "lightning__funding__nav_title" = "Баланс Расходов"; "lightning__funding__title" = "Пополните свой Баланс Расходов"; -"lightning__funding__text" = "Вы можете использовать свои сбережения Bitkit или отправить биткойны из другого кошелька."; +"lightning__funding__text" = "Самый простой вариант — использовать ваши сбережения Bitkit или отправить биткоин с другого кошелька."; "lightning__funding__text_blocked" = "Bitkit в настоящее время не предоставляет услуги Lightning в вашей стране, но вы всё равно можете подключаться к другим узлам напрямую."; "lightning__funding__text_blocked_cjit" = "Bitkit в настоящее время не предоставляет услуги Lightning в вашей стране, но вы всё равно можете подключаться к другим узлам напрямую."; "lightning__funding__button1" = "Перевести из Сбережений"; "lightning__funding__button2" = "Использовать Другой Кошелёк"; -"lightning__funding__button3" = "Дополнительно"; +"lightning__funding__button3" = "Ручная настройка"; "lightning__funding_advanced__nav_title" = "Баланс Расходов"; "lightning__funding_advanced__title" = "Расширенная Настройка"; "lightning__funding_advanced__text" = "Сканируйте QR-код, чтобы получить свой LNURL Канал от другого LSP, или выберите ручную настройку."; From b7ade3ca3b4527691ae0f2af12dfe4c3917887e8 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 7 Apr 2026 14:19:12 -0300 Subject: [PATCH 3/9] feat: display dialog for fund wallet when transfer is disabled --- Bitkit/Views/Transfer/FundingOptions.swift | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Bitkit/Views/Transfer/FundingOptions.swift b/Bitkit/Views/Transfer/FundingOptions.swift index 7cbe9b899..fa762c0cf 100644 --- a/Bitkit/Views/Transfer/FundingOptions.swift +++ b/Bitkit/Views/Transfer/FundingOptions.swift @@ -6,6 +6,8 @@ struct FundingOptions: View { @EnvironmentObject var sheets: SheetViewModel @EnvironmentObject var wallet: WalletViewModel + @State private var showNoFundsAlert = false + var text: String { if GeoService.shared.isGeoBlocked { return t("lightning__funding__text_blocked") @@ -42,6 +44,16 @@ struct FundingOptions: View { navigation.navigate(.spendingIntro) } } + .allowsHitTesting(wallet.totalOnchainSats == 0 ? false : true) + .overlay { + if wallet.totalOnchainSats == 0 && !GeoService.shared.isGeoBlocked { + Color.clear + .contentShape(Rectangle()) + .onTapGesture { + showNoFundsAlert = true + } + } + } RectangleButton( icon: "qr", @@ -66,6 +78,19 @@ struct FundingOptions: View { } .navigationBarHidden(true) .padding(.horizontal, 16) + .alert( + t("lightning__no_funds__title"), + isPresented: $showNoFundsAlert + ) { + Button(t("lightning__no_funds__fund")) { + navigation.reset() + sheets.showSheet(.receive, data: ReceiveConfig(view: .cjitAmount)) + } + Button(t("common__cancel"), role: .cancel) {} + } message: { + Text(t("lightning__no_funds__description")) + } + .tint(.purpleAccent) .task { await app.checkGeoStatus() } From 3ba1571edafaf9a47c41900241f24bdb4eb7f84e Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 7 Apr 2026 14:23:21 -0300 Subject: [PATCH 4/9] chore: changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c424818e..dc6196b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Update funding screen: replace Advanced with Manual Setup, update description text, add no-funds alert dialog #520 + ### Fixed - Fix keyboard and UI issues in the calculator widget #513 - Preserve msat precision for LNURL pay, withdraw callbacks and bolt11 #512 From 9d1ec3e5f3e2f1adb499fa57c6c73218d340a574 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Wed, 8 Apr 2026 09:36:16 -0300 Subject: [PATCH 5/9] fix: remove overlay and move alert logic to button callback --- Bitkit/Views/Transfer/FundingOptions.swift | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Bitkit/Views/Transfer/FundingOptions.swift b/Bitkit/Views/Transfer/FundingOptions.swift index fa762c0cf..2bc13628d 100644 --- a/Bitkit/Views/Transfer/FundingOptions.swift +++ b/Bitkit/Views/Transfer/FundingOptions.swift @@ -35,25 +35,17 @@ struct FundingOptions: View { RectangleButton( icon: "transfer", title: t("lightning__funding__button1"), - isDisabled: wallet.totalOnchainSats == 0 || GeoService.shared.isGeoBlocked, + isDisabled: GeoService.shared.isGeoBlocked, testID: "FundTransfer" ) { - if app.hasSeenTransferToSpendingIntro { + if wallet.totalOnchainSats == 0 { + showNoFundsAlert = true + } else if app.hasSeenTransferToSpendingIntro { navigation.navigate(.spendingAmount) } else { navigation.navigate(.spendingIntro) } } - .allowsHitTesting(wallet.totalOnchainSats == 0 ? false : true) - .overlay { - if wallet.totalOnchainSats == 0 && !GeoService.shared.isGeoBlocked { - Color.clear - .contentShape(Rectangle()) - .onTapGesture { - showNoFundsAlert = true - } - } - } RectangleButton( icon: "qr", From 61c56ffc187950998af26037bd6bdd09703c136f Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Wed, 8 Apr 2026 09:55:05 -0300 Subject: [PATCH 6/9] chore: remove dead code --- Bitkit/MainNavView.swift | 1 - Bitkit/ViewModels/NavigationViewModel.swift | 1 - .../Views/Transfer/FundAdvancedOptions.swift | 55 ------------------- .../Receive/ReceiveCjitGeoBlocked.swift | 2 +- 4 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 Bitkit/Views/Transfer/FundAdvancedOptions.swift diff --git a/Bitkit/MainNavView.swift b/Bitkit/MainNavView.swift index 06660c787..129141f81 100644 --- a/Bitkit/MainNavView.swift +++ b/Bitkit/MainNavView.swift @@ -292,7 +292,6 @@ struct MainNavView: View { case let .spendingAdvanced(order): SpendingAdvancedView(order: order) case let .transferLearnMore(order): TransferLearnMoreView(order: order) case .settingUp: SettingUpView() - case .fundingAdvanced: FundAdvancedOptions() case let .fundManual(nodeUri): FundManualSetupView(initialNodeUri: nodeUri) case let .fundManualAmount(lnPeer): FundManualAmountView(lnPeer: lnPeer) case let .fundManualConfirm(lnPeer, amountSats): FundManualConfirmView(lnPeer: lnPeer, amountSats: amountSats) diff --git a/Bitkit/ViewModels/NavigationViewModel.swift b/Bitkit/ViewModels/NavigationViewModel.swift index 7b8219e16..502b1ed71 100644 --- a/Bitkit/ViewModels/NavigationViewModel.swift +++ b/Bitkit/ViewModels/NavigationViewModel.swift @@ -21,7 +21,6 @@ enum Route: Hashable { case spendingAdvanced(order: IBtOrder) case transferLearnMore(order: IBtOrder) case settingUp - case fundingAdvanced case fundManual(nodeUri: String?) case fundManualAmount(lnPeer: LnPeer) case fundManualConfirm(lnPeer: LnPeer, amountSats: UInt64) diff --git a/Bitkit/Views/Transfer/FundAdvancedOptions.swift b/Bitkit/Views/Transfer/FundAdvancedOptions.swift deleted file mode 100644 index a9719ace2..000000000 --- a/Bitkit/Views/Transfer/FundAdvancedOptions.swift +++ /dev/null @@ -1,55 +0,0 @@ -import SwiftUI - -struct FundAdvancedOptions: View { - @EnvironmentObject private var navigation: NavigationViewModel - - var body: some View { - VStack(spacing: 0) { - NavigationBar(title: t("lightning__funding_advanced__nav_title")) - .padding(.bottom, 16) - - ScrollView(showsIndicators: false) { - VStack(spacing: 0) { - DisplayText( - t("lightning__funding_advanced__title"), - accentColor: .purpleAccent - ) - .padding(.bottom, 8) - - BodyMText(t("lightning__funding_advanced__text")) - .frame(maxWidth: .infinity, alignment: .leading) - .padding(.bottom, 32) - - VStack(spacing: 8) { - RectangleButton( - icon: "scan", - title: t("lightning__funding_advanced__button1"), - testID: "FundLnUrl" - ) { - navigation.navigate(.scanner) - } - - RectangleButton( - icon: "pencil", - title: t("lightning__funding_advanced__button2"), - testID: "FundManual" - ) { - navigation.navigate(.fundManual(nodeUri: nil)) - } - } - - Spacer() - } - } - } - .navigationBarHidden(true) - .padding(.horizontal, 16) - } -} - -#Preview { - NavigationStack { - FundAdvancedOptions() - .preferredColorScheme(.dark) - } -} diff --git a/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift b/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift index fbc4827f5..a32a36671 100644 --- a/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift +++ b/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift @@ -23,7 +23,7 @@ struct ReceiveCjitGeoBlocked: View { CustomButton(title: t("lightning__funding_advanced__button_short")) { sheets.hideSheet() - navigation.navigate(.fundingAdvanced) + navigation.navigate(.fundManual(nodeUri: nil)) } } .navigationBarHidden(true) From 0105117f5d9a9df9215c3841a8547d661c8ab635 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Wed, 8 Apr 2026 10:33:07 -0300 Subject: [PATCH 7/9] chore: revert fund advanced deletion --- Bitkit/MainNavView.swift | 1 + Bitkit/Services/GeoService.swift | 2 +- Bitkit/ViewModels/NavigationViewModel.swift | 1 + .../Views/Transfer/FundAdvancedOptions.swift | 55 +++++++++++++++++++ .../Receive/ReceiveCjitGeoBlocked.swift | 2 +- 5 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 Bitkit/Views/Transfer/FundAdvancedOptions.swift diff --git a/Bitkit/MainNavView.swift b/Bitkit/MainNavView.swift index 129141f81..06660c787 100644 --- a/Bitkit/MainNavView.swift +++ b/Bitkit/MainNavView.swift @@ -292,6 +292,7 @@ struct MainNavView: View { case let .spendingAdvanced(order): SpendingAdvancedView(order: order) case let .transferLearnMore(order): TransferLearnMoreView(order: order) case .settingUp: SettingUpView() + case .fundingAdvanced: FundAdvancedOptions() case let .fundManual(nodeUri): FundManualSetupView(initialNodeUri: nodeUri) case let .fundManualAmount(lnPeer): FundManualAmountView(lnPeer: lnPeer) case let .fundManualConfirm(lnPeer, amountSats): FundManualConfirmView(lnPeer: lnPeer, amountSats: amountSats) diff --git a/Bitkit/Services/GeoService.swift b/Bitkit/Services/GeoService.swift index 725643c8d..42b1f21a5 100644 --- a/Bitkit/Services/GeoService.swift +++ b/Bitkit/Services/GeoService.swift @@ -29,7 +29,7 @@ class GeoService: ObservableObject { Logger.info("Geo status check completed: isGeoBlocked=\(isGeoBlocked)", context: "GeoService") } catch { - isGeoBlocked = false + isGeoBlocked = true Logger.error("Failed to check geo status: \(error)", context: "GeoService") } } diff --git a/Bitkit/ViewModels/NavigationViewModel.swift b/Bitkit/ViewModels/NavigationViewModel.swift index 502b1ed71..7b8219e16 100644 --- a/Bitkit/ViewModels/NavigationViewModel.swift +++ b/Bitkit/ViewModels/NavigationViewModel.swift @@ -21,6 +21,7 @@ enum Route: Hashable { case spendingAdvanced(order: IBtOrder) case transferLearnMore(order: IBtOrder) case settingUp + case fundingAdvanced case fundManual(nodeUri: String?) case fundManualAmount(lnPeer: LnPeer) case fundManualConfirm(lnPeer: LnPeer, amountSats: UInt64) diff --git a/Bitkit/Views/Transfer/FundAdvancedOptions.swift b/Bitkit/Views/Transfer/FundAdvancedOptions.swift new file mode 100644 index 000000000..a9719ace2 --- /dev/null +++ b/Bitkit/Views/Transfer/FundAdvancedOptions.swift @@ -0,0 +1,55 @@ +import SwiftUI + +struct FundAdvancedOptions: View { + @EnvironmentObject private var navigation: NavigationViewModel + + var body: some View { + VStack(spacing: 0) { + NavigationBar(title: t("lightning__funding_advanced__nav_title")) + .padding(.bottom, 16) + + ScrollView(showsIndicators: false) { + VStack(spacing: 0) { + DisplayText( + t("lightning__funding_advanced__title"), + accentColor: .purpleAccent + ) + .padding(.bottom, 8) + + BodyMText(t("lightning__funding_advanced__text")) + .frame(maxWidth: .infinity, alignment: .leading) + .padding(.bottom, 32) + + VStack(spacing: 8) { + RectangleButton( + icon: "scan", + title: t("lightning__funding_advanced__button1"), + testID: "FundLnUrl" + ) { + navigation.navigate(.scanner) + } + + RectangleButton( + icon: "pencil", + title: t("lightning__funding_advanced__button2"), + testID: "FundManual" + ) { + navigation.navigate(.fundManual(nodeUri: nil)) + } + } + + Spacer() + } + } + } + .navigationBarHidden(true) + .padding(.horizontal, 16) + } +} + +#Preview { + NavigationStack { + FundAdvancedOptions() + .preferredColorScheme(.dark) + } +} diff --git a/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift b/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift index a32a36671..fbc4827f5 100644 --- a/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift +++ b/Bitkit/Views/Wallets/Receive/ReceiveCjitGeoBlocked.swift @@ -23,7 +23,7 @@ struct ReceiveCjitGeoBlocked: View { CustomButton(title: t("lightning__funding_advanced__button_short")) { sheets.hideSheet() - navigation.navigate(.fundManual(nodeUri: nil)) + navigation.navigate(.fundingAdvanced) } } .navigationBarHidden(true) From 1054578c036da45a955052442c50563f48978b32 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Wed, 8 Apr 2026 10:42:41 -0300 Subject: [PATCH 8/9] fix: navigate to onchain receive on fund wallet --- Bitkit/Services/GeoService.swift | 2 +- Bitkit/Views/Transfer/FundingOptions.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bitkit/Services/GeoService.swift b/Bitkit/Services/GeoService.swift index 42b1f21a5..725643c8d 100644 --- a/Bitkit/Services/GeoService.swift +++ b/Bitkit/Services/GeoService.swift @@ -29,7 +29,7 @@ class GeoService: ObservableObject { Logger.info("Geo status check completed: isGeoBlocked=\(isGeoBlocked)", context: "GeoService") } catch { - isGeoBlocked = true + isGeoBlocked = false Logger.error("Failed to check geo status: \(error)", context: "GeoService") } } diff --git a/Bitkit/Views/Transfer/FundingOptions.swift b/Bitkit/Views/Transfer/FundingOptions.swift index 2bc13628d..68ef798ca 100644 --- a/Bitkit/Views/Transfer/FundingOptions.swift +++ b/Bitkit/Views/Transfer/FundingOptions.swift @@ -76,7 +76,7 @@ struct FundingOptions: View { ) { Button(t("lightning__no_funds__fund")) { navigation.reset() - sheets.showSheet(.receive, data: ReceiveConfig(view: .cjitAmount)) + sheets.showSheet(.receive, data: ReceiveConfig(view: .qr(cjitInvoice: nil, tab: .savings))) } Button(t("common__cancel"), role: .cancel) {} } message: { From f7ce23780450896fc0f6593da70957532184f5cc Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Fri, 10 Apr 2026 14:04:06 -0300 Subject: [PATCH 9/9] fix: test tag FundManual --- Bitkit/Views/Transfer/FundingOptions.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bitkit/Views/Transfer/FundingOptions.swift b/Bitkit/Views/Transfer/FundingOptions.swift index 68ef798ca..9b12354c0 100644 --- a/Bitkit/Views/Transfer/FundingOptions.swift +++ b/Bitkit/Views/Transfer/FundingOptions.swift @@ -60,7 +60,7 @@ struct FundingOptions: View { RectangleButton( icon: "pencil", title: t("lightning__funding__button3"), - testID: "FundCustom" + testID: "FundManual" ) { navigation.navigate(.fundManual(nodeUri: nil)) }