diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 13698f0cd..f8b77cb59 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -184,7 +184,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun } $scope.completeTxHistory = txHistory; $scope.showHistory(); - $scope.$apply(); + $timeout(function() { + $scope.$apply(); + }); return cb(); }); }); diff --git a/www/img/icon-text-testnet-white.svg b/www/img/icon-text-testnet-white.svg new file mode 100644 index 000000000..aaedcd70b --- /dev/null +++ b/www/img/icon-text-testnet-white.svg @@ -0,0 +1,13 @@ + + + + Group 2 Copy + Created with Sketch. + + + + + + + + diff --git a/www/views/includes/walletInfo.html b/www/views/includes/walletInfo.html index 98ec7ac02..e0690f6ad 100644 --- a/www/views/includes/walletInfo.html +++ b/www/views/includes/walletInfo.html @@ -4,6 +4,7 @@
Auditable + diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index a2dbd7ae8..4e7809f25 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -45,9 +45,8 @@ {{status.totalBalanceStr}}
+ ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'" + ng-style="{opacity: altAmountOpacity}"> {{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
@@ -119,7 +118,7 @@
{{status.totalBalanceStr}} -
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
+
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}