diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html index d8b80f6ca..a3c37856b 100644 --- a/public/views/tab-create-personal.html +++ b/public/views/tab-create-personal.html @@ -28,7 +28,7 @@ ng-blur="create.formFocus(false)"> - + Show advanced options Hide advanced options diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html index c3b31f141..b7831389c 100644 --- a/public/views/tab-create-shared.html +++ b/public/views/tab-create-shared.html @@ -61,7 +61,7 @@ - + Show advanced options Hide advanced options diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 84ea631d4..1317959fa 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('createController', - function($scope, $rootScope, $timeout, $log, lodash, $state, profileService, configService, gettext, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, storageService) { + function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, profileService, configService, gettext, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, storageService) { var isChromeApp = platformInfo.isChromeApp; var isCordova = platformInfo.isCordova; @@ -37,6 +37,10 @@ angular.module('copayApp.controllers').controller('createController', return new Array(num); } + $scope.showAdvChange = function() { + $ionicScrollDelegate.resize(); + }; + var updateRCSelect = function(n) { $scope.totalCopayers = n; var maxReq = COPAYER_PAIR_LIMITS[n]; diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 1421b60f1..592c10c84 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -1,7 +1,10 @@ 'use strict'; angular.module('copayApp.controllers').controller('tabHomeController', - function($rootScope, $timeout, $scope, $state, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo, storageService) { + function($rootScope, $timeout, $scope, $state, $ionicScrollDelegate, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo, storageService) { + + $scope.externalServices = {}; + $scope.bitpayCardEnabled = true; // TODO var setNotifications = function(notifications) { $scope.notifications = notifications; @@ -20,7 +23,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', var notifications = []; lodash.each($scope.wallets, function(wallet) { - walletService.getStatus(wallet, {}, function(err, status) { if (err) { console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO @@ -28,8 +30,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', } wallet.status = status; }); - - }); $scope.fetchingNotifications = true; @@ -42,6 +42,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', } $scope.fetchingNotifications = false; setNotifications(n); + $ionicScrollDelegate.resize(); }) }; @@ -63,21 +64,20 @@ angular.module('copayApp.controllers').controller('tabHomeController', return; } setNotifications(n); + $ionicScrollDelegate.resize(); }) }); }; - $scope.externalServices = {}; $scope.nextStep = function() { lodash.each(['AmazonGiftCards', 'BitpayCard', 'BuyAndSell'], function(service) { storageService.getNextStep(service, function(err, value) { $scope.externalServices[service] = value ? true : false; + $ionicScrollDelegate.resize(); }); }); }; - $scope.bitpayCardEnabled = true; // TODO - var listeners = [ $rootScope.$on('bwsEvent', function(e, walletId, type, n) { var wallet = profileService.getWallet(walletId);