feature/guild #2167
Merged
feature/guild #2167
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
* started working on lock tokens modal and added rinkeby omen address * added rough outline for the omen guild membership modal * started working on lock omen token modal * added front-end fixes for lock omen token modal with input and made contents DRY as can be with new display feature i found * small css adjustments * some css to make row gaps * started working on guild service * tidied up omen guild service so it works and added two more functions * made all data display * started adjusting contracts and integrating it into cpk encountered minor block * fixed guild service issue * got lock function working * fixes for the guild service and calculation * added disabled button logic * done with style details excluded grid * added your vote weight percentage change and added unlock function along with changes to ethers sc stuff * cleaned up unused code and abi * added correct date formatting along with one missing abi * added omen icons and fixed couple things * handled cpk bug because of no relay * fixed incorrect unlock calculation for timestamp * added transaction modal and started looking into fixing cpk * fixing transaction state modal issue * added tooltip * started workig on allowance logic * approve button implemented with logic * working in progress * cracked motherfucker * tidied up code and added check to fetch appropriate amounts if on mainnet versus other cases * fixed type issue with transaction steps along with fex minor front-end fixes * added null state for unlock date * correct modal shows after transaction and balances update correctly * fixed all comments * fix for vote weight showing difference on incorrect place * fix Button animation removed * style Added hover styling for modal info icon and cursor * test: Test for formatLockDate function * style: Fixed bucnh of styling issue from Kadens comments * fix: Removed all instances of getting omenTokenAddress directly from SC but made them fetched from knownTokens * refactor: Deleted getOmenGuildContract and moved that logic into the constructor as suggested by Kaden * fix: Fixed unlock tokens so they transfer token to address on xDai,leave it on cpk on tight and regular transfer on mainnet/rinkeby * test: Added daysUntil test Co-authored-by: Thomas Pulber <[email protected]>
* add ModalAirdrop * add airdrop service * refactor airdrop service, deploy rinkeby airdrop, add useAidropService * refetch balances after claim, add airdropAddress to network interface * add xdai aidrop * fix annoying error messages * add check address error message * support multiple independent airdrops * handle proxy as recipient address * only display modal with web3 connection and claimable balance * update styles, handle displayAmount, update airdrop sets * handle race condition, don't display proxy claims on direct xdai * redeploy xdai airdrop * redeploy airdrops * handle undefined transaction arr * fix: merge with feature/guild Co-authored-by: Thomas Pulber <[email protected]> Co-authored-by: Violet <[email protected]>
…en-exchange into feature/airdrop-guild-modal
* feature: add airdrop card to guild modal * fix: style changes, testing airdrop * style: Reduce margin from 32px to 24px for diver and button group * fix: refetch claimable balance * fix: reset check address claim amount * fix: generalized onClose for guild modal * fix: update rinkeby airdrop Co-authored-by: Thomas Pulber <[email protected]>
* feature: add airdrop card to guild modal * fix: style changes, testing airdrop * style: Reduce margin from 32px to 24px for diver and button group * fix: refetch claimable balance * fix: reset check address claim amount * fix: display omen account on tight integration * fix: capitalize wallet balance * fix: combine relay and eoa omn balances Co-authored-by: Thomas Pulber <[email protected]>
Display omen account and wallet balance in guild modal
Add airdrop for DXD holders
I have found two minor bugs which should be resolved in a separate PR: |
Mi-Lan
approved these changes
Aug 11, 2021
There was a problem hiding this comment.
Works good! Nice job! Also one more thing not sure why I can't see claim transaction done through the xDai tight? Is it something blockscout related or? I did receive it though...
https://blockscout.com/poa/xdai/tx/0x3c7c4bb691ca05a0626146161f2ac39e1bfcb6545cb4fe1bb8c47bc8b942a6a6
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.
Testing:
If there are issues please dive in and try to resolve them, need to get this branch merged asap