Skip to content

Commit 0571bdd

Browse files
oleonovoleonov
committed
Fix Litecoin BIP descriptions in token info dialog
1 parent d2fbcd7 commit 0571bdd

16 files changed

Lines changed: 163 additions & 28 deletions

File tree

‎app/src/main/java/cash/p/terminal/modules/configuredtoken/ConfiguredTokenInfoDialog.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import cash.p.terminal.ui_compose.requireInput
4343
import cash.p.terminal.ui_compose.theme.ComposeAppTheme
4444
import cash.p.terminal.wallet.Token
4545
import io.horizontalsystems.chartview.rememberAsyncImagePainterWithFallback
46+
import io.horizontalsystems.core.entities.BlockchainType
4647
import org.koin.compose.viewmodel.koinViewModel
4748
import org.koin.core.parameter.parametersOf
4849

@@ -108,9 +109,14 @@ private fun ConfiguredTokenInfo(navController: NavController, token: Token) {
108109
}
109110

110111
is ConfiguredTokenInfoType.Bips -> {
112+
val descriptionRes = if (tokenInfoType.blockchainType == BlockchainType.Litecoin) {
113+
R.string.manage_coins_bips_description_litecoin
114+
} else {
115+
R.string.ManageCoins_BipsDescription
116+
}
111117
body_leah(
112118
text = stringResource(
113-
R.string.ManageCoins_BipsDescription,
119+
descriptionRes,
114120
tokenInfoType.blockchainName,
115121
tokenInfoType.blockchainName,
116122
tokenInfoType.blockchainName

‎app/src/main/java/cash/p/terminal/modules/configuredtoken/ConfiguredTokenInfoViewModel.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ConfiguredTokenInfoViewModel(
6161
}
6262

6363
is TokenType.Derived -> {
64-
Bips(token.blockchain.name)
64+
Bips(token.blockchain.name, token.blockchainType)
6565
}
6666

6767
is TokenType.AddressTyped -> {
@@ -118,7 +118,10 @@ sealed class ConfiguredTokenInfoType {
118118
val explorerUrl: String?
119119
) : ConfiguredTokenInfoType()
120120

121-
data class Bips(val blockchainName: String) : ConfiguredTokenInfoType()
121+
data class Bips(
122+
val blockchainName: String,
123+
val blockchainType: BlockchainType
124+
) : ConfiguredTokenInfoType()
122125
object Bch : ConfiguredTokenInfoType()
123126
data class BirthdayHeight(val height: Long?) : ConfiguredTokenInfoType()
124127
}

‎core/strings/src/main/res/values-ar/strings.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,14 +1057,23 @@
10571057
<string name="ManageCoins_Search">Name, code or contract address</string>
10581058
<string name="ManageCoins_AddToken">Add Token</string>
10591059
<string name="ManageCoins_NoResults">No results found. Try to add token manually if you know its smart contract address.</string>
1060-
<string name="ManageCoins_BipsDescription">There are 4 common address formats %1$s wallets can use to receive incoming payments:
1060+
<string name="ManageCoins_BipsDescription">هناك 4 تنسيقات شائعة للعناوين يمكن لمحافظ %1$s استخدامها لاستلام المدفوعات الواردة:
10611061
\n
1062-
\n- BIP-44 (older)
1062+
\n- BIP-44 (الأقدم)
10631063
\n- BIP-49
1064-
\n- BIP-84 (recommended)
1065-
\n- BIP-86 (newest)
1064+
\n- BIP-84 (موصى به)
1065+
\n- BIP-86 (الأحدث)
10661066
\n
1067-
\nWhile P.CASH wallet supports all 4 of them it recommends to use a %2$s wallet operating in BIP-84 format. The wallets operating in this format get to pay lowest fees when sending %3$s transactions.</string>
1067+
\nمع أن محفظة P.CASH تدعمها جميعها الأربعة، يُوصى باستخدام محفظة %2$s تعمل بتنسيق BIP-84. المحافظ التي تعمل بهذا التنسيق تدفع أقل الرسوم عند إرسال معاملات %3$s.</string>
1068+
<string name="manage_coins_bips_description_litecoin">هناك 5 تنسيقات شائعة للعناوين يمكن لمحافظ %1$s استخدامها لاستلام المدفوعات الواردة:
1069+
\n
1070+
\n- BIP-44 (الأقدم)
1071+
\n- BIP-49
1072+
\n- BIP-84 (موصى به)
1073+
\n- BIP-86 (الأحدث)
1074+
\n- MWEB (خاص)
1075+
\n
1076+
\nمع أن محفظة P.CASH تدعمها جميعها الخمسة، يُوصى باستخدام محفظة %2$s تعمل بتنسيق BIP-84. المحافظ التي تعمل بهذا التنسيق تدفع أقل الرسوم عند إرسال معاملات %3$s.</string>
10681077
<string name="ManageCoins_BchTypeDescription">There are 2 address formats Bitcoin Cash wallets can use to receive incoming payments:
10691078
\n
10701079
\n- TYPE0 (older)

‎core/strings/src/main/res/values-de/strings.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,15 @@
10581058
\n- BIP-86 (neueste)
10591059
\n
10601060
\nWährend unaufhaltsame Brieftasche alle 4 von ihnen unterstützt, empfiehlt es sich, eine %2$s Brieftasche im BIP-84 Format zu verwenden. Die Brieftaschen in diesem Format zahlen die niedrigsten Gebühren beim Senden von %3$s -Transaktionen.</string>
1061+
<string name="manage_coins_bips_description_litecoin">Es gibt 5 gängige Adressformate, die %1$s-Wallets zum Empfang eingehender Zahlungen verwenden können:
1062+
\n
1063+
\n- BIP-44 (älter)
1064+
\n- BIP-49
1065+
\n- BIP-84 (empfohlen)
1066+
\n- BIP-86 (neueste)
1067+
\n- MWEB (privat)
1068+
\n
1069+
\nObwohl die P.CASH-Wallet alle 5 davon unterstützt, wird empfohlen, eine %2$s-Wallet im BIP-84-Format zu verwenden. Wallets in diesem Format zahlen die niedrigsten Gebühren beim Senden von %3$s-Transaktionen.</string>
10611070
<string name="ManageCoins_BchTypeDescription">Es gibt 2 Adressformate Bitcoin Cash Wallets zum Empfang eingehender Zahlungen:\n\n- TYPE 0 (älter)\n- TYPE 145 (neuer)\n\nWährend unaufhaltsame Brieftaschen beide unterstützt, empfiehlt es sich, ein Bitcoin Cash Wallet im TYPE 145 Format zu verwenden.</string>
10621071
<string name="ManageCoins_ContractAddress">CONTRACT ADRESSE</string>
10631072

‎core/strings/src/main/res/values-es/strings.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,15 @@
10581058
\n- BIP-86 (más reciente)
10591059
\n
10601060
\nMientras que el monedero imparable soporta todos los 4 de ellos recomienda usar un monedero %2$s que opere en formato BIP-84. Las billeteras que operan en este formato pueden pagar las comisiones más bajas al enviar transacciones %3$s.</string>
1061+
<string name="manage_coins_bips_description_litecoin">Existen 5 formatos de dirección comunes que los monederos %1$s pueden usar para recibir pagos entrantes:
1062+
\n
1063+
\n- BIP-44 (más antiguo)
1064+
\n- BIP-49
1065+
\n- BIP-84 (recomendado)
1066+
\n- BIP-86 (más reciente)
1067+
\n- MWEB (privado)
1068+
\n
1069+
\nAunque el monedero P.CASH admite los 5, se recomienda usar un monedero %2$s que opere en formato BIP-84. Los monederos que operan en este formato pagan las comisiones más bajas al enviar transacciones %3$s.</string>
10611070
<string name="ManageCoins_BchTypeDescription">Hay 2 formatos de dirección de las carteras Bitcoin Cash pueden usar para recibir pagos entrantes:\n\n- TYPE 0 (más antiguo)\n- TYPE 145 (más reciente)\n\nMientras que el monedero imparable soporta ambos se recomienda usar un monedero Bitcoin Cash que funcione en formato TYPE 145.</string>
10621071
<string name="ManageCoins_ContractAddress">AÑADIR CONTRACTO</string>
10631072

‎core/strings/src/main/res/values-fa/strings.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,14 +1057,23 @@
10571057
<string name="ManageCoins_Search">Name, code or contract address</string>
10581058
<string name="ManageCoins_AddToken">اضافه کردن نشان</string>
10591059
<string name="ManageCoins_NoResults">نتیجه ای پیدا نشد. اگر آدرس قرارداد هوشمند آن را می‌دانید، سعی کنید توکن را به صورت دستی اضافه کنید.</string>
1060-
<string name="ManageCoins_BipsDescription">There are 4 common address formats %1$s wallets can use to receive incoming payments:
1060+
<string name="ManageCoins_BipsDescription">4 قالب آدرس رایج وجود دارد که کیف‌پول‌های %1$s می‌توانند برای دریافت پرداخت‌های ورودی از آن‌ها استفاده کنند:
10611061
\n
1062-
\n- BIP-44 (older)
1062+
\n- BIP-44 (قدیمی‌تر)
10631063
\n- BIP-49
1064-
\n- BIP-84 (recommended)
1065-
\n- BIP-86 (newest)
1064+
\n- BIP-84 (توصیه‌شده)
1065+
\n- BIP-86 (جدیدترین)
10661066
\n
1067-
\nWhile P.CASH wallet supports all 4 of them it recommends to use a %2$s wallet operating in BIP-84 format. The wallets operating in this format get to pay lowest fees when sending %3$s transactions.</string>
1067+
\nبا اینکه کیف‌پول P.CASH از هر 4 مورد پشتیبانی می‌کند، توصیه می‌شود از کیف‌پول %2$s با قالب BIP-84 استفاده کنید. کیف‌پول‌هایی که با این قالب کار می‌کنند هنگام ارسال تراکنش‌های %3$s کمترین کارمزد را پرداخت می‌کنند.</string>
1068+
<string name="manage_coins_bips_description_litecoin">5 قالب آدرس رایج وجود دارد که کیف‌پول‌های %1$s می‌توانند برای دریافت پرداخت‌های ورودی از آن‌ها استفاده کنند:
1069+
\n
1070+
\n- BIP-44 (قدیمی‌تر)
1071+
\n- BIP-49
1072+
\n- BIP-84 (توصیه‌شده)
1073+
\n- BIP-86 (جدیدترین)
1074+
\n- MWEB (خصوصی)
1075+
\n
1076+
\nبا اینکه کیف‌پول P.CASH از هر 5 مورد پشتیبانی می‌کند، توصیه می‌شود از کیف‌پول %2$s با قالب BIP-84 استفاده کنید. کیف‌پول‌هایی که با این قالب کار می‌کنند هنگام ارسال تراکنش‌های %3$s کمترین کارمزد را پرداخت می‌کنند.</string>
10681077
<string name="ManageCoins_BchTypeDescription">There are 2 address formats Bitcoin Cash wallets can use to receive incoming payments:
10691078
\n
10701079
\n- TYPE0 (older)

‎core/strings/src/main/res/values-fr/strings.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,14 +1051,23 @@
10511051
<string name="ManageCoins_Search">Nom, code ou adresse du contrat</string>
10521052
<string name="ManageCoins_AddToken">Ajouter le token</string>
10531053
<string name="ManageCoins_NoResults">Aucun résultat trouvé. Essayez d\'ajouter le token manuellement si vous connaissez son adresse de contrat intelligent.</string>
1054-
<string name="ManageCoins_BipsDescription">There are 4 common address formats %1$s wallets can use to receive incoming payments:
1054+
<string name="ManageCoins_BipsDescription">Il existe 4 formats d\'adresse courants que les portefeuilles %1$s peuvent utiliser pour recevoir des paiements entrants :
10551055
\n
1056-
\n- BIP-44 (older)
1056+
\n- BIP-44 (plus ancien)
10571057
\n- BIP-49
1058-
\n- BIP-84 (recommended)
1059-
\n- BIP-86 (newest)
1058+
\n- BIP-84 (recommandé)
1059+
\n- BIP-86 (le plus récent)
10601060
\n
1061-
\nWhile P.CASH wallet supports all 4 of them it recommends to use a %2$s wallet operating in BIP-84 format. The wallets operating in this format get to pay lowest fees when sending %3$s transactions.</string>
1061+
\nBien que le portefeuille P.CASH les prenne tous les 4 en charge, il est recommandé d\'utiliser un portefeuille %2$s fonctionnant au format BIP-84. Les portefeuilles utilisant ce format paient les frais les plus bas lors de l\'envoi de transactions %3$s.</string>
1062+
<string name="manage_coins_bips_description_litecoin">Il existe 5 formats d\'adresse courants que les portefeuilles %1$s peuvent utiliser pour recevoir des paiements entrants :
1063+
\n
1064+
\n- BIP-44 (plus ancien)
1065+
\n- BIP-49
1066+
\n- BIP-84 (recommandé)
1067+
\n- BIP-86 (le plus récent)
1068+
\n- MWEB (privé)
1069+
\n
1070+
\nBien que le portefeuille P.CASH les prenne tous les 5 en charge, il est recommandé d\'utiliser un portefeuille %2$s fonctionnant au format BIP-84. Les portefeuilles utilisant ce format paient les frais les plus bas lors de l\'envoi de transactions %3$s.</string>
10621071
<string name="ManageCoins_BchTypeDescription">There are 2 address formats Bitcoin Cash wallets can use to receive incoming payments:
10631072
\n
10641073
\n- TYPE0 (older)

‎core/strings/src/main/res/values-ko/strings.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,15 @@
10651065
\n- BIP 86 (최신)
10661066
\n
10671067
\nP.CASH 지갑은 4가지 모두를 지원하지만 BIP-84 형식으로 작동하는 %2$s 지갑을 사용하는 것이 좋습니다. 이 형식으로 작동하는 지갑은 %3$s 거래를 보낼 때 가장 낮은 수수료를 지불합니다.</string>
1068+
<string name="manage_coins_bips_description_litecoin">%1$s 지갑이 입금을 받는 데 사용할 수 있는 5가지 일반적인 주소 형식이 있습니다.
1069+
\n
1070+
\n- BIP-44 (이전)
1071+
\n- BIP-49
1072+
\n- BIP-84 (추천)
1073+
\n- BIP-86 (최신)
1074+
\n- MWEB (비공개)
1075+
\n
1076+
\nP.CASH 지갑은 5가지 모두를 지원하지만 BIP-84 형식으로 작동하는 %2$s 지갑을 사용하는 것이 좋습니다. 이 형식으로 작동하는 지갑은 %3$s 거래를 보낼 때 가장 낮은 수수료를 지불합니다.</string>
10681077
<string name="ManageCoins_BchTypeDescription">비트코인 캐시 지갑이 수신 지불을 받는 데 사용할 수 있는 2가지 주소 형식이 있습니다.\n\n- 유형 0(이전)\n- 유형 145(최신)\n\nP.CASH 지갑은 두 가지를 모두 지원하지만 비트코인 캐시를 사용하는 것이 좋습니다. TYPE 145 형식으로 작동하는 지갑.</string>
10691078
<string name="ManageCoins_ContractAddress">계약 주소</string>
10701079
<!-- Experimental Feature -->

‎core/strings/src/main/res/values-nl/strings.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,14 +1060,23 @@
10601060
<string name="ManageCoins_Search">Name, code or contract address</string>
10611061
<string name="ManageCoins_AddToken">Add Token</string>
10621062
<string name="ManageCoins_NoResults">No results found. Try to add token manually if you know its smart contract address.</string>
1063-
<string name="ManageCoins_BipsDescription">There are 4 common address formats %1$s wallets can use to receive incoming payments:
1063+
<string name="ManageCoins_BipsDescription">Er zijn 4 veelgebruikte adresformaten die %1$s-portefeuilles kunnen gebruiken om inkomende betalingen te ontvangen:
10641064
\n
1065-
\n- BIP-44 (older)
1065+
\n- BIP-44 (ouder)
10661066
\n- BIP-49
1067-
\n- BIP-84 (recommended)
1068-
\n- BIP-86 (newest)
1067+
\n- BIP-84 (aanbevolen)
1068+
\n- BIP-86 (nieuwste)
10691069
\n
1070-
\nWhile P.CASH wallet supports all 4 of them it recommends to use a %2$s wallet operating in BIP-84 format. The wallets operating in this format get to pay lowest fees when sending %3$s transactions.</string>
1070+
\nHoewel de P.CASH-portefeuille ze alle 4 ondersteunt, wordt aangeraden een %2$s-portefeuille te gebruiken die werkt met het BIP-84-formaat. Portefeuilles die dit formaat gebruiken, betalen de laagste kosten bij het verzenden van %3$s-transacties.</string>
1071+
<string name="manage_coins_bips_description_litecoin">Er zijn 5 veelgebruikte adresformaten die %1$s-portefeuilles kunnen gebruiken om inkomende betalingen te ontvangen:
1072+
\n
1073+
\n- BIP-44 (ouder)
1074+
\n- BIP-49
1075+
\n- BIP-84 (aanbevolen)
1076+
\n- BIP-86 (nieuwste)
1077+
\n- MWEB (privé)
1078+
\n
1079+
\nHoewel de P.CASH-portefeuille ze alle 5 ondersteunt, wordt aangeraden een %2$s-portefeuille te gebruiken die werkt met het BIP-84-formaat. Portefeuilles die dit formaat gebruiken, betalen de laagste kosten bij het verzenden van %3$s-transacties.</string>
10711080
<string name="ManageCoins_BchTypeDescription">There are 2 address formats Bitcoin Cash wallets can use to receive incoming payments:
10721081
\n
10731082
\n- TYPE0 (older)

‎core/strings/src/main/res/values-pt-rBR/strings.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,15 @@
10611061
\n- BIP-86 (mais recente)
10621062
\n
10631063
\nEnquanto que a carteira 4 deles oferece suporte a todos os 4 deles é recomendado usar uma carteira %2$s operando no formato BIP-84. As carteiras que operam neste formato pagam taxas mais baixas ao enviar transações de %3$s.</string>
1064+
<string name="manage_coins_bips_description_litecoin">Existem 5 formatos de endereço comuns que as carteiras %1$s podem usar para receber pagamentos:
1065+
\n
1066+
\n- BIP-44 (mais antigo)
1067+
\n- BIP-49
1068+
\n- BIP-84 (recomendado)
1069+
\n- BIP-86 (mais recente)
1070+
\n- MWEB (privado)
1071+
\n
1072+
\nEmbora a carteira P.CASH suporte todos os 5, recomenda-se usar uma carteira %2$s que opere no formato BIP-84. As carteiras que operam neste formato pagam as taxas mais baixas ao enviar transações de %3$s.</string>
10641073
<string name="ManageCoins_BchTypeDescription">Existem 2 formatos de endereço que as carteiras Bitcoin Cash podem usar para receber pagamentos:
10651074
\n
10661075
\n- TYPE0 (antigo)

0 commit comments

Comments
 (0)