Skip to content

Commit bc6c60c

Browse files
committed
Revert "Merge pull request #15063 from MetaMask/revert-v10.16.0"
This reverts commit 4d42715, reversing changes made to f09ab88.
1 parent e1f392a commit bc6c60c

File tree

394 files changed

+11553
-6443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

394 files changed

+11553
-6443
lines changed

.circleci/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,13 @@ jobs:
670670
- run:
671671
name: test:coverage:jest
672672
command: yarn test:coverage:jest
673+
- run:
674+
name: Validate coverage thresholds
675+
command: |
676+
if ! git diff --exit-code jest.config.js development/jest.config.js; then
677+
echo "Detected changes in coverage thresholds"
678+
exit 1
679+
fi
673680
- persist_to_workspace:
674681
root: .
675682
paths:

.circleci/scripts/chrome-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ set -u
55
set -o pipefail
66

77
# To get the latest version, see <https://www.ubuntuupdates.org/ppa/google_chrome?dist=stable>
8-
CHROME_VERSION='100.0.4896.60-1'
8+
CHROME_VERSION='102.0.5005.61-1'
99
CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
1010
CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
1111

1212
# To retrieve this checksum, run the `wget` and `shasum` commands below
13-
CHROME_BINARY_SHA512SUM='d7a98777650e8218fef4acc8466d4ddf5e234b97fbc16c33f38f69f9ebfe7b6bb6827a90aad15ea729d7c1bacfa78488c5d5194b531f00f454302dd9c0957e4e'
13+
CHROME_BINARY_SHA512SUM='dd701b99febf7d927657f38716d90f3a0b967ae75dac5f6e8fbf9df632c8a531ccb9f37ee09340ad730b4fe40d0564c1b64201121d2d3e4e503f3f167ca632cd'
1414

1515
wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
1616

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Bug Report
22
description: Using MetaMask, but it's not working as you expect?
33
title: "[Bug]: "
4-
labels: ["bug"]
4+
labels: ["type-bug"]
55
body:
66
- type: markdown
77
attributes:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This is a problem because ...
1515
In order to solve this problem, this pull request ...
1616
-->
1717

18-
## More information
18+
## More Information
1919

2020
<!--
2121
Are there any issues, Slack conversations, Zendesk issues, user stories, etc. reviewers should consult to understand this pull request better? For instance:
@@ -36,7 +36,7 @@ Are there any issues, Slack conversations, Zendesk issues, user stories, etc. re
3636

3737
<!-- How does it look now? Drag your file(s) below this line: -->
3838

39-
## Manual testing steps
39+
## Manual Testing Steps
4040

4141
<!--
4242
How should reviewers and QA manually test your changes? For instance:
@@ -45,3 +45,15 @@ How should reviewers and QA manually test your changes? For instance:
4545
- Do this
4646
- Then do this
4747
-->
48+
49+
## Pre-Merge Checklist
50+
51+
- [ ] PR template is filled out
52+
- [ ] **IF** this PR fixes a bug, a test that _would have_ caught the bug has been added
53+
- [ ] PR is linked to the appropriate GitHub issue
54+
- [ ] PR has been added to the appropriate release Milestone
55+
56+
### + If there are functional changes:
57+
58+
- [ ] Manual testing complete & passed
59+
- [ ] "Extension QA Board" label has been applied

.storybook/1.INTRODUCTION.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Welcome to the MetaMask Browser Extension Storybook.
88

99
## Building locally and Contributing
1010

11-
This document is currently only specific to storybook best practices and component documentation guidelines. This may change in future but for now if you are looking to get a local build of Metamask up and running or contribute to the extension codebase please read the Metamask [README.md](https://github.com/MetaMask/metamask-extension)
11+
This document is currently only specific to storybook best practices and component documentation guidelines. This may change in future but for now if you are looking to get a local build of MetaMask up and running or contribute to the extension codebase please read the MetaMask [README.md](https://github.com/MetaMask/metamask-extension)
1212

1313
## Documentation Guidelines
1414

.storybook/3.COLORS.stories.mdx

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ var(--color-text-muted)
6767

6868
/** Icons */
6969
var(--color-icon-default)
70+
var(--color-icon-alternative)
7071
var(--color-icon-muted)
7172

7273
/** Borders */
@@ -75,49 +76,49 @@ var(--color-border-muted)
7576

7677
/** Overlays */
7778
var(--color-overlay-default)
78-
var(--color-overlay-inverse)
79+
var(--color-overlay-inverse) [DEPRECATED]
7980

8081
/** User Actions */
8182
var(--color-primary-default)
8283
var(--color-primary-alternative)
8384
var(--color-primary-muted)
8485
var(--color-primary-inverse)
85-
var(--color-primary-disabled)
86+
var(--color-primary-disabled) [DEPRECATED]
8687

87-
var(--color-secondary-default)
88-
var(--color-secondary-alternative)
89-
var(--color-secondary-muted)
90-
var(--color-secondary-inverse)
91-
var(--color-secondary-disabled)
88+
var(--color-secondary-default) [DEPRECATED]
89+
var(--color-secondary-alternative) [DEPRECATED]
90+
var(--color-secondary-muted) [DEPRECATED]
91+
var(--color-secondary-inverse) [DEPRECATED]
92+
var(--color-secondary-disabled) [DEPRECATED]
9293

9394
/** States */
9495
/** Error */
9596
var(--color-error-default)
9697
var(--color-error-alternative)
9798
var(--color-error-muted)
9899
var(--color-error-inverse)
99-
var(--color-error-disabled)
100+
var(--color-error-disabled) [DEPRECATED]
100101

101102
/** Warning */
102103
var(--color-warning-default)
103-
var(--color-warning-alternative)
104+
var(--color-warning-alternative) [DEPRECATED]
104105
var(--color-warning-muted)
105106
var(--color-warning-inverse)
106-
var(--color-warning-disabled)
107+
var(--color-warning-disabled) [DEPRECATED]
107108

108109
/** Success */
109110
var(--color-success-default)
110-
var(--color-success-alternative)
111+
var(--color-success-alternative) [DEPRECATED]
111112
var(--color-success-muted)
112113
var(--color-success-inverse)
113-
var(--color-success-disabled)
114+
var(--color-success-disabled) [DEPRECATED]
114115

115116
/** Info */
116117
var(--color-info-default)
117-
var(--color-info-alternative)
118+
var(--color-info-alternative) [DEPRECATED]
118119
var(--color-info-muted)
119120
var(--color-info-inverse)
120-
var(--color-info-disabled)
121+
var(--color-info-disabled) [DEPRECATED]
121122
```
122123

123124
### **Component colors** (tier 3)

0 commit comments

Comments
 (0)