Fix issue with awaiting swaps page #16344
Merged
Conversation
This file contains 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
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
adonesky1
force-pushed
the
fix-awaiting-swap-page
branch
2 times, most recently
from
cbc6fb0 to
e241359
Compare
|
Though changes look good, I would suggest a review by someone from swaps team also. |
|
Thanks for the code. I believe it should be also changed on the smart transaction status page, which is displayed when a smart transaction is submitted: https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js#L76 |
adonesky1
force-pushed
the
fix-awaiting-swap-page
branch
from
7f43485 to
44f110c
Compare
Builds ready [97f6157]
Page Load Metrics (2017 ± 94 ms)
highlights:storybook
|
…tchParams are wiped when service worker dies
adonesky1
force-pushed
the
fix-awaiting-swap-page
branch
from
3bac654 to
5c3c319
Compare
dan437
approved these changes
Nov 4, 2022
Builds ready [35f8d44]
Page Load Metrics (2380 ± 128 ms)
highlights:storybook
|
darkwing
approved these changes
Nov 4, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Explanation
Currently when the service worker is terminated immediately after a swap is initiated the
SwapsControllercontrolledswapsStateis reset and so thequotesempty out along with otherfetchParamscausing a redirect:https://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/swaps/index.js#L505 . So if you don't quickly hit the
swapbutton on theview quotespage after terminating the SW you will be redirected back to thebuild-quotepage:Screen.Recording.2022-11-01.at.4.25.08.PM.mov
But if you hit swap button before the redirect we hit this call to
prepareToLeaveSwaps, which clears the swaps stateAnd before the state clearing process is complete the
signAndSendTransactionscall - that is initiated when you hit theswapbutton - goes through with the swaps state intacthttps://github.com/MetaMask/metamask-extension/blob/develop/ui/pages/swaps/index.js#L257
once you arrive on the
awaiting-swapspage, though the swap has been submitted correctly, the token information that we use to tell the user which token they will be receiving is no longer accessible since it is accessed through the now clearedswapsState(from theSwapsControllerin the background)This PR fixes the issue by having the
await-swappage fetch the swap transaction data from the transactions controller (where the state is persisted if the transaction is successfully initiated) rather than the swaps controller where the required state is cleared.More Information
Manual Testing Steps
Your <symbol of currency you are swapping for> will be added to your account once this transaction has processed.Pre-Merge Checklist
+ If there are functional changes: