gas price @ 50

MyEtherWallet · Jun 10, 2017 · 7b34cf4 · 7b34cf4
1 parent 3b7b147
commit 7b34cf4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/includes/generateWallet.tpl b/app/includes/generateWallet.tpl
@@ -102,7 +102,7 @@
 
       <div class="form-group">
         <h4 translate="x_PrivKey">Private Key (unencrypted)</h4>
-        <textarea aria-label="{{'x_PrivKey'|translate}}" aria-describedby="x_PrivKeyDesc" class="form-control bigger-on-mobile" type="text" readonly="readonly" style="  max-width: 50rem;margin: auto;">{{wallet.getPrivateKeyString()}}</textarea>
+        <input aria-label="{{'x_PrivKey'|translate}}" aria-describedby="x_PrivKeyDesc" value="{{wallet.getPrivateKeyString()}}" class="form-control" type="text" readonly="readonly" style="max-width: 50rem;margin: auto;" />
       </div>
 
       <div class="form-group">

diff --git a/app/scripts/controllers/footerCtrl.js b/app/scripts/controllers/footerCtrl.js
@@ -14,7 +14,6 @@ var footerCtrl = function($scope, globalService) {
 
     $scope.curLang = globalFuncs.curLang;
     $scope.gasChanged = function() {
-        if ($scope.gas.value == 50) return;
         localStorage.setItem(gasPriceKey, $scope.gas.value);
         ethFuncs.gasAdjustment = $scope.gas.value;
     }
@@ -42,5 +41,6 @@ var footerCtrl = function($scope, globalService) {
         }
     }
     setGasValues();
+    $scope.gasChanged();
 };
 module.exports = footerCtrl;
diff --git a/app/scripts/controllers/swapCtrl.js b/app/scripts/controllers/swapCtrl.js
@@ -28,7 +28,7 @@ var swapCtrl = function($scope, $sce, walletService) {
         }
     }
     $scope.verifyMinMaxValues = function() {
-
+  		if (!$scope.orderResult) uiFuncs.notifier.close();
         if($scope.swapOrder.toVal=='' || $scope.swapOrder.fromVal == '') return false;
         var errors = {
             priceNotLoaded: 0,
@@ -150,7 +150,7 @@ var swapCtrl = function($scope, $sce, walletService) {
                             orderResult.progress.status = "RCVE";
                             orderResult.progress.bar = getProgressBarArr(3, 5);
                         } else if (orderResult.progress.status == "RCVE" && bity.validStatus.indexOf(data.output.status) != -1) {
-                            
+
                             orderResult.progress.status = "FILL";
                             orderResult.progress.bar = getProgressBarArr(5, 5);
                             orderResult.progress.showTimeRem = false;
@@ -219,4 +219,4 @@ var swapCtrl = function($scope, $sce, walletService) {
         setOrderFromStorage();
     }
 };
-module.exports = swapCtrl;
+module.exports = swapCtrl;
diff --git a/app/scripts/directives/walletDecryptDrtv.html b/app/scripts/directives/walletDecryptDrtv.html
@@ -15,7 +15,7 @@ <h4 translate="decrypt_Access"> Select the format of your private key: </h4>
       <input aria-flowto="aria3" aria-label="mnemonic phrase" type="radio" ng-model="walletType" value="pastemnemonic" />
       <span translate="x_Mnemonic">Mnemonic Phrase</span>
     </label>
-    <label class="radio" style="display: none;">
+    <label class="radio" style="display: none;" id="showMeTheMoney">
       <input aria-flowto="aria4" aria-label="parity phrase" type="radio" ng-model="walletType" value="parityBWallet" />
       <span translate="x_ParityPhrase">Parity Phrase</span>
     </label>