Code refactor

Create action for clearing upgrade timer

src/renderer/redux/actions/app.js

@@ -139,10 +139,21 @@ export function doDownloadUpgradeRequested() {
   };
 }
 
-export function doAutoUpdate() {
+export function doClearUpgradeTimer() {
   return (dispatch, getState) => {
     const state = getState();
-    
+
+    if (selectUpgradeTimer(state)) {
+      clearInterval(selectUpgradeTimer(state));
+      dispatch({
+        type: ACTIONS.CLEAR_UPGRADE_TIMER,
+      });
+    }
+  };
+}
+
+export function doAutoUpdate() {
+  return dispatch => {
     dispatch({
       type: ACTIONS.AUTO_UPDATE_DOWNLOADED,
     });
@@ -153,19 +164,13 @@ export function doAutoUpdate() {
       })
     );
 
-    if (selectUpgradeTimer(state)) {
+    dispatch(doClearUpgradeTimer());
-      clearInterval(selectUpgradeTimer(state));
-    }
   };
 }
 
 export function doAutoUpdateDeclined() {
-  return (dispatch, getState) => {
+  return dispatch => {
-    const state = getState();
+    dispatch(doClearUpgradeTimer());
-
-    if (selectUpgradeTimer(state)) {
-      clearInterval(selectUpgradeTimer(state));
-    }
 
     dispatch({
       type: ACTIONS.AUTO_UPDATE_DECLINED,

src/renderer/redux/reducers/app.js

@@ -184,6 +184,11 @@ reducers[ACTIONS.HISTORY_NAVIGATE] = state =>
     modalProps: {},
   });
 
+reducers[ACTIONS.CLEAR_UPGRADE_TIMER] = state =>
+  Object.assign({}, state, {
+    checkUpgradeTimer: undefined,
+  });
+
 export default function reducer(state: AppState = defaultState, action: any) {
   const handler = reducers[action.type];
   if (handler) return handler(state, action);