Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix gas fee in the submitted step of the transaction details activity log #6301

Merged
merged 1 commit into from
Mar 22, 2019
+11 −2
Merged

Fix gas fee in the submitted step of the transaction details activity log #6301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions ui/app/components/app/transaction-activity-log/transaction-activity-log.util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,14 @@ const statusHash = {
* @returns {Array}
*/
export function getActivities (transaction, isFirstTransaction = false) {
const { id, hash, history = [], txReceipt: { status } = {}, type } = transaction
const {
id,
hash,
history = [],
txParams: { gas: paramsGasLimit, gasPrice: paramsGasPrice},
xReceipt: { status } = {},
type,
} = transaction

let cachedGasLimit = '0x0'
let cachedGasPrice = '0x0'
Expand Down Expand Up @@ -88,7 +95,9 @@ export function getActivities (transaction, isFirstTransaction = false) {
if (path in eventPathsHash && op === REPLACE_OP) {
switch (path) {
case STATUS_PATH: {
const gasFee = getHexGasTotal({ gasLimit: cachedGasLimit, gasPrice: cachedGasPrice })
const gasFee = cachedGasLimit === '0x0' && cachedGasPrice === '0x0'
? getHexGasTotal({ gasLimit: paramsGasLimit, gasPrice: paramsGasPrice })
: getHexGasTotal({ gasLimit: cachedGasLimit, gasPrice: cachedGasPrice })

if (value in statusHash) {
let eventKey = statusHash[value]
Expand Down