Skip to content

Commit

Permalink
Revert "Merge pull request #14912 from MetaMask/Version-v10.16.0"
Browse files Browse the repository at this point in the history
This reverts commit f09ab88, reversing
changes made to effc761.

This is being temporarily reverted to make it easier to release an
urgent fix for v10.15.1.
  • Loading branch information
Gudahtt committed Jun 28, 2022
1 parent f09ab88 commit 925a19f
Show file tree
Hide file tree
Showing 394 changed files with 6,400 additions and 11,493 deletions.
7 changes: 0 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -670,13 +670,6 @@ jobs:
- run:
name: test:coverage:jest
command: yarn test:coverage:jest
- run:
name: Validate coverage thresholds
command: |
if ! git diff --exit-code jest.config.js development/jest.config.js; then
echo "Detected changes in coverage thresholds"
exit 1
fi
- persist_to_workspace:
root: .
paths:
Expand Down
4 changes: 2 additions & 2 deletions .circleci/scripts/chrome-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ set -u
set -o pipefail

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

# To retrieve this checksum, run the `wget` and `shasum` commands below
CHROME_BINARY_SHA512SUM='dd701b99febf7d927657f38716d90f3a0b967ae75dac5f6e8fbf9df632c8a531ccb9f37ee09340ad730b4fe40d0564c1b64201121d2d3e4e503f3f167ca632cd'
CHROME_BINARY_SHA512SUM='d7a98777650e8218fef4acc8466d4ddf5e234b97fbc16c33f38f69f9ebfe7b6bb6827a90aad15ea729d7c1bacfa78488c5d5194b531f00f454302dd9c0957e4e'

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

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Bug Report
description: Using MetaMask, but it's not working as you expect?
title: "[Bug]: "
labels: ["type-bug"]
labels: ["bug"]
body:
- type: markdown
attributes:
Expand Down
16 changes: 2 additions & 14 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This is a problem because ...
In order to solve this problem, this pull request ...
-->

## More Information
## More information

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

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

## Manual Testing Steps
## Manual testing steps

<!--
How should reviewers and QA manually test your changes? For instance:
Expand All @@ -45,15 +45,3 @@ How should reviewers and QA manually test your changes? For instance:
- Do this
- Then do this
-->

## Pre-Merge Checklist

- [ ] PR template is filled out
- [ ] **IF** this PR fixes a bug, a test that _would have_ caught the bug has been added
- [ ] PR is linked to the appropriate GitHub issue
- [ ] PR has been added to the appropriate release Milestone

### + If there are functional changes:

- [ ] Manual testing complete & passed
- [ ] "Extension QA Board" label has been applied
2 changes: 1 addition & 1 deletion .storybook/1.INTRODUCTION.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Welcome to the MetaMask Browser Extension Storybook.

## Building locally and Contributing

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)
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)

## Documentation Guidelines

Expand Down
29 changes: 14 additions & 15 deletions .storybook/3.COLORS.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ var(--color-text-muted)

/** Icons */
var(--color-icon-default)
var(--color-icon-alternative)
var(--color-icon-muted)

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

/** Overlays */
var(--color-overlay-default)
var(--color-overlay-inverse) [DEPRECATED]
var(--color-overlay-inverse)

/** User Actions */
var(--color-primary-default)
var(--color-primary-alternative)
var(--color-primary-muted)
var(--color-primary-inverse)
var(--color-primary-disabled) [DEPRECATED]
var(--color-primary-disabled)

var(--color-secondary-default) [DEPRECATED]
var(--color-secondary-alternative) [DEPRECATED]
var(--color-secondary-muted) [DEPRECATED]
var(--color-secondary-inverse) [DEPRECATED]
var(--color-secondary-disabled) [DEPRECATED]
var(--color-secondary-default)
var(--color-secondary-alternative)
var(--color-secondary-muted)
var(--color-secondary-inverse)
var(--color-secondary-disabled)

/** States */
/** Error */
var(--color-error-default)
var(--color-error-alternative)
var(--color-error-muted)
var(--color-error-inverse)
var(--color-error-disabled) [DEPRECATED]
var(--color-error-disabled)

/** Warning */
var(--color-warning-default)
var(--color-warning-alternative) [DEPRECATED]
var(--color-warning-alternative)
var(--color-warning-muted)
var(--color-warning-inverse)
var(--color-warning-disabled) [DEPRECATED]
var(--color-warning-disabled)

/** Success */
var(--color-success-default)
var(--color-success-alternative) [DEPRECATED]
var(--color-success-alternative)
var(--color-success-muted)
var(--color-success-inverse)
var(--color-success-disabled) [DEPRECATED]
var(--color-success-disabled)

/** Info */
var(--color-info-default)
var(--color-info-alternative) [DEPRECATED]
var(--color-info-alternative)
var(--color-info-muted)
var(--color-info-inverse)
var(--color-info-disabled) [DEPRECATED]
var(--color-info-disabled)
```

### **Component colors** (tier 3)
Expand Down
Loading

0 comments on commit 925a19f

Please sign in to comment.