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

feat: vertically stacked permits #274

Merged
merged 49 commits into from
Sep 9, 2024

Conversation

pbkompasz
Copy link
Contributor

Resolves #196

@ubiquity-os-deployer
Copy link

ubiquity-os-deployer bot commented Aug 6, 2024

@pbkompasz
Copy link
Contributor Author

@0x4007 Still working on it. Here is how it looks currently:
Screencast from 2024-08-08 18-28-22.webm

@pbkompasz
Copy link
Contributor Author

@0x4007 Some tests are failing on development branch. Are the tests the expected behaviour or they need to be updated?

@Keyrxng
Copy link
Member

Keyrxng commented Aug 9, 2024

hi @pbkompasz, the tests are the expected behaviour buddy

Your first run 3 days ago passed and all other runs pass just fine. Can you link to the run which has failed as I cannot seem to find it.

The most recent cypress run passed too. Maybe you meant that it was CI that had failed on development?

Copy link
Contributor

github-actions bot commented Aug 9, 2024

Unused files (1)

static/scripts/rewards/render-transaction/utils.ts

@pbkompasz
Copy link
Contributor Author

pbkompasz commented Aug 12, 2024

@Keyrxng I saw that the tests passed in the CI but when I ran them locally, some of the e2e test cases in claim-portal-success.cy.ts fail.
Screenshot from 2024-08-12 16-37-32
Screenshot from 2024-08-12 16-35-54

Copy link
Member

@Keyrxng Keyrxng left a comment

Choose a reason for hiding this comment

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

Overall great work with this

After making a few changes to get things working (addressed in comments) I manually QA'd with two permits from different networks and things work but there a few bugs although they can be addressed with other issues once merged (since multi-network permits aren't in use right now)

Sorry for the slow review it slipped my mind, please ping me after a day or two in the future if it happens again.

static/scripts/rewards/web3/connect-wallet.ts Outdated Show resolved Hide resolved
static/scripts/rewards/web3/erc20-permit.ts Outdated Show resolved Hide resolved
static/scripts/rewards/web3/erc20-permit.ts Outdated Show resolved Hide resolved
@0x4007
Copy link
Member

0x4007 commented Aug 22, 2024

The only thing that bothers me about this pull is how the page renders upon loading. I spent a lot of time to refine the animation for when the permit table renders, and with this new version, it looks like it jumps around quite a bit and the animations are not smooth. However, this is not in scope for the current task so we can create a new task to refine this particular problem.

@pbkompasz
Copy link
Contributor Author

@Keyrxng Fixed the bugs.

@Keyrxng Keyrxng self-requested a review August 24, 2024 10:04
Copy link
Member

@Keyrxng Keyrxng left a comment

Choose a reason for hiding this comment

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

I think this is good to merge following any other review comments

  • Dual network permits work (I can post a video if needed)
  • permits are stacked and all functions work
  • Manually QA'd mobile and the only comment is that you only see one permit above the fold and it's not immediately clear that you can scroll or that you have more than one
  • The known issue with MM browser and us switching the user network is still present so while multi-network permits work on mobile they need to change their network manually. (For mobile QA I did not fire any txs but I did receive the relevant wallet prompts for them. That's because it's difficult to work with anvil and mm mobile)

@gentlementlegen
Copy link
Member

Seems fine to me, good to go when you fix Knip issues.

@pbkompasz
Copy link
Contributor Author

@gentlementlegen done

@0x4007
Copy link
Member

0x4007 commented Sep 1, 2024

image

image

The styles are quite messed up. Make sure to check where you are setting font colors, and to match how it's done elsewhere so that it will work in light mode automatically

There is also a new line that shouldn't be there

image

Tested what should be the latest commit from the CI/CD

