diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index 7f3dacf10..c82343c17 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -24,6 +24,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio updateMemo(); initActionList(); getAlternativeAmount(); +console.log('[txDetails.js.16:btx:]',$scope.btx, $scope.btx.addressTo); //TODO }; function updateMemo() { diff --git a/www/views/includes/output.html b/www/views/includes/output.html index d085ecb4d..1decbdff0 100644 --- a/www/views/includes/output.html +++ b/www/views/includes/output.html @@ -1,14 +1,17 @@ -
  • +
    To: {{output.toAddress || output.address}} -
  • -
  • + + +
    Amount: {{output.amountStr}} - {{output.alternativeAmountStr}} + ({{output.alternativeAmountStr}}) -
  • -
  • + + + +
    Note: {{output.message}} -
  • + diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index 2db70f5b6..a34febe9b 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -55,9 +55,9 @@
    -
    +
    -
    +
    {{btx.merchant.domain}} {{btx.merchant.domain}} @@ -69,6 +69,20 @@
    +
    + {{'Recipients'|translate}} + [ {{btx.recipientCount}} ] + + + +
    + +
    +
    + +
    @@ -120,20 +134,6 @@
    -
    - {{'Recipients'|translate}} - - {{btx.recipientCount}} - - - -
    - -
    -
    -
    This transaction has become invalid; possibly due to a double spend attempt.