Release: v3.7.0

MyEtherWallet · May 8, 2017 · b586a9b · b586a9b
1 parent 7f734b3
commit b586a9b
Show file tree

Hide file tree

Showing 11 changed files with 95,324 additions and 109,716 deletions.
diff --git a/app/includes/ens-auction.tpl b/app/includes/ens-auction.tpl
@@ -36,7 +36,7 @@
         </strong>
         <li><strong>Finalize the Auction:</strong>
           <ul>
-            <li>Once the auction is over, anyone can finalize it. The ENS name is then assigned to the winning bidder.</li>
+            <li>Once the auction is over, the winner will finalize it. The ENS name is then assigned to the winning bidder.</li>
             <li> The winner will be refunded the difference between their bid and the next-highest bid. If you are the only bidder, you will refunded all but 0.1 ETH. Any non-winners will also be refunded.</li>
           </ul>
         </li>

diff --git a/app/includes/ens-modal-after-sent.tpl b/app/includes/ens-modal-after-sent.tpl
@@ -1,3 +1,4 @@
+<br /><br /><br />
 <div ng-show="objENS.txSent">
 <section ng-show="objENS.status==ensModes.auction || objENS.status==ensModes.open">
   <div class="alert alert-danger">
@@ -27,7 +28,7 @@
         <td>Secret Phrase:</td><td>{{objENS.secret}}</td>
       </tr>
       <tr ng-show="objENS.status!=ensModes.reveal">
-        <td>Amount to Send (disguise):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
+        <td>Amount to Send ("Disguise Bid"):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
       </tr>
       <tr>
         <td>From Account:</td><td><small class="mono">{{wallet.getAddressString()}}</small></td>
@@ -55,4 +56,4 @@
   </div>
   <h4 class="text-warning">Please return on {{objENS.registrationDate.toLocaleString()}} to finalize the auction and see if you won!</h4>
 </div>
-</div>
+</div>
diff --git a/app/includes/ens-modal-finalize.tpl b/app/includes/ens-modal-finalize.tpl
@@ -6,7 +6,7 @@
       <div class="modal-body">
 
         <button type="button" class="close" data-dismiss="modal">&times;</button>
-        <h2 class="modal-title"> You are about to Finalize domain {{objENS.name}}.eth</h2>
+        <h2 class="modal-title"> You are about to finalize the auction for {{objENS.name}}.eth &amp; claim this name. </h2>
 
         <p> The <strong>{{ajaxReq.type}}</strong> node you are sending through is provided by <strong>{{ajaxReq.service}}</strong>.</p>
 

diff --git a/app/includes/ens-modal.tpl b/app/includes/ens-modal.tpl
@@ -41,7 +41,7 @@
               <td>Secret Phrase:</td><td>{{objENS.secret}}</td>
             </tr>
             <tr ng-show="objENS.status!=ensModes.reveal">
-              <td>Amount to Send (disguise):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
+              <td>Amount to Send ("Disguise Bid"):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
             </tr>
             <tr>
               <td>From Account:</td><td><small class="mono">{{wallet.getAddressString()}}</small></td>

diff --git a/app/includes/ens.tpl b/app/includes/ens.tpl
@@ -38,7 +38,7 @@
       </span>
       <span ng-show="objENS.status==ensModes.owned">
         <strong>{{objENS.name}}.eth</strong>  is not available. It's already owned by {{objENS.owner}},
-        if you are the owner, you can finalize it below.
+        if you are the winner, you must finalize it below to claim the name.
       </span>
       <span ng-show="objENS.status==ensModes.forbidden">
         <strong>{{objENS.name}}.eth</strong>  not available. (Forbidden)
@@ -158,25 +158,17 @@
         <!-- / Name -->
 
         <!-- Maximum -->
-        <h5>{{objENS.status==ensModes.reveal ? "Bid Amount" : "Maximum Bid"}}</h5>
+        <h5>Amount to <u> Bid </u></h5>
         <p ng-show="objENS.status!=ensModes.reveal"><em><small>You must remember this to claim your name later.</small></em></p>
         <div class="input-group">
           <input class="form-control" type="text" placeholder="1 {{ajaxReq.type}}" ng-model="objENS.bidValue" ng-class="Validator.isPositiveNumber(objENS.bidValue) && objENS.bidValue >= 0.01 ? 'is-valid' : 'is-invalid'"/>
           <div class="input-group-btn"><a class="btn btn-default">{{ajaxReq.type}}</a></div>
         </div>
         <!-- / Maximum -->
 
