Remove duplicated clocks on active tx row

poanetwork · Nov 2, 2018 · 47bf4ce · 47bf4ce
1 parent d376523
commit 47bf4ce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/components/Common/TxProgressStatus.js b/src/components/Common/TxProgressStatus.js
@@ -19,7 +19,7 @@ export class TxProgressStatus extends Component {
     const table = []
 
     txMap.forEach((status, name) => {
-      table.push({ name, status })
+      table.push({ name, status: status.slice() })
     })
 
     return table
@@ -73,7 +73,7 @@ export class TxProgressStatus extends Component {
   }
 
   getStatusIcon(txStatus, index) {
-    if (this.isTxStatusActive(txStatus)) {
+    if (txStatus[index] && this.isTxStatusActive(txStatus)) {
       return <TxStatusIconClockActive />
     } else if (txStatus[index] && !txStatus[index].mined) {
       return <TxStatusIconClock />
@@ -117,7 +117,7 @@ export class TxProgressStatus extends Component {
 
   render() {
     const { tierStore, extraClassName = '' } = this.props
-    const whitelisted = tierStore.tiers.map((tier, index) => (index === 0 ? true : tier.whitelistEnabled === 'yes'))
+    const whitelisted = tierStore.tiers.map(tier => tier.whitelistEnabled === 'yes')
     const tableContent = this.txStatuses()
 
     return tableContent.length ? (