Conflicts fixed

js/directives.js

@@ -6,17 +6,16 @@ var bignum = bitcore.Bignum;
 var preconditions = require('preconditions').singleton();
 
 angular.module('copayApp.directives')
-  .directive('validAddress', ['$rootScope', function($rootScope) {
 
+.directive('validAddress', ['$rootScope',
+  function($rootScope) {
     return {
       require: 'ngModel',
       link: function(scope, elem, attrs, ctrl) {
         var validator = function(value) {
 
           // If we're setting the domain, ignore the change.
-          if ($rootScope.merchant
-              && $rootScope.merchant.domain
-              && value === $rootScope.merchant.domain) {
+          if ($rootScope.merchant && $rootScope.merchant.domain && value === $rootScope.merchant.domain) {
             ctrl.$setValidity('validAddress', true);
             return value;
           }
@@ -27,6 +26,7 @@ angular.module('copayApp.directives')
             return value;
           }
 
+
           // Bip21 uri
           if (/^bitcoin:/.test(value)) {
             var uri = new bitcore.BIP21(value);
@@ -41,11 +41,13 @@ angular.module('copayApp.directives')
           return value;
         };
 
+
         ctrl.$parsers.unshift(validator);
         ctrl.$formatters.unshift(validator);
       }
     };
-  }])
+  }
+])
   .directive('enoughAmount', ['$rootScope',
     function($rootScope) {
       var w = $rootScope.wallet;

views/create.html

@@ -30,6 +30,7 @@
                 <input id="walletPassword" type="password" placeholder="{{'Choose your password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: 
                   <i>{{passwordStrength}}</i><br/><span
                     class='size-12'>Tip: Use lower and uppercase, numbers and
+<<<<<<< HEAD
                     symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
 
                 <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
@@ -38,6 +39,19 @@
                   <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-click="changeNetwork()" ng-checked="networkName == 'testnet' ? true : false">
                   <label for="network-name">Use test network</label>
                 </div>
+=======
+                    symbols</span>" 
+                  tooltip-trigger="focus" required
+                  tooltip-placement="top">
+
+                  <small translate class="is-valid" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">Please enter the same password you entered above</small>
+                  <input type="password" 
+                  placeholder="{{'Repeat password'|translate}}"
+                  name="walletPasswordConfirm"
+                  ng-model="walletPasswordConfirm" 
+                  match="walletPassword" 
+                  required>
+>>>>>>> Fixed
               </div>
 
               <a class="expand small" ng-click="hideAdv=!hideAdv">

views/join.html

@@ -64,6 +64,7 @@
               numbers and symbols</span>" tooltip-trigger="focus" 
               tooltip-placement="top" required>
 
+            <small translate class="is-valid" ng-show="joinForm.joinPasswordConfirm.$dirty &&  joinForm.$invalid">Please enter the same password you entered above</small>
             <input type="password" 
             placeholder="{{'Repeat password'|translate}}"
             name="joinPasswordConfirm"