[ENG-210] ERC-721 Whitelisting; Voting section not showing
#2722
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ieval and enhance user voting token data handling
… improved token retrieval and code clarity
…n linearVotingErc721Address in useEffect
…rieval and improve token data handling
Deploying decent-interface with
|
| Latest commit: |
2c858c9
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://4b4fb0c4.decent-interface.pages.dev |
| Branch Preview URL: | https://eng-210-erc-721-whitelist-no.decent-interface.pages.dev |
Da-Colon
commented
Feb 8, 2025
Comment on lines
+42
to
+45
| governanceContracts: { | ||
| linearVotingErc721Address, | ||
| linearVotingErc721WithHatsWhitelistingAddress, | ||
| }, |
There was a problem hiding this comment.
Main thing was we weren't account for the second type of contract
|
|
||
| const globalContextSafeAddress = safe?.address; | ||
| // Means getting these for any safe, primary use case - calculating user voting weight for freeze voting | ||
| const getUserVotingTokenData = useCallback( |
There was a problem hiding this comment.
extracted out some code for readability into own callback
| }), | ||
| const globalContextSafeAddress = safe?.address; | ||
|
|
||
| const getUserERC721VotingTokens = useCallback( |
There was a problem hiding this comment.
main function is a little easier to follow
Comment on lines
+197
to
+204
| if (_safeAddress && globalContextSafeAddress !== _safeAddress) { | ||
| const userVotingTokenData = await getUserVotingTokenData(_safeAddress); | ||
| if (userVotingTokenData) { | ||
| governanceTokens = userVotingTokenData.governanceTokens; | ||
| votingType = userVotingTokenData.votingType; | ||
| linearVotingAddress = userVotingTokenData.linear721VotingAddress; | ||
| } | ||
| } |
There was a problem hiding this comment.
IF being used outside the context of viewing safe these variables are updated.
Comment on lines
+218
to
232
| const tokenDataPromises = Array.from(userERC721Tokens.entries()).flatMap( | ||
| ([tokenAddress, tokenIdsSet]) => { | ||
| return Array.from(tokenIdsSet).map(async tokenId => { | ||
| let hasVoted = false; | ||
| if (_proposalId !== null) { | ||
| hasVoted = await votingContract.read.hasVoted([ | ||
| _proposalId, | ||
| tokenAddress, | ||
| BigInt(tokenId), | ||
| ]); | ||
| } | ||
| return { tokenAddress, tokenId, hasVoted }; | ||
| }); | ||
| }, | ||
| ); |
There was a problem hiding this comment.
This replaces the nested promises to a flatmap of promises to optimise this section
Comment on lines
-237
to
+277
| if (loadOnMount && linearVotingErc721Address) { | ||
| if (loadOnMount) { | ||
| loadUserERC721VotingTokens(); | ||
| } | ||
| }, [loadUserERC721VotingTokens, loadOnMount, linearVotingErc721Address]); | ||
| }, [loadUserERC721VotingTokens, loadOnMount]); |
There was a problem hiding this comment.
Don't believe we need to hold this one back. if there is no contract it will just set defaults
DarksightKellar
approved these changes
Feb 10, 2025
adamgall
approved these changes
Feb 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close ENG-210
Changes
linearVotingErc721WithHatsWhitelistingAddresscontract address is checked for loading erc721 tokens