txs: cancelling status
This commit is contained in:
parent
df6fafd256
commit
26f82f3cc7
3 changed files with 21 additions and 9 deletions
|
@ -71,6 +71,7 @@ wallets:
|
||||||
tx_receiving: Receiving
|
tx_receiving: Receiving
|
||||||
tx_confirming: Awaiting confirmation
|
tx_confirming: Awaiting confirmation
|
||||||
tx_canceled: Canceled
|
tx_canceled: Canceled
|
||||||
|
tx_cancelling: Cancelling
|
||||||
tx_finalizing: Finalizing
|
tx_finalizing: Finalizing
|
||||||
tx_confirmed: Confirmed
|
tx_confirmed: Confirmed
|
||||||
txs: Transactions
|
txs: Transactions
|
||||||
|
|
|
@ -71,6 +71,7 @@ wallets:
|
||||||
tx_receiving: Получение
|
tx_receiving: Получение
|
||||||
tx_confirming: Ожидает подтверждения
|
tx_confirming: Ожидает подтверждения
|
||||||
tx_canceled: Отменено
|
tx_canceled: Отменено
|
||||||
|
tx_cancelling: Отмена
|
||||||
tx_finalizing: Завершение
|
tx_finalizing: Завершение
|
||||||
tx_confirmed: Подтверждено
|
tx_confirmed: Подтверждено
|
||||||
txs: Транзакции
|
txs: Транзакции
|
||||||
|
|
|
@ -365,15 +365,25 @@ impl WalletTransactions {
|
||||||
} else if tx.posting {
|
} else if tx.posting {
|
||||||
format!("{} {}", DOTS_THREE_CIRCLE, t!("wallets.tx_finalizing"))
|
format!("{} {}", DOTS_THREE_CIRCLE, t!("wallets.tx_finalizing"))
|
||||||
} else {
|
} else {
|
||||||
match tx.data.tx_type {
|
if tx.cancelling {
|
||||||
TxLogEntryType::TxReceived => {
|
format!("{} {}", DOTS_THREE_CIRCLE, t!("wallets.tx_cancelling"))
|
||||||
format!("{} {}", DOTS_THREE_CIRCLE, t!("wallets.tx_receiving"))
|
} else {
|
||||||
},
|
match tx.data.tx_type {
|
||||||
TxLogEntryType::TxSent => {
|
TxLogEntryType::TxReceived => {
|
||||||
format!("{} {}", DOTS_THREE_CIRCLE, t!("wallets.tx_sending"))
|
format!("{} {}",
|
||||||
},
|
DOTS_THREE_CIRCLE,
|
||||||
_ => {
|
t!("wallets.tx_receiving"))
|
||||||
format!("{} {}", DOTS_THREE_CIRCLE, t!("wallets.tx_confirmed"))
|
},
|
||||||
|
TxLogEntryType::TxSent => {
|
||||||
|
format!("{} {}",
|
||||||
|
DOTS_THREE_CIRCLE,
|
||||||
|
t!("wallets.tx_sending"))
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
format!("{} {}",
|
||||||
|
DOTS_THREE_CIRCLE,
|
||||||
|
t!("wallets.tx_confirmed"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue