diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 5e9f09017..e17426e5b 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -33,7 +33,7 @@ -
+
Recent Transactions @@ -120,7 +120,7 @@
-
+
diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index 928b64a93..807eb0dd9 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', $scope.coinbaseChange = function() { var opts = { coinbase: { - enabled: $scope.coinbaseEnabled + enabled: $scope.coinbaseEnabled.value } }; configService.set(opts, function(err) { @@ -87,7 +87,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', $scope.recentTransactionsChange = function() { var opts = { recentTransactions: { - enabled: $scope.recentTransactionsEnabled + enabled: $scope.recentTransactionsEnabled.value } }; configService.set(opts, function(err) { @@ -98,7 +98,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', $scope.frequentlyUsedChange = function() { var opts = { frequentlyUsed: { - enabled: $scope.frequentlyUsedEnabled + enabled: $scope.frequentlyUsedEnabled.value } }; configService.set(opts, function(err) { diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index e4b157408..c8e3abf4e 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -71,7 +71,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ $timeout(function() { $ionicScrollDelegate.resize(); - }, 100); + }, 10); }); $scope.toggleAlternative = function() { diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 84c77275f..6b91db34d 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -37,7 +37,9 @@ angular.module('copayApp.controllers').controller('createController', }; $scope.showAdvChange = function() { - $ionicScrollDelegate.resize(); + $timeout(function() { + $ionicScrollDelegate.resize(); + }, 10); }; function updateRCSelect(n) { diff --git a/src/js/controllers/modals/search.js b/src/js/controllers/modals/search.js index 9b9e6d268..ed1861074 100644 --- a/src/js/controllers/modals/search.js +++ b/src/js/controllers/modals/search.js @@ -14,7 +14,9 @@ angular.module('copayApp.controllers').controller('searchController', function($ window.plugins.toast.hide(); currentTxHistoryPage = 0; throttleSearch(search); - $ionicScrollDelegate.resize(); + $timeout(function() { + $ionicScrollDelegate.resize(); + }, 10); } var throttleSearch = lodash.throttle(function(search) { diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 8f76d7f4d..076d98748 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -147,7 +147,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi paymentTimeControl(tx.paypro.expires); $timeout(function() { $ionicScrollDelegate.resize(); - }, 100); + }, 10); }); } }; diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index 3cbac1bab..2f2da8b00 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -114,9 +114,9 @@ angular.module('copayApp.controllers').controller('preferencesInformation', } $scope.addrs = last10; $timeout(function() { + $ionicScrollDelegate.resize(); $scope.$apply(); - }); - $ionicScrollDelegate.resize(); + }, 10); }); }); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index fbaa561f4..41444b0d9 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -88,11 +88,10 @@ angular.module('copayApp.controllers').controller('tabHomeController', if (err) $log.error(err); $scope.txps = txps; $scope.txpsN = n; - $ionicScrollDelegate.resize(); - $timeout(function() { + $ionicScrollDelegate.resize(); $scope.$apply(); - }, 1); + }, 10); }) }; @@ -128,11 +127,11 @@ angular.module('copayApp.controllers').controller('tabHomeController', } $scope.fetchingNotifications = false; $scope.notifications = n; - $ionicScrollDelegate.resize(); $timeout(function() { + $ionicScrollDelegate.resize(); $scope.$apply(); - }, 1); + }, 10); }) }; @@ -175,14 +174,18 @@ angular.module('copayApp.controllers').controller('tabHomeController', lodash.each(['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'], function(service) { storageService.getNextStep(service, function(err, value) { $scope.externalServices[service] = value ? true : false; - $ionicScrollDelegate.resize(); + $timeout(function() { + $ionicScrollDelegate.resize(); + }, 10); }); }); }; $scope.shouldHideNextSteps = function() { $scope.hideNextSteps = !$scope.hideNextSteps; - $ionicScrollDelegate.resize(); + $timeout(function() { + $ionicScrollDelegate.resize(); + }, 10); }; var listeners = [ @@ -207,6 +210,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', configService.whenAvailable(function() { var config = configService.getSync(); var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; + $scope.hideNextSteps = false; $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp; $scope.amazonEnabled = config.amazon.enabled;