From 25901380c1e44c8cb9cc7bbfcd1ef54c1fb084df Mon Sep 17 00:00:00 2001 From: Niranjana Binoy <43930900+NiranjanaBinoy@users.noreply.github.com> Date: Fri, 8 Oct 2021 12:20:08 -0400 Subject: [PATCH 1/4] removing the icronUrl in tokens fron the state.json for fixtures (#12309) --- test/e2e/fixtures/imported-account/state.json | 32 +++++++++---------- .../fixtures/navigate-transactions/state.json | 32 +++++++++---------- test/jest/mock-store.js | 8 ++--- 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/test/e2e/fixtures/imported-account/state.json b/test/e2e/fixtures/imported-account/state.json index edb463d87..42f5a7a54 100644 --- a/test/e2e/fixtures/imported-account/state.json +++ b/test/e2e/fixtures/imported-account/state.json @@ -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", diff --git a/test/e2e/fixtures/navigate-transactions/state.json b/test/e2e/fixtures/navigate-transactions/state.json index 988098e68..3f08971b0 100644 --- a/test/e2e/fixtures/navigate-transactions/state.json +++ b/test/e2e/fixtures/navigate-transactions/state.json @@ -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", diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js index a23d7ad35..3d397a52c 100644 --- a/test/jest/mock-store.js +++ b/test/jest/mock-store.js @@ -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', From bd05a3e1deafb9d16224e65ae31357d259ae3f3a Mon Sep 17 00:00:00 2001 From: Jean P <10632523+TamtamHero@users.noreply.github.com> Date: Sat, 9 Oct 2021 19:30:46 +0200 Subject: [PATCH 2/4] Update warning message when Ledger app has contract data/blind signing setting disabled (#12256) --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 2d382d25c..e892f5040 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -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" From 6ae261e7b0bac06568f6c5e3d5221634c79c58df Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Sat, 9 Oct 2021 17:35:41 +0000 Subject: [PATCH 3/4] Version v10.2.2 --- CHANGELOG.md | 13 ++++++++++++- package.json | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d593da66..631c98815 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [10.2.2] +### Uncategorized +- Update warning message when Ledger app has contract data/blind signing setting disabled ([#12256](https://github.com/MetaMask/metamask-extension/pull/12256)) +- removing the icronUrl in tokens fron the state.json for fixtures ([#12309](https://github.com/MetaMask/metamask-extension/pull/12309)) +- Version v10.2.1 RC ([#12317](https://github.com/MetaMask/metamask-extension/pull/12317)) +- [skip e2e] Updating v10.2.1 changelog ([#12318](https://github.com/MetaMask/metamask-extension/pull/12318)) +- Version v10.2.1 +- use improved-yarn-audit and exclude 1002401 and 1002581 ([#12310](https://github.com/MetaMask/metamask-extension/pull/12310)) +- Update `immer` from v8 to v9 ([#12303](https://github.com/MetaMask/metamask-extension/pull/12303)) + ## [10.2.1] ### Fixed - [#12315](https://github.com/MetaMask/metamask-extension/pull/12315): Fix ERC-20 token swaps @@ -2494,7 +2504,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 diff --git a/package.json b/package.json index 3cfdee9d3..3dc9c235d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.2.1", + "version": "10.2.2", "private": true, "repository": { "type": "git", From b61d7700c8a8d1d40253fe884d4e1660d4a8c0ee Mon Sep 17 00:00:00 2001 From: ryanml Date: Sat, 9 Oct 2021 10:40:33 -0700 Subject: [PATCH 4/4] Updating changelog --- CHANGELOG.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 631c98815..41ddfdf69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [10.2.2] -### Uncategorized -- Update warning message when Ledger app has contract data/blind signing setting disabled ([#12256](https://github.com/MetaMask/metamask-extension/pull/12256)) -- removing the icronUrl in tokens fron the state.json for fixtures ([#12309](https://github.com/MetaMask/metamask-extension/pull/12309)) -- Version v10.2.1 RC ([#12317](https://github.com/MetaMask/metamask-extension/pull/12317)) -- [skip e2e] Updating v10.2.1 changelog ([#12318](https://github.com/MetaMask/metamask-extension/pull/12318)) -- Version v10.2.1 -- use improved-yarn-audit and exclude 1002401 and 1002581 ([#12310](https://github.com/MetaMask/metamask-extension/pull/12310)) -- Update `immer` from v8 to v9 ([#12303](https://github.com/MetaMask/metamask-extension/pull/12303)) +### 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