Skip to content

Commit 206fa94

Browse files
birdofpreyrubirdofpreyru
committed
Merge branch 'develop'
2 parents 50473f3 + 15251bf commit 206fa94

File tree

10 files changed

+70
-5
lines changed

10 files changed

+70
-5
lines changed

‎.exchange-rates.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1507723200,"base":"USD","rates":{"AED":3.673158,"AFN":68.232,"ALL":113.02,"AMD":480.26149,"ANG":1.785421,"AOA":165.9215,"ARS":17.4055,"AUD":1.28373,"AWG":1.789995,"AZN":1.7,"BAM":1.654745,"BBD":2,"BDT":82.599323,"BGN":1.654049,"BHD":0.377243,"BIF":1753.5,"BMD":1,"BND":1.356769,"BOB":6.911671,"BRL":3.178293,"BSD":1,"BTC":0.000208274846,"BTN":65.263593,"BWP":10.322628,"BYN":1.969348,"BZD":2.016202,"CAD":1.25108,"CDF":1566.440781,"CHF":0.97434,"CLF":0.02329,"CLP":627.53,"CNH":6.58275,"CNY":6.5909,"COP":2957.7,"CRC":574.855762,"CUC":1,"CUP":25.5,"CVE":93.65,"CZK":21.8771,"DJF":178.77,"DKK":6.292281,"DOP":47.45197,"DZD":113.4595,"EGP":17.6118,"ERN":15.340336,"ETB":23.541937,"EUR":0.845382,"FJD":2.039998,"FKP":0.758174,"GBP":0.758174,"GEL":2.4791,"GGP":0.758174,"GHS":4.394843,"GIP":0.758174,"GMD":46.075,"GNF":8940.35,"GTQ":7.347343,"GYD":207.833351,"HKD":7.80585,"HNL":23.421667,"HRK":6.347,"HTG":62.789,"HUF":261.87,"IDR":13512.770504,"ILS":3.4973,"IMP":0.758174,"INR":65.145,"IQD":1167.3,"IRR":33637.5,"ISK":104.549272,"JEP":0.758174,"JMD":128.463141,"JOD":0.709001,"JPY":112.2282,"KES":103.334508,"KGS":68.380649,"KHR":4041,"KMF":416.9,"KPW":900,"KRW":1132.80625,"KWD":0.30198,"KYD":0.833581,"KZT":335.179792,"LAK":8295.9,"LBP":1508.55,"LKR":153.548466,"LRD":118.1,"LSL":13.667598,"LYD":1.369592,"MAD":9.4085,"MDL":17.543951,"MGA":3058.3,"MKD":52.062743,"MMK":1367.21006,"MNT":2455.744584,"MOP":8.041808,"MRO":365.06815,"MUR":34.0295,"MVR":15.400126,"MWK":726.11,"MXN":18.7269,"MYR":4.2186,"MZN":61.275,"NAD":13.56625,"NGN":359.852233,"NIO":30.325153,"NOK":7.931143,"NPR":104.282226,"NZD":1.413685,"OMR":0.384951,"PAB":1,"PEN":3.264246,"PGK":3.1953,"PHP":51.4495,"PKR":105.172108,"PLN":3.62245,"PYG":5642,"QAR":3.729989,"RON":3.876588,"RSD":101.017082,"RUB":57.81,"RWF":834.095,"SAR":3.75065,"SBD":7.824323,"SCR":13.75684,"SDG":6.678506,"SEK":8.057958,"SGD":1.3563,"SHP":0.758174,"SLL":7652.388383,"SOS":578.528398,"SRD":7.448,"SSP":128.8751,"STD":20773.407268,"SVC":8.752214,"SYP":514.96999,"SZL":13.673284,"THB":33.189,"TJS":8.797402,"TMT":3.50998,"TND":2.46919,"TOP":2.225338,"TRY":3.658465,"TTD":6.727159,"TWD":30.251308,"TZS":2244.8,"UAH":26.524334,"UGX":3630.95,"USD":1,"UYU":29.24392,"UZS":8030.45,"VEF":10.221245,"VND":22720.143686,"VUV":105.447306,"WST":2.513433,"XAF":554.534496,"XAG":0.05825833,"XAU":0.00077496,"XCD":2.70255,"XDR":0.708152,"XOF":554.534496,"XPD":0.00106673,"XPF":100.880953,"XPT":0.00107601,"YER":250.35,"ZAR":13.573368,"ZMW":9.62727,"ZWL":322.355011}}
1+
{"disclaimer":"Usage subject to terms: https://openexchangerates.org/terms","license":"https://openexchangerates.org/license","timestamp":1507798800,"base":"USD","rates":{"AED":3.672896,"AFN":67.974,"ALL":113,"AMD":478.925,"ANG":1.77865,"AOA":165.9215,"ARS":17.4045,"AUD":1.277432,"AWG":1.790501,"AZN":1.69,"BAM":1.648856,"BBD":2,"BDT":82.288,"BGN":1.64876,"BHD":0.377213,"BIF":1746.8,"BMD":1,"BND":1.355356,"BOB":6.885986,"BRL":3.171391,"BSD":1,"BTC":0.000195885465,"BTN":65.230321,"BWP":10.283758,"BYN":1.961895,"BZD":2.008642,"CAD":1.245347,"CDF":1562.881563,"CHF":0.973707,"CLF":0.02324,"CLP":626.965409,"CNH":6.583036,"CNY":6.585567,"COP":2953.31,"CRC":572.515,"CUC":1,"CUP":25.5,"CVE":93.375,"CZK":21.81801,"DJF":178.97,"DKK":6.275117,"DOP":47.278488,"DZD":113.454,"EGP":17.622,"ERN":15.333158,"ETB":23.45091,"EUR":0.842994,"FJD":2.051354,"FKP":0.75579,"GBP":0.75579,"GEL":2.478108,"GGP":0.75579,"GHS":4.395,"GIP":0.75579,"GMD":46.275,"GNF":8906.35,"GTQ":7.319909,"GYD":207.06,"HKD":7.80686,"HNL":23.331869,"HRK":6.330489,"HTG":63.080843,"HUF":260.717,"IDR":13502.802788,"ILS":3.4853,"IMP":0.75579,"INR":65.075,"IQD":1162.95,"IRR":33654.5,"ISK":104.74,"JEP":0.75579,"JMD":127.971482,"JOD":0.709001,"JPY":112.27,"KES":103.25,"KGS":68.399709,"KHR":4025.7,"KMF":415.25,"KPW":900,"KRW":1132.55,"KWD":0.301803,"KYD":0.830511,"KZT":333.96,"LAK":8315,"LBP":1502.9,"LKR":152.952819,"LRD":118.010556,"LSL":13.517836,"LYD":1.364414,"MAD":9.3903,"MDL":17.424728,"MGA":3046.65,"MKD":51.91,"MMK":1359.15,"MNT":2457.447826,"MOP":8.011891,"MRO":363.721657,"MUR":34.0005,"MVR":15.400126,"MWK":724.675734,"MXN":18.702241,"MYR":4.2195,"MZN":60.994761,"NAD":13.517351,"NGN":358.75,"NIO":30.207843,"NOK":7.9106,"NPR":103.905516,"NZD":1.404011,"OMR":0.385005,"PAB":1,"PEN":3.25875,"PGK":3.183202,"PHP":51.39,"PKR":104.782432,"PLN":3.600585,"PYG":5620.55,"QAR":3.729989,"RON":3.868701,"RSD":100.609575,"RUB":57.665,"RWF":830.479566,"SAR":3.750196,"SBD":7.810521,"SCR":13.541191,"SDG":6.653117,"SEK":8.092327,"SGD":1.353802,"SHP":0.75579,"SLL":7635.994028,"SOS":576.39,"SRD":7.448,"SSP":129.0194,"STD":20701.93181,"SVC":8.719665,"SYP":514.99499,"SZL":13.528287,"THB":33.105,"TJS":8.764406,"TMT":3.499986,"TND":2.463097,"TOP":2.247061,"TRY":3.637455,"TTD":6.70213,"TWD":30.197,"TZS":2245,"UAH":26.423235,"UGX":3617.4,"USD":1,"UYU":29.175341,"UZS":8032.8,"VEF":10.146563,"VND":22709.292617,"VUV":105.278798,"WST":2.531559,"XAF":552.967845,"XAG":0.05802155,"XAU":0.00077159,"XCD":2.70255,"XDR":0.707444,"XOF":552.967845,"XPD":0.0010379,"XPF":100.595948,"XPT":0.00106726,"YER":250.306642,"ZAR":13.460823,"ZMW":9.591214,"ZWL":322.355011}}

