From d55e756e6a4ee45942413e731b66e918c8cb1a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 22 May 2017 21:28:41 -0300
Subject: [PATCH] create view and controller refactor

---
 src/js/controllers/create.js       |  8 ++++----
 src/js/controllers/join.js         |  2 +-
 src/js/routes.js                   |  6 ++++--
 www/views/join.html                | 16 ++++++++--------
 www/views/tab-create-personal.html | 17 +++++++++--------
 www/views/tab-create-shared.html   | 14 +++++++-------
 6 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index b7e0255c9..f47e1ba9a 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -19,18 +19,18 @@ angular.module('copayApp.controllers').controller('createController',
       12: 1,
     };
 
-    $scope.init = function(tc) {
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
       $scope.formData = {};
       var defaults = configService.getDefaults();
+      var tc = $state.current.name == 'tabs.add.create-personal' ? 1 : defaults.wallet.totalCopayers;
       $scope.formData.account = 1;
       $scope.formData.bwsurl = defaults.bws.url;
       $scope.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
-      $scope.formData.totalCopayers = defaults.wallet.totalCopayers;
       $scope.formData.derivationPath = derivationPathHelper.default;
       $scope.setTotalCopayers(tc);
       updateRCSelect(tc);
       resetPasswordFields();
-    };
+    });
 
     $scope.showAdvChange = function() {
       $scope.showAdv = !$scope.showAdv;
@@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('createController',
     };
 
     function resetPasswordFields() {
-      $scope.formData.passphrase = $scope.formData.createPassphrase = $scope.formData.passwordSaved = $scope.formData.repeatpassword = $scope.result = null;
+      $scope.formData.passphrase = $scope.formData.createPassphrase = $scope.formData.passwordSaved = $scope.formData.repeatPassword = $scope.result = null;
       $timeout(function() {
         $scope.$apply();
       });
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 6e6456d98..105b7767c 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -43,7 +43,7 @@ angular.module('copayApp.controllers').controller('joinController',
     };
 
     function resetPasswordFields() {
-      $scope.formData.passphrase = $scope.formData.createPassphrase = $scope.formData.passwordSaved = $scope.formData.repeatpassword = $scope.result = null;
+      $scope.formData.passphrase = $scope.formData.createPassphrase = $scope.formData.passwordSaved = $scope.formData.repeatPassword = $scope.result = null;
       $timeout(function() {
         $scope.$apply();
       });
diff --git a/src/js/routes.js b/src/js/routes.js
index 81626d5b6..52a9ade41 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -341,7 +341,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         url: '/create-personal',
         views: {
           'tab-home@tabs': {
-            templateUrl: 'views/tab-create-personal.html'
+            templateUrl: 'views/tab-create-personal.html',
+            controller: 'createController'
           },
         }
       })
@@ -349,7 +350,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         url: '/create-shared',
         views: {
           'tab-home@tabs': {
-            templateUrl: 'views/tab-create-shared.html'
+            templateUrl: 'views/tab-create-shared.html',
+            controller: 'createController'
           },
         }
       })
diff --git a/www/views/join.html b/www/views/join.html
index 4acbeaa14..1bf5ed4c0 100644
--- a/www/views/join.html
+++ b/www/views/join.html
@@ -6,7 +6,7 @@
   </ion-nav-bar>
 
 
-  <ion-content ng-init="init()">
+  <ion-content>
 
     <form name="setupForm" ng-submit="join()" novalidate>
 
@@ -15,7 +15,7 @@
         <label class="item item-input item-stacked-label no-border">
           <span class="input-label" translate>Your nickname</span>
           <input type="text"
-          placeholder="{{'John'|translate}}"
+          placeholder="Satoshi"
           name="myName"
           ng-model="formData.myName"
           required>
@@ -95,7 +95,7 @@
                    autocapitalize="off"
                    name="createPassphrase"
                    ng-model="formData.createPassphrase"
-                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
 
             <input ng-show="seedSourceId == 'set'"
@@ -104,7 +104,7 @@
                    autocapitalize="off"
                    name="passphrase"
                    ng-model="formData.passphrase"
