From 2cb099057e5e0586760ab84968315ee4110ef030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 4 Aug 2016 10:48:20 -0300 Subject: [PATCH] use txp wallet id for confirm button color --- public/views/includes/confirm-tx.html | 2 +- src/js/controllers/index.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/views/includes/confirm-tx.html b/public/views/includes/confirm-tx.html index 594790af9..c4d8ce64a 100644 --- a/public/views/includes/confirm-tx.html +++ b/public/views/includes/confirm-tx.html @@ -31,7 +31,7 @@
-
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 682d006b9..7e5a33ec4 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1689,8 +1689,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r function openConfirmationPopup(txp, cb) { - $scope.tx = txFormatService.processTx(txp); + var config = configService.getSync(); + $scope.color = config.colorFor[txp.walletId]; + $scope.tx = txFormatService.processTx(txp); self.confirmationPopup = $ionicPopup.show({ templateUrl: 'views/includes/confirm-tx.html', scope: $scope,