diff --git a/Gruntfile.js b/Gruntfile.js index b9315a389..d13d873ae 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -111,7 +111,7 @@ module.exports = function(grunt) { 'src/js/filters/*.js', 'src/js/models/*.js', 'src/js/services/*.js', - 'src/js/controllers/*.js', + 'src/js/controllers/**/*.js', 'src/js/translations.js', 'src/js/version.js', 'src/js/coinbase.js', diff --git a/public/index.html b/public/index.html index e39ee7409..dc1d2b39b 100644 --- a/public/index.html +++ b/public/index.html @@ -27,7 +27,6 @@
-
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 235835e67..7a269d924 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -1,148 +1,158 @@ - +

Transaction

+ -
-
-
-
- sync -

Received

+ +
+
+
+ sync +

Received

+
+
+ sync +

Sent

+
+
+ sync +

Moved

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

Sent

-
-
- sync -

Moved

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

Details

+

Details

-
    - -
  • - To - - - {{btx.merchant.domain}} - {{btx.merchant.domain}} - - - {{btx.labelTo}} - - - -
    • - -
  • - Recipients - {{btx.recipientCount}} - - - -
    • - -
    -
    - -
  • - - 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}} - -
    • -
  • - Confirmations - - - Unconfirmed - - - {{btx.confirmations}} - - - {{btx.safeConfirmed}} - - - -
    • -
- -
-

Participants

    -
  • - - - - + +
  • + To + + + {{btx.merchant.domain}} + {{btx.merchant.domain}} - {{c.copayerName}} ({{'Me'|translate}}) + + {{btx.labelTo}} + + + +
    • + +
  • + Recipients + {{btx.recipientCount}} + + + +
    • + +
    +
    + +
  • + + 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}} + +
    • +
  • + Confirmations + + + Unconfirmed + + + {{btx.confirmations}} + + + {{btx.safeConfirmed}} + + +
-
-
-
- +
+

Participants

+
    +
  • + + + + + + {{c.copayerName}} ({{'Me'|translate}}) +
    • +
-
-
-
+
+
+ +
+
+ +
+ + \ No newline at end of file diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 138d1e80a..3d5975b76 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -71,14 +71,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.hideBalance = function() { storageService.getHideBalanceFlag(self.walletId, function(err, shouldHideBalance) { - if (err) self.shouldHideBalance = false; - else self.shouldHideBalance = (shouldHideBalance == 'true') ? true : false; + if (err) self.shouldHideBalance = false; + else self.shouldHideBalance = (shouldHideBalance == 'true') ? true : false; }); } - self.onHold = function(){ - self.shouldHideBalance = !self.shouldHideBalance; - storageService.setHideBalanceFlag(self.walletId, self.shouldHideBalance, function() {}); + self.onHold = function() { + self.shouldHideBalance = !self.shouldHideBalance; + storageService.setHideBalanceFlag(self.walletId, self.shouldHideBalance, function() {}); } self.setOngoingProcess = function(processName, isOn) { @@ -1353,16 +1353,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.coinbasePendingTransactions = lodash.isEmpty(txs) ? null : txs; lodash.forEach(txs, function(dataFromStorage, txId) { if ((dataFromStorage.type == 'sell' && dataFromStorage.status == 'completed') || - (dataFromStorage.type == 'buy' && dataFromStorage.status == 'completed') || - dataFromStorage.status == 'error' || - (dataFromStorage.type == 'send' && dataFromStorage.status == 'completed')) return; + (dataFromStorage.type == 'buy' && dataFromStorage.status == 'completed') || + dataFromStorage.status == 'error' || + (dataFromStorage.type == 'send' && dataFromStorage.status == 'completed')) return; coinbaseService.getTransaction(accessToken, accountId, txId, function(err, tx) { if (err) { if (err.errors[0] && err.errors[0].id == 'expired_token') { self.refreshCoinbaseToken(); return; } - coinbaseService.savePendingTransaction(dataFromStorage, {status: 'error', error: err}, function(err) { + coinbaseService.savePendingTransaction(dataFromStorage, { + status: 'error', + error: err + }, function(err) { if (err) $log.debug(err); }); return; @@ -1376,7 +1379,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.refreshCoinbaseToken(); return; } - coinbaseService.savePendingTransaction(dataFromStorage, {status: 'error', error: err}, function(err) { + coinbaseService.savePendingTransaction(dataFromStorage, { + status: 'error', + error: err + }, function(err) { if (err) $log.debug(err); }); return; @@ -1386,8 +1392,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (variance < dataFromStorage.price_sensitivity.value) { self.sellPending(tx.data); } else { - var error = {errors: [{ message: 'Price falls over the selected percentage' }]}; - coinbaseService.savePendingTransaction(dataFromStorage, {status: 'error', error: error}, function(err) { + var error = { + errors: [{ + message: 'Price falls over the selected percentage' + }] + }; + coinbaseService.savePendingTransaction(dataFromStorage, { + status: 'error', + error: error + }, function(err) { if (err) $log.debug(err); }); } @@ -1405,8 +1418,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r }, 1000); - var _updateCoinbasePendingTransactions = function (obj/*, …*/) { - for (var i=1; i 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.getAmount = function(amount) { + return self.getAmount(amount); + }; + + $scope.getUnitName = function() { + return self.getUnitName(); + }; + + $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(); + $scope.txDetailsModal.remove(); + }; + +}); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 2f5b36122..f98f3d1c4 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1349,8 +1349,21 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return this.alternativeIsoCode; }; - this.openTxModal = function(tx) { - $rootScope.$emit('Local/TxModal', tx); + this.openTxModal = function(btx) { + var self = this; + + $scope.btx = btx; + $scope.self = self; + + $ionicModal.fromTemplateUrl('views/modals/tx-details.html', { + scope: $scope, + backdropClickToClose: false, + hardwareBackButtonClose: false, + hideDelay: 500 + }).then(function(modal) { + $scope.txDetailsModal = modal; + $scope.txDetailsModal.show(); + }); }; this.hasAction = function(actions, action) {