1 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 9606841ae..3e26f333b 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -860,15 +860,16 @@ function markPasswordForgotten () {
 function unMarkPasswordForgotten () {
   return (dispatch) => {
     return background.unMarkPasswordForgotten(() => {
-      dispatch(actions.forgotPassword())
+      dispatch(actions.forgotPassword(false))
       forceUpdateMetamaskState(dispatch)
     })
   }
 }
 
-function forgotPassword () {
+function forgotPassword (forgotPasswordState = true) {
   return {
     type: actions.FORGOT_PASSWORD,
+    value: forgotPasswordState,
   }
 }
 
@@ -1504,6 +1505,7 @@ function pairUpdate (coin) {
     dispatch(actions.hideWarning())
     shapeShiftRequest('marketinfo', {pair: `${coin.toLowerCase()}_eth`}, (mktResponse) => {
       dispatch(actions.hideSubLoadingIndication())
+      if (mktResponse.error) return dispatch(actions.displayWarning(mktResponse.error))
       dispatch({
         type: actions.PAIR_UPDATE,
         value: {