diff --git a/public/views/create.html b/public/views/create.html index 98d3e88a8..adaef7f9a 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -49,13 +49,13 @@
-
+
{{create.error|translate}}
-
+
-
+
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 77b5e2037..84045dd38 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -517,4 +517,4 @@
-
+
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 1433ccdb9..372f0a53c 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, $location, $timeout, $log, lodash, go, profileService, configService, isCordova, gettext, ledger, trezor, isMobile, isChromeApp, isDevel, derivationPathHelper) { + function($scope, $location, $anchorScroll, $rootScope, $timeout, $log, lodash, go, profileService, configService, isCordova, gettext, ledger, trezor, isMobile, isChromeApp, isDevel, derivationPathHelper) { var self = this; var defaults = configService.getDefaults(); @@ -164,6 +164,7 @@ angular.module('copayApp.controllers').controller('createController', if (err) { $log.warn(err); self.error = err; + scrollUp('notification'); $timeout(function() { $rootScope.$apply(); }); @@ -174,6 +175,12 @@ angular.module('copayApp.controllers').controller('createController', }, 100); } + function scrollUp(location){ + if(!location) return; + $location.hash(location); + $anchorScroll(); + }; + this.formFocus = function(what) { if (!this.isWindowsPhoneApp) return diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 737849652..48d14e062 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var self = this; window.ignoreMobilePause = false; - $rootScope.hideMenuBar = false; + $rootScope.shouldHideMenuBar = false; $rootScope.wpInputFocused = false; var config = configService.getSync(); var configWallet = config.wallet; @@ -84,7 +84,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi disableFocusListener(); disableResumeListener(); disableOngoingProcessListener(); - $rootScope.hideMenuBar = false; + $rootScope.shouldHideMenuBar = false; }); this.onQrCodeScanned = function(data) { @@ -638,10 +638,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.hideMenuBar = lodash.debounce(function(hide) { if (hide) { - $rootScope.hideMenuBar = true; + $rootScope.shouldHideMenuBar = true; this.bindTouchDown(); } else { - $rootScope.hideMenuBar = false; + $rootScope.shouldHideMenuBar = false; } $rootScope.$digest(); }, 100);