update transaction categorising

TheLindaProjectInc · Oct 4, 2020 · 0b94749 · 0b94749
1 parent 8f64b08
commit 0b94749
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/app/metrix/classes/transaction.ts b/src/app/metrix/classes/transaction.ts
@@ -13,6 +13,7 @@ export class Transaction {
     timestamp: Date;
     fee: number;
     vout: number;
+    isReward: boolean;
 
     constructor(transactionData?) {
         if (transactionData) {
@@ -33,6 +34,10 @@ export class Transaction {
             if (transactionData.blocktime) this.blockTime = new Date(transactionData.blocktime * 1000);
             this.timestamp = new Date(transactionData.time * 1000);
 
+            // set type
+            if (this.category === "generate" || this.category === "immature")
+                this.isReward = true
+
             // santise category
             if (this.category === "send") this.category = "Payment"
             if (this.category === "generate") this.category = "Stake"

diff --git a/src/app/metrix/providers/rpc.service.ts b/src/app/metrix/providers/rpc.service.ts
@@ -400,7 +400,7 @@ export class RpcService {
         for (const tx of data.result) {
             const trx = new Transaction(tx)
             if (trx.blockIndex === 1) {
-                if (trx.category !== 'Payment') {
+                if (trx.category !== 'Payment' && trx.vout < 4) {
                     let stake: any = await this.callServer('gettransaction', [trx.txId])
                     const totalReward = stake.result.details.find(e => e.vout === 1).fee
                     const dgpPayments = stake.result.details.reduce((a, b) => a.add(b.amount), Big(0))

diff --git a/src/app/metrix/providers/wallet.service.ts b/src/app/metrix/providers/wallet.service.ts
@@ -318,7 +318,7 @@ export class WalletService {
 
     private notifyUserNewTransaction(serverTrx: Transaction) {
         // only notify new coins received
-        if (serverTrx.category.includes('Stake') || serverTrx.category === 'Received') {
+        if (serverTrx.isReward || serverTrx.category === 'Received') {
             // check we have a block height so we don't notify already known transactions
             if (this.walletInfo.startupBlockTime) {
                 // check we recieved this after the last time we synced

diff --git a/src/app/providers/desktop-notification.service.ts b/src/app/providers/desktop-notification.service.ts
@@ -19,7 +19,7 @@ export class DesktopNotificationService {
         let title = 'Metrix - ';
         if (trx.category === "Received")
             title += await this.translation.translate('DESKTOPNOTIFICATIONS.NEWTRANSACTION_TITLE_RECEIVED');
-        if (trx.category.includes('Stake'))
+        if (trx.isReward)
             title += await this.translation.translate('DESKTOPNOTIFICATIONS.NEWTRANSACTION_TITLE_STAKE');
 
         // get body