Merge pull request #105 from NazarUsov/testnet/issues

Fix a transaction without subtransfers
hyle-team · Mar 6, 2024 · 55e1cb9 · 55e1cb9
2 parents a0784df + 79c09aa
commit 55e1cb9
Show file tree

Hide file tree

Showing 36 changed files with 226 additions and 151 deletions.
diff --git a/html_source/src/app/api/models/transaction.model.ts b/html_source/src/app/api/models/transaction.model.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from 'bignumber.js';
 
-export class Transaction {
+export interface Transaction {
     comment: string;
     employed_entries: {
         receive: {
@@ -22,11 +22,11 @@ export class Transaction {
     payment_id: string;
     remote_addresses: string[];
     show_sender: boolean;
-    subtransfers: {
+    subtransfers?: {
         amount: BigNumber;
         asset_id: string;
         is_income: boolean;
-    }[];
+    }[] | undefined;
     timestamp: number;
     tx_blob_size: number;
     remote_aliases?: string[];

diff --git a/html_source/src/app/api/models/wallet.model.ts b/html_source/src/app/api/models/wallet.model.ts
@@ -132,8 +132,8 @@ export class Wallet {
     prepareHistory(items: Transaction[]): void {
         for (let i = 0; i < items.length; i++) {
             if (
-                (items[i].tx_type === 7 && items[i].subtransfers.find(({ is_income }) => is_income)) ||
-                (items[i].tx_type === 11 && items[i].subtransfers.find(({ is_income }) => is_income))
+                (items[i].tx_type === 7 && items[i].subtransfers?.find(({ is_income }) => is_income)) ||
+                (items[i].tx_type === 11 && items[i].subtransfers?.find(({ is_income }) => is_income))
             ) {
                 let exists = false;
                 for (let j = 0; j < this.excluded_history.length; j++) {

diff --git a/html_source/src/app/pages/wallet/tabs/history/history.component.ts b/html_source/src/app/pages/wallet/tabs/history/history.component.ts
diff --git a/html_source/src/app/parts/pipes/history-type-messages-pipe/history-type-messages.pipe.ts b/html_source/src/app/parts/pipes/history-type-messages-pipe/history-type-messages.pipe.ts
@@ -46,7 +46,11 @@ export class HistoryTypeMessagesPipe implements PipeTransform {
                         ? this.translate.instant('HISTORY.TYPE_MESSAGES.POS_REWARD')
                         : this.translate.instant('HISTORY.TYPE_MESSAGES.POW_REWARD');
                 case 7:
-                    return this.translate.instant('HISTORY.TYPE_MESSAGES.CREATE_CONTRACT');
+                    if (!item.subtransfers || !item.subtransfers.length) {
+                        return this.translate.instant('HISTORY.TYPE_MESSAGES.SERVICE_TRANSACTIONS');
+                    } else {
+                        return this.translate.instant('HISTORY.TYPE_MESSAGES.CREATE_CONTRACT');
+                    }
                 case 8:
                     return this.translate.instant('HISTORY.TYPE_MESSAGES.PLEDGE_CONTRACT');
                 // case 9:

diff --git a/html_source/src/assets/i18n/af.json b/html_source/src/assets/i18n/af.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/ar.json b/html_source/src/assets/i18n/ar.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/ca.json b/html_source/src/assets/i18n/ca.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/cs.json b/html_source/src/assets/i18n/cs.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/da.json b/html_source/src/assets/i18n/da.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/de.json b/html_source/src/assets/i18n/de.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS-Belohnung",
             "POW_REWARD": "POW-Belohnung",
             "PROPOSAL_CANCEL_CONTRACT": "Stornierungsanfrage",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Unbedefiniert",
             "UPDATE_ALIAS": "Gebühr für die Bearbeitung eines Alias"
         }

diff --git a/html_source/src/assets/i18n/el.json b/html_source/src/assets/i18n/el.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/en.json b/html_source/src/assets/i18n/en.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/es.json b/html_source/src/assets/i18n/es.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/fi.json b/html_source/src/assets/i18n/fi.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/fr.json b/html_source/src/assets/i18n/fr.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "Récompense POS",
             "POW_REWARD": "Récompense POW",
             "PROPOSAL_CANCEL_CONTRACT": "Demande d'annulation",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Non défini",
             "UPDATE_ALIAS": "Frais pour modifier l'alias"
         }

diff --git a/html_source/src/assets/i18n/he.json b/html_source/src/assets/i18n/he.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/hu.json b/html_source/src/assets/i18n/hu.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/id.json b/html_source/src/assets/i18n/id.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "Hadiah POS",
             "POW_REWARD": "Hadiah POW",
             "PROPOSAL_CANCEL_CONTRACT": "Permintaan pembatalan",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Tidak terdefinisi",
             "UPDATE_ALIAS": "Biaya untuk mengubah alias"
         }

diff --git a/html_source/src/assets/i18n/it.json b/html_source/src/assets/i18n/it.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "Ricompensa POS",
             "POW_REWARD": "Ricompensa POW",
             "PROPOSAL_CANCEL_CONTRACT": "Richiesta di cancellazione",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Non definito",
             "UPDATE_ALIAS": "Tassa per modificare alias"
         }

diff --git a/html_source/src/assets/i18n/ja.json b/html_source/src/assets/i18n/ja.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/ko.json b/html_source/src/assets/i18n/ko.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/nl.json b/html_source/src/assets/i18n/nl.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/no.json b/html_source/src/assets/i18n/no.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/pl.json b/html_source/src/assets/i18n/pl.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/pt.json b/html_source/src/assets/i18n/pt.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "Recompensa de POS",
             "POW_REWARD": "Recompensa de POW",
             "PROPOSAL_CANCEL_CONTRACT": "Cancelar pedido",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Indefinido",
             "UPDATE_ALIAS": "Taxa para edição de alias"
         }

diff --git a/html_source/src/assets/i18n/ro.json b/html_source/src/assets/i18n/ro.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/ru.json b/html_source/src/assets/i18n/ru.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/sr.json b/html_source/src/assets/i18n/sr.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/sv.json b/html_source/src/assets/i18n/sv.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/tr.json b/html_source/src/assets/i18n/tr.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/uk.json b/html_source/src/assets/i18n/uk.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/vi.json b/html_source/src/assets/i18n/vi.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/i18n/zh.json b/html_source/src/assets/i18n/zh.json
@@ -366,6 +366,7 @@
             "POS_REWARD": "POS reward",
             "POW_REWARD": "POW reward",
             "PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
+            "SERVICE_TRANSACTIONS": "Service transactions",
             "UNDEFINED": "Undefined",
             "UPDATE_ALIAS": "Fee for editing alias"
         }

diff --git a/html_source/src/assets/icons/gray/fire_ico.svg b/html_source/src/assets/icons/gray/fire_ico.svg
diff --git a/html_source/src/assets/scss/components/_icons.scss b/html_source/src/assets/scss/components/_icons.scss
@@ -218,4 +218,9 @@ i {
     &.success {
         background: center / contain no-repeat url(~src/assets/icons/aqua/modal-success.svg);
     }
+
+    // gray
+    &.fire {
+        background: center / contain no-repeat url(~src/assets/icons/gray/fire_ico.svg);
+    }
 }
diff --git a/html_source/src/main.ts b/html_source/src/main.ts
@@ -5,7 +5,7 @@ import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 import 'lodash';
 
-export const buildTime = '2023-11-22T09:13:55.758Z';
+export const buildTime = '2024-03-06T13:59:36.086Z';
 
 if (environment.production) {
     enableProdMode();