https://2f44f23e.pay-ubq-fi.pages.dev/?claim=W3sidHlwZSI6ImVyYzIwLXBlcm1pdCIsInBlcm1pdCI6eyJwZXJtaXR0ZWQiOnsidG9rZW4iOiIweGU5MUQxNTNFMGI0MTUxOEEyQ2U4RGQzRDc5NDRGYTg2MzQ2M2E5N2QiLCJhbW91bnQiOiIwIn0sIm5vbmNlIjoiMTA1NzYwOTYwNDk5Nzk5MTUxMjQxMjg3MTk5MTAwNDkyMTc5NzY5MjczOTgwMTg3NTk1MDg4MDI4MTc4ODM2MTAyNjEyNjIwMzAwNzUxIiwiZGVhZGxpbmUiOiIxMTU3OTIwODkyMzczMTYxOTU0MjM1NzA5ODUwMDg2ODc5MDc4NTMyNjk5ODQ2NjU2NDA1NjQwMzk0NTc1ODQwMDc5MTMxMjk2Mzk5MzUifSwidHJhbnNmZXJEZXRhaWxzIjp7InRvIjoiMHhlZkMwZTcwMUE4MjQ5NDNiNDY5YTY5NGFDNTY0QWExZWZGN0FiN2RkIiwicmVxdWVzdGVkQW1vdW50IjoiMCJ9LCJvd25lciI6IjB4QkE3NDJiZEJmNGVGMWU2YmU4YTkxN0ZkMmY4NEJFNkM3NEY4Nzk2QiIsInNpZ25hdHVyZSI6IjB4NDlkZjMxNGJjMTQ4MWNmZjcyMzBmZTRlYmQwYzUyYTdmYzg4MThlZWE2YThmMmM0Mzg1YWE0MjNmNjQyODQzYjEyOTEzMzdhYjg3YjUwYTA2ODg1ODk3MjQ2YjM5ZDM0ZTczZDEwOTA1NGUwZjlmNThlMjdjYzY0MjJkZTcxYzcxYyIsIm5ldHdvcmtJZCI6MTAwfSx7InR5cGUiOiJlcmMyMC1wZXJtaXQiLCJwZXJtaXQiOnsicGVybWl0dGVkIjp7InRva2VuIjoiMHhlOTFEMTUzRTBiNDE1MThBMkNlOERkM0Q3OTQ0RmE4NjM0NjNhOTdkIiwiYW1vdW50IjoiOTAwMDAwMDAwMDAwMDAwMDAwMCJ9LCJub25jZSI6IjY0OTM5NTUwMjcyNjkwMjI2NzkzNTIyNTU2NjMyMjg1NDI5ODQ0NTE1NTE0NDQ0NjUxNjIzNzQ3OTM2Nzc0MTA3MjY5NDY5OTc1MDY5IiwiZGVhZGxpbmUiOiIxMTU3OTIwODkyMzczMTYxOTU0MjM1NzA5ODUwMDg2ODc5MDc4NTMyNjk5ODQ2NjU2NDA1NjQwMzk0NTc1ODQwMDc5MTMxMjk2Mzk5MzUifSwidHJhbnNmZXJEZXRhaWxzIjp7InRvIjoiMHhlZkMwZTcwMUE4MjQ5NDNiNDY5YTY5NGFDNTY0QWExZWZGN0FiN2RkIiwicmVxdWVzdGVkQW1vdW50IjoiOTAwMDAwMDAwMDAwMDAwMDAwMCJ9LCJvd25lciI6IjB4QkE3NDJiZEJmNGVGMWU2YmU4YTkxN0ZkMmY4NEJFNkM3NEY4Nzk2QiIsInNpZ25hdHVyZSI6IjB4NDlkZjMxNGJjMTQ4MWNmZjcyMzBmZTRlYmQwYzUyYTdmYzg4MThlZWE2YThmMmM0Mzg1YWE0MjNmNjQyODQzYjEyOTEzMzdhYjg3YjUwYTA2ODg1ODk3MjQ2YjM5ZDM0ZTczZDEwOTA1NGUwZjlmNThlMjdjYzY0MjJkZTcxYzcxYyIsIm5ldHdvcmtJZCI6MTAwfV0=

Copy link
Member

@0x4007 0x4007 left a comment

Choose a reason for hiding this comment

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

Light mode needs to be fixed

}
@media only screen and (max-width: 600px) {
table {
max-width: 90%;
Copy link
Member

Choose a reason for hiding this comment

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

Doesn't seem right

@gentlementlegen gentlementlegen self-requested a review September 1, 2024 08:40
@pbkompasz
Copy link
Contributor Author

@0x4007 Fixed light mode.
Screenshot from 2024-09-02 14-23-30
Screenshot from 2024-09-02 14-23-21
Screenshot from 2024-09-02 14-23-03
Screenshot from 2024-09-02 14-22-53
Screenshot from 2024-09-02 14-22-43
Screenshot from 2024-09-02 14-22-34

@ubiquity-os ubiquity-os bot merged commit 7c6d302 into ubiquity:development Sep 9, 2024
3 checks passed
@0x4007
Copy link
Member

0x4007 commented Sep 9, 2024

Gonna need to test this again on desktop.

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.

Redo Carousel
4 participants