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

Issue #606: Vaults explorer page #611

Merged
merged 7 commits into from
Jul 10, 2024
Merged

Conversation

jahabeebs
Copy link
Member

@jahabeebs jahabeebs commented Jul 4, 2024

closes #606
closes #615

Description

  • Create a new "/explore" page
  • Copy the code from marketplace to display all vaults in a table
  • Pull data from the subgraph
  • Updated yarn lock file which was failing

Screenshots

Mobile

Screenshot 2024-07-03 at 10 06 11 PM

Desktop

Screenshot 2024-07-03 at 10 06 01 PM

Responsive

explore.mov

@jahabeebs jahabeebs requested a review from pi0neerpat July 4, 2024 03:13
@jahabeebs jahabeebs self-assigned this Jul 4, 2024
Copy link

vercel bot commented Jul 4, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
od-app ✅ Ready (Inspect) Visit Preview Jul 10, 2024 0:16am
od-app-hai ✅ Ready (Inspect) Visit Preview Jul 10, 2024 0:16am
od-app-testnet ✅ Ready (Inspect) Visit Preview Jul 10, 2024 0:16am

Copy link
Member

@pi0neerpat pi0neerpat left a comment

Choose a reason for hiding this comment

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

  • svg render issue
  • add collateral and debt amounts

@jahabeebs
Copy link
Member Author

  • svg render issue
  • add collateral and debt amounts

I made the following changes

  • I found that the rendering issue only occurs when sorting by "ID" and "collateral". I tried to fix the rendering issue in a number of ways (triggering more re-renders with useEffect, annotating rows with unique ids, consolidating into one component, comparing with the marketplace logic) but there must be something going on with how tanstack is re-rendering the rows, because I wasn't able to get them to re-render correctly. I had to disable sorting by ID and collateral. The same issue is probably occurring on the marketplace route but there are so few listings either the rendering issue doesn't happen or we just don't have enough examples to see it happen
  • I added collateral amount and debt amount and these sort correctly without rendering issues, though I had to do some string parsing

Screenshots

test.mov

