+ new versions of geth

! 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

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,6 +1,6 @@
{ {
"name": "Ether1Wallet", "name": "Ether1Wallet",
"version": "0.2.3", "version": "0.2.4",
"description": "Desktop wallet for Ether1 currency", "description": "Desktop wallet for Ether1 currency",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

View File

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

View File

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