From 2580adc2ca36bbc957a779e62faed932c9848cc2 Mon Sep 17 00:00:00 2001 From: Nenad Vracar <34926005+nenadV91@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:49:20 +0100 Subject: [PATCH] [Hotfix - 1.5.1] - revert WalletConnect changes (#1940) * revert WalletConnect changes * Commit to Reopen PR --- package.json | 2 +- .../components/WalletModal/WalletModalMod.tsx | 2 +- yarn.lock | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6f2533451..251dffaa1 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "@web3-react/fortmatic-connector": "^6.1.6", "@web3-react/injected-connector": "^6.0.7", "@web3-react/portis-connector": "^6.1.9", - "@web3-react/walletconnect-connector": "^6.2.8", + "@web3-react/walletconnect-connector": "6.2.4", "@web3-react/walletlink-connector": "^6.2.5", "ajv": "^6.12.3", "cids": "^1.0.0", diff --git a/src/custom/components/WalletModal/WalletModalMod.tsx b/src/custom/components/WalletModal/WalletModalMod.tsx index 9252d1dc0..03ffd6963 100644 --- a/src/custom/components/WalletModal/WalletModalMod.tsx +++ b/src/custom/components/WalletModal/WalletModalMod.tsx @@ -206,7 +206,7 @@ export default function WalletModal({ setWalletView(WALLET_VIEWS.PENDING) // if the connector is walletconnect and the user has already tried to connect, manually reset the connector - if (connector instanceof WalletConnectConnector) { + if (connector instanceof WalletConnectConnector && connector.walletConnectProvider?.wc?.uri) { connector.walletConnectProvider = undefined } diff --git a/yarn.lock b/yarn.lock index 0b1e7dd8c..da88aaf48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4874,7 +4874,7 @@ resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034" integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ== -"@walletconnect/ethereum-provider@1.6.4", "@walletconnect/ethereum-provider@^1.6.0": +"@walletconnect/ethereum-provider@1.6.4": version "1.6.4" resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-1.6.4.tgz#ffe3fee5aab7d0d7f02da2d31e7125e82de1ab53" integrity sha512-QhrBcAv/XJKz+UGRChjOl/SSJfbf0+QL86KjHzPufSTIGazusjNRtXc60QdFMy3Nh5u3xLODUbjXeSYIUR9UHQ== @@ -5009,7 +5009,7 @@ js-sha3 "0.8.0" query-string "6.13.5" -"@walletconnect/web3-provider@^1.6.6": +"@walletconnect/web3-provider@^1.5.0", "@walletconnect/web3-provider@^1.6.6": version "1.6.6" resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.6.6.tgz#7be7b6d6230d6925f8728cdddc226ef24119e602" integrity sha512-8z4r9JCE0lKuZmVCPSdYnX114ckQ+oMfr9D8osRBtdyhvN9elwITMloUJfACDRelcuet94yEbXuDobQeBDDkkw== @@ -5085,12 +5085,12 @@ resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-6.0.7.tgz#34a6204224467eedc6123abaf55fbb6baeb2809f" integrity sha512-ofGmfDhxmNT1/P/MgVa8IKSkCStFiyvXe+U5tyZurKdrtTDFU+wJ/LxClPDtFerWpczNFPUSrKcuhfPX1sI6+A== -"@web3-react/walletconnect-connector@^6.2.8": - version "6.2.8" - resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-connector/-/walletconnect-connector-6.2.8.tgz#069d27df226464775de25248e71e8c407c374cc7" - integrity sha512-HENFuGw+inlYHPdZc1vKKVVYzJ/h/JJIXZVzXC2UPQ+c14cX1t0WSnQ7ywUYHkgRqYWMsngTDZTKRMU2+4O1Tg== +"@web3-react/walletconnect-connector@6.2.4": + version "6.2.4" + resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-connector/-/walletconnect-connector-6.2.4.tgz#0a128699fc93ddac885935f4aeca32925f6285f0" + integrity sha512-IEVjCXrlcfVa6ggUBEyKtLRaLQuZGtT2lGuzOFtdbJJkN84u1++pzzeDrcsVhKAoS5wq33zyJT9baEbG1Aed8g== dependencies: - "@walletconnect/ethereum-provider" "^1.6.0" + "@walletconnect/web3-provider" "^1.5.0" "@web3-react/abstract-connector" "^6.0.7" "@web3-react/types" "^6.0.7" tiny-invariant "^1.0.6"