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

* origin/develop: Fix connect long URL styling (#8719) Add nonce to transaction details (#8716)
MetaMask · Jun 1, 2020 · 07dee72 · 07dee72
2 parents f3d64a1 + 8afb295
commit 07dee72
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git 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
@@ -38,7 +38,15 @@
     color: $Grey-500;
   }
 
+  &__text {
+    width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    /*rtl:ignore*/
+    direction: rtl;
+  }
+
   &__subtitle {
     margin-top: 4px;
   }
-}
+}
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
@@ -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>
     )
   }

diff --git 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 (
       <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"

diff --git a/...p/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/...p/components/app/transaction-list-item-details/transaction-list-item-details.component.js
@@ -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"
               />