-                   ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                   ng-change="checkPassword(formData.passphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
           </div>
 
@@ -113,16 +113,16 @@
                    placeholder="{{'Repeat password'|translate}}"
                    type="password"
                    autocapitalize="off"
-                   ng-model="formData.repeatpassword"
-                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-model="formData.repeatPassword"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
 
              <input ng-show="seedSource.id == 'set'"
                     placeholder="{{'Repeat password'|translate}}"
                     type="password"
                     autocapitalize="off"
-                    ng-model="formData.repeatpassword"
-                    ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                    ng-model="formData.repeatPassword"
+                    ng-change="checkPassword(formData.passphrase, formData.repeatPassword)"
                     ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
           </div>
 
diff --git a/www/views/tab-create-personal.html b/www/views/tab-create-personal.html
index 21806b693..317712a26 100644
--- a/www/views/tab-create-personal.html
+++ b/www/views/tab-create-personal.html
@@ -5,7 +5,7 @@
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content ng-controller="createController" ng-init="init(1);">
+  <ion-content>
     <form name="setupForm" ng-submit="create()" novalidate>
       <div class="list settings-list settings-input-group">
         <label class="item item-input item-stacked-label">
@@ -15,7 +15,8 @@
           ng-model="formData.walletName"
           ng-required="true"
           ng-focus="formFocus('wallet-name')"
-          ng-blur="formFocus(false)">
+          ng-blur="formFocus(false)"
+          required>
         </label>
 
         <div class="item item-divider"></div>
@@ -67,7 +68,7 @@
                    type="password"
                    autocapitalize="off"
                    ng-model="formData.createPassphrase"
-                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
 
             <input ng-show="seedSource.id == 'set'"
@@ -75,7 +76,7 @@
                    type="password"
                    autocapitalize="off"
                    ng-model="formData.passphrase"
-                   ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                   ng-change="checkPassword(formData.passphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
           </div>
           <div class="item item-input" ng-show="encrypt">
@@ -83,16 +84,16 @@
                    placeholder="{{'Repeat password'|translate}}"
                    type="password"
                    autocapitalize="off"
-                   ng-model="formData.repeatpassword"
-                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-model="formData.repeatPassword"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
 
              <input ng-show="seedSource.id == 'set'"
                     placeholder="{{'Repeat password'|translate}}"
                     type="password"
                     autocapitalize="off"
-                    ng-model="formData.repeatpassword"
-                    ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                    ng-model="formData.repeatPassword"
+                    ng-change="checkPassword(formData.passphrase, formData.repeatPassword)"
                     ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
           </div>
 
diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html
index 17c1701d0..e145d91b3 100644
--- a/www/views/tab-create-shared.html
+++ b/www/views/tab-create-shared.html
@@ -5,7 +5,7 @@
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content ng-controller="createController" ng-init="init(3);">
+  <ion-content>
     <form name="setupForm" ng-submit="create()" novalidate>
       <div class="list settings-list settings-input-group">
         <label class="item item-input item-stacked-label">
@@ -97,7 +97,7 @@
                    type="password"
                    autocapitalize="off"
                    ng-model="formData.createPassphrase"
-                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
 
             <input ng-show="seedSource.id == 'set'"
@@ -105,7 +105,7 @@
                    type="password"
                    autocapitalize="off"
                    ng-model="formData.passphrase"
-                   ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                   ng-change="checkPassword(formData.passphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
           </div>
           <div class="item item-input" ng-show="encrypt">
@@ -113,16 +113,16 @@
                    placeholder="{{'Repeat password'|translate}}"
                    type="password"
                    autocapitalize="off"
-                   ng-model="formData.repeatpassword"
-                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-model="formData.repeatPassword"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatPassword)"
                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
 
              <input ng-show="seedSource.id == 'set'"
                     placeholder="{{'Repeat password'|translate}}"
                     type="password"
                     autocapitalize="off"
-                    ng-model="formData.repeatpassword"
-                    ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                    ng-model="formData.repeatPassword"
+                    ng-change="checkPassword(formData.passphrase, formData.repeatPassword)"
                     ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
           </div>