@jahabeebs jahabeebs requested a review from pi0neerpat July 5, 2024 22:52
tableRows.push({
id: vault.id,
collateral: vault.collateralType,
image: svg ? svg : null,
Copy link
Member

Choose a reason for hiding this comment

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

Pass entire svg component here

columnHelper.accessor('image', {
header: () => '',
cell: (info) => {
const image = info.row.original.image
Copy link
Member

Choose a reason for hiding this comment

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

Maybe explorer "row.original"

Copy link
Member

@pi0neerpat pi0neerpat left a comment

Choose a reason for hiding this comment

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

Use internal link, not external link

@pi0neerpat
Copy link
Member

image

ORDER:
ID, Image, Collateral Amount, Collateral, Debt

Collateral eg. "1,000 ARB"

@jahabeebs
Copy link
Member Author

@pi0neerpat

I made the following changes:

  1. Passing the entire svg component into the table and trying to find other properties in info.row didn't help the svg rendering issue, I've kept sorting disabled for ID and collateral because I've been trying for a long time but still haven't found a workaround (though if someone search a collateral type in the search bar they can filter and it doesn't affect the SVG)

  2. I re-ordered the columns to ID, Image, Collateral Amount, Collateral, Debt

  3. View button is now an internal link

Re-ordered columns

Screenshot 2024-07-08 at 5 51 38 PM

Re-ordered columns

Screenshot 2024-07-08 at 5 51 49 PM

Responsive

redirect.mov

Copy link
Member

@pi0neerpat pi0neerpat left a comment

Choose a reason for hiding this comment

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

Continue troubleshooting per discussion this morning

@jahabeebs
Copy link
Member Author

Continue troubleshooting per discussion this morning

@pi0neerpat

I did the following today:

  1. Added risk status column (Explore: risk status column #615) which we can sort by
  2. I found our cratio calculation was incorrect sometimes, as we weren't filtering commas from numbers we were parsing and those numbers became NaN. Also, we weren't handling the differences between infinity and 0 correctly (since if a vault still has collateral it will be considered to have an infinity collateral ratio) and I fixed that. The color issue is still a problem and I'll have to debug more with a local svg package

@pi0neerpat pi0neerpat merged commit 75431ce into dev Jul 10, 2024
10 checks passed
@pi0neerpat pi0neerpat deleted the feature/606-vaults-explore-page branch July 10, 2024 03:40
pi0neerpat added a commit that referenced this pull request Jul 10, 2024
* matomo race conditions (#613)

* typo fix (#618)

* Issue #606: Vaults explorer page (#611)

* explore page

* explore page more changes

* fix explore page

* more explore page fixes

* revert yarn lock

* explore table reorder, external link

* add risk status, fix bugs

* remove fuul (#620)

* bump sdk (#621)

* remove maintenance from bolts

* add credit guild block (#622)

* add credit guild block

* update earn block

* final copy

* api url hotfix

* Od-weth QA (#623)

* round stability fee

* OD_API_URL

* New "initializing" loader (#609)

* change waiting modal content

* put modal content back

* show loader if no title, text, hint, hash

* rm loader modal from account checkking

* close loader popup when vaults is fetched

* prettier

* fix loader and blinking

* rm creating modal

* prettier

* lin fix

* cleanup

---------

Co-authored-by: Jacob Habib <47253537+jahabeebs@users.noreply.github.com>
Co-authored-by: Iana <36742189+alekseevaiana@users.noreply.github.com>
pi0neerpat added a commit that referenced this pull request Jul 23, 2024
* matomo race conditions (#613)

* typo fix (#618)

* Issue #606: Vaults explorer page (#611)

* explore page

* explore page more changes

* fix explore page

* more explore page fixes

* revert yarn lock

* explore table reorder, external link

* add risk status, fix bugs

* remove fuul (#620)

* bump sdk (#621)

* remove maintenance from bolts

* add credit guild block (#622)

* add credit guild block

* update earn block

* final copy

* api url hotfix

* Od-weth QA (#623)

* round stability fee

* OD_API_URL

* New "initializing" loader (#609)

* change waiting modal content

* put modal content back

* show loader if no title, text, hint, hash

* rm loader modal from account checkking

* close loader popup when vaults is fetched

* prettier

* fix loader and blinking

* rm creating modal

* prettier

* lin fix

* cleanup

* Borrow + Deposit tabs cleanup (#631)

* shape of tabs

* tabs font styles

* borders

* fix lint warning

* cleanup

* Address ENS loading skeleton (#632)

* add skeleton to vault stats

* sidemenu and wallet info navbar

* base color for skeleton in vault stats

* base color for skeleton in ean page

* prettier

* Update react, react-router (#602)

* widget at v2.10.2

* add yarn.lock

* Update react-router to v6

* Update widget to v3

* add mui packages

* fix onboarding props issue

* yarn lock

* make compatible with react router dom v6

* remove lifi widget

* remove widget

---------

Co-authored-by: jahabeebs <jahgoreds@gmail.com>

* Issue #557: View internal balances (#633)

* initial balance draft

* initial balance draft

* bump sdk version

* fix lock file

* fix lock file

* fix lock file

* fix vault block issue

* fix infinite loop when pushed from other page (#640)

* Issue #630: Explore page design improvements (#639)

* explore page improvements

* reuse function

* fix svg rendering issue

* fix navigate issue (#643)

* Add GRT (#652)

* Bump sdk to v1.7.4-rc.3

* lint

* Issue #642: Reconnect on refresh (#644)

* reconnect on refresh

* fix loading logic

* bump svg generator (#649)

Co-authored-by: Patrick Gallagher <blockchainbuddha@gmail.com>

* bump sdk

---------

Co-authored-by: Jacob Habib <47253537+jahabeebs@users.noreply.github.com>
Co-authored-by: Iana <36742189+alekseevaiana@users.noreply.github.com>
Co-authored-by: jahabeebs <jahgoreds@gmail.com>
pi0neerpat added a commit that referenced this pull request Jul 31, 2024
* matomo race conditions (#613)

* typo fix (#618)

* Issue #606: Vaults explorer page (#611)

* explore page

* explore page more changes

* fix explore page

* more explore page fixes

* revert yarn lock

* explore table reorder, external link

* add risk status, fix bugs

* remove fuul (#620)

* bump sdk (#621)

* remove maintenance from bolts

* add credit guild block (#622)

* add credit guild block

* update earn block

* final copy

* api url hotfix

* Od-weth QA (#623)

* round stability fee

* OD_API_URL

* New "initializing" loader (#609)

* change waiting modal content

* put modal content back

* show loader if no title, text, hint, hash

* rm loader modal from account checkking

* close loader popup when vaults is fetched

* prettier

* fix loader and blinking

* rm creating modal

* prettier

* lin fix

* cleanup

* Borrow + Deposit tabs cleanup (#631)

* shape of tabs

* tabs font styles

* borders

* fix lint warning

* cleanup

* Address ENS loading skeleton (#632)

* add skeleton to vault stats

* sidemenu and wallet info navbar

* base color for skeleton in vault stats

* base color for skeleton in ean page

* prettier

* Update react, react-router (#602)

* widget at v2.10.2

* add yarn.lock

* Update react-router to v6

* Update widget to v3

* add mui packages

* fix onboarding props issue

* yarn lock

* make compatible with react router dom v6

* remove lifi widget

* remove widget

---------

Co-authored-by: jahabeebs <jahgoreds@gmail.com>

* Issue #557: View internal balances (#633)

* initial balance draft

* initial balance draft

* bump sdk version

* fix lock file

* fix lock file

* fix lock file

* fix vault block issue

* fix infinite loop when pushed from other page (#640)

* Issue #630: Explore page design improvements (#639)

* explore page improvements

* reuse function

* fix svg rendering issue

* fix navigate issue (#643)

* Add GRT (#652)

* Bump sdk to v1.7.4-rc.3

* lint

* Issue #642: Reconnect on refresh (#644)

* reconnect on refresh

* fix loading logic

* bump svg generator (#649)

Co-authored-by: Patrick Gallagher <blockchainbuddha@gmail.com>

* bump sdk

* Replace all 'any' with correct Types (#638)

* rm any from global styles: safe ones

* global style: unused, wrong and empty

* styling any

* errors types and events

* prettier and earn index strings type

* earn and bolts

* add pool data type

* rm ts-ignore

* lint fix

* QA: Tracking error, empty vault (#645)

* add error message when vault not excists

* fix Tracking error

* add error color

* lint fix

* cleanup console.log

* App meta tags (#657)

* update helmet

* meta tags to home page

* change home meta tags texts

* vaults meta tags

* create meta tags component

* add tags to earn and stats

* add bg to stats page

* stats meta

* add other meta tags to main pages

* prettier

* Issue #656 (app PR): country.is failure (#660)

* add geoblock

* no ip call

* consolidate calls

* Add PT-rETH PT-wstETH (#661)

* update sdk

* bump sdk

* update icons

* QA: Header (#646)

* side menu fixed width

* side menu display none id screen is wide

* fix account arrangement

* change camelot link  color

* fix bg (#659)

* fix gnosis safe (#664)

---------

Co-authored-by: Jacob Habib <47253537+jahabeebs@users.noreply.github.com>
Co-authored-by: Iana <36742189+alekseevaiana@users.noreply.github.com>
Co-authored-by: jahabeebs <jahgoreds@gmail.com>
pi0neerpat added a commit that referenced this pull request Aug 1, 2024
* matomo race conditions (#613)

* typo fix (#618)

* Issue #606: Vaults explorer page (#611)

* explore page

* explore page more changes

* fix explore page

* more explore page fixes

* revert yarn lock

* explore table reorder, external link

* add risk status, fix bugs

* remove fuul (#620)

* bump sdk (#621)

* remove maintenance from bolts

* add credit guild block (#622)

* add credit guild block

* update earn block

* final copy

* api url hotfix

* Od-weth QA (#623)

* round stability fee

* OD_API_URL

* New "initializing" loader (#609)

* change waiting modal content

* put modal content back

* show loader if no title, text, hint, hash

* rm loader modal from account checkking

* close loader popup when vaults is fetched

* prettier

* fix loader and blinking

* rm creating modal

* prettier

* lin fix

* cleanup

* Borrow + Deposit tabs cleanup (#631)

* shape of tabs

* tabs font styles

* borders

* fix lint warning

* cleanup

* Address ENS loading skeleton (#632)

* add skeleton to vault stats

* sidemenu and wallet info navbar

* base color for skeleton in vault stats

* base color for skeleton in ean page

* prettier

* Update react, react-router (#602)

* widget at v2.10.2

* add yarn.lock

* Update react-router to v6

* Update widget to v3

* add mui packages

* fix onboarding props issue

* yarn lock

* make compatible with react router dom v6

* remove lifi widget

* remove widget

---------

Co-authored-by: jahabeebs <jahgoreds@gmail.com>

* Issue #557: View internal balances (#633)

* initial balance draft

* initial balance draft

* bump sdk version

* fix lock file

* fix lock file

* fix lock file

* fix vault block issue

* fix infinite loop when pushed from other page (#640)

* Issue #630: Explore page design improvements (#639)

* explore page improvements

* reuse function

* fix svg rendering issue

* fix navigate issue (#643)

* Add GRT (#652)

* Bump sdk to v1.7.4-rc.3

* lint

* Issue #642: Reconnect on refresh (#644)

* reconnect on refresh

* fix loading logic

* bump svg generator (#649)

Co-authored-by: Patrick Gallagher <blockchainbuddha@gmail.com>

* bump sdk

* Replace all 'any' with correct Types (#638)

* rm any from global styles: safe ones

* global style: unused, wrong and empty

* styling any

* errors types and events

* prettier and earn index strings type

* earn and bolts

* add pool data type

* rm ts-ignore

* lint fix

* QA: Tracking error, empty vault (#645)

* add error message when vault not excists

* fix Tracking error

* add error color

* lint fix

* cleanup console.log

* App meta tags (#657)

* update helmet

* meta tags to home page

* change home meta tags texts

* vaults meta tags

* create meta tags component

* add tags to earn and stats

* add bg to stats page

* stats meta

* add other meta tags to main pages

* prettier

* Issue #656 (app PR): country.is failure (#660)

* add geoblock

* no ip call

* consolidate calls

* Add PT-rETH PT-wstETH (#661)

* update sdk

* bump sdk

* update icons

* QA: Header (#646)

* side menu fixed width

* side menu display none id screen is wide

* fix account arrangement

* change camelot link  color

* fix bg (#659)

* fix gnosis safe (#664)

* fix stability fee by removing multiplication (#667) (#668)

* fix stability fee by removing multiplication

* lint cleanup

---------

Co-authored-by: Jacob Habib <47253537+jahabeebs@users.noreply.github.com>
Co-authored-by: Iana <36742189+alekseevaiana@users.noreply.github.com>
Co-authored-by: jahabeebs <jahgoreds@gmail.com>
pi0neerpat added a commit that referenced this pull request Aug 5, 2024
* matomo race conditions (#613)

* typo fix (#618)

* Issue #606: Vaults explorer page (#611)

* explore page

* explore page more changes

* fix explore page

* more explore page fixes

* revert yarn lock

* explore table reorder, external link

* add risk status, fix bugs

* remove fuul (#620)

* bump sdk (#621)

* remove maintenance from bolts

* add credit guild block (#622)

* add credit guild block

* update earn block

* final copy

* api url hotfix

* Od-weth QA (#623)

* round stability fee

* OD_API_URL

* New "initializing" loader (#609)

* change waiting modal content

* put modal content back

* show loader if no title, text, hint, hash

* rm loader modal from account checkking

* close loader popup when vaults is fetched

* prettier

* fix loader and blinking

* rm creating modal

* prettier

* lin fix

* cleanup

* Borrow + Deposit tabs cleanup (#631)

* shape of tabs

* tabs font styles

* borders

* fix lint warning

* cleanup

* Address ENS loading skeleton (#632)

* add skeleton to vault stats

* sidemenu and wallet info navbar

* base color for skeleton in vault stats

* base color for skeleton in ean page

* prettier

* Update react, react-router (#602)

* widget at v2.10.2

* add yarn.lock

* Update react-router to v6

* Update widget to v3

* add mui packages

* fix onboarding props issue

* yarn lock

* make compatible with react router dom v6

* remove lifi widget

* remove widget

---------

Co-authored-by: jahabeebs <jahgoreds@gmail.com>

* Issue #557: View internal balances (#633)

* initial balance draft

* initial balance draft

* bump sdk version

* fix lock file

* fix lock file

* fix lock file

* fix vault block issue

* fix infinite loop when pushed from other page (#640)

* Issue #630: Explore page design improvements (#639)

* explore page improvements

* reuse function

* fix svg rendering issue

* fix navigate issue (#643)

* Add GRT (#652)

* Bump sdk to v1.7.4-rc.3

* lint

* Issue #642: Reconnect on refresh (#644)

* reconnect on refresh

* fix loading logic

* bump svg generator (#649)

Co-authored-by: Patrick Gallagher <blockchainbuddha@gmail.com>

* bump sdk

* Replace all 'any' with correct Types (#638)

* rm any from global styles: safe ones

* global style: unused, wrong and empty

* styling any

* errors types and events

* prettier and earn index strings type

* earn and bolts

* add pool data type

* rm ts-ignore

* lint fix

* QA: Tracking error, empty vault (#645)

* add error message when vault not excists

* fix Tracking error

* add error color

* lint fix

* cleanup console.log

* App meta tags (#657)

* update helmet

* meta tags to home page

* change home meta tags texts

* vaults meta tags

* create meta tags component

* add tags to earn and stats

* add bg to stats page

* stats meta

* add other meta tags to main pages

* prettier

* Issue #656 (app PR): country.is failure (#660)

* add geoblock

* no ip call

* consolidate calls

* Add PT-rETH PT-wstETH (#661)

* update sdk

* bump sdk

* update icons

* QA: Header (#646)

* side menu fixed width

* side menu display none id screen is wide

* fix account arrangement

* change camelot link  color

* fix bg (#659)

* fix gnosis safe (#664)

* fix stability fee by removing multiplication (#667)

* fix stability fee by removing multiplication

* lint cleanup

* fix stability fee by removing multiplication (#667) (#668)

* fix stability fee by removing multiplication

* lint cleanup

* Remove low gas modal (#671)

* Remove low gas modal (#672)

* fix stability fee by removing multiplication (#667)

* fix stability fee by removing multiplication

* lint cleanup

* Remove low gas modal (#671)

* Add ARB-Griff (#665)

* update sdk

* bump sdk

* add arb-griff icon

* bump sdk to v1.7.6

* Add Arb-griff (#674)

* fix stability fee by removing multiplication (#667)

* fix stability fee by removing multiplication

* lint cleanup

* Remove low gas modal (#671)

* Add ARB-Griff (#665)

* update sdk

* bump sdk

* add arb-griff icon

* bump sdk to v1.7.6

* Auction fixes (#637)

* chains config improvement

* Fix auction block

* Cleanup payment flow

* max amount error handling

* lint

---------

Co-authored-by: Jacob Habib <47253537+jahabeebs@users.noreply.github.com>
Co-authored-by: Iana <36742189+alekseevaiana@users.noreply.github.com>
Co-authored-by: jahabeebs <jahgoreds@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Explore: risk status column Vaults explorer page
2 participants