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

Merge pull request #216 from Bitcoin-com/wallet/task/461

Browse source 
Improvement - 461 - Remove automatic address copying when opening Receive tab
This commit is contained in:
Brendon Duncan 2018-07-16 09:11:43 +12:00 • committed by GitHub
commit ad64758883
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
}); });
}; };
$scope.setAddress = function(newAddr) { $scope.setAddress = function(newAddr, copyAddress) {
$scope.addr = null; $scope.addr = null;
if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return; if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return;
$scope.generatingAddress = true; $scope.generatingAddress = true;
@ -58,11 +58,13 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
paymentSubscriptionObj.addr = $scope.addr paymentSubscriptionObj.addr = $scope.addr
} }
try { if (copyAddress === true) {
clipboardService.copyToClipboard($scope.wallet.coin == 'bch' && $scope.bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + $scope.addr : $scope.addr); try {
} catch (error) { clipboardService.copyToClipboard($scope.wallet.coin == 'bch' && $scope.bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + $scope.addr : $scope.addr);
$log.debug("Error copying to clipboard:"); } catch (error) {
$log.debug(error); $log.debug("Error copying to clipboard:");
$log.debug(error);
}
} }
// create subscription // create subscription
var msg = JSON.stringify(paymentSubscriptionObj); var msg = JSON.stringify(paymentSubscriptionObj);

2
www/views/tab-receive.html
View file

@ -48,7 +48,7 @@
</div> </div>
</div> </div>
<div> <div>
<button ng-show="addr" class="button-address" ng-click="setAddress(true)"> <button ng-show="addr" class="button-address" ng-click="setAddress(true, true)">
<span translate>Generate new address</span> <span translate>Generate new address</span>
</button><br/> </button><br/>
</div> </div>