From 0d92a2af9b4b88f89d63c34ef40a8a5c3274dfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 10 Oct 2016 15:19:33 -0300 Subject: [PATCH 1/4] pull to refresh --- src/js/controllers/walletDetails.js | 6 ++++++ www/views/walletDetails.html | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 344ee7d75..ef9f409c1 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -8,6 +8,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.txps = []; $scope.completeTxHistory = []; $scope.openTxpModal = txpModalService.open; + $scope.isCordova = platformInfo.isCordova; $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); @@ -159,6 +160,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }, 100); }; + $scope.onRefresh = function() { + $scope.$broadcast('scroll.refreshComplete'); + $scope.updateAll(true); + }; + $scope.updateAll = function(force, cb)  { updateStatus(force); updateTxHistory(cb); diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 135287375..9e42964dc 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -11,6 +11,12 @@ + +
From 59d2641c273e7994610b8faf7a6efab860a77efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 10 Oct 2016 15:23:16 -0300 Subject: [PATCH 2/4] remove unused code --- www/views/walletDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 9e42964dc..3f36ba652 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -10,7 +10,7 @@ - + Date: Tue, 11 Oct 2016 12:59:02 -0300 Subject: [PATCH 3/4] pull to refresh in home tab --- src/js/controllers/tab-home.js | 18 ++++++++++++------ www/views/tab-home.html | 6 ++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 937e1bab6..62b24ac7f 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -11,12 +11,13 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.version = $window.version; $scope.name = $window.appConfig.nameCase; $scope.homeTip = $stateParams.fromOnboarding; + $scope.isCordova = platformInfo.isCordova; - if(!$scope.homeTip){ - storageService.getHomeTipAccepted(function(error, value){ - $scope.homeTip = (value == 'false') ? false : true; - }); - } + if (!$scope.homeTip) { + storageService.getHomeTipAccepted(function(error, value) { + $scope.homeTip = (value == 'false') ? false : true; + }); + } $scope.openNotificationModal = function(n) { wallet = profileService.getWallet(n.walletId); @@ -170,7 +171,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.hideHomeTip = function() { - storageService.setHomeTipAccepted(false, function(error, value){ + storageService.setHomeTipAccepted(false, function(error, value) { $scope.homeTip = false; }); }; @@ -201,6 +202,11 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); }; + $scope.onRefresh = function() { + $scope.$broadcast('scroll.refreshComplete'); + updateAllWallets(); + }; + $scope.$on("$ionicView.enter", function(event, data) { $scope.bitpayCard = null; nextStep(); diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 64d874c27..0cc933f8a 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -4,6 +4,12 @@ + +
From 80246588f91301a373b1681ef21db65cb04b6e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Oct 2016 13:17:32 -0300 Subject: [PATCH 4/4] remove bouncing wallet details --- www/views/walletDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 3f36ba652..5314a2714 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -10,7 +10,7 @@ - +