From 8b7b097034f274631917b2df8617c24feb09f69c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 3 Jan 2017 10:42:09 -0800
Subject: Apply new pattern to repetitive functions

---
 ui/app/actions.js | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'ui')

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 018baff73..bc9b4a092 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -231,7 +231,6 @@ function createNewVaultAndKeychain (password) {
       if (err) {
         return dispatch(actions.showWarning(err.message))
       }
-      dispatch(actions.updateMetamaskState(newState))
     })
   }
 }
@@ -467,16 +466,7 @@ function updateMetamaskState (newState) {
 }
 
 function lockMetamask () {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    background.setLocked((err, newState) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        return dispatch(actions.displayWarning(err.message))
-      }
-      dispatch(actions.updateMetamaskState(newState))
-    })
-  }
+  return callBackgroundThenUpdate(background.setLocked)
 }
 
 function showAccountDetail (address) {
@@ -586,14 +576,7 @@ function clearNotices () {
 }
 
 function markAccountsFound() {
-  return (dispatch) => {
-    dispatch(this.showLoadingIndication())
-    background.markAccountsFound((err, newState) => {
-      dispatch(this.hideLoadingIndication())
-      if (err) return dispatch(this.showWarning(err.message))
-      dispatch(actions.updateMetamaskState(newState))
-    })
-  }
+  return callBackgroundThenUpdate(background.markAccountsFound)
 }
 
 //
-- 
cgit