From 4563b674bd772ccfca844d620ba00f0a56330c0d Mon Sep 17 00:00:00 2001
From: Makoto Inoue <2630+makoto@users.noreply.github.com>
Date: Sat, 5 Dec 2020 20:17:18 +0000
Subject: [PATCH] Debug favourite caching issue (#1013)

* WIP

* Unstable site fix

- reload page on reconnect
- remove fetchPolicy

* Update key

* Revert to old key

* Change INFURA_ID depending on host

* Remove debugging messages

* Remove console.log

* Remove extra comments
---
 src/App.js                                              | 1 -
 src/api/ens.js                                          | 5 ++++-
 src/api/manager/resolvers.js                            | 4 ----
 src/api/web3modal.js                                    | 5 ++++-
 src/apolloClient.js                                     | 8 --------
 src/components/NetworkInformation/NetworkInformation.js | 4 ++--
 src/routes/Favourites.js                                | 2 +-
 src/routes/Home.js                                      | 5 ++---
 src/utils/utils.js                                      | 2 +-
 9 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/App.js b/src/App.js
index 1b57b51c8..bd16938d7 100644
--- a/src/App.js
+++ b/src/App.js
@@ -68,7 +68,6 @@ const App = ({ initialClient, initialNetworkId }) => {
       <Query query={GET_ERRORS}>
         {({ data }) => {
           setupAnalytics()
-
           errorHandler.start({
             key: 'AIzaSyDW3loXBr_2e-Q2f8ZXdD0UAvMzaodBBNg',
             projectId: 'idyllic-ethos-235310'
diff --git a/src/api/ens.js b/src/api/ens.js
index 988c53497..117c66697 100644
--- a/src/api/ens.js
+++ b/src/api/ens.js
@@ -1,6 +1,9 @@
 import { setupENS } from '@ensdomains/ui'
 
-const INFURA_ID = '58a380d3ecd545b2b5b3dad5d2b18bf0'
+const INFURA_ID =
+  window.location.host === 'app.ens.domains'
+    ? '90f210707d3c450f847659dc9a3436ea'
+    : '58a380d3ecd545b2b5b3dad5d2b18bf0'
 
 let ens = {},
   registrar = {},
diff --git a/src/api/manager/resolvers.js b/src/api/manager/resolvers.js
index 4f5e652a4..bf1b19d26 100644
--- a/src/api/manager/resolvers.js
+++ b/src/api/manager/resolvers.js
@@ -927,7 +927,6 @@ const resolvers = {
         'ensFavourites',
         JSON.stringify(data.favourites)
       )
-
       return data
     },
     deleteFavourite: async (_, { domain }, { cache }) => {
@@ -944,7 +943,6 @@ const resolvers = {
         'ensFavourites',
         JSON.stringify(data.favourites)
       )
-
       return data
     },
     addSubDomainFavourite: async (_, { domain }, { cache }) => {
@@ -963,7 +961,6 @@ const resolvers = {
         'ensSubDomainFavourites',
         JSON.stringify(data.subDomainFavourites)
       )
-
       return data
     },
     deleteSubDomainFavourite: async (_, { domain }, { cache }) => {
@@ -980,7 +977,6 @@ const resolvers = {
         'ensSubDomainFavourites',
         JSON.stringify(data.subDomainFavourites)
       )
-
       return data
     }
   }
diff --git a/src/api/web3modal.js b/src/api/web3modal.js
index c45a0bb92..65fefc6c7 100644
--- a/src/api/web3modal.js
+++ b/src/api/web3modal.js
@@ -7,7 +7,10 @@ import Torus from '@toruslabs/torus-embed'
 import Portis from '@portis/web3'
 import { getNetwork } from '@ensdomains/ui'
 
-const INFURA_ID = '58a380d3ecd545b2b5b3dad5d2b18bf0'
+const INFURA_ID =
+  window.location.host === 'app.ens.domains'
+    ? '90f210707d3c450f847659dc9a3436ea'
+    : '58a380d3ecd545b2b5b3dad5d2b18bf0'
 const PORTIS_ID = '57e5d6ca-e408-4925-99c4-e7da3bdb8bf5'
 let provider
 const option = {
diff --git a/src/apolloClient.js b/src/apolloClient.js
index 148455d5f..23d14b0a4 100644
--- a/src/apolloClient.js
+++ b/src/apolloClient.js
@@ -52,14 +52,6 @@ export async function setupClient(network) {
     link: ApolloLink.from([stateLink, httpLink], cache)
   }
 
-  if (process.env.REACT_APP_STAGE !== 'local') {
-    option.defaultOptions = {
-      watchQuery: {
-        fetchPolicy: 'network-only'
-      }
-    }
-  }
-
   client = new ApolloClient(option)
   return client
 }
diff --git a/src/components/NetworkInformation/NetworkInformation.js b/src/components/NetworkInformation/NetworkInformation.js
index 73e4debb5..a3074e050 100644
--- a/src/components/NetworkInformation/NetworkInformation.js
+++ b/src/components/NetworkInformation/NetworkInformation.js
@@ -144,14 +144,14 @@ function NetworkInformation() {
     }
     if (network) {
       switchNetwork(network.chainId)
-      refetch()
+      location.reload()
     }
   }
 
   const handleDisconnect = async () => {
     await disconnect()
     switchNetwork(1)
-    refetch()
+    location.reload()
   }
 
   if (loading) {
diff --git a/src/routes/Favourites.js b/src/routes/Favourites.js
index f563d6d56..b54eacf6e 100644
--- a/src/routes/Favourites.js
+++ b/src/routes/Favourites.js
@@ -89,7 +89,7 @@ function Favourites() {
   const { data: { subDomainFavourites } = [] } = useQuery(
     GET_SUBDOMAIN_FAVOURITES
   )
-  const ids = favourites.map(f => getNamehash(f.name))
+  const ids = favourites && favourites.map(f => getNamehash(f.name))
   const { data: { registrations } = [] } = useQuery(
     GET_REGISTRATIONS_BY_IDS_SUBGRAPH,
     {
diff --git a/src/routes/Home.js b/src/routes/Home.js
index f53f177a9..4eb997c95 100644
--- a/src/routes/Home.js
+++ b/src/routes/Home.js
@@ -313,15 +313,14 @@ export default ({ match }) => {
     }
     if (network) {
       switchNetwork(network.chainId)
-      refetch()
     }
-    refetch()
+    location.reload()
   }
 
   const handleDisconnect = async () => {
     await disconnect()
     switchNetwork(1)
-    refetch()
+    location.reload()
   }
   return (
     <>
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 585e610c8..8cdecef17 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -231,7 +231,7 @@ export async function handleNetworkChange() {
     client = await setupClient()
     await client.mutate({
       mutation: SET_ERROR,
-      variables: { message: e.message }
+      variables: { message: e && e.message }
     })
   }
   return { client, networkId }