Skip to content

Commit ec10b93

Browse files
nutrinaGerald Iakobinyi-Pich
nutrina
and
Gerald Iakobinyi-Pich
authored
New bounty creation flow (#10409)
* New bounty creation flow * Minor fixes: adressing comments from review * Bug fixes: - redirect to new url format from bounty invitation - fix failure loading details page due to invalid JSON in acceptance criteria and ressources - ®emved hardcoded URLs for network icons * Adding forgotten vue template to new_bounty.html in hackathons * Displaying the funding orgs avatar for custom bounties Co-authored-by: Gerald Iakobinyi-Pich <gerald@gitcoin.co>
1 parent 9601f54 commit ec10b93

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5186
-2225
lines changed

‎app/app/fixtures/economy.json‎

Lines changed: 20 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -18939,7 +18939,7 @@
1893918939
"symbol": "ETH",
1894018940
"network": "mainnet",
1894118941
"decimals": 18,
18942-
"priority": 999,
18942+
"priority": 1,
1894318943
"metadata": {},
1894418944
"approved": true
1894518945
}
@@ -21449,21 +21449,6 @@
2144921449
"approved": true
2145021450
}
2145121451
},
21452-
{
21453-
"model": "economy.token",
21454-
"pk": 171,
21455-
"fields": {
21456-
"created_on": "2018-12-26T17:00:13.244Z",
21457-
"modified_on": "2018-12-26T17:00:13.244Z",
21458-
"address": "0x0000000000000000000000000000000000000000",
21459-
"symbol": "ETH",
21460-
"network": "ropsten",
21461-
"decimals": 18,
21462-
"priority": 999,
21463-
"metadata": {},
21464-
"approved": true
21465-
}
21466-
},
2146721452
{
2146821453
"model": "economy.token",
2146921454
"pk": 172,
@@ -21509,21 +21494,6 @@
2150921494
"approved": true
2151021495
}
2151121496
},
21512-
{
21513-
"model": "economy.token",
21514-
"pk": 175,
21515-
"fields": {
21516-
"created_on": "2018-12-26T17:00:13.246Z",
21517-
"modified_on": "2018-12-26T17:00:13.246Z",
21518-
"address": "0x0000000000000000000000000000000000000000",
21519-
"symbol": "ETH",
21520-
"network": "rinkeby",
21521-
"decimals": 18,
21522-
"priority": 999,
21523-
"metadata": {},
21524-
"approved": true
21525-
}
21526-
},
2152721497
{
2152821498
"model": "economy.token",
2152921499
"pk": 176,
@@ -21554,21 +21524,6 @@
2155421524
"approved": true
2155521525
}
2155621526
},
21557-
{
21558-
"model": "economy.token",
21559-
"pk": 178,
21560-
"fields": {
21561-
"created_on": "2018-12-26T17:00:13.249Z",
21562-
"modified_on": "2018-12-26T17:00:13.249Z",
21563-
"address": "0x0000000000000000000000000000000000000000",
21564-
"symbol": "ETH",
21565-
"network": "custom",
21566-
"decimals": 18,
21567-
"priority": 999,
21568-
"metadata": {},
21569-
"approved": true
21570-
}
21571-
},
2157221527
{
2157321528
"model": "economy.token",
2157421529
"pk": 179,
@@ -21584,21 +21539,6 @@
2158421539
"approved": true
2158521540
}
2158621541
},
21587-
{
21588-
"model": "economy.token",
21589-
"pk": 180,
21590-
"fields": {
21591-
"created_on": "2018-12-26T17:00:13.251Z",
21592-
"modified_on": "2018-12-26T17:00:13.251Z",
21593-
"address": "0x0000000000000000000000000000000000000000",
21594-
"symbol": "ETH",
21595-
"network": "unknown",
21596-
"decimals": 18,
21597-
"priority": 999,
21598-
"metadata": {},
21599-
"approved": true
21600-
}
21601-
},
2160221542
{
2160321543
"model": "economy.token",
2160421544
"pk": 181,
@@ -21629,21 +21569,6 @@
2162921569
"approved": true
2163021570
}
2163121571
},
21632-
{
21633-
"model": "economy.token",
21634-
"pk": 183,
21635-
"fields": {
21636-
"created_on": "2018-12-26T18:45:52.084Z",
21637-
"modified_on": "2018-12-26T18:45:52.084Z",
21638-
"address": "0x0000000000000000000000000000000000000000",
21639-
"symbol": "ETH",
21640-
"network": "mainnet",
21641-
"decimals": 18,
21642-
"priority": 999,
21643-
"metadata": {},
21644-
"approved": true
21645-
}
21646-
},
2164721572
{
2164821573
"model": "economy.token",
2164921574
"pk": 184,
@@ -24149,21 +24074,6 @@
2414924074
"approved": true
2415024075
}
2415124076
},
24152-
{
24153-
"model": "economy.token",
24154-
"pk": 351,
24155-
"fields": {
24156-
"created_on": "2018-12-26T18:45:52.213Z",
24157-
"modified_on": "2018-12-26T18:45:52.213Z",
24158-
"address": "0x0000000000000000000000000000000000000000",
24159-
"symbol": "ETH",
24160-
"network": "ropsten",
24161-
"decimals": 18,
24162-
"priority": 999,
24163-
"metadata": {},
24164-
"approved": true
24165-
}
24166-
},
2416724077
{
2416824078
"model": "economy.token",
2416924079
"pk": 352,
@@ -24209,21 +24119,6 @@
2420924119
"approved": true
2421024120
}
2421124121
},
24212-
{
24213-
"model": "economy.token",
24214-
"pk": 355,
24215-
"fields": {
24216-
"created_on": "2018-12-26T18:45:52.216Z",
24217-
"modified_on": "2018-12-26T18:45:52.216Z",
24218-
"address": "0x0000000000000000000000000000000000000000",
24219-
"symbol": "ETH",
24220-
"network": "rinkeby",
24221-
"decimals": 18,
24222-
"priority": 999,
24223-
"metadata": {},
24224-
"approved": true
24225-
}
24226-
},
2422724122
{
2422824123
"model": "economy.token",
2422924124
"pk": 356,
@@ -24254,21 +24149,6 @@
2425424149
"approved": true
2425524150
}
2425624151
},
24257-
{
24258-
"model": "economy.token",
24259-
"pk": 358,
24260-
"fields": {
24261-
"created_on": "2018-12-26T18:45:52.217Z",
24262-
"modified_on": "2018-12-26T18:45:52.217Z",
24263-
"address": "0x0000000000000000000000000000000000000000",
24264-
"symbol": "ETH",
24265-
"network": "custom",
24266-
"decimals": 18,
24267-
"priority": 999,
24268-
"metadata": {},
24269-
"approved": true
24270-
}
24271-
},
2427224152
{
2427324153
"model": "economy.token",
2427424154
"pk": 359,
@@ -24284,21 +24164,6 @@
2428424164
"approved": true
2428524165
}
2428624166
},
24287-
{
24288-
"model": "economy.token",
24289-
"pk": 360,
24290-
"fields": {
24291-
"created_on": "2018-12-26T18:45:52.219Z",
24292-
"modified_on": "2018-12-26T18:45:52.219Z",
24293-
"address": "0x0000000000000000000000000000000000000000",
24294-
"symbol": "ETH",
24295-
"network": "unknown",
24296-
"decimals": 18,
24297-
"priority": 999,
24298-
"metadata": {},
24299-
"approved": true
24300-
}
24301-
},
2430224167
{
2430324168
"model": "economy.token",
2430424169
"pk": 361,
@@ -24525,5 +24390,24 @@
2452524390
"conversion_rate_id": "harmony",
2452624391
"conversion_rate_source": "coingecko"
2452724392
}
24393+
},
24394+
{
24395+
"model": "economy.token",
24396+
"pk": 374,
24397+
"fields": {
24398+
"created_on": "2022-04-22T12:35:27Z",
24399+
"modified_on": "2022-04-22T12:36:06.267Z",
24400+
"address": "0x0000000000000000000000000000000000000000",
24401+
"symbol": "ETH",
24402+
"network": "testnetrpc",
24403+
"decimals": 18,
24404+
"priority": 1,
24405+
"chain_id": 1,
24406+
"network_id": 1,
24407+
"metadata": {},
24408+
"approved": true,
24409+
"conversion_rate_id": null,
24410+
"conversion_rate_source": null
24411+
}
2452824412
}
2452924413
]

