diff --git a/test/e2e/tests/send-edit.spec.js b/test/e2e/tests/send-edit.spec.js index 81772df7b..94000b4a8 100644 --- a/test/e2e/tests/send-edit.spec.js +++ b/test/e2e/tests/send-edit.spec.js @@ -62,7 +62,7 @@ describe('Editing Confirm Transaction', function () { // has correct updated value on the confirm screen the transaction const editedTransactionAmounts = await driver.findElements( - '.transaction-detail-item__row .transaction-detail-item__detail-text .currency-display-component__text', + '.transaction-detail-item__row .transaction-detail-item__detail-values .currency-display-component__text:last-of-type', ); const editedTransactionAmount = editedTransactionAmounts[0]; assert.equal(await editedTransactionAmount.getText(), '0.0008'); diff --git a/ui/components/app/transaction-detail-item/index.scss b/ui/components/app/transaction-detail-item/index.scss index 8d6c1bcd7..45c6e4f9b 100644 --- a/ui/components/app/transaction-detail-item/index.scss +++ b/ui/components/app/transaction-detail-item/index.scss @@ -5,12 +5,15 @@ &__row { display: flex; + justify-content: space-between; grid-gap: 5px; } - &__title { - flex-grow: 1; - word-break: break-word; + &__detail-values { + display: flex; + flex-wrap: wrap; + justify-content: end; + width: 65%; } .info-tooltip { @@ -22,19 +25,6 @@ } } - &__total { - font-weight: bold; - color: $ui-black; - } - - &__subtitle { - flex-grow: 1; - } - - &__subtext { - text-align: end; - } - .currency-display-component { display: inline; } diff --git a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js index 80a3e2fef..9780402ff 100644 --- a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js +++ b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js @@ -23,46 +23,35 @@ export default function TransactionDetailItem({ color={detailTitleColor} fontWeight={FONT_WEIGHT.BOLD} variant={TYPOGRAPHY.H6} - className="transaction-detail-item__title" > {detailTitle} - {detailText && ( +
+ {detailText && ( + + {detailText} + + )} - {detailText} + {detailTotal} - )} - - {detailTotal} - +
{React.isValidElement(subTitle) ? ( -
{subTitle}
+
{subTitle}
) : ( - + {subTitle} )} - + {subText}