From 286bde606f1c42a8edf2793b78042f5ef3271894 Mon Sep 17 00:00:00 2001
From: brunobar79 <brunobar79@gmail.com>
Date: Wed, 8 Aug 2018 14:30:49 -0400
Subject: fix merge conflicts

---
 ui/app/actions.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui/app/actions.js')

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 7a8d9667d..4f71d911b 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -1483,11 +1483,12 @@ function showAccountDetail (address) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
     log.debug(`background.setSelectedAddress`)
-    background.setSelectedAddress(address, (err) => {
+    background.setSelectedAddress(address, (err, tokens) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
         return dispatch(actions.displayWarning(err.message))
       }
+      dispatch(updateTokens(tokens))
       dispatch({
         type: actions.SHOW_ACCOUNT_DETAIL,
         value: address,
-- 
cgit