m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

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

Browse Source
This commit is contained in:
Dan J Miller 2019-03-22 12:20:25 -02:30 committed by GitHub
parent 468bc96bdf
commit 2b992d2946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/app/components/app/transaction-activity-log/transaction-activity-log.util.js
View File

@ -51,7 +51,14 @@ const statusHash = {
* @returns {Array} * @returns {Array}
*/ */
export function getActivities (transaction, isFirstTransaction = false) { 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 cachedGasLimit = '0x0'
let cachedGasPrice = '0x0' let cachedGasPrice = '0x0'
@ -88,7 +95,9 @@ export function getActivities (transaction, isFirstTransaction = false) {
if (path in eventPathsHash && op === REPLACE_OP) { if (path in eventPathsHash && op === REPLACE_OP) {
switch (path) { switch (path) {
case STATUS_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) { if (value in statusHash) {
let eventKey = statusHash[value] let eventKey = statusHash[value]