Fix Conflicts:

css/main.css

js/controllers/addresses.js

@@ -2,36 +2,21 @@
 
 angular.module('copay.addresses').controller('AddressesController',
   function($scope, $rootScope, controllerUtils) {
-    $scope.title = 'Home';
-    $scope.oneAtATime = true;
-    $scope.addrBalance = {};
 
     var w = $rootScope.wallet;
-
-    var _updateBalance = function () {
-      controllerUtils.setSocketHandlers();
-      w.getBalance(true, function (balance, balanceByAddr, isMain) {
-        if (balanceByAddr  && Object.keys(balanceByAddr).length) {
-          $rootScope.balanceByAddr = balanceByAddr;
-          $scope.isMain = isMain;
-          $scope.addrs =  Object.keys(balanceByAddr);
-          $scope.selectedAddr = $scope.addrs[0];
-          $scope.loading = false;
-          $rootScope.$digest();
-        }
-      });
-    };
+    $scope.loading = false;
 
     $scope.newAddr = function() {
       $scope.loading = true;
       w.generateAddress();
-      _updateBalance();
+      controllerUtils.updateBalance(function() {
+        $scope.loading = false;
+        $rootScope.$digest();
+      });
     };
 
     $scope.selectAddr = function(addr) {
       $scope.selectedAddr = addr;
     };
 
-    _updateBalance();
-    w.on('refresh', _updateBalance);
   });

js/controllers/header.js

@@ -40,7 +40,13 @@ angular.module('copay.header').controller('HeaderController',
         w.disconnect();
         controllerUtils.logout();
       }
-      $rootScope.flashMessage = {};
+      $scope.clearFlashMessage();
+    };
+
+    $scope.refresh = function() {
+      controllerUtils.updateBalance(function() {
+        $rootScope.$digest();
+      });
     };
 
     $scope.clearFlashMessage = function() {

js/controllers/setup.js

@@ -5,6 +5,11 @@ angular.module('copay.setup').controller('SetupController',
 
     $scope.loading = false;
 
+    // ng-repeat defined number of times instead of repeating over array?
+    $scope.getNumber = function(num) {
+      return new Array(num);   
+    }
+
     $scope.totalCopayers = config.wallet.totalCopayers;
     $scope.TCValues = [];
     for (var n = 1; n <= config.limits.totalCopayers; n++)