This commit is contained in:
2018-04-04 14:15:07 +02:00
parent 0812ff3467
commit e2d02d357c
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ export default Ember.Route.extend({
beforeModel(transition) { beforeModel(transition) {
const kredits = this.get('kredits'); const kredits = this.get('kredits');
return kredits.initEthProvider().then((ethProvider) => { return kredits.initEthProvider().then(() => {
if (kredits.get('accountNeedsUnlock')) { if (kredits.get('accountNeedsUnlock')) {
if (confirm('It looks like you have an Ethereum wallet available. Please unlock your account.')) { if (confirm('It looks like you have an Ethereum wallet available. Please unlock your account.')) {
transition.retry(); transition.retry();
+2 -2
View File
@@ -34,7 +34,7 @@ export default Service.extend({
// this is called called in the routes beforeModel(). So it is initialized before everything else // this is called called in the routes beforeModel(). So it is initialized before everything else
// and we can rely on the ethProvider and the potential currentUserAccounts to be available // and we can rely on the ethProvider and the potential currentUserAccounts to be available
initEthProvider: function() { initEthProvider: function() {
return new Ember.RSVP.Promise((resolve, reject) => { return new Ember.RSVP.Promise((resolve) => {
let ethProvider; let ethProvider;
let networkId; let networkId;
if (typeof window.web3 !== 'undefined') { if (typeof window.web3 !== 'undefined') {
@@ -43,7 +43,7 @@ export default Service.extend({
ethProvider = new ethers.providers.Web3Provider(window.web3.currentProvider, {chainId: networkId}); ethProvider = new ethers.providers.Web3Provider(window.web3.currentProvider, {chainId: networkId});
ethProvider.listAccounts().then((accounts) => { ethProvider.listAccounts().then((accounts) => {
this.set('currentUserAccounts', accounts); this.set('currentUserAccounts', accounts);
this.set('ethProvider', ethProvider) this.set('ethProvider', ethProvider);
resolve(ethProvider); resolve(ethProvider);
}); });
} else { } else {