From 6e6aaebdb5d6d987444d7021413a22ff6567c8db Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 2 Apr 2026 14:38:39 -0300 Subject: [PATCH 01/15] feat: ExternalSuccessScreen.kt new text and image --- .../ui/screens/transfer/external/ExternalSuccessScreen.kt | 4 ++-- app/src/main/res/values-ar/strings.xml | 3 ++- app/src/main/res/values-b+es+419/strings.xml | 3 ++- app/src/main/res/values-ca/strings.xml | 3 ++- app/src/main/res/values-cs/strings.xml | 3 ++- app/src/main/res/values-de/strings.xml | 3 ++- app/src/main/res/values-el/strings.xml | 3 ++- app/src/main/res/values-es-rES/strings.xml | 3 ++- app/src/main/res/values-es/strings.xml | 3 ++- app/src/main/res/values-fr/strings.xml | 3 ++- app/src/main/res/values-it/strings.xml | 3 ++- app/src/main/res/values-nl/strings.xml | 3 ++- app/src/main/res/values-pl/strings.xml | 3 ++- app/src/main/res/values-pt-rBR/strings.xml | 3 ++- app/src/main/res/values-pt/strings.xml | 3 ++- app/src/main/res/values-ru/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 3 ++- 17 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt index 413e5abe0..a80182084 100644 --- a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt @@ -17,10 +17,10 @@ fun ExternalSuccessScreen( onContinue: () -> Unit, ) { InfoScreenContent( - navTitle = stringResource(R.string.lightning__external__nav_title), + navTitle = stringResource(R.string.lightning__external_success__nav_title), title = stringResource(R.string.lightning__external_success__title).withAccent(accentColor = Colors.Purple), description = stringResource(R.string.lightning__external_success__text).withAccentBoldBright(), - image = painterResource(R.drawable.switch_box), + image = painterResource(R.drawable.lightning), buttonText = localizedRandom(R.string.common__ok_random), onButtonClick = onContinue, testTag = "ExternalSuccess", diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 840561096..39068993e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -130,8 +130,9 @@ مسح QR يمكنك استخدام عقدة خارجية لفتح اتصال Lightning يدويًا. أدخل تفاصيل العقدة للمتابعة. <accent>إعداد يدوي</accent> + رصيد الإنفاق بدأ اتصال Lightning. ستتمكن من استخدام رصيد الإنفاق خلال <accent>±30 دقيقة</accent> (يعتمد على إعدادات العقدة). - بدأ\n<accent>الاتصال</accent> + القناة\n<accent>قيد الفتح</accent> معدل الرسوم وقت تحديث ذاكرة التخزين المؤقت لمعدل الرسوم الرسوم diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 9dbd3625a..8edf43a78 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -130,8 +130,9 @@ Escanear QR Puedes usar un nodo externo para abrir una conexión Lightning manualmente. Ingresa los datos del nodo para continuar. <accent>Config. manual</accent> + Saldo de gasto Conexión lightning iniciada. Podrá utilizar su saldo de gastos en <accent>±30 minutos</accent> (depende de la config. del nodo). - Conexión\n<accent>iniciada</accent> + Apertura\n<accent>de canal</accent> Tarifa Hora de actualización de caché de tarifa Tarifa diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index c30193647..35a7a580c 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -130,8 +130,9 @@ Escaneja QR Pots utilitzar un node extern per obrir manualment una connexió Lightning. Introdueix els detalls del node per continuar. <accent>Configuració manual</accent> + Saldo de despesa Connexió Lightning iniciada. Podràs utilitzar el teu saldo de despesa en <accent>±30 minuts</accent> (depèn de la configuració del node). - Connexió\n<accent>iniciada</accent> + Obertura\n<accent>de canal</accent> Taxa de tarifa Temps d\'actualització de la memòria cau de tarifes Tarifes diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8f9d457f2..98b4939b2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -130,8 +130,9 @@ Skenovat QR Můžete použít externí uzel k ručnímu otevření lightning připojení. Zadejte údaje o uzlu pro pokračování. <accent>Manuální nastavení</accent> + Zůstatek k utracení Iniciováno připojení lightning. Zůstatek na účtu budete moci použít do <accent>±30 minut</accent> (závisí na konfiguraci uzlu). - Připojení\n<accent>iniciováno</accent> + Otevírání\n<accent>kanálu</accent> Sazba poplatku Čas aktualizace mezipaměti poplatků Poplatky diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b3e55d72f..b77bd9848 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -152,7 +152,8 @@ Paste Node URI QR-Code scannen Spending\n<accent>balance</accent> - Verbindung\n<accent>initiiert</accent> + Kanal wird\n<accent>geöffnet</accent> + Ausgabenguthaben Lightning-Verbindung initiiert. Du kannst dein Guthaben in <accent>±30 Minuten</accent> verwenden (abhängig von der Node-Konfiguration). Einrichtung der Instant-Zahlungen fehlgeschlagen Ein Fehler ist bei der Einrichtung deines Sofortguthabens aufgetreten. {raw} diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 379545f73..94c461e9b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -130,8 +130,9 @@ Σάρωση QR Μπορείς να χρησιμοποιήσεις έναν εξωτερικό κόμβο για να ανοίξεις χειροκίνητα μια σύνδεση Lightning. Εισάγαγε τα στοιχεία του κόμβου για να συνεχίσεις. <accent>Χειροκίνητη ρύθμιση</accent> + Υπόλοιπο δαπανών Η σύνδεση Lightning ξεκίνησε. Θα μπορείς να χρησιμοποιήσεις το υπόλοιπο δαπανών σε <accent>±30 λεπτά</accent> (εξαρτάται από τη διαμόρφωση του κόμβου). - Η σύνδεση\n<accent>ξεκίνησε</accent> + Άνοιγμα\n<accent>καναλιού</accent> Ποσοστό τέλους Χρόνος ενημέρωσης cache τελών Τέλη diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 252257879..2e2140ece 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -130,8 +130,9 @@ Escanear QR Puedes usar un nodo externo para abrir manualmente una conexión Lightning. Introduce los datos del nodo para continuar. <accent>Configuración manual</accent> + Saldo de gasto Conexión Lightning iniciada. Podrá usar su balance para pagar en <accent>±30 minutos</accent> (depende de la configuración del nodo). - Conexión\n<accent>iniciada</accent> + Apertura\n<accent>de canal</accent> Tasa de comisión Hora de actualización de caché de tasas Comisiones diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8a8788259..5a64287b9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -109,7 +109,7 @@ Pegar URI del nodo Puedes usar un nodo externo para abrir manualmente una conexión Lightning. Introduce los datos del nodo para continuar. <accent>Configuración manual</accent> - Conexión\n<accent>iniciada</accent> + Apertura\n<accent>de canal</accent> Tasa de comisión Hora de actualización de caché de comisiones Comisiones @@ -201,6 +201,7 @@ Servidor Puerto Escanear QR + Saldo de gasto Conexión Lightning iniciada. Podrá usar su balance para pagar en <accent>±30 minutos</accent> (depende de la configuración del nodo). Error en la Configuración de Pago Instántaneo Gasto diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9b11dcd6a..52a00e373 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -152,7 +152,8 @@ Coller l\'URI du nœud Scanner QR Dépenses \n<accent>solde</accent> - Connexion \n<accent>initiée</accent> + Ouverture\n<accent>du canal</accent> + Solde de dépenses La connexion Lightning est initiée. Vous pourrez utiliser votre compte courant dans <accent>±30 minutes</accent> (en fonction de la configuration du nœud). Échec de la configuration des paiements instantanés Une erreur s\'est produite lors de l\'établissement de votre solde du compte courant. {raw} diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c54328363..043e961f1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -130,8 +130,9 @@ Scansiona QR Puoi usare un nodo esterno per aprire manualmente una connessione Lightning. Inserisci i dettagli del nodo per continuare. <accent>Configurazione manuale</accent> + Saldo di spesa Connessione Lightning avviata. Potrai utilizzare il tuo conto di spesa in <accent>±30 minuti</accent> (dipende dalla configurazione del nodo). - Connessione\n<accent>avviata</accent> + Apertura\n<accent>del canale</accent> Tasso di commissione Tempo di Aggiornamento Cache Commissioni Commissioni diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 141fd00b9..c07a996f2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -130,8 +130,9 @@ QR scannen Je kunt een externe node gebruiken om handmatig een Lightning-verbinding te openen. Voer de node-gegevens in om door te gaan. <accent>Handmatige configuratie</accent> + Uitgavenbalans Lightning-verbinding gestart. Je kunt je bestedingssaldo gebruiken in <accent>±30 minuten</accent> (afhankelijk van node-configuratie). - Verbinding\n<accent>gestart</accent> + Kanaal wordt\n<accent>geopend</accent> Vergoedingstarief Vergoedingstarief cache update tijd Vergoedingen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ad72a04c2..04c1c4516 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -152,7 +152,8 @@ Wklej adres URI węzła Skanuj QR Saldo\n<accent>wydatków</accent> - Połączenie\n<accent>zainicjowane</accent> + Otwieranie\n<accent>kanału</accent> + Saldo wydatków Połączenie Lightning zostało zainicjowane. Będą Państwo mogli wykorzystać swoje saldo wydatków w ciągu <accent>±30 minut</accent> (w zależności od konfiguracji węzła). Konfiguracja płatności natychmiastowych nie powiodła się Wystąpił błąd podczas konfigurowania salda natychmiastowego. {raw} diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8bb66e6d9..88c0aa0dc 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -130,8 +130,9 @@ Escanear QR Você pode usar um nó externo para abrir manualmente uma conexão Lightning. Digite os detalhes do nó para continuar. <accent>Setup manual</accent> + Saldo de gastos Conexão Lightning iniciada. Você poderá usar seu saldo de gastos em <accent>±30 minutos</accent> (depende da configuração do nó). - Conexão\n<accent>iniciada</accent> + Abertura\n<accent>de canal</accent> Taxa por bytes Atualização do Cache de Taxa Taxas diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index dcf964b10..7cc23e873 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -152,7 +152,8 @@ Colar URI do nó Escanear QR Saldo de\n<accent>gastos</accent> - Conexão\n<accent>iniciada</accent> + Abertura\n<accent>de canal</accent> + Saldo de gastos Conexão Lightning iniciada. Você poderá usar seu saldo de gastos em <accent>±30 minutos</accent> (depende da configuração do nó). Setup dos Pagamentos Instantâneos falhou Ocorreu um erro ao configurar seu saldo de gastos. {raw} diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 56e7f7acf..3f9c4cfee 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -138,8 +138,9 @@ Сканировать QR Вы можете использовать внешний узел для ручного открытия Lightning соединения. Введите данные узла, чтобы продолжить. <accent>Ручная Настройка</accent> + Баланс расходов Lightning соединение инициировано. Вы сможете использовать ваш баланс расходов через <accent>±30 минут</accent> (зависит от конфигурации узла). - Соединение\n<accent>Инициировано</accent> + Открытие\n<accent>канала</accent> Ставка Комиссии Время обновления кэша комиссии Комиссии diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6d409e9f2..f19f6b052 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -136,8 +136,9 @@ Scan QR You can use an external node to manually open a Lightning connection. Enter the node details to continue. <accent>Manual setup</accent> + Spending Balance Lightning connection initiated. You will be able to use your spending balance in <accent>±30 minutes</accent> (depends on node configuration). - Connection\n<accent>initiated</accent> + Channel\n<accent>opening</accent> Fee rate Fee Rate Cache Update Time Fees From 2a920c001a3537f9aeeb0215540ce5ddf92bf800 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 2 Apr 2026 14:39:47 -0300 Subject: [PATCH 02/15] chore: add changelog entry Co-Authored-By: Claude Opus 4.6 (1M context) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 333a54e01..969e8f67a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Mnemonic warning text transitions on reveal #857 ### Changed +- Update external success screen title and image to match new design - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857 - Icons added to all settings rows for faster scanning #857 - Selected values displayed on right side of settings rows #857 From aece068dd5029db5b4faf7e2df579d8661e2e1a7 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 2 Apr 2026 14:40:31 -0300 Subject: [PATCH 03/15] chore: backfill changelog pr number Co-Authored-By: Claude Opus 4.6 (1M context) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 969e8f67a..6339cc8c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Mnemonic warning text transitions on reveal #857 ### Changed -- Update external success screen title and image to match new design +- Update external success screen title and image to match new design #883 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857 - Icons added to all settings rows for faster scanning #857 - Selected values displayed on right side of settings rows #857 From 4deca4e2629e5178e36a8cb04712f570931f42c6 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Thu, 2 Apr 2026 15:24:05 -0300 Subject: [PATCH 04/15] chore: lint --- app/src/main/res/values-es/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a573fa24c..7c720ddfe 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -109,6 +109,8 @@ Pegar URI del nodo Puedes usar un nodo externo para abrir manualmente una conexión Lightning. Introduce los datos del nodo para continuar. <accent>Configuración manual</accent> + Saldo de gasto + Conexión Lightning iniciada. Podrá usar su balance para pagar en <accent>±30 minutos</accent> (depende de la configuración del nodo). Apertura\n<accent>de canal</accent> Tasa de comisión Hora de actualización de caché de comisiones @@ -201,8 +203,6 @@ Servidor Puerto Escanear QR - Saldo de gasto - Conexión Lightning iniciada. Podrá usar su balance para pagar en <accent>±30 minutos</accent> (depende de la configuración del nodo). Error en la Configuración de Pago Instántaneo Gasto Ahorro From f8d332c1e5bb7fd5191d10a5fa64716922d6d785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Sena?= Date: Fri, 3 Apr 2026 08:57:42 -0300 Subject: [PATCH 05/15] Update CHANGELOG.md Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fc6d71fc..0ac500385 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Mnemonic warning text transitions on reveal #857 ### Changed +- Update external success screen title and image to match new design #883 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863 - Update external success screen title and image to match new design #883 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857 From f32c613352537fb9fd29347eeefa2a714cac34a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Sena?= Date: Fri, 3 Apr 2026 20:57:17 -0300 Subject: [PATCH 06/15] Update CHANGELOG.md Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ac500385..c3dde1637 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Update external success screen title and image to match new design #883 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863 - Update external success screen title and image to match new design #883 -- Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857 - Icons added to all settings rows for faster scanning #857 - Selected values displayed on right side of settings rows #857 - Support screen redesigned with About content merged in #857 From 62cb746046507a588b4dce24394cacd122d8c00a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Sena?= Date: Fri, 3 Apr 2026 20:57:26 -0300 Subject: [PATCH 07/15] Update app/src/main/res/values-de/strings.xml Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> --- app/src/main/res/values-de/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7db2f5bbc..b756bfdf4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -154,6 +154,7 @@ Spending\n<accent>balance</accent> Kanal wird\n<accent>geöffnet</accent> Ausgabenguthaben + Kanal wird\n<accent>geöffnet</accent> Lightning-Verbindung initiiert. Du kannst dein Guthaben in <accent>±30 Minuten</accent> verwenden (abhängig von der Node-Konfiguration). Einrichtung der Instant-Zahlungen fehlgeschlagen Ein Fehler ist bei der Einrichtung deines Sofortguthabens aufgetreten. {raw} From fc42b21a167eb42acb16bded56cf5ed6a38599ad Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Mon, 6 Apr 2026 08:26:06 -0300 Subject: [PATCH 08/15] fix: duplicated and out of order strings --- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b756bfdf4..5245e71a3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -152,7 +152,6 @@ Paste Node URI QR-Code scannen Spending\n<accent>balance</accent> - Kanal wird\n<accent>geöffnet</accent> Ausgabenguthaben Kanal wird\n<accent>geöffnet</accent> Lightning-Verbindung initiiert. Du kannst dein Guthaben in <accent>±30 Minuten</accent> verwenden (abhängig von der Node-Konfiguration). diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d5e725491..331705090 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -152,8 +152,8 @@ Coller l\'URI du nœud Scanner QR Dépenses \n<accent>solde</accent> - Ouverture\n<accent>du canal</accent> Solde de dépenses + Ouverture\n<accent>du canal</accent> La connexion Lightning est initiée. Vous pourrez utiliser votre compte courant dans <accent>±30 minutes</accent> (en fonction de la configuration du nœud). Échec de la configuration des paiements instantanés Une erreur s\'est produite lors de l\'établissement de votre solde du compte courant. {raw} diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8278ea2f7..981a987e5 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -152,8 +152,8 @@ Wklej adres URI węzła Skanuj QR Saldo\n<accent>wydatków</accent> - Otwieranie\n<accent>kanału</accent> Saldo wydatków + Otwieranie\n<accent>kanału</accent> Połączenie Lightning zostało zainicjowane. Będą Państwo mogli wykorzystać swoje saldo wydatków w ciągu <accent>±30 minut</accent> (w zależności od konfiguracji węzła). Konfiguracja płatności natychmiastowych nie powiodła się Wystąpił błąd podczas konfigurowania salda natychmiastowego. {raw} diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 79f86668d..9f5f33101 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -152,8 +152,8 @@ Colar URI do nó Escanear QR Saldo de\n<accent>gastos</accent> - Abertura\n<accent>de canal</accent> Saldo de gastos + Abertura\n<accent>de canal</accent> Conexão Lightning iniciada. Você poderá usar seu saldo de gastos em <accent>±30 minutos</accent> (depende da configuração do nó). Setup dos Pagamentos Instantâneos falhou Ocorreu um erro ao configurar seu saldo de gastos. {raw} From 4fa821479b69d80eb9524f48d464437ff279310a Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Mon, 6 Apr 2026 08:26:21 -0300 Subject: [PATCH 09/15] fix: duplicated changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index deade83a7..a1cee92a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Update external success screen title and image to match new design #883 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863 -- Update external success screen title and image to match new design #883 +- Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857 - Icons added to all settings rows for faster scanning #857 - Selected values displayed on right side of settings rows #857 - Support screen redesigned with About content merged in #857 From 05ebe138be6da29fb191a0daa1b719a7d4642e67 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Mon, 6 Apr 2026 09:39:34 -0300 Subject: [PATCH 10/15] chore: lint --- .../to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt index b10954e85..a35a81f19 100644 --- a/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt @@ -38,6 +38,7 @@ import to.bitkit.ui.components.EmptyStateView import to.bitkit.ui.components.IncomingTransfer import to.bitkit.ui.components.SecondaryButton import to.bitkit.ui.components.TabBar +import to.bitkit.ui.components.VerticalSpacer import to.bitkit.ui.scaffold.AppTopBar import to.bitkit.ui.scaffold.DrawerNavIcon import to.bitkit.ui.scaffold.ScreenColumn @@ -113,7 +114,7 @@ fun SpendingWalletScreen( } if (!showEmptyState) { - Spacer(modifier = Modifier.height(32.dp)) + VerticalSpacer(32.dp) if (canTransfer) { SecondaryButton( @@ -123,7 +124,7 @@ fun SpendingWalletScreen( Icon( painter = painterResource(R.drawable.ic_transfer), contentDescription = null, - modifier = Modifier.size(16.dp), + modifier = Modifier.size(16.dp) ) }, modifier = Modifier.testTag("TransferToSavings") From 873309d1bfb5678a03fd30fad3c21cc5e74bbf9b Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Mon, 6 Apr 2026 09:42:29 -0300 Subject: [PATCH 11/15] chore: lint --- .../java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt index a35a81f19..35b893736 100644 --- a/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt @@ -4,10 +4,8 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size From 47357318db9eb1f7f305fb1b31702e61fae3150b Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 6 Apr 2026 21:12:26 +0200 Subject: [PATCH 12/15] fix: secondary button weight layout regression --- .../java/to/bitkit/ui/components/Button.kt | 42 +++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/components/Button.kt b/app/src/main/java/to/bitkit/ui/components/Button.kt index dc91fb4f8..58a5529ec 100644 --- a/app/src/main/java/to/bitkit/ui/components/Button.kt +++ b/app/src/main/java/to/bitkit/ui/components/Button.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredHeight @@ -83,6 +82,7 @@ enum class ButtonSize { Small -> 8.dp Large -> 6.dp } + fun secondaryBorder(enabled: Boolean): BorderStroke = when (this) { Large -> BorderStroke(2.dp, if (enabled) Colors.Gray4 else Color.Transparent) Small -> BorderStroke(1.dp, if (enabled) Colors.White16 else Color.Transparent) @@ -183,6 +183,7 @@ fun SecondaryButton( // and AFTER size modifiers (Haze needs to know dimensions) val buttonShape = MaterialTheme.shapes.extraLarge Box( + propagateMinConstraints = true, modifier = modifier .then(if (fullWidth) Modifier.fillMaxWidth() else Modifier) .requiredHeight(size.height) @@ -200,7 +201,7 @@ fun SecondaryButton( } else { Modifier } - ) + ), ) { OutlinedButton( onClick = rememberDebouncedClick(onClick = onClick), @@ -208,7 +209,6 @@ fun SecondaryButton( colors = AppButtonDefaults.secondaryColors.copy(contentColor = contentColor), contentPadding = contentPadding, border = border, - modifier = if (fullWidth) Modifier.fillMaxSize() else Modifier, ) { if (isLoading) { GradientCircularProgressIndicator( @@ -488,6 +488,25 @@ private fun SecondaryButtonPreview() { ) }, ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + SecondaryButton( + text = "Secondary", + fullWidth = false, + hazeState = hazeState, + onClick = {}, + modifier = Modifier.weight(1f) + ) + SecondaryButton( + text = "Secondary", + fullWidth = false, + hazeState = hazeState, + onClick = {}, + modifier = Modifier.weight(1f) + ) + } SecondaryButton( text = "Secondary Small", size = ButtonSize.Small, @@ -588,6 +607,23 @@ private fun TertiaryButtonPreview() { }, onClick = {} ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + TertiaryButton( + text = "Tertiary", + fullWidth = false, + onClick = {}, + modifier = Modifier.weight(1f) + ) + TertiaryButton( + text = "Tertiary", + fullWidth = false, + onClick = {}, + modifier = Modifier.weight(1f) + ) + } TertiaryButton( text = "Tertiary Small", size = ButtonSize.Small, From 6f14ab2d0a4bb0f806c5536845f4944de20aecc7 Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 6 Apr 2026 21:27:51 +0200 Subject: [PATCH 13/15] chore: rm modifier arg trailing comma --- app/src/main/java/to/bitkit/ui/components/Button.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/to/bitkit/ui/components/Button.kt b/app/src/main/java/to/bitkit/ui/components/Button.kt index 58a5529ec..6887ed3a3 100644 --- a/app/src/main/java/to/bitkit/ui/components/Button.kt +++ b/app/src/main/java/to/bitkit/ui/components/Button.kt @@ -201,7 +201,7 @@ fun SecondaryButton( } else { Modifier } - ), + ) ) { OutlinedButton( onClick = rememberDebouncedClick(onClick = onClick), From 6c59ca11ed0770e78c187154f99bc2f3d57737a9 Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 6 Apr 2026 21:49:41 +0200 Subject: [PATCH 14/15] chore; update changelog entry for PR #883 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef6126ab1..65e0c7861 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Mnemonic warning text transitions on reveal #857 ### Changed -- Update external success screen title and image to match new design #883 +- Updated design of the success screen in the manual channel setup flow #883 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857 - Icons added to all settings rows for faster scanning #857 From f3c0c542bdb6eb63b6891fe10e385f64b17f61f2 Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 6 Apr 2026 21:49:41 +0200 Subject: [PATCH 15/15] chore; update changelog entry for PR #883 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef6126ab1..eb2b65070 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Mnemonic warning text transitions on reveal #857 ### Changed -- Update external success screen title and image to match new design #883 +- Updated design of the success screen in the manual channel setup flow #883 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857 - Icons added to all settings rows for faster scanning #857