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

Hide activity list retry button for failed swaps transctions (#9513)

Browse Source
This commit is contained in:
Dan J Miller 2020-10-08 11:41:05 -02:30 committed by GitHub
parent 443c280b4a
commit e389ad98af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/components/app/transaction-list-item/transaction-list-item.component.js
View File

@ -19,6 +19,7 @@ import {
FAILED_STATUS, FAILED_STATUS,
DROPPED_STATUS, DROPPED_STATUS,
REJECTED_STATUS, REJECTED_STATUS,
TRANSACTION_CATEGORY_SWAP,
} from '../../../helpers/constants/transactions' } from '../../../helpers/constants/transactions'
import { useShouldShowSpeedUp } from '../../../hooks/useShouldShowSpeedUp' import { useShouldShowSpeedUp } from '../../../hooks/useShouldShowSpeedUp'
import TransactionStatus from '../transaction-status/transaction-status.component' import TransactionStatus from '../transaction-status/transaction-status.component'
@ -56,6 +57,7 @@ export default function TransactionListItem ({ transactionGroup, isEarliestNonce
const isSignatureReq = category === TRANSACTION_CATEGORY_SIGNATURE_REQUEST const isSignatureReq = category === TRANSACTION_CATEGORY_SIGNATURE_REQUEST
const isApproval = category === TRANSACTION_CATEGORY_APPROVAL const isApproval = category === TRANSACTION_CATEGORY_APPROVAL
const isUnapproved = displayedStatusKey === UNAPPROVED_STATUS const isUnapproved = displayedStatusKey === UNAPPROVED_STATUS
const isSwap = category === TRANSACTION_CATEGORY_SWAP
const className = classnames('transaction-list-item', { const className = classnames('transaction-list-item', {
'transaction-list-item--unconfirmed': isPending || [FAILED_STATUS, DROPPED_STATUS, REJECTED_STATUS].includes(displayedStatusKey), 'transaction-list-item--unconfirmed': isPending || [FAILED_STATUS, DROPPED_STATUS, REJECTED_STATUS].includes(displayedStatusKey),
@ -159,7 +161,7 @@ export default function TransactionListItem ({ transactionGroup, isEarliestNonce
senderAddress={senderAddress} senderAddress={senderAddress}
recipientAddress={recipientAddress} recipientAddress={recipientAddress}
onRetry={retryTransaction} onRetry={retryTransaction}
showRetry={status === FAILED_STATUS} showRetry={status === FAILED_STATUS && !isSwap}
showSpeedUp={shouldShowSpeedUp} showSpeedUp={shouldShowSpeedUp}
isEarliestNonce={isEarliestNonce} isEarliestNonce={isEarliestNonce}
onCancel={cancelTransaction} onCancel={cancelTransaction}