Make content changes for the STX status page, remove old content (#14805)

2024-12-23 09:52:26 +01:00 · 2022-06-07 15:42:25 +02:00 · 2022-06-07 15:42:25 +02:00 · bd5d47993d
commit bd5d47993d
parent 18e4af7690
17 changed files with 14 additions and 201 deletions
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Sie können Ihre Token immer noch tauschen, selbst während intelligente Transaktionen nicht verfügbar sind."
  },
-  "stxPendingFinalizing": {
-    "message": "Wird finalisiert ..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Gas wird optimiert ..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Swap wird privat eingereicht ..."
-  },
  "stxSubDescription": {
    "message": "* Intelligente Transaktionen versuchen mehrmals, Ihre Transaktion privat zu übermitteln. Wenn alle Versuche fehlschlagen, wird die Transaktion öffentlich übertragen, um sicherzustellen, dass Ihr Swap erfolgreich durchgeführt wird."
  },
@ -3180,10 +3171,6 @@
    "message": "Keine Token verfügbar mit $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Swap abgeschlossen in <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Mit Ihrer Hardware-Wallet bestätigen"
  },
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Μπορείτε να ανταλλάξετε ακόμα τα token σας, ακόμα και αν οι Έξυπνες Συναλλαγές δεν είναι διαθέσιμες."
  },
-  "stxPendingFinalizing": {
-    "message": "Ολοκλήρωση..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Βελτιστοποίηση τελών συναλλαγής..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Ιδιωτική υποβολή της Ανταλλαγής..."
-  },
  "stxSubDescription": {
    "message": "* Οι Έξυπνες Συναλλαγές θα προσπαθήσουν να υποβάλουν τη συναλλαγή σας ιδιωτικά, πολλές φορές. Εάν όλες οι προσπάθειες αποτύχουν, η συναλλαγή θα μεταδοθεί δημόσια για να διασφαλιστεί η επιτυχής πραγματοποίηση της ανταλλαγής σας."
  },
@ -3180,10 +3171,6 @@
    "message": "Δεν υπάρχουν διαθέσιμα tokens που να ταιριάζουν σε $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Η ανταλλαγή θα ολοκληρωθεί σε <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Επιβεβαιώστε με το υλικό πορτοφόλι σας"
  },
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@ -3161,14 +3161,11 @@
  "stxFallbackUnavailable": {
    "message": "You can still swap your tokens even while Smart Transactions are unavailable."
  },
-  "stxPendingFinalizing": {
-    "message": "Finalizing..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Privately submitting your Swap..."
  },
-  "stxPendingOptimizingGas": {
-    "message": "Optimizing gas..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Privately submitting the Swap..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Publicly submitting your Swap..."
  },
  "stxSubDescription": {
    "message": "* Smart Transactions will attempt to submit your transaction privately, multiple times. If all attempts fail, the transaction will be broadcast publicly to ensure your Swap successfully goes through."
@ -3180,6 +3177,10 @@
    "message": "Your $1 is now available.",
    "description": "$1 is a token symbol, e.g. ETH"
  },
+  "stxSwapCompleteIn": {
+    "message": "Swap will complete in <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
  "stxTooltip": {
    "message": "Simulate transactions before submitting to decrease transaction costs and reduce failures."
  },
@ -3258,10 +3259,6 @@
    "message": "No tokens available matching $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Swap complete in <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Confirm with your hardware wallet"
  },
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Todavía puede intercambiar sus tokens incluso cuando las transacciones inteligentes no están disponibles."
  },
-  "stxPendingFinalizing": {
-    "message": "Finalizando…"
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Optimizando gas..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Enviando el Swap de forma privada..."
-  },
  "stxSubDescription": {
    "message": "* Transacciones inteligentes intentará enviar su transacción de forma privada varias veces. Si todos los intentos fallan, la transacción se transmitirá públicamente para garantizar que su swap se realice con éxito."
  },
@ -3180,10 +3171,6 @@
    "message": "No hay tokens disponibles que coincidan con $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Swap finalizado en <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Confirmar con la cartera de hardware"
  },
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Vous pouvez toujours faire un swap de tokens, même si les transactions intelligentes ne sont pas disponibles."
  },
-  "stxPendingFinalizing": {
-    "message": "Finalisation..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Optimisation des gas fees..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Soumission privée du swap..."
-  },
  "stxSubDescription": {
    "message": "* Avec les transactions intelligentes, votre transaction sera soumise plusieurs fois en privé. Si toutes les tentatives échouent, la transaction sera diffusée publiquement pour s’assurer de la réussite de votre swap."
  },
@ -3180,10 +3171,6 @@
    "message": "Aucun jeton disponible correspondant à $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Swap terminé dans <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Confirmez avec votre portefeuille matériel"
  },
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "स्मार्ट लेनदेन अनुपलब्ध होने पर भी आप अपने टोकनों को स्वैप कर सकते हैं।"
  },
