add normalization of seeds, better JA support

public/views/backup.html

@@ -75,9 +75,7 @@
     <div class="row enable_text_select" ng-show="show">
         <div class="small-centered p10t p10b large-centered medium-centered large-8 medium-8 small-10 columns enable_text_select" style="border:1px solid gray; background:#eee;
 ">
-          <span ng-repeat="word in wordsC.mnemonicWords">
+          <span ng-repeat="word in wordsC.mnemonicWords"><span style="white-space:nowrap">{{word}}</span><span ng-show="index.defaultLanguageIsoCode == 'ja'">&#x3000;</span> </span>  
-            {{word}} 
-          </span> 
         </div>
 
         <div class="box-notification large-centered medium-centered small-centered large-8 medium-8 small-10 columns m10t" ng-show="wordsC.mnemonicHasPassphrase">
@@ -89,10 +87,6 @@
           </span>
         </div>
 
-
-
-
-
         <div class="m10 text-center columns">
           <div class="m10 size-14 text-gray">
             <span translate>

public/views/preferences.html

@@ -55,12 +55,6 @@
       <span translate>Backup</span>
     </li>
  
-    <h4 class="title m0">&nbsp;</h4>
-    <li class="line-b p20" ng-click="$root.go('export')" ng-hide="preferences.externalIndex >= 0">
-      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
-      <span translate>Export</span>
-    </li>
- 
     <li class="line-b p20" ng-click="$root.go('preferencesAdvanced')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Advanced</span>

src/js/controllers/backup.js

@@ -27,7 +27,7 @@ angular.module('copayApp.controllers').controller('wordsController',
     var words = fc.getMnemonic();
 
     if (words)
-      this.mnemonicWords = words.split(' ');
+      this.mnemonicWords = words.split(/[\u3000\s]+/);
 
     this.mnemonicHasPassphrase = fc.mnemonicHasPassphrase();
   });

src/js/controllers/import.js

@@ -159,18 +159,14 @@ angular.module('copayApp.controllers').controller('importController',
 
       if (!words) {
         this.error = gettext('Please enter the seed words');
-      } else if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
+      } else if (words.indexOf('xprv') == 0  || words.indexOf('tprv') == 0) {
         return _importExtendedPrivateKey(words)
       } else {
-        var wordList = words.split(/ /).filter(function(v) {
+        var wordList = words.split(/[\u3000\s]+/);
-          return v.length > 0;
-        });
 
         // m/ allows to enter a custom derivation 
         if ((wordList.length % 3) != 0 && wordList[0].indexOf('m/') != 0)
           this.error = gettext('Wrong number of seed words:') + wordList.length;
-        else
-          words = wordList.join(' ');
       }
 
       if (this.error) {

src/js/services/profileService.js

@@ -170,15 +170,9 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       var network = opts.networkName || 'livenet';
 
-      if (opts.mnemonic && opts.mnemonic.indexOf('m/') == 0) {
-        var xPrivKey = root._preDerivation(opts.mnemonic, network);
-        if (!xPrivKey)
-          return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
-        opts.mnemonic = null;
-        opts.extendedPrivateKey = xPrivKey;
-      }
       if (opts.mnemonic) {
         try {
+          opts.mnemonic = root._normalizeMnemonic(opts.mnemonic);
           walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
         } catch (ex) {
           $log.info(ex);
@@ -327,10 +321,11 @@ angular.module('copayApp.services')
       var walletId = walletClient.credentials.walletId;
 
       // check if exist
-      if (lodash.find(root.profile.credentials, {
+      var w = lodash.find(root.profile.credentials, {
         'walletId': walletId
-      })) {
+      });
-        return cb(gettext('Wallet already exists'));
+      if (w) {
+        return cb(gettext('Wallet already in Copay' + ": ") + w.walletName );
       }
 
       root.profile.credentials.push(JSON.parse(walletClient.export()));
@@ -371,31 +366,19 @@ angular.module('copayApp.services')
     };
 
 
-    root._preDerivation = function(words, network) {
+    root._normalizeMnemonic = function(words) {
-      var wordList = words.split(/ /).filter(function(v) {
+      var isJA = words.indexOf('\u3000') > -1; 
-        return v.length > 0;
+      var wordList = words.split(/[\u3000\s]+/);
-      });
+
-      var path = wordList.shift();
+      return wordList.join(isJA ? '\u3000' : ' ');
-      var walletClient = bwcService.getClient();
-      $log.info('preDerivation:', path);
-      walletClient.seedFromMnemonic(wordList.join(' '), null, network);
-      var k = new bitcore.HDPrivateKey(walletClient.credentials.xPrivKey);
-      var k2 = k.derive(path);
-      return k2.toString();
     };
 
     root.importMnemonic = function(words, opts, cb) {
       var walletClient = bwcService.getClient();
 
-      if (words.indexOf('m/') == 0) {
-        var xPrivKey = root._preDerivation(words, opts.networkName);
-        if (!xPrivKey)
-          return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
-        return root.importExtendedPrivateKey(xPrivKey, cb);
-      }
-
       $log.debug('Importing Wallet Mnemonic');
 
+      words = root._normalizeMnemonic(words);
       walletClient.importFromMnemonic(words, {
         network: opts.networkName,
         passphrase: opts.passphrase,