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.

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

✨ feat(metamask): Add support for NFT actions #1086

Merged
merged 1 commit into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions wallets/metamask/src/pages/NotificationPage/actions/transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,31 @@ export type GasSetting = z.input<typeof GasSetting>
const confirmTransaction = async (notificationPage: Page, options: GasSetting) => {
const gasSetting = GasSetting.parse(options)

const handleNftSetApprovalForAll = async (page: Page) => {
try {
const nftApproveButtonLocator = page.locator(
Selectors.TransactionPage.nftApproveAllConfirmationPopup.approveButton
)
const isNfTPopupHidden = await waitFor(() => nftApproveButtonLocator.isHidden(), 3_000, false)

if (!isNfTPopupHidden) {
await nftApproveButtonLocator.click()
}
} catch (e) {
if (page.isClosed()) {
return
}

throw new Error(`Failed to handle NFT setApprovalForAll popup: ${e}`)
}
}

// By default, the `site` gas setting is used.
if (gasSetting === 'site') {
await notificationPage.locator(Selectors.ActionFooter.confirmActionButton).click()

await handleNftSetApprovalForAll(notificationPage)

return
}

Expand Down Expand Up @@ -119,6 +140,8 @@ const confirmTransaction = async (notificationPage: Page, options: GasSetting) =
await waitFor(waitForAction, 3_000, true)

await notificationPage.locator(Selectors.ActionFooter.confirmActionButton).click()

await handleNftSetApprovalForAll(notificationPage)
}

const confirmTransactionAndWaitForMining = async (walletPage: Page, notificationPage: Page, options: GasSetting) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ const editGasFeeMenu = {
advancedGasFeeMenu
}

const nftApproveAllConfirmationPopup = {
approveButton: '.set-approval-for-all-warning__content button.set-approval-for-all-warning__footer__approve-button'
}

export default {
editGasFeeMenu
editGasFeeMenu,
nftApproveAllConfirmationPopup
}
85 changes: 85 additions & 0 deletions wallets/metamask/test/e2e/metamask/confirmTransaction.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,25 @@ import { testWithMetaMask } from '../testWithMetaMask'

const test = testWithMetaMask.extend<{
connectAndTriggerEIP1559Transaction: () => Promise<void>
connectDeployAndMintNft: () => Promise<void>
}>({
connectAndTriggerEIP1559Transaction: async ({ page, connectToAnvil }, use) => {
await use(async () => {
await connectToAnvil()

await page.locator('#sendEIP1559Button').click()
})
},
connectDeployAndMintNft: async ({ page, connectToAnvil, metamask }, use) => {
await use(async () => {
await connectToAnvil()

await page.locator('#deployNFTsButton').click()
await metamask.confirmTransaction()

await page.locator('#mintButton').click()
await metamask.confirmTransaction()
})
}
})

Expand Down Expand Up @@ -40,6 +52,64 @@ describe('with default gas setting', () => {

await metamask.confirmTransaction()
})

describe('NFTs', () => {
test('should confirm `watch NFT` request', async ({ page, metamask, connectDeployAndMintNft }) => {
await connectDeployAndMintNft()

await page.locator('#watchNFTButton').click()

await metamask.confirmTransaction()
})

test('should confirm `watch all NFTs` request', async ({ page, metamask, connectDeployAndMintNft }) => {
await connectDeployAndMintNft()

await page.locator('#watchNFTsButton').click()

await metamask.confirmTransaction()
})

test('should confirm `approve` transaction', async ({ page, metamask, connectDeployAndMintNft }) => {
await connectDeployAndMintNft()

await page.locator('#approveButton').click()

await metamask.confirmTransaction()

await expect(page.locator('#nftsStatus')).toHaveText('Approve completed')
})

test('should confirm `set approval for all` transaction', async ({ page, metamask, connectDeployAndMintNft }) => {
await connectDeployAndMintNft()

await page.locator('#setApprovalForAllButton').click()

await metamask.confirmTransaction()

await expect(page.locator('#nftsStatus')).toHaveText('Set Approval For All completed')
})

test('should confirm `revoke` transaction', async ({ page, metamask, connectDeployAndMintNft }) => {
await connectDeployAndMintNft()

await page.locator('#revokeButton').click()

await metamask.confirmTransaction()

await expect(page.locator('#nftsStatus')).toHaveText('Revoke completed')
})

test('should confirm `transfer from` transaction', async ({ page, metamask, connectDeployAndMintNft }) => {
await connectDeployAndMintNft()

await page.locator('#transferFromButton').click()

await metamask.confirmTransaction()

await expect(page.locator('#nftsStatus')).toHaveText('Transfer From completed')
})
})
})

describe('with custom gas setting', () => {
Expand Down Expand Up @@ -163,5 +233,20 @@ describe('with custom gas setting', () => {
}
})
})

test('should confirm `set approval for all` transaction', async ({ page, metamask, connectDeployAndMintNft }) => {
await connectDeployAndMintNft()

await page.locator('#setApprovalForAllButton').click()

await metamask.confirmTransaction({
gasSetting: {
maxBaseFee: 250,
priorityFee: 150
}
})

await expect(page.locator('#nftsStatus')).toHaveText('Set Approval For All completed')
})
})
})
Loading