[Swap V2] - Fixes and Updates #4332
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nents/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]>
…nents/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]>
Nebyt
previously approved these changes
Oct 6, 2025
Nebyt
approved these changes
Oct 6, 2025
loxator
approved these changes
Oct 7, 2025
packages/yoroi-extension/app/UI/features/swap-new/common/components/AssetInput.tsx
Show resolved
Hide resolved
|
loxator
added a commit
that referenced
this pull request
Oct 9, 2025
Merged
loxator
added a commit
that referenced
this pull request
Oct 27, 2025
* add: bring one click update * add open/complete orders * wip * add complete and open orders display * fix tsc * remove console.log * remove unused comp * removed commented code * removed console.log * remove hardcoded id * fix tabs border bottom * reverse assets * fix display * update format * fix tsx * rename Cashback to cashback * add sidebar id and method to open the Portfolio page * add ids for portfolio header in component * add test ids in page object * add ids for no search results * add ids on sort icons * fix fmt on Sort * add ids on table headers * add constants for columns in tests * add methods to get table headers locators in tests * add ids for tokens in the table * update token total ids * add constants for porfolio chips colors * add methods for portfolio page object * add method to collect info from a column * add portfolioDetails template page * add ids for buttons on the token details page * add ids on token details page * rename page object file and add ids into the pageObject * rename class * add methods to portfolio pageObjects * add tokens info * fixes * add first test * Apply suggestions from code review Co-authored-by: Amin Limbada <[email protected]> * Apply suggestions from code review Co-authored-by: Amin Limbada <[email protected]> * Apply suggestions from code review Co-authored-by: Amin Limbada <[email protected]> * fix:tests: change isDisplayed condition for token details page * fix: fmt * fix: updated component id * chore: add required methods * chore: add test for checking balance * chore: pageObject methods updates * chore: add test for switching currencies * Bump chromedriver from 140.0.3 to 140.0.4 in /packages/e2e-tests Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 140.0.3 to 140.0.4. - [Commits](giggio/node-chromedriver@140.0.3...140.0.4) --- updated-dependencies: - dependency-name: chromedriver dependency-version: 140.0.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * add: update @emurgo/bringweb3-chrome-extension-kit to version 1.5.1 * flow fix * prettier fix * allow redirection in notification center (#4322) Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Amin Limbada <[email protected]> * add claenSEarch method * add positive test for search * add message for no results * add method noResultsFound * add test fro no results * [SWAP] - Fixes (#4313) * fix seetings btn and slippage input * force to one decimal * force one decimal * fixes * update dispatch * add constant * add cancel order tx review implementation * fix condition * add refresh, fix state update * refactor context reducer * fix string * fix route * fix typo * fix format * removed console.log * remove console.log * fix parsing number * fix format * fix imports * Update packages/yoroi-extension/app/UI/features/swap-new/common/components/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]> * Update packages/yoroi-extension/app/UI/features/swap-new/common/components/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]> * removed unused code * add const * refactor and extract to fnc * add string * fix format --------- Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Ruslan Dudin <[email protected]> Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Amin Limbada <[email protected]> * New Crowdin updates (#4334) * New translations en-us.json (ja-JP) * New translations en-us.json (id-ID) * New translations en-us.json (fr-FR) * New translations en-us.json (Spanish) * New translations en-us.json (de-DE) * New translations en-us.json (ko-KR) * New translations en-us.json (ru-RU) * New translations en-us.json (zh-Hans) * New translations en-us.json (Vietnamese) * New translations en-us.json (Portuguese, Brazilian) * New translations en-us.json (id-ID) (#4335) * add isDisplayed on Receive page object * add selectTokenByName on portfolio page object * add minimal swap page object * add callRedirection in the portfolioHelper * add test for redirection * add additional step in handle tests * Bump chromedriver from 140.0.4 to 141.0.0 in /packages/e2e-tests Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 140.0.4 to 141.0.0. - [Commits](giggio/node-chromedriver@140.0.4...141.0.0) --- updated-dependencies: - dependency-name: chromedriver dependency-version: 141.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * fix: YOEXT-2302 Swaps redirection doesn't work (#4336) Co-authored-by: Denis Nebytov <[email protected]> * wait loading * change website to websiteLink * minor change * improve logging info on token details poage object * add test for checking token details info * add id for the wallet plate * update methods _findAndSelectWallet and switchToWallet * add required await * add test for Portfolio for switching wallet when a token is selected * add portfolio is loaded check * update color constants * add help functions for sorting * add method getSortingArrowDirection and fixes for collecting info from a column * add test for sorting in the Portfolio. * add tags * add script for running smoke tests * [Swap V2] - Fixes and Updates (#4332) * fix seetings btn and slippage input * force to one decimal * force one decimal * fixes * update dispatch * add constant * add cancel order tx review implementation * fix condition * add refresh, fix state update * refactor context reducer * fix string * fix route * fix typo * fix format * removed console.log * remove console.log * fix parsing number * fix format * fix imports * refactor cip30 implementation * update cancel order * fix asset input * fix crash on review inputs * Update packages/yoroi-extension/app/UI/features/swap-new/common/components/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]> * Update packages/yoroi-extension/app/UI/features/swap-new/common/components/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]> * removed unused code * add const * refactor and extract to fnc * add string * fix format * fix close bracket * update address on receiver * remove console.log * fix format, update package --------- Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Ruslan Dudin <[email protected]> Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Amin Limbada <[email protected]> * Revert "[Swap V2] - Fixes and Updates (#4332)" (#4349) This reverts commit 09c0c4c. * fix: YOEXT-2247 swap (#4350) * fix seetings btn and slippage input * force to one decimal * force one decimal * fixes * update dispatch * add constant * add cancel order tx review implementation * fix condition * add refresh, fix state update * refactor context reducer * fix string * fix route * fix typo * fix format * removed console.log * remove console.log * fix parsing number * fix format * fix imports * refactor cip30 implementation * update cancel order * fix asset input * fix crash on review inputs * Update packages/yoroi-extension/app/UI/features/swap-new/common/components/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]> * Update packages/yoroi-extension/app/UI/features/swap-new/common/components/Modals/SettingsModalContent.tsx Co-authored-by: Amin Limbada <[email protected]> * removed unused code * add const * refactor and extract to fnc * add string * fix format * fix close bracket * update address on receiver * remove console.log * fix format, update package * [Swap V2] - Fixes (#4347) * refactor dex switch * fix name display * add empty orders * remove logs * fix format * add string * fix string * Update packages/yoroi-extension/app/UI/features/swap-new/useCases/SwapOrders.tsx/NoOpenOrders.tsx Co-authored-by: Denis Nebytov <[email protected]> * fix string * fix id * hide minswap * fix(tokens): canonicalize asset IDs & prevent metadata downgrade * fix warning * update --------- Co-authored-by: Denis Nebytov <[email protected]> * fix: prettier issue --------- Co-authored-by: Sorin Chis <[email protected]> Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Ruslan Dudin <[email protected]> Co-authored-by: Denis Nebytov <[email protected]> * Bump chromedriver from 141.0.0 to 141.0.1 in /packages/e2e-tests Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 141.0.0 to 141.0.1. - [Commits](giggio/node-chromedriver@141.0.0...141.0.1) --- updated-dependencies: - dependency-name: chromedriver dependency-version: 141.0.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * New Crowdin updates (#4351) * New translations en-us.json (ja-JP) * New translations en-us.json (id-ID) * New translations en-us.json (fr-FR) * New translations en-us.json (Spanish) * New translations en-us.json (de-DE) * New translations en-us.json (ko-KR) * New translations en-us.json (ru-RU) * New translations en-us.json (zh-Hans) * New translations en-us.json (Vietnamese) * New translations en-us.json (Portuguese, Brazilian) * New translations en-us.json (ja-JP) * chore: release 5.15.1 unused theme code is removed for Bring (#4348) (#4353) * unused theme code is removed for Bring * bring sdk update * prettier fix * Bring SDK version update * chore: bump version to 5.15.1 * chore: bump package.lock version to 5.15.1 --------- Co-authored-by: Ruslan Dudin <[email protected]> * improve trezorEmulator controller * fix running on Ubuntu * return Trezor job * make disabling security conditional * update description * YOEXT-2320: swap v2 – clean squash * fix format * ignore unstoppable domains * Bump chromedriver from 141.0.1 to 141.0.3 in /packages/e2e-tests Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 141.0.1 to 141.0.3. - [Commits](giggio/node-chromedriver@141.0.1...141.0.3) --- updated-dependencies: - dependency-name: chromedriver dependency-version: 141.0.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * New Crowdin updates (#4367) * New translations en-us.json (Spanish) * New translations en-us.json (de-DE) * New translations en-us.json (ja-JP) * New translations en-us.json (ru-RU) * New translations en-us.json (zh-Hans) * New translations en-us.json (id-ID) * New translations en-us.json (ko-KR) * New translations en-us.json (Vietnamese) * New translations en-us.json (Portuguese, Brazilian) * New translations en-us.json (id-ID) --------- Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Amin Limbada <[email protected]> * remove FF and related to it stuff * update package scripts * update gitignore * remove nanoS * update CI jobs * fix display * update price * test * wip * New translations en-us.json (Spanish) * New translations en-us.json (de-DE) * New translations en-us.json (ja-JP) * New translations en-us.json (ru-RU) * New translations en-us.json (zh-Hans) * New translations en-us.json (id-ID) * New translations en-us.json (ko-KR) * New translations en-us.json (Vietnamese) * New translations en-us.json (Portuguese, Brazilian) * New translations en-us.json (fr-FR) * fix swap transaction * fix format * [Swap V2] - fixes (#4366) * format amount before sending * refactor and use quanity prop * add Minswap back * removed console.logs * fix format --------- Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Amin Limbada <[email protected]> * Create push-to-octopus.yml (#4365) * Create push-to-octopus.yml * Update push-to-octopus.yml * Update push-to-octopus.yml * Update push-to-octopus.yml * fix fmt * Update .github/workflows/push-to-octopus.yml --------- Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Amin Limbada <[email protected]> * [E2E] Return some tests from the blacklist (#4373) * return and update a test * return and update the second test * fix format --------- Co-authored-by: Amin Limbada <[email protected]> * New translations en-us.json (fr-FR) (#4375) Co-authored-by: Amin Limbada <[email protected]> * [Swap V2] (#4376) * format amount before sending * refactor and use quanity prop * add Minswap back * removed console.logs * fix format * hide museliswap * fix warning * fix esint * fix flow --------- Co-authored-by: Denis Nebytov <[email protected]> * chore: update package.json * Version bump: 5.15.1.1 (nightly) (#4378) Co-authored-by: loxator <[email protected]> * stabilize test (#4380) Co-authored-by: Amin Limbada <[email protected]> * SWAP V2 - Disclaimer popup (#4382) * add new modal popup for swap v2 * fux format * add value as string * chore: make func into useCallback and add interface for component --------- Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Amin Limbada <[email protected]> * Version bump: 5.15.1.2 (nightly) (#4385) Co-authored-by: loxator <[email protected]> * fix airdrop page (#4386) * fix airdrop page * lint * chore: bump version to 5.15.2 --------- Co-authored-by: Amin Limbada <[email protected]> * [E2E] Extension tests into small jobs (#4389) * update tests structure * fix portfolio issue * update package scripts and CI job * fix fmt * chore: bump version to 5.16.0 * fix: hide old swap and show new swap * chore: bump version to 5.16.1 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: kalfada <[email protected]> Co-authored-by: Sorin Chis <[email protected]> Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: Denis Nebytov <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ruslan Dudin <[email protected]> Co-authored-by: Yushi <[email protected]> Co-authored-by: Juliano Lazzarotto <[email protected]> Co-authored-by: CryptoTitan <[email protected]> Co-authored-by: Emurgo R&D <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
tasks: