Merge pull request #2134 from kvhnuke/bugfix/tx-generation

bugfix/tx-generation
MyEtherWallet · Nov 2, 2018 · a123c0b · a123c0b
2 parents dcc38ac + d058758
commit a123c0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Devop
 
+- Fixes gasPrice when generating offline. [#2134](https://github.com/kvhnuke/etherwallet/pull/2134)
 - Update u2f-api [#2135](https://github.com/kvhnuke/etherwallet/pull/2135)
 
 ### Release v3.24.0

diff --git a/app/scripts/controllers/offlineTxCtrl.js b/app/scripts/controllers/offlineTxCtrl.js
@@ -74,7 +74,7 @@ var offlineTxCtrl = function($scope, $sce, walletService) {
             ajaxReq.getTransactionData($scope.tx.from, function(data) {
                 if (data.error) throw data.msg;
                 data = data.data;
-                $scope.gasPriceDec = ethFuncs.hexToDecimal(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)));
+                $scope.gasPriceDec = $scope.gasPriceDef === "GWEI" ? etherUnits.toGwei(ethFuncs.hexToDecimal(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice))), "wei") : ethFuncs.hexToDecimal(ethFuncs.sanitizeHex(ethFuncs.addTinyMoreToGas(data.gasprice)));
                 $scope.nonceDec = ethFuncs.hexToDecimal(data.nonce);
                 $scope.showWalletInfo = true;
             });