Skip to content

Commit 13ba6fb

Browse files
SrikanthSoparlaSrikanthSoparla
authored
Nam transfers enable. (#220)
* Nam transfers enable. * config unwanted list removed. * shielded fee fixes.
1 parent 1ea49f3 commit 13ba6fb

File tree

8 files changed

+44
-88
lines changed

8 files changed

+44
-88
lines changed

‎src/config.js‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,14 @@ export const config = {
55
RPC_URL: 'https://namada-rpc.cosmicvalidator.com',
66
REST_URL: 'https://namada-indexer.cosmicvalidator.com',
77
// MASP_REST_URL: 'https://namada-masp.cosmicvalidator.com',
8-
EXPLORER_URL: 'https://explorer75.org/namada',
8+
EXPLORER_URL: 'https://namada.valopers.com',
99
STAKING_URL: 'https://namada.omniflix.co/stake',
1010
NETWORK_NAME: 'Namada',
1111
NETWORK_TYPE: 'mainnet',
1212
CHAIN_ID: 'namada.5f5de2dd1b88cba30586420',
1313
TOKEN_ADDRESS: 'tnam1q9gr66cvu4hrzm0sd5kmlnjje82gs3xlfg3v6nu7',
14-
// CHAIN_NAME: 'OmniFlix Hub',
1514
COIN_DENOM: 'NAM',
16-
// COIN_MINIMAL_DENOM: 'uflix',
1715
COIN_DECIMALS: 6,
18-
// PREFIX: 'omniflix',
19-
// COIN_TYPE: 118,
20-
// COSMOSTAION: 'omniflix',
21-
// COINGECKO_ID: 'omniflix-network',
22-
// GAS_PRICE_STEP_LOW: 0.001,
23-
// GAS_PRICE_STEP_AVERAGE: 0.0025,
24-
// GAS_PRICE_STEP_HIGH: 0.025,
25-
// FEATURES: ['ibc-transfer', 'ibc-go'],
2616
};
2717

2818
export const osmosisChainConfig = {

‎src/containers/IBCTransfer/ShieldedSourceSelectField.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,10 @@ const ShieldedSourceSelectField = (props) => {
7878
onChange={handleChange}>
7979
{props.ibcOnly
8080
? null
81-
: <MenuItem className="phase5_disable" value="NAM" disabled>
81+
: <MenuItem className="phase5_disable" value="NAM">
8282
<img alt="NamadaLogo" src={NamadaLogo}/>
8383
<div>
8484
{variables[props.lang].namada}
85-
<p>{variables[props.lang].enables_in_phase_5}</p>
8685
</div>
8786
</MenuItem>}
8887
{enrichedAssets && enrichedAssets.map((asset, index) => {

‎src/containers/ShieldedAssets/ShieldDialog/AmountTextField.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import { config } from 'config';
88
const AmountTextField = (props) => {
99
const fromNamadaSelectedConfig = props.selectedAsset?.config;
1010
let namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
11+
if (props.selectedAsset?.balance?.tokenAddress === config.TOKEN_ADDRESS) {
12+
namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount);
13+
}
1114
if (props.from === 'shield_to_transparent') {
1215
const fromNamadaSelectedConfig = props.fromNamadaSelectedAsset?.config;
1316
namadaBalance = props.fromNamadaSelectedAsset?.balance && Number(props.fromNamadaSelectedAsset?.balance) / 10 ** fromNamadaSelectedConfig.COIN_DECIMALS;
1417
if (props.fromNamadaSelectedAsset?.tokenAddress === config.TOKEN_ADDRESS) {
1518
namadaBalance = props.fromNamadaSelectedAsset?.balance && Number(props.fromNamadaSelectedAsset?.balance);
1619
}
1720
}
18-
if (props.selectedAsset?.balance?.tokenAddress === config.TOKEN_ADDRESS) {
19-
namadaBalance = props.selectedAsset?.balance?.minDenomAmount && Number(props.selectedAsset?.balance?.minDenomAmount);
20-
}
2121

2222
const handleChange = (input) => {
2323
const value = input === '' ? '' : parseFloat(input);

‎src/containers/ShieldedAssets/ShieldDialog/SourceSelectField.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ const SourceSelectField = (props) => {
4848
placeholder={variables[props.lang]['select_asset']}
4949
value={props.value}
5050
onChange={handleChange}>
51-
<MenuItem className="phase5_disable" value="NAM" disabled>
51+
<MenuItem className="phase5_disable" value="NAM">
5252
<img alt="NamadaLogo" src={NamadaLogo} style={{ width: '24px', height: '24px', marginRight: '8px' }}/>
5353
<div>
5454
{variables[props.lang].namada}
55-
<p>{variables[props.lang].enables_in_phase_5}</p>
5655
</div>
5756
</MenuItem>
5857
{enrichedAssets && enrichedAssets.map((asset, index) => {

‎src/containers/Stake/DelegateDialog/SuccessDialog.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ const CustomTooltip = withStyles(() => ({
3737
const SuccessDialog = (props) => {
3838
const handleRedirect = () => {
3939
if (props.router.location.pathname === '/externalTransfer/withdraw' && config.EXPLORER_URL) {
40-
const link = `${config.EXPLORER_URL}/tx/${props.hash}`;
40+
const link = `${config.EXPLORER_URL}/transactions/${props.hash}`;
4141
window.open(link, '_blank');
4242
} else if (props.ibcConfig && props.ibcConfig.EXPLORER_URL) {
4343
const link = `${props.ibcConfig.EXPLORER_URL}/tx/${props.hash}`;
4444
window.open(link, '_blank');
4545
} else if (config.EXPLORER_URL) {
46-
const link = `${config.EXPLORER_URL}/tx/${props.hash}`;
46+
const link = `${config.EXPLORER_URL}/transactions/${props.hash}`;
4747
window.open(link, '_blank');
4848
}
4949
};

‎src/containers/Tokens/FeeOptions/index.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import './index.css';
88
import { feeCoverageOptions } from 'utils/feeCalculation';
99
import { namadaAssets } from 'dummy/ibcList';
1010
import NamadaLogo from '../../../assets/masp/namada_logo.svg';
11+
import ShieldedNamadaLogo from '../../../assets/masp/namada_shielded.svg';
1112
import { makeStyles } from '@material-ui/core/styles';
1213
import variables from '../../../utils/variables';
1314

@@ -46,7 +47,13 @@ const FeeOptions = (props) => {
4647
}, ...namadaAssets];
4748

4849
if (props.from && props.from === 'shielded') {
49-
newNamadaAssets = namadaAssets;
50+
newNamadaAssets = [{
51+
name: 'Shielded Namada',
52+
symbol: 'NAM',
53+
logo_URIs: {
54+
svg: ShieldedNamadaLogo,
55+
},
56+
}, ...namadaAssets];
5057
}
5158

5259
let enrichedAssets = (newNamadaAssets || []).map((asset) => {

‎src/containers/Tokens/ShieldedTokensListTable.js‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,11 @@ class ShieldedTokensListTable extends React.Component {
9797
if (find) {
9898
this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM, value);
9999
} else {
100-
// Enable in phase 5
101-
// if (!find && value?.config?.COIN_DENOM === config.COIN_DENOM) {
102-
// this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM, value);
103-
// } else {
104-
// this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM);
105-
// }
106-
this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM);
100+
if (!find && value?.config?.COIN_DENOM === config.COIN_DENOM) {
101+
this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM, value);
102+
} else {
103+
this.props.setFromShieldedNamadaSelectedAsset(value?.config?.COIN_DENOM);
104+
}
107105
}
108106
this.props.showShieldedTokensConvertDialog(value);
109107
}
@@ -220,32 +218,14 @@ class ShieldedTokensListTable extends React.Component {
220218
<img src={WithdrawIcon} alt="Withdraw"/>
221219
{variables[this.props.lang].withdraw}
222220
</Button>}
223-
{token === 'NAM'
224-
? <CustomTooltip title="Enables in Phase 5">
225-
<span className='disabled_tx_button'>
226-
<Button disabled={true} onClick={() => this.handleTransfer(value)}>
227-
<img src={TransferIcon} alt="Transfer"/>
228-
{variables[this.props.lang].transfer}
229-
</Button>
230-
</span>
231-
</CustomTooltip>
232-
: <Button onClick={() => this.handleTransfer(value)} disabled={this.props.shieldedBalanceProgress}>
233-
<img src={TransferIcon} alt="Transfer"/>
234-
{variables[this.props.lang].transfer}
235-
</Button>}
236-
{token === 'NAM'
237-
? <CustomTooltip title="Enables in Phase 5">
238-
<span className='disabled_tx_button'>
239-
<Button disabled={true} onClick={() => this.handleConvert(value)}>
240-
<img src={ConvertIcon} alt="Convert"/>
241-
{variables[this.props.lang].unshield}
242-
</Button>
243-
</span>
244-
</CustomTooltip>
245-
: <Button onClick={() => this.handleConvert(value)} disabled={this.props.shieldedBalanceProgress}>
246-
<img src={ConvertIcon} alt="Convert"/>
247-
{variables[this.props.lang].unshield}
248-
</Button>}
221+
<Button onClick={() => this.handleTransfer(value)} disabled={this.props.shieldedBalanceProgress}>
222+
<img src={TransferIcon} alt="Transfer"/>
223+
{variables[this.props.lang].transfer}
224+
</Button>
225+
<Button onClick={() => this.handleConvert(value)} disabled={this.props.shieldedBalanceProgress}>
226+
<img src={ConvertIcon} alt="Convert"/>
227+
{variables[this.props.lang].unshield}
228+
</Button>
249229
</div>
250230
);
251231
},
@@ -277,7 +257,7 @@ class ShieldedTokensListTable extends React.Component {
277257
config: {
278258
COIN_DENOM: 'NAM',
279259
},
280-
balance: (matchingBalance && matchingBalance.length && matchingBalance[1]) || 0,
260+
balance: (matchingBalance && matchingBalance.length && matchingBalance[1] && matchingBalance[1] / (10 ** config.COIN_DECIMALS)) || 0,
281261
tokenAddress: config.TOKEN_ADDRESS,
282262
});
283263

‎src/containers/Tokens/TokensListTable.js‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,10 @@ class TokensListTable extends React.Component {
106106
}
107107
this.props.fetchGasEstimation(array, value);
108108
this.props.showTransparentTokensConvertDialog(value);
109-
// Enable in phase 5
110-
// if (!find && value?.config?.COIN_DENOM === config.COIN_DENOM) {
111-
// this.props.setSelectedSource(value?.config?.COIN_DENOM, value);
112-
// return;
113-
// }
109+
if (!find && value?.config?.COIN_DENOM === config.COIN_DENOM) {
110+
this.props.setSelectedSource(value?.config?.COIN_DENOM, value);
111+
return;
112+
}
114113
this.props.setSelectedSource(value?.config?.COIN_DENOM, find);
115114
}
116115

@@ -244,34 +243,16 @@ class TokensListTable extends React.Component {
244243
<img src={WithdrawIcon} alt="Withdraw"/>
245244
{variables[this.props.lang].withdraw}
246245
</Button>}
247-
{token === 'NAM'
248-
? <CustomTooltip title="Enables in Phase 5">
249-
<span className='disabled_tx_button'>
250-
<Button disabled={true} onClick={() => this.handleTransfer(value)}>
251-
<img src={TransferIcon} alt="Transfer"/>
252-
{variables[this.props.lang].transfer}
253-
</Button>
254-
</span>
255-
</CustomTooltip>
256-
: <Button onClick={() => this.handleTransfer(value)}>
257-
<img src={TransferIcon} alt="Transfer"/>
258-
{variables[this.props.lang].transfer}
259-
</Button>}
260-
{token === 'NAM'
261-
? <CustomTooltip title="Enables in Phase 5">
262-
<span className='disabled_tx_button'>
263-
<Button disabled={true} onClick={() => this.handleConvert(value)}>
264-
<img src={ConvertIcon} alt="Convert"/>
265-
{variables[this.props.lang].shield}
266-
</Button>
267-
</span>
268-
</CustomTooltip>
269-
: <CustomTooltip title="Convert to Shielded">
270-
<Button onClick={() => this.handleConvert(value)}>
271-
<img src={ConvertIcon} alt="Convert"/>
272-
{variables[this.props.lang].shield}
273-
</Button>
274-
</CustomTooltip>}
246+
<Button onClick={() => this.handleTransfer(value)}>
247+
<img src={TransferIcon} alt="Transfer"/>
248+
{variables[this.props.lang].transfer}
249+
</Button>
250+
<CustomTooltip title="Convert to Shielded">
251+
<Button onClick={() => this.handleConvert(value)}>
252+
<img src={ConvertIcon} alt="Convert"/>
253+
{variables[this.props.lang].shield}
254+
</Button>
255+
</CustomTooltip>
275256
</div>
276257
);
277258
},

0 commit comments

Comments
 (0)