Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bitkit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = exactVersion;
version = "0.1.1-rc2";
version = "0.1.1-rc6";
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Bitkit/Models/PaykitUsdtStateBackup.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ struct PaykitUsdtStateBackup: Codable {
let receivedAtMillis: Int64
let underpaid: Bool
let afterExpiry: Bool
let beforeRequest: Bool?

init(_ value: PaykitUsdtPaymentService.Receipt) {
wallet = value.wallet
Expand All @@ -76,6 +77,7 @@ struct PaykitUsdtStateBackup: Codable {
receivedAtMillis = Int64(value.receivedAt.timeIntervalSince1970 * 1000)
underpaid = value.underpaid
afterExpiry = value.afterExpiry
beforeRequest = value.beforeRequest
}

func restored() throws -> PaykitUsdtPaymentService.Receipt {
Expand All @@ -89,7 +91,8 @@ struct PaykitUsdtStateBackup: Codable {
billingPeriodStartsAt: periodStart),
paymentId: paymentId, proofEventId: proofEventId, verified: verified, transferId: transferId,
amount: PaykitAmount(asset: .usdt, atomic: amountAtomic),
receivedAt: Date(timeIntervalSince1970: Double(receivedAtMillis) / 1000), underpaid: underpaid, afterExpiry: afterExpiry
receivedAt: Date(timeIntervalSince1970: Double(receivedAtMillis) / 1000), underpaid: underpaid, afterExpiry: afterExpiry,
beforeRequest: beforeRequest ?? false
)
}
}
Expand Down
4 changes: 4 additions & 0 deletions Bitkit/Resources/Localization/ar.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,8 @@
"pubky_auth__homeserver" = "الخادم الرئيسي";
"pubky_auth__signup_description" = "أنشئ هوية Pubky جديدة على هذا الخادم الرئيسي. تابع فقط إذا كنت تثق به.";
"pubky_auth__approval_failed" = "فشل التفويض";
"pubky_auth__identity_unavailable_desc" = "تحقق من اتصالك وحاول مرة أخرى.";
"profile__auth_error_signup_code_rejected" = "لم يقبل الخادم الرئيسي رمز التسجيل هذا. حاول مرة أخرى أو استخدم رابط تسجيل آخر.";
"wallet__onchain_abandon_transfer_note" = "لم تعد التحويلات إلى رصيد الإنفاق متاحة. يتحقق Bitkit أولًا من الشبكة، ثم يعيد عملات هذا التحويل إلى محفظتك حتى لا يتأكد التحويل الأصلي أبدًا. يكلّف ذلك رسوم شبكة.";
"watch_only_accounts__active_section" = "الحسابات النشطة";
"watch_only_accounts__copy_xpub" = "نسخ xpub";
Expand Down Expand Up @@ -1229,6 +1231,7 @@
"wallet__payment_request_payment_verified" = "تم التحقق من الدفع";
"wallet__payment_request_underpaid" = "مستلم · دفع ناقص";
"wallet__payment_request_after_expiry" = "مستلم · بعد انتهاء الصلاحية";
"wallet__payment_request_before_request" = "مستلم · قبل الطلب";
"pubky_auth__usdt_intro_description" = "لتربح، تحتاج إلى مشاركة عنوان USDT الخاص بك مع Paykit. يمكنه عرض نشاط المبيعات، لكنه لا يستطيع إنفاق الأموال.";
"pubky_auth__usdt_intro_optional" = "يمكنك مشاركة عنوان USDT الخاص بك مع Paykit لاستلام الأرباح. يمكنه عرض نشاط المبيعات، لكنه لا يستطيع إنفاق الأموال.";
"pubky_auth__usdt_unavailable" = "عنوان USDT الخاص بك غير متاح. يرجى المحاولة مرة أخرى.";
Expand Down Expand Up @@ -1288,6 +1291,7 @@
"usdt__deposit_refund_address_network" = "عنوان USDT على {network}";
"wallet__payment_request" = "طلب دفع";
"wallet__payment_request_unavailable" = "لم يعد طلب الدفع متاحًا.";
"wallet__payment_request_note_too_long" = "اختصر الملاحظة وحاول مرة أخرى.";
"wallet__payment_request_expired" = "انتهت صلاحية طلب الدفع.";
"wallet__payment_request_waiting_for_details" = "لا تزال تفاصيل الدفع قيد الاستعادة. حاول مرة أخرى قريبًا.";
"wallet__payment_request_in_progress" = "طلب الدفع قيد المعالجة بالفعل.";
Expand Down
4 changes: 4 additions & 0 deletions Bitkit/Resources/Localization/ca.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,8 @@
"pubky_auth__homeserver" = "Homeserver";
"pubky_auth__signup_description" = "Crea una nova identitat Pubky en aquest homeserver. Continua només si hi confies.";
"pubky_auth__approval_failed" = "Ha fallat l'autorització";
"pubky_auth__identity_unavailable_desc" = "Comprova la connexió i torna-ho a provar.";
"profile__auth_error_signup_code_rejected" = "L'homeserver no ha acceptat aquest codi de registre. Torna-ho a provar o utilitza un altre enllaç de registre.";
"wallet__onchain_abandon_transfer_note" = "Les transferències al saldo de despesa ja no estan disponibles. Bitkit primer comprova la xarxa i després retorna les monedes d'aquesta transferència a la teva cartera perquè la transferència original no es pugui confirmar mai. Això té una comissió de xarxa.";
"watch_only_accounts__active_section" = "Comptes actius";
"watch_only_accounts__copy_xpub" = "Copiar xpub";
Expand Down Expand Up @@ -1327,6 +1329,7 @@
"wallet__payment_received" = "Rebut Bitcoin";
"wallet__payment_request" = "Sol·licitud de pagament";
"wallet__payment_request_unavailable" = "La sol·licitud de pagament ja no està disponible.";
"wallet__payment_request_note_too_long" = "Escurça la nota i torna-ho a provar.";
"wallet__payment_request_expired" = "La sol·licitud de pagament ha caducat.";
"wallet__payment_request_waiting_for_details" = "Encara s'estan recuperant les dades de pagament. Torna-ho a provar d'aquí a poc.";
"wallet__payment_request_in_progress" = "La sol·licitud de pagament ja s'està processant.";
Expand Down Expand Up @@ -1649,6 +1652,7 @@
"wallet__payment_request_payment_verified" = "Pagament verificat";
"wallet__payment_request_underpaid" = "Rebut · Pagament insuficient";
"wallet__payment_request_after_expiry" = "Rebut · Després del venciment";
"wallet__payment_request_before_request" = "Rebut · Abans de la sol·licitud";
"pubky_auth__usdt_intro_description" = "Per guanyar, has de compartir amb Paykit la teva adreça USDT. Pot veure l'activitat de vendes, però no pot gastar fons.";
"pubky_auth__usdt_intro_optional" = "Pots compartir amb Paykit la teva adreça USDT per rebre guanys. Pot veure l'activitat de vendes, però no pot gastar fons.";
"pubky_auth__usdt_unavailable" = "La teva adreça USDT no està disponible. Torna-ho a provar.";
Expand Down
4 changes: 4 additions & 0 deletions Bitkit/Resources/Localization/cs.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,8 @@
"pubky_auth__homeserver" = "Homeserver";
"pubky_auth__signup_description" = "Vytvořte si na tomto homeserveru novou identitu Pubky. Pokračujte, jen pokud mu důvěřujete.";
"pubky_auth__approval_failed" = "Autorizace se nezdařila";
"pubky_auth__identity_unavailable_desc" = "Zkontrolujte připojení a zkuste to znovu.";
"profile__auth_error_signup_code_rejected" = "Homeserver tento registrační kód nepřijal. Zkuste to znovu nebo použijte jiný registrační odkaz.";
"wallet__onchain_abandon_transfer_note" = "Převody na útratový zůstatek už nejsou dostupné. Bitkit nejprve zkontroluje síť a pak vrátí mince tohoto převodu do vaší peněženky, aby se původní převod nikdy nepotvrdil. Stojí to síťový poplatek.";
"watch_only_accounts__active_section" = "Aktivní účty";
"watch_only_accounts__copy_xpub" = "Kopírovat xpub";
Expand Down Expand Up @@ -1450,6 +1452,7 @@
"wallet__payment_received" = "bitcoin přijatý";
"wallet__payment_request" = "Žádost o platbu";
"wallet__payment_request_unavailable" = "Žádost o platbu již není k dispozici.";
"wallet__payment_request_note_too_long" = "Zkraťte poznámku a zkuste to znovu.";
"wallet__payment_request_expired" = "Platnost žádosti o platbu vypršela.";
"wallet__payment_request_waiting_for_details" = "Platební údaje se stále obnovují. Zkuste to za chvíli znovu.";
"wallet__payment_request_in_progress" = "Žádost o platbu se již zpracovává.";
Expand Down Expand Up @@ -1789,6 +1792,7 @@
"wallet__payment_request_payment_verified" = "Platba ověřena";
"wallet__payment_request_underpaid" = "Přijato · Nedoplatek";
"wallet__payment_request_after_expiry" = "Přijato · Po vypršení";
"wallet__payment_request_before_request" = "Přijato · Před žádostí";
"pubky_auth__usdt_intro_description" = "Abyste mohli vydělávat, musíte s Paykit sdílet svou adresu USDT. Může zobrazovat prodejní aktivitu, ale nemůže utrácet prostředky.";
"pubky_auth__usdt_intro_optional" = "Svou adresu USDT můžete sdílet s Paykit a přijímat tak výdělky. Může zobrazovat prodejní aktivitu, ale nemůže utrácet prostředky.";
"pubky_auth__usdt_unavailable" = "Vaše adresa USDT není k dispozici. Zkuste to prosím znovu.";
Expand Down
4 changes: 4 additions & 0 deletions Bitkit/Resources/Localization/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,8 @@
"pubky_auth__homeserver" = "Homeserver";
"pubky_auth__signup_description" = "Erstelle eine neue Pubky-Identität auf diesem Homeserver. Fahre nur fort, wenn du ihm vertraust.";
"pubky_auth__approval_failed" = "Autorisierung fehlgeschlagen";
"pubky_auth__identity_unavailable_desc" = "Überprüfe deine Verbindung und versuche es erneut.";
"profile__auth_error_signup_code_rejected" = "Der Homeserver hat diesen Registrierungscode nicht akzeptiert. Versuche es erneut oder verwende einen anderen Registrierungslink.";
"wallet__onchain_abandon_transfer_note" = "Überweisungen auf dein Ausgabenguthaben sind nicht mehr verfügbar. Bitkit prüft zuerst das Netzwerk und schickt die Coins dieser Überweisung dann zurück in deine Wallet, damit die ursprüngliche Überweisung nie bestätigt wird. Dafür fällt eine Netzwerkgebühr an.";
"watch_only_accounts__active_section" = "Aktive Konten";
"watch_only_accounts__copy_xpub" = "xpub kopieren";
Expand Down Expand Up @@ -1448,6 +1450,7 @@
"wallet__payment_received" = "Bitcoin empfangen";
"wallet__payment_request" = "Zahlungsanforderung";
"wallet__payment_request_unavailable" = "Die Zahlungsanforderung ist nicht mehr verfügbar.";
"wallet__payment_request_note_too_long" = "Kürze die Notiz und versuche es erneut.";
"wallet__payment_request_expired" = "Die Zahlungsanforderung ist abgelaufen.";
"wallet__payment_request_waiting_for_details" = "Die Zahlungsdetails werden noch wiederhergestellt. Versuche es in Kürze erneut.";
"wallet__payment_request_in_progress" = "Die Zahlungsanforderung wird bereits bearbeitet.";
Expand Down Expand Up @@ -1786,6 +1789,7 @@
"wallet__payment_request_payment_verified" = "Zahlung verifiziert";
"wallet__payment_request_underpaid" = "Empfangen · Unterbezahlt";
"wallet__payment_request_after_expiry" = "Empfangen · Nach Ablauf";
"wallet__payment_request_before_request" = "Empfangen · Vor der Anforderung";
"pubky_auth__usdt_intro_description" = "Um zu verdienen, musst du deine USDT-Adresse mit Paykit teilen. Paykit kann Verkaufsaktivitäten sehen, aber kein Guthaben ausgeben.";
"pubky_auth__usdt_intro_optional" = "Du kannst deine USDT-Adresse mit Paykit teilen, um Einnahmen zu empfangen. Paykit kann Verkaufsaktivitäten sehen, aber kein Guthaben ausgeben.";
"pubky_auth__usdt_unavailable" = "Deine USDT-Adresse ist nicht verfügbar. Bitte versuche es erneut.";
Expand Down
4 changes: 4 additions & 0 deletions Bitkit/Resources/Localization/el.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,8 @@
"pubky_auth__homeserver" = "Homeserver";
"pubky_auth__signup_description" = "Δημιούργησε μια νέα ταυτότητα Pubky σε αυτόν τον homeserver. Συνέχισε μόνο αν τον εμπιστεύεσαι.";
"pubky_auth__approval_failed" = "Η Εξουσιοδότηση Απέτυχε";
"pubky_auth__identity_unavailable_desc" = "Έλεγξε τη σύνδεσή σου και δοκίμασε ξανά.";
"profile__auth_error_signup_code_rejected" = "Ο homeserver δεν αποδέχτηκε αυτόν τον κωδικό εγγραφής. Δοκίμασε ξανά ή χρησιμοποίησε άλλο σύνδεσμο εγγραφής.";
"wallet__onchain_abandon_transfer_note" = "Οι μεταφορές στο υπόλοιπο δαπανών δεν είναι πλέον διαθέσιμες. Το Bitkit ελέγχει πρώτα το δίκτυο και μετά επιστρέφει τα νομίσματα αυτής της μεταφοράς στο πορτοφόλι σας, ώστε η αρχική μεταφορά να μην επιβεβαιωθεί ποτέ. Αυτό έχει χρέωση δικτύου.";
"watch_only_accounts__active_section" = "Ενεργοί λογαριασμοί";
"watch_only_accounts__copy_xpub" = "Αντιγραφή xpub";
Expand Down Expand Up @@ -1199,6 +1201,7 @@
"wallet__payment_received" = "Bitcoin Λήφθηκε";
"wallet__payment_request" = "Αίτημα πληρωμής";
"wallet__payment_request_unavailable" = "Το αίτημα πληρωμής δεν είναι πλέον διαθέσιμο.";
"wallet__payment_request_note_too_long" = "Συντόμευσε τη σημείωση και δοκίμασε ξανά.";
"wallet__payment_request_expired" = "Το αίτημα πληρωμής έληξε.";
"wallet__payment_request_waiting_for_details" = "Τα στοιχεία πληρωμής ανακτώνται ακόμα. Δοκιμάστε ξανά σε λίγο.";
"wallet__payment_request_in_progress" = "Το αίτημα πληρωμής βρίσκεται ήδη σε επεξεργασία.";
Expand Down Expand Up @@ -1520,6 +1523,7 @@
"wallet__payment_request_payment_verified" = "Η πληρωμή επαληθεύτηκε";
"wallet__payment_request_underpaid" = "Ελήφθη · Ελλιπής πληρωμή";
"wallet__payment_request_after_expiry" = "Ελήφθη · Μετά τη λήξη";
"wallet__payment_request_before_request" = "Ελήφθη · Πριν από το αίτημα";
"pubky_auth__usdt_intro_description" = "Για να κερδίζετε, πρέπει να μοιραστείτε τη διεύθυνση USDT σας με το Paykit. Μπορεί να βλέπει τη δραστηριότητα πωλήσεων, αλλά δεν μπορεί να ξοδέψει κεφάλαια.";
"pubky_auth__usdt_intro_optional" = "Μπορείτε να μοιραστείτε τη διεύθυνση USDT σας με το Paykit για να λαμβάνετε τα κέρδη σας. Μπορεί να βλέπει τη δραστηριότητα πωλήσεων, αλλά δεν μπορεί να ξοδέψει κεφάλαια.";
"pubky_auth__usdt_unavailable" = "Η διεύθυνση USDT σας δεν είναι διαθέσιμη. Δοκιμάστε ξανά.";
Expand Down
4 changes: 4 additions & 0 deletions Bitkit/Resources/Localization/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@
"pubky_auth__homeserver" = "Homeserver";
"pubky_auth__signup_description" = "Create a new Pubky identity on this homeserver. Only continue if you trust it.";
"pubky_auth__approval_failed" = "Authorization Failed";
"pubky_auth__identity_unavailable_desc" = "Check your connection and try again.";
"profile__auth_error_signup_code_rejected" = "The homeserver did not accept this signup code. Try again or use another signup link.";
"watch_only_accounts__active_section" = "Active accounts";
"watch_only_accounts__copy_xpub" = "Copy xpub";
"watch_only_accounts__description" = "Each approved Paykit server gets a separate Bitcoin account. Turn tracking off to unload an account without deleting its wallet history.";
Expand Down Expand Up @@ -1462,6 +1464,7 @@
"wallet__payment_received" = "Received Bitcoin";
"wallet__payment_request" = "Payment Request";
"wallet__payment_request_unavailable" = "The payment request is no longer available.";
"wallet__payment_request_note_too_long" = "Shorten the note and try again.";
"wallet__payment_request_expired" = "The payment request has expired.";
"wallet__payment_request_waiting_for_details" = "Payment details are still being recovered. Try again shortly.";
"wallet__payment_request_in_progress" = "The payment request is already being processed.";
Expand Down Expand Up @@ -1907,6 +1910,7 @@

