From 78224601b981829345bf85dc40c0bd3f08fec57b Mon Sep 17 00:00:00 2001
From: ricky <ricky.miller@gmail.com>
Date: Sun, 10 Nov 2019 21:17:00 -0500
Subject: [PATCH] Fix grid-template-columns (#7366)

* Fix grid-template-columns

* Add fullscreen check
---
 ui/app/components/app/transaction-list-item/index.scss   | 2 +-
 .../transaction-list-item.component.js                   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/app/transaction-list-item/index.scss b/ui/app/components/app/transaction-list-item/index.scss
index 54a2e9db3..e0c62199e 100644
--- a/ui/app/components/app/transaction-list-item/index.scss
+++ b/ui/app/components/app/transaction-list-item/index.scss
@@ -13,7 +13,7 @@
     width: 100%;
     padding: 16px 20px;
     display: grid;
-    grid-template-columns: 45px 1fr 1fr 1fr;
+    grid-template-columns: 45px 1fr 1fr 1fr 1fr;
     grid-template-areas:
       "identicon action status estimated-time primary-amount"
       "identicon nonce status estimated-time secondary-amount";
diff --git a/ui/app/components/app/transaction-list-item/transaction-list-item.component.js b/ui/app/components/app/transaction-list-item/transaction-list-item.component.js
index 12350ada6..9ab0105f9 100644
--- a/ui/app/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/app/components/app/transaction-list-item/transaction-list-item.component.js
@@ -12,6 +12,8 @@ import { CONFIRM_TRANSACTION_ROUTE } from '../../../helpers/constants/routes'
 import { UNAPPROVED_STATUS, TOKEN_METHOD_TRANSFER } from '../../../helpers/constants/transactions'
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'
 import { getStatusKey } from '../../../helpers/utils/transactions.util'
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../app/scripts/lib/enums'
+import { getEnvironmentType } from '../../../../../app/scripts/lib/util'
 
 export default class TransactionListItem extends PureComponent {
   static propTypes = {
@@ -196,6 +198,11 @@ export default class TransactionListItem extends PureComponent {
       ? tokenData.params && tokenData.params[0] && tokenData.params[0].value || txParams.to
       : txParams.to
 
+    const isFullScreen = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_FULLSCREEN
+    const showEstimatedTime = transactionTimeFeatureActive &&
+      (transaction.id === firstPendingTransactionId) &&
+      isFullScreen
+
     return (
       <div className="transaction-list-item">
         <div
@@ -228,7 +235,7 @@ export default class TransactionListItem extends PureComponent {
                 : primaryTransaction.err && primaryTransaction.err.message
             )}
           />
-          { transactionTimeFeatureActive && (transaction.id === firstPendingTransactionId)
+          { showEstimatedTime
             ? <TransactionTimeRemaining
               className="transaction-list-item__estimated-time"
               transaction={ primaryTransaction }