Skip to content

Commit

Permalink
Surface swap finalization errors when fetching and validating BTC HTLC
Browse files Browse the repository at this point in the history
  • Loading branch information
@sisou
sisou committed Jan 12, 2024
1 parent 9c2062c commit 4193879
Show file tree
Hide file tree
Showing 11 changed files with 245 additions and 104 deletions.
32 changes: 22 additions & 10 deletions src/i18n/de.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ msgstr "30 Sekunden, keine E-Mail, kein Download."
msgid "404 - Cash not found"
msgstr "404 - kein Guthaben vorhanden"

#: src/views/SetupSwapSuccess.vue:142
#: src/views/SetupSwapSuccess.vue:145
msgid "503 Service unavailable - please try again later"
msgstr "503 Service nicht verfügbar - bitte versuche es später nochmal"

Expand Down Expand Up @@ -209,6 +209,10 @@ msgstr "Bitcoin"
msgid "Bitcoin activated"
msgstr "Bitcoin aktiviert"

#: src/views/SetupSwapSuccess.vue:627
msgid "Bitcoin HTLC invalid: {error}"
msgstr ""

#: src/views/AddVestingContract.vue:36
msgid "Blocks/Step:"
msgstr "Blöcke/Schritt:"
Expand Down Expand Up @@ -546,15 +550,19 @@ msgstr "Gebühr"
msgid "Fetching Addresses Failed"
msgstr "Laden der Adressen fehlgeschlagen"

#: src/views/SetupSwapSuccess.vue:616
msgid "Fetching Bitcoin HTLC..."
msgstr ""

#: src/views/AddVestingContract.vue:16
msgid "Fetching contract information..."
msgstr "Lade Vertragsadressen"

#: src/views/SetupSwapSuccess.vue:603
#: src/views/SetupSwapSuccess.vue:624
msgid "Fetching swap data failed: {error}"
msgstr "Laden der Tausch-Daten fehlgeschlagen: {error}"

#: src/views/SetupSwapSuccess.vue:593
#: src/views/SetupSwapSuccess.vue:612
msgid "Fetching swap data..."
msgstr "Lade Tausch-Daten..."

Expand Down Expand Up @@ -866,7 +874,7 @@ msgstr "Bitte sende die Transaktion manuell"
msgid "Prepare for update"
msgstr "Update vorbereiten"

#: src/views/SetupSwapSuccess.vue:586
#: src/views/SetupSwapSuccess.vue:605
msgid "Preparing Swap"
msgstr "Tausch wird vorbereitet"

Expand Down Expand Up @@ -938,8 +946,8 @@ msgid "Retrieving your old accounts..."
msgstr "Rufe alte Konten ab..."

#: src/views/ActivatePolygonSuccess.vue:139
#: src/views/BitcoinSyncBaseView.vue:68 src/views/LoginSuccess.vue:122
#: src/views/SetupSwapSuccess.vue:611 src/views/SignupLedger.vue:145
#: src/views/BitcoinSyncBaseView.vue:72 src/views/LoginSuccess.vue:122
#: src/views/SetupSwapSuccess.vue:634 src/views/SignupLedger.vue:145
msgid "Retry"
msgstr "Noch einmal"

Expand Down Expand Up @@ -972,7 +980,7 @@ msgstr "Teilen"
msgid "Sign Message"
msgstr "Nachricht signieren"

#: src/views/SetupSwapSuccess.vue:595
#: src/views/SetupSwapSuccess.vue:614
msgid "Signing transactions..."
msgstr "Signiere Transaktionen..."

Expand Down Expand Up @@ -1017,7 +1025,7 @@ msgstr "Tausch autorisiert"
msgid "Swap fee"
msgstr "Tauschgebühr"

#: src/views/SetupSwapLedger.vue:848 src/views/SetupSwapSuccess.vue:582
#: src/views/SetupSwapLedger.vue:848 src/views/SetupSwapSuccess.vue:601
msgid "Swap Setup Failed"
msgstr "Tauschvorgang fehlgeschlagen"

Expand All @@ -1033,7 +1041,7 @@ msgstr "Konsensus wird synchronisiert..."

#: src/views/ActivatePolygonSuccess.vue:113
#: src/views/BitcoinSyncBaseView.vue:50 src/views/SetupSwapLedger.vue:850
#: src/views/SetupSwapSuccess.vue:584
#: src/views/SetupSwapSuccess.vue:603
#: src/views/SignBtcTransactionLedger.vue:117
msgid "Syncing Failed"
msgstr "Synchronisierung fehlgeschlagen"
Expand All @@ -1046,7 +1054,7 @@ msgstr "Synchronisierung mit {currency}-Netzwerk fehlgeschlagen: {error}"
msgid "Syncing with {currency} network..."
msgstr "Synchronisiere mit {currency}-Netzwerk..."

#: src/views/BitcoinSyncBaseView.vue:63
#: src/views/BitcoinSyncBaseView.vue:65
msgid "Syncing with Bitcoin network failed: {error}"
msgstr "Synchronisierung mit Bitcoin-Netzwerk fehlgeschlagen: {error}"

