diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fb26369f3..84c603f00a 100644 --- 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 index 2af4d55058..3f6f092dce 100644 --- 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; });