From f178eb9b503a6673d39de075649aadbf325d1b2e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 14:26:19 -0500 Subject: [PATCH 1/2] ensure pull to refresh icon is visible on android and remove comments --- src/js/controllers/walletDetails.js | 4 ---- src/sass/views/walletDetails.scss | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index a6553612e..4abb2e51b 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -323,10 +323,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun ]; }); - // $scope.$on("$ionicView.beforeLeave", function(event, data) { - // $interval.cancel(scrollInterval); - // }); - $scope.$on("$ionicView.leave", function(event, data) { screenInactive = true; lodash.each(listeners, function(x) { diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 0a48b5da5..87fcefcaf 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -92,6 +92,11 @@ #walletDetails { background: #F8F8F9; + .scroll-refresher { + z-index: 1; + margin-top: 3.5rem; + } + .ionic-refresher-content { color: white !important; } From 51c4ebfc647d3aa380496ad34efca8a60b16ebc5 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Tue, 15 Nov 2016 14:43:38 -0500 Subject: [PATCH 2/2] ensure infinite loading spinner is visible --- src/sass/views/walletDetails.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 87fcefcaf..f6220c524 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -99,11 +99,11 @@ .ionic-refresher-content { color: white !important; - } - .spinner svg { - stroke: white; - fill: white; + .spinner svg { + stroke: white; + fill: white; + } } .bp-content {