From 8759b633fb8808f4cc508c13eb9ae7fb4d538c26 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 31 May 2016 14:51:17 -0300 Subject: [PATCH] add transaction comment - custom popup (Gabriel) --- package.json | 2 +- public/views/includes/note.html | 7 ++ public/views/modals/paypro.html | 90 ++++++++++--------- public/views/modals/tx-details.html | 99 +++++++++++--------- public/views/modals/txp-details.html | 2 +- public/views/walletHome.html | 11 ++- src/css/ionic-migration.css | 8 ++ src/js/controllers/modals/txDetails.js | 119 +++++++++++++++++-------- 8 files changed, 205 insertions(+), 133 deletions(-) create mode 100644 public/views/includes/note.html diff --git a/package.json b/package.json index 366841eeb..ac580e726 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { - "bitcore-wallet-client": "2.5.0", + "bitcore-wallet-client": "~2.5.0", "express": "^4.11.2", "fs": "0.0.2", "grunt": "^0.4.5", diff --git a/public/views/includes/note.html b/public/views/includes/note.html new file mode 100644 index 000000000..49008491b --- /dev/null +++ b/public/views/includes/note.html @@ -0,0 +1,7 @@ + +
+ +
+
+ +
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html index 393deb8b2..ca7599de5 100644 --- a/public/views/modals/paypro.html +++ b/public/views/modals/paypro.html @@ -11,54 +11,56 @@ - -
-
- {{unitTotal}} {{unitName}} + +
+
+
+ {{unitTotal}} {{unitName}} +
+
+ {{ alternative }} {{ alternativeIsoCode }} +
-
- {{ alternative }} {{ alternativeIsoCode }} -
-
-

Details

-
    -
  • - Pay To - {{paypro.domain}} -
    • -
  • - Address - {{paypro.toAddress}} -
    • -
  • - Certified by - - - - {{paypro.caName}}
    - (Trusted) -     - - - Self-signed Certificate +

    Details

    +
      +
    • + Pay To + {{paypro.domain}} +
      • +
    • + Address + {{paypro.toAddress}} +
      • +
    • + Certified by + + + + {{paypro.caName}}
      + (Trusted)       - - {{paypro.caName}}
      - WARNING: UNTRUSTED CERTIFICATE + + + Self-signed Certificate + + + {{paypro.caName}}
      + WARNING: UNTRUSTED CERTIFICATE +       -       -
      • -
    • - Memo - {{paypro.memo}} -
      • -
    • - Expires - {{paypro.expires * 1000 | amTimeAgo }} -
      • -
    +
    • +
  • + Memo + {{paypro.memo}} +
    • +
  • + Expires + {{paypro.expires * 1000 | amTimeAgo }} +
    • +
+
- \ No newline at end of file + diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 181500889..a29ec80c5 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -6,13 +6,11 @@
-

- Transaction -

+

Transaction

- +
@@ -51,20 +49,19 @@

Details

    -
  • - To - - - {{btx.merchant.domain}} - {{btx.merchant.domain}} + To + + + {{btx.merchant.domain}} + {{btx.merchant.domain}} + + + {{btx.labelTo}} + + - - {{btx.labelTo}} - - -
  • - - This transaction has become invalid; possibly due to a double spend attempt. - -
  • - Date - - - - + + This transaction has become invalid; possibly due to a double spend attempt. +
    • + +
  • + Date + + + + +
    • +
  • Fee {{btx.feeStr}}
    • +
  • Note {{btx.message}}
    • +
  • - Merchant message - - {{btx.merchant.pr.pd.memo}} - + Merchant message + + {{btx.merchant.pr.pd.memo}} +
    • -
  • - Confirmations - - - Unconfirmed - - - {{btx.confirmations}} - - - {{btx.safeConfirmed}} - - +
  • + Confirmations + + + Unconfirmed + + + {{btx.confirmations}} + + + {{btx.safeConfirmed}} + + +
    • + +
  • + Comment + {{comment}}
    + + {{editedBy}} + +
@@ -146,10 +157,12 @@ (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)"> See it on the blockchain +
- -
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 1310923b6..81055b0eb 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -18,7 +18,7 @@
- +
{{tx.amountStr}}
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 631119533..a2fc7965b 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -204,12 +204,11 @@
Received - {{index.addressbook[btx.addressTo]}} - - {{btx.message}} - - - Sent + + {{btx.message}} + {{btx.note.body}} + {{index.addressbook[btx.addressTo]}} + Sent Moved diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css index 8d25ca3ff..bb776eceb 100644 --- a/src/css/ionic-migration.css +++ b/src/css/ionic-migration.css @@ -20,6 +20,14 @@ z-index: -1; } +.popup-container.active .popup { + border-radius: 10px; +} + +.popup-container .popup { + width: 300px; +} + .bct { background-color: transparent !important; margin-top: -25px; diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index 443f9ca8f..af768b584 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -1,50 +1,93 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $scope, $filter, profileService, nodeWebkit, configService, gettextCatalog) { +angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $log, $scope, $filter, $ionicPopup, gettextCatalog, profileService, configService) { - var self = $scope.self; - var fc = profileService.focusedClient; - var config = configService.getSync(); - var configWallet = config.wallet; - var walletSettings = configWallet.settings; + var self = $scope.self; + var fc = profileService.focusedClient; + var config = configService.getSync(); + var configWallet = config.wallet; + var walletSettings = configWallet.settings; - $scope.alternativeIsoCode = walletSettings.alternativeIsoCode; - $scope.color = fc.backgroundColor; - $scope.copayerId = fc.credentials.copayerId; - $scope.isShared = fc.credentials.n > 1; + $scope.alternativeIsoCode = walletSettings.alternativeIsoCode; + $scope.color = fc.backgroundColor; + $scope.copayerId = fc.credentials.copayerId; + $scope.isShared = fc.credentials.n > 1; - $scope.getAlternativeAmount = function() { - var satToBtc = 1 / 100000000; - fc.getFiatRate({ - code: $scope.alternativeIsoCode, - ts: $scope.btx.time * 1000 - }, function(err, res) { - if (err) { - $log.debug('Could not get historic rate'); - return; - } - if (res && res.rate) { - var alternativeAmountBtc = ($scope.btx.amount * satToBtc).toFixed(8); - $scope.rateDate = res.fetchedOn; - $scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode; - $scope.alternativeAmountStr = $filter('noFractionNumber')(alternativeAmountBtc * res.rate, 2) + ' ' + $scope.alternativeIsoCode; - $scope.$apply(); - } - }); + if ($scope.btx.txid) { + fc.getTxNote({ + txid: $scope.btx.txid + }, function(err, note) { + if (err || !note) { + $log.debug(gettextCatalog.getString('Could not fetch transaction note')); + return; + } + $scope.comment = note.body; + $scope.editedBy = gettextCatalog.getString('Edited by') + ' ' + note.editedByName; + $scope.createdOn = note.createdOn; + }); + } + + $scope.showCommentPopup = function() { + $scope.data = { + comment: '' }; - $scope.getShortNetworkName = function() { - var n = fc.credentials.network; - return n.substring(0, 4); + var commentPopup = $ionicPopup.show({ + templateUrl: "views/includes/note.html", + title: gettextCatalog.getString('Enter a new comment'), + subTitle: gettextCatalog.getString('Save an empty content to delete it'), + scope: $scope, + }); + + $scope.commentPopupClose = function() { + commentPopup.close(); }; - $scope.copyToClipboard = function(addr) { - if (!addr) return; - self.copyToClipboard(addr); + $scope.commentPopupSave = function() { + fc.editTxNote({ + txid: $scope.btx.txid, + body: $scope.data.comment + }, function() {}); + $scope.comment = $scope.data.comment; + $scope.editedBy = gettextCatalog.getString('Edited by') + ' ' + fc.credentials.copayerName; + $scope.createdOn = Math.floor(Date.now() / 1000); + commentPopup.close(); }; + }; - $scope.cancel = function() { - $scope.txDetailsModal.hide(); - }; + $scope.getAlternativeAmount = function() { + var satToBtc = 1 / 100000000; - }); + fc.getFiatRate({ + code: $scope.alternativeIsoCode, + ts: $scope.btx.time * 1000 + }, function(err, res) { + if (err) { + $log.debug('Could not get historic rate'); + return; + } + if (res && res.rate) { + var alternativeAmountBtc = ($scope.btx.amount * satToBtc).toFixed(8); + $scope.rateDate = res.fetchedOn; + $scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode; + $scope.alternativeAmountStr = $filter('noFractionNumber')(alternativeAmountBtc * res.rate, 2) + ' ' + $scope.alternativeIsoCode; + $scope.$apply(); + } + }); + }; + + $scope.getShortNetworkName = function() { + var n = fc.credentials.network; + return n.substring(0, 4); + }; + + $scope.copyToClipboard = function(addr) { + if (!addr) return; + self.copyToClipboard(addr); + }; + + $scope.cancel = function() { + $scope.txDetailsModal.hide(); + }; + +});