edge case fix for subdomain registration

MyEtherWallet · Mar 9, 2018 · e0129b6 · e0129b6
1 parent db52dc6
commit e0129b6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/app/includes/ens.tpl b/app/includes/ens.tpl
@@ -14,11 +14,11 @@
     </h1>
   </div>
   <!-- / Title -->
-  <div ng-show="visibility=='ens'">
+  <div ng-if="visibility=='ens'">
     @@if (site === 'mew' ) { @@include( './ens-domain.tpl', { "site": "mew" } ) }
     @@if (site === 'cx'  ) { @@include( './ens-domain.tpl', { "site": "cx"  } ) }
   </div>
-  <div ng-show="visibility=='subdomain'">
+  <div ng-if="visibility=='subdomain'">
     <div class="block">
       <!-- ENS Title -->
       <article class="cont-md">

diff --git a/app/scripts/controllers/ensCtrl.js b/app/scripts/controllers/ensCtrl.js
@@ -3,8 +3,6 @@ var ensCtrl = function($scope, $sce, walletService) {
     $scope.ajaxReq = ajaxReq;
     $scope.hideEnsInfoPanel = false;
     walletService.wallet = null;
-    $scope.ensConfirmModalModal = new Modal(document.getElementById('ensConfirmModal'));
-    $scope.ensFinalizeModal = new Modal(document.getElementById('ensFinalizeConfirm'));
     $scope.Validator = Validator;
     $scope.wd = false;
     $scope.haveNotAlreadyCheckedLength = true;
@@ -57,7 +55,7 @@ var ensCtrl = function($scope, $sce, walletService) {
     var resetToDefault = function() {
         $scope.objENS = JSON.parse(JSON.stringify($scope.objENSClone));
         $scope.objSub = JSON.parse(JSON.stringify($scope.objSubClone));
-        $scope.wallet= null;
+        $scope.wallet = null;
         walletService.wallet = null;
         $scope.wd = false;
     }
@@ -166,6 +164,8 @@ var ensCtrl = function($scope, $sce, walletService) {
     $scope.checkName = function() {
         // checks if it's the same length as a PK and if so, warns them.
         // If they confirm they can set haveNotAlreadyCheckedLength to true and carry on
+        $scope.ensConfirmModalModal = new Modal(document.getElementById('ensConfirmModal'));
+        $scope.ensFinalizeModal = new Modal(document.getElementById('ensFinalizeConfirm'));
         if ($scope.haveNotAlreadyCheckedLength && ($scope.objENS.name.length == 128 || $scope.objENS.name.length == 132 || $scope.objENS.name.length == 64 || $scope.objENS.name.length == 66)) {
             $scope.notifier.danger("That looks an awful lot like a private key. Are you sure you would like to check if this name is available on the ENS network? If so, click `Check`. If it is your private key, click refresh & try again.");
             $scope.haveNotAlreadyCheckedLength = false;

diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html
@@ -3754,7 +3754,7 @@ <h1>
     </h1>
   </div>
   <!-- / Title -->
-  <div ng-show="visibility=='ens'">
+  <div ng-if="visibility=='ens'">
 
      <div class="block">
       <!-- ENS Title -->
@@ -4820,7 +4820,7 @@ <h4 translate="SENDModal_Content_3"> Are you sure you want to do this? </h4>
 
 
   </div>
-  <div ng-show="visibility=='subdomain'">
+  <div ng-if="visibility=='subdomain'">
     <div class="block">
       <!-- ENS Title -->
       <article class="cont-md">

diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js
@@ -2043,8 +2043,6 @@ var ensCtrl = function ensCtrl($scope, $sce, walletService) {
     $scope.ajaxReq = ajaxReq;
     $scope.hideEnsInfoPanel = false;
     walletService.wallet = null;
-    $scope.ensConfirmModalModal = new Modal(document.getElementById('ensConfirmModal'));
-    $scope.ensFinalizeModal = new Modal(document.getElementById('ensFinalizeConfirm'));
     $scope.Validator = Validator;
     $scope.wd = false;
     $scope.haveNotAlreadyCheckedLength = true;
@@ -2206,6 +2204,8 @@ var ensCtrl = function ensCtrl($scope, $sce, walletService) {
     $scope.checkName = function () {
         // checks if it's the same length as a PK and if so, warns them.
         // If they confirm they can set haveNotAlreadyCheckedLength to true and carry on
+        $scope.ensConfirmModalModal = new Modal(document.getElementById('ensConfirmModal'));
+        $scope.ensFinalizeModal = new Modal(document.getElementById('ensFinalizeConfirm'));
         if ($scope.haveNotAlreadyCheckedLength && ($scope.objENS.name.length == 128 || $scope.objENS.name.length == 132 || $scope.objENS.name.length == 64 || $scope.objENS.name.length == 66)) {
             $scope.notifier.danger("That looks an awful lot like a private key. Are you sure you would like to check if this name is available on the ENS network? If so, click `Check`. If it is your private key, click refresh & try again.");
             $scope.haveNotAlreadyCheckedLength = false;

diff --git a/dist/index.html b/dist/index.html
@@ -3140,7 +3140,7 @@ <h1>
     </h1>
   </div>
   <!-- / Title -->
-  <div ng-show="visibility=='ens'">
+  <div ng-if="visibility=='ens'">
      <div class="block">
       <!-- ENS Title -->
       <article class="cont-md">
@@ -4206,7 +4206,7 @@ <h4 translate="SENDModal_Content_3"> Are you sure you want to do this? </h4>
 
 
   </div>
-  <div ng-show="visibility=='subdomain'">
+  <div ng-if="visibility=='subdomain'">
     <div class="block">
       <!-- ENS Title -->
       <article class="cont-md">

diff --git a/dist/js/etherwallet-master.js b/dist/js/etherwallet-master.js
@@ -2043,8 +2043,6 @@ var ensCtrl = function ensCtrl($scope, $sce, walletService) {
     $scope.ajaxReq = ajaxReq;
     $scope.hideEnsInfoPanel = false;
     walletService.wallet = null;
-    $scope.ensConfirmModalModal = new Modal(document.getElementById('ensConfirmModal'));
-    $scope.ensFinalizeModal = new Modal(document.getElementById('ensFinalizeConfirm'));
     $scope.Validator = Validator;
     $scope.wd = false;
     $scope.haveNotAlreadyCheckedLength = true;
@@ -2206,6 +2204,8 @@ var ensCtrl = function ensCtrl($scope, $sce, walletService) {
     $scope.checkName = function () {
         // checks if it's the same length as a PK and if so, warns them.
         // If they confirm they can set haveNotAlreadyCheckedLength to true and carry on
+        $scope.ensConfirmModalModal = new Modal(document.getElementById('ensConfirmModal'));
+        $scope.ensFinalizeModal = new Modal(document.getElementById('ensFinalizeConfirm'));
         if ($scope.haveNotAlreadyCheckedLength && ($scope.objENS.name.length == 128 || $scope.objENS.name.length == 132 || $scope.objENS.name.length == 64 || $scope.objENS.name.length == 66)) {
             $scope.notifier.danger("That looks an awful lot like a private key. Are you sure you would like to check if this name is available on the ENS network? If so, click `Check`. If it is your private key, click refresh & try again.");
             $scope.haveNotAlreadyCheckedLength = false;