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.

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

Feature/swaps quotes view #2060

Merged
merged 82 commits into from
Jan 21, 2021
Merged

Feature/swaps quotes view #2060

merged 82 commits into from
Jan 21, 2021

Conversation

estebanmino
Copy link
Contributor

Description

Write a short description of the changes included in this pull request.

Checklist

  • There is a related GitHub issue
  • Tests are included if applicable
  • Any added code is fully documented

Issue

Resolves #???

wachunei and others added 28 commits November 17, 2020 14:31
@wachunei
Squashed commit of the following:
17ff273 
commit d552524
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Tue Nov 17 14:05:22 2020 -0300

    Remove unnecessary styling

commit 24b5456
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Tue Nov 17 13:13:16 2020 -0300

    Update tokens dependency for effect

commit 1662700
Author: Esteban Mino <efmino@uc.cl>
Date:   Tue Nov 17 12:50:48 2020 -0300

    bumpcontrollers

commit 94a14dd
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 16 13:52:01 2020 -0300

    Update main navigation snapshot

commit f9ba8af
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 16 13:43:14 2020 -0300

    Add TokenSelectButton label prop to test

commit 637452f
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 16 13:34:37 2020 -0300

    Add i18n to swaps amount view

commit 6dfd9a4
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 13 15:52:21 2020 -0300

    Fix TokenIcon border radius

commit 54c17c2
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 13 13:30:16 2020 -0300

    Remove unused key in token search for swaps

commit 4bb4bcb
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Thu Nov 12 23:30:58 2020 -0300

    Add asset balance in swaps amount view

commit b262b4e
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Thu Nov 12 22:48:36 2020 -0300

    Add token balances in token search modal list

commit 6ca34c9
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Thu Nov 12 14:04:33 2020 -0300

    Add invalid decimal warning

commit 539d1e7
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 23:11:26 2020 -0300

    Add empty list message and clear search on modal hide

commit 65a31a6
Author: Esteban Mino <efmino@uc.cl>
Date:   Wed Nov 11 22:00:20 2020 -0300

    bumpcontrollers

commit 36a2289
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 19:18:40 2020 -0300

    Update Receiver Modal snapshot, it uses ModalHandler now

commit c69c414
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 19:13:31 2020 -0300

    Add tokens from SwapsController

commit 4f4e87f
Author: Esteban Mino <efmino@uc.cl>
Date:   Tue Nov 10 21:57:42 2020 -0300

    inception

commit 2367393
Author: Esteban Mino <efmino@uc.cl>
Date:   Tue Nov 10 19:09:15 2020 -0300

    package

commit 707b491
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 17:49:41 2020 -0300

    Add Initial Token Selector with dummy tokens

commit 8644be0
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Tue Nov 10 12:40:34 2020 -0300

    Switch Swaps feature flag to false

commit 0696f10
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 9 20:40:44 2020 -0300

    Add Keypad rules and swap token button

commit 3173290
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 6 17:08:56 2020 -0300

    Update snapshot for main nav

commit 5f03198
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 6 12:41:01 2020 -0300

    Add SWAPS.ACTIVE flag
@wachunei
Disable flag
812383c
@wachunei
Remove console.log
90c83c7
@wachunei
Fix linting
4b8f053
@estebanmino
bump and getch quotes
55105bf
@estebanmino
bump
a6194f9
@estebanmino
bump
2d861d1
@estebanmino
fetchingcorrectly
1dd566e
@estebanmino
fetchQuotesfetchQuotes
bf047df
@wachunei
Use SwapsController state
103cd51
@estebanmino
merge
6b09c1e
@wachunei
Add initial generic error view
08b25a2
@estebanmino
bumpcontroller
258535f
@wachunei
Add swaps app utils
405b470
@wachunei
Add ratio and values from top quote
8664890
@estebanmino
bump
511bd94
@estebanmino
bump
7485db9
@estebanmino
bump
33d0c45
@estebanmino
effect
74b1241
@wachunei
Add gas price
7e9b41e
@wachunei
Remove console.log
a36dd9e
@wachunei
Add quotes modal and i18n
5fd6f15
@estebanmino
tradefees
4d3822f
@estebanmino
bump
fd0cbd9
@estebanmino
tradefees
a5949c9
@estebanmino
orderedtradesfees
62cc4d9
@estebanmino
bump
13c476f
@estebanmino
bumpcontrolker
433053a
@estebanmino estebanmino requested a review from a team as a code owner December 11, 2020 00:50
@omnat omnat added the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Jan 19, 2021
rickycodes
rickycodes approved these changes Jan 19, 2021
View reviewed changes
Copy link
Member

@rickycodes rickycodes left a comment

Choose a reason for hiding this comment

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

some small comments, but LGTM

.circleci/config.yml Outdated
@@ -176,12 +176,14 @@ workflows:
only:
- master
- develop
- feature/swaps-quotes-view
Copy link
Member

Choose a reason for hiding this comment

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

if this is ready for develop do we still want these?

