Replace contract with third party within the token allowance flow #18101

filipsekulic · 2023-03-10T12:01:36Z

Explanation

Fixes Replace contract with a different word that applies for both EOAs and contracts #16587

Screenshots/Screencaps

After

After.mov

Manual Testing Steps

Go to test-dapp
CREATE TOKEN
APPROVE TOKENS

metamaskbot · 2023-03-10T13:51:53Z

Builds ready [5c43c2f]

builds: chrome, firefox
builds (beta): chrome, firefox
builds (flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4
- common: 0, 1, 2, 3, 4, 5
- content-script: 0
- contentscript: contentscript
- disable-console: disable-console
- inpage: inpage
- policy-load: policy-load
- sentry-install: sentry-install
- ui: 0, 1, 10, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1570 ± 51 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	96	192	122	23	11
		domContentLoaded	1400	1846	1546	109	52
		load	1441	1846	1570	107	51
		domInteractive	1400	1846	1546	109	52

Bundle size diffs

background: 0 bytes
ui: 0 bytes
common: 0 bytes

codecov · 2023-03-10T13:52:12Z

Codecov Report

Merging #18101 (a27542e) into develop (f92e463) will decrease coverage by 0.62%.
The diff coverage is n/a.

❗ Current head a27542e differs from pull request most recent head 9712cf2. Consider uploading reports for the commit 9712cf2 to get more accurate results

@@             Coverage Diff             @@
##           develop   #18101      +/-   ##
===========================================
- Coverage    65.15%   64.53%   -0.62%     
===========================================
  Files          936      916      -20     
  Lines        35965    35435     -530     
  Branches      9231     9124     -107     
===========================================
- Hits         23432    22867     -565     
- Misses       12533    12568      +35

see 178 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

metamaskbot · 2023-03-13T08:56:41Z

Builds ready [f71422d]

builds: chrome, firefox
builds (beta): chrome, firefox
builds (flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4
- common: 0, 1, 2, 3, 4, 5
- content-script: 0
- contentscript: contentscript
- disable-console: disable-console
- inpage: inpage
- policy-load: policy-load
- sentry-install: sentry-install
- ui: 0, 1, 10, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1585 ± 74 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	97	206	119	23	11
		domContentLoaded	1266	1979	1559	148	71
		load	1266	1979	1585	155	74
		domInteractive	1266	1979	1559	148	71

Bundle size diffs

background: 0 bytes
ui: 0 bytes
common: 0 bytes

coreyjanssen · 2023-03-20T22:37:14Z

One small change in just a few spots! We need to add a hyphen when third party is used as a modifier to the word details, as seen in the screenshots here. Every other instance, there's no need for a hyphen.

In summary, please add a hyphen in the instances in the screenshots, so the copy reads third-party details. Thanks!

georgewrmarshall

LGTM with some questions for @coreyjanssen

app/_locales/en/messages.json

ui/pages/token-allowance/index.scss

metamaskbot · 2023-03-21T12:29:12Z

Builds ready [93b3d7b]

builds: chrome, firefox
builds (beta): chrome, firefox
builds (flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4
- common: 0, 1, 2, 3, 4, 5
- content-script: 0
- contentscript: contentscript
- disable-console: disable-console
- inpage: inpage
- policy-load: policy-load
- sentry-install: sentry-install
- ui: 0, 1, 10, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1499 ± 42 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	89	147	112	16	8
		domContentLoaded	1317	1680	1473	89	43
		load	1317	1680	1499	88	42
		domInteractive	1317	1680	1473	89	43

Bundle size diffs

background: 0 bytes
ui: 0 bytes
common: 0 bytes

georgewrmarshall

LGTM

coreyjanssen

I have read the CLA Document and I hereby sign the CLA

Co-authored-by: George Marshall <[email protected]>

github-actions · 2023-03-23T18:13:03Z

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.

metamaskbot · 2023-03-23T18:19:36Z

Builds ready [a27542e]

builds: chrome, firefox
builds (beta): chrome, firefox
builds (flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4
- common: 0, 1, 2, 3, 4, 5
- content-script: 0
- contentscript: contentscript
- disable-console: disable-console
- inpage: inpage
- policy-load: policy-load
- sentry-install: sentry-install
- ui: 0, 1, 10, 11, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1635 ± 64 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	99	147	118	13	6
		domContentLoaded	1409	1855	1613	128	61
		load	1426	1869	1635	134	64
		domInteractive	1409	1855	1613	128	61

Bundle size diffs

background: 0 bytes
ui: 0 bytes
common: 0 bytes

coreyjanssen · 2023-03-24T16:30:18Z

I have read the CLA Document and I hereby sign the CLA

legobeat

LGTM

metamaskbot · 2023-04-10T12:51:23Z

Builds ready [9712cf2]

builds: chrome, firefox
builds (beta): chrome, firefox
builds (flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4
- common: 0, 1, 2, 3, 4, 5
- content-script: 0
- contentscript: contentscript
- disable-console: disable-console
- inpage: inpage
- policy-load: policy-load
- sentry-install: sentry-install
- ui: 0, 1, 10, 11, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1740 ± 95 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	90	213	121	29	14
		domContentLoaded	1505	2274	1719	196	94
		load	1511	2274	1740	198	95
		domInteractive	1505	2274	1719	196	94

Bundle size diffs

background: 0 bytes
ui: 0 bytes
common: 0 bytes

filipsekulic self-assigned this Mar 10, 2023

filipsekulic force-pushed the replace-contract-with-use-third-party branch from e87275a to a7e62c4 Compare March 10, 2023 12:30

filipsekulic marked this pull request as ready for review March 10, 2023 14:57

filipsekulic requested a review from a team as a code owner March 10, 2023 14:57

filipsekulic requested a review from georgewrmarshall March 10, 2023 14:57

jpuri previously approved these changes Mar 14, 2023

View reviewed changes

bschorchit requested a review from coreyjanssen March 20, 2023 21:32

georgewrmarshall reviewed Mar 20, 2023

View reviewed changes

coreyjanssen dismissed jpuri’s stale review via 16a4f50 March 21, 2023 00:22

filipsekulic force-pushed the replace-contract-with-use-third-party branch from 0724b57 to c84d790 Compare March 21, 2023 09:19

georgewrmarshall previously approved these changes Mar 21, 2023

View reviewed changes

danjm previously approved these changes Mar 23, 2023

View reviewed changes

coreyjanssen previously approved these changes Mar 23, 2023

View reviewed changes

filipsekulic and others added 10 commits March 23, 2023 18:55

Replace contract with third party

def840a

Fixed tests

3057b4b

Updated e2e tests

d3f3352

Fixed e2e test

c600147

Covered one more case

be1bcb5

Update app/_locales/en/messages.json

d2ea095

Co-authored-by: George Marshall <[email protected]>

Update app/_locales/en/messages.json

ddace94

Co-authored-by: George Marshall <[email protected]>

Update app/_locales/en/messages.json

273a97d

Co-authored-by: George Marshall <[email protected]>

Fixed tests and CSS

65673b2

Fixed tests

a27542e

filipsekulic dismissed stale reviews from coreyjanssen and danjm via a27542e March 23, 2023 17:56

filipsekulic dismissed georgewrmarshall’s stale review via a27542e March 23, 2023 17:56

filipsekulic force-pushed the replace-contract-with-use-third-party branch from bafd7ea to a27542e Compare March 23, 2023 17:56

MetaMask deleted a comment from github-actions bot Mar 23, 2023

coreyjanssen approved these changes Mar 23, 2023

View reviewed changes

Merge branch 'develop' into replace-contract-with-use-third-party

9712cf2

legobeat approved these changes Apr 10, 2023

View reviewed changes

bschorchit mentioned this pull request Apr 10, 2023

[Bug]: ERC20 Approve screen displays missleading copy, referring to a Contract, when it's an EOA #17520

Closed

jpuri approved these changes Apr 11, 2023

View reviewed changes

jpuri merged commit 54aeb1b into develop Apr 11, 2023

jpuri deleted the replace-contract-with-use-third-party branch April 11, 2023 03:19

github-actions bot locked and limited conversation to collaborators Apr 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace contract with third party within the token allowance flow #18101

Replace contract with third party within the token allowance flow #18101

filipsekulic commented Mar 10, 2023 •

edited

Loading

metamaskbot commented Mar 10, 2023

codecov bot commented Mar 10, 2023 •

edited

Loading

metamaskbot commented Mar 13, 2023

coreyjanssen commented Mar 20, 2023

georgewrmarshall left a comment

metamaskbot commented Mar 21, 2023

georgewrmarshall left a comment

coreyjanssen left a comment

github-actions bot commented Mar 23, 2023 •

edited

Loading

metamaskbot commented Mar 23, 2023

coreyjanssen commented Mar 24, 2023

legobeat left a comment

metamaskbot commented Apr 10, 2023

Replace contract with third party within the token allowance flow #18101

Replace contract with third party within the token allowance flow #18101

Conversation

filipsekulic commented Mar 10, 2023 • edited Loading

Explanation

Screenshots/Screencaps

After

Manual Testing Steps

metamaskbot commented Mar 10, 2023

codecov bot commented Mar 10, 2023 • edited Loading

Codecov Report

metamaskbot commented Mar 13, 2023

coreyjanssen commented Mar 20, 2023

georgewrmarshall left a comment

Choose a reason for hiding this comment

metamaskbot commented Mar 21, 2023

georgewrmarshall left a comment

Choose a reason for hiding this comment

coreyjanssen left a comment

Choose a reason for hiding this comment

github-actions bot commented Mar 23, 2023 • edited Loading

metamaskbot commented Mar 23, 2023

coreyjanssen commented Mar 24, 2023

legobeat left a comment

Choose a reason for hiding this comment

metamaskbot commented Apr 10, 2023

filipsekulic commented Mar 10, 2023 •

edited

Loading

codecov bot commented Mar 10, 2023 •

edited

Loading

github-actions bot commented Mar 23, 2023 •

edited

Loading