-        <!-- Your Secret -->
-        <h5>Secret Phrase</h5>
-        <p ng-show="objENS.status!=ensModes.reveal"><em><small>You must remember this to claim your name later.</small></em></p>
-        <div class="form-group">
-          <input class="form-control" type="text" placeholder="word1 word2 word3" value="" ng-model="objENS.secret" ng-class="Validator.isPasswordLenValid(objENS.secret,0) ? 'is-valid' : 'is-invalid'"/>
-        </div>
-        <!-- / Your Secret  -->
-
         <!-- Disguise Bid -->
         <div ng-show="objENS.status!=ensModes.reveal">
-          <h5>Amount to Send</h5>
+          <h5>Amount to Send ("Disguise Bid")</h5>
           <p><em><small>If you wish to send more than your actual bid to disguise it.</small></em></p>
           <!-- Validation = more than Max. Bid Input, more than what is in account -->
           <div class="input-group">
@@ -186,6 +178,13 @@
         </div>
         <!-- / Disguise Bid  -->
 
+        <!-- Your Secret -->
+        <h5>Secret Phrase</h5>
+        <p ng-show="objENS.status!=ensModes.reveal"><em><small>You must remember this to claim your name later.</small></em></p>
+        <div class="form-group">
+          <input class="form-control" type="text" placeholder="word1 word2 word3" value="" ng-model="objENS.secret" ng-class="Validator.isPasswordLenValid(objENS.secret,0) ? 'is-valid' : 'is-invalid'"/>
+        </div>
+        <!-- / Your Secret  -->
 
         <div class="form-group">
           <a class="btn btn-primary btn-block" ng-click="generateTx()"> <span ng-show="objENS.status==ensModes.auction"> Place a Bid</span><span ng-show="objENS.status==ensModes.open">Start an Auction</span> <span ng-show="objENS.status==ensModes.reveal">Reveal your Bid</span></a>

diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html
@@ -2024,7 +2024,7 @@ <h1 class="text-center">
       </span>
       <span ng-show="objENS.status==ensModes.owned">
         <strong>{{objENS.name}}.eth</strong>  is not available. It's already owned by {{objENS.owner}},
-        if you are the owner, you can finalize it below.
+        if you are the winner, you must finalize it below to claim the name.
       </span>
       <span ng-show="objENS.status==ensModes.forbidden">
         <strong>{{objENS.name}}.eth</strong>  not available. (Forbidden)
@@ -2092,7 +2092,7 @@ <h6> What is the auction & bidding process like? </h6>
         </strong>
         <li><strong>Finalize the Auction:</strong>
           <ul>
-            <li>Once the auction is over, anyone can finalize it. The ENS name is then assigned to the winning bidder.</li>
+            <li>Once the auction is over, the winner will finalize it. The ENS name is then assigned to the winning bidder.</li>
             <li> The winner will be refunded the difference between their bid and the next-highest bid. If you are the only bidder, you will refunded all but 0.1 ETH. Any non-winners will also be refunded.</li>
           </ul>
         </li>
@@ -2204,25 +2204,17 @@ <h2>
         <!-- / Name -->
 
         <!-- Maximum -->
-        <h5>{{objENS.status==ensModes.reveal ? "Bid Amount" : "Maximum Bid"}}</h5>
+        <h5>Amount to <u> Bid </u></h5>
         <p ng-show="objENS.status!=ensModes.reveal"><em><small>You must remember this to claim your name later.</small></em></p>
         <div class="input-group">
           <input class="form-control" type="text" placeholder="1 {{ajaxReq.type}}" ng-model="objENS.bidValue" ng-class="Validator.isPositiveNumber(objENS.bidValue) && objENS.bidValue >= 0.01 ? 'is-valid' : 'is-invalid'"/>
           <div class="input-group-btn"><a class="btn btn-default">{{ajaxReq.type}}</a></div>
         </div>
         <!-- / Maximum -->
 
-        <!-- Your Secret -->
-        <h5>Secret Phrase</h5>
-        <p ng-show="objENS.status!=ensModes.reveal"><em><small>You must remember this to claim your name later.</small></em></p>
-        <div class="form-group">
-          <input class="form-control" type="text" placeholder="word1 word2 word3" value="" ng-model="objENS.secret" ng-class="Validator.isPasswordLenValid(objENS.secret,0) ? 'is-valid' : 'is-invalid'"/>
-        </div>
-        <!-- / Your Secret  -->
-
         <!-- Disguise Bid -->
         <div ng-show="objENS.status!=ensModes.reveal">
-          <h5>Amount to Send</h5>
+          <h5>Amount to Send ("Disguise Bid")</h5>
           <p><em><small>If you wish to send more than your actual bid to disguise it.</small></em></p>
           <!-- Validation = more than Max. Bid Input, more than what is in account -->
           <div class="input-group">
@@ -2232,6 +2224,13 @@ <h5>Amount to Send</h5>
         </div>
         <!-- / Disguise Bid  -->
 
+        <!-- Your Secret -->
+        <h5>Secret Phrase</h5>
+        <p ng-show="objENS.status!=ensModes.reveal"><em><small>You must remember this to claim your name later.</small></em></p>
+        <div class="form-group">
+          <input class="form-control" type="text" placeholder="word1 word2 word3" value="" ng-model="objENS.secret" ng-class="Validator.isPasswordLenValid(objENS.secret,0) ? 'is-valid' : 'is-invalid'"/>
+        </div>
+        <!-- / Your Secret  -->
 
         <div class="form-group">
           <a class="btn btn-primary btn-block" ng-click="generateTx()"> <span ng-show="objENS.status==ensModes.auction"> Place a Bid</span><span ng-show="objENS.status==ensModes.open">Start an Auction</span> <span ng-show="objENS.status==ensModes.reveal">Reveal your Bid</span></a>
@@ -2291,7 +2290,7 @@ <h4>Screenshot & save first!</h4>
               <td>Secret Phrase:</td><td>{{objENS.secret}}</td>
             </tr>
             <tr ng-show="objENS.status!=ensModes.reveal">
-              <td>Amount to Send (disguise):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
+              <td>Amount to Send ("Disguise Bid"):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
             </tr>
             <tr>
               <td>From Account:</td><td><small class="mono">{{wallet.getAddressString()}}</small></td>
@@ -2343,7 +2342,7 @@ <h4 translate="SENDModal_Content_3"> Are you sure you want to do this? </h4>
       <div class="modal-body">
 
         <button type="button" class="close" data-dismiss="modal">&times;</button>
-        <h2 class="modal-title"> You are about to Finalize domain {{objENS.name}}.eth</h2>
+        <h2 class="modal-title"> You are about to finalize the auction for {{objENS.name}}.eth &amp; claim this name. </h2>
 
         <p> The <strong>{{ajaxReq.type}}</strong> node you are sending through is provided by <strong>{{ajaxReq.service}}</strong>.</p>
 
@@ -2368,7 +2367,8 @@ <h4 translate="SENDModal_Content_3"> Are you sure you want to do this? </h4>
 
 
 
-   <div ng-show="objENS.txSent">
+   <br /><br /><br />
+<div ng-show="objENS.txSent">
 <section ng-show="objENS.status==ensModes.auction || objENS.status==ensModes.open">
   <div class="alert alert-danger">
     <h4>If you haven't done so already, please screenshot & save the below information</h4>
@@ -2397,7 +2397,7 @@ <h4>If you haven't done so already, please screenshot & save the below informati
         <td>Secret Phrase:</td><td>{{objENS.secret}}</td>
       </tr>
       <tr ng-show="objENS.status!=ensModes.reveal">
-        <td>Amount to Send (disguise):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
+        <td>Amount to Send ("Disguise Bid"):</td><td>{{objENS.dValue}} {{ajaxReq.type}}</td>
       </tr>
       <tr>
         <td>From Account:</td><td><small class="mono">{{wallet.getAddressString()}}</small></td>
@@ -2425,7 +2425,8 @@ <h4>You have successfully revealed your {{objENS.bidValue}} bid for {{objENS.nam
   </div>
   <h4 class="text-warning">Please return on {{objENS.registrationDate.toLocaleString()}} to finalize the auction and see if you won!</h4>
 </div>
-</div> 
+</div>
+
 
 
 </main>