refactor: swap with state machines #283

pedronauck · 2022-06-11T06:42:24Z

✨ Fix #282
✨ Fix #234

packages/app/src/systems/Swap/machines/swapMachine.ts

* 'master' of github.com:FuelLabs/swayswap: feat: update contracts (#285) feat: fix header on top and faucet at the bottom (#281) feat: put cypress tests in CI flow (#278) feat: add landing page as index (#280)

pedronauck · 2022-06-15T21:21:26Z

Just missing to fix/add tests now, the state machine is done

LuizAsFight

refact looks great. just minor comments

packages/app/src/systems/Core/utils/helpers.ts

packages/app/src/systems/Pool/utils/helpers.ts

packages/app/src/systems/Swap/hooks/useSwapButton.tsx

packages/app/src/systems/Swap/hooks/useSwapCoinInput.tsx

packages/app/src/systems/Swap/utils/helpers.ts

* 'master' of github.com:FuelLabs/swayswap: feat: move check branch to commit step (#292) feat: add agreement and update copy (#290) fix: correct behavior when typing only "." in the coin input (#291) fix: coin input value being cut by bottom line balance (#286)

* 'master' of github.com:FuelLabs/swayswap: fix: avoid resize during image loading (#349)

* 'master' of github.com:FuelLabs/swayswap: fix: add a fixed size for captcha to avoid size change after load (#348)

* 'master' of github.com:FuelLabs/swayswap: fix: clean inputs after add liquidity (#347)

packages/app/scripts/contracts-init/initializePool.ts

packages/app/src/systems/Core/components/CoinInput.tsx

packages/app/src/systems/Core/hooks/useTokensMethods.ts

packages/app/src/systems/Swap/utils/queries.ts

luizstacio · 2022-06-25T06:22:37Z

packages/app/src/systems/Swap/machines/swapMachine.ts

+};
+
+export const swapMachine =
+  /** @xstate-layout N4IgpgJg5mDOIC5QAoC2BDAxgCwJYDswBKAOgDMwAXHAqAIXQBt19M4BiCAe0JIIDcuAazAk0WPIVIVqk+kxZtYCAV0zpKuHgG0ADAF1EoAA5dYuTTyMgAHogCsAZgCMJABzOATPef37ANjcATl1ggBoQAE9ER3sAFhIgpKDPOLdHRwB2N11-AF88iPEaKXIqEvlmVg4wACdarlqSY2ZKMkbUMQwS4jLZWgYqpRV8QXVLfD1DJBBTcwnrOwQXfxJnTKDAt28ff0z-COiET0ddEjjnf2c4oLj7XUzLtwKi7slemQqAJTguAFdako+hUACo2ADCZkonB4olUIi6EgIH3Kch+sH+gLgwLkYMhsEoIzGGi0kwM1jmFlJi0QzlybncbmyTluQTc-iyhwcaRITjicV0ujiqTSTJeIGK72kqNo6MxQM+uIhUPYdQaTRaGnatU6kuR0v6+CgcoBCplRrxUKJahJOnJM0pCxmS3Z9l5bOC9jc9hSws8XIQ-ISukccUcwSuXs8t0y4r1pUVst+pux-CYuAgJKNAEl8MY-pRYOwKWYqVZnbSTo5ef57v4OUF7KkOQH-JsSJlMgLBZ5HgE4299TikxiU7ASDgwJghAAFLhcRjg2pgDSQGG8eGieMow3G5NY8eT6dzhdLleUSDW8akqYl+bUisIS4+EhtkKnAV93T2Vvtzvd3Re18fxdGcAckQTc091HA8J2wKdZ3nRdl1XCBVXqRpmlabVdUHSDdxNWCj0Q08UIvCAr1tMlphMUsnVAJZfBfPw9hOJJO1DH8okQYU3QCTsY3-R5HHAnoDW+fczV3Gdl34XAwAAd3XOFRmELc8J3CSYKkioZLAOTFMoiZbwdOiHwYxBPF0dsMiCfYLhCbtMgDPkSBDMM2VAttLhEwoJQ08S0Uk7FEyNPSDKUtVMM1NoOkRMThyNQidLkcL5IUoyb3tWj73LCyn29IISFDOkrNiO56QDXiawEuJOy7YTRKlRLoPlbFYCoTQjQAQVQf58ELYtTNy-AaWOL0iv5IJw3We4u2uFzAjc0NHHrOJ-DDQUwL87dApHNrxzTRgMyzKAAGUFPQYwhpystRsfS5BVfPYNl43sqwDLxvzWFw7guLwAmcIImqHULWrHZSSAJVd4uasHkrgO87rGk50hIVIrPrDJ-Cs5wA2mzJ0aZDx1nScMhRB0oIDAAAjfrMFodgbGhi8SHQMgL1qZAQN0Ih2F2khqbpv5WFoJH6NsHjprcnJrh9Lsrjs5zuIQJw3Xc8NQzbEn8h2gKSBQiBIhBLgLquvgIEYMB2DOgB1bqZ3F8zJeOOWfvrL07iBzYuKOL6Eg5OX-u8RXKd6Q3jdNy7jCh6PjEZ7gN1UhEBYjk2zZj2A49oTK7Ro2YzLyl3UkuDtcmmkDYh9eJPqszxX1+8N9mjDJPDD0g06j82s6u+OjXQ9UsK1OLU5XI30+j2Pe5z1Rrzzp2i6WTxUY7ZefTDTHvU+6yGUD4UNniXs4nbm2AFEQQAfTobqABluoAOXBU+zoX+78uuFx0dFXIsmcP+gYDL2Ds9YXrrT-o4JIJ8zqnxvqfcEl9wQAHlsz31fmNWs5wQJPGcEyE4Tg8YqyrucZIPgcgnEFPsE+KCABqp8vgIOQffF+w1kaPhxsVWIPlbjenrIBQBpxziXDKk3TI9hHhtz1hBYgZ9L4AFluoAA0L7UNvgAVVPmgx83pzjWQCKBVkOM3BxADPsVYdlAK9lAlZBWVD74zlUQggAEg-AA4holhEslgAFoNro02B-f6mRvC9iqhyXkK1tg4wuCBZ44p8BcGpvAGYAswaDEUIjDxzsl6NmKp4EmECThBgIUcUM9dkj+I8FcMMsTXhSL2klYK44waWgJJo-KRiEgNU8HsH0QpsgHBVk4VYGt0jrTZH-WMkiErw0aSQI6J0upQFzPmQsbSXZeEyGcRs-EQhCi9EExarg+QXCyMKcMdl24tQRoeeCx4kJnlQmsxiTgzibPuI2IJwRNnKyOEM5a1StbjMuJcmZ2kQpQTSopJ5tJ0gMjSLcdaFjsirRcqtf5msxk6xBVBa5UNOq0F6v1VZmTF6WWjGUwIIDvRhiyP6QZaKRmApJpM2p0ycWzPmZmRZGdoXHDbKsRwnhnAQLZF2UCvsHBXHCfyYVXZUYXKmXDdlYLxywD+JgJQSTbqeMskEYV7h9hBJSOyHBhzpUnLlecmp-k6lXMaby7Yry6rdNEY5fpAZYj134h4b0gqmzL0uULemYsSVv2LmyNyYiXBBKqW4FyeTzUhgEjNXyrLmqdwzhbK2vK66rGFR7EM6RDGfSBrvX6dU7irT-sfRVQ4M2Tx7sYPuUAc2pDOG4dkONjW+CriWkIDdrhCpyNsAIEi011rHpHTNy5UkKGqFqguI0UY+gZB6XwU1VpiJLUEgdQZvQ63sJc+tV0c09ndrWQtq08nb28Lu7IP9QJilraUAQ6YIAkAUhYbA-xKCEpFpQXla1irpCVnsTYoQBl+3DHmlwsQIFjOApc19x132fsoN+gskICAADEGioEA8EDsPhfBCN7B4CVT5UgMmFTRnyG1RFIdGG+j9X6f1YfwCbQDSRloY3WIY3wJa6Q-WuN6B4DlD3Pt6MhjMLH0M-pPIwL4tpAO+M1qBjYMTIO0mjcJsj1Lax1UY5y2TGHKA31wAARz+BmCwRxtVZMQEBtTnYwOae3hcYTPhmRYJuEZ5jaHTPsdw1wVAaTqgqfrjg9kNwi3PjpUcOykXy29g5KIu4fmUMmZ-afdD2HGj3yoApRoQhsNgDAIBn0wGIEuY0xB7dRUaN3GXikLITgMsZkA7EKr6nwPsgDMEBrv1RHxD8F2Gt46pC8q8R2vxVSSrrGCT82kdxBFVMCE2B4EDYkFCAA */


Why do we need this comment here?

This is generated from xstate visualizer vscode addon in order to have correctly visualization layout of the machine

packages/app/src/systems/Swap/machines/swapMachine.typegen.ts

packages/app/src/systems/Core/hooks/useTokensMethods.ts

luizstacio

The First state should be select token.
Network fee is not using the price factor correctly take a look on the hook useTransactionCost and show the user the txCost.fee
When inverting the inputs the transition should be smoother, without elements appearing and changing the screen size, and sober components are flicking.

Note: item 3 can be done another issue.

Images:

pedronauck added the enhancement New feature or request label Jun 11, 2022

pedronauck self-assigned this Jun 11, 2022

pedronauck marked this pull request as draft June 11, 2022 06:42

vercel bot had a problem deploying to Preview June 11, 2022 06:42 Failure

luizstacio reviewed Jun 11, 2022

View reviewed changes

packages/app/src/systems/Swap/machines/swapMachine.ts Outdated Show resolved Hide resolved

pedronauck added 7 commits June 13, 2022 19:11

chore: add Maybe type

8642231

refac: move useCoinInput to a separate file

10fbb4d

Merge branch 'master' of github.com:FuelLabs/swayswap into refac/swap2

b5543c7

* 'master' of github.com:FuelLabs/swayswap: feat: update contracts (#285) feat: fix header on top and faucet at the bottom (#281) feat: put cypress tests in CI flow (#278) feat: add landing page as index (#280)

refac: rename ActiveInput enum to SwapDirection

44f689d

refac: code improvements

8a3e634

fix: dependency cycle

87dac27

refac: use state machine on swap

b83af0d

pedronauck force-pushed the refac/swap branch from efa9ecf to b83af0d Compare June 15, 2022 01:25

vercel bot deployed to Preview June 15, 2022 01:25 View deployment

refac: improve state machine

82ccd54

pedronauck added 3 commits June 15, 2022 19:30

refactor: remove refetch balances on swap machine

e4066c3

fix: add insufficient eth for gas fee as first validation

813ed22

chore: rename fetch pool info state

4df5a13

vercel bot deployed to Preview June 15, 2022 22:34 View deployment

LuizAsFight suggested changes Jun 16, 2022

View reviewed changes

pedronauck added 2 commits June 17, 2022 20:14

refac: add safeBigInt method

bb3ff36

vercel bot deployed to Preview June 17, 2022 23:28 View deployment

pedronauck changed the title ~~refac: add first version of refactoring on swap~~ refactor: add first version of refactoring on swap Jun 17, 2022

pedronauck added 3 commits June 17, 2022 21:04

chore: udpate deps

7f88aea

fix: adapt swap to new CoinBalance component

15a1059

fix: keep swap service between refreshs on dev

432daec

vercel bot deployed to Preview June 18, 2022 05:47 View deployment

vercel bot deployed to Preview June 18, 2022 06:09 View deployment

Merge branch 'master' of github.com:FuelLabs/swayswap into refac/swap

3ff2ad4

* 'master' of github.com:FuelLabs/swayswap: fix: avoid resize during image loading (#349)

pedronauck dismissed LuizAsFight’s stale review via 3ff2ad4 June 24, 2022 20:18

pedronauck marked this pull request as ready for review June 24, 2022 20:19

Merge branch 'master' of github.com:FuelLabs/swayswap into refac/swap

30bcac3

* 'master' of github.com:FuelLabs/swayswap: fix: add a fixed size for captcha to avoid size change after load (#348)

vercel bot deployed to Preview June 24, 2022 20:21 View deployment

pedronauck enabled auto-merge (squash) June 24, 2022 20:21

pedronauck changed the title ~~refactor: add first version of refactoring on swap~~ refactor: swap refactoring Jun 24, 2022

pedronauck changed the title ~~refactor: swap refactoring~~ refactor: swap with state machines Jun 24, 2022

luizstacio linked an issue Jun 24, 2022 that may be closed by this pull request

Input blinks "Insufficient Liquidity" before calculating swap value #234

Closed

Merge branch 'master' of github.com:FuelLabs/swayswap into refac/swap

b3dfec3

* 'master' of github.com:FuelLabs/swayswap: fix: clean inputs after add liquidity (#347)

vercel bot deployed to Preview June 24, 2022 21:33 View deployment

luizstacio suggested changes Jun 25, 2022

View reviewed changes

chore: requested changes

a703923

pedronauck requested a review from luizstacio June 27, 2022 15:18

vercel bot deployed to Preview June 27, 2022 15:19 View deployment

luizstacio suggested changes Jun 27, 2022

View reviewed changes

chore: requested changes [2]

6d619c5

vercel bot deployed to Preview June 27, 2022 18:39 View deployment

pedronauck added 2 commits June 27, 2022 17:59

fix: swap machine validations

efec675

fix: coin balance decimals

defdf7f

vercel bot deployed to Preview June 27, 2022 21:26 View deployment

luizstacio previously approved these changes Jun 27, 2022

View reviewed changes

fix: tests

3d579ca

pedronauck dismissed luizstacio’s stale review via 3d579ca June 27, 2022 22:20

vercel bot deployed to Preview June 27, 2022 22:21 View deployment

fix: e2e tests

429ffa0

vercel bot deployed to Preview June 27, 2022 22:27 View deployment

luizstacio approved these changes Jun 27, 2022

View reviewed changes

pedronauck merged commit 652c83b into master Jun 27, 2022

pedronauck deleted the refac/swap branch June 27, 2022 22:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: swap with state machines #283

refactor: swap with state machines #283

pedronauck commented Jun 11, 2022 •

edited

pedronauck commented Jun 15, 2022

LuizAsFight left a comment

luizstacio Jun 25, 2022

pedronauck Jun 27, 2022

luizstacio left a comment •

edited

refactor: swap with state machines #283

refactor: swap with state machines #283

Conversation

pedronauck commented Jun 11, 2022 • edited

pedronauck commented Jun 15, 2022

LuizAsFight left a comment

Choose a reason for hiding this comment

luizstacio Jun 25, 2022

Choose a reason for hiding this comment

pedronauck Jun 27, 2022

Choose a reason for hiding this comment

luizstacio left a comment • edited

Choose a reason for hiding this comment

pedronauck commented Jun 11, 2022 •

edited

luizstacio left a comment •

edited