Merge pull request #410 from ZencashOfficial/development

README.md

@@ -16,6 +16,10 @@
 
 # Version History
 
+## v1.2.3
+- [x] Fix transaction history crashing the app for some users
+- [x] Clarify intent of transaction limit setting
+
 ## v1.2.2
 
 - [x] Fix: Add Async to vout array manipulation to improve performance

app/lang/lang_en.json

@@ -170,7 +170,7 @@
     },
     "settings": {
       "label": "Settings",
-      "limit": "Transaction limit",
+      "limit": "Transaction history display limit",
       "items": "items",
       "language": "Language",
       "explorerUrl": "ZEN Explorer URL",

app/main.js

@@ -614,7 +614,19 @@ async function apiPost(url, form) {
 function getFilteredVout(address, originalVout) {
     return new Promise(resolve => {
         resolve(originalVout.filter(vout => {
-          return address.has(vout.scriptPubKey.addresses[0]);
+            return address.has(vout.scriptPubKey.addresses[0]);
+        }));
+    });
+}
+
+/**
+ * @param {Set} address
+ * @param {object[]} originalVin
+ */
+function getFilteredVin(address, originalVin) {
+    return new Promise(resolve => {
+        resolve(originalVin.filter(vin => {
+            return address.has(vin.addr);
         }));
     });
 }
@@ -633,9 +645,10 @@ async function fetchTransactions(txIds, myAddrs) {
         // Address field in transaction rows is meaningless. Pick something sane.
         let firstMyAddr;
 
-        info.vout = await getFilteredVout(myAddrSet, info.vout);
+        const filteredVout = await getFilteredVout(myAddrSet, info.vout);
+        const filteredVin = await getFilteredVin(myAddrSet, info.vin);
 
-        for (const vout of info.vout) {
+        for (const vout of filteredVout) {
             // XXX can it be something else?
             if (!vout.scriptPubKey) {
                 continue;
@@ -649,31 +662,35 @@ async function fetchTransactions(txIds, myAddrs) {
                         firstMyAddr = addr;
                     }
                 }
+
                 if (!vouts.includes(addr)) {
                     vouts.push(addr);
                 }
             }
         }
 
-        for (const vin of info.vin) {
+        for (const vin of filteredVin) {
             const addr = vin.addr;
             if (myAddrSet.has(addr)) {
                 txBalance -= parseFloat(vin.value);
                 if (!firstMyAddr) {
                     firstMyAddr = addr;
                 }
             }
+
             if (!vins.includes(addr)) {
                 vins.push(addr);
             }
         }
 
+        const isWithdraw = txBalance < 0;
+
         const tx = {
             txid: info.txid,
             time: info.blocktime,
             address: firstMyAddr,
-            vins: vins.join(","),
-            vouts: vouts.join(","),
+            vins: isWithdraw ? [...new Set(filteredVin.map(vin => vin.addr))].join(',') : [...new Set(info.vin.map(vin => vin.addr))].join(','),
+            vouts: isWithdraw ? [...new Set(info.vout.map(vout => vout.scriptPubKey.addresses[0]))].join(',') : [...new Set(filteredVout.map(vout => vout.scriptPubKey.addresses[0]))].join(','),
             amount: txBalance,
             block: info.blockheight
         };

app/zwallet.html

@@ -337,7 +337,7 @@ <h2 slot=headerText data-tr=wallet.settings.label>Settings</h2>
                     <span class=checkmark></span>
                 </label>
 
-                <label for=settingsTxHistory data-tr=wallet.settings.limit>Transaction limit</label>
+                <label for=settingsTxHistory data-tr=wallet.settings.limit>Transaction history display limit</label>
                 <span class=formInput><input type=number name=settingsTxHistory class=settingsTxHistory min=0 /><span data-tr=wallet.settings.items>items</span></span>
 
                 <hr class=formDivider />