From 1788dec4fc3da08f046994bfede5627aaa0a06a1 Mon Sep 17 00:00:00 2001
From: Kadir Sekha <sekhakadir@gmail.com>
Date: Mon, 5 Feb 2018 17:12:21 -0400
Subject: [PATCH] can join shared wallet now using main scanner

---
 src/js/controllers/join.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index b36b38cb7..171f570b6 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -5,6 +5,10 @@ angular.module('copayApp.controllers').controller('joinController',
 
     var defaults = configService.getDefaults();
 
+    $scope.coinChanged = function() {
+      $scope.formData.bwsurl = $scope.formData.coin == 'btc' ? defaults.bws.url : defaults.bwscash.url;
+    }
+
     $scope.$on("$ionicView.beforeEnter", function(event, data) {
       var config = configService.getSync();
       $scope.formData = {};
@@ -18,12 +22,17 @@ angular.module('copayApp.controllers').controller('joinController',
       if (config.cashSupport) $scope.enableCash = true;
       resetPasswordFields();
       updateSeedSourceSelect();
+      if (data.stateParams.url) {
+        var s = data.stateParams.url.replace('copay:', '');
+        $scope.formData.secret = s;
+        var coin = s.substring(s.length-3);
+        if ($scope.formData.coin != coin) {
+          $scope.formData.coin = coin;
+          $scope.coinChanged();
+        }
+      }
     });
 
-    $scope.coinChanged = function() {
-      $scope.formData.bwsurl = $scope.formData.coin == 'btc' ? defaults.bws.url : defaults.bwscash.url;
-    }
-
     $scope.showAdvChange = function() {
       $scope.showAdv = !$scope.showAdv;
       $scope.encrypt = null;
@@ -68,12 +77,6 @@ angular.module('copayApp.controllers').controller('joinController',
       $scope.$apply();
     };
 
-    if ($stateParams.url) {
-      var data = $stateParams.url;
-      data = data.replace('copay:', '');
-      $scope.onQrCodeScannedJoin(data);
-    }
-
     function updateSeedSourceSelect() {
       $scope.seedOptions = [{
         id: 'new',