Skip to content
This repository has been archived by the owner on Dec 13, 2019. It is now read-only.

[apps] Simple swap app #1796

Closed
wants to merge 15 commits into from
Closed

[apps] Simple swap app #1796

wants to merge 15 commits into from

Conversation

rhlsthrm
Copy link
Collaborator

@rhlsthrm rhlsthrm commented Jul 2, 2019

Description

Exchange functionality in app.

Related issues

  • Deploy preview is functional

@rhlsthrm rhlsthrm requested review from ldct and snario as code owners July 2, 2019 21:02
@cf19drofxots
Copy link
Member

Thanks for this - we'll probably change the base branch for this but it shouldn't effect the actual PR itself.

@rhlsthrm
Copy link
Collaborator Author

rhlsthrm commented Jul 3, 2019

Cool, just wanted to get this into the erc20 branch before it got merged and released.

@ldct
Copy link
Member

ldct commented Jul 3, 2019

We should do any ERC20 PRs and this one in separate PRs

@cf19drofxots
Copy link
Member

@IIIIllllIIIIllllIIIIllllIIIIllllIIIIll yeah that's why I mentioned changing the base branch

@rhlsthrm rhlsthrm changed the base branch from erc20_deposit to master July 3, 2019 22:28
@rhlsthrm
Copy link
Collaborator Author

rhlsthrm commented Jul 3, 2019

OK, I changed the base branch to be master instead of ERC20. We can merge this after that branch is merged, please ping me when it's ready.

@ldct
Copy link
Member

ldct commented Jul 4, 2019

You can leave the base branch as before since #1792 is a dependency of this (and also so that rebases are possible), just don't merge it into #1792

@rhlsthrm rhlsthrm changed the base branch from master to erc20_deposit July 4, 2019 20:07
@rhlsthrm
Copy link
Collaborator Author

rhlsthrm commented Jul 4, 2019

Changed it back to erc20_deposit

@ArjunBhuptani
Copy link
Collaborator

Updated based on a conversation with @snario today. Should be good to go!

@cf19drofxots cf19drofxots changed the base branch from erc20_deposit to master July 9, 2019 20:29
@cf19drofxots cf19drofxots changed the base branch from master to erc20_deposit July 9, 2019 20:44
@cf19drofxots
Copy link
Member

Closing in favor of merging: #1836

@cf19drofxots cf19drofxots deleted the arjun/simpleSwapApp branch July 9, 2019 21:09
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.

None yet

4 participants