From ff8560208b9efb94dbc2d3fb34d04d4822b5ccb1 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 13 Apr 2015 11:57:58 -0300 Subject: [PATCH 1/7] handle notauthorized --- src/js/controllers/index.js | 7 ++++++- src/js/routes.js | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 770dd1df0..27fa37b68 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -421,7 +421,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); $rootScope.$on('Local/ClientError', function(event, err) { - self.clientError = err; + if (err.code && err.code === 'NOTAUTHORIZED') { + // Show not error, just redirect to home (where the recreate option is shown) + go.walletHome(); + } else { + self.clientError = err; + } $rootScope.$apply(); }); diff --git a/src/js/routes.js b/src/js/routes.js index 9915657b0..1a20750b8 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -14,7 +14,6 @@ if (window && window.navigator) { angular .module('copayApp') .config(function(bwcServiceProvider, $stateProvider, $urlRouterProvider) { - bwcServiceProvider.setBaseUrl('http://192.168.1.102:3001/bws/api'); $urlRouterProvider.otherwise('/'); $stateProvider From 9efa2dfe248179df5ae0e6be8cb25cf7b9ad0f81 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 13 Apr 2015 14:58:07 -0300 Subject: [PATCH 2/7] handle network reconnection --- public/index.html | 6 ++-- public/views/copayers.html | 2 +- public/views/createProfile.html | 13 +++----- public/views/history.html | 10 +++++- public/views/includes/offline.html | 4 +-- public/views/includes/sidebar.html | 2 +- public/views/receive.html | 11 ++++++- public/views/send.html | 4 +-- public/views/walletHome.html | 10 ++++++ src/css/mobile.css | 6 ++-- src/js/controllers/index.js | 35 ++++++++++++++------- src/js/controllers/receive.js | 4 ++- src/js/init.js | 19 +++++++----- src/js/routes.js | 50 ++++++++++++++++-------------- src/js/services/configService.js | 1 + src/js/services/profileService.js | 14 +++++++++ 16 files changed, 125 insertions(+), 66 deletions(-) diff --git a/public/index.html b/public/index.html index cd27bc35e..a913a4c5d 100644 --- a/public/index.html +++ b/public/index.html @@ -28,9 +28,9 @@
-
-
+
+ +
diff --git a/public/views/copayers.html b/public/views/copayers.html index c2e337d04..4562274af 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -1,5 +1,5 @@
+ ng-if="!index.clientError">
diff --git a/public/views/createProfile.html b/public/views/createProfile.html index ca58a33d1..6f73a3706 100644 --- a/public/views/createProfile.html +++ b/public/views/createProfile.html @@ -5,16 +5,11 @@ Copay
-
-
-

Warning

-
-

You don’t have an internet connection active. Copay needs connection to create a wallet

-
-
+
+ {{(cp.error)|translate}}. Retrying...
- -
+ +
Creating wallet...
diff --git a/public/views/history.html b/public/views/history.html index f49075310..a6cb99f8f 100644 --- a/public/views/history.html +++ b/public/views/history.html @@ -3,7 +3,15 @@
Getting transactions... - No transactions yet + +
+
+ +
+ Could not fetch transaction history + +
+ No transactions yet
diff --git a/public/views/includes/offline.html b/public/views/includes/offline.html index f3c9e55ea..b732ac84d 100644 --- a/public/views/includes/offline.html +++ b/public/views/includes/offline.html @@ -4,8 +4,8 @@
-

{{'No internet connection'|translate}}

-
{{'Copay needs connection to run basic functions'|translate}}
+

{{'Could not connect to Wallet Service'|translate}}

+
{{'Trying to reconnnect...'|translate}}
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index d2628f6ac..cabc0dc1a 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -15,7 +15,7 @@
{{item.m}} of {{item.n}}
-
  • +
  • diff --git a/public/views/receive.html b/public/views/receive.html index 3591a09e3..0eacc0ec6 100644 --- a/public/views/receive.html +++ b/public/views/receive.html @@ -34,6 +34,15 @@
    +
    +
    + +
    + + {{receive.error|translate}} + +
    +
    @@ -56,7 +65,7 @@
    -
    +
    diff --git a/public/views/send.html b/public/views/send.html index ae8f374f0..282e3289d 100644 --- a/public/views/send.html +++ b/public/views/send.html @@ -1,4 +1,4 @@ -
    +

    @@ -152,6 +152,4 @@

    -
    Checking your internet connection...
    -
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index f86194a4f..2cd6bfbd8 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -1,6 +1,7 @@
    +
    @@ -39,6 +40,15 @@
    +
    +
    + + + Could not update Wallet + +
    +
    +
    diff --git a/src/css/mobile.css b/src/css/mobile.css index 92cc05557..c2e8628e5 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -476,8 +476,10 @@ a.pin-button:active { .dr-notification-wrapper.offline { position: absolute; - top: 45px; - z-index: 11; + top: 0px; + z-index: 2000; + opacity: 1.0 !important; + background-color: #2C3E50; } .dr-notification-wrapper.client-error { diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 27fa37b68..bad589b43 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -69,8 +69,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r var get = function(cb) { if (walletStatus) return cb(null, walletStatus); - else - return fc.getStatus(cb); + else { + self.updateError = false; + return fc.getStatus(function(err, ret) { + if (err) self.updateError = true; + return cb(err, ret); + }); + } }; var fc = profileService.focusedClient; @@ -144,6 +149,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r $timeout(function() { self.setOngoingProcess('updatingTxHistory', true); $log.debug('Updating Transaction History'); + self.txHistoryError = false; fc.getTxHistory({ skip: self.skipHistory, limit: self.limitHistory + 1 @@ -152,8 +158,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (err) { $log.debug('TxHistory ERROR:', err); $scope.$emit('Local/ClientError', err); - } - else { + self.txHistoryError = true; + } else { $log.debug('Wallet Transaction History:', txs); self.skipHistory = self.skipHistory + self.limitHistory; self.setTxHistory(txs); @@ -390,14 +396,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r go.walletHome(); }); - $rootScope.$on('Local/OnLine', function(event) { - self.isOffLine = false; - self.updateAll(); - self.updateTxHistory(); + lodash.each(['Local/Online', 'Local/Resume'], function(eventName) { + $rootScope.$on(eventName, function(event) { + $log.debug('### Online event'); + self.isOffline = false; + self.updateAll(); + self.updateTxHistory(); + }); }); - $rootScope.$on('Local/OffLine', function(event) { - self.isOffLine = true; + $rootScope.$on('Local/Offline', function(event) { + $log.debug('========== Offline event'); + self.isOffline = true; + $rootScope.$apply(); }); $rootScope.$on('Local/BackupDone', function(event) { @@ -424,6 +435,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (err.code && err.code === 'NOTAUTHORIZED') { // Show not error, just redirect to home (where the recreate option is shown) go.walletHome(); + } else if (err && err.cors == 'rejected') { + $log.debug('CORS error:', err); } else { self.clientError = err; } @@ -506,7 +519,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) { self.askPassword = { isSetup: isSetup, - callback: function (err, pass) { + callback: function(err, pass) { self.askPassword = null; return cb(err, pass); }, diff --git a/src/js/controllers/receive.js b/src/js/controllers/receive.js index 833db0804..fddd93ff4 100644 --- a/src/js/controllers/receive.js +++ b/src/js/controllers/receive.js @@ -16,15 +16,17 @@ angular.module('copayApp.controllers').controller('receiveController', this.newAddress = function() { self.generatingAddress = true; + self.error = null; fc.createAddress(function(err, addr) { + self.generatingAddress = false; if (err) { $log.debug('Creating address ERROR:', err); $scope.$emit('Local/ClientError', err); + self.error='Could not generate address'; } else { self.addr = addr.address; storageService.storeLastAddress(fc.credentials.walletId, addr.address, function() {}); } - self.generatingAddress = false; $scope.$digest(); }); }; diff --git a/src/js/init.js b/src/js/init.js index e5dc0ab5e..104d44406 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -23,13 +23,24 @@ angular.element(document).ready(function() { window.location = '#/'; } }, false); - + document.addEventListener('resume', function() { + window.location = '#/cordova/resume'; setTimeout(function() { window.ignoreMobilePause = false; }, 100); }, false); + // We are not emitting here, since when the BWS socket reconnects, + // update will be triggered + // document.addEventListener('offline', function() { + // window.location = '#/cordova/offline'; + // }, false); + // + // document.addEventListener("online", function() { + // window.location = '#/cordoba/online'; + // }, false); + document.addEventListener('backbutton', function() { window.location = '#/walletHome'; }, false); @@ -38,13 +49,7 @@ angular.element(document).ready(function() { window.location = '#/preferences'; }, false); - document.addEventListener('offline', function() { - window.location = '#/network/offline'; - }, false); - document.addEventListener("online", function() { - window.location = '#/network/online'; - }, false); setTimeout(function() { navigator.splashscreen.hide(); diff --git a/src/js/routes.js b/src/js/routes.js index 1a20750b8..156110fec 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -322,8 +322,8 @@ angular } } }) - - .state('preferencesAltCurrency', { + + .state('preferencesAltCurrency', { url: '/preferencesAltCurrency', templateUrl: 'views/preferencesAltCurrency.html', walletShouldBeComplete: true, @@ -409,33 +409,36 @@ angular }) .state('add', { - url: '/add', - needProfile: true, - views: { - 'main': { - templateUrl: 'views/add.html' - }, - 'topbar': { - templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Add wallet'; - $scope.goBackToState = 'walletHome'; + url: '/add', + needProfile: true, + views: { + 'main': { + templateUrl: 'views/add.html' + }, + 'topbar': { + templateUrl: 'views/includes/topbar.html', + controller: function($scope) { + $scope.titleSection = 'Add wallet'; + $scope.goBackToState = 'walletHome'; + } } } - } - }) - .state('network', { - url: '/network/:status', + }) + .state('cordova', { + url: '/cordova/:status', views: { 'main': { controller: function($scope, $stateParams, go) { switch ($stateParams.status) { - case 'online': - $scope.$emit('Local/OnLine'); - break; - case 'offline': - $scope.$emit('Local/OffLine'); + case 'resume': + $scope.$emit('Local/Resume'); break; + // case 'online': + // // $scope.$emit('Local/Online'); + // break; + // case 'offline': + // // $scope.$emit('Local/Offline'); + // break; }; go.walletHome(); } @@ -491,8 +494,7 @@ angular if (pageWeight[fromState.name] > pageWeight[toState.name]) { $rootScope.$emit('Animation/SwipeRight'); - } - else if (pageWeight[fromState.name] < pageWeight[toState.name]) { + } else if (pageWeight[fromState.name] < pageWeight[toState.name]) { $rootScope.$emit('Animation/SwipeLeft'); } diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 7e4bff118..2474a95bc 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -13,6 +13,7 @@ angular.module('copayApp.services').factory('configService', function(localStora // Bitcore wallet service URL bws: { url: 'http://162.242.245.33:3004/bws/api', +// url: 'http://localhost:3001/bws/api', }, // insight diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 7d5d1496e..3e570ed68 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -60,6 +60,20 @@ angular.module('copayApp.services') root.walletClients[credentials.walletId] = client; client.removeAllListeners(); + + client.on('reconnect', function() { + if (root.focusedClient.credentials.walletId == client.credentials.walletId) { + $rootScope.$emit('Local/Online'); + } + }); + + + client.on('reconnecting', function() { + if (root.focusedClient.credentials.walletId == client.credentials.walletId) { + $rootScope.$emit('Local/Offline'); + } + }); + client.on('notification', function(n) { $log.debug('BWC Notification:', n); notificationService.newBWCNotification(n, From 6186a70a504521fd1ddef768dca094b59870ff60 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 13 Apr 2015 16:24:25 -0300 Subject: [PATCH 3/7] better handling clientError --- public/views/walletHome.html | 2 +- src/js/controllers/index.js | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 2cd6bfbd8..206ffea38 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -40,7 +40,7 @@
    -
    +
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index bad589b43..4caac6035 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -157,7 +157,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setOngoingProcess('updatingTxHistory', false); if (err) { $log.debug('TxHistory ERROR:', err); - $scope.$emit('Local/ClientError', err); + self.handleError(err); self.txHistoryError = true; } else { $log.debug('Wallet Transaction History:', txs); @@ -175,8 +175,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r $scope.$emit('Local/NotAuthorized'); } else if (err.code === 'NOTFOUND') { $scope.$emit('Local/BWSNotFound'); - } else if (err.code === 'ETIMEDOUT') { - $scope.$emit('Local/BWSTimeOut'); } else { $scope.$emit('Local/ClientError', err); } @@ -400,6 +398,7 @@ 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(); }); @@ -426,17 +425,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$apply(); }); - $rootScope.$on('Local/BWSTimeOut', function(event) { - self.clientError = 'Could not access to Bitcore Wallet Service: Timed out'; - $rootScope.$apply(); - }); - $rootScope.$on('Local/ClientError', function(event, err) { if (err.code && err.code === 'NOTAUTHORIZED') { // Show not error, just redirect to home (where the recreate option is shown) go.walletHome(); } else if (err && err.cors == 'rejected') { $log.debug('CORS error:', err); + } else if (err.code === 'ETIMEDOUT') { + $log.debug('Time out:', err); } else { self.clientError = err; } From 2883932bc9e29aa85d285906e442bb7aa0ed4570 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 13 Apr 2015 17:09:33 -0300 Subject: [PATCH 4/7] add offline handlers for devices --- src/js/init.js | 6 +++--- src/js/routes.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/init.js b/src/js/init.js index 104d44406..339aa0f7e 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -33,9 +33,9 @@ angular.element(document).ready(function() { // We are not emitting here, since when the BWS socket reconnects, // update will be triggered - // document.addEventListener('offline', function() { - // window.location = '#/cordova/offline'; - // }, false); + document.addEventListener('offline', function() { + window.location = '#/cordova/offline'; + }, false); // // document.addEventListener("online", function() { // window.location = '#/cordoba/online'; diff --git a/src/js/routes.js b/src/js/routes.js index 156110fec..506b0d1a7 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -436,9 +436,9 @@ angular // case 'online': // // $scope.$emit('Local/Online'); // break; - // case 'offline': - // // $scope.$emit('Local/Offline'); - // break; + case 'offline': + $scope.$emit('Local/Offline'); + break; }; go.walletHome(); } From d21c9320c4af5463d424433b8f7d2eedf1d8391e Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 14 Apr 2015 12:51:49 -0300 Subject: [PATCH 5/7] fix offline notifications --- public/views/history.html | 21 +++++++-------- public/views/includes/clientError.html | 2 +- public/views/includes/offline.html | 2 +- public/views/walletHome.html | 37 +++++++++----------------- src/css/main.css | 1 + src/css/mobile.css | 1 + src/js/controllers/history.js | 9 +------ src/js/controllers/index.js | 18 +++++++++---- 8 files changed, 40 insertions(+), 51 deletions(-) diff --git a/public/views/history.html b/public/views/history.html index a6cb99f8f..07d7d8071 100644 --- a/public/views/history.html +++ b/public/views/history.html @@ -2,16 +2,15 @@
    - Getting transactions... - -
    -
    - -
    - Could not fetch transaction history - -
    - No transactions yet + Getting transactions... + + + Could not fetch transaction history + + + No transactions yet + +
    @@ -30,7 +29,7 @@ + - - {{history.formatAmount(btx.amount)}} + {{btx.amountStr}} {{history.getUnitName()}}
    diff --git a/public/views/includes/clientError.html b/public/views/includes/clientError.html index 11365bf8d..de193f2cf 100644 --- a/public/views/includes/clientError.html +++ b/public/views/includes/clientError.html @@ -4,7 +4,7 @@
    -

    Connection error

    +

    Wallet Service Error

    {{index.clientError.message || index.clientError}}
    diff --git a/public/views/includes/offline.html b/public/views/includes/offline.html index b732ac84d..9e64e0cf3 100644 --- a/public/views/includes/offline.html +++ b/public/views/includes/offline.html @@ -5,7 +5,7 @@

    {{'Could not connect to Wallet Service'|translate}}

    -
    {{'Trying to reconnnect...'|translate}}
    +
    {{'Trying to reconnnect...'|translate}}
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 206ffea38..0e5e82bac 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -2,20 +2,23 @@
    -
    +
    - - {{index.totalBalanceStr || '...'}} + + {{index.totalBalanceStr }} - ...
    -
    - {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}} - N/A +
    + Opening Wallet... + Updating Status... + Updating Balance... + Updating Pending Transactions... + Scanning Wallet funds... + Recreating Wallet on BWS...
    -
    -   +
    + {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
    @@ -41,13 +44,7 @@
    -
    - - Could not update Wallet - -
    -
    @@ -109,16 +106,6 @@ You can recreate it from the local information.
    -
    - Opening Wallet... - Updating Status... - Updating Balance... - Updating Pending Transactions... - Scanning Wallet funds... - Recreating Wallet on BWS... -
    - -
    diff --git a/src/css/main.css b/src/css/main.css index 16e9b9202..d04a4b59e 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1137,3 +1137,4 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .tx-details-blockchain li { cursor: pointer !important; } + diff --git a/src/css/mobile.css b/src/css/mobile.css index c2e8628e5..3c33d261e 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -154,6 +154,7 @@ _:-ms-fullscreen, :root .main { padding: 3rem 1rem; margin-bottom: 11px; color: #fff; + height: 175px; } .scroll-section { diff --git a/src/js/controllers/history.js b/src/js/controllers/history.js index 8c9660959..7dc20d6ec 100644 --- a/src/js/controllers/history.js +++ b/src/js/controllers/history.js @@ -9,7 +9,6 @@ angular.module('copayApp.controllers').controller('historyController', var fc = profileService.focusedClient; var config = configService.getSync().wallet.settings; - var formatAmount = profileService.formatAmount; this.unitToSatoshi = config.unitToSatoshi; this.satToUnit = 1 / this.unitToSatoshi; this.unitName = config.unitName; @@ -42,10 +41,9 @@ angular.module('copayApp.controllers').controller('historyController', this.openTxModal = function(btx) { var self = this; var fc = profileService.focusedClient; - var ModalInstanceCtrl = function($scope, $modalInstance, profileService) { + var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.btx = btx; $scope.settings = config; - $scope.btx.amountStr = profileService.formatAmount(btx.amount); $scope.color = fc.backgroundColor; $scope.getAmount = function(amount) { @@ -73,11 +71,6 @@ angular.module('copayApp.controllers').controller('historyController', }); }; - - this.formatAmount = function(amount) { - return profileService.formatAmount(amount); - }; - this.hasAction = function(actions, action) { return actions.hasOwnProperty('create'); }; diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 4caac6035..9dc4a444e 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -15,9 +15,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self[processName] = isOn; self.onGoingProcess[processName] = isOn; - // derived rules - self.hideBalance = self.updatingBalance || self.updatingStatus || self.openingWallet; - var name; self.anyOnGoingProcess = lodash.any(self.onGoingProcess, function(isOn, processName) { if (isOn) @@ -26,6 +23,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); // The first one self.onGoingProcessName = name; + $timeout(function() { + $rootScope.$apply(); + }); }; self.setFocusedWallet = function() { @@ -147,14 +147,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r } self.skipHistory = skip || 0; $timeout(function() { - self.setOngoingProcess('updatingTxHistory', true); $log.debug('Updating Transaction History'); self.txHistoryError = false; + self.updatingTxHistory = true; fc.getTxHistory({ skip: self.skipHistory, limit: self.limitHistory + 1 }, function(err, txs) { - self.setOngoingProcess('updatingTxHistory', false); + self.updatingTxHistory = false; if (err) { $log.debug('TxHistory ERROR:', err); self.handleError(err); @@ -346,6 +346,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.notAuthorized = false; self.setOngoingProcess('recreating', false); + if (err) { + self.clientError = 'Could not recreate wallet:' + err; + $rootScope.$apply(); + return; + } + profileService.setWalletClients(); $timeout(function() { $rootScope.$emit('Local/WalletImported', self.walletId); @@ -375,6 +381,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r c.scanning = false; if (self.walletId == walletId) self.setOngoingProcess('scanning', false); + self.clientError = 'Could not scan wallet:' + err; + $rootScope.$apply(); } }); }; From e01fc8683571b874de7df44d8f2d1f09329820ac Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 14 Apr 2015 16:06:04 -0300 Subject: [PATCH 6/7] tap to retry --- public/views/history.html | 3 ++- public/views/walletHome.html | 11 +++++++---- src/js/controllers/index.js | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/public/views/history.html b/public/views/history.html index 07d7d8071..d008c42a4 100644 --- a/public/views/history.html +++ b/public/views/history.html @@ -4,8 +4,9 @@
    Getting transactions... - +
    Could not fetch transaction history +
    [Tap to retry] No transactions yet diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 0e5e82bac..1b6acfee5 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -2,6 +2,13 @@
    +
    + Could not update Wallet +
    [Tap to retry] +
    + + +
    @@ -43,10 +50,6 @@
    -
    - Could not update Wallet -
    -
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 9dc4a444e..418c10729 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -184,9 +184,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateColor(); $timeout(function() { self.setOngoingProcess('openingWallet', true); + self.updateError = false; fc.openWallet(function(err, walletStatus) { self.setOngoingProcess('openingWallet', false); if (err) { + self.updateError = true; self.handleError(err); return; } From 63998a8b0f2d5b414edf4ff34cb824226cd09880 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 14 Apr 2015 16:41:03 -0300 Subject: [PATCH 7/7] remove digest --- src/js/controllers/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 418c10729..471b6acd8 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -417,7 +417,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/Offline', function(event) { $log.debug('========== Offline event'); self.isOffline = true; - $rootScope.$apply(); }); $rootScope.$on('Local/BackupDone', function(event) {