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

Merge remote-tracking branch 'origin/develop' into Version-v8.0.0

Browse Source 
* origin/develop:
  Fix connect long URL styling (#8719)
  Add nonce to transaction details (#8716)
This commit is contained in:
Mark Stacey 2020-06-01 19:44:14 -03:00
commit 07dee72efd
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/metamask-ui.spec.js
View File

@ -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()
})

10
ui/app/components/app/permissions-connect-header/index.scss
View File

@ -38,7 +38,15 @@
color: $Grey-500;
}
&__text {
width: 100%;
text-overflow: ellipsis;
overflow: hidden;
/*rtl:ignore*/
direction: rtl;
}
&__subtitle {
margin-top: 4px;
}
}
}

2
ui/app/components/app/permissions-connect-header/permissions-connect-header.component.js
View File

@ -22,7 +22,7 @@ export default class PermissionsConnectHeader extends Component {
return (
<div className="permissions-connect-header__icon">
<IconWithFallBack icon={ icon } name={ iconName } />
<div className="permissions-connect-header__text">{iconName }</div>
<div className="permissions-connect-header__text">{iconName}</div>
</div>
)
}

14
ui/app/components/app/transaction-breakdown/transaction-breakdown.component.js
View File

@ -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 (
<div className={classnames('transaction-breakdown', className)}>
<div className="transaction-breakdown__title">
{ t('transaction') }
</div>
<TransactionBreakdownRow title="Nonce">
{typeof nonce !== 'undefined'
? (
<HexToDecimal
className="transaction-breakdown__value"
value={nonce}
/>
) : null
}
</TransactionBreakdownRow>
<TransactionBreakdownRow title={t('amount')}>
<UserPreferencedCurrencyDisplay
className="transaction-breakdown__value"

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

@ -246,6 +246,7 @@ export default class TransactionListItemDetails extends PureComponent {
</div>
<div className="transaction-list-item-details__cards-container">
<TransactionBreakdown
nonce={transactionGroup.initialTransaction.txParams.nonce}
transaction={transaction}
className="transaction-list-item-details__transaction-breakdown"
/>