Merge pull request #487 from OasisDEX/dev

Release 2.0.4
OasisDEX · Sep 23, 2021 · 735fe71 · 735fe71
2 parents ac38293 + d8b4079
commit 735fe71
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/components/connectWallet/ConnectWallet.tsx b/components/connectWallet/ConnectWallet.tsx
@@ -448,10 +448,6 @@ function autoConnect(
   let firstTime = true
 
   const subscription = web3Context$.subscribe(async (web3Context) => {
-    if (web3Context.status === 'error' && web3Context.error instanceof UnsupportedChainIdError) {
-      web3Context.deactivate()
-    }
-
     try {
       const serialized = localStorage.getItem(AUTO_CONNECT)
       if (firstTime && web3Context.status === 'notConnected' && serialized) {
@@ -508,10 +504,17 @@ async function connectReadonly(web3Context: Web3ContextNotConnected) {
 }
 
 export function WithConnection({ children }: WithChildren) {
+  const { replace } = useRedirect()
   const { web3Context$ } = useAppContext()
   const web3Context = useObservable(web3Context$)
 
   useEffect(() => {
+    if (web3Context?.status === 'error' && web3Context.error instanceof UnsupportedChainIdError) {
+      disconnect(web3Context)
+      redirectState$.next(window.location.pathname)
+      replace(`/connect`)
+    }
+
     if (web3Context && web3Context.status === 'connectedReadonly') {
       redirectState$.next(window.location.pathname)
     }
@@ -526,11 +529,19 @@ export function WithWalletConnection({ children }: WithChildren) {
   const { replace } = useRedirect()
   const { web3Context$ } = useAppContext()
   const web3Context = useObservable(web3Context$)
+
   useEffect(() => {
+    if (web3Context?.status === 'error' && web3Context.error instanceof UnsupportedChainIdError) {
+      disconnect(web3Context)
+      redirectState$.next(window.location.pathname)
+      replace(`/connect`)
+    }
+
     if (web3Context?.status === 'connectedReadonly') {
       redirectState$.next(window.location.pathname)
       replace(`/connect`)
     }
+
     if (web3Context?.status === 'notConnected') {
       redirectState$.next(window.location.pathname)
       autoConnect(web3Context$, getNetworkId(), () => replace(`/connect`))

diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -289,6 +289,7 @@
   "moving-into-vault": "Moving into Vault",
   "moving-out-vault": "Moving out of Vault",
   "multiple": "Multiple",
+  "metamask-unsupported-network": "You are on an unsupported network. Please switch to Mainnet.",
   "net-value": "Net Value",
   "nav": {
     "about": "About",