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

Transaction cleanup and fix TransactionDetailItem key not unique bug (#18899)

Browse Source 
* TransactionDetailItem: allow empty detailText

* TxDetailItem: fix keys; ensure unique keys
This commit is contained in:
Ariella Vu 2023-05-02 00:42:59 -03:00 committed by GitHub
parent 36092571c6
commit a5d7cf3319
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/components/app/approve-content-card/approve-content-card.js
View File

@ -135,7 +135,7 @@ export default function ApproveContentCard({
className="approve-content-card-container__transaction-details-extra-content" className="approve-content-card-container__transaction-details-extra-content"
> >
<TransactionDetailItem <TransactionDetailItem
key="total-item" key="approve-content-card-min-tx-fee"
detailTitle={t('transactionDetailLayer2GasHeading')} detailTitle={t('transactionDetailLayer2GasHeading')}
detailTotal={ detailTotal={
<UserPreferencedCurrencyDisplay <UserPreferencedCurrencyDisplay

2
ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
View File

@ -53,7 +53,7 @@ const ConfirmLegacyGasDisplay = () => {
if (isMultiLayerFeeNetwork) { if (isMultiLayerFeeNetwork) {
return [ return [
<TransactionDetailItem <TransactionDetailItem
key="total-item" key="legacy-total-item"
detailTitle={t('transactionDetailLayer2GasHeading')} detailTitle={t('transactionDetailLayer2GasHeading')}
detailTotal={ detailTotal={
<UserPreferencedCurrencyDisplay <UserPreferencedCurrencyDisplay

2
ui/components/app/gas-details-item/gas-details-item.js
View File

@ -52,7 +52,7 @@ const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
return ( return (
<TransactionDetailItem <TransactionDetailItem
key="gas-item" key="gas-details-item"
detailTitle={<GasDetailsItemTitle />} detailTitle={<GasDetailsItemTitle />}
detailTitleColor={TextColor.textDefault} detailTitleColor={TextColor.textDefault}
detailText={ detailText={

4
ui/components/app/multilayer-fee-message/multi-layer-fee-message.js
View File

@ -92,7 +92,7 @@ export default function MultilayerFeeMessage({
return ( return (
<div className="multi-layer-fee-message"> <div className="multi-layer-fee-message">
<TransactionDetailItem <TransactionDetailItem
key="total-item-gas-fee" key="multi-layer-fee-message-total-item-gas-fee"
detailTitle={t('layer1Fees')} detailTitle={t('layer1Fees')}
detailTotal={layer1Total} detailTotal={layer1Total}
detailText={useCurrencyRateCheck && feeTotalInFiat} detailText={useCurrencyRateCheck && feeTotalInFiat}
@ -100,7 +100,7 @@ export default function MultilayerFeeMessage({
flexWidthValues={plainStyle} flexWidthValues={plainStyle}
/> />
<TransactionDetailItem <TransactionDetailItem
key="total-item-total" key="multi-layer-fee-message-total-item-total"
detailTitle={t('total')} detailTitle={t('total')}
detailTotal={totalInEth} detailTotal={totalInEth}
detailText={totalInFiat} detailText={totalInFiat}

2
ui/components/app/transaction-detail-item/transaction-detail-item.component.js
View File

@ -15,7 +15,7 @@ import {
export default function TransactionDetailItem({ export default function TransactionDetailItem({
detailTitle = '', detailTitle = '',
detailText = '', detailText,
detailTitleColor = Color.textDefault, detailTitleColor = Color.textDefault,
detailTotal = '', detailTotal = '',
subTitle = '', subTitle = '',

2
ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
View File

@ -187,7 +187,7 @@ export default class ConfirmApproveContent extends Component {
{isMultiLayerFeeNetwork ? ( {isMultiLayerFeeNetwork ? (
<div className="confirm-approve-content__transaction-details-extra-content"> <div className="confirm-approve-content__transaction-details-extra-content">
<TransactionDetailItem <TransactionDetailItem
key="total-item" key="confirm-approve-content-min-tx-fee"
detailTitle={t('transactionDetailLayer2GasHeading')} detailTitle={t('transactionDetailLayer2GasHeading')}
detailTotal={ detailTotal={
<UserPreferencedCurrencyDisplay <UserPreferencedCurrencyDisplay

2
ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
View File

@ -457,7 +457,7 @@ export default class ConfirmTransactionBase extends Component {
), ),
!isMultiLayerFeeNetwork && ( !isMultiLayerFeeNetwork && (
<TransactionDetailItem <TransactionDetailItem
key="total-item" key="confirm-transaction-base-total-item"
detailTitle={t('total')} detailTitle={t('total')}
detailText={useCurrencyRateCheck && renderTotalDetailText()} detailText={useCurrencyRateCheck && renderTotalDetailText()}
detailTotal={renderTotalDetailTotal()} detailTotal={renderTotalDetailTotal()}

2
ui/pages/send/gas-display/gas-display.js
View File

@ -159,7 +159,7 @@ export default function GasDisplay({ gasError }) {
<ConfirmGasDisplay key="gas-display" />, <ConfirmGasDisplay key="gas-display" />,
(gasError || isInsufficientTokenError) && ( (gasError || isInsufficientTokenError) && (
<TransactionDetailItem <TransactionDetailItem
key="total-item" key="gas-display-total-item"
detailTitle={t('total')} detailTitle={t('total')}
detailText={ detailText={
showCurrencyRateCheck && ( showCurrencyRateCheck && (