From 47181a62d117062ebfeeaa48b66cf8ccda8e9f0a Mon Sep 17 00:00:00 2001 From: Bradley Suira Date: Sat, 23 Jan 2021 12:23:24 -0500 Subject: [PATCH 1/3] fix: compare assets when update injected ethereum for rsk and set to rbtc back --- package-lock.json | 2 +- package.json | 2 +- src/manifest.json | 2 +- src/views/Settings.vue | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3cd2b9181..77635c03d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "liquality-wallet", - "version": "0.13.1", + "version": "0.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 882781900..060bf8cb0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "liquality-wallet", - "version": "0.13.1", + "version": "0.14.0", "private": true, "license": "MIT", "author": "Liquality ", diff --git a/src/manifest.json b/src/manifest.json index 740fe1c16..c88d9b7df 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "manifest_version": 2, - "version": "0.13.1", + "version": "0.14.0", "name": "Liquality Wallet", "description": "Secure multi-crypto wallet with built-in Atomic Swaps!", "homepage_url": "https://liquality.io", diff --git a/src/views/Settings.vue b/src/views/Settings.vue index c6e8509db..28615e221 100644 --- a/src/views/Settings.vue +++ b/src/views/Settings.vue @@ -64,6 +64,10 @@ export default { else this.disableEthereumInjection() }, updateInjectEthereumAsset (asset) { + // Update back to RBTC as asset + if (asset === 'RSK') { + asset = 'RBTC' + } this.setEthereumInjectionAsset({ asset }) } } From ded789fc9d2e8cf2ca0e419edf717b602e2c958f Mon Sep 17 00:00:00 2001 From: Bradley Suira Date: Sat, 23 Jan 2021 12:57:19 -0500 Subject: [PATCH 2/3] fix: added migration to update RSK to RBTC as injected ethereum asset --- src/store/migrations.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/store/migrations.js b/src/store/migrations.js index 92e378187..16141fc89 100644 --- a/src/store/migrations.js +++ b/src/store/migrations.js @@ -35,6 +35,17 @@ const migrations = [ } return { ...state, customTokens } } + }, + { // Fix for RSK token injected asset + version: 4, + migrate: async (state) => { + if (state.injectEthereumAsset === 'RSK') { + const injectEthereumAsset = 'RBTC' + return { ...state, injectEthereumAsset } + } + + return { ...state } + } } ] From 8a5f7012fdf4d61ec9905e70e3a0a902f063b822 Mon Sep 17 00:00:00 2001 From: Bradley Suira Date: Sat, 23 Jan 2021 13:24:28 -0500 Subject: [PATCH 3/3] feat: bumped version for dev --- package-lock.json | 2 +- package.json | 2 +- src/manifest.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77635c03d..49d13d7e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "liquality-wallet", - "version": "0.14.0", + "version": "0.13.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 060bf8cb0..34aa5c3a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "liquality-wallet", - "version": "0.14.0", + "version": "0.13.2", "private": true, "license": "MIT", "author": "Liquality ", diff --git a/src/manifest.json b/src/manifest.json index c88d9b7df..82ba22c04 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "manifest_version": 2, - "version": "0.14.0", + "version": "0.13.2", "name": "Liquality Wallet", "description": "Secure multi-crypto wallet with built-in Atomic Swaps!", "homepage_url": "https://liquality.io",