From 7cae296a194730435ed9f20ad9f7860fa00dcb17 Mon Sep 17 00:00:00 2001
From: Won Jun Bae <wonjun@gmail.com>
Date: Sun, 25 Sep 2022 13:24:24 -0700
Subject: [PATCH 1/2] check if response is null before checking response.ok

---
 dapp/src/services/apy.service.js                      | 2 +-
 dapp/src/services/balances.service.js                 | 2 +-
 dapp/src/services/transaction-history-page.service.js | 2 +-
 dapp/src/services/transaction-history.service.js      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dapp/src/services/apy.service.js b/dapp/src/services/apy.service.js
index 32a765393b..c20680f83c 100644
--- a/dapp/src/services/apy.service.js
+++ b/dapp/src/services/apy.service.js
@@ -12,7 +12,7 @@ export default class ApyService {
           throw new Error(`Unexpected days param: ${days}`)
         }
         const response = await fetch(endpoint)
-        if (!response.ok) {
+        if (!response || !response.ok) {
           throw new Error(`Failed to fetch ${days} day APY`, err)
         }
         const json = await response.json()
diff --git a/dapp/src/services/balances.service.js b/dapp/src/services/balances.service.js
index e120963e2b..2e9fb8600c 100644
--- a/dapp/src/services/balances.service.js
+++ b/dapp/src/services/balances.service.js
@@ -44,7 +44,7 @@ export default class BalancesService {
       body: JSON.stringify(data),
     })
 
-    if (!response.ok) {
+    if (!response || !response.ok) {
       throw new Error(
         `Could not fetch balances from Alchemy http status: ${response.status}`
       )
diff --git a/dapp/src/services/transaction-history-page.service.js b/dapp/src/services/transaction-history-page.service.js
index b37c414cd7..2d089d40bc 100644
--- a/dapp/src/services/transaction-history-page.service.js
+++ b/dapp/src/services/transaction-history-page.service.js
@@ -19,7 +19,7 @@ export default class TransactionHistoryPageService {
       }/${account.toLowerCase()}/history?per_page=${transactionHistoryItemsPerPage}&page=${page}${filter_param}`
     )
 
-    if (!response.ok) {
+    if (!response || !response.ok) {
       throw new Error('Failed fetching history from analytics')
     }
 
diff --git a/dapp/src/services/transaction-history.service.js b/dapp/src/services/transaction-history.service.js
index 5c4ece1156..6b4c1cd9c2 100644
--- a/dapp/src/services/transaction-history.service.js
+++ b/dapp/src/services/transaction-history.service.js
@@ -13,7 +13,7 @@ export default class TransactionHistoryService {
         this.baseURL
       }/${account.toLowerCase()}/history?per_page=1000000${filter_param}`
     )
-    if (!response.ok) {
+    if (!response || !response.ok) {
       throw new Error('Failed fetching history from analytics')
     }
 

From d8bcf62e7c57da4f31d0b6cdab2eb3cab8854de9 Mon Sep 17 00:00:00 2001
From: Won Jun Bae <wonjun@gmail.com>
Date: Sun, 25 Sep 2022 14:32:13 -0700
Subject: [PATCH 2/2] Update ContractStore in AccountListener when the user
 disconnects the wallet

---
 contracts/test/vault/rebase.js                   | 2 +-
 dapp/src/components/AccountListener.js           | 3 +++
 dapp/src/components/buySell/BalanceHeader.js     | 4 +++-
 dapp/src/components/wrap/BalanceHeaderWrapped.js | 4 +++-
 dapp/src/utils/contracts.js                      | 3 +++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/contracts/test/vault/rebase.js b/contracts/test/vault/rebase.js
index f203bd58e5..3416702bcb 100644
--- a/contracts/test/vault/rebase.js
+++ b/contracts/test/vault/rebase.js
@@ -51,7 +51,7 @@ describe("Vault rebase pausing", async () => {
     );
   });
 
-  it("Should allow governor tonpause rebasing", async () => {
+  it("Should allow governor to pause rebasing", async () => {
     let { vault, governor } = await loadFixture(defaultFixture);
     await vault.connect(governor).pauseRebase();
   });
diff --git a/dapp/src/components/AccountListener.js b/dapp/src/components/AccountListener.js
index 4263860b4b..6fbd4e7323 100644
--- a/dapp/src/components/AccountListener.js
+++ b/dapp/src/components/AccountListener.js
@@ -86,6 +86,9 @@ const AccountListener = (props) => {
         s.allowances = {}
         s.balances = {}
       })
+      ContractStore.update((s) => {
+        s.walletConnected = false
+      })
       PoolStore.update((s) => {
         s.claimable_ogn = null
         s.lp_tokens = null
diff --git a/dapp/src/components/buySell/BalanceHeader.js b/dapp/src/components/buySell/BalanceHeader.js
index 344bdcdeee..2c739fccc0 100644
--- a/dapp/src/components/buySell/BalanceHeader.js
+++ b/dapp/src/components/buySell/BalanceHeader.js
@@ -239,7 +239,9 @@ const BalanceHeader = ({
             <Statistic
               title={fbt('Balance', 'OUSD Balance')}
               value={
-                !isNaN(parseFloat(displayedBalance)) && ousdBalanceLoaded
+                walletConnected &&
+                !isNaN(parseFloat(displayedBalance)) &&
+                ousdBalanceLoaded
                   ? displayedBalance
                   : '--.--'
               }
diff --git a/dapp/src/components/wrap/BalanceHeaderWrapped.js b/dapp/src/components/wrap/BalanceHeaderWrapped.js
index 742a03d938..8fc2a9fa00 100644
--- a/dapp/src/components/wrap/BalanceHeaderWrapped.js
+++ b/dapp/src/components/wrap/BalanceHeaderWrapped.js
@@ -257,7 +257,9 @@ const BalanceHeaderWrapped = ({
             <Statistic
               title={fbt('wOUSD Balance', 'wOUSD Balance')}
               value={
-                !isNaN(parseFloat(displayedWousdBalance)) && wousdBalanceLoaded
+                walletConnected &&
+                !isNaN(parseFloat(displayedWousdBalance)) &&
+                wousdBalanceLoaded
                   ? displayedWousdBalance
                   : '--.--'
               }
diff --git a/dapp/src/utils/contracts.js b/dapp/src/utils/contracts.js
index 9cf499ce51..d078fbcea1 100644
--- a/dapp/src/utils/contracts.js
+++ b/dapp/src/utils/contracts.js
@@ -389,6 +389,9 @@ export async function setupContracts(account, library, chainId, fetchId) {
 
   const fetchCreditsPerToken = async () => {
     try {
+      if (!walletConnected) {
+        return
+      }
       const response = await fetch(process.env.CREDITS_ANALYTICS_ENDPOINT)
       if (response.ok) {
         const json = await response.json()