dn724/dnault
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge branch 'master' into patch-4

Browse source
This commit is contained in:
keeri 2023-06-01 20:50:56 +00:00 • committed by GitHub
commit fc305b931e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/app/services/wallet.service.ts
View file

@ -512,8 +512,12 @@ export class WalletService {
for (const accountID in batchResponse.frontiers) { for (const accountID in batchResponse.frontiers) {
if (batchResponse.frontiers.hasOwnProperty(accountID)) { if (batchResponse.frontiers.hasOwnProperty(accountID)) {
const frontier = batchResponse.frontiers[accountID]; const frontier = batchResponse.frontiers[accountID];
if (frontier !== batchAccounts[accountID].publicKey) { const frontierIsValidHash = this.util.nano.isValidHash(frontier);
usedIndices.push(batchAccounts[accountID].index);
if (frontierIsValidHash === true) {
if (frontier !== batchAccounts[accountID].publicKey) {
usedIndices.push(batchAccounts[accountID].index);
}
} }
} }
} }
@ -754,7 +758,14 @@ export class WalletService {
walletAccount.balanceFiat = this.util.nano.rawToMnano(walletAccount.balance).times(fiatPrice).toNumber(); walletAccount.balanceFiat = this.util.nano.rawToMnano(walletAccount.balance).times(fiatPrice).toNumber();
walletAccount.frontier = frontiers.frontiers?.[accountID] || null; const walletAccountFrontier = frontiers.frontiers?.[accountID];
const walletAccountFrontierIsValidHash = this.util.nano.isValidHash(walletAccountFrontier);
walletAccount.frontier = (
(walletAccountFrontierIsValidHash === true)
? walletAccountFrontier
: null
);
walletBalance = walletBalance.plus(walletAccount.balance); walletBalance = walletBalance.plus(walletAccount.balance);
walletPendingInclUnconfirmed = walletPendingInclUnconfirmed.plus(accountBalancePendingInclUnconfirmed); walletPendingInclUnconfirmed = walletPendingInclUnconfirmed.plus(accountBalancePendingInclUnconfirmed);