Use send state for send flow token
#8695
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
Builds ready [c177e0e]
Page Load Metrics (911 ± 51 ms)
|
Gudahtt
force-pushed
the
use-send-token-in-send-flow
branch
2 times, most recently
from
a04c9cc to
2d3f2ea
Compare
Builds ready [2d3f2ea]
Page Load Metrics (716 ± 74 ms)
|
The chosen token in the `send` flow was set from one of two places: `metamask.selectedTokenAddress` or `metamask.send.token`. The former is used most of the time, but the latter is used for the 'Edit' button shown in the upper-left of the confirmation UI. The send flow will now exclusively use `metamask.send.token` for the token state during the send flow. `metamask.selectedTokenAddress` is now only used for the selected token state on the Home screen. This simplifies the Redux state, as the send token is now in one place instead of two, and `metamask.selectedTokenAddress` has only one purpose.
Gudahtt
force-pushed
the
use-send-token-in-send-flow
branch
from
2d3f2ea to
091e782
Compare
Merged
Builds ready [091e782]
Page Load Metrics (615 ± 39 ms)
|
brad-decker
previously approved these changes
May 29, 2020
rekmarks
previously approved these changes
May 29, 2020
| @@ -55,7 +55,7 @@ describe('add-recipient utils', function () { | |||
| }) | |||
| }) | |||
|
|
|||
| it('should null if to is truthy part of tokens but selectedToken falsy', function () { | |||
| it('should null if to is truthy part of tokens but sendToken falsy', function () { | |||
There was a problem hiding this comment.
This PR did not commit the original sin here, but what the hell is this test description?
Ditto for the other cases in this file.
There was a problem hiding this comment.
I started addressing this, but it got bigger than I had anticipated. I'll address this separately
There was a problem hiding this comment.
This has been addressed in #8705
Gudahtt
commented
May 29, 2020
| @@ -38,7 +38,6 @@ const mapDispatchToProps = (dispatch) => { | |||
| toNumericBase: 'hex', | |||
| }) | |||
|
|
|||
| dispatch(setSelectedToken(tokenAddress)) | |||
There was a problem hiding this comment.
Note: this was removed because its purpose was to set the token correctly on the edit screen, and that's handled now by the token below being passed to updateSend.
brad-decker
approved these changes
May 29, 2020
Builds ready [f62d43c]
Page Load Metrics (612 ± 61 ms)
|
Gudahtt
added a commit
that referenced
this pull request
Jun 1, 2020
* origin/develop: (689 commits) Implement asset page (#8696) fix crash on signature request (#8709) Fix accounts menu styling (#8707) Delete docs/porting_to_new_environment.md (#8704) Remove unused `getToErrorObject` parameters (#8705) hide connected-status on metamask ext (#8703) Stop adding permissions middleware to trusted connections (#8701) Use `send` state for send flow token (#8695) do not display extension id in connection modal (#8699) Fix tab content disappearing during scrolling on macOS Firefox (#8702) close details when button is pressed (#8694) Refactor token selectors (#8671) Update eth_accounts permission description (#8693) Extract selected token from token input (#8692) Fix propType for Home defaultHomeActiveTabName (#8683) Fix create account form styling (#8689) Remove unused `getSelectedTokenAssetImage` selector (#8691) Remove `getTxParams` (#8676) do not show account mismatch alert on details (#8678) Fix connect hardware styling (#8680) ...
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.
The chosen token in the
sendflow was set from one of two places:metamask.selectedTokenAddressormetamask.send.token. The former is used most of the time, but the latter is used for the 'Edit' button shown in the upper-left of the confirmation UI.The send flow will now exclusively use
metamask.send.tokenfor the token state during the send flow.metamask.selectedTokenAddressis now only used for the selected token state on the Home screen. This simplifies the Redux state, as the send token is now in one place instead of two, andmetamask.selectedTokenAddresshas only one purpose.