Expand Down Expand Up @@ -1234,6 +1242,10 @@ msgstr "Benutze deine Login-Datei oder deine Wie­der­her­stellungswörter."
msgid "Used addresses without balance might have been missed."
msgstr "Verwendete Adressen ohne Guthaben wurden möglicherweise übersprungen."

#: src/views/SetupSwapSuccess.vue:370
msgid "Value mismatch (expected {expected} sats, found {found} sats)"
msgstr ""

#: src/views/SignTransactionLedger.vue:31
msgid "Verify Payment"
msgstr "Überprüfe die Zahlung"
Expand Down
32 changes: 22 additions & 10 deletions src/i18n/en.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ msgstr ""
msgid "404 - Cash not found"
msgstr ""

#: src/views/SetupSwapSuccess.vue:142
#: src/views/SetupSwapSuccess.vue:145
msgid "503 Service unavailable - please try again later"
msgstr ""

Expand Down Expand Up @@ -199,6 +199,10 @@ msgstr ""
msgid "Bitcoin activated"
msgstr ""

#: src/views/SetupSwapSuccess.vue:627
msgid "Bitcoin HTLC invalid: {error}"
msgstr ""

#: src/views/AddVestingContract.vue:36
msgid "Blocks/Step:"
msgstr ""
Expand Down Expand Up @@ -543,15 +547,19 @@ msgstr ""
msgid "Fetching Addresses Failed"
msgstr ""

#: src/views/SetupSwapSuccess.vue:616
msgid "Fetching Bitcoin HTLC..."
msgstr ""

#: src/views/AddVestingContract.vue:16
msgid "Fetching contract information..."
msgstr ""

#: src/views/SetupSwapSuccess.vue:603
#: src/views/SetupSwapSuccess.vue:624
msgid "Fetching swap data failed: {error}"
msgstr ""

#: src/views/SetupSwapSuccess.vue:593
#: src/views/SetupSwapSuccess.vue:612
msgid "Fetching swap data..."
msgstr ""

Expand Down Expand Up @@ -849,7 +857,7 @@ msgstr ""
msgid "Prepare for update"
msgstr ""

#: src/views/SetupSwapSuccess.vue:586
#: src/views/SetupSwapSuccess.vue:605
msgid "Preparing Swap"
msgstr ""

Expand Down Expand Up @@ -915,9 +923,9 @@ msgid "Retrieving your old accounts..."
msgstr ""

#: src/views/ActivatePolygonSuccess.vue:139
#: src/views/BitcoinSyncBaseView.vue:68
#: src/views/BitcoinSyncBaseView.vue:72
#: src/views/LoginSuccess.vue:122
#: src/views/SetupSwapSuccess.vue:611
#: src/views/SetupSwapSuccess.vue:634
#: src/views/SignupLedger.vue:145
msgid "Retry"
msgstr ""
Expand Down Expand Up @@ -952,7 +960,7 @@ msgstr ""
msgid "Sign Message"
msgstr ""

#: src/views/SetupSwapSuccess.vue:595
#: src/views/SetupSwapSuccess.vue:614
msgid "Signing transactions..."
msgstr ""

Expand Down Expand Up @@ -998,7 +1006,7 @@ msgid "Swap fee"
msgstr ""

#: src/views/SetupSwapLedger.vue:848
#: src/views/SetupSwapSuccess.vue:582
#: src/views/SetupSwapSuccess.vue:601
msgid "Swap Setup Failed"
msgstr ""

Expand All @@ -1016,7 +1024,7 @@ msgstr ""
#: src/views/ActivatePolygonSuccess.vue:113
#: src/views/BitcoinSyncBaseView.vue:50
#: src/views/SetupSwapLedger.vue:850
#: src/views/SetupSwapSuccess.vue:584
#: src/views/SetupSwapSuccess.vue:603
#: src/views/SignBtcTransactionLedger.vue:117
msgid "Syncing Failed"
msgstr ""
Expand All @@ -1029,7 +1037,7 @@ msgstr ""
msgid "Syncing with {currency} network..."
msgstr ""

#: src/views/BitcoinSyncBaseView.vue:63
#: src/views/BitcoinSyncBaseView.vue:65
msgid "Syncing with Bitcoin network failed: {error}"
msgstr ""

Expand Down Expand Up @@ -1191,6 +1199,10 @@ msgstr ""
msgid "Used addresses without balance might have been missed."
msgstr ""

#: src/views/SetupSwapSuccess.vue:370
msgid "Value mismatch (expected {expected} sats, found {found} sats)"
msgstr ""

#: src/views/SignTransactionLedger.vue:31
msgid "Verify Payment"
msgstr ""
Expand Down
32 changes: 22 additions & 10 deletions src/i18n/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ msgstr "30 segundos, sin email, sin descargas."
msgid "404 - Cash not found"
msgstr "404 - Dinero no fue encontrado"

