Transfer txs update (#218)

SrikanthSoparla · poojachigitey · web-flow · commit f1d4c727fad5 · 2025-06-12T18:02:21.000+05:30
* transparent transfer updates

* nam shielded transfer, unshield transactions.

* fixes.

---------

Co-authored-by: poojachigitey &lt;chigiteypooja12@gmail.com&gt;
diff --git a/src/containers/IBCTransfer/ShieldedSourceSelectField.js b/src/containers/IBCTransfer/ShieldedSourceSelectField.js
@@ -77,14 +77,14 @@ const ShieldedSourceSelectField = (props) => {
             value={props.value}
             onChange={handleChange}>
             {props.ibcOnly
-            ? null
-            : <MenuItem className="phase5_disable" value="Namada" disabled>
-                <img alt="NamadaLogo" src={NamadaLogo}/>
-                <div>
-                    {variables[props.lang].namada}
-                    <p>{variables[props.lang].enables_in_phase_5}</p>
-                </div>
-            </MenuItem>}
+                ? null
+                : <MenuItem className="phase5_disable" value="NAM" disabled>
+                    <img alt="NamadaLogo" src={NamadaLogo}/>
+                    <div>
+                        {variables[props.lang].namada}
+                        <p>{variables[props.lang].enables_in_phase_5}</p>
+                    </div>
+                </MenuItem>}
             {enrichedAssets && enrichedAssets.map((asset, index) => {
                 if (asset?.balance?.minDenomAmount === "0") {
                     return null;
diff --git a/src/containers/ShieldedAssets/ShieldDialog/AmountTextField.js b/src/containers/ShieldedAssets/ShieldDialog/AmountTextField.js
@@ -3,13 +3,20 @@ import React from 'react';
 import TextField from '../../../components/TextField';
 import { connect } from 'react-redux';
 import { setAmount } from '../../../actions/shieldedAssets';
+import { config } from 'config';
 
 const AmountTextField = (props) => {
     const fromNamadaSelectedConfig = props.selectedAsset?.config;
     let namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
     if (props.from === 'shield_to_transparent') {
         const fromNamadaSelectedConfig = props.fromNamadaSelectedAsset?.config;
         namadaBalance = props.fromNamadaSelectedAsset?.balance && Number(props.fromNamadaSelectedAsset?.balance) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
+        if (props.fromNamadaSelectedAsset?.tokenAddress === config.TOKEN_ADDRESS) {
+            namadaBalance = props.fromNamadaSelectedAsset?.balance && Number(props.fromNamadaSelectedAsset?.balance);
+        }
+    }
+    if (props.selectedAsset?.balance?.tokenAddress === config.TOKEN_ADDRESS) {
+        namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount);
     }
     
     const handleChange = (input) => {
diff --git a/src/containers/ShieldedAssets/ShieldDialog/ShieldedToTransparent.js b/src/containers/ShieldedAssets/ShieldDialog/ShieldedToTransparent.js
@@ -35,7 +35,8 @@ const ShieldedToTransparent = (props) => {
         const source = props.shieldedData?.pseudoExtendedKey;
         let token = config.TOKEN_ADDRESS;
         let amount = new BigNumber(props.amount);
-        if (props.selectedAsset?.balance) {
+        if (props.selectedAsset?.balance && props.selectedAsset?.tokenAddress &&
+            props.selectedAsset?.tokenAddress !== config.TOKEN_ADDRESS) {
             amount = new BigNumber(props.amount * (10 ** fromNamadaSelectedConfig?.COIN_DECIMALS));
             token = props.selectedAsset?.tokenAddress;
         }
@@ -71,6 +72,8 @@ const ShieldedToTransparent = (props) => {
                 if (props.feeOption?.fees?.token === config.TOKEN_ADDRESS) {
                     txs.feeAmount = new BigNumber(0.000001);
                 }
+            } else if (props.selectedAsset?.tokenAddress === config.TOKEN_ADDRESS) {
+                txs.feeAmount = new BigNumber(0.000001);
             }
             txs.gasLimit = new BigNumber(feeCalculation(props.gasEstimation))
         }
@@ -161,7 +164,10 @@ const ShieldedToTransparent = (props) => {
     const disable = inProgress || !props.amount || props.amountValid === false || !balanceValidation;
 
     const fromNamadaSelectedConfig = props.selectedAsset?.config;
-    const namadaBalance = props.selectedAsset?.balance && Number(props.selectedAsset?.balance) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
+    let namadaBalance = props.selectedAsset?.balance && Number(props.selectedAsset?.balance) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
+    if (props.selectedAsset?.tokenAddress === config.TOKEN_ADDRESS) {
+        namadaBalance = props.selectedAsset?.balance && Number(props.selectedAsset?.balance)
+    }
     const fee = feeList && fromNamadaSelectedConfig && feeList[fromNamadaSelectedConfig?.COIN_DENOM];
 
     return (
diff --git a/src/containers/ShieldedAssets/ShieldDialog/SourceSelectField.js b/src/containers/ShieldedAssets/ShieldDialog/SourceSelectField.js
@@ -48,8 +48,8 @@ const SourceSelectField = (props) => {
             placeholder={variables[props.lang]['select_asset']}
             value={props.value}
             onChange={handleChange}>
-            <MenuItem className="phase5_disable" value="Namada" disabled>
-                <img alt="NamadaLogo" src={NamadaLogo}/>
+            <MenuItem className="phase5_disable" value="NAM" disabled>
+                <img alt="NamadaLogo" src={NamadaLogo} style={{ width: '24px', height: '24px', marginRight: '8px' }}/>
                 <div>
                     {variables[props.lang].namada}
                     <p>{variables[props.lang].enables_in_phase_5}</p>
diff --git a/src/containers/ShieldedAssets/ShieldDialog/index.js b/src/containers/ShieldedAssets/ShieldDialog/index.js
@@ -12,7 +12,6 @@ import NamadaLogo from '../../../assets/masp/namada_logo.svg';
 import NamadaShieldedLogo from '../../../assets/masp/namada_shielded.svg';
 import BigNumber from 'bignumber.js';
 import { maspTransaction } from 'helper';
-import CircularProgress from 'components/CircularProgress';
 import { ShieldingTransferDataMsgValue } from '@harish551/namada-types';
 import { fetchBalanceList, getBalance, getShieldedBalance } from 'actions/accounts';
 import { showDelegateFailedDialog, showDelegateProcessingDialog, showDelegateSuccessDialog } from 'actions/stake';
@@ -36,7 +35,8 @@ const ShieldDialog = (props) => {
         const source = props.address;
         let token = config.TOKEN_ADDRESS;
         let amount = new BigNumber(props.amount);
-        if (props.selectedAsset?.balance?.minDenomAmount) {
+        if (props.selectedAsset?.balance?.minDenomAmount && props.selectedAsset?.balance?.tokenAddress &&
+            props.selectedAsset?.balance?.tokenAddress !== config.TOKEN_ADDRESS) {
             amount = new BigNumber(props.amount * (10 ** fromNamadaSelectedConfig?.COIN_DECIMALS));
             token = props.selectedAsset?.balance?.tokenAddress;
         }
@@ -71,6 +71,8 @@ const ShieldDialog = (props) => {
                 if (props.feeOption?.fees?.token === config.TOKEN_ADDRESS) {
                     txs.feeAmount = new BigNumber(0.000001);
                 }
+            } else if (props.selectedAsset?.balance?.tokenAddress === config.TOKEN_ADDRESS) {
+                txs.feeAmount = new BigNumber(0.000001);
             }
             txs.gasLimit = new BigNumber(feeCalculation(props.gasEstimation))
         }
@@ -111,6 +113,38 @@ const ShieldDialog = (props) => {
                 text: `${tokenName} Shielded Successfully`,
                 content: 'Your shielded transaction was completed',
             }
+            if (token === config.TOKEN_ADDRESS) {
+                props.getBalance(props.address, (result) => {
+                    if (result && result.length) {
+                        let localBalance = null;
+                        result && result.length && result.map((val) => {
+                            if (val && val.length) {
+                                val.map((value) => {
+                                    if (value === config.TOKEN_ADDRESS) {
+                                        localBalance = val[1];
+                                    }
+                                });
+                            }
+    
+                            return null;
+                        });
+    
+                        if (localBalance !== available) {
+                            setInProgress(false);
+                            setParams(false);
+                            setApproval(false);
+                            clearInterval(intervalTime);
+                            // props.successDialog(value && value.hash, null, fromNamadaSelectedConfig);
+                            props.showTokensTransactionSuccessDialog(successObject)
+                            props.getShieldedBalance(props.shieldedData?.viewingKey, props.shieldedData?.timestamp, props.address, props.shieldedData?.address, config.CHAIN_ID);
+                            props.hideTransparentTokensConvertDialog();
+                        }
+                    }
+                });
+
+                return;
+            }
+
             props.fetchBalanceList(props.address, (result) => {
                 if (result && result.length) {
                     let localBalance = null;
@@ -175,7 +209,10 @@ const ShieldDialog = (props) => {
     const disable = inProgress || !props.amount || props.amountValid === false || !balanceValidation;
 
     const fromNamadaSelectedConfig = props.selectedAsset?.config;
-    const namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
+    let namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
+    if (props.selectedAsset?.balance?.tokenAddress === config.TOKEN_ADDRESS) {
+        namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount)
+    }
     const fee = feeList && fromNamadaSelectedConfig && feeList[fromNamadaSelectedConfig?.COIN_DENOM];
 
     return (
diff --git a/src/containers/Tokens/ShieldedTokensListTable.js b/src/containers/Tokens/ShieldedTokensListTable.js
@@ -17,6 +17,7 @@ import classNames from 'classnames';
 import DotsLoading from 'components/DotsLoading';
 import variables from 'utils/variables';
 import { fetchGasEstimation } from 'actions/gasPrice';
+import { config } from '../../config';
 
 const CustomTooltip = withStyles({
     tooltip: {
@@ -96,6 +97,12 @@ class ShieldedTokensListTable extends React.Component {
         if (find) {
             this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM, value);
         } else {
+            // Enable in phase 5
+            // if (!find && value?.config?.COIN_DENOM === config.COIN_DENOM) {
+            //     this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM, value);
+            // } else {
+            //     this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM);
+            // }
             this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM);
         }
         this.props.showShieldedTokensConvertDialog(value);
@@ -221,7 +228,7 @@ class ShieldedTokensListTable extends React.Component {
                                                 {variables[this.props.lang].transfer}
                                             </Button>
                                         </span>
-                                    </CustomTooltip> 
+                                    </CustomTooltip>
                                     : <Button onClick={() => this.handleTransfer(value)} disabled={this.props.shieldedBalanceProgress}>
                                         <img src={TransferIcon} alt="Transfer"/>
                                         {variables[this.props.lang].transfer}
@@ -260,13 +267,18 @@ class ShieldedTokensListTable extends React.Component {
                 tokenAddress: (matchingBalance && matchingBalance.length && matchingBalance[0]) || (matchingToken && matchingToken.address) || null,
             };
         }).filter((item) => item);
+        const matchingBalance = (this.props.balanceList || []).find(([address]) => address === config.TOKEN_ADDRESS);
         enrichedAssets.unshift({
             name: 'Shielded Namada',
             symbol: 'NAM',
             logo_URIs: {
                 svg: NamadaShieldedLogo,
             },
-            balance: 0,
+            config: {
+                COIN_DENOM: 'NAM',
+            },
+            balance: (matchingBalance && matchingBalance.length && matchingBalance[1]) || 0,
+            tokenAddress: config.TOKEN_ADDRESS,
         });
 
         const tableData = enrichedAssets && enrichedAssets.length
diff --git a/src/containers/Tokens/ShieldedTransferDialog/index.js b/src/containers/Tokens/ShieldedTransferDialog/index.js
@@ -19,7 +19,6 @@ import { ShieldedTransferDataMsgValue } from "@harish551/namada-types";
 import BigNumber from "bignumber.js";
 import { ibcShieldedTransfer } from "helper";
 import { fetchIBCBalance, showTokensTransactionSuccessDialog } from "actions/IBCTransfer";
-import CircularProgress from "components/CircularProgress";
 import variables from "utils/variables";
 import ProcessingButton from "components/ProcessingButton";
 import { balanceCalculation, feeCalculation, feeCalculationDisplay } from "utils/feeCalculation";
@@ -41,14 +40,17 @@ class ShieldedTransferDialog extends React.Component {
     }
 
     handleTransfer () {
-        const fromSelectedConfig = this.props.value && this.props.value.config && this.props.value.config.CHAIN_NAME ? this.props.value.config : null;
+        const fromSelectedConfig = this.props.value && this.props.value?.symbol === 'NAM'
+        ? config
+        : this.props.value && this.props.value.config && this.props.value.config.CHAIN_NAME ? this.props.value.config : null;
         this.setState({ inProgress: true });
 
         // const source = this.props.address;
         const source = this.props.shieldedData?.pseudoExtendedKey;
         let token = config.TOKEN_ADDRESS;
         let amount = new BigNumber(this.props.tokensTransferAmount);
-        if (this.props.value?.balance) {
+        if (this.props.value?.balance && this.props.value?.tokenAddress &&
+            this.props.value?.tokenAddress !== config.TOKEN_ADDRESS) {
             amount = new BigNumber(this.props.tokensTransferAmount * (10 ** fromSelectedConfig?.COIN_DECIMALS));
             token = this.props.value?.tokenAddress;
         }
@@ -94,6 +96,8 @@ class ShieldedTransferDialog extends React.Component {
                 if (this.props.feeOption?.fees?.token === config.TOKEN_ADDRESS) {
                     txs.feeAmount = new BigNumber(0.000001);
                 }
+            } else if (this.props.value?.tokenAddress === config.TOKEN_ADDRESS) {
+                txs.feeAmount = new BigNumber(0.000001);
             }
             txs.gasLimit = new BigNumber(feeCalculation(this.props.gasEstimation))
         }
diff --git a/src/containers/Tokens/TokensListTable.js b/src/containers/Tokens/TokensListTable.js
@@ -106,6 +106,11 @@ class TokensListTable extends React.Component {
         }
         this.props.fetchGasEstimation(array, value);
         this.props.showTransparentTokensConvertDialog(value);
+        // Enable in phase 5
+        // if (!find && value?.config?.COIN_DENOM === config.COIN_DENOM) {
+        //     this.props.setSelectedSource(value?.config?.COIN_DENOM, value);
+        //     return;
+        // }
         this.props.setSelectedSource(value?.config?.COIN_DENOM, find);
     }
 
@@ -252,14 +257,6 @@ class TokensListTable extends React.Component {
                                         <img src={TransferIcon} alt="Transfer"/>
                                         {variables[this.props.lang].transfer}
                                     </Button>}
-                                {/* <CustomTooltip title={token === 'NAM' ? 'Enables in Phase 5' : "Coming Soon"}>
-                                    <span className='disabled_tx_button'>
-                                        <Button disabled={true} onClick={() => this.handleTransfer(value)}>
-                                            <img src={TransferIcon} alt="Transfer"/>
-                                            Transfer
-                                        </Button>
-                                    </span>
-                                </CustomTooltip> */}
                                 {token === 'NAM'
                                     ? <CustomTooltip title="Enables in Phase 5">
                                         <span className='disabled_tx_button'>
@@ -328,8 +325,12 @@ class TokensListTable extends React.Component {
             logo_URIs: {
                 svg: NamadaLogo,
             },
+            config: {
+                COIN_DENOM: 'NAM',
+            },
             balance: {
-                minDenomAmount: available
+                minDenomAmount: available,
+                tokenAddress: config.TOKEN_ADDRESS,
             }
         });
 
diff --git a/src/containers/Tokens/TransparentTransferDialog/index.js b/src/containers/Tokens/TransparentTransferDialog/index.js
@@ -14,7 +14,7 @@ import { formatCount } from "utils/numberFormats";
 import { fetchBalanceList, getBalance } from "actions/accounts";
 import { showDelegateFailedDialog, showDelegateProcessingDialog, showDelegateSuccessDialog } from "actions/stake";
 import { showMessage } from "actions/snackbar";
-import { config } from "config";
+import { config } from "../../../config";
 import { TransparentTransferDataMsgValue } from "@harish551/namada-types";
 import BigNumber from "bignumber.js";
 import { ibcTransparentTransfer } from "helper";
@@ -45,7 +45,8 @@ class TransparentTransferDialog extends React.Component {
         // const source = this.props.shieldedData?.pseudoExtendedKey;
         let token = config.TOKEN_ADDRESS;
         let amount = new BigNumber(this.props.tokensTransferAmount);
-        if (this.props.value?.balance?.minDenomAmount) {
+        if (this.props.value?.balance?.minDenomAmount && this.props.value?.balance?.tokenAddress &&
+            this.props.value?.balance?.tokenAddress !== config.TOKEN_ADDRESS) {
             amount = new BigNumber(this.props.tokensTransferAmount * (10 ** fromSelectedConfig?.COIN_DECIMALS));
             token = this.props.value?.balance?.tokenAddress;
         }
@@ -81,6 +82,8 @@ class TransparentTransferDialog extends React.Component {
                 if (this.props.feeOption?.fees?.token === config.TOKEN_ADDRESS) {
                     txs.feeAmount = new BigNumber(0.000001);
                 }
+            } else if (this.props.value?.balance?.tokenAddress === config.TOKEN_ADDRESS) {
+                txs.feeAmount = new BigNumber(0.000001);
             }
             txs.gasLimit = new BigNumber(feeCalculation(this.props.gasEstimation))
         }
