Merge pull request #198 from Bitcoin-com/wallet/task/409

Bug - 409 - "Generate new address" copies "bitcoincash:null" to the clipboard instead of a new address

src/js/controllers/tab-receive.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, $ionicPopover, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError, bitcoinCashJsService, $ionicNavBarDelegate, txFormatService) {
+angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, $ionicPopover, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError, bitcoinCashJsService, $ionicNavBarDelegate, txFormatService, clipboardService) {
 
   var listeners = [];
   $scope.bchAddressType = { type: 'cashaddr' };
@@ -74,6 +74,12 @@ 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);
+      }
       // create subscription
       var msg = JSON.stringify(paymentSubscriptionObj);
       currentAddressSocket.onopen = function (event) {

src/js/directives/copyToClipboard.js

@@ -1,38 +1,26 @@
 'use strict';
 
 angular.module('copayApp.directives')
-  .directive('copyToClipboard', function(platformInfo, nodeWebkitService, gettextCatalog, ionicToast, clipboard) {
+  .directive('copyToClipboard', function(clipboardService, ionicToast, gettextCatalog) {
     return {
       restrict: 'A',
       scope: {
         copyToClipboard: '=copyToClipboard'
       },
       link: function(scope, elem, attrs, ctrl) {
-        var isCordova = platformInfo.isCordova;
-        var isChromeApp = platformInfo.isChromeApp;
-        var isNW = platformInfo.isNW;
         elem.bind('mouseover', function() {
           elem.css('cursor', 'pointer');
         });
 
-        var msg = gettextCatalog.getString('Copied to clipboard');
         elem.bind('click', function() {
           var data = scope.copyToClipboard;
-          if (!data) return;
+          clipboardService.copyToClipboard(data);
 
-          if (isCordova) {
+          var msg = gettextCatalog.getString('Copied to clipboard');
-            cordova.plugins.clipboard.copy(data);
+          scope.$apply(function () {
-          } else if (isNW) {
-            nodeWebkitService.writeToClipboard(data);
-          } else if (clipboard.supported) {
-            clipboard.copyText(data);
-          } else {
-            // No supported
-            return;
-          }
-          scope.$apply(function() {
             ionicToast.show(msg, 'bottom', false, 1000);
           });
+
         });
       }
     }

src/js/services/clipboardService.js

@@ -0,0 +1,24 @@
+'use strict';
+
+angular.module('copayApp.services').factory('clipboardService', function ($http, $log, platformInfo, nodeWebkitService, gettextCatalog, ionicToast, clipboard) {
+  var root = {};
+
+  root.copyToClipboard = function (data) {
+    if (!data) return;
+
+    $log.debug("Copy '"+data+"' to clipboard");
+    if (platformInfo.isCordova) {
+      cordova.plugins.clipboard.copy(data);
+    } else if (platformInfo.isNW) {
+      nodeWebkitService.writeToClipboard(data);
+    } else if (clipboard.supported) {
+      clipboard.copyText(data);
+    } else {
+      // No supported
+      return;
+    }
+
+  };
+
+  return root;
+});

www/views/tab-receive.html

@@ -46,11 +46,11 @@
               <span class="ellipsis">{{addr}}</span>
               <ion-spinner ng-show="!addr" class="spinner-dark" icon="crescent"></ion-spinner>
             </div>
-            <div>
+          </div>
-              <button ng-show="addr" class="button-address" ng-click="setAddress(true)">
+          <div>
-                <span translate>Generate new address</span>
+            <button ng-show="addr" class="button-address" ng-click="setAddress(true)">
-              </button><br/>
+              <span translate>Generate new address</span>
-            </div>
+            </button><br/>
           </div>
         </div>
         <!-- animation for payment received -->