-
Notifications
You must be signed in to change notification settings - Fork 80
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bounty network integration #1102
Conversation
…me action order for Standard Bounties
…s it applies only to strings
This PR includes a bugfix. In some forms for Generic Schemes, fields can be asking for a number. All user input fields are parsed with A commit included fixes this, by first checking if the field is a string before parsing it with
|
Note: This PR alters the CSS for Generic Schemes, as previous CSS of the new proposal modal window held the sidebar and main content as a single column. This PR uses |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't see the preview app to review the UI
|
||
{ // if Bounties Scheme, create new tab | ||
(schemeName(schemeState, schemeState.address) === "Standard Bounties") && | ||
<Link className={openTabClass} to={`/dao/${daoAvatarAddress}/scheme/${schemeId}/open/`}>Open Bounties</Link> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this url should be less generic and contain something specific to this contract, like /dao/${daoAvatarAddress}/scheme/${schemeId}/openbounties/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated in 7c89ec3
}); | ||
const infoTabClass = classNames({ | ||
[css.info]: true, | ||
[css.active]: this.props.location.pathname.includes("info"), | ||
}); | ||
const openTabClass = classNames({ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
openBountiesTabClass
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated in 7c89ec3
@edsonayllon would be great to get this on, can you address @dkent600 last comments and resolve conflicts with the latest dev? |
Sorry, just saw this. Will get on it |
@EzraWeller this one needs some serious testing before we merge in |
@edsonayllon also check the build, looks like a lint issue and a testing issue related to paths |
I made some quick edits on Github. Am trying to load on my computer to go over it, but the install seems to be failing. What's the recommended version of Node? I've tried Node 10 and 12. Edit: Node 11 seems to work. The Readme needs updating for Docker. It looks like alchemy-server was changed in the docker-compose file. |
Checks are passing. I wasn't able to load the app in |
|
There's no |
So sorry, |
Ok, nevermind. I guess those DAOs of the same name were recently created. I thought I wasn't on the Rinkeby deployment. I found dxDAO by using search. Everything seems to be working as it was. Open Bounties tab routing works and proposals are the same. Might consider adding some filtering options in the All DAOs page, if Alchemy ever reaches that degree of saturation with DAOs. |
@dkent600 @jellegerbrandy i feel good about merging this now! you guys have outstanding reviews |
* Close modals by pressing ESC * Fix styling of submit button on profile page when submitting * Make sure tooltip on redemptions button doesn't cover the button * Create ModalPopup component to bundle common modal stuff Share common modal styles across all modals. All ModalPopups can be closed by pressing esc or clicking on the background All modals have a header, body and optional footer * Fix paths * In create proposal form tab directly from title to description Fixes: #964 * Lint fix * in history, open proposal in new tab on ctrl-click (#1474) * open proposal in new tab with ctrl-click * typo * handle mac command key * show DAO total rep in sidebar (#1473) * Enforce required permissions when adding/editing known Schemes Also move all scheme utilities into a new lib/schemeUtils.ts file * Require NETWORK env var on Heroku and default to rinkeby * Add generic scheme json * Add ens registrar * Preserve ts file formatting * overflow generic scheme fix * init * init * Bounty network integration (#1102) * added preliminary json * added preliminary json * added contract addresses, changed contract name * new react component * update fields mass * revert uint fields * contract name * Update ProposalSummaryStandardBounties.tsx * Finish StandardBounties.json * Update ProposalSummaryStandardBounties.tsx * Update ProposalSummaryStandardBounties.tsx * Conditionally render Bounties tab * Update SchemeContainer.tsx * Begin adding open bounties tab * Prepare component for open bounties * Generate List of Open Bounties * parse markdown bounty details * add Known Scheme entry * update addresses * Update StandardBounties.json * fix open bounties display * fixed CSS for larger form generic schemes and rearranged generic scheme action order for Standard Bounties * Bugfix, forms of type number would return error on trim() function, as it applies only to strings * Update StandardBounties.json * Fix Bounties Navigation Tabs * Fix proposals for Bounties and set ETH as default bounty token * Add tests * Update fields of test * Specified on kind of timestamp for deadline field * Changed unit to Gwei, add conditional for bounties API * Update ProposalSummaryStandardBounties.tsx * Update ProposalSummaryStandardBounties.tsx * Add bounty ID to API, return bounty stage filter * Clarified user input for API compatibility * Return issuer in Bounties API call * Edit typo * Fix error due to typo * fix sent eth amounts * Change details to data, per naming convention * Update SchemeOpenBountyPage.tsx * Lint and isolate ethToSend for Standard Bounties * Update proposal-genericSchemeStandardBounties.ts * Comment out tests * Update Mainnet Address to latest current * As by code review * Lint, Remove JSON decimals for fields, convert relevant fields to Wei avoiding precision errors * Removed log used in testing * added transformation to Bounties JSON scheme * updated statement to ECMA 2016 spec * Updated tests for Bounties * check test for standard bounties * revert test * compilation fixes Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> Co-authored-by: Thomas Spofford <tspoff@gmail.com> Co-authored-by: Tibet Sprague <tibet.sprague@gmail.com> Co-authored-by: Tibet Sprague <tibetsprague@users.noreply.github.com> Co-authored-by: dOrgJelli <jelli@dorg.tech> Co-authored-by: Alex Zak <a@alexzak.me> Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com>
* release-2020-03-11 (#1494) * Close modals by pressing ESC * Fix styling of submit button on profile page when submitting * Make sure tooltip on redemptions button doesn't cover the button * Create ModalPopup component to bundle common modal stuff Share common modal styles across all modals. All ModalPopups can be closed by pressing esc or clicking on the background All modals have a header, body and optional footer * Fix paths * In create proposal form tab directly from title to description Fixes: #964 * Lint fix * in history, open proposal in new tab on ctrl-click (#1474) * open proposal in new tab with ctrl-click * typo * handle mac command key * show DAO total rep in sidebar (#1473) * Enforce required permissions when adding/editing known Schemes Also move all scheme utilities into a new lib/schemeUtils.ts file * Require NETWORK env var on Heroku and default to rinkeby * Add generic scheme json * Add ens registrar * Preserve ts file formatting * overflow generic scheme fix * init * init * Bounty network integration (#1102) * added preliminary json * added preliminary json * added contract addresses, changed contract name * new react component * update fields mass * revert uint fields * contract name * Update ProposalSummaryStandardBounties.tsx * Finish StandardBounties.json * Update ProposalSummaryStandardBounties.tsx * Update ProposalSummaryStandardBounties.tsx * Conditionally render Bounties tab * Update SchemeContainer.tsx * Begin adding open bounties tab * Prepare component for open bounties * Generate List of Open Bounties * parse markdown bounty details * add Known Scheme entry * update addresses * Update StandardBounties.json * fix open bounties display * fixed CSS for larger form generic schemes and rearranged generic scheme action order for Standard Bounties * Bugfix, forms of type number would return error on trim() function, as it applies only to strings * Update StandardBounties.json * Fix Bounties Navigation Tabs * Fix proposals for Bounties and set ETH as default bounty token * Add tests * Update fields of test * Specified on kind of timestamp for deadline field * Changed unit to Gwei, add conditional for bounties API * Update ProposalSummaryStandardBounties.tsx * Update ProposalSummaryStandardBounties.tsx * Add bounty ID to API, return bounty stage filter * Clarified user input for API compatibility * Return issuer in Bounties API call * Edit typo * Fix error due to typo * fix sent eth amounts * Change details to data, per naming convention * Update SchemeOpenBountyPage.tsx * Lint and isolate ethToSend for Standard Bounties * Update proposal-genericSchemeStandardBounties.ts * Comment out tests * Update Mainnet Address to latest current * As by code review * Lint, Remove JSON decimals for fields, convert relevant fields to Wei avoiding precision errors * Removed log used in testing * added transformation to Bounties JSON scheme * updated statement to ECMA 2016 spec * Updated tests for Bounties * check test for standard bounties * revert test * compilation fixes Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> Co-authored-by: Thomas Spofford <tspoff@gmail.com> Co-authored-by: Tibet Sprague <tibet.sprague@gmail.com> Co-authored-by: Tibet Sprague <tibetsprague@users.noreply.github.com> Co-authored-by: dOrgJelli <jelli@dorg.tech> Co-authored-by: Alex Zak <a@alexzak.me> Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> * Revert "release-2020-03-11 (#1494)" This reverts commit d5c9b86. * add EnsPublicResolver address Co-authored-by: Jelle <jellegerbrandy@gmail.com> Co-authored-by: Thomas Spofford <tspoff@gmail.com> Co-authored-by: Tibet Sprague <tibet.sprague@gmail.com> Co-authored-by: Tibet Sprague <tibetsprague@users.noreply.github.com> Co-authored-by: dOrgJelli <jelli@dorg.tech> Co-authored-by: Alex Zak <a@alexzak.me> Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com>
* show only register schemes in pluging manager (#1661) * show only register schemes in pluging manager * remove subscription * Can't vote if didn't have reputation in DAO when proposal was created (#1634) * Can't vote if didn't have reputation in DAO when proposal was created Fixes #1593 Depends on daostack/arc.js#451 * use arc.js 0.2.68 * update package-lock.json * @daostack/arc.js * documentation * fix gh-issue #1655 * Update CHANGELOG.md * fix changelog * add comment * tweaks to comment * fix votingDisabled Co-authored-by: Oren Sokolowsky <oren@daostack.io> Co-authored-by: orenyodfat <orenyodfat@users.noreply.github.com> Co-authored-by: Doug Kent <github@douglaskent.com> * Update subgraph_endpoints.json (#1662) * add console warn if scheme has future activation time (#1669) * Update schemeUtils.ts * lint * xDAI: Remove burner connect , Add Tor.us (#1652) * Update settings.ts xDAI: - Remove burner connect (Not in use) - add Tor.us * Update settings.ts * Update settings.ts * update settings.ts Updated with the xDAI network URL * Update settings.ts * Update settings.ts * Update settings.ts * Update settings.ts * Update settings.ts * Update settings.ts * web3modal v 1.6.3 * spelling * update package-lock.json * add network to torus..option * setting. * lint Co-authored-by: orenyodfat <orenyodfat@users.noreply.github.com> Co-authored-by: Oren Sokolowsky <oren@daostack.io> * temorary workaround for gh issue #1684 (#1691) * add plugin to SchemeRegstrar plugins list (#1688) * breadcrumbs for dao landing page, proposal plugins (#1683) * refactor and fix appearance of New Proposal button (#1681) * Bump version and update changelog (#1694) * bump version, update changelog * edit * remove references to alchemy server * update nodejs version in readme * updating daocreator versionm (#1697) * add help to proposal create description boxes (#1687) * better embedded video UX (#1685) * Fix plugin manage edit "plugin manager" scheme . permission (#1717) * Fix plugin manage edit "plugin manager" scheme . permission * travis Increasing the amount of inotify watchers * comment * remove first docker-compose log alchemy -travis * remove docker log alchemy from travis * cosmetics * fix ensPublicResolver setAddr encoding (#1718) * fix Disqus scoping (#1702) * first try * fix disqusConfig initialization * fix new proposal button (#1713) * show notification on copy to clipboard (#1724) * show notification on copy to clipboard * simplify code * fix edit, don't show new/edit unless known (#1723) * set torus z-index (#1727) * changelog and bump version for 0.10.8 (#1721) * bump version to 0.10.8 * changelog * more stuff added * typo * warn when GenericScheme `value` is > 0 (#1733) * show genericscheme value, in red when > 0 * change wording * blinking warning, and on the card too * handle unknown details * handle DutchX details * update selenium chrome version * embed videos everywhere (#1707) * create ProposalDescription component * add to feed, competitions and submissions * help text for competition+submission description * add orderby (#1740) * fix stake amount GEN label (#1743) * fix layout * remove redundant style * subscribe to redm. changes, tooltip when disabled (#1746) * sosCollective Landing Page (#1714) * customized SoS Collective landing page * comment * fix onboarding URL * load voter profiles in VotersModal (#1730) * load voter profiles in VotersModal * don't getProfile unless needed * default user account when creating CR proposal (#1708) * let current user be default * show current account as placeholder * fix redemption numbers in menu (#1749) * url params for Competitions/Submissions (#1712) * generate url * associate createSubmission modal with url * add EnsPublicResolver address (#1762) * release-2020-03-11 (#1494) * Close modals by pressing ESC * Fix styling of submit button on profile page when submitting * Make sure tooltip on redemptions button doesn't cover the button * Create ModalPopup component to bundle common modal stuff Share common modal styles across all modals. All ModalPopups can be closed by pressing esc or clicking on the background All modals have a header, body and optional footer * Fix paths * In create proposal form tab directly from title to description Fixes: #964 * Lint fix * in history, open proposal in new tab on ctrl-click (#1474) * open proposal in new tab with ctrl-click * typo * handle mac command key * show DAO total rep in sidebar (#1473) * Enforce required permissions when adding/editing known Schemes Also move all scheme utilities into a new lib/schemeUtils.ts file * Require NETWORK env var on Heroku and default to rinkeby * Add generic scheme json * Add ens registrar * Preserve ts file formatting * overflow generic scheme fix * init * init * Bounty network integration (#1102) * added preliminary json * added preliminary json * added contract addresses, changed contract name * new react component * update fields mass * revert uint fields * contract name * Update ProposalSummaryStandardBounties.tsx * Finish StandardBounties.json * Update ProposalSummaryStandardBounties.tsx * Update ProposalSummaryStandardBounties.tsx * Conditionally render Bounties tab * Update SchemeContainer.tsx * Begin adding open bounties tab * Prepare component for open bounties * Generate List of Open Bounties * parse markdown bounty details * add Known Scheme entry * update addresses * Update StandardBounties.json * fix open bounties display * fixed CSS for larger form generic schemes and rearranged generic scheme action order for Standard Bounties * Bugfix, forms of type number would return error on trim() function, as it applies only to strings * Update StandardBounties.json * Fix Bounties Navigation Tabs * Fix proposals for Bounties and set ETH as default bounty token * Add tests * Update fields of test * Specified on kind of timestamp for deadline field * Changed unit to Gwei, add conditional for bounties API * Update ProposalSummaryStandardBounties.tsx * Update ProposalSummaryStandardBounties.tsx * Add bounty ID to API, return bounty stage filter * Clarified user input for API compatibility * Return issuer in Bounties API call * Edit typo * Fix error due to typo * fix sent eth amounts * Change details to data, per naming convention * Update SchemeOpenBountyPage.tsx * Lint and isolate ethToSend for Standard Bounties * Update proposal-genericSchemeStandardBounties.ts * Comment out tests * Update Mainnet Address to latest current * As by code review * Lint, Remove JSON decimals for fields, convert relevant fields to Wei avoiding precision errors * Removed log used in testing * added transformation to Bounties JSON scheme * updated statement to ECMA 2016 spec * Updated tests for Bounties * check test for standard bounties * revert test * compilation fixes Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> Co-authored-by: Thomas Spofford <tspoff@gmail.com> Co-authored-by: Tibet Sprague <tibet.sprague@gmail.com> Co-authored-by: Tibet Sprague <tibetsprague@users.noreply.github.com> Co-authored-by: dOrgJelli <jelli@dorg.tech> Co-authored-by: Alex Zak <a@alexzak.me> Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> * Revert "release-2020-03-11 (#1494)" This reverts commit d5c9b86. * add EnsPublicResolver address Co-authored-by: Jelle <jellegerbrandy@gmail.com> Co-authored-by: Thomas Spofford <tspoff@gmail.com> Co-authored-by: Tibet Sprague <tibet.sprague@gmail.com> Co-authored-by: Tibet Sprague <tibetsprague@users.noreply.github.com> Co-authored-by: dOrgJelli <jelli@dorg.tech> Co-authored-by: Alex Zak <a@alexzak.me> Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> * fix count of days in countdowns (#1764) * fix count of days in countdowns * single version of calculateCountdown * fix All Daos page layout problems (#1761) * fix All Daos page layout problems * cleaner mid-width * clean up sidebar on mobile * fix historic display of voting percentages (#1780) * validateDaoProposalRoute (#1768) * validate is the current DAO's proposal * reference DAO name in message * give dao landing page padding on mobile (#1778) * remove redundant New Proposal button (#1783) * line up votingDisabled text (#1782) * augment mintBurnReputation permission description (#1769) * augment mintBurnReputation permission description * same fix on scheme info * changelog and bump version to 0.10.9 (#1759) * changelog and bump version to 0.10.9 * more changes * updates * added Mint and Burn plugin permission * break out array, and truncate long param values (#1799) * break out array, and truncate long param values * improved readability * more improved readability * more on readability * remove spaces * init * comment * improve sidebar scroll, fix DAOstack icon color (#1793) * close Redemptions menu on Redeem click (#1803) * improve layout of AccountProfile popup (#1772) * add simple message popup (#1704) * added SimpleMessagePopup * convert to redux state * lint * make accessible from utils.ts * lint * fix div styling * ensure init is the same as the rest of the app * removed all cases of dash at end of infinitescroll (#1804) * improve scheme info layout (#1787) * replace redundant copy to clipboards ops with component (#1806) * replace redundant copy to clip ops with component * merge error * page the preboosted proposals (#1755) * page the preboosted proposals * cheap-source-map * fix merge errors * use contract alias for plugin name (#1790) * use contract alias for plugin name * update package-lock * use contract alias for plugin name * update package-lock * rename test * swap EnsPublicResolver and EnsRegistry addresses * cheap-source-map * don't create pretty alias * don't prettify rewarder contract alias * revert tests * bump version, update changelog for 0.10.10 (#1815) * bump version, update changelog * new features * don't split GenericScheme name (#1826) * Add dxswap governance scheme (#1816) * added dxswap scheme * added dxswap scheme * Daocreator xdai support (#1791) * updating daocreator version to support xdai * Change of devtool to 'cheap-source-map' * fix proposal count not updating (#1817) * navigator.webdriver => global.inAlchemyTests (#1814) * Update issue templates * Create config.yml * Update config.yml * Update bug_report.md (#1839) * handle wide GenericScheme calldata (#1857) * truncate call data * back to miniscule * BUIDLHub proposal notifications integration changes (#1843) * BUIDLHub proposal notifications integration changes * Added buidlhub assets * Fixed popup message modal to use hideFooter vs. custom button spec * Fixed linter problems * Changed h2 to inline-block * v0.10.11 changelog (#1874) * bump version (#1877) * fix copy to clipboard for callData array params (#1883) * I added the GEMS token to the list which is needed for i4 (#1821) * fix insufficient GEN error message layout (#1801) * clean up PreTransactionModal on mobile (#1777) * custom landing page for the Venus Project (#1878) * Custom data for Venus Project * make network-specific * instructions in the readme * update readme * more in readme * clean up voting and staking UI (#1872) * fix xDAI issues (#1913) * send to blockscout in address/tx links * RPC URLs * use getArc() * update provider URL * poll for eth changes * changelog, bump version to 12 (#1920) * fix compile errors * lint * remove redundant CSS change * upgraded arc.js, compile succeeds * update package-lock * upgrade test-env to match arc.js * fix broken test * fix bug in custom landing page on ganache * update changelog * edit Alchemy Goods * rename Alchemy goods * further documentation scheme=>plugin changes * test bug fixes * more test fixes * genesisprotocol voteOnBehalf address can be null * list error * remove scss.d files * fix proposal description field errors * use targetedNetwork * remove .ps1 from .gitignore * add *.css.d.ts to .gitignore Co-authored-by: orenyodfat <orenyodfat@users.noreply.github.com> Co-authored-by: Tibet Sprague <tibetsprague@users.noreply.github.com> Co-authored-by: Oren Sokolowsky <oren@daostack.io> Co-authored-by: Theeylon <aviveylon2@gmail.com> Co-authored-by: Cesar Brazon <cesarbrazon10@gmail.com> Co-authored-by: Jelle <jellegerbrandy@gmail.com> Co-authored-by: Thomas Spofford <tspoff@gmail.com> Co-authored-by: Tibet Sprague <tibet.sprague@gmail.com> Co-authored-by: dOrgJelli <jelli@dorg.tech> Co-authored-by: Alex Zak <a@alexzak.me> Co-authored-by: Edson Ayllon <EAYLLON1@GMAIL.COM> Co-authored-by: Edson Ayllon <34966228+edsonayllon@users.noreply.github.com> Co-authored-by: Jordan Ellis <5522128+dOrgJelli@users.noreply.github.com> Co-authored-by: Nico Elzer <contact@nicoelzer.de> Co-authored-by: Michael Coon <mdcoon1@yahoo.com> Co-authored-by: arsena21 <ericarsenault6@gmail.com>
This PR is for the integration of a generic scheme and a corresponding UI for interacting with the bounty networks contract.
This will allow our DAOs to create bounties, accept fulfillers, and pay them out when the work is done.
This is important for the separation of ideation and implementation (allow people to suggest ideas even if they can't implement them) & pseudo escrow funding (only transfer the money after the work is done).