@@ -174,7 +196,7 @@
@@ -317,7 +339,7 @@
Cancel
-
@@ -343,7 +365,7 @@ history
Could not fetch transaction history
-
[Tap to retry]
+
Tap to retry
No transactions yet
@@ -401,15 +423,5 @@ history
-
-
-
-
- You do not have any wallet
-
-
-
diff --git a/src/css/main.css b/src/css/main.css
index d41667a74..25d60ef91 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1110,12 +1110,12 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.onGoingProcess {
background: #213140;
text-align: center;
- max-width: 14.5rem;
+ max-width: 16.5rem;
max-height: 3.5rem;
top:auto;
left:0;
right:0;
- bottom:90px;
+ bottom:170px;
margin: auto;
border-radius: 3px;
color: #fff;
@@ -1123,6 +1123,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
font-size: 13px;
position: absolute;
opacity: 0.8;
+ z-index: 1000;
}
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index d2b241eda..5fbce2b62 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -72,7 +72,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.alternativeBalanceAvailable = false;
self.totalBalanceAlternative = null;
self.notAuthorized = false;
- self.clientError = null;
self.txHistory = [];
self.txHistoryPaging = false;
@@ -411,17 +410,27 @@ angular.module('copayApp.controllers').controller('indexController', function($r
};
+ self.clientError = function (err) {
+ if (isCordova) {
+ navigator.notification.confirm(
+ err,
+ function() {},
+ 'Wallet Server Error', ['OK']
+ );
+ } else {
+ alert(err);
+ }
+ };
self.recreate = function(cb) {
var fc = profileService.focusedClient;
self.setOngoingProcess('recreating', true);
- self.clientError = null;
fc.recreateWallet(function(err) {
self.notAuthorized = false;
self.setOngoingProcess('recreating', false);
if (err) {
- self.clientError = 'Could not recreate wallet:' + err;
+ self.clientError('Could not recreate wallet:' + err);
$rootScope.$apply();
return;
}
@@ -458,7 +467,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (err) {
if (self.walletId == walletId)
self.setOngoingProcess('scanning', false);
- self.clientError = 'Could not scan wallet:' + err;
+ self.clientError = ('Could not scan wallet:' + err);
$rootScope.$apply();
}
});
@@ -522,7 +531,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on(eventName, function(event) {
$log.debug('### Online event');
self.isOffline = false;
- self.clientError = null;
self.updateAll();
self.updateTxHistory();
});
@@ -531,6 +539,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on('Local/Offline', function(event) {
$log.debug('Offline event');
self.isOffline = true;
+ $timeout(function(){
+ $rootScope.$apply();
+ });
});
$rootScope.$on('Local/BackupDone', function(event) {
@@ -544,7 +555,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
$rootScope.$on('Local/BWSNotFound', function(event) {
- self.clientError = 'Could not access to Bitcore Wallet Service: Service not found';
+ self.clientError('Could not access to Bitcore Wallet Service: Service not found');
$rootScope.$apply();
});
@@ -557,7 +568,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} else if (err.code === 'ETIMEDOUT') {
$log.debug('Time out:', err);
} else {
- self.clientError = err;
+ self.clientError(err && err.message ? 'Error at Bitcore Wallet Service:' + err.message : err);
}
$rootScope.$apply();
});
@@ -627,7 +638,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$timeout(function() {
self.hasProfile = true;
self.noFocusedWallet = true;
- self.clientError = null;
self.isComplete = null;
self.walletName = null;
go.addWallet();