BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add tx modal - fix search tx

This commit is contained in:
Javier 2016-05-20 11:37:13 -03:00
parent 0c786ebd6a
commit 6f15afc638
6 changed files with 270 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -111,7 +111,7 @@ module.exports = function(grunt) {
'src/js/filters/*.js', 'src/js/filters/*.js',
'src/js/models/*.js', 'src/js/models/*.js',
'src/js/services/*.js', 'src/js/services/*.js',
'src/js/controllers/*.js', 'src/js/controllers/**/*.js',
'src/js/translations.js', 'src/js/translations.js',
'src/js/version.js', 'src/js/version.js',
'src/js/coinbase.js', 'src/js/coinbase.js',

1
public/index.html
View File

@ -27,7 +27,6 @@
<ion-side-menu-content> <ion-side-menu-content>
<div notifications="right top"></div> <div notifications="right top"></div>
<div ng-include="'views/includes/tx-details.html'" ng-if="index.showTx"></div>
<div ng-include="'views/includes/password.html'" ng-if="index.askPassword"></div> <div ng-include="'views/includes/password.html'" ng-if="index.askPassword"></div>
<div ng-include="'views/includes/alert.html'" ng-if="index.showAlert"></div> <div ng-include="'views/includes/alert.html'" ng-if="index.showAlert"></div>
<div ng-include="'views/includes/confirm-tx.html'" ng-if="index.confirmTx"></div> <div ng-include="'views/includes/confirm-tx.html'" ng-if="index.confirmTx"></div>

124
public/views/modals/tx-details.html
View File

@ -1,59 +1,56 @@
<nav class="tab-bar" ng-style="{'background-color':color}"> <ion-modal-view ng-controller="txDetailsController">
<section class="left-small"> <ion-header-bar align-title="center" class="bar-stable">
<a ng-click="cancel()"> <a class="m5t" ng-click="cancel()">
<i class="icon-arrow-left3 icon-back"></i> <span class="text-close">{{'Close'|translate}}</span>
<span class="text-back" translate>Back</span>
</a> </a>
</section> <h1 class="title ellipsis" translate>Transaction</h1>
<section class="middle tab-bar-section"> </ion-header-bar>
<h1 class="title ellipsis" translate>
Transaction
</h1>
</section>
</nav>
<div class="modal-content fix-modals-touch" <ion-content class="modal-content"
ng-swipe-disable-mouse ng-class="{'status-bar-content':index.useViewManagedStatusBar}" ng-style="{'background':skin.view.viewBackground}">
ng-swipe-right="cancel()"> <div class="header-modal text-center" ng-init="getAlternativeAmount()"
<div class="header-modal text-center" ng-init="getAlternativeAmount()"> ng-style="{'background':skin.view.viewSectionHeaderBackground}">
<div ng-show="btx.action != 'invalid'"> <div ng-show="btx.action != 'invalid'">
<div ng-show="btx.action == 'received'"> <div ng-show="btx.action == 'received'">
<img src="img/icon-receive-history.svg" alt="sync" width="50"> <img src="img/icon-receive-history.svg" alt="sync" width="50">
<p class="m0 text-gray size-14" translate>Received</p> <p class="m0 text-gray size-14" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Received</p>
</div> </div>
<div ng-show="btx.action == 'sent'"> <div ng-show="btx.action == 'sent'">
<img src="img/icon-sent-history.svg" alt="sync" width="50"> <img src="img/icon-sent-history.svg" alt="sync" width="50">
<p class="m0 text-gray size-14" translate>Sent</p> <p class="m0 text-gray size-14" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Sent</p>
</div> </div>
<div ng-show="btx.action == 'moved'"> <div ng-show="btx.action == 'moved'">
<img src="img/icon-moved.svg" alt="sync" width="50"> <img src="img/icon-moved.svg" alt="sync" width="50">
<p class="m0 text-gray size-14" translate>Moved</p> <p class="m0 text-gray size-14" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Moved</p>
</div> </div>
<div class="size-36"> <div class="size-36" ng-style="{'color':skin.view.viewPrimaryTextColor}">
<span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}} <span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}}
</div> </div>
<div class="alternative-amount" ng-click="showRate=!showRate" ng-init="showRate = false"> <div class="alternative-amount" ng-click="showRate=!showRate" ng-init="showRate = false">
<span class="label gray radius" ng-show="!showRate && alternativeAmountStr"> <span class="label gray radius" ng-show="!showRate && alternativeAmountStr"
ng-style="{'color':skin.view.complementaryColor, 'background-color':skin.view.primaryColor}">
{{alternativeAmountStr}} {{alternativeAmountStr}}
</span> </span>
<span class="size-12" ng-show="showRate && alternativeAmountStr"> <span class="size-12" ng-show="showRate && alternativeAmountStr"
ng-style="{'color':skin.view.complementaryColor, 'background-color':skin.view.primaryColor}">
{{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
</span> </span>
</div> </div>
</div> </div>
<div ng-show="btx.action == 'invalid'"> <div ng-style="{'color':skin.view.viewPrimaryTextColor}" ng-show="btx.action == 'invalid'">
- -
</div> </div>
</div> </div>
<h4 class="title m0" translate>Details</h4> <h4 class="title m0" ng-style="{'color':skin.view.viewSectionHeaderColor, 'background':skin.view.viewSectionHeaderBackground}" translate>Details</h4>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyToClipboard(btx.addressTo)"> <li ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyToClipboard(btx.addressTo)"
<span class="text-gray" translate>To</span> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="right"> <span class="text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>To</span>
<span class="right" ng-style="{'color':skin.view.viewSecondaryTextColor}">
<span ng-if="btx.merchant"> <span ng-if="btx.merchant">
<span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span> <span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span>
<span ng-show="!btx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{btx.merchant.domain}}</span> <span ng-show="!btx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{btx.merchant.domain}}</span>
@ -66,9 +63,10 @@
</li> </li>
<li ng-show="btx.hasMultiplesOutputs" class="line-b p10 oh" <li ng-show="btx.hasMultiplesOutputs" class="line-b p10 oh"
ng-click="showMultiplesOutputs = !showMultiplesOutputs"> ng-click="showMultiplesOutputs = !showMultiplesOutputs"
<span class="text-gray" translate>Recipients</span> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="right">{{btx.recipientCount}} <span class="text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Recipients</span>
<span class="right" ng-style="{'color':skin.view.viewSecondaryTextColor}">{{btx.recipientCount}}
<i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i> <i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
<i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i> <i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
</span> </span>
@ -79,41 +77,50 @@
ng-include="'views/includes/output.html'"> ng-include="'views/includes/output.html'">
</div> </div>
<li ng-if="btx.action == 'invalid'" class="line-b p10 oh"> <li ng-if="btx.action == 'invalid'" class="line-b p10 oh"
<span class="right" translate> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="right" ng-style="{'color':skin.view.viewSecondaryTextColor}" translate>
This transaction has become invalid; possibly due to a double spend attempt. This transaction has become invalid; possibly due to a double spend attempt.
</span> </span>
<li ng-if="btx.time" class="line-b p10 oh"> </li>
<span class="text-gray" translate>Date</span> <li ng-if="btx.time" class="line-b p10 oh"
<span class="right enable_text_select"> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Date</span>
<span class="right enable_text_select" ng-style="{'color':skin.view.viewSecondaryTextColor}">
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time> <time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
<time>({{ btx.time * 1000 | amTimeAgo}})</time> <time>({{ btx.time * 1000 | amTimeAgo}})</time>
</span> </span>
</li> </li>
<li class="line-b p10" ng-show="btx.action != 'received'" ng-click="copyToClipboard(btx.feeStr)"> <li class="line-b p10" ng-show="btx.action != 'received'" ng-click="copyToClipboard(btx.feeStr)"
<span class="text-gray" translate>Fee</span> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="right enable_text_select">{{btx.feeStr}}</span> <span class="text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Fee</span>
<span class="right enable_text_select" ng-style="{'color':skin.view.viewSecondaryTextColor}">{{btx.feeStr}}</span>
</li> </li>
<li class="line-b p10 oh" ng-show="btx.message && btx.action != 'received'" ng-click="copyToClipboard(btx.message)"> <li class="line-b p10 oh" ng-show="btx.message && btx.action != 'received'" ng-click="copyToClipboard(btx.message)"
<span class="text-gray" translate>Note</span> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="right enable_text_select">{{btx.message}}</span> <span class="text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Note</span>
<span class="right enable_text_select" ng-style="{'color':skin.view.viewSecondaryTextColor}">{{btx.message}}</span>
</li> </li>
<li ng-if="btx.merchant" class="line-b p10 oh" ng-click="copyToClipboard(btx.merchant.pr.pd.memo)"> <li ng-if="btx.merchant" class="line-b p10 oh" ng-click="copyToClipboard(btx.merchant.pr.pd.memo)"
<span class="text-gray" translate>Merchant message</span> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="right enable_text_select"> <span class="text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Merchant message</span>
<span class="right enable_text_select" ng-style="{'color':skin.view.viewSecondaryTextColor}">
{{btx.merchant.pr.pd.memo}} {{btx.merchant.pr.pd.memo}}
</span> </span>
</li> </li>
<li ng-if="btx.time" class="line-b p10 oh"> <li ng-if="btx.time" class="line-b p10 oh"
<span class="text-gray" translate>Confirmations</span> ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<span class="right" > <span class="text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" translate>Confirmations</span>
<span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate> <span class="right" ng-style="{'color':skin.view.viewAlertTextColor}">
<span ng-style="{'color':skin.view.viewAlertTextColor}" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
Unconfirmed Unconfirmed
</span> </span>
<span class="label gray radius" ng-show="btx.confirmations>0 && !btx.safeConfirmed"> <span class="label gray radius" ng-show="btx.confirmations>0 && !btx.safeConfirmed"
ng-style="{'color':skin.view.complementaryColor, 'background-color':skin.view.primaryColor}">
{{btx.confirmations}} {{btx.confirmations}}
</span> </span>
<span class="label gray radius" ng-show="btx.safeConfirmed"> <span class="label gray radius" ng-show="btx.safeConfirmed"
ng-style="{'color':skin.view.complementaryColor, 'background-color':skin.view.primaryColor}">
{{btx.safeConfirmed}} {{btx.safeConfirmed}}
</span> </span>
@ -122,11 +129,12 @@
</ul> </ul>
<div ng-if="btx.actions[0] && isShared"> <div ng-if="btx.actions[0] && isShared">
<h4 class="title m0" translate>Participants</h4> <h4 class="title m0" ng-style="{'color':skin.view.viewSectionHeaderColor, 'background':skin.view.viewSectionHeaderBackground}" translate>Participants</h4>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li class="line-b p10 text-gray" ng-repeat="c in btx.actions"> <li class="line-b p10 text-gray" ng-style="{'color':skin.view.viewPrimaryTextColor}" ng-repeat="c in btx.actions"
ng-style="{'background':skin.view.viewListItemBackground, 'border-bottom-color':skin.view.viewListItemSeparatorColor}">
<i class="icon-contact size-24"></i> <i class="icon-contact size-24"></i>
<span class="right"> <span class="right" ng-style="{'color':skin.view.viewSecondaryTextColor}">
<i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i> <i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i>
<i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i> <i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i>
</span> </span>
@ -137,12 +145,14 @@
<div ng-show="btx.txid" class="tx-details-blockchain"> <div ng-show="btx.txid" class="tx-details-blockchain">
<div class="text-center m20t"> <div class="text-center m20t">
<button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://' + <button class="button outline round dark-gray tiny"
(getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)"> ng-style="{'background':skin.view.secondaryButtonBackground, 'border':skin.view.secondaryButtonBorder, 'color':skin.view.secondaryButtonTextColor}"
<span class="text-gray" translate>See it on the blockchain</span> ng-click="$root.openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
<span class="text-gray" ng-style="{'color':skin.view.viewSecondaryTextColor}" translate>See it on the blockchain</span>
</button> </button>
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div> <div class="extra-margin-bottom"></div>
</div> </ion-content>
</ion-modal-view>

64
src/js/controllers/index.js
View File

@ -1362,7 +1362,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.refreshCoinbaseToken(); self.refreshCoinbaseToken();
return; return;
} }
coinbaseService.savePendingTransaction(dataFromStorage, {status: 'error', error: err}, function(err) { coinbaseService.savePendingTransaction(dataFromStorage, {
status: 'error',
error: err
}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
}); });
return; return;
@ -1376,7 +1379,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.refreshCoinbaseToken(); self.refreshCoinbaseToken();
return; return;
} }
coinbaseService.savePendingTransaction(dataFromStorage, {status: 'error', error: err}, function(err) { coinbaseService.savePendingTransaction(dataFromStorage, {
status: 'error',
error: err
}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
}); });
return; return;
@ -1386,8 +1392,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (variance < dataFromStorage.price_sensitivity.value) { if (variance < dataFromStorage.price_sensitivity.value) {
self.sellPending(tx.data); self.sellPending(tx.data);
} else { } else {
var error = {errors: [{ message: 'Price falls over the selected percentage' }]}; var error = {
coinbaseService.savePendingTransaction(dataFromStorage, {status: 'error', error: error}, function(err) { errors: [{
message: 'Price falls over the selected percentage'
}]
};
coinbaseService.savePendingTransaction(dataFromStorage, {
status: 'error',
error: error
}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
}); });
} }
@ -1452,21 +1465,31 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.refreshCoinbaseToken(); self.refreshCoinbaseToken();
return; return;
} }
coinbaseService.savePendingTransaction(tx, {status: 'error', error: err}, function(err) { coinbaseService.savePendingTransaction(tx, {
status: 'error',
error: err
}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
}); });
} else { } else {
if (!res.data.id) { if (!res.data.id) {
coinbaseService.savePendingTransaction(tx, {status: 'error', error: err}, function(err) { coinbaseService.savePendingTransaction(tx, {
status: 'error',
error: err
}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
}); });
return; return;
} }
coinbaseService.getTransaction(self.coinbaseToken, self.coinbaseAccount.id, res.data.id, function(err, sendTx) { coinbaseService.getTransaction(self.coinbaseToken, self.coinbaseAccount.id, res.data.id, function(err, sendTx) {
coinbaseService.savePendingTransaction(tx, {remove: true}, function(err) { coinbaseService.savePendingTransaction(tx, {
remove: true
}, function(err) {
coinbaseService.savePendingTransaction(sendTx.data, {}, function(err) { coinbaseService.savePendingTransaction(sendTx.data, {}, function(err) {
$timeout(function() { $timeout(function() {
self.updateCoinbase({updateAccount: true}); self.updateCoinbase({
updateAccount: true
});
}, 1000); }, 1000);
}); });
}); });
@ -1485,22 +1508,32 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.refreshCoinbaseToken(); self.refreshCoinbaseToken();
return; return;
} }
coinbaseService.savePendingTransaction(tx, {status: 'error', error: err}, function(err) { coinbaseService.savePendingTransaction(tx, {
status: 'error',
error: err
}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
}); });
} else { } else {
if (!res.data.transaction) { if (!res.data.transaction) {
coinbaseService.savePendingTransaction(tx, {status: 'error', error: err}, function(err) { coinbaseService.savePendingTransaction(tx, {
status: 'error',
error: err
}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
}); });
return; return;
} }
coinbaseService.savePendingTransaction(tx, {remove: true}, function(err) { coinbaseService.savePendingTransaction(tx, {
remove: true
}, function(err) {
coinbaseService.getTransaction(self.coinbaseToken, self.coinbaseAccount.id, res.data.transaction.id, function(err, updatedTx) { coinbaseService.getTransaction(self.coinbaseToken, self.coinbaseAccount.id, res.data.transaction.id, function(err, updatedTx) {
coinbaseService.savePendingTransaction(updatedTx.data, {}, function(err) { coinbaseService.savePendingTransaction(updatedTx.data, {}, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
$timeout(function() { $timeout(function() {
self.updateCoinbase({updateAccount: true}); self.updateCoinbase({
updateAccount: true
});
}, 1000); }, 1000);
}); });
}); });
@ -1691,13 +1724,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}); });
}); });
$rootScope.$on('Local/TxModal', function(event, tx) {
self.showTx = tx;
$timeout(function() {
$rootScope.$apply();
});
});
$rootScope.$on('NewIncomingTx', function() { $rootScope.$on('NewIncomingTx', function() {
self.newTx = true; self.newTx = true;
self.updateAll({ self.updateAll({

55
src/js/controllers/modals/txDetails.js Normal file
View File

@ -0,0 +1,55 @@
'use strict';
angular.module('copayApp.controllers').controller('txDetailsController', function($scope, $rootScope, $log, $filter, profileService, configService) {
var self = $scope.self;
var fc = profileService.focusedClient;
$scope.settings = configService.getSync();
$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.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();
};
});

17
src/js/controllers/walletHome.js
View File

@ -1349,8 +1349,21 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
return this.alternativeIsoCode; return this.alternativeIsoCode;
}; };
this.openTxModal = function(tx) { this.openTxModal = function(btx) {
$rootScope.$emit('Local/TxModal', tx); 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) { this.hasAction = function(actions, action) {