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

can now sweep both btc and bch together

Browse source
This commit is contained in:
Kadir Sekha 2017-11-01 13:56:52 +09:00
commit a358ea69f3
2 changed files with 53 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/js/controllers/paperWallet.js
View file

@ -68,14 +68,15 @@ angular.module('copayApp.controllers').controller('paperWalletController',
$state.go('tabs.home'); $state.go('tabs.home');
} else { } else {
$scope.privateKey = privateKey; $scope.privateKey = privateKey;
$scope.btcBalanceSat = btcBalance; $scope.btcBalance = btcBalance;
$scope.bchBalanceSat = bchBalance; $scope.bchBalance = bchBalance;
if ($scope.balanceSat <= 0)
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not funds found'));
if ($scope.btcWallet) if ($scope.btcWallet)
$scope.btcBalance = txFormatService.formatAmountStr($scope.btcWallet.coin, btcBalance); $scope.btcBalanceText = txFormatService.formatAmountStr($scope.btcWallet.coin, btcBalance);
if ($scope.bchWallet) if ($scope.bchWallet)
$scope.bchBalance = txFormatService.formatAmountStr($scope.bchWallet.coin, bchBalance); $scope.bchBalanceText = txFormatService.formatAmountStr($scope.bchWallet.coin, bchBalance);
$scope.readyToShow = true;
} }
$scope.$apply(); $scope.$apply();
}); });
@ -162,17 +163,13 @@ angular.module('copayApp.controllers').controller('paperWalletController',
network: 'livenet', network: 'livenet',
}); });
$scope.noMatchingWallet = false;
if (!wallets || wallets.length == 0) {
$scope.noMatchingWallet = true;
return;
}
$scope.wallets = wallets; $scope.wallets = wallets;
$scope.btcWallets = _.filter($scope.wallets, function(w) { return w.coin == 'btc'; }); $scope.btcWallets = _.filter($scope.wallets, function(w) { return w.coin == 'btc'; });
$scope.bchWallets = _.filter($scope.wallets, function(w) { return w.coin == 'bch'; }); $scope.bchWallets = _.filter($scope.wallets, function(w) { return w.coin == 'bch'; });
$scope.singleBtcWallet = $scope.btcWallets.length == 1; $scope.singleBtcWallet = $scope.btcWallets.length == 1;
$scope.singleBchWallet = $scope.bchWallets.length == 1; $scope.singleBchWallet = $scope.bchWallets.length == 1;
$scope.noMatchingBtcWallet = $scope.btcWallets.length == 0;
$scope.noMatchingBchWallet = $scope.bchWallets.length == 0;
}); });
$scope.$on("$ionicView.enter", function(event, data) { $scope.$on("$ionicView.enter", function(event, data) {

91
www/views/paperWallet.html
View file

@ -3,29 +3,18 @@
<ion-nav-title>{{'Sweep paper wallet' | translate}}</ion-nav-title> <ion-nav-title>{{'Sweep paper wallet' | translate}}</ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
<ion-nav-buttons side="secondary">
<button ng-disabled="sending || btcBalanceSat <= 0 && bchBalanceSat <= 0 || noMatchingWallet" class="button no-border" ng-click="sweepWallet()" translate>
Sweep
</button>
</ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content scroll="false"> <ion-content scroll="false">
<div ng-class="ng-hide" ng-show="!noMatchingWallet"> <div ng-class="ng-hide" ng-show="btcBalance">
<div ng-class="ng-hide" ng-show="btcWallets.length > 0"> <div class="row">
<div class="row"> <div class="col text-center">
<div class="col text-center"> <h4 class="text-bold" translate>Funds found:</h4>
<h4 class="text-bold" translate>Funds found:</h4> <div class="size-24">
<div ng-show="btcBalance" class="size-24 ng-hide"> <span>{{btcBalanceText}}</span>
<span>{{btcBalance}}</span>
<span>
<button ng-disabled="btcBalanceSat <= 0 || noMatchingWallet" class="button no-border" ng-click="sweepWallet('btc')" translate>
Sweep
</button>
</span>
</div>
<div ng-show="!btcBalance" class="size-24 ng-hide">...</div>
</div> </div>
</div> </div>
</div>
<div ng-class="ng-hide" ng-show="!noMatchingBtcWallet">
<div class="text-center size-12 text-gray"> <div class="text-center size-12 text-gray">
<span translate>Funds will be transferred to</span>: <span translate>Funds will be transferred to</span>:
</div> </div>
@ -48,28 +37,29 @@
<i ng-if="!singleBtcWallet" class="icon bp-arrow-right"></i> <i ng-if="!singleBtcWallet" class="icon bp-arrow-right"></i>
</a> </a>
</div> </div>
<button class="button button-standard button-primary" ng-click="sweepWallet('btc')" translate>Sweep</button>
</div> </div>
<slide-to-accept-success <div ng-class="ng-hide" ng-show="noMatchingBtcWallet">
slide-success-show="sendStatus === 'success'" <div class="text-center size-12 text-gray">
slide-success-on-confirm="onSuccessConfirm()" <span>No BTC wallet to transfer funds to found.</span>
slide-success-hide-on-confirm="true"> </div>
<span translate>Funds transferred</span> </div>
</slide-to-accept-success> </div>
<div ng-class="ng-hide" ng-show="bchWallets.length > 0"> <div ng-class="ng-hide" ng-show="!btcBalance && readyToShow">
<div class="row"> <div class="text-center">
<div class="col text-center"> <h4 class="text-bold" translate>No BTC found</h4>
<h4 class="text-bold" translate>Funds found:</h4> </div>
<div ng-show="bchBalance" class="size-24 ng-hide"> </div>
<span>{{bchBalance}}</span> <div ng-class="ng-hide" ng-show="bchBalance">
<span> <div class="row">
<button ng-disabled="bchBalanceSat <= 0 || noMatchingWallet" class="button no-border" ng-click="sweepWallet('bch')" translate> <div class="col text-center">
Sweep <h4 class="text-bold" translate>Funds found:</h4>
</button> <div class="size-24">
</span> <span>{{bchBalanceText}}</span>
</div>
<div ng-show="!bchBalance" class="size-24 ng-hide">...</div>
</div> </div>
</div> </div>
</div>
<div ng-class="ng-hide" ng-show="!noMatchingBchWallet">
<div class="text-center size-12 text-gray"> <div class="text-center size-12 text-gray">
<span translate>Funds will be transferred to</span>: <span translate>Funds will be transferred to</span>:
</div> </div>
@ -81,7 +71,6 @@
</span> </span>
<p> <p>
<span ng-if="!bchWallet.balanceHidden"> {{bchWallet.status.totalBalanceStr}} </span> <span ng-if="!bchWallet.balanceHidden"> {{bchWallet.status.totalBalanceStr}} </span>
<span ng-if="bchWallet.balanceHidden" translate>[Balance Hidden]</span> <span ng-if="bchWallet.balanceHidden" translate>[Balance Hidden]</span>
<span class="tab-home__wallet__multisig-number" ng-if="bchWallet.n > 1"> <span class="tab-home__wallet__multisig-number" ng-if="bchWallet.n > 1">
{{bchWallet.m}}-of-{{bchWallet.n}} {{bchWallet.m}}-of-{{bchWallet.n}}
@ -92,17 +81,25 @@
<i ng-if="!singleBchWallet" class="icon bp-arrow-right"></i> <i ng-if="!singleBchWallet" class="icon bp-arrow-right"></i>
</a> </a>
</div> </div>
<button class="button button-standard button-primary" ng-click="sweepWallet('bch')" translate>Sweep</button>
</div>
<div ng-class="ng-hide" ng-show="noMatchingBchWallet">
<div class="text-center size-12 text-gray">
<span>No BCH wallet to transfer funds to found.</span>
</div>
</div> </div>
<slide-to-accept-success
slide-success-show="sendStatus === 'success'"
slide-success-on-confirm="onSuccessConfirm()"
slide-success-hide-on-confirm="true">
<span translate>Funds transferred</span>
</slide-to-accept-success>
</div> </div>
<div class="text-center padding ng-hide" ng-show="noMatchingWallet"> <div ng-class="ng-hide" ng-show="!bchBalance && readyToShow">
<span class="badge badge-energized" translate>No wallets available to receive funds</span> <div class="text-center">
<h4 class="text-bold" translate>No BCH found</h4>
</div>
</div> </div>
<slide-to-accept-success
slide-success-show="sendStatus === 'success'"
slide-success-on-confirm="onSuccessConfirm()"
slide-success-hide-on-confirm="true">
<span translate>Funds transferred</span>
</slide-to-accept-success>
</ion-content> </ion-content>
<wallet-selector <wallet-selector
wallet-selector-title="walletSelectorTitle" wallet-selector-title="walletSelectorTitle"