app/components/UI/Navbar/index.js
@@ -902,3 +902,29 @@ export function getSwapsAmountNavbar(navigation) {
)
};
}
export function getSwapsQuotesNavbar(navigation) {
const title = navigation.getParam('title', 'Swap');
Copy link
Member

Choose a reason for hiding this comment

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

this is a nit, so feel free to disregard, but Swap could be a const here, it's repeated above and we likely want this to always be the same?

Copy link
Member

Choose a reason for hiding this comment

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

Very good question, I did not elaborate here because it was too early then, but I think know is a great time to ask: is Swap in the title something we want to translate or handle it as a "brand"? (eg: "Tweet" button in spanish version of Twitter is "Twittear" instead of the translation of "tweet")

@wachunei wachunei mentioned this pull request Jan 19, 2021
Merged
3 tasks
@omnat omnat removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Jan 20, 2021
@wachunei wachunei mentioned this pull request Jan 20, 2021
Merged
3 tasks
@estebanmino estebanmino merged commit e5fae8d into develop Jan 21, 2021
@estebanmino estebanmino deleted the feature/swaps-quotes-view branch January 21, 2021 17:01
@estebanmino estebanmino restored the feature/swaps-quotes-view branch January 21, 2021 17:32
rickycodes pushed a commit that referenced this pull request Jan 31, 2022
@estebanmino @wachunei
@flamingyawn @tlip
MetaSwaps Alpha (#2060)
f26a383 
* Squashed commit of the following:

commit d552524
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Tue Nov 17 14:05:22 2020 -0300

    Remove unnecessary styling

commit 24b5456
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Tue Nov 17 13:13:16 2020 -0300

    Update tokens dependency for effect

commit 1662700
Author: Esteban Mino <efmino@uc.cl>
Date:   Tue Nov 17 12:50:48 2020 -0300

    bumpcontrollers

commit 94a14dd
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 16 13:52:01 2020 -0300

    Update main navigation snapshot

commit f9ba8af
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 16 13:43:14 2020 -0300

    Add TokenSelectButton label prop to test

commit 637452f
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 16 13:34:37 2020 -0300

    Add i18n to swaps amount view

commit 6dfd9a4
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 13 15:52:21 2020 -0300

    Fix TokenIcon border radius

commit 54c17c2
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 13 13:30:16 2020 -0300

    Remove unused key in token search for swaps

commit 4bb4bcb
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Thu Nov 12 23:30:58 2020 -0300

    Add asset balance in swaps amount view

commit b262b4e
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Thu Nov 12 22:48:36 2020 -0300

    Add token balances in token search modal list

commit 6ca34c9
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Thu Nov 12 14:04:33 2020 -0300

    Add invalid decimal warning

commit 539d1e7
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 23:11:26 2020 -0300

    Add empty list message and clear search on modal hide

commit 65a31a6
Author: Esteban Mino <efmino@uc.cl>
Date:   Wed Nov 11 22:00:20 2020 -0300

    bumpcontrollers

commit 36a2289
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 19:18:40 2020 -0300

    Update Receiver Modal snapshot, it uses ModalHandler now

commit c69c414
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 19:13:31 2020 -0300

    Add tokens from SwapsController

commit 4f4e87f
Author: Esteban Mino <efmino@uc.cl>
Date:   Tue Nov 10 21:57:42 2020 -0300

    inception

commit 2367393
Author: Esteban Mino <efmino@uc.cl>
Date:   Tue Nov 10 19:09:15 2020 -0300

    package

commit 707b491
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Wed Nov 11 17:49:41 2020 -0300

    Add Initial Token Selector with dummy tokens

commit 8644be0
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Tue Nov 10 12:40:34 2020 -0300

    Switch Swaps feature flag to false

commit 0696f10
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Mon Nov 9 20:40:44 2020 -0300

    Add Keypad rules and swap token button

commit 3173290
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 6 17:08:56 2020 -0300

    Update snapshot for main nav

commit 5f03198
Author: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Date:   Fri Nov 6 12:41:01 2020 -0300

    Add SWAPS.ACTIVE flag

* Disable flag

* Remove console.log

* Fix linting

* bump and getch quotes

* bump

* bump

* fetchingcorrectly

* fetchQuotesfetchQuotes

* Use SwapsController state

* Add initial generic error view

* bumpcontroller

* Add swaps app utils

* Add ratio and values from top quote

* bump

* bump

* bump

* effect

* Add gas price

* Remove console.log

* Add quotes modal and i18n

* tradefees

* bump

* tradefees

* orderedtradesfees

* bump

* bumpcontrolker

* snaps

* walletaddress

* bump

* bump

* quotevalues

* Order quotes by overall quote value

* Add enable asset text row

* bump

* bump

* 500

* Swaps amount view: use max for tokens (#2052)

* Add slider button component (#2046)

* Add slider buttons and useBalance

useBalance should be used to show balance alerts

* detecting

* bump

* REVERTTHISVALIDATION

* Add Alert component (#2061)

* Add balance alert to quotes view

* fixsendto

* networkfix

* Fix use max handler usecallback deps

* Add Slippage Slider Component (#2068)

Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>

* controllers

* circle

* circlerevert

* 9

* bumpcontrollers

* CURRENT_PROJECT_VERSION

* Refactor slider button

* Add visual feedback

- Nav title
- Spacing
- Text color and size

* Adjust token symbol text colors

* Update ios/MetaMask.xcodeproj/project.pbxproj

* Update ios/MetaMask.xcodeproj/project.pbxproj

* Fix SliderButton infinite effect

* Update ios/MetaMask.xcodeproj/project.pbxproj

* Update ios/MetaMask.xcodeproj/project.pbxproj

* gasprice

* 561

* Make onComplete optional

* averagegas

* 42

* Add touchable ratio switcher

* Add default 3% slippage constant

* Add fee variable to fee modal

* Add hitSlop area to modal close buttons

* Add quotes overview string

* Add error views styling

* merge

* networkupdated

Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: tlip <flamingYawn@users.noreply.github.com>
Co-authored-by: tlip <11626601+tlip@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wachunei wachunei wachunei left review comments

@rickycodes rickycodes rickycodes approved these changes

@miranda76 miranda76 miranda76 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@estebanmino @rickycodes @wachunei @miranda76 @omnat @flamingyawn @tlip