Merge pull request #1348 from mrfelton/fix/transaction-modal

fix(wallet): show as unconfirmed transactions
LN-Zap · Jan 15, 2019 · 0c68261 · 0c68261
2 parents bdecb4a + 6959f26
commit 0c68261
Show file tree

Hide file tree

Showing 36 changed files with 53 additions and 11 deletions.
diff --git a/app/components/Activity/TransactionModal/TransactionModal.js b/app/components/Activity/TransactionModal/TransactionModal.js
@@ -170,15 +170,22 @@ export default class TransactionModal extends React.PureComponent {
           )}
 
           <DataRow
-            left={<FormattedMessage {...messages.block_height} />}
+            left={<FormattedMessage {...messages.status} />}
             right={
-              <Link
-                className="hint--bottom-left"
-                data-hint={item.block_hash}
-                onClick={() => blockExplorer.showBlock(network, item.block_hash)}
-              >
-                {item.block_height}
-              </Link>
+              item.block_height ? (
+                <Link
+                  className="hint--bottom-left"
+                  data-hint={item.block_hash}
+                  onClick={() => blockExplorer.showBlock(network, item.block_hash)}
+                >
+                  <FormattedMessage
+                    {...messages.block_height}
+                    values={{ height: item.block_height }}
+                  />
+                </Link>
+              ) : (
+                <FormattedMessage {...messages.unconfirmed} />
+              )
             }
           />
 

diff --git a/app/components/Activity/TransactionModal/messages.js b/app/components/Activity/TransactionModal/messages.js
@@ -10,6 +10,7 @@ export default defineMessages({
   status: 'Status',
   current_value: 'Current value',
   address: 'Address',
-  block_height: 'Confirmed in Block',
-  tx_hash: 'Transaction ID'
+  block_height: 'Confirmed in block {height}',
+  tx_hash: 'Transaction ID',
+  unconfirmed: 'Unconfirmed'
 })
diff --git a/app/translations/af-ZA.json b/app/translations/af-ZA.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/ar-SA.json b/app/translations/ar-SA.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "قيد الانتظار",

diff --git a/app/translations/bg-BG.json b/app/translations/bg-BG.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Всички",
   "components.Activity.hide_expired": "Скрии изтеклите заявки",
   "components.Activity.pending": "Чакащи",

diff --git a/app/translations/ca-ES.json b/app/translations/ca-ES.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/cs-CZ.json b/app/translations/cs-CZ.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Všechny",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Čekající",

diff --git a/app/translations/da-DK.json b/app/translations/da-DK.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/de-DE.json b/app/translations/de-DE.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Alle",
   "components.Activity.hide_expired": "Verstecke abgelaufene Anfragen",
   "components.Activity.pending": "Ausstehend",

diff --git a/app/translations/el-GR.json b/app/translations/el-GR.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Ολα",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Εκκρεμής",

diff --git a/app/translations/en.json b/app/translations/en.json
@@ -38,7 +38,7 @@
   "components.Activity.Transaction.type": "On-chain transaction",
   "components.Activity.TransactionModal.address": "Address",
   "components.Activity.TransactionModal.amount": "Amount",
-  "components.Activity.TransactionModal.block_height": "Confirmed in Block",
+  "components.Activity.TransactionModal.block_height": "Confirmed in block {height}",
   "components.Activity.TransactionModal.current_value": "Current value",
   "components.Activity.TransactionModal.date_confirmed": "Date of confirmation",
   "components.Activity.TransactionModal.fee": "Total fee",
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "Received",
   "components.Activity.TransactionModal.title_sent": "Sent",
   "components.Activity.TransactionModal.tx_hash": "Transaction ID",
+  "components.Activity.TransactionModal.unconfirmed": "Unconfirmed",
   "components.Activity.all": "All",
   "components.Activity.hide_expired": "Hide Expired Requests",
   "components.Activity.pending": "Pending",

diff --git a/app/translations/es-ES.json b/app/translations/es-ES.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Todo",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Pendiente",

diff --git a/app/translations/fi-FI.json b/app/translations/fi-FI.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/fr-FR.json b/app/translations/fr-FR.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Tout",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "En attente",

diff --git a/app/translations/ga-IE.json b/app/translations/ga-IE.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Gach",
   "components.Activity.hide_expired": "Folaigh Iarratais Leathnaithe",
   "components.Activity.pending": "Ar feitheamh",

diff --git a/app/translations/he-IL.json b/app/translations/he-IL.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/hi-IN.json b/app/translations/hi-IN.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "सभी",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "लंबित",

diff --git a/app/translations/hr-HR.json b/app/translations/hr-HR.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Sve",
   "components.Activity.hide_expired": "Sakrij istekle zahtjeve",
   "components.Activity.pending": "Na čekanju",

diff --git a/app/translations/hu-HU.json b/app/translations/hu-HU.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/it-IT.json b/app/translations/it-IT.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/ja-JP.json b/app/translations/ja-JP.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "全て",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "保留中",

diff --git a/app/translations/ko-KR.json b/app/translations/ko-KR.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/nl-NL.json b/app/translations/nl-NL.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Alle",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "In behandeling",

diff --git a/app/translations/no-NO.json b/app/translations/no-NO.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/pl-PL.json b/app/translations/pl-PL.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/pt-BR.json b/app/translations/pt-BR.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Tudo",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Pendente",

diff --git a/app/translations/pt-PT.json b/app/translations/pt-PT.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/ro-RO.json b/app/translations/ro-RO.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Toate",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "În aşteptare",

diff --git a/app/translations/ru-RU.json b/app/translations/ru-RU.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Все",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Ожидание",

diff --git a/app/translations/sr-SP.json b/app/translations/sr-SP.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/sv-SE.json b/app/translations/sv-SE.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Alla",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Väntande",

diff --git a/app/translations/tr-TR.json b/app/translations/tr-TR.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Tüm",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Bekleyen",

diff --git a/app/translations/uk-UA.json b/app/translations/uk-UA.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "Усі",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "Очікування",

diff --git a/app/translations/vi-VN.json b/app/translations/vi-VN.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "",

diff --git a/app/translations/zh-CN.json b/app/translations/zh-CN.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "所有",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "等待",

diff --git a/app/translations/zh-TW.json b/app/translations/zh-TW.json
@@ -47,6 +47,7 @@
   "components.Activity.TransactionModal.title_received": "",
   "components.Activity.TransactionModal.title_sent": "",
   "components.Activity.TransactionModal.tx_hash": "",
+  "components.Activity.TransactionModal.unconfirmed": "",
   "components.Activity.all": "所有",
   "components.Activity.hide_expired": "",
   "components.Activity.pending": "等待",