diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index e5df57820bba..6cb3981cb25b 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -474,7 +474,7 @@ describe('MetaMask', function () { const popoverCloseButton = await driver.findClickableElement(By.css('.popover-header__button')) const txGasPrices = await driver.findElements(By.css('.transaction-breakdown__value')) const txGasPriceLabels = await driver.findElements(By.css('.transaction-breakdown-row__title')) - await driver.wait(until.elementTextMatches(txGasPrices[3], /^10$/), 10000) + await driver.wait(until.elementTextMatches(txGasPrices[4], /^10$/), 10000) assert(txGasPriceLabels[2]) await popoverCloseButton.click() }) diff --git a/ui/app/components/app/permissions-connect-header/index.scss b/ui/app/components/app/permissions-connect-header/index.scss index f57451e78492..591e9a0dc7ca 100644 --- a/ui/app/components/app/permissions-connect-header/index.scss +++ b/ui/app/components/app/permissions-connect-header/index.scss @@ -38,7 +38,15 @@ color: $Grey-500; } + &__text { + width: 100%; + text-overflow: ellipsis; + overflow: hidden; + /*rtl:ignore*/ + direction: rtl; + } + &__subtitle { margin-top: 4px; } -} \ No newline at end of file +} diff --git a/ui/app/components/app/permissions-connect-header/permissions-connect-header.component.js b/ui/app/components/app/permissions-connect-header/permissions-connect-header.component.js index c15c988a6d38..456295536afb 100644 --- a/ui/app/components/app/permissions-connect-header/permissions-connect-header.component.js +++ b/ui/app/components/app/permissions-connect-header/permissions-connect-header.component.js @@ -22,7 +22,7 @@ export default class PermissionsConnectHeader extends Component { return (
-
{iconName }
+
{iconName}
) } diff --git a/ui/app/components/app/transaction-breakdown/transaction-breakdown.component.js b/ui/app/components/app/transaction-breakdown/transaction-breakdown.component.js index 6e610a8337dd..2c3d5e924455 100644 --- a/ui/app/components/app/transaction-breakdown/transaction-breakdown.component.js +++ b/ui/app/components/app/transaction-breakdown/transaction-breakdown.component.js @@ -16,6 +16,7 @@ export default class TransactionBreakdown extends PureComponent { className: PropTypes.string, nativeCurrency: PropTypes.string, showFiat: PropTypes.bool, + nonce: PropTypes.string, gas: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), gasPrice: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), @@ -29,13 +30,22 @@ export default class TransactionBreakdown extends PureComponent { render () { const { t } = this.context - const { gas, gasPrice, value, className, nativeCurrency, showFiat, totalInHex, gasUsed } = this.props - + const { gas, gasPrice, value, className, nonce, nativeCurrency, showFiat, totalInHex, gasUsed } = this.props return (
{ t('transaction') }
+ + {typeof nonce !== 'undefined' + ? ( + + ) : null + } +