Merge pull request #452 from persistenceOne/passphrase

Passphrase fix

Author: puneet2019

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pwallet",
-  "version": "2.1.4",
+  "version": "3.1.1",
   "private": true,
   "dependencies": {
     "@cosmjs/crypto": "^v0.27.1",

src/components/DarkMode/global.js

@@ -230,6 +230,8 @@ export const GlobalStyles = createGlobalStyle`
    .MuiPaper-root.MuiMenu-paper .validator-item, .MuiListItem-root.Mui-selected, .MuiListItem-root.Mui-selected:hover, .MuiMenuItem-root{
      border-bottom: 1px solid ${({theme}) => theme.selectItemBorderColor} !important;
      color: ${({theme}) => theme.infoHeadingColor};
+   };
+   .modal-content .form-check label{
+     color: ${({theme}) => theme.selectIconColor};
    }
-
 `;

src/containers/SignIn/index.js

@@ -53,7 +53,6 @@ const SignIn = (props) => {
 
     const cosmos = ExternalChains.find(chain => chain.chainName === 'Cosmos');
 
-    console.log(cosmos, "Cosmos");
     return (
         <>
             <Modal backdrop="static" show={show} onHide={handleClose} centered

src/store/actions/transactions/keyStore.js

@@ -45,8 +45,10 @@ export const keyStoreSubmit = (loginAddress) => {
             const loginInfo = JSON.parse(localStorage.getItem(LOGIN_INFO));
             const password = getState().keyStore.password;
             const keyStoreData = getState().keyStore.keyStore;
+            const encryptedSeed = getState().common.loginInfo.encryptedSeed;
+
             let loginCoinType;
-            if (loginInfo && loginInfo?.addressLogin){
+            if ((loginInfo && loginInfo?.addressLogin) || (loginInfo && !encryptedSeed)){
                 const {coinType} =  getState().signInKeyStore;
                 loginCoinType = coinType;
             }else {
@@ -60,8 +62,6 @@ export const keyStoreSubmit = (loginAddress) => {
             const formData = getState().common.txInfo.value.data;
             const txName = getState().common.txName.value.name;
 
-            const encryptedSeed = getState().common.loginInfo.encryptedSeed;
-
             const fee = getState().fee.fee.value.fee;
             const gas = getState().gas.gas.value;
 
@@ -75,7 +75,7 @@ export const keyStoreSubmit = (loginAddress) => {
                 }
                 mnemonic = decryptedData.mnemonic;
             } else {
-                mnemonic = await privateKeyReader(keyStoreData.value, password.value, loginAddress, accountNumber, accountIndex, loginCoinType);
+                mnemonic = await privateKeyReader(keyStoreData.value, password.value, loginAddress, accountNumber, accountIndex, bip39PassPhrase, loginCoinType);
             }
 
             let result = await transactions.getTransactionResponse(loginAddress, formData, fee, gas, mnemonic, txName, accountNumber, accountIndex, bip39PassPhrase, loginCoinType);

src/store/actions/transactions/ledger.js

@@ -30,7 +30,7 @@ export const ledgerSubmit = (loginAddress, loginMode) => {
 
         let mnemonic = "";
         if (loginMode !== "ledger") {
-            mnemonic = await privateKeyReader(keyStoreData.value, password.value, loginAddress, coinType);
+            mnemonic = await privateKeyReader(keyStoreData.value, password.value, loginAddress, accountNumber, accountIndex, bip39PassPhrase, coinType);
         }
         let response = transactions.getTransactionResponse(loginAddress, formData, fee, gas, mnemonic, txName, accountNumber, accountIndex, bip39PassPhrase, coinType);
         response.then(result => {

src/utils/helper.js

@@ -262,7 +262,7 @@ export const tokenValueConversion = (data) => {
     return data / DefaultChainInfo.uTokenValue;
 };
 
-export const privateKeyReader = (file, password, loginAddress, accountNumber = "0", addressIndex = "0", coinType = configCoinType) => {
+export const privateKeyReader = (file, password, loginAddress, accountNumber = "0", addressIndex = "0", bip39PassPhrase='', coinType = configCoinType) => {
     return new Promise(function (resolve, reject) {
         const fileReader = new FileReader();
         fileReader.readAsText(file, "UTF-8");
@@ -274,7 +274,7 @@ export const privateKeyReader = (file, password, loginAddress, accountNumber = "
                     reject(new Error(decryptedData.error));
                 } else {
                     let mnemonic = mnemonicTrim(decryptedData.mnemonic);
-                    const accountData = await transactions.MnemonicWalletWithPassphrase(mnemonic, makeHdPath(accountNumber, addressIndex, coinType));
+                    const accountData = await transactions.MnemonicWalletWithPassphrase(mnemonic, makeHdPath(accountNumber, addressIndex, coinType), bip39PassPhrase);
                     const address = accountData[1];
                     if (address === loginAddress) {
                         resolve(mnemonic);

src/utils/transactions.js

@@ -28,7 +28,6 @@ async function Transaction(wallet, signerAddress, msgs, fee, memo = "") {
 }
 
 async function TransactionWithKeplr(msgs, fee, memo = "", chainID = configChainID) {
-    console.log(msgs, "msgs");
     const [wallet, address] = await KeplrWallet(chainID);
     return Transaction(wallet, address, msgs, fee, memo);
 }