File tree Expand file tree Collapse file tree 2 files changed +7
-14
lines changed
components/challenge-listing/Listing
containers/challenge-listing/Listing Expand file tree Collapse file tree 2 files changed +7
-14
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ import CardPlaceholder from '../placeholders/ChallengeCard';
17
17
import './style.scss' ;
18
18
19
19
// const Filter = challengeUtils.filter;
20
- const LOADING_MESSAGE = 'Loading Challenges' ;
21
20
22
21
function Listing ( {
23
22
activeBucket,
@@ -259,14 +258,7 @@ function Listing({
259
258
loading
260
259
? placeholders
261
260
: ( ! filterState . recommended || activeBucket !== 'openForRegistration' ) && (
262
- < div styleName = "no-results" >
263
- {
264
- needLoad ? LOADING_MESSAGE
265
- : (
266
- `${ NO_LIVE_CHALLENGES_CONFIG [ activeBucket ] } `
267
- )
268
- }
269
- </ div >
261
+ < div styleName = "no-results" > { `${ NO_LIVE_CHALLENGES_CONFIG [ activeBucket ] } ` } </ div >
270
262
)
271
263
}
272
264
</ div >
Original file line number Diff line number Diff line change @@ -66,6 +66,8 @@ export class ListingContainer extends React.Component {
66
66
filter,
67
67
} = this . props ;
68
68
69
+ const { needLoad } = this . state ;
70
+
69
71
markHeaderMenu ( ) ;
70
72
71
73
if ( queryBucket !== activeBucket && _ . includes ( BUCKETS , queryBucket ) ) {
@@ -105,6 +107,10 @@ export class ListingContainer extends React.Component {
105
107
} ) ;
106
108
}
107
109
// }
110
+
111
+ if ( needLoad ) {
112
+ this . setState ( { needLoad : false } ) ;
113
+ }
108
114
}
109
115
110
116
componentDidUpdate ( prevProps ) {
@@ -134,7 +140,6 @@ export class ListingContainer extends React.Component {
134
140
getPastChallenges,
135
141
filterState,
136
142
} = this . props ;
137
- const { needLoad } = this . state ;
138
143
const oldUserId = _ . get ( prevProps , 'auth.user.userId' ) ;
139
144
const userId = _ . get ( this . props , 'auth.user.userId' ) ;
140
145
const handle = _ . get ( auth , 'user.handle' ) ;
@@ -259,10 +264,6 @@ export class ListingContainer extends React.Component {
259
264
}
260
265
if ( filterChanged ( filter , prevProps . filter ) ) {
261
266
this . reloadChallenges ( ) ;
262
- if ( needLoad ) {
263
- // eslint-disable-next-line react/no-did-update-set-state
264
- this . setState ( { needLoad : false } ) ;
265
- }
266
267
}
267
268
setTimeout ( ( ) => {
268
269
selectBucketDone ( ) ;
You can’t perform that action at this time.
0 commit comments