anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

add wallet information to custom amount and addresses view

Browse source
This commit is contained in:
Gabriel Bazán 2017-05-04 14:45:21 -03:00
commit 813d89a139
6 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/amount.js
View file

@ -22,7 +22,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.currency = data.stateParams.currency;
$scope.forceCurrency = data.stateParams.forceCurrency;
$scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' ||
$scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' ||
$ionicHistory.backView().stateName == 'tabs.bitpayCard');
$scope.recipientType = data.stateParams.recipientType || null;
$scope.toAddress = data.stateParams.toAddress;
@ -30,6 +30,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.toEmail = data.stateParams.toEmail;
$scope.showAlternativeAmount = !!$scope.nextStep;
$scope.toColor = data.stateParams.toColor;
$scope.walletId = data.stateParams.walletId;
$scope.showSendMax = false;
$scope.customAmount = data.stateParams.customAmount;
@ -236,6 +237,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
var amount = $scope.showAlternativeAmount ? fromFiat(_amount) : _amount;
if ($scope.customAmount) {
$state.transitionTo('tabs.receive.customAmount', {
walletId: $scope.walletId,
toAmount: (amount * unitToSatoshi).toFixed(0),
toAddress: $scope.toAddress
});

3
src/js/controllers/customAmount.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('customAmountController', function($rootScope, $scope, $stateParams, $ionicHistory, txFormatService, platformInfo) {
angular.module('copayApp.controllers').controller('customAmountController', function($rootScope, $scope, $stateParams, $ionicHistory, txFormatService, platformInfo, profileService) {
$scope.$on("$ionicView.beforeEnter", function(event, data) {
var satToBtc = 1 / 100000000;
@ -10,6 +10,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func
$scope.amountBtc = ($scope.amount * satToBtc).toFixed(8);
$scope.amountStr = txFormatService.formatAmountStr($scope.amount);
$scope.altAmountStr = txFormatService.formatAlternativeStr($scope.amount);
$scope.wallet = profileService.getWallet($stateParams.walletId);
});
$scope.finish = function() {

1
src/js/controllers/tab-receive.js
View file

@ -8,6 +8,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.requestSpecificAmount = function() {
$state.go('tabs.receive.amount', {
walletId: $scope.wallet.credentials.walletId,
customAmount: true,
toAddress: $scope.addr
});

4
src/js/routes.js
View file

@ -681,7 +681,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/
.state('tabs.receive.amount', {
url: '/amount/:customAmount/:toAddress',
url: '/amount/:walletId/:customAmount/:toAddress',
views: {
'tab-receive@tabs': {
controller: 'amountController',
@ -690,7 +690,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
.state('tabs.receive.customAmount', {
url: '/customAmount/:toAmount/:toAddress',
url: '/customAmount/:walletId/:toAmount/:toAddress',
views: {
'tab-receive@tabs': {
controller: 'customAmountController',

6
www/views/addresses.html
View file

@ -11,11 +11,7 @@
</ion-nav-bar>
<ion-content>
<div class="text-center banner-icon">
<i class="icon zero-state-icon">
<img src="img/tab-icons/ico-receive-selected.svg"/>
</i>
</div>
<div ng-include="'views/includes/walletItem.html'"></div>
<div class="addr-list">
<div class="addr-explanation">

1
www/views/customAmount.html
View file

@ -12,6 +12,7 @@
</ion-nav-buttons>
</ion-nav-bar>
<ion-content scroll="false">
<div ng-include="'views/includes/walletItem.html'"></div>
<div class="item head text-center" copy-to-clipboard="'bitcoin:' + address + '?amount=' + amountBtc">
<qrcode size="220" data="bitcoin:{{address + '?amount=' + amountBtc}}" color="#334"></qrcode>
</div>