diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 629e59b51..249cf8e5a 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -24,7 +24,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }); }; - $scope.setAddress = function(newAddr) { + $scope.setAddress = function(newAddr, copyAddress) { $scope.addr = null; if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return; $scope.generatingAddress = true; @@ -58,11 +58,13 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi paymentSubscriptionObj.addr = $scope.addr } - try { - clipboardService.copyToClipboard($scope.wallet.coin == 'bch' && $scope.bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + $scope.addr : $scope.addr); - } catch (error) { - $log.debug("Error copying to clipboard:"); - $log.debug(error); + if (copyAddress === true) { + try { + clipboardService.copyToClipboard($scope.wallet.coin == 'bch' && $scope.bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + $scope.addr : $scope.addr); + } catch (error) { + $log.debug("Error copying to clipboard:"); + $log.debug(error); + } } // create subscription var msg = JSON.stringify(paymentSubscriptionObj); diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 28f0e51ad..046a19ba8 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -48,7 +48,7 @@