diff --git a/public/views/includes/output.html b/public/views/includes/output.html index 2fb157df1..e22e4b8c2 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,24 +1,14 @@ -
-
  • - Recipients: - {{output.recipientCount}} - - - -
    • -
  • - To: - {{output.toAddress || output.address}} -
    • -
  • - Total - Amount: - {{output.amountStr}} - {{output.alternativeAmountStr}} - -
    • -
  • - Note: - {{output.message}} -
    • -
    +
  • + To: + {{output.toAddress || output.address}} +
    • +
  • + Amount: + {{output.amountStr}} + {{output.alternativeAmountStr}} + +
    • +
  • + Note: + {{output.message}} +
    • diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index f7d9b9d92..0a0be0be0 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -11,18 +11,19 @@
    - + Recipients: - {{tx.outputs.length}} + {{tx.recipientCount}} - + To: {{tx.merchant.domain}} {{tx.merchant.domain}} - - {{tx.toAddress}} + + {{tx.toAddress}} +
    diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index d4c04665a..c26f2fa53 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -15,7 +15,7 @@
    - +-{{btx.amountStr}} {{settings.unitName}} + +-{{btx.amountStr}}
    - @@ -25,17 +25,8 @@

    Details

      -
      -
      -
      -
      -
      -
      -
    • + +
    • To: @@ -46,7 +37,27 @@ {{btx.labelTo || btx.addressTo}} +
      • + +
    • + Recipients: + {{btx.recipientCount}} + + +
      • + +
      +
      + +
    • + Note: + {{btx.message}} +
      • +
    • This transaction has become invalid; possibly due to a double spend attempt. @@ -59,7 +70,7 @@
    • Fee: - {{feeStr}} + {{btx.feeStr}}
    • Note: diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index dc8c683bd..2f8866ed1 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -14,21 +14,41 @@

      Details

        -
        -
        -
        -
        -
        + To: + {{tx.toAddress}} + +
      • + Total + Amount: + {{tx.amountStr}} + {{tx.alternativeAmountStr}} + +
        • +
      • + Note: + {{tx.message}} +
        • + +
      • + Recipients: + {{tx.recipientCount}} + + + +
        • + +
        +
      • Fee: - {{feeStr}} + {{tx.feeStr}}
      • Time: @@ -131,7 +151,7 @@ ng-show="tx.status=='broadcasted'" translate> Payment sent!
        • -
        Payment finally rejected
        diff --git a/public/views/walletHome.html b/public/views/walletHome.html index a8f78582e..5bb883278 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -505,7 +505,6 @@ {{btx.amountStr}} - {{home.getUnitName()}}
      diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index e8a8dbf12..ec3def5e0 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, utilService) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -469,49 +469,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; - self.summarizeOutputs = function(tx, formatAmount) { - tx.showSingle = true; - if (tx.outputs) { - tx.showSingle = false; - tx.outputs.details = lodash.clone(tx.outputs); - var total = lodash.reduce(tx.outputs.details, function(total, o) { - formatAmount(o); - return total + o.amount; - }, 0); - if (tx.action != 'received') { - tx.amount = total; - } - tx.outputs.summary = { - amount: tx.amount, - message: tx.message, - isSummary: true, - showDetails: false, - recipientCount: tx.outputs.details.length - }; - formatAmount(tx.outputs.summary); - if (tx.outputs.length === 1 && !tx.outputs[0].message) { - tx.showSingle = true; - tx.toAddress = tx.outputs[0].toAddress; // txproposal - tx.address = tx.outputs[0].address; // txhistory - } - } - }; - self.setPendingTxps = function(txps) { - var config = configService.getSync().wallet.settings; self.pendingTxProposalsCountForUs = 0; lodash.each(txps, function(tx) { - function formatAmount(tx) { - tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; - tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; - tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; - }; - - self.summarizeOutputs(tx, formatAmount); - formatAmount(tx); - - tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName; - tx.alternativeIsoCode = config.alternativeIsoCode; + + tx = utilService.processTx(tx); var action = lodash.find(tx.actions, { copayerId: self.copayerId @@ -546,21 +508,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r var c = 0; self.txHistoryPaging = txs[self.limitHistory] ? true : false; lodash.each(txs, function(tx) { + tx = utilService.processTx(tx); // no future transactions... if (tx.time > now) tx.time = now; - tx.rateTs = Math.floor((tx.ts || now) / 1000); - if (tx.fees) - tx.feeStr = profileService.formatAmount(tx.fees) + ' ' + config.unitName; - - function formatAmount(tx) { - tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')( - }; - - self.summarizeOutputs(tx, formatAmount); - formatAmount(tx); if (c < self.limitHistory) { self.txHistory.push(tx); c++; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 50fa2a54b..54cd7f6e0 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, feeService, bwsError) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, feeService, bwsError, utilService) { var self = this; $rootScope.hideMenuBar = false; @@ -171,9 +171,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.error = null; $scope.tx = tx; - $scope.amountStr = tx.amountStr; - $scope.feeStr = tx.feeStr; - $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers $scope.copayerId = fc.credentials.copayerId; $scope.canSign = fc.canSign(); @@ -204,7 +201,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var action = lodash.find(tx.actions, { copayerId: fc.credentials.copayerId }); - $scope.tx = tx; + $scope.tx = utilService.processTx(tx); if (!action && tx.status == 'pending') $scope.tx.pendingForUs = true; $scope.updateCopayerList(); @@ -348,10 +345,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.copyAddress(addr); }; - $scope.toggleOutputDetails = function(summary) { - summary.showDetails = !summary.showDetails; - }; - $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; @@ -1014,7 +1007,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.color = fc.backgroundColor; $scope.copayerId = fc.credentials.copayerId; $scope.isShared = fc.credentials.n > 1; - $scope.feeStr = btx.feeStr; $scope.getAmount = function(amount) { return self.getAmount(amount); @@ -1038,9 +1030,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $modalInstance.dismiss('cancel'); }; - $scope.toggleOutputDetails = function(summary) { - summary.showDetails = !summary.showDetails; - }; }; var modalInstance = $modal.open({ diff --git a/src/js/services/utilService.js b/src/js/services/utilService.js new file mode 100644 index 000000000..08b4787c3 --- /dev/null +++ b/src/js/services/utilService.js @@ -0,0 +1,46 @@ +'use strict'; + +angular.module('copayApp.services').factory('utilService', function(profileService, rateService, configService, lodash) { + var root = {}; + + var formatAmountStr = function(amount) { + if (!amount) return; + var config = configService.getSync().wallet.settings; + return profileService.formatAmount(amount) + ' ' + config.unitName; + }; + + var formatAlternativeStr = function(amount) { + if (!amount) return; + var config = configService.getSync().wallet.settings; + return (rateService.toFiat(amount, config.alternativeIsoCode) ? rateService.toFiat(amount, config.alternativeIsoCode).toFixed(2) : 'N/A') + ' ' + config.alternativeIsoCode; + }; + + var formatFeeStr = function(fee) { + if (!fee) return; + var config = configService.getSync().wallet.settings; + return profileService.formatAmount(fee) + ' ' + config.unitName; + }; + + root.processTx = function(tx) { + if (!tx) return; + + var outputs = tx.outputs ? tx.outputs.length : 0; + if (outputs > 1 && tx.action != 'received') { + tx.hasMultiplesOutputs = true; + tx.recipientCount = outputs; + tx.amount = lodash.reduce(tx.outputs, function(total, o) { + o.amountStr = formatAmountStr(o.amount); + o.alternativeAmountStr = formatAlternativeStr(o.amount); + return total + o.amount; + }, 0); + } + + tx.amountStr = formatAmountStr(tx.amount); + tx.alternativeAmountStr = formatAlternativeStr(tx.amount); + tx.feeStr = formatFeeStr(tx.fee || tx.fees); + + return tx; + }; + + return root; +});