Merge pull request #536 from persistenceOne/test_gaia

fix: fix tokenize error

Author: blackpanther1881

src/containers/Transactions/ModalRedeemShares/ButtonRedeem.js

@@ -35,7 +35,7 @@ const ButtonRedeem = ({ tokenizedShares, rewardList }) => {
       );
       messages.push(msg);
     });
-    console.log(messages, "messages");
+    console.log(messages, "messages1");
     dispatch(submitFormData(messages));
   };
 

src/containers/Transactions/ModalTransferShares/ButtonTransfer.js

@@ -37,42 +37,58 @@ const ButtonTransfer = ({ tokenizedShares, rewardList }) => {
 
   const onClick = () => {
     const messages = getMessage();
-    console.log(messages, "messages")
+    console.log(messages, "messages-transfer")
     dispatch(submitFormData(messages));
   };
 
   const disable = tokenizedShares.length <= 0 || toAddress.value === "";
 
   const getMessage = () => {
     let messages = [];
-    rewardList.forEach((item) => {
-      const msg = TokenizedSharesRewardsMsg(item.owner,item.recordId);
-      messages.push(msg);
-    });
-
-    let blcList = [];
-
-    tokenizedShares.forEach((item) => {
-      const msg = TokenizeSharesTransferMsg(
+    const ledgerApp = localStorage.getItem("ledgerAppName");
+    if(loginInfo && loginInfo.loginMode === "keplr" || ledgerApp !== "Persistence"){
+      rewardList.forEach((item) => {
+        const msg = TokenizedSharesRewardsMsg(item.owner,item.recordId);
+        messages.push(msg);
+      });
+      let blcList = [];
+      tokenizedShares.forEach((item) => {
+        const blc = {
+          amount: (item.amount * DefaultChainInfo.uTokenValue).toFixed(0),
+          denom: item.denom
+        };
+        blcList.push(blc);
+        const msg = TokenizeSharesTransferMsg(
           item.recordId,
-        loginInfo.address,
-        toAddress.value
+          loginInfo.address,
+          toAddress.value
+        );
+        messages.push(msg);
+      });
+      const sendMsg = SendMsg(
+        loginInfo && loginInfo.address,
+        toAddress.value,
+        blcList
       );
-      const blc = {
-        amount: (item.amount * DefaultChainInfo.uTokenValue).toFixed(0),
-        denom: item.denom
-      };
-      blcList.push(blc);
-      messages.push(msg);
-    });
-
-    const sendMsg = SendMsg(
-      loginInfo && loginInfo.address,
-      toAddress.value,
-      blcList
-    );
-    messages.push(sendMsg);
-    return messages;
+      messages.push(sendMsg);
+      return messages;
+    } else {
+      let blcList = [];
+      tokenizedShares.forEach((item) => {
+        const blc = {
+          amount: (item.amount * DefaultChainInfo.uTokenValue).toFixed(0),
+          denom: item.denom
+        };
+        blcList.push(blc);
+      });
+      const sendMsg = SendMsg(
+        loginInfo && loginInfo.address,
+        toAddress.value,
+        blcList
+      );
+      messages.push(sendMsg);
+      return messages;
+    }
   };
 
   const onClickKeplr = () => {

src/store/actions/balance.js

@@ -94,6 +94,7 @@ export const fetchTransferableVestingAmount = (address) => {
       const response = await stakingQueryService.AllBalances({
         address: address
       });
+      console.log(response, "response-balances")
       if (response.balances.length) {
         let tokenList = [];
         for (let i = 0; i < response.balances.length; i++) {