Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: edit button on confirmation page for send ERC-1155 token #27004

Merged
merged 5 commits into from
Sep 12, 2024
Merged

fix: edit button on confirmation page for send ERC-1155 token #27004

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b2b30e
Fix edit button on confirmation page for send ERC-1155 token
jpuri Sep 10, 2024
2cfba04
Merge branch 'develop' into erc_1155_sendedit_fix
jpuri Sep 11, 2024
0f68d5a
Update
jpuri Sep 11, 2024
3d885f6
Merge branch 'erc_1155_sendedit_fix' of github.com:MetaMask/metamask-…
jpuri Sep 11, 2024
f2b1391
Update
jpuri Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions test/e2e/tests/tokens/nft/send-nft.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ describe('Send NFT', function () {
);
});

it('should be able to send ERC1155 NFT', async function () {
it.only('should be able to send ERC1155 NFT', async function () {
await withFixtures(
{
dapp: true,
Expand Down Expand Up @@ -115,13 +115,6 @@ describe('Send NFT', function () {
tag: 'button',
});

// Ensure that this type of NFT is not editable for now
// https://github.com/MetaMask/metamask-extension/issues/24320
const editButtonPresent = await driver.isElementPresent(
'[data-testid="confirm-page-back-edit-button"]',
);
assert.equal(editButtonPresent, false);

// Confirm the send
sleepytanya marked this conversation as resolved.
Show resolved Hide resolved
await driver.clickElement({ text: 'Confirm', tag: 'button' });

Expand Down
8 changes: 8 additions & 0 deletions ui/pages/confirmations/confirm-transaction/confirm-token-transaction-switch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,14 @@ export default function ConfirmTokenTransactionSwitch({ transaction }) {
decimals={decimals}
image={tokenImage}
tokenAddress={tokenAddress}
onEdit={async ({ txData }) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor, it's a legacy pattern in the file but should we define this once as a handleNftEdit somewhere to avoid the duplication with the other paths?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would avoid getting into cleanup as this code is soon going to go away anyways,

const { id } = txData;
await dispatch(
editExistingTransaction(AssetType.NFT, id.toString()),
);
dispatch(clearConfirmTransaction());
history.push(SEND_ROUTE);
}}
toAddress={toAddress}
tokenAmount={tokenAmount}
tokenId={tokenId}
Expand Down