Skip to content

Commit

Permalink
fix kmd merge for qt
Browse files Browse the repository at this point in the history
  • Loading branch information
CryptoForge committed Jun 18, 2023
1 parent f1a2d36 commit ef63276
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/qt/komodo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ void KomodoCore::shutdown()

while (!fShutdown)
{
if ( ASSETCHAINS_SYMBOL[0] == 0 )
if (chainName.isKMD())
{
//if (!ShutdownRequested()) komodo_passport_iteration();
// if ( KOMODO_NSPV_FULLNODE )
Expand Down
2 changes: 1 addition & 1 deletion src/qt/overviewpage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed
// for the non-mining users
bool showImmature = immatureBalance != 0;
bool showWatchOnlyImmature = watchImmatureBalance != 0;
bool showInterest = (ASSETCHAINS_SYMBOL[0] == 0);
bool showInterest = (chainName.isKMD());

bool showTransparent = balance !=0;
bool showWatchOnlyTransaparent = watchOnlyBalance != 0;
Expand Down
6 changes: 3 additions & 3 deletions src/qt/walletmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ CAmount WalletModel::getPrivateWatchBalance() const

CAmount WalletModel::getInterestBalance() const
{
return (ASSETCHAINS_SYMBOL[0] == 0) ? komodo_interestsum() : 0;
return (chainName.isKMD()) ? komodo_interestsum() : 0;
}

bool WalletModel::haveWatchOnly() const
Expand Down Expand Up @@ -391,7 +391,7 @@ void WalletModel::checkBalanceChanged()
CAmount newWatchImmatureBalance = 0;
CAmount newWatchPrivateBalance = 0;
CAmount newprivateBalance = getBalanceZaddr("", 1, true);
CAmount newinterestBalance = (ASSETCHAINS_SYMBOL[0] == 0) ? komodo_interestsum() : 0;
CAmount newinterestBalance = (chainName.isKMD()) ? komodo_interestsum() : 0;
if (haveWatchOnly())
{
newWatchOnlyBalance = getWatchBalance();
Expand Down Expand Up @@ -690,7 +690,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareZTransaction(WalletModelZTransa
if ( fromSprout || toSprout )
return SproutUsageExpired;
}
if ( toSapling && ASSETCHAINS_SYMBOL[0] == 0 )
if ( toSapling && chainName.isKMD() )
return SproutUsageWillExpireSoon;

// If we are sending from a shielded address, all recipient
Expand Down

0 comments on commit ef63276

Please sign in to comment.