Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

bugfix/tx-generation #2134

Merged
merged 3 commits into from
Nov 2, 2018
Merged

bugfix/tx-generation #2134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da862de
Fixes the display issue when generating a tx
gamalielhere Oct 31, 2018
599b8f4
Update changelog
gamalielhere Oct 31, 2018
d058758
Use existing functions to get gasPrice
gamalielhere Nov 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/offlineTxCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
Expand Down