‎app/app/urls.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,9 @@
443443
),
444444

445445
# View Bounty
446+
# TODO: The 2 URLs below issue_details_new2 and issue_details_new3 will not be used any more (we should not create such
447+
# links any more), and can be removed in the future. We are keeping these for now to avoid breaking the
448+
# existing links that users might have saved already.
446449
url(
447450
r'^issue/(?P<ghuser>.*)/(?P<ghrepo>.*)/(?P<ghissue>.*)/(?P<stdbounties_id>.*)',
448451
dashboard.views.bounty_details,
@@ -454,6 +457,7 @@
454457
name='issue_details_new2'
455458
),
456459
re_path(r'^funding/details/?', dashboard.views.bounty_details, name='funding_details'),
460+
re_path(r'^issue/(?P<bounty_id>\d+)', dashboard.views.bounty_details, name='issue_details_new4'),
457461
re_path(r'^issue/(?P<invitecode>.*)', dashboard.views.bounty_invite_url, name='unique_bounty_invite'),
458462

459463
# Tips
@@ -513,6 +517,7 @@
513517
url(r'^sync/web3/?', dashboard.views.sync_web3, name='sync_web3'),
514518
url(r'^sync/get_amount/?', dashboard.helpers.amount, name='helpers_amount'),
515519
re_path(r'^sync/get_issue_details/?', dashboard.helpers.issue_details, name='helpers_issue_details'),
520+
re_path(r'^sync/validate_org_url/?', dashboard.helpers.validate_org_url, name='helpers_validate_org_url'),
516521

