Skip to content

v12.0.0 swap send updates#25152

Merged
micaelae merged 4 commits intoVersion-v12.0.0from
Version-v12.0.0-swap-send-updates
Jun 8, 2024
Merged

v12.0.0 swap send updates#25152
micaelae merged 4 commits intoVersion-v12.0.0from
Version-v12.0.0-swap-send-updates

Conversation

@micaelae
Copy link
Copy Markdown
Member

@micaelae micaelae commented Jun 7, 2024

Description

Follow-up PR for Swap+Send

Cherry pick of

  • chore: update swaps blockedList api url #24837
  • fix: re-enable swap-send-eth e2e test #24882
  • chore: add swap+send analytics #25078
  • fix: resolve all known swap+send bugs #25100

Open in GitHub Codespaces

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

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.

@micaelae micaelae requested a review from a team as a code owner June 7, 2024 19:15
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 7, 2024

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.

micaelae added 2 commits June 7, 2024 12:17
<!--
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**
This is a follow-up to the initial [Swap+Send blocklist
implementation](#24591).
This change shifts traffic from swaps-api to token-api by changing the
fetched blocklist API.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/24837?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Attempting to swap+send 1 ETH to BNB should not be possible
2. Attempting to swap+send 1 BNB to ETH should not be possible
3. Network tab in dev console should show calls to the token-api
blocklist endpoint, not swaps

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

Blocklisting should function identically to the old behavior.

### **Before**

<!-- [screenshots/recordings] -->
N/A

### **After**

<!-- [screenshots/recordings] -->
N/A

## **Pre-merge author checklist**

- [X ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've completed the PR template to the best of my ability
- [X] I’ve included tests if applicable
- [X] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ X] 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/24882?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 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.
@micaelae micaelae requested review from a team as code owners June 7, 2024 19:18
@micaelae micaelae changed the base branch from develop to Version-v12.0.0 June 7, 2024 19:18
<!--
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 PR introduces the new analytics events for Swap+Send; it also
improves analytics for the existing flow.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25078?quickstart=1)

## **Related issues**


[METABRIDGE-843](https://consensyssoftware.atlassian.net/browse/METABRIDGE-843)

Fixes:

## **Manual testing steps**

1. Mock analytics to log in console
2. Ensure all analytics modified/added are firing as expected

## **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**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] 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.
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 7, 2024

Codecov Report

Attention: Patch coverage is 76.19048% with 20 lines in your changes missing coverage. Please review.

Project coverage is 65.59%. Comparing base (046766c) to head (57d18a6).

Current head 57d18a6 differs from pull request most recent head 700d981

Please upload reports for the commit 700d981 to get more accurate results.

Files Patch % Lines
ui/ducks/send/send.js 81.08% 7 Missing ⚠️
shared/lib/swaps-utils.js 57.14% 3 Missing ⚠️
.../asset-picker-amount/asset-picker/asset-picker.tsx 40.00% 3 Missing ⚠️
ui/components/multichain/pages/send/send.js 75.00% 2 Missing ⚠️
ui/components/app/nfts-items/nfts-items.js 66.67% 1 Missing ⚠️
...r-amount/asset-picker-modal/asset-picker-modal.tsx 75.00% 1 Missing ⚠️
.../multichain/pages/send/components/address-book.tsx 50.00% 1 Missing ⚠️
...ltichain/pages/send/components/recipient-input.tsx 0.00% 1 Missing ⚠️
...nts/multichain/pages/send/components/recipient.tsx 50.00% 1 Missing ⚠️
Additional details and impacted files
@@                 Coverage Diff                 @@
##           Version-v12.0.0   #25152      +/-   ##
===================================================
- Coverage            65.66%   65.59%   -0.07%     
===================================================
  Files                 1359     1359              
  Lines                54014    54110      +96     
  Branches             14015    14053      +38     
===================================================
+ Hits                 35464    35490      +26     
- Misses               18550    18620      +70     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [57d18a6]
Page Load Metrics (295 ± 355 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint64211993517
domContentLoaded9241132
load422790295739355
domInteractive9241132
Bundle size diffs [🚨 Warning! Bundle size has increased!]
  • background: 0 Bytes (0.00%)
  • ui: 4.63 KiB (0.07%)
  • common: 2.4 KiB (0.04%)

<!--
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**

A number of minor bugs have been discovered during the official QA
process of Swap+Send; this PR aims to resolve all of them without
regression.

<!--
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/25100?quickstart=1)

## **Related issues**


[METABRIDGE-843](https://consensyssoftware.atlassian.net/browse/METABRIDGE-843)

Fixes:

## **Manual testing steps**

1. Test all issues with a send-swap label
2. Ensure they are no longer present
3. Ensure Swap+Send continues to work as expected

## **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**

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] 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.
@micaelae micaelae merged commit fab8cb5 into Version-v12.0.0 Jun 8, 2024
@micaelae micaelae deleted the Version-v12.0.0-swap-send-updates branch June 8, 2024 00:23
@github-actions github-actions bot locked and limited conversation to collaborators Jun 8, 2024
@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [700d981]
Page Load Metrics (318 ± 387 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint76216963215
domContentLoaded9261352
load413053318805387
domInteractive9261352
Bundle size diffs [🚨 Warning! Bundle size has increased!]
  • background: 0 Bytes (0.00%)
  • ui: 4.99 KiB (0.07%)
  • common: 3.38 KiB (0.05%)

@metamaskbot metamaskbot added the release-12.0.0 Issue or pull request that will be included in release 12.0.0 label Aug 19, 2024
@metamaskbot
Copy link
Copy Markdown
Collaborator

No release label on PR. Adding release label release-12.0.0 on PR, as PR was added to branch 12.0.0 when release was cut.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-12.0.0 Issue or pull request that will be included in release 12.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants