diff --git a/public/views/includes/tx-details.html b/public/views/includes/tx-details.html index 701ddc54c..d7a507a10 100644 --- a/public/views/includes/tx-details.html +++ b/public/views/includes/tx-details.html @@ -34,8 +34,10 @@

Moved

-
- +-{{index.showTx.amountStr}} +
+ + + - + {{index.showTx.amountStr}}
@@ -56,7 +58,7 @@
  • + ng-click="txc.copyToClipboard(index.showTx.addressTo)"> To @@ -83,11 +85,6 @@ ng-repeat="output in index.showTx.outputs" ng-include="'views/includes/output.html'">
- -
  • - Note - {{index.showTx.message}} -
  • @@ -95,22 +92,25 @@
  • Date - +
  • -
  • +
  • Fee - {{index.showTx.feeStr}} + {{index.showTx.feeStr}}
  • -
  • +
  • Note - {{index.showTx.message}} + {{index.showTx.message}}
  • -
  • +
  • Merchant message - + {{index.showTx.merchant.pr.pd.memo}}
  • diff --git a/src/js/controllers/tx.js b/src/js/controllers/tx.js index f39ab69ab..93cf26111 100644 --- a/src/js/controllers/tx.js +++ b/src/js/controllers/tx.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('txController', - function($rootScope, $scope, $timeout, $filter, lodash, profileService, isCordova, nodeWebkit, configService, animationService) { + function($rootScope, $scope, $timeout, $filter, lodash, profileService, isCordova, nodeWebkit, configService, animationService, gettextCatalog) { var fc = profileService.focusedClient; var config = configService.getSync(); @@ -50,13 +50,12 @@ angular.module('copayApp.controllers').controller('txController', return n.substring(0, 4); }; - this.copyAddress = function(addr) { - if (!addr) return; + this.copyToClipboard = function(value) { if (isCordova) { - window.cordova.plugins.clipboard.copy(addr); + window.cordova.plugins.clipboard.copy(value); window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard')); } else if (nodeWebkit.isDefined()) { - nodeWebkit.writeToClipboard(addr); + nodeWebkit.writeToClipboard(value); } };