@@ -22,9 +22,7 @@ class MixStatus extends React.PureComponent {
2222 </ div >
2323 < div className = 'col-sm-10 mixThreads' >
2424 < div className = 'row no-gutters justify-content-center' >
25- { mixService . getThreadsAndIdle ( ) . map ( ( utxo , i ) => {
26- let content
27- if ( utxo !== undefined ) {
25+ { mixService . getThreads ( ) . map ( ( utxo , i ) => {
2826 const pool = poolsService . findPool ( utxo . poolId )
2927 const poolInfo = pool ? < small > • { pool . nbConfirmed } /{ pool . mixAnonymitySet } peers</ small > : undefined
3028 const message = utils . utxoMessage ( utxo )
@@ -36,32 +34,20 @@ class MixStatus extends React.PureComponent {
3634 const progressVariant = utxo . progressPercent ? undefined : 'info'
3735 const poolProgress = pool ? ( 100 - progressPercent ) * poolsService . computePoolProgress ( pool ) / 100 : undefined
3836
39- content = < div >
40- < div className = 'label'
41- title = { utxo . hash + ':' + utxo . index + ' (' + utxo . account + ') (' + mixService . computeLastActivity ( utxo ) + ')' } > { progressLabel } </ div >
42- < ProgressBar >
43- < ProgressBar animated now = { progressPercent } variant = { progressVariant } key = { 1 }
44- className = { 'progressBarSamourai' + ( utxo . mixStep === 'CONNECTING' ?' connecting' :'' ) } />
45- { poolProgress && < ProgressBar variant = "warning" now = { poolProgress } key = { 2 } /> }
46- </ ProgressBar >
47- </ div >
48- } else {
49- content = < div >
50- < div className = 'label' >
51- < strong > THREAD { ( i + 1 ) } </ strong > < br />
52- < small > idle</ small >
53- </ div >
54- < ProgressBar animated now = { 0 } className = { 'progressBarSamourai' } />
55- </ div >
56- }
57- return < div className = 'col-sm-3 align-self-center' key = { i } >
58- < div className = 'row no-gutters' >
59- < div className = 'col-sm-12 item' >
60- { content }
37+ return < div className = 'col-sm-3 align-self-center' key = { i } >
38+ < div className = 'row no-gutters' >
39+ < div className = 'col-sm-12 item' >
40+ < div className = 'label'
41+ title = { utxo . hash + ':' + utxo . index + ' (' + utxo . account + ') (' + mixService . computeLastActivity ( utxo ) + ')' } > { progressLabel } </ div >
42+ < ProgressBar >
43+ < ProgressBar animated now = { progressPercent } variant = { progressVariant } key = { 1 }
44+ className = { 'progressBarSamourai' + ( utxo . mixStep === 'CONNECTING' ? ' connecting' : '' ) } />
45+ { poolProgress != undefined && < ProgressBar variant = "warning" now = { poolProgress } key = { 2 } /> }
46+ </ ProgressBar >
47+ </ div >
6148 </ div >
6249 </ div >
63- </ div >
64- } ) }
50+ } ) }
6551 </ div >
6652 </ div >
6753 < div className = 'col-sm-1 mixStatus align-self-center text-center' >
0 commit comments