‎__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
3232
"technologies": "Data Science",
3333
"totalPrize": 1800,
3434
"track": "DEVELOP",
35+
"users": Object {},
3536
}
3637
}
3738
newChallengeDetails={false}
3839
onTechTagClicked={[Function]}
3940
openChallengesInNewTabs={false}
4041
prizeMode="money-usd"
4142
sampleWinnerProfile={undefined}
43+
userHandle=""
4244
/>
4345
`;
4446

@@ -64,13 +66,15 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
6466
"technologies": "Go",
6567
"totalPrize": 1800,
6668
"track": "DATA_SCIENCE",
69+
"users": Object {},
6770
}
6871
}
6972
newChallengeDetails={false}
7073
onTechTagClicked={[Function]}
7174
openChallengesInNewTabs={false}
7275
prizeMode="money-usd"
7376
sampleWinnerProfile={undefined}
77+
userHandle=""
7478
/>
7579
`;
7680

@@ -96,12 +100,14 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
96100
"technologies": "",
97101
"totalPrize": 1800,
98102
"track": "DATA_SCIENCE",
103+
"users": Object {},
99104
}
100105
}
101106
newChallengeDetails={false}
102107
onTechTagClicked={[Function]}
103108
openChallengesInNewTabs={false}
104109
prizeMode="money-usd"
105110
sampleWinnerProfile={undefined}
111+
userHandle=""
106112
/>
107113
`;

‎__tests__/shared/components/challenge-listing/ChallengeCard/index.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const mockData1 = {
3131
subTrack: 'CODE',
3232
events: [{ eventName: 'Submit' }],
3333
status: 'ACTIVE',
34+
users: {},
3435
},
3536
};
3637

@@ -47,6 +48,7 @@ const mockData2 = {
4748
subTrack: 'CODE',
4849
id: '1',
4950
totalPrize: 1800,
51+
users: {},
5052
},
5153
};
5254

@@ -63,6 +65,7 @@ const mockData3 = {
6365
subTrack: 'CODE',
6466
id: 'long id',
6567
totalPrize: 1800,
68+
users: {},
6669
},
6770
};
6871

@@ -79,6 +82,7 @@ const mockData4 = {
7982
subTrack: 'CODE',
8083
id: 'long id',
8184
totalPrize: 1800,
85+
users: {},
8286
},
8387
};
8488

@@ -95,6 +99,7 @@ const mockData5 = {
9599
subTrack: 'CODE',
96100
id: 'long id',
97101
totalPrize: 1800,
102+
users: {},
98103
},
99104
};
100105

‎__tests__/shared/components/challenge-listing/Listing/Bucket.jsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const mockDatas = [{
3030
status: 'b',
3131
prizes: [1200, 600],
3232
totalPrize: 1800,
33+
users: {},
3334
},
3435
{
3536
id: '2',
@@ -45,6 +46,7 @@ const mockDatas = [{
4546
events: [{ eventName: 'Submit' }],
4647
prizes: [1200, 600],
4748
totalPrize: 1800,
49+
users: {},
4850
}],
4951
loading: false,
5052
loadMore,
@@ -66,66 +68,77 @@ const mockDatas = [{
6668
status: 'b',
6769
prizes: [1200, 600],
6870
totalPrize: 1800,
71+
users: {},
6972
},
7073
{
7174
id: '2',
7275
status: 'a',
7376
prizes: [1200, 600],
7477
totalPrize: 1800,
78+
users: {},
7579
},
7680
{
7781
id: '3',
7882
status: 'a',
7983
prizes: [1200, 600],
8084
totalPrize: 1800,
85+
users: {},
8186
},
8287
{
8388
id: '4',
8489
status: 'a',
8590
prizes: [1200, 600],
8691
totalPrize: 1800,
92+
users: {},
8793
},
8894
{
8995
id: '5',
9096
status: 'a',
9197
prizes: [1200, 600],
9298
totalPrize: 1800,
99+
users: {},
93100
},
94101
{
95102
id: '6',
96103
status: 'a',
97104
prizes: [1200, 600],
98105
totalPrize: 1800,
106+
users: {},
99107
},
100108
{
101109
id: '7',
102110
status: 'a',
103111
prizes: [1200, 600],
104112
totalPrize: 1800,
113+
users: {},
105114
},
106115
{
107116
id: '8',
108117
status: 'a',
109118
prizes: [1200, 600],
110119
totalPrize: 1800,
120+
users: {},
111121
},
112122
{
113123
id: '9',
114124
status: 'a',
115125
prizes: [1200, 600],
116126
totalPrize: 1800,
127+
users: {},
117128
},
118129
{
119130
id: '10',
120131
status: 'a',
121132
prizes: [1200, 600],
122133
totalPrize: 1800,
134+
users: {},
123135
},
124136
{
125137
id: '11',
126138
status: 'a',
127139
prizes: [1200, 600],
128140
totalPrize: 1800,
141+
users: {},
129142
},
130143
],
131144
loading: true,

‎__tests__/shared/components/challenge-listing/Listing/__snapshots__/Bucket.jsx.snap

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ exports[`Matches shallow shapshot 1`] = `
2222
],
2323
"status": "b",
2424
"totalPrize": 1800,
25+
"users": Object {},
2526
},
2627
Object {
2728
"allPhases": Array [
@@ -53,6 +54,7 @@ exports[`Matches shallow shapshot 1`] = `
5354
"technologies": "a, b, c",
5455
"totalPrize": 1800,
5556
"track": "DEVELOP",
57+
"users": Object {},
5658
},
5759
]
5860
}
@@ -67,6 +69,7 @@ exports[`Matches shallow shapshot 1`] = `
6769
setFilterState={[Function]}
6870
setSort={[Function]}
6971
sort=""
72+
userHandle=""
7073
/>
7174
`;
7275

@@ -92,6 +95,7 @@ exports[`Matches shallow shapshot 2`] = `
9295
],
9396
"status": "b",
9497
"totalPrize": 1800,
98+
"users": Object {},
9599
},
96100
Object {
97101
"id": "2",
@@ -101,6 +105,7 @@ exports[`Matches shallow shapshot 2`] = `
101105
],
102106
"status": "a",
103107
"totalPrize": 1800,
108+
"users": Object {},
104109
},
105110
Object {
106111
"id": "3",
@@ -110,6 +115,7 @@ exports[`Matches shallow shapshot 2`] = `
110115
],
111116
"status": "a",
112117
"totalPrize": 1800,
118+
"users": Object {},
113119
},
114120
Object {
115121
"id": "4",
@@ -119,6 +125,7 @@ exports[`Matches shallow shapshot 2`] = `
119125
],
120126
"status": "a",
121127
"totalPrize": 1800,
128+
"users": Object {},
122129
},
123130
Object {
124131
"id": "5",
@@ -128,6 +135,7 @@ exports[`Matches shallow shapshot 2`] = `
128135
],
129136
"status": "a",
130137
"totalPrize": 1800,
138+
"users": Object {},
131139
},
132140
Object {
133141
"id": "6",
@@ -137,6 +145,7 @@ exports[`Matches shallow shapshot 2`] = `
137145
],
138146
"status": "a",
139147
"totalPrize": 1800,
148+
"users": Object {},
140149
},
141150
Object {
142151
"id": "7",
@@ -146,6 +155,7 @@ exports[`Matches shallow shapshot 2`] = `
146155
],
147156
"status": "a",
148157
"totalPrize": 1800,
158+
"users": Object {},
149159
},
150160
Object {
151161
"id": "8",
@@ -155,6 +165,7 @@ exports[`Matches shallow shapshot 2`] = `
155165
],
156166
"status": "a",
157167
"totalPrize": 1800,
168+
"users": Object {},
158169
},
159170
Object {
160171
"id": "9",
@@ -164,6 +175,7 @@ exports[`Matches shallow shapshot 2`] = `
164175
],
165176
"status": "a",
166177
"totalPrize": 1800,
178+
"users": Object {},
167179
},
168180
Object {
169181
"id": "10",
@@ -173,6 +185,7 @@ exports[`Matches shallow shapshot 2`] = `
173185
],
174186
"status": "a",
175187
"totalPrize": 1800,
188+
"users": Object {},
176189
},
177190
Object {
178191
"id": "11",
@@ -182,6 +195,7 @@ exports[`Matches shallow shapshot 2`] = `
182195
],
183196
"status": "a",
184197
"totalPrize": 1800,
198+
"users": Object {},
185199
},
186200
]
187201
}
@@ -196,6 +210,7 @@ exports[`Matches shallow shapshot 2`] = `
196210
setFilterState={[Function]}
197211
setSort={[Function]}
198212
sort=""
213+
userHandle=""
199214
/>
200215
`;
201216

