Merge pull request #2577 from BlueWallet/jsonim

ADD:  Standard wallet type Electrum JSON import

class/wallets/abstract-wallet.js

@@ -164,12 +164,25 @@ export class AbstractWallet {
     }
 
     try {
-      const parsedSecret = JSON.parse(this.secret);
+      let parsedSecret;
+      // regex might've matched invalid data. if so, parse newSecret.
+      if (this.secret.trim().length > 0) {
+        try {
+          parsedSecret = JSON.parse(this.secret);
+        } catch (e) {
+          console.log(e);
+          parsedSecret = JSON.parse(newSecret);
+        }
+      } else {
+        parsedSecret = JSON.parse(newSecret);
+      }
       if (parsedSecret && parsedSecret.keystore && parsedSecret.keystore.xpub) {
         let masterFingerprint = false;
         if (parsedSecret.keystore.ckcc_xfp) {
           // It is a ColdCard Hardware Wallet
           masterFingerprint = Number(parsedSecret.keystore.ckcc_xfp);
+        } else if (parsedSecret.keystore.root_fingerprint) {
+          masterFingerprint = Number(parsedSecret.keystore.root_fingerprint);
         }
         if (parsedSecret.keystore.label) {
           this.setLabel(parsedSecret.keystore.label);

class/wallets/multisig-hd-wallet.js

@@ -480,7 +480,7 @@ export class MultisigHDWallet extends AbstractHDElectrumWallet {
     }
 
     // is it electrum json?
-    if (json && json.wallet_type) {
+    if (json && json.wallet_type && json.wallet_type !== 'standard') {
       const mofn = json.wallet_type.split('of');
       this.setM(parseInt(mofn[0].trim()));
       const n = parseInt(mofn[1].trim());

screen/wallets/import.js

@@ -141,7 +141,6 @@ const WalletsImport = () => {
           <BlueDoneAndDismissKeyboardInputAccessory
             onClearTapped={() => {
               setImportText('');
-              Keyboard.dismiss();
             }}
             onPasteTapped={text => {
               setImportText(text);