matt/paperclip-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ new versions of geth

Browse Source 
! check if transactions are already loading
* catch and report error on syncing
This commit is contained in:
Taegus
2019-01-19 19:19:25 +01:00
parent 73584e715c
commit 6f78865edc
6 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
renderer/syncing.js
View File

@@ -75,10 +75,14 @@ function StartSyncProcess() {
$(document).trigger("onSyncComplete");
}
}
} else {
EthoMainGUI.showGeneralError(error);
}
});
}, 10000);
}
} else {
EthoMainGUI.showGeneralError(error);
}
}).on("data", function(sync){
if ((sync) && (sync.HighestBlock > 0)) {
@@ -93,6 +97,8 @@ function StartSyncProcess() {
if ((!error) && (sync)) {
SyncProgress.animate(sync.currentBlock / sync.highestBlock);
SyncProgress.setText(vsprintf('%d/%d (%d%%)', [sync.currentBlock, sync.highestBlock, Math.floor(sync.currentBlock / sync.highestBlock * 100)]));
} else if (error) {
EthoMainGUI.showGeneralError(error);
}
});
}, 2000);
@@ -118,6 +124,6 @@ var InitWeb3 = setInterval(function()
});
}
catch(err) {
console.log(err);
EthoMainGUI.showGeneralError(err);
}
}, 2000);

57
renderer/transactions.js
View File

@@ -4,6 +4,7 @@ class Transactions {
constructor() {
this.filter = "";
this.isSyncing = false;
this.isLoading = false;
}
setIsSyncing(value) {
@@ -14,6 +15,14 @@ class Transactions {
return this.isSyncing;
}
setIsLoading(value) {
this.isLoading = value;
}
getIsLoading() {
return this.isLoading;
}
setFilter(text) {
this.filter = text;
}
@@ -74,31 +83,35 @@ class Transactions {
}
renderTransactions() {
EthoMainGUI.renderTemplate("transactions.html", {});
$(document).trigger("render_transactions");
if (!EthoTransactions.getIsLoading()) {
EthoMainGUI.renderTemplate("transactions.html", {});
$(document).trigger("render_transactions");
EthoTransactions.setIsLoading(true);
// show the loading overlay for transactions
$("#loadingTransactionsOverlay").css("display", "block");
// show the loading overlay for transactions
$("#loadingTransactionsOverlay").css("display", "block");
setTimeout(() => {
var dataTransactions = ipcRenderer.sendSync('getTransactions');
var addressList = EthoWallets.getAddressList();
setTimeout(() => {
var dataTransactions = ipcRenderer.sendSync('getTransactions');
var addressList = EthoWallets.getAddressList();
dataTransactions.forEach(function(element) {
var isFromValid = (addressList.indexOf(element[2].toLowerCase()) > -1);
var isToValid = (addressList.indexOf(element[3].toLowerCase()) > -1);
if ((isToValid) && (!isFromValid)) {
element.unshift(0);
} else if ((!isToValid) && (isFromValid)) {
element.unshift(1);
} else {
element.unshift(2);
}
});
dataTransactions.forEach(function(element) {
var isFromValid = (addressList.indexOf(element[2].toLowerCase()) > -1);
var isToValid = (addressList.indexOf(element[3].toLowerCase()) > -1);
if ((isToValid) && (!isFromValid)) {
element.unshift(0);
} else if ((!isToValid) && (isFromValid)) {
element.unshift(1);
} else {
element.unshift(2);
}
});
EthoTableTransactions.initialize('#tableTransactionsForAll', dataTransactions);
}, 200);
EthoTableTransactions.initialize('#tableTransactionsForAll', dataTransactions);
EthoTransactions.setIsLoading(false);
}, 200);
}
}
enableKeepInSync() {