@@ -223,5 +238,6 @@ exports[`Matches shallow shapshot 3`] = `
223238
setFilterState={[Function]}
224239
setSort={[Function]}
225240
sort=""
241+
userHandle=""
226242
/>
227243
`;

‎__tests__/shared/components/challenge-listing/Listing/__snapshots__/index.jsx.snap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ exports[`Matches shallow shapshot 1`] = `
2424
setFilterState={[Function]}
2525
setSort={[Function]}
2626
sort={null}
27+
userHandle="handle"
2728
/>
2829
<Bucket
2930
bucket={Object {}}
@@ -45,6 +46,7 @@ exports[`Matches shallow shapshot 1`] = `
4546
setFilterState={[Function]}
4647
setSort={[Function]}
4748
sort={null}
49+
userHandle="handle"
4850
/>
4951
<Bucket
5052
bucket={Object {}}
@@ -66,6 +68,7 @@ exports[`Matches shallow shapshot 1`] = `
6668
setFilterState={[Function]}
6769
setSort={[Function]}
6870
sort={null}
71+
userHandle="handle"
6972
/>
7073
<Bucket
7174
bucket={Object {}}
@@ -87,6 +90,7 @@ exports[`Matches shallow shapshot 1`] = `
8790
setFilterState={[Function]}
8891
setSort={[Function]}
8992
sort={null}
93+
userHandle="handle"
9094
/>
9195
</div>
9296
`;
@@ -115,6 +119,7 @@ exports[`Matches shallow shapshot 2`] = `
115119
setFilterState={[Function]}
116120
setSort={[Function]}
117121
sort={null}
122+
userHandle="handle"
118123
/>
119124
</div>
120125
`;
@@ -143,6 +148,7 @@ exports[`Matches shallow shapshot 3`] = `
143148
setFilterState={[Function]}
144149
setSort={[Function]}
145150
sort={null}
151+
userHandle="handle"
146152
/>
147153
</div>
148154
`;
@@ -171,6 +177,7 @@ exports[`Matches shallow shapshot 4`] = `
171177
setFilterState={[Function]}
172178
setSort={[Function]}
173179
sort={null}
180+
userHandle=""
174181
/>
175182
<Bucket
176183
bucket={Object {}}
@@ -192,6 +199,7 @@ exports[`Matches shallow shapshot 4`] = `
192199
setFilterState={[Function]}
193200
setSort={[Function]}
194201
sort={null}
202+
userHandle=""
195203
/>
196204
<Bucket
197205
bucket={Object {}}
@@ -213,6 +221,7 @@ exports[`Matches shallow shapshot 4`] = `
213221
setFilterState={[Function]}
214222
setSort={[Function]}
215223
sort={null}
224+
userHandle=""
216225
/>
217226
</div>
218227
`;
@@ -241,6 +250,7 @@ exports[`Matches shallow shapshot 5`] = `
241250
setFilterState={[Function]}
242251
setSort={[Function]}
243252
sort={null}
253+
userHandle=""
244254
/>
245255
</div>
246256
`;

0 commit comments

Comments
 (0)