Merge branch 'master' of github.com:getcanoe/canoe

getcanoe · Apr 19, 2018 · 496b84b · 496b84b
2 parents 411afb8 + a81e242
commit 496b84b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
@@ -68,11 +68,11 @@ angular.module('canoeApp.controllers').controller('tabReceiveController', functi
 
   var checkSelectedAccount = function (account, accounts) {
     if (!account) return accounts[0]
-    var w = lodash.find(accounts, function (w) {
+    var w = lodash.findIndex(accounts, function (w) {
       return w.id === account.id
     })
     if (!w) return accounts[0]
-    return account
+    return accounts[w]
   }
 
   $scope.onAccountSelect = function (acc) {

diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
@@ -192,11 +192,11 @@ angular.module('canoeApp.controllers').controller('tabSendController', function
 
   var checkSelectedAccount = function (account, accounts) {
     if (!account) return accounts[0]
-    var w = lodash.find(accounts, function (w) {
+    var w = lodash.findIndex(accounts, function (w) {
       return w.id === account.id
     })
     if (!w) return accounts[0]
-    return account
+    return accounts[w]
   }
 
   $scope.$on('$ionicView.beforeEnter', function (event, data) {