#: src/views/SetupSwapSuccess.vue:142
#: src/views/SetupSwapSuccess.vue:145
msgid "503 Service unavailable - please try again later"
msgstr ""
"503 Servicio no se encuentra disponible - por favor intente de nuevo luego"
Expand Down Expand Up @@ -206,6 +206,10 @@ msgstr "Bitcoin"
msgid "Bitcoin activated"
msgstr "Bitcoin activado"

#: src/views/SetupSwapSuccess.vue:627
msgid "Bitcoin HTLC invalid: {error}"
msgstr ""

#: src/views/AddVestingContract.vue:36
msgid "Blocks/Step:"
msgstr "Bloques/Paso:"
Expand Down Expand Up @@ -542,15 +546,19 @@ msgstr "Cuota"
msgid "Fetching Addresses Failed"
msgstr "Obtención de Direcciones Fallida"

#: src/views/SetupSwapSuccess.vue:616
msgid "Fetching Bitcoin HTLC..."
msgstr ""

#: src/views/AddVestingContract.vue:16
msgid "Fetching contract information..."
msgstr "Obteniendo información del contrato..."

#: src/views/SetupSwapSuccess.vue:603
#: src/views/SetupSwapSuccess.vue:624
msgid "Fetching swap data failed: {error}"
msgstr "Obtención de datos de intercambio fallida: {error}"

#: src/views/SetupSwapSuccess.vue:593
#: src/views/SetupSwapSuccess.vue:612
msgid "Fetching swap data..."
msgstr "Obteniendo datos del intercambio..."

Expand Down Expand Up @@ -860,7 +868,7 @@ msgstr "Por favor envíe la transacción manualmente"
msgid "Prepare for update"
msgstr "Prepárese para la actualización"

#: src/views/SetupSwapSuccess.vue:586
#: src/views/SetupSwapSuccess.vue:605
msgid "Preparing Swap"
msgstr "Preparando intercambio"

Expand Down Expand Up @@ -932,8 +940,8 @@ msgid "Retrieving your old accounts..."
msgstr "Obteniendo sus cuentas viejas..."

#: src/views/ActivatePolygonSuccess.vue:139
#: src/views/BitcoinSyncBaseView.vue:68 src/views/LoginSuccess.vue:122
#: src/views/SetupSwapSuccess.vue:611 src/views/SignupLedger.vue:145
#: src/views/BitcoinSyncBaseView.vue:72 src/views/LoginSuccess.vue:122
#: src/views/SetupSwapSuccess.vue:634 src/views/SignupLedger.vue:145
msgid "Retry"
msgstr "Reintentar"

Expand Down Expand Up @@ -966,7 +974,7 @@ msgstr "Compartir"
msgid "Sign Message"
msgstr "Firmar Mensaje"

#: src/views/SetupSwapSuccess.vue:595
#: src/views/SetupSwapSuccess.vue:614
msgid "Signing transactions..."
msgstr "Firmando transacciones..."

Expand Down Expand Up @@ -1010,7 +1018,7 @@ msgstr "Intercambio autorizado"
msgid "Swap fee"
msgstr "Cuota de intercambio"

#: src/views/SetupSwapLedger.vue:848 src/views/SetupSwapSuccess.vue:582
#: src/views/SetupSwapLedger.vue:848 src/views/SetupSwapSuccess.vue:601
msgid "Swap Setup Failed"
msgstr "Configuración del Intercambio Fallida"

Expand All @@ -1026,7 +1034,7 @@ msgstr "Sincronizando consenso...."

#: src/views/ActivatePolygonSuccess.vue:113
#: src/views/BitcoinSyncBaseView.vue:50 src/views/SetupSwapLedger.vue:850
#: src/views/SetupSwapSuccess.vue:584
#: src/views/SetupSwapSuccess.vue:603
#: src/views/SignBtcTransactionLedger.vue:117
msgid "Syncing Failed"
msgstr "Sincronización Fallida"
Expand All @@ -1039,7 +1047,7 @@ msgstr "Sincronización con la red de {currency} fallida: {error}"
msgid "Syncing with {currency} network..."
msgstr "Sincronizando con la red de {currency} ..."

#: src/views/BitcoinSyncBaseView.vue:63
#: src/views/BitcoinSyncBaseView.vue:65
msgid "Syncing with Bitcoin network failed: {error}"
msgstr "Proceso de sincronización con la red Bitcoin falló: {error}"

Expand Down Expand Up @@ -1228,6 +1236,10 @@ msgstr ""
msgid "Used addresses without balance might have been missed."
msgstr "Puede que se ignoraran direcciones usadas sin balance."

#: src/views/SetupSwapSuccess.vue:370
msgid "Value mismatch (expected {expected} sats, found {found} sats)"
msgstr ""

#: src/views/SignTransactionLedger.vue:31
msgid "Verify Payment"
msgstr "Verifique Pago"
Expand Down
Loading

0 comments on commit 4193879

Please sign in to comment.