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.

Sign up for GitHub

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

Jump to bottom

feat: update defi ui #2116

Merged

0xApotheosis merged 47 commits into develop from update-yearn

Jul 21, 2022

Contributor

reallybeard commented Jul 6, 2022 •

edited

Loading

Description

Updated the routing for defi modals to use a query param
Remove the routes inside deposit
Update the UI to match the new defi UI

Notice

Have you followed the guidelines in our Contributing guide?
Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Pull Request Type

🐛 Bug fix (Non-breaking Change: Fixes an issue)
🛠️ Chore (Non-breaking Change: Doc updates, pkg upgrades, typos, etc..)
💅 New Feature (Breaking/Non-breaking Change)

Issue (if applicable)

closes #2144

Risk

High risk, totally changing the way we handle the DeFi modals

Testing

Test Yearn (deposit/withdraw) and Foxy (deposit/withdraw/claim) from the DeFi page and from the asset specific pages.

Need to make sure all the methods are still functioning as normal.

Screenshots (if applicable)

reallybeard and others added 11 commits

July 6, 2022 11:51


          update to use new modal based query param and new UI

7aa1021


          fixing some warnings

0cd7dd5


          updates

d5e5706


          update foxy

11b0100


          use context for loading state

35bb642


          add some translations

65f7a27


          Merge branch 'develop' into update-yearn


          fix routing

b080e57


          fixing foxy

1c69904


          Update EarnOpportunities.tsx

df59636


          Update EarnOpportunities.tsx

ba4c489

gomesalexandre mentioned this pull request

Add a FOX Farming modal with the new staking UI #2143

Closed

reallybeard added 3 commits

July 12, 2022 09:15


          translations

cb5bdba


          Update WithdrawType.tsx

0306b0b


          fix claim logic

f5f3b2f

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/AssetInput.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/AssetInput.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/AssetInput.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/Steps.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/Steps.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/Steps.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/Steps.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/components/DeFi/components/Steps.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/features/defi/components/DefiActionButtons.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/features/defi/components/DefiActionButtons.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/features/defi/components/DefiModal/DefiModal.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/features/defi/components/Overview/Overview.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/features/defi/components/Overview/Overview.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/features/defi/components/Overview/Overview.tsx Outdated Show resolved Hide resolved

0xdef1cafe reviewed

View reviewed changes

src/features/defi/components/Overview/Overview.tsx Outdated Show resolved Hide resolved


          Merge branch 'develop' into update-yearn

44f6f3b

reallybeard removed the needs operations label

reallybeard added 4 commits

July 19, 2022 22:25


          Merge branch 'develop' into update-yearn

e87cf4d


          divider

54027b4


          Update Button.theme.ts

9e63c20


          updating

26ea937

0xdef1cafe suggested changes

View reviewed changes

Collaborator

0xdef1cafe left a comment

small bug

src/features/defi/providers/foxy/components/FoxyManager/Withdraw/components/Status.tsx Outdated Show resolved Hide resolved

src/features/defi/providers/yearn/components/YearnManager/Deposit/components/Status.tsx Outdated Show resolved Hide resolved

src/features/defi/providers/yearn/components/YearnManager/Withdraw/components/Status.tsx Outdated Show resolved Hide resolved


          fix for status on failed

e5d90a3

0xdef1cafe previously approved these changes

View reviewed changes

0xdef1cafe mentioned this pull request

DeFI - View position not available after staking #908

Closed

2 tasks

0xApotheosis requested changes

View reviewed changes

Member

0xApotheosis left a comment

Some requested changes - I know that a lot of this was just you moving things around, so please address what you think is appropriate.

src/features/defi/providers/foxy/components/FoxyManager/Withdraw/components/Withdraw.tsx Outdated Show resolved Hide resolved

src/features/defi/providers/foxy/components/FoxyManager/Withdraw/components/Withdraw.tsx Outdated Show resolved Hide resolved

src/features/defi/providers/foxy/components/FoxyManager/Withdraw/components/Withdraw.tsx Outdated Show resolved Hide resolved

src/components/Tag/Tag.theme.ts Show resolved Hide resolved

src/features/defi/contexts/DefiManagerProvider/DefiCommon.ts Show resolved Hide resolved

src/features/defi/components/Deposit/Deposit.tsx Outdated Show resolved Hide resolved

src/assets/translations/en/main.json Outdated Show resolved Hide resolved

src/features/defi/providers/yearn/components/YearnManager/Deposit/components/Status.tsx Outdated Show resolved Hide resolved

src/features/defi/providers/yearn/components/YearnManager/Withdraw/YearnWithdraw.tsx Show resolved Hide resolved

src/features/defi/providers/yearn/components/YearnManager/Withdraw/components/Status.tsx Outdated Show resolved Hide resolved


          update per comments

ce37c02

reallybeard dismissed 0xdef1cafe’s stale review via

ce37c02

July 21, 2022 18:01


          Merge branch 'develop' into update-yearn

fbc7594

0xApotheosis previously approved these changes

View reviewed changes

Member

0xApotheosis left a comment

Appreciate the changes ser

0xdef1cafe previously approved these changes

View reviewed changes


          Update WithdrawCard.tsx

reallybeard dismissed stale reviews from 0xdef1cafe and 0xApotheosis via

July 21, 2022 19:46

Collaborator

0xdef1cafe commented Jul 21, 2022

@reallybeard plz do not merge until ops comments in discord are resolved


          Update Claim.tsx

b119f51

0xdef1cafe approved these changes

View reviewed changes

0xApotheosis approved these changes

View reviewed changes

Member

0xApotheosis left a comment

🎉

0xApotheosis merged commit 234e5f5 into develop

0xApotheosis deleted the update-yearn branch

July 21, 2022 23:06

This was referenced Jul 22, 2022

feat: multi currency support #1873

Merged

Cosmos - Use new DeFi UI abstraction #2219

Closed

elmutt mentioned this pull request

chore: create release v1.46.0 [DO NOT MERGE] #2226

Merged

gomesalexandre mentioned this pull request

FOX-ETH LP: Implement LP DeFi opportunity #2270

Closed

gomesalexandre mentioned this pull request

DeFi UI abstraction improvements #2434

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet