Validate refresh response, don't provide defaultValue

MetaMask · Dec 15, 2020 · 24dd8fe · 24dd8fe
1 parent 8c7d2a5
commit 24dd8fe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
@@ -67,7 +67,7 @@ const initialState = {
     topAggId: null,
     routeState: '',
     swapsFeatureIsLive: false,
-    swapsQuoteRefreshTime: 0,
+    swapsQuoteRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
   },
 }
 
@@ -115,9 +115,7 @@ export default class SwapsController {
     // Default to fallback time unless API returns valid response
     let swapsQuoteRefreshTime = FALLBACK_QUOTE_REFRESH_TIME
     try {
-      swapsQuoteRefreshTime = await this._fetchSwapsQuoteRefreshTime(
-        FALLBACK_QUOTE_REFRESH_TIME,
-      )
+      swapsQuoteRefreshTime = await this._fetchSwapsQuoteRefreshTime()
     } catch (e) {
       console.error('Request for swaps quote refresh time failed: ', e)
     }

diff --git a/test/unit/app/controllers/swaps-test.js b/test/unit/app/controllers/swaps-test.js
@@ -121,7 +121,7 @@ const EMPTY_INIT_STATE = {
     topAggId: null,
     routeState: '',
     swapsFeatureIsLive: false,
-    swapsQuoteRefreshTime: 0,
+    swapsQuoteRefreshTime: 60000,
   },
 }
 

diff --git a/ui/app/ducks/swaps/swaps.js b/ui/app/ducks/swaps/swaps.js
@@ -330,6 +330,7 @@ export const navigateBackToBuildQuote = (history) => {
   return async (dispatch) => {
     // TODO: Ensure any fetch in progress is cancelled
     dispatch(navigatedBackToBuildQuote())
+
     history.push(BUILD_QUOTE_ROUTE)
   }
 }

diff --git a/ui/app/helpers/utils/fetch-with-cache.js b/ui/app/helpers/utils/fetch-with-cache.js
@@ -48,7 +48,6 @@ const fetchWithCache = async (
     cachedResponse: responseJson,
     cachedTime: currentTime,
   }
-
   cachedFetch[url] = cacheEntry
   await setStorageItem('cachedFetch', cachedFetch)
   return responseJson

diff --git a/ui/app/pages/swaps/swaps.util.js b/ui/app/pages/swaps/swaps.util.js
@@ -332,19 +332,21 @@ export async function fetchSwapsFeatureLiveness() {
   return status?.active
 }
 
-export async function fetchSwapsQuoteRefreshTime(defaultValue = 0) {
+export async function fetchSwapsQuoteRefreshTime() {
   const response = await fetchWithCache(
     getBaseApi('refreshTime'),
     { method: 'GET' },
     { cacheRefreshTime: 600000 },
   )
 
   // We presently use milliseconds in the UI
-  if (response?.seconds) {
+  if (typeof response?.seconds === 'number' && response.seconds > 0) {
     return response.seconds * 1000
   }
 
-  return defaultValue
+  throw new Error(
+    `MetaMask - refreshTime provided invalid response: ${response}`,
+  )
 }
 
 export async function fetchTokenPrice(address) {