TheDude
/
ciphermask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12321 from MetaMask/Version-v10.2.2

Browse Source 
Version v10.2.2 RC
feature/default_network_editable
ryanml 3 years ago committed by GitHub
parent 0512b9c9f9 b61d7700c8
commit 4b2ef17d80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      CHANGELOG.md
  2. 2
      app/_locales/en/messages.json
  3. 2
      package.json
  4. 32
      test/e2e/fixtures/imported-account/state.json
  5. 32
      test/e2e/fixtures/navigate-transactions/state.json
  6. 8
      test/jest/mock-store.js

7
CHANGELOG.md
Unescape View File

@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [10.2.2]
### Changed
- [#12256](https://github.com/MetaMask/metamask-extension/pull/12256): Updating instruction step when Ledger app has contract data or blind signing setting disabled
## [10.2.1]
### Fixed
- [#12315](https://github.com/MetaMask/metamask-extension/pull/12315): Fix ERC-20 token swaps
@ -2494,7 +2498,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Uncategorized
- Added the ability to restore accounts from seed words.
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.2.1...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.2.2...HEAD
[10.2.2]: https://github.com/MetaMask/metamask-extension/compare/v10.2.1...v10.2.2
[10.2.1]: https://github.com/MetaMask/metamask-extension/compare/v10.2.0...v10.2.1
[10.2.0]: https://github.com/MetaMask/metamask-extension/compare/v10.1.1...v10.2.0
[10.1.1]: https://github.com/MetaMask/metamask-extension/compare/v10.1.0...v10.1.1

2
app/_locales/en/messages.json
Unescape View File

@ -1229,7 +1229,7 @@
"message": "Prior to clicking confirm:"
},
"ledgerLiveDialogStepFour": {
"message": "Enable smart contract data on your Ledger device"
"message": "Enable \"smart contract data\" or \"blind signing\" on your Ledger device"
},
"ledgerLiveDialogStepOne": {
"message": "Enable Use Ledger Live under Settings > Advanced"

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "metamask-crx",
"version": "10.2.1",
"version": "10.2.2",
"private": true,
"repository": {
"type": "git",

32
test/e2e/fixtures/imported-account/state.json
Unescape View File

@ -95,7 +95,7 @@
"symbol": "LRC",
"decimals": 18,
"name": "Loopring",
"iconUrl": "https://airswap-token-images.s3.amazonaws.com/LRC.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -117,7 +117,7 @@
"symbol": "UMA",
"decimals": 18,
"name": "UMA",
"iconUrl": "https://assets.coingecko.com/coins/images/10951/thumb/UMA.png?1586307916",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -138,7 +138,7 @@
"symbol": "SUSHI",
"decimals": 18,
"name": "SushiSwap",
"iconUrl": "https://assets.coingecko.com/coins/images/12271/thumb/512x512_Logo_no_chop.png?1606986688",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -159,7 +159,7 @@
"symbol": "CRV",
"decimals": 18,
"name": "Curve DAO Token",
"iconUrl": "https://assets.coingecko.com/coins/images/12124/thumb/Curve.png?1597369484",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -180,7 +180,7 @@
"symbol": "COMP",
"decimals": 18,
"name": "Compound",
"iconUrl": "https://assets.coingecko.com/coins/images/10775/thumb/COMP.png?1592625425",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -201,7 +201,7 @@
"symbol": "BAL",
"decimals": 18,
"name": "Balancer",
"iconUrl": "https://assets.coingecko.com/coins/images/11683/thumb/Balancer.png?1592792958",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -222,7 +222,7 @@
"symbol": "MATIC",
"decimals": 18,
"name": "Polygon",
"iconUrl": "https://raw.githubusercontent.com/MetaMask/eth-contract-metadata/master/images/matic-network-logo.svg",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -243,7 +243,7 @@
"symbol": "BAT",
"decimals": 18,
"name": "Basic Attention Tok",
"iconUrl": "https://s3.amazonaws.com/airswap-token-images/BAT.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -269,7 +269,7 @@
"symbol": "LRC",
"decimals": 18,
"name": "Loopring",
"iconUrl": "https://airswap-token-images.s3.amazonaws.com/LRC.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -291,7 +291,7 @@
"symbol": "UMA",
"decimals": 18,
"name": "UMA",
"iconUrl": "https://assets.coingecko.com/coins/images/10951/thumb/UMA.png?1586307916",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -312,7 +312,7 @@
"symbol": "SUSHI",
"decimals": 18,
"name": "SushiSwap",
"iconUrl": "https://assets.coingecko.com/coins/images/12271/thumb/512x512_Logo_no_chop.png?1606986688",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -333,7 +333,7 @@
"symbol": "CRV",
"decimals": 18,
"name": "Curve DAO Token",
"iconUrl": "https://assets.coingecko.com/coins/images/12124/thumb/Curve.png?1597369484",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -354,7 +354,7 @@
"symbol": "COMP",
"decimals": 18,
"name": "Compound",
"iconUrl": "https://assets.coingecko.com/coins/images/10775/thumb/COMP.png?1592625425",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -375,7 +375,7 @@
"symbol": "BAL",
"decimals": 18,
"name": "Balancer",
"iconUrl": "https://assets.coingecko.com/coins/images/11683/thumb/Balancer.png?1592792958",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -396,7 +396,7 @@
"symbol": "MATIC",
"decimals": 18,
"name": "Polygon",
"iconUrl": "https://raw.githubusercontent.com/MetaMask/eth-contract-metadata/master/images/matic-network-logo.svg",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -417,7 +417,7 @@
"symbol": "BAT",
"decimals": 18,
"name": "Basic Attention Tok",
"iconUrl": "https://s3.amazonaws.com/airswap-token-images/BAT.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",

32
test/e2e/fixtures/navigate-transactions/state.json
Unescape View File

@ -95,7 +95,7 @@
"symbol": "LRC",
"decimals": 18,
"name": "Loopring",
"iconUrl": "https://airswap-token-images.s3.amazonaws.com/LRC.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -117,7 +117,7 @@
"symbol": "UMA",
"decimals": 18,
"name": "UMA",
"iconUrl": "https://assets.coingecko.com/coins/images/10951/thumb/UMA.png?1586307916",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -138,7 +138,7 @@
"symbol": "SUSHI",
"decimals": 18,
"name": "SushiSwap",
"iconUrl": "https://assets.coingecko.com/coins/images/12271/thumb/512x512_Logo_no_chop.png?1606986688",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -159,7 +159,7 @@
"symbol": "CRV",
"decimals": 18,
"name": "Curve DAO Token",
"iconUrl": "https://assets.coingecko.com/coins/images/12124/thumb/Curve.png?1597369484",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -180,7 +180,7 @@
"symbol": "COMP",
"decimals": 18,
"name": "Compound",
"iconUrl": "https://assets.coingecko.com/coins/images/10775/thumb/COMP.png?1592625425",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -201,7 +201,7 @@
"symbol": "BAL",
"decimals": 18,
"name": "Balancer",
"iconUrl": "https://assets.coingecko.com/coins/images/11683/thumb/Balancer.png?1592792958",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -222,7 +222,7 @@
"symbol": "MATIC",
"decimals": 18,
"name": "Polygon",
"iconUrl": "https://raw.githubusercontent.com/MetaMask/eth-contract-metadata/master/images/matic-network-logo.svg",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -243,7 +243,7 @@
"symbol": "BAT",
"decimals": 18,
"name": "Basic Attention Tok",
"iconUrl": "https://s3.amazonaws.com/airswap-token-images/BAT.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -269,7 +269,7 @@
"symbol": "LRC",
"decimals": 18,
"name": "Loopring",
"iconUrl": "https://airswap-token-images.s3.amazonaws.com/LRC.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -291,7 +291,7 @@
"symbol": "UMA",
"decimals": 18,
"name": "UMA",
"iconUrl": "https://assets.coingecko.com/coins/images/10951/thumb/UMA.png?1586307916",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -312,7 +312,7 @@
"symbol": "SUSHI",
"decimals": 18,
"name": "SushiSwap",
"iconUrl": "https://assets.coingecko.com/coins/images/12271/thumb/512x512_Logo_no_chop.png?1606986688",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -333,7 +333,7 @@
"symbol": "CRV",
"decimals": 18,
"name": "Curve DAO Token",
"iconUrl": "https://assets.coingecko.com/coins/images/12124/thumb/Curve.png?1597369484",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -354,7 +354,7 @@
"symbol": "COMP",
"decimals": 18,
"name": "Compound",
"iconUrl": "https://assets.coingecko.com/coins/images/10775/thumb/COMP.png?1592625425",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -375,7 +375,7 @@
"symbol": "BAL",
"decimals": 18,
"name": "Balancer",
"iconUrl": "https://assets.coingecko.com/coins/images/11683/thumb/Balancer.png?1592792958",
"iconUrl": "",
"aggregators": [
"bancor",
"cmc",
@ -396,7 +396,7 @@
"symbol": "MATIC",
"decimals": 18,
"name": "Polygon",
"iconUrl": "https://raw.githubusercontent.com/MetaMask/eth-contract-metadata/master/images/matic-network-logo.svg",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",
@ -417,7 +417,7 @@
"symbol": "BAT",
"decimals": 18,
"name": "Basic Attention Tok",
"iconUrl": "https://s3.amazonaws.com/airswap-token-images/BAT.png",
"iconUrl": "",
"aggregators": [
"airswapLight",
"bancor",

8
test/jest/mock-store.js
Unescape View File

@ -230,8 +230,7 @@ export const createSwapsMockStore = () => {
symbol: 'UNI',
decimals: 18,
name: 'Uniswap',
iconUrl:
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984/logo.png',
iconUrl: '',
aggregators: [
'airswapLight',
'bancor',
@ -253,7 +252,7 @@ export const createSwapsMockStore = () => {
symbol: 'LINK',
decimals: 18,
name: 'Chainlink',
iconUrl: 'https://s3.amazonaws.com/airswap-token-images/LINK.png',
iconUrl: '',
aggregators: [
'airswapLight',
'bancor',
@ -275,8 +274,7 @@ export const createSwapsMockStore = () => {
symbol: 'SUSHI',
decimals: 18,
name: 'SushiSwap',
iconUrl:
'https://assets.coingecko.com/coins/images/12271/thumb/512x512_Logo_no_chop.png?1606986688',
iconUrl: '',
aggregators: [
'bancor',
'cmc',

Write Preview
Loading…
Cancel
Save