Updated on 2026-08-14
This commit is contained in:
parent
2ac7c0dc2b
commit
7418640994
7 changed files with 9 additions and 15 deletions
|
|
@ -143,7 +143,7 @@ public abstract class CoinData {
|
|||
|
||||
public void clearInfo() {
|
||||
setIsBalanceEqual(false);
|
||||
setBalanceReceived(false); // TODO check
|
||||
setBalanceReceived(false);
|
||||
setValidationNodeDescription("");
|
||||
minFee=null;
|
||||
maxFee=null;
|
||||
|
|
|
|||
|
|
@ -192,7 +192,6 @@ public abstract class CoinEngine {
|
|||
|
||||
public abstract boolean checkNewTransactionAmount(Amount amount);
|
||||
|
||||
// TODO - move minFeeInInternalUnits to CoinData
|
||||
public abstract boolean checkNewTransactionAmountAndFee(Amount amount, Amount fee, Boolean isFeeIncluded);
|
||||
|
||||
public abstract boolean validateBalance(BalanceValidator balanceValidator);
|
||||
|
|
|
|||
|
|
@ -321,8 +321,8 @@ public class EthEngine extends CoinEngine {
|
|||
|
||||
if (!coinData.getUnconfirmedTXCount().equals(coinData.getConfirmedTXCount())) {
|
||||
balanceValidator.setScore(0);
|
||||
balanceValidator.setFirstLine("Unguaranteed balance");
|
||||
balanceValidator.setSecondLine("Transaction is in progress. Wait for confirmation in blockchain.");
|
||||
balanceValidator.setFirstLine("Transaction in progress");
|
||||
balanceValidator.setSecondLine("Wait for confirmation in blockchain");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -394,8 +394,8 @@ public class TokenEngine extends CoinEngine {
|
|||
|
||||
if (!coinData.getUnconfirmedTXCount().equals(coinData.getConfirmedTXCount())) {
|
||||
balanceValidator.setScore(0);
|
||||
balanceValidator.setFirstLine("Unguaranteed balance");
|
||||
balanceValidator.setSecondLine("Transaction is in progress. Wait for confirmation in blockchain.");
|
||||
balanceValidator.setFirstLine("Transaction in progress");
|
||||
balanceValidator.setSecondLine("Wait for confirmation in blockchain");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -87,12 +87,7 @@ class ConfirmTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
|
|||
|
||||
btnSend.visibility = View.INVISIBLE
|
||||
|
||||
val allowFeeLevelSelection = engine.allowSelectFeeLevel()
|
||||
for (lol in rgFee.touchables) {//TODO: leave invisible only?
|
||||
lol.isEnabled = allowFeeLevelSelection
|
||||
}
|
||||
|
||||
if (!allowFeeLevelSelection) {
|
||||
if (!engine.allowSelectFeeLevel()) {
|
||||
rgFee.visibility = View.INVISIBLE
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -729,7 +729,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback
|
|||
Blockchain.Litecoin -> "litecoin"
|
||||
Blockchain.Rootstock -> "bitcoin"
|
||||
Blockchain.RootstockToken -> "bitcoin"
|
||||
Blockchain.Cardano -> "cardano" //TODO:check
|
||||
Blockchain.Cardano -> "cardano"
|
||||
else -> {
|
||||
throw Exception("Can''t get rate for blockchain " + ctx.blockchainName)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue