better texts and forms

src/css/main.css

@@ -573,6 +573,13 @@ button.radius, .button.radius {
   border-radius: 3px;
 }
 
+
+label small {
+  font-size: 10px;
+  color: #999;
+}
+
+
 label small.has-error {
   font-size: 11px;
 }

src/js/controllers/create.js

@@ -57,10 +57,22 @@ angular.module('copayApp.controllers').controller('createController',
         m: $scope.requiredCopayers,
         n: $scope.totalCopayers,
         name: form.walletName.$modelValue,
-        mnemonic: form.privateKey.$modelValue,
         myName: $scope.totalCopayers > 1 ? form.myName.$modelValue : null,
         networkName: form.isTestnet.$modelValue ? 'testnet' : 'livenet',
       };
+      var setSeed = form.setSeed.$modelValue;
+      if  (setSeed) {
+        opts.mnemonic = form.privateKey.$modelValue;
+        opts.passphrase = form.passphrase.$modelValue;
+      } else {
+        opts.passphrase = form.createPassphrase.$modelValue;
+      }
+
+      if (setSeed && !opts.mnemonic) {
+        this.error = gettext('Please enter the wallet seed');
+        return;
+      }
+ 
       self.loading = true;
 
       if (form.hwLedger.$modelValue) {

src/js/controllers/import.js

@@ -61,7 +61,7 @@ angular.module('copayApp.controllers').controller('importController',
     };
 
 
-    var _importMnemonic = function(words, passphrase, opts) {
+    var _importMnemonic = function(words, opts) {
       self.loading = true;
 
       $timeout(function() {
@@ -164,6 +164,6 @@ angular.module('copayApp.controllers').controller('importController',
       opts.passphrase = form.passphrase.$modelValue || null;
       opts.networkName = form.isTestnet.$modelValue ? 'testnet' : 'livenet';
 
-      _importMnemonic(words, passphrase, opts);
+      _importMnemonic(words, opts);
     };
   });

src/js/controllers/join.js

@@ -153,11 +153,23 @@ angular.module('copayApp.controllers').controller('joinController',
 
       var opts = {
         secret: form.secret.$modelValue,
-        mnemonic: form.privateKey.$modelValue,
         myName: form.myName.$modelValue
         extendedPrivateKey: form.privateKey.$modelValue,
         myName: form.myName.$modelValue
       }
+      var setSeed = form.setSeed.$modelValue;
+      if  (setSeed) {
+        opts.mnemonic = form.privateKey.$modelValue;
+        opts.passphrase = form.passphrase.$modelValue;
+      } else {
+        opts.passphrase = form.createPassphrase.$modelValue;
+      }
+
+      if (setSeed && !opts.mnemonic) {
+        this.error = gettext('Please enter the wallet seed');
+        return;
+      }
+ 
 
       if (form.hwLedger.$modelValue) {
         self.ledger = true;

src/js/services/bwsError.js

@@ -91,7 +91,7 @@ angular.module('copayApp.services')
             body = gettextCatalog.getString('This wallet is not registed at the wallet service. Please create it from "Create Wallet" using adding for backup words');
             break;
           case 'INVALID_BACKUP': 
-            body = gettextCatalog.getString('Backup words are invalid');
+            body = gettextCatalog.getString('Wallet seed is invalid');
             break;
  
  

src/js/services/profileService.js

@@ -175,7 +175,7 @@ angular.module('copayApp.services')
           walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
         } catch (ex) {
           $log.info(ex);
-          return cb(gettext('Could not create: Invalid Backup Words'));
+          return cb(gettext('Could not create: Invalid wallet seed'));
         }
       } else if (opts.extendedPublicKey) {
         try {