diff --git a/Gruntfile.js b/Gruntfile.js index f06465281..998453b7e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,7 +61,7 @@ module.exports = function(grunt) { 'src/js/routes.js', 'src/js/services/*.js', 'src/js/models/*.js', - 'src/js/controllers/*.js' + 'src/js/controllers/**/*.js' ], tasks: ['concat:js'] } @@ -179,11 +179,10 @@ module.exports = function(grunt) { files: { 'i18n/po/template.pot': [ 'public/index.html', - 'public/views/*.html', 'public/views/**/*.html', 'src/js/routes.js', 'src/js/services/*.js', - 'src/js/controllers/*.js' + 'src/js/controllers/**/*.js' ] } }, diff --git a/public/views/includes/tx-details.html b/public/views/includes/tx-details.html deleted file mode 100644 index d7a507a10..000000000 --- a/public/views/includes/tx-details.html +++ /dev/null @@ -1,159 +0,0 @@ -
- - - -
-
-
-
- sync -

Received

-
-
- sync -

Sent

-
-
- sync -

Moved

-
- -
- + - - - {{index.showTx.amountStr}} -
-
- - {{alternativeAmountStr}} - - - {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) - -
-
-
- - -
-
- -

Details

- - - -
-

Participants

-
    -
  • - - - - - - {{c.copayerName}} ({{'Me'|translate}}) -
    • -
-
- -
-
- -
-
- -
-
-
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index e7e1e87ef..8ce4dd4ed 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -1,61 +1,62 @@ - + -
-
+
+
sync -

Received

+

Received

sync -

Sent

+

Sent

sync -

Moved

+

Moved

-
- +-{{btx.amountStr}} +
+ + + - + {{btx.amountStr}}
- + {{alternativeAmountStr}} - + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
-
+
-
-

Details

+

Details

    -
  • - To - +
  • + To + {{btx.merchant.domain}} {{btx.merchant.domain}} @@ -68,10 +69,9 @@
  • - Recipients - {{btx.recipientCount}} + ng-click="showMultiplesOutputs = !showMultiplesOutputs"> + Recipients + {{btx.recipientCount}} @@ -82,50 +82,44 @@ ng-include="'views/includes/output.html'">
-
  • - +
  • + This transaction has become invalid; possibly due to a double spend attempt. -
    • -
  • - Date - +
  • + Date +
    • -
  • - Fee - {{btx.feeStr}} +
  • + Fee + {{btx.feeStr}}
    • -
  • - Note - {{btx.message}} +
  • + Note + {{btx.message}}
    • -
  • - Merchant message - +
  • + Merchant message + {{btx.merchant.pr.pd.memo}}
    • -
  • - Confirmations - - +
  • + Confirmations + + Unconfirmed - + {{btx.confirmations}} - + {{btx.safeConfirmed}} @@ -134,12 +128,11 @@
    -

    Participants

    +

    Participants

      -
    • +
    • - + @@ -150,10 +143,9 @@
      -
      @@ -161,4 +153,4 @@
    - \ No newline at end of file + diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css index b843e57dc..8d25ca3ff 100644 --- a/src/css/ionic-migration.css +++ b/src/css/ionic-migration.css @@ -20,10 +20,6 @@ z-index: -1; } -.scroll { - height: 100%; -} - .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 fd9fd97ca..443f9ca8f 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -1,53 +1,50 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txDetailsController', function($scope, $rootScope, $log, $filter, profileService, configService) { +angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $scope, $filter, profileService, nodeWebkit, configService, gettextCatalog) { - var self = $scope.self; - var fc = profileService.focusedClient; + var self = $scope.self; + var fc = profileService.focusedClient; + var config = configService.getSync(); + var configWallet = config.wallet; + var walletSettings = configWallet.settings; - $scope.settings = configService.getSync(); - $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: self.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 + ' ' + self.alternativeIsoCode; - $scope.alternativeAmountStr = $filter('noFractionNumber')(alternativeAmountBtc * res.rate, 2) + ' ' + self.alternativeIsoCode; - $scope.$apply(); - } - }); - }; + $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.getAmount = function(amount) { - return self.getAmount(amount); - }; + $scope.getShortNetworkName = function() { + var n = fc.credentials.network; + return n.substring(0, 4); + }; - $scope.getUnitName = function() { - return self.getUnitName(); - }; + $scope.copyToClipboard = function(addr) { + if (!addr) return; + self.copyToClipboard(addr); + }; - $scope.getShortNetworkName = function() { - var n = fc.credentials.network; - return n.substring(0, 4); - }; + $scope.cancel = function() { + $scope.txDetailsModal.hide(); + }; - $scope.copyToClipboard = function(addr) { - if (!addr) return; - self.copyToClipboard(addr); - }; - - $scope.cancel = function() { - $scope.txDetailsModal.hide(); - }; -}); + });