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

Swaps: Change fee denomination from USD -> actual payment token #6000

Merged
merged 6 commits into from
Aug 14, 2024

Conversation

benisgold
Copy link
Member

Fixes APP-1767

What changed (plus any additional context for devs)

see ticket

Screen recordings / screenshots

Simulator Screenshot - iPhone 15 Pro - 2024-08-13 at 13 13 27
Simulator Screenshot - iPhone 15 Pro - 2024-08-13 at 13 33 04

What to test

Copy link

linear bot commented Aug 13, 2024

Copy link
Member

@brunobar79 brunobar79 left a comment

Choose a reason for hiding this comment

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

LGTM!

@ibrahimtaveras00 ibrahimtaveras00 added the release for release blockers and release candidate branches label Aug 14, 2024
Base automatically changed from update-swaps-sdk to develop August 14, 2024 19:16
@brunobar79 brunobar79 merged commit cb37209 into develop Aug 14, 2024
6 checks passed
@brunobar79 brunobar79 deleted the @benisgold/swaps-fee-denomination branch August 14, 2024 20:18
brunobar79 added a commit that referenced this pull request Aug 20, 2024
* Degen mode analytics, copy adjustment (#5979)

* Brody/swap v2 e2e (#5915)

* init

* test file

* clean up

* matthew review fixes

* lint

* oops!!!

* type casting

* rename

* .

* lint

* oops hardhat stuff removed

* reverts

* simplify hardhat check

* Update src/__swaps__/screens/Swap/components/FadeMask.tsx

Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>

* Apply suggestions from code review

IS_TESTING > IS_TEST

Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>

* fix lint

* okay actually fix lint

---------

Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>

* Revert CI script changes (#5961)

* init

* oop

* update logging

* test

* undo

* Revert "rerun only failed tests (#5878)"

This reverts commit 497d27a.

* Bump fast-xml-parser from 4.4.0 to 4.4.1 (#5965)

Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases)
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md)
- [Commits](NaturalIntelligence/fast-xml-parser@v4.4.0...v4.4.1)

---
updated-dependencies:
- dependency-name: fast-xml-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: i18n updates (#5980)

* Revert "Brody/swap v2 e2e (#5915)" (#5987)

This reverts commit a38f633.

* Convert App.js => App.tsx (#5792)

* .

* undo tsconfig change and create routes.tsx with platform selector

* chore: merge

* yep

* fix

* rm authorize

* change initial route context initial value

* wrap in usecallbacks

* Fix token to buy list empty spaces (#5983)

* fixes empty spaces

* also add searching to recents

* rm log

* remove duplicate recents and add migration

* fix sort

* fix bridge button sending users to swaps v1 (#5971)

* fix (#5989)

* fix favorites tokens with no icon (#5982)

* fix favorites default list

* wip

* 👍

* Update src/resources/favorites.ts

* fix format

---------

Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>

* codeowners file removed (#5991)

* Trending DApps (#5974)

* initial work for trending dapps

* progress on trending dapps

* impl. trending hooks

* combine selectors

* fix crash and fix empty state not showing up (#5975)

* bump version to v1.9.35 (#5992)

* Swaps: Popular Tokens (#5990)

* Default the Swap input currency to ETH  (#5994)

* . (#5993)

* Design system improvements (#5984)

* Revert ". (#5993)" (#5999)

* swaps bug fix: missing asset balance for some tokens (#5998)

* remove filter

* forgot this

* Drag and drop components, browser favorites reordering (#5978)

* Add drag-and-drop components, useLayoutWorklet

Slightly modified implementation based on https://github.com/mgcrea/react-native-dnd

* Make browser favorites reorderable, migrate favoriteDapps store to createRainbowStore

* Fix fallback logos, add useLayoutWorklet documentation

* Reorder imports

* Clean up favorites stores, types

Removes unnecessary additions to the legacy store

* Improve reliability of browser favorites URL handling

Resolves issues causing certain favorites not to be removable (due to params in the URL or a subtly different URL path), by:

- Adding more lenient fallback lookup mechanisms if no exact match is found
- Trimming params from the standardized URLs

Also moves the browser favorites store to within the /state/browser/ folder.

* Create EasingGradient, useEasingGradient

* Add activeScale, default activeOpacity to 1

* Clean up activeScale

* Replace JS-based timer with useAnimatedTimeout, misc. cleanup

* Add dragDirection option to Draggable

* Add DraggableFlatList

Fully working with the exception of auto scrolling while dragging

* Improve browser homepage cards

* Fix light mode card contrast, Android card gradient

* Expose stop function in useAnimatedTimeout

* useAnimatedTime: stop → clearTimeout

* Improve card BlurView rendering

* Make reorderable favorites mounting/unmounting smoother

* Clean up animated reaction dependencies

* Add missing favorites store method

* Fix account balance discrepancies (#5959)

* fix balance discrepency between bx and app and app and change wallet sheet

* Update src/helpers/buildWalletSections.tsx

* fix missing import from commit

* also fix send sheet balance discrepancy

* fix swap user assets not refetching on pending txn resolution and PTR

* .

* update en_US key

* rmeove unused hook and bake it into the user assets store

* good lord

* separate invalidateQueries because they don't update when grouped for some reason

* more instances

* cleanup

* cleanup useWatchPendingTxs

* code suggestions

* break up useWallets

* rm latestBackup from useWallets

* useMemo -> useEffect

* logging

* cleanup

* remove unused withPositions params

* type

* fix PROFILE_STICKY_HEADER loading value

* fix

* optional chaining

* fixes to buildWalletSections + related code

* fix accountInfo isLoadingAccountBalance

* clean up useWalletBalances

* stuff is still broken but committing walletsWithBalancesAndNames fix

* refactor useWalletsWithBalancesAndNames and fix consumers

* fix wallet screen balance loading state

* console.log

* switch amount types from string | number -> string

* align stale/cache times, remove keepPreviousData

* remove spammy isDamaged logging

* add loading balance copy + remove incorrectly used no balance copy

* fix i18n mistake

---------

Co-authored-by: Ben Goldberg <bengoldberg@rainbow.me>

* update swaps sdk (#5996)

* Swaps: Change fee denomination from USD -> actual payment token (#6000)

* hm

* done

* idk how this got deleted

* cleanup

* fix bad rebase

---------

Co-authored-by: gregs <ukfaeku@gmail.com>

* Fun stuff (#5995)

* add filteration

* clenaup

* fix runtime error (#6001)

* rotate user-agent (#6003)

* fixed dapp browser height on android (#6004)

* fixes android light mode button navigation colors (#6005)

* fix TokenToBuyList weirdness when favoriting (#6002)

* wip

* fix

* ops

* bring back slice

* Revert "fixes android light mode button navigation colors (#6005)"

This reverts commit fc87001.

* Revert "Convert App.js => App.tsx (#5792)"

This reverts commit 0d09b10.

* Revert "Drag and drop components, browser favorites reordering (#5978)"

This reverts commit 5feae69.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Christian Baroni <7061887+christianbaroni@users.noreply.github.com>
Co-authored-by: brdy <41711440+BrodyHughes@users.noreply.github.com>
Co-authored-by: Matthew Wall <matthew.wallt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Sinclair <4412473+DanielSinclair@users.noreply.github.com>
Co-authored-by: gregs <ukfaeku@gmail.com>
Co-authored-by: Bruno Barbieri <1247834+brunobar79@users.noreply.github.com>
Co-authored-by: Ben Goldberg <bengoldberg@rainbow.me>
Co-authored-by: Bruno Barbieri <brunobar79@gmail.com>
Copy link

sentry-io bot commented Aug 21, 2024

Suspect Issues

This pull request was deployed and Sentry observed the following issues:

  • ‼️ TypeError: Cannot read property 'decimals' of undefined calculateRainbowFeeFromQuoteData(src/__swaps__/... View Issue

Did you find this useful? React with a 👍 or 👎

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release for release blockers and release candidate branches swaps v2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants