Skip to content

Commit 54588f9

Browse files
fix: cherry-pick: Return to send page with different asset types (#28384)
Cherry-pick: #28382 <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> This bug was reproducible by opening a new wallet initiated send confirmation with a Native token ("simple send") from the extension full screen view, and then triggering a dApp initiated confirmation, and trying to return back to the send flow stepper. The bug was provoked due to having the `editExistingTransaction` action dispatched on back button click hardcoded for asset of type token. The fix involves dynamically determining the asset type. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28382?quickstart=1) ## **Related issues** Fixes: #28316 ## **Manual testing steps** See above or check video on the bug report ticket. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28384?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
1 parent ae779d0 commit 54588f9

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

ui/pages/confirmations/components/confirm/header/wallet-initiated-header.tsx

+24-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { TransactionMeta } from '@metamask/transaction-controller';
1+
import {
2+
TransactionMeta,
3+
TransactionType,
4+
} from '@metamask/transaction-controller';
25
import React, { useCallback } from 'react';
36
import { useDispatch } from 'react-redux';
47
import { useHistory } from 'react-router-dom';
@@ -38,7 +41,26 @@ export const WalletInitiatedHeader = () => {
3841
const handleBackButtonClick = useCallback(async () => {
3942
const { id } = currentConfirmation;
4043

41-
await dispatch(editExistingTransaction(AssetType.token, id.toString()));
44+
const isNativeSend =
45+
currentConfirmation.type === TransactionType.simpleSend;
46+
const isERC20TokenSend =
47+
currentConfirmation.type === TransactionType.tokenMethodTransfer;
48+
const isNFTTokenSend =
49+
currentConfirmation.type === TransactionType.tokenMethodTransferFrom ||
50+
currentConfirmation.type === TransactionType.tokenMethodSafeTransferFrom;
51+
52+
let assetType: AssetType;
53+
if (isNativeSend) {
54+
assetType = AssetType.native;
55+
} else if (isERC20TokenSend) {
56+
assetType = AssetType.token;
57+
} else if (isNFTTokenSend) {
58+
assetType = AssetType.NFT;
59+
} else {
60+
assetType = AssetType.unknown;
61+
}
62+
63+
await dispatch(editExistingTransaction(assetType, id.toString()));
4264
dispatch(clearConfirmTransaction());
4365
dispatch(showSendTokenPage());
4466

0 commit comments

Comments
 (0)