sora-xor · Nikita-Polyakov · Apr 19, 2022 · Apr 19, 2022 · Apr 19, 2022 · Apr 19, 2022
diff --git a/src/lang/cs.json b/src/lang/cs.json
@@ -591,7 +591,6 @@
             "done": "Hotovo",
             "waitingForConfirmation": "Čeká se na potvrzení..."
         },
-        "wait30Block": "Vyčkejte prosím 30 potvrzení bloku",
         "viewInEtherscan": "Zobrazit v Etherscanu",
         "networkTitle": "{network} transakce",
         "transactionHash": "Hash transakce",

diff --git a/src/lang/de.json b/src/lang/de.json
@@ -591,7 +591,6 @@
             "done": "Erfolgreich",
             "waitingForConfirmation": "Warten auf Bestätigung..."
         },
-        "wait30Block": "Bitte, warte 30 Blockbestätigungen",
         "viewInEtherscan": "Auf Etherscan anzeigen",
         "networkTitle": "{network} Transaktion",
         "transactionHash": "Transaktions-ID",

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -591,7 +591,6 @@
             "done": "Complete",
             "waitingForConfirmation": "Waiting for confirmation..."
         },
-        "wait30Block": "Please wait 30 block confirmations",
         "viewInEtherscan": "View in Etherscan",
         "networkTitle": "{network} transaction",
         "transactionHash": "Transaction hash",

diff --git a/src/lang/es.json b/src/lang/es.json
@@ -591,7 +591,6 @@
             "done": "Completo",
             "waitingForConfirmation": "Esperando confirmación..."
         },
-        "wait30Block": "Espere 30 confirmaciones de bloque",
         "viewInEtherscan": "Ver en Etherscan",
         "networkTitle": "Transacción de {network}",
         "transactionHash": "Hash de la transacción",

diff --git a/src/lang/fr.json b/src/lang/fr.json
@@ -591,7 +591,6 @@
             "done": "Compléter",
             "waitingForConfirmation": "En attente de confirmation..."
         },
-        "wait30Block": "Veuillez attendre 30 confirmations de block",
         "viewInEtherscan": "Afficher dans Etherscan",
         "networkTitle": "transaction {network}",
         "transactionHash": "Hash de transaction",

diff --git a/src/lang/hy.json b/src/lang/hy.json
@@ -591,7 +591,6 @@
             "done": "Վերջացված է",
             "waitingForConfirmation": "Հաստատման սպասում ..."
         },
-        "wait30Block": "Խնդրում ենք սպասել 30 բլոկի հաստատատման",
         "viewInEtherscan": "Դիտել Etherscan- ում",
         "networkTitle": "{network} գործարք",
         "transactionHash": "Գործարքի հաշ(կոդ)",

diff --git a/src/lang/id.json b/src/lang/id.json
@@ -591,7 +591,6 @@
             "done": "Berhasil",
             "waitingForConfirmation": "Menunggu konfirmasi..."
         },
-        "wait30Block": "Silakan tunggu 30 blok terkonfirmasi",
         "viewInEtherscan": "Lihat di Etherscan",
         "networkTitle": "Transaksi {network}",
         "transactionHash": "Hash transaksi",

diff --git a/src/lang/it.json b/src/lang/it.json
@@ -591,7 +591,6 @@
             "done": "Completata",
             "waitingForConfirmation": "In attesa di conferma..."
         },
-        "wait30Block": "Si prega di attendere 30 blocchi di conferma",
         "viewInEtherscan": "Visualizza in Etherscan",
         "networkTitle": "transazione {network}",
         "transactionHash": "Hash della transazione",

diff --git a/src/lang/messages.ts b/src/lang/messages.ts
@@ -414,7 +414,6 @@ export default {
       done: 'Complete',
       waitingForConfirmation: 'Waiting for confirmation...',
     },
-    wait30Block: 'Please wait 30 block confirmations',
     blocksLeft: '{count} blocks left...',
     viewInEtherscan: 'View in Etherscan',
     networkTitle: '{network} transaction',

diff --git a/src/lang/nl.json b/src/lang/nl.json
@@ -591,7 +591,6 @@
             "done": "Compleet",
             "waitingForConfirmation": "Wachten op bevestiging..."
         },
-        "wait30Block": "Gelieve 30 blokbevestigingen te wachten",
         "viewInEtherscan": "Bekijk in Etherscan",
         "networkTitle": "{Netwerk} transactie",
         "transactionHash": "Transactie hash",

diff --git a/src/lang/no.json b/src/lang/no.json
@@ -591,7 +591,6 @@
             "done": "Ferdig",
             "waitingForConfirmation": "Venter på bekreftelse..."
         },
-        "wait30Block": "Vent på 30 blokkbekreftelser",
         "viewInEtherscan": "Vis i Etherscan",
         "networkTitle": "{network} transaksjon",
         "transactionHash": "Transaksjon hash",

diff --git a/src/lang/pl.json b/src/lang/pl.json
@@ -591,7 +591,6 @@
             "done": "Ukończono",
             "waitingForConfirmation": "Oczekiwanie na potwierdzenie..."
         },
-        "wait30Block": "Proszę poczekać, aż 30 bloków zostanie potwierdzonych.",
         "viewInEtherscan": "Pokaż w Etherscanie",
         "networkTitle": "transakcji sieci {network}",
         "transactionHash": "Skrót transakcji",

diff --git a/src/lang/ru.json b/src/lang/ru.json
@@ -591,7 +591,6 @@
             "done": "Выполнено",
             "waitingForConfirmation": "Ожидание подтверждения..."
         },
-        "wait30Block": "Пожалуйста, дождитесь 30 подтверждений блока",
         "viewInEtherscan": "Посмотреть в Etherscan",
         "networkTitle": "{network} транзакция",
         "transactionHash": "Хеш транзакции",

diff --git a/src/lang/yo.json b/src/lang/yo.json
@@ -591,7 +591,6 @@
             "done": "Pari",
             "waitingForConfirmation": "Nduro fun idaniloju ..."
         },
-        "wait30Block": "Jọwọ duro awọn ijẹrisi idiwọ ogbon",
         "viewInEtherscan": "Wo ni Etherscan",
         "networkTitle": "idunadura {network}",
         "transactionHash": "Ami Iṣowo",

diff --git a/src/views/BridgeTransaction.vue b/src/views/BridgeTransaction.vue
@@ -513,6 +513,9 @@ export default class BridgeTransaction extends Mixins(mixins.FormattedAmountMixi
 
   get statusFrom(): string {
     if (this.isTransactionFromPending) {
+      if (!this.isSoraToEvm && !this.transactionFromHash) {
+        return this.t('bridgeTransaction.statuses.waitingForConfirmation');
+      }
       return this.t('bridgeTransaction.statuses.pending') + '...';
     }
     if (this.isTransactionFromFailed) {
@@ -526,23 +529,19 @@ export default class BridgeTransaction extends Mixins(mixins.FormattedAmountMixi
   }
 
   get statusTo(): string {
-    if (!this.isTransactionFromCompleted) {
-      return this.t('bridgeTransaction.statuses.waiting') + '...';
-    }
     if (this.isTransactionToPending) {
-      const message = this.t('bridgeTransaction.statuses.pending') + '...';
-      if (this.isSoraToEvm) {
-        return message;
+      if (this.isSoraToEvm && !this.transactionToHash) {
+        return this.t('bridgeTransaction.statuses.waitingForConfirmation');
       }
-      return `${message} (${this.t('bridgeTransaction.wait30Block')})`;
+      return this.t('bridgeTransaction.statuses.pending') + '...';
     }
     if (this.isTransactionToFailed) {
       return this.t('bridgeTransaction.statuses.failed');
     }
     if (this.isTransactionToCompleted) {
       return this.t('bridgeTransaction.statuses.done');
     }
-    return this.t('bridgeTransaction.statuses.waitingForConfirmation');
+    return this.t('bridgeTransaction.statuses.waiting') + '...';
   }
 
   get transactionEvmAddress(): string {