Merge pull request #4051 from BlueWallet/title

FIX: Delete wallet Alert title had confusing string

blue_modules/prompt.js

@@ -1,7 +1,8 @@
 import { Platform } from 'react-native';
 import prompt from 'react-native-prompt-android';
+import loc from '../loc';
 
-module.exports = (title, text, isCancelable = true, type = 'secure-text', isOKDestructive = false) => {
+module.exports = (title, text, isCancelable = true, type = 'secure-text', isOKDestructive = false, continueButtonText = loc._.ok) => {
   const keyboardType = type === 'numeric' ? 'numeric' : 'default';
 
   if (Platform.OS === 'ios' && type === 'numeric') {
@@ -13,14 +14,14 @@ module.exports = (title, text, isCancelable = true, type = 'secure-text', isOKDe
     const buttons = isCancelable
       ? [
           {
-            text: 'Cancel',
+            text: loc._.cancel,
             onPress: () => {
               reject(Error('Cancel Pressed'));
             },
             style: 'cancel',
           },
           {
-            text: 'OK',
+            text: continueButtonText,
             onPress: password => {
               console.log('OK Pressed');
               resolve(password);
@@ -30,7 +31,7 @@ module.exports = (title, text, isCancelable = true, type = 'secure-text', isOKDe
         ]
       : [
           {
-            text: 'OK',
+            text: continueButtonText,
             onPress: password => {
               console.log('OK Pressed');
               resolve(password);

class/wallets/lightning-ldk-wallet.ts

@@ -349,7 +349,8 @@ export class LightningLdkWallet extends LightningCustodianWallet {
     const peers2reconnect: Record<string, boolean> = {};
     if (this._listChannels) {
       for (const channel of this._listChannels) {
-        if (!channel.is_funding_locked) { // pending channel
+        if (!channel.is_funding_locked) {
+          // pending channel
           if (!peers.includes(channel.remote_node_id)) peers2reconnect[channel.remote_node_id] = true;
         }
       }

loc/ar.json

@@ -444,7 +444,6 @@
     "details_advanced": "الخيارات المتقدمة",
     "details_are_you_sure": "هل أنت متأكد؟",
     "details_connected_to": "متصلة بـ",
-    "details_del_wb": "رصيد المحفظة",
     "details_del_wb_err": "لا يتطابق مبلغ الرصيد المقدَّم مع رصيد هذه المحفظة. يُرجى إعادة المحاولة",
     "details_del_wb_q": "يتوفر رصيد في هذه المحفظة. قبل المتابعة، يُرجى الانتباه إلى أنك لن تتمكن من استرداد الأموال دون العبارة التذكيرية لهذه المحفظة. لتجنب الإزالة الخاطئة لهذه المحفظة، يُرجى إدخال رصيد محفظتك البالغ {balance} ساتوشي.",
     "details_delete": "الحذف",

loc/cs_cz.json

@@ -399,7 +399,6 @@
     "details_advanced": "Pokročilé",
     "details_are_you_sure": "Jste si jistý?",
     "details_connected_to": "Připojeno k",
-    "details_del_wb": "Zůstatek v peněžence",
     "details_del_wb_err": "Poskytnutá částka zůstatku neodpovídá zůstatku této peněženky. Prosím zkuste to znovu",
     "details_del_wb_q": "Tato peněženka má zůstatek. Předtím, než budete pokračovat, mějte na paměti, že nebudete moci získat prostředky bez počáteční věty této peněženky. Chcete-li zabránit náhodnému odebrání této peněženky, zadejte zůstatek vaší peněženky {balance} satoshi.",
     "details_delete": "Smazat",

loc/cy.json

@@ -226,7 +226,6 @@
     "details_advanced": "Arbenigol",
     "details_are_you_sure": "Wyt ti'n siwr?",
     "details_connected_to": "Wedi cysylltu efo",
-    "details_del_wb": "Balans Waled",
     "details_delete": "Gwaredu",
     "details_delete_wallet": "Gwaredu Waled",
     "details_marketplace": "Marchnad",

loc/de_de.json

@@ -447,7 +447,6 @@
     "details_advanced": "Fortgeschritten",
     "details_are_you_sure": "Bist du dir sicher?",
     "details_connected_to": "Verbunden mit",
-    "details_del_wb": "Wallet Guthaben",
     "details_del_wb_err": "Das angegebene Guthaben deckt sich nicht mit dem Guthaben des Wallet. Bitte versuche es erneut.",
     "details_del_wb_q": "Dieses Wallet enthält noch bitcoin. Ohne vorhandenes Backup der mnemonische Phrase sind diese unwiederbringlich verloren. Um ein versehentliches entfernen zu vermeiden, gib bitte das Wallet-Guthaben von {balance} satoshis ein.",
     "details_delete": "Löschen",

loc/en.json

@@ -449,9 +449,8 @@
     "details_advanced": "Advanced",
     "details_are_you_sure": "Are you sure?",
     "details_connected_to": "Connected to",
-    "details_del_wb": "Wallet Balance",
     "details_del_wb_err": "The provided balance amount doesn’t match this wallet’s balance. Please try again.",
-    "details_del_wb_q": "This wallet has a balance. Before proceeding, please be aware that you will not be able to recover the funds without this wallet’s seed phrase. In order to avoid accidental removal this wallet, please enter your wallet’s balance of {balance} satoshis.",
+    "details_del_wb_q": "This wallet has a balance. Before proceeding, please be aware that you will not be able to recover the funds without this wallet’s seed phrase. In order to avoid accidental removal, please enter your wallet’s balance of {balance} satoshis.",
     "details_delete": "Delete",
     "details_delete_wallet": "Delete Wallet",
     "details_derivation_path": "derivation path",

loc/es.json

@@ -447,7 +447,6 @@
     "details_advanced": "Avanzado",
     "details_are_you_sure": "¿Estás seguro?",
     "details_connected_to": "Conectado a",
-    "details_del_wb": "Balance de la cartera",
     "details_del_wb_err": "El balance introducido no coincide con el balance de esta cartera. Por favor, inténtelo de nuevo.",
     "details_del_wb_q": "Esta cartera tiene saldo. Antes de proceder, ten en cuenta que no podrás recuperar los fondos sin la semilla de esta cartera. Para evitar el borrado accidental, por favor introduce los {balance} satoshis que contiene esta cartera.",
     "details_delete": "Eliminar",

loc/es_419.json

@@ -447,7 +447,6 @@
     "details_advanced": "Avanzado",
     "details_are_you_sure": "¿Estás seguro?",
     "details_connected_to": "Conectado a",
-    "details_del_wb": "Saldo de la Billetera",
     "details_del_wb_err": "El saldo proporcionado no coincide con el saldo de esta billetera. Inténtalo de nuevo.",
     "details_del_wb_q": "Esta billetera tiene saldo. Antes de continuar, ten en cuenta que no podrás recuperar los fondos sin la frase semilla de esta billetera. Para evitar la eliminación accidental de esta billetera, ingresa el saldo de tu billetera de {balance} satoshis.",
     "details_delete": "Eliminar",

loc/fa.json

@@ -447,7 +447,6 @@
     "details_advanced": "پیشرفته",
     "details_are_you_sure": "مطمئن هستید؟",
     "details_connected_to": "متصل به",
-    "details_del_wb": "موجودی کیف پول",
     "details_del_wb_err": "مقدار موجودی ارائه‌شده با موجودی این کیف پول مطابقت ندارد. لطفاً دوباره تلاش کنید.",
     "details_del_wb_q": "این کیف پول دارای موجودی است. قبل از ادامه، لطفاً توجه داشته باشید که بدون عبارت سید این کیف پول، قادر به بازیابی دارایی آن نخواهید بود. به‌منظور جلوگیری از حذف تصادفی این کیف پول، لطفاً موجودی کیف پول خود معادل {balance} ساتوشی را وارد کنید.",
     "details_delete": "حذف",

loc/fi_fi.json

@@ -377,7 +377,6 @@
     "details_advanced": "Edistynyt",
     "details_are_you_sure": "Oletko varma?",
     "details_connected_to": "Yhdistetty",
-    "details_del_wb": "Lompakon saldo",
     "details_del_wb_err": "Annettu saldo ei vastaa tämän lompakon saldoa. Yritä uudelleen",
     "details_del_wb_q": "Tällä lompakolla on saldoa. Ennen kuin jatkat, huomaa, että et voi palauttaa varoja ilman tämän lompakon siemenlauseketta. Syötä lompakkosi saldo {balance} satoshia välttääksesi vahingossa tämän lompakon poistamisen.",
     "details_delete": "Poista",

loc/fr_fr.json

@@ -447,7 +447,6 @@
     "details_advanced": "Avancé",
     "details_are_you_sure": "Êtes vous sur?",
     "details_connected_to": "Connecté à",
-    "details_del_wb": "Solde du portefeuille",
     "details_del_wb_err": "Le solde ne correspond pas à celui du portefeuille. Veuillez réessayer",
     "details_del_wb_q": "Ce portefeuille a un solde non nul. Avant de continuer, veuillez noter que vous ne serez pas en mesure de récupérer vos fonds sans la phrase mnémonique du portefeuille. Pour éviter toute suppression accidentelle du portefeuille, veuillez entrer son solde de {balance} satoshis.",
     "details_delete": "Supprimer",

loc/he.json

@@ -442,7 +442,6 @@
     "details_advanced": "מתקדם",
     "details_are_you_sure": "האם אתם בטוחים?",
     "details_connected_to": "מחובר ל- ",
-    "details_del_wb": "יתרת ארנק",
     "details_del_wb_err": "סכום היתרה שסופק אינו תואם ליתרת הארנק. אנא נסו שנית.",
     "details_del_wb_q": "ארנק זה בעל יתרת מטבעות. לפני שתמשיכו, אנא שימו לב שלא תוכלו לשחזר את הארנק ואת הכספים בו בלי גרעין מילות הגיבוי שלו. על מנת למנוע מחיקה אקראית של ארנק זה, אנא הכניסו את סכום יתרת הארנק של {balance} סאטושים.",
     "details_delete": "מחיקה",

loc/hu_hu.json

@@ -440,7 +440,6 @@
     "details_advanced": "Haladó",
     "details_are_you_sure": "Biztos vagy benne?",
     "details_connected_to": "Kapcsolódva: ",
-    "details_del_wb": "Tárca Egyenlege",
     "details_del_wb_err": "A megadott egyenleg összege nem egyezik a tárca egyenlegével. Próbáld újra. ",
     "details_del_wb_q": "Ennek a tárcának pozitív az egyenlege. Mielőtt tovább mennél, ne felejtsd, hogy a tárca jelszó sorozata nélkül nem lehetséges a tárca helyreállítása. A tárca véletlen törlésének elkerülése érdekében, add meg a tárca {balance} egyenlegét satoshi-ban.",
     "details_delete": "Törlés",

loc/it.json

@@ -411,7 +411,6 @@
     "details_advanced": "Avanzato",
     "details_are_you_sure": "Sei sicuro?",
     "details_connected_to": "Connesso a",
-    "details_del_wb": "Saldo del portafoglio",
     "details_del_wb_q": "Questo portafoglio ha un saldo. Prima di procedere, tieni presente che non potrai recuperare i fondi senza la frase seed di questo portafoglio. Al fine di evitare la rimozione accidentale di questo portafoglio, inserisci il saldo del tuo portafoglio di {balance} satoshis.",
     "details_delete": "Elimina",
     "details_delete_wallet": "Rimuovi portafoglio",

loc/jp_jp.json

@@ -375,7 +375,6 @@
     "details_advanced": "上級設定",
     "details_are_you_sure": "実行しますか?",
     "details_connected_to": "接続",
-    "details_del_wb": "ウォレット残高",
     "details_del_wb_err": "提供された残高は、このウォレットの残高と一致しません。もう一度お試しください。",
     "details_del_wb_q": "このウォレットには残高があります。先に進む前に、このウォレットのシードフレーズがないと資金を回収できない点に注意してください。誤ってこのウォレットを削除しないようにするために、このウォレットの残高 {balance} satoshisを入力してください。",
     "details_delete": "削除",

loc/ms.json

@@ -439,7 +439,6 @@
     "details_advanced": "Lanjut",
     "details_are_you_sure": "Adakah anda pasti?",
     "details_connected_to": "Terhububg kepada",
-    "details_del_wb": "Baki Dompet",
     "details_del_wb_err": "Jumlah baki yang diberi tidak sepadan dengan baki dompet ini. Sila cuba lagi.",
     "details_del_wb_q": "Dompet ini mempunyai baki. Sebelum meneruskan, sila ambil perhatian yang anda tidak akan dapat semula baki tersebut tanpa frasa benih dompet ini. Untuk mengelakkan dompet ini dibuang secara tidak sengaja, sila masukkan baki {balance} satoshi dompet anda.",
     "details_delete": "Padam",

loc/nl_nl.json

@@ -432,7 +432,6 @@
     "details_advanced": "Geavenceerd",
     "details_are_you_sure": "Weet u het zeker?",
     "details_connected_to": "Verbonden met",
-    "details_del_wb": "Wallet saldo",
     "details_del_wb_err": "Het opgegeven saldo komt niet overeen met het saldo van deze wallet. Probeer het a.u.b. opnieuw",
     "details_del_wb_q": "Deze wallet heeft een saldo. Voordat u verder gaat, moet u er rekening mee houden dat u de tegoeden niet kunt terugkrijgen zonder de seed phrase van deze wallet. Om te voorkomen dat deze wallet per ongeluk wordt verwijderd, moet u het saldo van {balance} satoshis in uw wallet invoeren.",
     "details_delete": "Verwijderen",

loc/pl.json

@@ -447,7 +447,6 @@
     "details_advanced": "Zaawansowane",
     "details_are_you_sure": "Na pewno?",
     "details_connected_to": "Podłączono do",
-    "details_del_wb": "Saldo portfela",
     "details_del_wb_err": "Podane saldo nie zgadza się z saldem portfela. Spróbuj ponownie.",
     "details_del_wb_q": "Ten portfel ma dodatnie saldo. Zanim pójdziesz dalej, wiedz, że nie będziesz w stanie odzyskać środków bez hasła ziarna. Aby uniknąć przypadkowego usunięcia portfela, wpisz jego saldo wynoszące {balance} satoshi.",
     "details_delete": "Skasuj",

loc/pt_br.json

@@ -444,7 +444,6 @@
     "details_advanced": "Avançado",
     "details_are_you_sure": "Tem certeza?",
     "details_connected_to": "Conectado a",
-    "details_del_wb": "Saldo da carteira",
     "details_del_wb_err": "O valor do saldo fornecido não corresponde ao saldo desta carteira. Tente novamente.",
     "details_del_wb_q": "Esta carteira tem um saldo. Antes de prosseguir, esteja ciente de que você não poderá recuperar os fundos sem a frase de backup desta carteira. Para evitar a remoção acidental desta carteira, insira o saldo de {balance} satoshis da carteira.",
     "details_delete": "Apagar",

loc/pt_pt.json

@@ -339,7 +339,6 @@
     "details_advanced": "Avançado",
     "details_are_you_sure": "Tem a certeza?",
     "details_connected_to": "Conectado a",
-    "details_del_wb": "Saldo da carteira",
     "details_del_wb_err": "O valor do saldo fornecido não corresponde ao saldo desta carteira. Por favor, tente novamente",
     "details_del_wb_q": "Esta carteira tem um slado. Antes de continuar, esteja ciente de que não poderá recuperar os fundos sem a frase de backup desta carteira. Para evitar a remoção acidental desta carteira, insira o saldo de {balance} satoshis de sua carteira.",
     "details_delete": "Eliminar",

loc/ro.json

@@ -376,7 +376,6 @@
     "details_advanced": "Avansat",
     "details_are_you_sure": "Ești sigur(ă)?",
     "details_connected_to": "Conectat la",
-    "details_del_wb": "Balanță Portofel",
     "details_del_wb_err": "Balanța furnizată nu se potrivește cu balanța acestui portofel. Încearcă din nou.",
     "details_del_wb_q": "Acest portofel are o balanță. Înainte de a merge mai departe, ia la cunoștință că nu vei putea să recuperezi fondurile fără seed phrase-ul acestui portofel. Pentru a evita înlăturarea accidentală a acestui portofel, introdu balanța portofelului în valoare de {number} satoshi. ",
     "details_delete": "Șterge",

loc/ru.json

@@ -398,7 +398,6 @@
     "details_advanced": "Расширенные настройки",
     "details_are_you_sure": "Точно удалить?",
     "details_connected_to": "Подключено к",
-    "details_del_wb": "Баланс кошелька",
     "details_del_wb_err": "Указанная сумма баланса не соответствует балансу этого кошелька. Пожалуйста, попробуйте еще раз",
     "details_del_wb_q": "На этом кошельке есть средства. Прежде чем продолжить, имейте в виду, что вы не сможете вернуть средства без seed фразы этого кошелька. Чтобы избежать случайного удаления этого кошелька, введите баланс {balance} сатоши в вашем кошельке.",
     "details_delete": "Удалить",

loc/si_LK.json

@@ -447,7 +447,6 @@
     "details_advanced": "උසස්",
     "details_are_you_sure": "ඔබට විශ්වාසද?",
     "details_connected_to": "සම්බන්ධයි",
-    "details_del_wb": "පසුම්බියේ ශේෂය",
     "details_del_wb_err": "සපයන ලද ඉතිරි මුදල මෙම පසුම්බියේ ශේෂයට නොගැලපේ. කරුණාකර නැවත උත්සාහ කරන්න.",
     "details_del_wb_q": "මෙම පසුම්බියට ශේෂයක් ඇත. ඉදිරියට යාමට පෙර, මෙම මුදල් පසුම්බියේ බීජ වැකිය නොමැතිව ඔබට මුදල් ආපසු ලබා ගත නොහැකි බව කරුණාවෙන් සලකන්න. මෙම පසුම්බිය අහම්බෙන් ඉවත් කිරීම වලක්වා ගැනීම සඳහා, කරුණාකර ඔබේ මුදල් පසුම්බියේ ශේෂය {balance} සතෝෂි ඇතුළත් කරන්න.",
     "details_delete": "මකන්න",

loc/sk_sk.json

@@ -240,7 +240,6 @@
     "details_advanced": "Rozšírené",
     "details_are_you_sure": "Ste si istý?",
     "details_connected_to": "Napojené na",
-    "details_del_wb": "Zostatok v peňaženke",
     "details_del_wb_err": "Napísaný zostatok nesedí so skutočným zostatkom v peňaženke. Skúste znovu",
     "details_del_wb_q": "Peňaženka má zostatok. Bez seed frázy nebude možné peňaženku obnoviť. Aby sme predišli vymazaniu peňaženky omylom, napíšte zostatok v peňaženke {balance} satoshi.",
     "details_delete": "Zmazaž",

loc/sl_SI.json

@@ -411,7 +411,6 @@
     "details_advanced": "Napredno",
     "details_are_you_sure": "Ali ste prepričani?",
     "details_connected_to": "Povezano z",
-    "details_del_wb": "Stanje",
     "details_del_wb_err": "Navedeni znesek stanja se ne ujema s stanjem v tej denarnici. Prosimo poskusite ponovno.",
     "details_del_wb_q": "Ta denarnica ima pozitivno stanje. Preden nadaljujete, se zavedajte, da sredstev ne boste mogli obnoviti brez seznama besed te denarnice (mnemonično seme). Da se izognete nenamerni odstranitvi te denarnice, vnesite stanje svoje denarnice {balance} satošijev.",
     "details_delete": "Izbriši",

loc/th_th.json

@@ -308,7 +308,6 @@
     "details_advanced": "ขั้นสูง",
     "details_are_you_sure": "คุณแน่ใจหรือไม่?",
     "details_connected_to": "เชื่อมไปที่",
-    "details_del_wb": "ยอดรวมของกระเป๋าสตางค์",
     "details_del_wb_err": "จำนวนเงินไม่ตรงกับยอดเงินในกระเป๋าสตางค์",
     "details_delete": "ลบ",
     "details_delete_wallet": "ลบกระเป๋าสตางค์",

loc/zh_cn.json

@@ -376,7 +376,6 @@
     "details_advanced": "进阶的",
     "details_are_you_sure": "你确认么?",
     "details_connected_to": "连接到",
-    "details_del_wb": "钱包余额",
     "details_del_wb_err": "提供的余额与此钱包的余额不匹配，请再试一遍。",
     "details_del_wb_q": "这个钱包有余额。 在继续操作之前，请注意，没有此钱包的种子(备份)短语，您将无法取回资金。 为了避免意外移除该钱包，请输入您的钱包余额{balance} 聪。",
     "details_delete": "删除",

loc/zh_tw.json

@@ -375,7 +375,6 @@
     "details_advanced": "進階的",
     "details_are_you_sure": "你確定嗎?",
     "details_connected_to": "連接到",
-    "details_del_wb": "錢包結餘",
     "details_del_wb_err": "提供的結餘與此錢包的結餘不匹配，請再試一遍。",
     "details_del_wb_q": "這個錢包有結餘。 在繼續操作之前，請注意，沒有此錢包的種子(備份)短語，您將無法取回資金。 為了避免意外移除該錢包，請輸入您的錢包結餘{balance} 聰。",
     "details_delete": "移除",

screen/wallets/details.js

@@ -223,11 +223,12 @@ const WalletDetails = () => {
     ReactNativeHapticFeedback.trigger('notificationWarning', { ignoreAndroidSystemSettings: false });
     try {
       const walletBalanceConfirmation = await prompt(
-        loc.wallets.details_del_wb,
+        loc.wallets.details_delete_wallet,
         loc.formatString(loc.wallets.details_del_wb_q, { balance: wallet.getBalance() }),
         true,
         'plain-text',
         true,
+        loc.wallets.details_delete,
       );
       if (Number(walletBalanceConfirmation) === wallet.getBalance()) {
         navigateToOverviewAndDeleteWallet();

tests/e2e/helperz.js

@@ -56,7 +56,7 @@ export async function helperDeleteWallet(label, remainingBalanceSat = false) {
   await element(by.text('Yes, delete')).tap();
   if (remainingBalanceSat) {
     await element(by.type('android.widget.EditText')).typeText(remainingBalanceSat);
-    await element(by.text('OK')).tap();
+    await element(by.text('Delete')).tap();
   }
   await expect(element(by.id('NoTransactionsMessage'))).toBeVisible();
 }