"wallet__payment_request_underpaid" = "Received · Underpaid";
"wallet__payment_request_after_expiry" = "Received · After expiry";
"wallet__payment_request_before_request" = "Received · Before request";

"pubky_auth__usdt_intro_description" = "To earn, you need to share your USDT address with Paykit. It can view sales activity, but cannot spend funds.";
"pubky_auth__usdt_intro_optional" = "You can share your USDT address with Paykit to receive earnings. It can view sales activity, but cannot spend funds.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,8 @@
"pubky_auth__homeserver" = "Homeserver";
"pubky_auth__signup_description" = "Cree una nueva identidad Pubky en este homeserver. Continúe solo si confía en él.";
"pubky_auth__approval_failed" = "Falló la autorización";
"pubky_auth__identity_unavailable_desc" = "Revise su conexión y vuelva a intentarlo.";
"profile__auth_error_signup_code_rejected" = "El homeserver no aceptó este código de registro. Vuelva a intentarlo o use otro enlace de registro.";
"wallet__onchain_abandon_transfer_note" = "Las transferencias al saldo de gasto ya no están disponibles. Bitkit primero revisa la red y luego devuelve las monedas de esta transferencia a tu billetera para que la transferencia original nunca se confirme. Esto tiene una comisión de red.";
"watch_only_accounts__active_section" = "Cuentas activas";
"watch_only_accounts__copy_xpub" = "Copiar xpub";
Expand Down Expand Up @@ -1453,6 +1455,7 @@
"wallet__payment_received" = "Bitcoin recibido";
"wallet__payment_request" = "Solicitud de pago";
"wallet__payment_request_unavailable" = "La solicitud de pago ya no está disponible.";
"wallet__payment_request_note_too_long" = "Acorte la nota y vuelva a intentarlo.";
"wallet__payment_request_expired" = "La solicitud de pago venció.";
"wallet__payment_request_waiting_for_details" = "Los datos de pago aún se están recuperando. Vuelva a intentarlo en breve.";
"wallet__payment_request_in_progress" = "La solicitud de pago ya se está procesando.";
Expand Down Expand Up @@ -1792,6 +1795,7 @@
"wallet__payment_request_payment_verified" = "Pago verificado";
"wallet__payment_request_underpaid" = "Recibido · Pago insuficiente";
"wallet__payment_request_after_expiry" = "Recibido · Tras vencer";
"wallet__payment_request_before_request" = "Recibido · Antes de la solicitud";
"pubky_auth__usdt_intro_description" = "Para ganar, debe compartir su dirección USDT con Paykit. Puede ver la actividad de ventas, pero no puede gastar fondos.";
"pubky_auth__usdt_intro_optional" = "Puede compartir su dirección USDT con Paykit para recibir sus ganancias. Paykit podrá ver la actividad de ventas, pero no gastar fondos.";
"pubky_auth__usdt_unavailable" = "Su dirección USDT no está disponible. Vuelva a intentarlo.";
Expand Down
Loading