From 1bc09bd9963afc65228746f9d37aea470a5238f9 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sun, 25 Oct 2026 15:07:15 -0700 Subject: An Ark gift's claim button just says "Claim it now" (no "(instant, no fee)"); an on-chain gift still shows its network fee Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01QjVvE4YAcK3AGwV7kZXeN4 --- src/features/gifts.js | 8 +++++--- src/i18n.js | 1 + src/locales/ar.json | 1 + src/locales/bn.json | 1 + src/locales/de.json | 1 + src/locales/es.json | 1 + src/locales/fr.json | 1 + src/locales/hi.json | 1 + src/locales/id.json | 1 + src/locales/it.json | 1 + src/locales/ja.json | 1 + src/locales/ko.json | 1 + src/locales/mr.json | 1 + src/locales/pt.json | 1 + src/locales/ru.json | 1 + src/locales/sw.json | 1 + src/locales/ta.json | 1 + src/locales/te.json | 1 + src/locales/tr.json | 1 + src/locales/ur.json | 1 + src/locales/vi.json | 1 + src/locales/zh.json | 1 + 22 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/features/gifts.js b/src/features/gifts.js index bcc9b3f..399a807 100644 --- a/src/features/gifts.js +++ b/src/features/gifts.js @@ -346,10 +346,12 @@ export function giftsFeature(ctx) { !ui.claimError && ui.claimNotVisible && h('div', { class: 'notice info' }, t('claimNotVisibleBody')), ui.busy || ui.claimChecking ? h('button', { class: 'btn-primary btn-block', disabled: true }, h('span', { class: 'spinner' })) + // an ark gift costs nothing to claim: just the button (an on-chain + // one says what its network fee will take) : h('button', { class: 'btn-primary btn-block', onClick: doClaim }, - t('claimBtn'), ' ', - h('span', { style: 'font-size:0.85em;opacity:0.9' }, - '(' + (ag ? t('claimArkFree') : t('claimFeeNote', { n: fmtAmount(estFee) + ' ' + unitLabel() })) + ')')) + ...(ag ? [t('claimNowBtn')] : [t('claimBtn'), ' ', + h('span', { style: 'font-size:0.85em;opacity:0.9' }, + '(' + t('claimFeeNote', { n: fmtAmount(estFee) + ' ' + unitLabel() }) + ')')])) ); } diff --git a/src/i18n.js b/src/i18n.js index b542dfd..1e96214 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -1123,6 +1123,7 @@ const STR = { claimOr: 'or', goToWallet: 'Go to wallet', claimBtn: 'Claim it', + claimNowBtn: 'Claim it now', claimFeeNote: '~{n} fee', claimFailed: 'This gift has already been claimed or is no longer available.', claimNotVisibleBody: 'The coins funding this gift aren\u2019t visible from this wallet\u2019s network/data source. Make sure this wallet uses the same network and data source as the sender, then try again.', diff --git a/src/locales/ar.json b/src/locales/ar.json index f7cda76..ae94daf 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -426,6 +426,7 @@ "claimOr": "أو", "goToWallet": "اذهب إلى المحفظة", "claimBtn": "طالب بها", + "claimNowBtn": "استلمها الآن", "claimFeeNote": "♪{n} الرسوم", "claimFailed": "تمت المطالبة بهذه الهدية بالفعل أو لم تعد متاحة.", "claimNotVisibleBody": "والعملات التي تمول هذه الهدية غير مرئية من مصدر هذه المحفظة/البيانات. تأكد من استخدام هذه المحفظة نفس الشبكة ومصدر البيانات كمرسل، ثم محاولة مرة أخرى.", diff --git a/src/locales/bn.json b/src/locales/bn.json index 367ce7e..8be4c84 100644 --- a/src/locales/bn.json +++ b/src/locales/bn.json @@ -426,6 +426,7 @@ "claimOr": "অথবা", "goToWallet": "ওয়ালেট যাও", "claimBtn": "দাবি করুন", + "claimNowBtn": "এখনই নিন", "claimFeeNote": "একটিও নয়{n} কাগজ", "claimFailed": "এই উপহারটি আগেই দাবি করা হয়েছে অথবা আর পাওয়া যাচ্ছে না।", "claimNotVisibleBody": "এই দানের অর্থ এই ওয়ালেটের নেটওয়ার্ক/ডাটা উৎস থেকে দেখা যাচ্ছে না। নিশ্চিত করুন যে এই ওয়ালেট একই নেটওয়ার্ক এবং ডাটা উৎস ব্যবহার করে, অতঃপর পুনরায় চেষ্টা করুন ।", diff --git a/src/locales/de.json b/src/locales/de.json index da4a616..c4d512a 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -426,6 +426,7 @@ "claimOr": "oder", "goToWallet": "Zur Brieftasche gehen", "claimBtn": "Beanspruchen", + "claimNowBtn": "Jetzt einlösen", "claimFeeNote": "~{n} Gebühr", "claimFailed": "Dieses Geschenk wurde bereits beansprucht oder ist nicht mehr verfügbar.", "claimNotVisibleBody": "Die Münzen finanzieren dieses Geschenk sind nicht sichtbar aus dieser Brieftasche Netzwerk / Datenquelle. Stellen Sie sicher, dass diese Brieftasche die gleiche Netzwerk- und Datenquelle wie der Absender verwendet, dann versuchen Sie es erneut.", diff --git a/src/locales/es.json b/src/locales/es.json index 2ee5478..8f37f85 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -426,6 +426,7 @@ "claimOr": "o", "goToWallet": "Ve a la cartera.", "claimBtn": "Reclamarlo", + "claimNowBtn": "Reclámalo ahora", "claimFeeNote": "~{n} tarifa", "claimFailed": "Este regalo ya ha sido reclamado o ya no está disponible.", "claimNotVisibleBody": "Las monedas que financian este regalo no son visibles desde la fuente de red/datos de esta cartera. Asegúrese de que esta cartera utiliza la misma red y fuente de datos que el remitente, a continuación, inténtelo de nuevo.", diff --git a/src/locales/fr.json b/src/locales/fr.json index 36578b7..254c76c 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -426,6 +426,7 @@ "claimOr": "ou", "goToWallet": "Allez dans le portefeuille", "claimBtn": "Récupérer", + "claimNowBtn": "Récupérer maintenant", "claimFeeNote": "~{n} Taxe", "claimFailed": "Ce cadeau a déjà été réclamé ou n’est plus disponible.", "claimNotVisibleBody": "Les pièces de monnaie qui financent ce cadeau ne sont pas visibles à partir de ce portefeuille. Assurez-vous que ce portefeuille utilise le même réseau et la même source de données que l'expéditeur, puis essayez à nouveau.", diff --git a/src/locales/hi.json b/src/locales/hi.json index 4e05804..46c7ab5 100644 --- a/src/locales/hi.json +++ b/src/locales/hi.json @@ -426,6 +426,7 @@ "claimOr": "या", "goToWallet": "वॉलेट पर जाएं", "claimBtn": "इसे प्राप्त करें", + "claimNowBtn": "अभी लें", "claimFeeNote": "~{n} शुल्क", "claimFailed": "इस उपहार का दावा पहले ही किया जा चुका है या यह अब उपलब्ध नहीं है।", "claimNotVisibleBody": "इस उपहार को वित्तपोषित करने वाले सिक्के इस वॉलेट के नेटवर्क / डेटा स्रोत से दिखाई नहीं देते हैं। सुनिश्चित करें कि यह वॉलेट प्रेषक के समान नेटवर्क और डेटा स्रोत का उपयोग करता है, फिर फिर से प्रयास करें।", diff --git a/src/locales/id.json b/src/locales/id.json index dfedcb8..36bc810 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -146,6 +146,7 @@ "giftReserved": "Tautan hadiah belum diklaim ({n})", "claimBody": "Klaim ke dompet baru yang hanya Anda kendalikan.", "claimBtn": "Klaim", + "claimNowBtn": "Klaim sekarang", "claimFailed": "Hadiah ini sudah diklaim atau tidak lagi tersedia.", "claimedTitle": "Diklaim!", "claimedBody": "Bitcoin Anda sedang dalam perjalanan. Cadangkan frasa pemulihan Anda agar tetap aman.", diff --git a/src/locales/it.json b/src/locales/it.json index 0c83ad7..2776ef6 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -891,6 +891,7 @@ "claimOr": "oppure", "goToWallet": "Vai al portafoglio", "claimBtn": "Riscuoti", + "claimNowBtn": "Riscatta ora", "claimFeeNote": "~{n} di commissione", "claimFailed": "Questo regalo è già stato riscosso o non è più disponibile.", "claimNotVisibleBody": "Le monete che finanziano questo regalo non sono visibili dalla rete/fonte dati di questo portafoglio. Assicurati che questo portafoglio usi la stessa rete e fonte dati del mittente, poi riprova.", diff --git a/src/locales/ja.json b/src/locales/ja.json index 779ab0e..dd6eb07 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -426,6 +426,7 @@ "claimOr": "または", "goToWallet": "ウォレットに行く", "claimBtn": "受け取る", + "claimNowBtn": "今すぐ受け取る", "claimFeeNote": "ふりがな{n} 料金について", "claimFailed": "このギフトはすでに受け取られたか、現在利用できません。", "claimNotVisibleBody": "このギフトに資金を調達するコインは、このウォレットのネットワーク/データソースから表示されません。 このウォレットは、送信者と同じネットワークとデータソースを使用していて、もう一度お試しください。", diff --git a/src/locales/ko.json b/src/locales/ko.json index 97dfe5f..e260c4f 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -425,6 +425,7 @@ "claimOr": "또는", "goToWallet": "지갑 바로가기", "claimBtn": "받기", + "claimNowBtn": "지금 받기", "claimFeeNote": "·{n} 요금안내", "claimFailed": "이 선물은 이미 수령되었거나 더 이상 이용할 수 없습니다.", "claimNotVisibleBody": "이 선물은 이 지갑의 네트워크/데이터 소스에서 볼 수 없습니다. 이 지갑이 같은 네트워크와 데이터 소스를 보낸 후 다시 시도하십시오.", diff --git a/src/locales/mr.json b/src/locales/mr.json index ecfc799..c49c994 100644 --- a/src/locales/mr.json +++ b/src/locales/mr.json @@ -146,6 +146,7 @@ "giftReserved": "दावा न केलेल्या भेट लिंक ({n})", "claimBody": "ते फक्त तुमच्याच नियंत्रणातील एका नव्या कोऱ्या वॉलेटमध्ये घ्या.", "claimBtn": "ते घ्या", + "claimNowBtn": "आता घ्या", "claimFailed": "ही भेट आधीच घेतली गेली आहे किंवा आता उपलब्ध नाही.", "claimedTitle": "घेतले!", "claimedBody": "तुमचे Bitcoin येत आहे. ते सुरक्षित ठेवण्यासाठी तुमच्या रिकव्हरी वाक्यांशाचा बॅकअप घ्या.", diff --git a/src/locales/pt.json b/src/locales/pt.json index 259bb52..4b51866 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -426,6 +426,7 @@ "claimOr": "ou", "goToWallet": "Ir para a carteira", "claimBtn": "Resgatar", + "claimNowBtn": "Resgatar agora", "claimFeeNote": "~{n} taxa", "claimFailed": "Este presente já foi resgatado ou não está mais disponível.", "claimNotVisibleBody": "As moedas que financiam este presente não são visíveis da rede/fonte de dados desta carteira. Certifique-se de que esta carteira usa a mesma rede e fonte de dados que o remetente e tente novamente.", diff --git a/src/locales/ru.json b/src/locales/ru.json index 8ae9fa7..6494584 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -426,6 +426,7 @@ "claimOr": "или", "goToWallet": "Иди к кошельку", "claimBtn": "Получить", + "claimNowBtn": "Получить сейчас", "claimFeeNote": "~{n} взнос", "claimFailed": "Этот подарок уже получен или больше недоступен.", "claimNotVisibleBody": "Монеты, финансирующие этот подарок, не видны из сети / источника данных этого кошелька. Убедитесь, что этот кошелек использует ту же сеть и источник данных, что и отправитель.", diff --git a/src/locales/sw.json b/src/locales/sw.json index ddf1ca1..e164659 100644 --- a/src/locales/sw.json +++ b/src/locales/sw.json @@ -146,6 +146,7 @@ "giftReserved": "Viungo vya zawadi visivyodaiwa ({n})", "claimBody": "Idai kwenye pochi mpya kabisa unayoidhibiti wewe pekee.", "claimBtn": "Idai", + "claimNowBtn": "Dai sasa", "claimFailed": "Zawadi hii tayari imedaiwa au haipatikani tena.", "claimedTitle": "Imedaiwa!", "claimedBody": "Bitcoin yako inakuja. Hifadhi kifungu chako cha kurejesha ili kuilinda.", diff --git a/src/locales/ta.json b/src/locales/ta.json index ef5371a..d5ae03b 100644 --- a/src/locales/ta.json +++ b/src/locales/ta.json @@ -146,6 +146,7 @@ "giftReserved": "கோரப்படாத பரிசு இணைப்புகள் ({n})", "claimBody": "நீங்கள் மட்டுமே கட்டுப்படுத்தும் புத்தம்புதிய வாலட்டிற்குள் இதை உரிமை கொள்ளுங்கள்.", "claimBtn": "உரிமை கொள்", + "claimNowBtn": "இப்போதே பெறுங்கள்", "claimFailed": "இந்தப் பரிசு ஏற்கனவே உரிமை கொள்ளப்பட்டுவிட்டது அல்லது இனி கிடைக்கவில்லை.", "claimedTitle": "உரிமை கொள்ளப்பட்டது!", "claimedBody": "உங்கள் Bitcoin வந்துகொண்டிருக்கிறது. அதைப் பாதுகாப்பாக வைக்க உங்கள் மீட்பு சொற்றொடரைக் காப்புப்பிரதி எடுங்கள்.", diff --git a/src/locales/te.json b/src/locales/te.json index f7a6d34..79ca57f 100644 --- a/src/locales/te.json +++ b/src/locales/te.json @@ -146,6 +146,7 @@ "giftReserved": "దావా చేయని బహుమతి లింకులు ({n})", "claimBody": "మీరు మాత్రమే నియంత్రించే సరికొత్త వాలెట్‌లోకి దాన్ని క్లెయిమ్ చేసుకోండి.", "claimBtn": "క్లెయిమ్ చేసుకోండి", + "claimNowBtn": "ఇప్పుడే పొందండి", "claimFailed": "ఈ బహుమతి ఇప్పటికే క్లెయిమ్ చేయబడింది లేదా ఇక అందుబాటులో లేదు.", "claimedTitle": "క్లెయిమ్ అయింది!", "claimedBody": "మీ Bitcoin మీ వద్దకు వస్తోంది. దాన్ని సురక్షితంగా ఉంచడానికి మీ రికవరీ ఫ్రేజ్‌ను బ్యాకప్ చేయండి.", diff --git a/src/locales/tr.json b/src/locales/tr.json index 6605c6c..9dce950 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -425,6 +425,7 @@ "claimOr": "veya", "goToWallet": "Cüzdana git", "claimBtn": "Talep et", + "claimNowBtn": "Şimdi al", "claimFeeNote": "~{n} ücret ücreti", "claimFailed": "Bu hediye zaten talep edilmiş veya artık kullanılamıyor.", "claimNotVisibleBody": "Paralar bu hediyeyi finanse ediyor bu cüzdanın ağ/data kaynağından görünür değil. Bu cüzdanın aynı ağ ve veri kaynağını gönderileyici olarak kullandığından emin olun, sonra tekrar deneyin.", diff --git a/src/locales/ur.json b/src/locales/ur.json index 258d1a3..c255c6c 100644 --- a/src/locales/ur.json +++ b/src/locales/ur.json @@ -148,6 +148,7 @@ "giftReserved": "غیر دعویٰ شدہ تحفہ لنکس ({n})", "claimBody": "اسے ایک بالکل نئے والیٹ میں وصول کریں جو صرف آپ کے کنٹرول میں ہو۔", "claimBtn": "وصول کریں", + "claimNowBtn": "ابھی حاصل کریں", "claimFailed": "اس تحفے کا پہلے ہی دعویٰ کیا جا چکا ہے یا یہ اب دستیاب نہیں۔", "claimedTitle": "وصول ہو گیا!", "claimedBody": "آپ کا Bitcoin راستے میں ہے۔ اسے محفوظ رکھنے کے لیے اپنے بحالی فقرے کا بیک اپ بنا لیں۔", diff --git a/src/locales/vi.json b/src/locales/vi.json index 4c2793a..3401427 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -146,6 +146,7 @@ "giftReserved": "Liên kết quà chưa nhận ({n})", "claimBody": "Nhận nó vào một ví hoàn toàn mới mà chỉ riêng bạn kiểm soát.", "claimBtn": "Nhận ngay", + "claimNowBtn": "Nhận ngay", "claimFailed": "Món quà này đã được nhận hoặc không còn khả dụng.", "claimedTitle": "Đã nhận!", "claimedBody": "Bitcoin của bạn đang trên đường tới. Hãy sao lưu cụm từ khôi phục để giữ an toàn.", diff --git a/src/locales/zh.json b/src/locales/zh.json index a9cfef7..dc58a62 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -426,6 +426,7 @@ "claimOr": "或者说", "goToWallet": "转到钱包", "claimBtn": "领取", + "claimNowBtn": "立即领取", "claimFeeNote": "~ (法语){n} 收费", "claimFailed": "此礼物已被领取或不再可用。", "claimNotVisibleBody": "从这个钱包的网络/数据来源看, 确保这个钱包使用与发送者相同的网络和数据源,然后再次尝试.", -- cgit v1.2.3