-  "stxPendingFinalizing": {
-    "message": "फ़ाइनलाइज़ कर रहा है..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "गैस ऑप्टिमाइज़ कर रहा है..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "स्वैप को निजी तौर पर सबमिट कर रहा है..."
-  },
  "stxSubDescription": {
    "message": "* स्मार्ट लेनदेन आपके लेनदेन को निजी तौर पर, अनेक बार जमा करने का प्रयास करेंगे। यदि सभी प्रयास विफल हो जाते हैं, तो लेनदेन को सार्वजनिक रूप से प्रसारित किया जाएगा ताकि यह सुनिश्चित हो सके कि आपका स्वैप सफलतापूर्वक पूरा हो।"
  },
@ -3180,10 +3171,6 @@
    "message": "$1 के मिलान वाले कोई भी टोकन उपलब्ध नहीं हैं",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "स्वैप पूरा होगा <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "अपने हार्डवेयर वॉलेट से पुष्टि करें"
  },
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Anda masih bisa menukar token meskipun Transaksi Pintar tidak tersedia."
  },
-  "stxPendingFinalizing": {
-    "message": "Menyelesaikan..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Mengoptimalkan gas..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Mengirimkan Pertukaran secara pribadi..."
-  },
  "stxSubDescription": {
    "message": "* Transaksi Pintar akan mencoba mengirimkan transaksi Anda secara pribadi, beberapa kali. Jika semua upaya gagal, transaksi akan disiarkan secara publik untuk memastikan Pertukaran telah berhasil dilakukan."
  },
@ -3180,10 +3171,6 @@
    "message": "Tidak ada token yang cocok yang tersedia $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Pertukaran selesai di <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Konfirmasikan dengan dompet perangkat keras Anda"
  },
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "スマートトランザクションが利用できなくても、トークンのスワップは可能です。"
  },
-  "stxPendingFinalizing": {
-    "message": "最終処理中..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "ガス代を最適化中..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "スワップを非公開で送信中..."
-  },
  "stxSubDescription": {
    "message": "* スマートトランザクションは、非公開でトランザクションのの送信を数回試みます。すべての試みが失敗した場合、スワップが成功するようトランザクションが公開されます。"
  },
@ -3180,10 +3171,6 @@
    "message": "$1と一致するトークンがありません",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "スワップ完了まで <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "ハードウェアウォレットで確定"
  },
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "스마트 거래를 사용할 수 없을 때도 토큰 스왑은 가능합니다."
  },
-  "stxPendingFinalizing": {
-    "message": "마무리 중..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "가스비 최적화 중..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "스왑을 비공개로 제출하는 중..."
-  },
  "stxSubDescription": {
    "message": "*스마트 거래는 비공개로 거래를 제출하기 위해 여러 번 시도할 것입니다. 모든 시도가 실패하면 성공적인 스왑을 위해 거래는 공개적으로 브로드캐스트될 것입니다."
  },
@ -3180,10 +3171,6 @@
    "message": "$1와(과) 일치하는 토큰이 없습니다.",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "스왑 완료까지 남은 시간:",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "하드웨어 지갑으로 확인합니다."
  },
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Você ainda pode fazer swap com seus tokens mesmo quando as Transações Inteligentes estiverem indisponíveis."
  },
-  "stxPendingFinalizing": {
-    "message": "Finalizando..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Otimizando as taxas de gás..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Enviando a Swap de forma privada..."
-  },
  "stxSubDescription": {
    "message": "* A função de Transações Inteligentes tentará enviar a sua transação várias vezes de forma privada. Se todas as tentativas falharem, a transação será transmitida publicamente para garantir que sua Swap seja realizada com sucesso."
  },
@ -3180,10 +3171,6 @@
    "message": "Nenhum token disponível correspondente a $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Swap concluído em <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Confirme com sua carteira de hardware"
  },
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Вы по-прежнему можете обменивать свои токены, даже если смарт-транзакции недоступны."
  },
-  "stxPendingFinalizing": {
-    "message": "Завершение..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Оптимизация газа..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Конфиденциальная отправка ооперации обмена..."
-  },
  "stxSubDescription": {
    "message": "* Смарт-транзакции попытаются несколько раз отправить вашу транзакцию в конфиденциальном порядке. Если все попытки не увенчаются успехом, транзакция будет показана публично, чтобы гарантировать успешное завершение вашего обмена."
  },
@ -3180,10 +3171,6 @@
    "message": "Нет доступных токенов, соответствующих $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Обмен завершится через <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Подтвердите с помощью аппаратного кошелька"
  },
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Maaari mo parin papalitan ang iyong mga token kahit na hindi available ang mga Smart Transaction."
  },
-  "stxPendingFinalizing": {
-    "message": "Isinasapinal..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Pinapahusay ang gas..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Pribadong isinusumite ang Pagpapalit..."
-  },
  "stxSubDescription": {
    "message": "* Susubukan ng mga Smart Transaction na isumite nang pribado ang iyong transaksyon, maraming beses. Kapag nabigo ang lahat ng pagsubok, ipapakita sa publiko ang transaksyon upang matiyak na ang Pagpapalit ay naging matagupay."
  },
