Merge c6f8018 into 580304d

blockchain · Jan 15, 2016 · 3502b70 · 3502b70
2 parents 580304d + c6f8018
commit 3502b70
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/partials/security-center.jade b/app/partials/security-center.jade
@@ -109,7 +109,7 @@
 
     .badge-panel(ng-show="display.action == 'mobilenumber' || display.action == 'twofactor'")
       div(ng-show="display.action == 'mobilenumber'")
-        configure-mobile-number(on-success="mobileNumber.step = 2" on-cancel="mobileNumber.step = 0" ng-show="mobileNumber.step == 1" button-lg full-width)          
+        configure-mobile-number(on-success="mobileNumber.step = 2" on-cancel="mobileNumber.step = 1; cancelNumber();" ng-show="mobileNumber.step == 1" button-lg full-width)          
         div(ng-show="mobileNumber.step == 2")
           h2.status.complete.hidden-xs.long-input
           verify-mobile-number(on-success="mobileNumber.step = 0" button-lg full-width)

diff --git a/assets/css/modules/_security-center.scss b/assets/css/modules/_security-center.scss
@@ -149,8 +149,10 @@
   }
   .badge-panel {
     border: 1px solid rgb(234, 234, 234);
+    position: relative;
     border-top: none;
     padding: 30px;
+    z-index: 10;
     input {
       border: none;
       border-bottom: 1px solid #DBDBDB;

diff --git a/assets/js/controllers/securityCenter.controller.js b/assets/js/controllers/securityCenter.controller.js
@@ -68,6 +68,10 @@ function SettingsSecurityCenterCtrl($scope, Wallet, SecurityCenter, filterFilter
     Wallet.changePasswordHint(hint, success, error);
   };
 
+  $scope.cancelNumber = () => {
+    $scope.toggle('mobilenumber');
+  }
+
   $scope.$watchCollection("user", (newValue, oldValue) => {
     if (!($scope.display.action === "mobilenumber" && !$scope.user.isMobileVerified)) {
       $scope.nextAction();