517522
# modals
518523
re_path(r'^modal/get_quickstart_video/?', dashboard.views.get_quickstart_video, name='get_quickstart_video'),

‎app/assets/v2/js/data-chains.js‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,24 @@ var dataChains =
14491449
"shortName": "hmy-b-s3",
14501450
"chainId": 1666700003,
14511451
"networkId": 1666700003
1452-
}
1452+
},
1453+
{ // Creating a testnet entry, with the ID 1111111111, such that it is possible to use testnet when running integration tests for payments
1454+
"name": "Ethereum Testnet RPC",
1455+
"chainId": 1111111111,
1456+
"shortName": "rpc",
1457+
"chain": "ETH",
1458+
"network": "testnetrpc",
1459+
"networkId": 1111111111,
1460+
"nativeCurrency": {
1461+
"name": "Testnet Ether",
1462+
"symbol": "ETH",
1463+
"decimals": 18
1464+
},
1465+
"rpc": [
1466+
],
1467+
"faucets": [
1468+
],
1469+
},
14531470
];
14541471

14551472
function searchDataChains(name, obj) {

‎app/assets/v2/js/grants/form_wrapper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Vue.component('form-wrapper', {
1010
'total-steps': {
1111
type: Number, required: true
1212
},
13-
disableConfirm: {
13+
'disable-confirm': {
1414
type: Boolean,
1515
'default': false
1616
},

‎app/assets/v2/js/pages/bounty_details.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -333,19 +333,6 @@ var callbacks = {
333333
);
334334

335335
}
336-
337-
$('#value_in_usdt').html(Math.round(totalUSDValue));
338-
339-
$('#value_in_usdt_wrapper').attr('title',
340-
'<div class="tooltip-info tooltip-sm">' +
341-
'<p class="text-highlight-gc-purple">How did we calculate this?</p>' +
342-
'<div style="float:left; text-align:left;">' +
343-
leftHtml +
344-
'</div><div style="margin-left: .5rem; float:right; text-align:left;">' +
345-
rightHtml +
346-
'</div></div>'
347-
);
348-
349336
return [ key, val ];
350337
},
351338
'token_value_time_peg': function(key, val, result) {

0 commit comments

Comments
 (0)