Merge pull request #110 from NazarUsov/testnet/issues

Corrections to transaction history and error text for swap

html_source/package.json

@@ -5,7 +5,7 @@
         "ng": "ng",
         "start": "ng serve",
         "build": "ng build",
-        "build --watch": "ng build --output-path \"/Applications/Zano.app/Contents/MacOS/html\" --watch",
+        "build --watch": "ng build --output-path \"D:/work/nazar/Zano/html\" --watch",
         "build --html": "node update-build-time.js && ng build --output-path \"../html/\"",
         "test": "ng test",
         "lint": "ng lint",

html_source/src/app/pages/wallet/tabs/history/history.component.ts

@@ -193,7 +193,8 @@ import { zanoAssetInfo } from '@parts/data/assets';
                                             >
                                                 <div class="text-ellipsis">
                                                         <span *ngIf="!subtransfer.is_income">
-                                                            {{ subtransfer.amount.minus(transaction.fee ?? 0).negated() | intToMoney }}
+                                                            <ng-container *ngIf="isInitiator(transaction)">{{ subtransfer.amount.minus(transaction.fee ?? 0).negated() | intToMoney }}</ng-container>
+                                                            <ng-container *ngIf="isFinalizator(transaction)">{{ subtransfer.amount.negated() | intToMoney }}</ng-container>
                                                         </span>
                                                     <span *ngIf="subtransfer.is_income">
                                                             {{ subtransfer.amount | intToMoney }}
@@ -465,6 +466,17 @@ export class HistoryComponent implements OnInit, OnDestroy {
 
     }
 
+    isInitiator(transaction: Transaction): boolean {
+        const { employed_entries: { spent= [] } } = transaction;
+        return Boolean(spent?.find(({ asset_id, index }) => {
+            return index === 0 && asset_id === zanoAssetInfo.asset_id;
+        }));
+    }
+
+    isFinalizator(transaction: Transaction): boolean {
+        return !this.isInitiator(transaction);
+    }
+
     init(): void {
         let restore = false;
         if (hasOwnProperty(this.variablesService.after_sync_request, String(this.variablesService.currentWallet.wallet_id))) {
@@ -507,7 +519,9 @@ export class HistoryComponent implements OnInit, OnDestroy {
 
     isVisibleFee(transaction: Transaction): boolean {
         const { subtransfers } = transaction;
-        return subtransfers ? !subtransfers?.every(({ is_income }) => is_income) : false;
+        const condition1 = subtransfers ? !subtransfers?.every(({ is_income }) => is_income) : false;
+        const condition2 = this.isInitiator(transaction);
+        return condition1 && condition2;
     }
 
     strokeSize(item): number {

html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html

@@ -55,8 +55,7 @@
         </div>
 
         <div *ngIf="errorRpc" class="error mt-2">
-            Error code: {{ errorRpc.code }} <br />
-            Error message: {{ errorRpc.message || 'hex_raw_proposal not decoded' }}
+            {{ 'ERRORS.INVALID_PROPOSAL' | translate }}
         </div>
     </form>
 </div>

html_source/src/app/pages/wallet/tabs/swap/pages/create-swap/create-swap.component.html

@@ -265,8 +265,7 @@
         </div>
 
         <div *ngIf="errorRpc" class="error mt-2">
-            Error code: {{ errorRpc.code }} <br />
-            Error message: {{ errorRpc.message || 'hex_raw_proposal not created' }}
+            {{ 'ERRORS.INVALID_PROPOSAL' | translate }}
         </div>
     </form>
 </div>

html_source/src/assets/i18n/af.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/ar.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/ca.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/cs.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/da.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/de.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "Sie können keine Wallet-Datei in diesem Ordner speichern. Bitte wählen Sie einen anderen Ordner.",
         "FILE_RESTORED": "Die Wallet-Datei wurde beschädigt. Wir haben die Schlüssel und die Wallet von der Blockchain wiederhergestellt",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Unzureichendes Guthaben im Konto",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in-Nummer ist zu groß für den aktuellen Blockchain-Status. Nicht genügend unverbrauchte outputs zum Mischen",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/el.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/en.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/es.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/fi.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/fr.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "Vous ne pouvez pas enregistrer un fichier de portefeuille dans ce dossier. Veuillez choisir un autre dossier.",
         "FILE_RESTORED": "Le fichier de portefeuille a été corrompu. Nous avons récupéré les clés et le portefeuille de la blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Fonds insuffisants dans le compte",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Le nombre de mixage est trop grand pour l'état actuel de la blockchain. Il n'y a pas assez de sorties non utilisées pour mélanger avec",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/he.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/hu.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/id.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "Anda tidak dapat menyimpan file dompet di folder ini. Tolong pilih folder yang lain.",
         "FILE_RESTORED": "File dompet rusak. Kami telah memulihkan kunci dan dompet dari blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Dana di akun tidak cukup",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mixin terlalu besar untuk keadaan blockchain saat ini. Tidak ada cukup keluaran yang tidak terpakai untuk digabungkan",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/it.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "Non puoi salvare un file di portafoglio in questa cartella. Scegli un'altra cartella.",
         "FILE_RESTORED": "Il file del portafoglio è stato danneggiato. Abbiamo recuperato le chiavi e il portafoglio dalla blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Fondi insufficienti nell'account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Il numero di Mix-in è troppo grande per lo stato corrente della blockchain. Non ci sono abbastanza output non spesi per mescolare con",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/ja.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/ko.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/nl.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/no.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/pl.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/pt.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "Não pode gravar um ficheiro de carteira nesta pasta. Por favor escolha outra pasta.",
         "FILE_RESTORED": "O ficheiro de carteira estava corrompido. Recuperámos as chaves e a carteira a partir da blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Fundos insuficientes na conta",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "O número de mixagem é muito grande para o estado atual da blockchain. Não há saídas não gastas suficientes para misturar",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/ro.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/ru.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/sr.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",

html_source/src/assets/i18n/sv.json

@@ -301,6 +301,7 @@
         "FILE_NOT_SAVED": "You cannot save a wallet file in this folder. Please choose another folder.",
         "FILE_RESTORED": "The wallet file was corrupted. We have recovered the keys and the wallet from the blockchain",
         "INSUFFICIENT_FUNDS": "Insufficient funds for this transaction",
+        "INVALID_PROPOSAL": "Invalid proposal",
         "NOT_ENOUGH_MONEY": "Insufficient funds in account",
         "NOT_ENOUGH_OUTPUTS_TO_MIX": "Mix-in number is too big for current blockchain state. There are not enough unspent outputs to mix with",
         "NOT_FILE_ZANO_WALLET": "This file is not recognized as a Zano wallet..",