Skip to content
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

Mission board #919

Merged
merged 31 commits into from
Sep 14, 2023
Merged

Mission board #919

merged 31 commits into from
Sep 14, 2023

Conversation

datadanne
Copy link
Contributor

@datadanne datadanne commented Sep 7, 2023

Closes RIG-59, RIG-60, RIG-61, RIG-62, RIG-64

fixup w move manifesto to modal
sanderpick
sanderpick previously approved these changes Sep 11, 2023
Copy link
Member

@sanderpick sanderpick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoa, tons of work here! LGTM. @dtbuchholz can you give this a skim as well? lots of additions.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be cleaner to have this as part of the rigs package vs. manual abi?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes definitely. We actually export the generated types from typechain in the rigs package but we can't use them, I don't remember if it is because they are just incompatible with wagmi or if it has something to do with the way they are exported from the rigs package but that would definitely be much nicer

ethereum/contracts/MissionsManager.sol Show resolved Hide resolved
expectedChain={secondaryChain}
isDisabled={["querying", "success"].includes(txnState)}
onClick={() =>
setContributionAcceptedState(contribution.id, true, reason)
Copy link
Contributor

@dtbuchholz dtbuchholz Sep 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should the admin contribution approval process work in this PR? i tried both accepting/rejecting with the admin wallet in the admin UI, and neither worked (accepted value in table is still null). some screenshots:

  • attempting to accept (note: both the reject/accept buttons spin...not a big deal but calling it out in case it helps troubleshoot):
Screenshot 2023-09-11 at 3 07 41 PM
  • error shown after waiting for the approve tx to finalize:
Screenshot 2023-09-11 at 3 08 21 PM
  • and upon refreshing, the second row (the one i tried to approve) is still pending: Screenshot 2023-09-11 at 3 16 53 PM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm yes that should work, I'll take a look

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I forgot to give the admin wallet permission to update the contributions table. hm, maybe I should update the contract & have approvals go through the contract instead, that way we don't have to remember to give it both the admin role and those permissions

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@datadanne
Copy link
Contributor Author

datadanne commented Sep 13, 2023

@dtbuchholz @sanderpick can I get a re-approval on this PR? the reviews got dismissed when dtb pushed a commit. I also added three commits:

  • a tiny bug fix, I noticed today that the 'contributions pending reivew' count was off because of a missing WHERE mission_id = ? clause in the query (4c992c2)
  • I reverted the temp commit that hardcoded the staging deployment for testing purposes (7504bf8)
  • I made a small improvement to the contribution review form so that it doesn't crash the page if the data is incorrectly formatted, thx @dtbuchholz for doing some proper testing 🙌 (d0e0aec)

--

The deployment won't work because this PR needs the mission-related tables/contract defintiions to be part of the rigs package. Lmk how you want to go about deploying this, should I still merge it to staging or do you want to publish a pre-release of the package first @sanderpick?

dtbuchholz
dtbuchholz previously approved these changes Sep 13, 2023
@sanderpick
Copy link
Member

let's merge it to staging and I can work on the deployment of the package / contract / tables

@datadanne
Copy link
Contributor Author

let's merge it to staging and I can work on the deployment of the package / contract / tables

Ah actually I can't haha, it requires all checks to pass. I can add back the temp change that hardcodes the staging dev into env.ts and update the SHIP linear issue with a check to remember to revert that? or can you override the status checks?

image

@sanderpick
Copy link
Member

ah yeah. i can just do the package release now and then you can make the changes here. one sec

Signed-off-by: Sander Pick <sanderpick@gmail.com>
@sanderpick
Copy link
Member

pushed 0.3.3-pre0

@datadanne datadanne merged commit 9a61b91 into staging Sep 14, 2023
6 checks passed
@datadanne datadanne deleted the datadanne/mission-board branch September 14, 2023 10:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants