Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

fix(wallet): show as unconfirmed transactions #1348

Merged
merged 1 commit into from
Jan 15, 2019
Merged
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
23 changes: 15 additions & 8 deletions app/components/Activity/TransactionModal/TransactionModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
)
}
/>

Expand Down
5 changes: 3 additions & 2 deletions app/components/Activity/TransactionModal/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
})
1 change: 1 addition & 0 deletions app/translations/af-ZA.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/ar-SA.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "قيد الانتظار",
Expand Down
1 change: 1 addition & 0 deletions app/translations/bg-BG.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "Чакащи",
Expand Down
1 change: 1 addition & 0 deletions app/translations/ca-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/cs-CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -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í",
Expand Down
1 change: 1 addition & 0 deletions app/translations/da-DK.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/el-GR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "Εκκρεμής",
Expand Down
3 changes: 2 additions & 1 deletion app/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/es-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/fi-FI.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/ga-IE.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/he-IL.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/hi-IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "लंबित",
Expand Down
1 change: 1 addition & 0 deletions app/translations/hr-HR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/hu-HU.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/it-IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "保留中",
Expand Down
1 change: 1 addition & 0 deletions app/translations/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/nl-NL.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/no-NO.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/pl-PL.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/ro-RO.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "Ожидание",
Expand Down
1 change: 1 addition & 0 deletions app/translations/sr-SP.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/sv-SE.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/tr-TR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/translations/uk-UA.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "Очікування",
Expand Down
1 change: 1 addition & 0 deletions app/translations/vi-VN.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
1 change: 1 addition & 0 deletions app/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "等待",
Expand Down
1 change: 1 addition & 0 deletions app/translations/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "等待",
Expand Down