@ -3180,10 +3171,6 @@
    "message": "Walang available na token na tumutugma sa $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Kumpleto na ang pagpapalit sa <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Kumpirmahin gamit ang iyong hardware wallet"
  },
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Akıllı İşlemler kullanılamazken bile token'larını değiştirebilirsin."
  },
-  "stxPendingFinalizing": {
-    "message": "Sonuçlandırılıyor..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Gas optimize ediliyor..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Takas özel olarak gönderiliyor..."
-  },
  "stxSubDescription": {
    "message": "* Akıllı İşlemler, işlemini birden çok kez özel olarak göndermeye çalışır. Tüm denemeler başarısız olursa Takas'ının başarılı bir şekilde gerçekleşmesini sağlamak için işlem herkese açık olarak yayınlanacaktır."
  },
@ -3180,10 +3171,6 @@
    "message": "$1 ile eşleşen token yok",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Değiştirme işlemi şu süre içinde tamamlandı <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Donanım cüzdanınızla onaylayın"
  },
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@ -3083,15 +3083,6 @@
  "stxFallbackUnavailable": {
    "message": "Bạn vẫn có thể hoán đổi token ngay cả khi Giao dịch thông minh không khả dụng."
  },
-  "stxPendingFinalizing": {
-    "message": "Đang hoàn thành..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Đang tối ưu gas..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Đang gửi yêu cầu Hoán đổi riêng tư..."
-  },
  "stxSubDescription": {
    "message": "* Giao dịch thông minh sẽ cố gắng gửi giao dịch của bạn nhiều lần theo cách riêng tư. Nếu tất cả các lần thử đều không thành công, giao dịch sẽ được phát công khai để đảm bảo Hoán đổi của bạn được thực hiện thành công."
  },
@ -3180,10 +3171,6 @@
    "message": "Không có token nào khớp với $1",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "Hoán đổi xong sau <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "Xác nhận ví cứng của bạn"
  },
--- a/app/_locales/zh/messages.json
+++ b/app/_locales/zh/messages.json
@ -3089,15 +3089,6 @@
  "stxFallbackUnavailable": {
    "message": "即使智能交易不可用，您仍然可以交换代币。"
  },
-  "stxPendingFinalizing": {
-    "message": "最终确定中..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "正在优化燃料......"
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "正在隐秘提交交换......"
-  },
  "stxSubDescription": {
    "message": "*智能交易将尝试多次隐秘提交您的交易。如果所有尝试都失败，交易将会公开广播，以确保您的交换能成功进行。"
  },
@ -3186,10 +3177,6 @@
    "message": "没有与 $1 匹配的代币",
    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
  },
-  "swapCompleteIn": {
-    "message": "交换将在此时间內完成<",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
  "swapConfirmWithHwWallet": {
    "message": "使用您的硬件钱包确认"
  },
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@ -169,17 +169,15 @@ export default function SmartTransactionStatus() {
    }, 1000); // Stop polling for quotes after 1s.
  }, [dispatch]);

-  let headerText = t('stxPendingOptimizingGas');
+  let headerText = t('stxPendingPrivatelySubmittingSwap');
  let description;
  let subDescription;
  let icon;
  if (isSmartTransactionPending) {
-    if (timeLeftForPendingStxInSec < 120) {
-      headerText = t('stxPendingFinalizing');
-    } else if (timeLeftForPendingStxInSec < 150) {
-      headerText = t('stxPendingPrivatelySubmitting');
-    } else if (cancelSwapLinkClicked) {
+    if (cancelSwapLinkClicked) {
      headerText = t('stxTryingToCancel');
+    } else if (latestSmartTransaction?.statusMetadata?.cancellationFeeWei > 0) {
+      headerText = t('stxPendingPubliclySubmittingSwap');
    }
  }
  if (smartTransactionStatus === SMART_TRANSACTION_STATUSES.SUCCESS) {
@ -332,7 +330,7 @@ export default function SmartTransactionStatus() {
              variant={TYPOGRAPHY.H6}
              boxProps={{ marginLeft: 1 }}
            >
-              {`${t('swapCompleteIn')} `}
+              {`${t('stxSwapCompleteIn')} `}
            </Typography>
            <Typography
              color={COLORS.TEXT_ALTERNATIVE}
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
@ -19,7 +19,7 @@ describe('SmartTransactionStatus', () => {
  it('renders the component with initial props', () => {
    const store = configureMockStore(middleware)(createSwapsMockStore());
    const { getByText } = renderWithProvider(<SmartTransactionStatus />, store);
-    expect(getByText('Optimizing gas...')).toBeInTheDocument();
+    expect(getByText('Publicly submitting your Swap...')).toBeInTheDocument();
    expect(getByText('Close')).toBeInTheDocument();
  });
 });