Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

fix(euler): fix token values and calculations #660

Merged
merged 5 commits into from
Jun 21, 2022

Conversation

conwayconstar
Copy link
Contributor

Description

Various fixes for euler app integration

  • Fixed TVL
  • Fixed E, D, P token prices
  • Removed Supply APY from D tokens
  • Removed Borrow APY from E tokens
  • Removed Borrow/Supply APY from P tokens
  • Updated logo

Checklist

  • I have followed the Contributing Guidelines
  • (optional) As a contributor, my Ethereum address/ENS is:
  • (optional) As a contributor, my Twitter handle is:

@immasandwich
Copy link
Contributor

@conwayconstar I can't merge because there's a few merge conflicts.. can you merge the latest from main? I'll get this in as soon as you can do that.

@conwayconstar
Copy link
Contributor Author

@conwayconstar I can't merge because there's a few merge conflicts.. can you merge the latest from main? I'll get this in as soon as you can do that.

I have merged in main

@immasandwich
Copy link
Contributor

I'm still seeing this:
image

You probably need to merge the latest from the main branch from this repo into your fork.

@immasandwich
Copy link
Contributor

You'll likely find this document helpful:
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

What I would do is simply:

git remote add upstream https://github.com/Zapper-fi/studio.git
git fetch upstream
git merge upstream/main

This will fetch the latest branches from the upstream repo, then merge the upstream/main branch into your branch. Then, you can resolve conflicts and push. You can also git checkout master && git merge upstream/main to get your forked main branch in sync.

@immasandwich immasandwich merged commit 3a17376 into Zapper-fi:main Jun 21, 2022
@conwayconstar conwayconstar deleted the euler-fixes branch June 21, 2022 14:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants