Skip to content

Commit bd03321

Browse files
usdc token added. (#216)
1 parent 37f0d93 commit bd03321

File tree

4 files changed

+103
-21
lines changed

4 files changed

+103
-21
lines changed

src/containers/IBCTransfer/IBCTransferDialog.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const IBCTransferDialog = (props) => {
8484
});
8585

8686
balance = balance && balance / 10 ** config.COIN_DECIMALS;
87-
ibcBalance = ibcBalance && ibcBalance / 10 ** (props.selectedChain && props.selectedChain.config && props.selectedChain.config.COIN_DECIMALS);
87+
ibcBalance = (ibcBalance && ibcBalance / 10 ** (props.selectedChain && props.selectedChain.config && props.selectedChain.config.COIN_DECIMALS)) || 0;
8888
if (ibcBalance > 0.5) {
8989
ibcBalance = ibcBalance - 0.05;
9090
}
@@ -94,16 +94,21 @@ const IBCTransferDialog = (props) => {
9494
return undefined;
9595
}
9696

97-
const channel = ibcData.channels.find((ch) => {
97+
let channels = ibcData.channels;
98+
let newIBCData = ibcData;
99+
if (props.selectedChain?.channel?.channels) {
100+
channels = props.selectedChain?.channel?.channels;
101+
newIBCData = props.selectedChain?.channel;
102+
}
103+
const channel = channels.find((ch) => {
98104
if (!ch) { return false; }
99105

100-
return (ibcData.chain_1 && ibcData.chain_1.chain_name === targetChain && ch.chain_1 && ch.chain_1.channel_id) ||
101-
(ibcData.chain_2 && ibcData.chain_2.chain_name === targetChain && ch.chain_2 && ch.chain_2.channel_id);
106+
return (newIBCData.chain_1 && newIBCData.chain_1.chain_name === targetChain && ch.chain_1 && ch.chain_1.channel_id) ||
107+
(newIBCData.chain_2 && newIBCData.chain_2.chain_name === targetChain && ch.chain_2 && ch.chain_2.channel_id);
102108
});
103-
104109
if (!channel) { return undefined; }
105110

106-
const chainKey = ibcData.chain_1 && ibcData.chain_1.chain_name === targetChain ? 'chain_1' : 'chain_2';
111+
const chainKey = newIBCData.chain_1 && newIBCData.chain_1.chain_name === targetChain ? 'chain_1' : 'chain_2';
107112
return channel[chainKey] && channel[chainKey].channel_id;
108113
};
109114

@@ -247,8 +252,8 @@ const IBCTransferDialog = (props) => {
247252
props.fetchBalanceList(props.address);
248253
const tokenAddress = props.transparentTokensDepositDialogValue && props.transparentTokensDepositDialogValue.balance &&
249254
props.transparentTokensDepositDialogValue.balance.tokenAddress;
250-
const balance = props.transparentTokensDepositDialogValue && props.transparentTokensDepositDialogValue.balance &&
251-
props.transparentTokensDepositDialogValue.balance.minDenomAmount && Number(props.transparentTokensDepositDialogValue.balance.minDenomAmount);
255+
const balance = (props.transparentTokensDepositDialogValue && props.transparentTokensDepositDialogValue.balance &&
256+
props.transparentTokensDepositDialogValue.balance.minDenomAmount && Number(props.transparentTokensDepositDialogValue.balance.minDenomAmount)) || 0;
252257
if (tokenAddress) {
253258
const time = setInterval(() => {
254259
(async () => {

src/containers/IBCTransfer/IBCUnShielding.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,22 @@ const IBCUnShielding = (props) => {
103103
return undefined;
104104
}
105105

106-
const channel = ibcData.channels.find((ch) => {
106+
let channels = ibcData.channels;
107+
let newIBCData = ibcData;
108+
if (props.fromNamadaSelectedAsset?.channel?.channels) {
109+
channels = props.fromNamadaSelectedAsset?.channel?.channels;
110+
newIBCData = props.fromNamadaSelectedAsset?.channel;
111+
}
112+
const channel = channels.find((ch) => {
107113
if (!ch) { return false; }
108114

109-
return (ibcData.chain_1 && ibcData.chain_1.chain_name === targetChain && ch.chain_1 && ch.chain_1.channel_id) ||
110-
(ibcData.chain_2 && ibcData.chain_2.chain_name === targetChain && ch.chain_2 && ch.chain_2.channel_id);
115+
return (newIBCData.chain_1 && newIBCData.chain_1.chain_name === targetChain && ch.chain_1 && ch.chain_1.channel_id) ||
116+
(newIBCData.chain_2 && newIBCData.chain_2.chain_name === targetChain && ch.chain_2 && ch.chain_2.channel_id);
111117
});
112118

113119
if (!channel) { return undefined; }
114120

115-
const chainKey = ibcData.chain_1 && ibcData.chain_1.chain_name === targetChain ? 'chain_1' : 'chain_2';
121+
const chainKey = newIBCData.chain_1 && newIBCData.chain_1.chain_name === targetChain ? 'chain_1' : 'chain_2';
116122
return channel[chainKey] && channel[chainKey].channel_id;
117123
};
118124

src/containers/IBCTransfer/NamadaToIBCTransparentTransfer.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,22 @@ const NamadaToIBCTransparentTransfer = (props) => {
100100
return undefined;
101101
}
102102

103-
const channel = ibcData.channels.find((ch) => {
103+
let channels = ibcData.channels;
104+
let newIBCData = ibcData;
105+
if (props.fromNamadaSelectedAsset?.channel?.channels) {
106+
channels = props.fromNamadaSelectedAsset?.channel?.channels;
107+
newIBCData = props.fromNamadaSelectedAsset?.channel;
108+
}
109+
const channel = channels.find((ch) => {
104110
if (!ch) { return false; }
105111

106-
return (ibcData.chain_1 && ibcData.chain_1.chain_name === targetChain && ch.chain_1 && ch.chain_1.channel_id) ||
107-
(ibcData.chain_2 && ibcData.chain_2.chain_name === targetChain && ch.chain_2 && ch.chain_2.channel_id);
112+
return (newIBCData.chain_1 && newIBCData.chain_1.chain_name === targetChain && ch.chain_1 && ch.chain_1.channel_id) ||
113+
(newIBCData.chain_2 && newIBCData.chain_2.chain_name === targetChain && ch.chain_2 && ch.chain_2.channel_id);
108114
});
109115

110116
if (!channel) { return undefined; }
111117

112-
const chainKey = ibcData.chain_1 && ibcData.chain_1.chain_name === targetChain ? 'chain_1' : 'chain_2';
118+
const chainKey = newIBCData.chain_1 && newIBCData.chain_1.chain_name === targetChain ? 'chain_1' : 'chain_2';
113119
return channel[chainKey] && channel[chainKey].channel_id;
114120
};
115121

src/dummy/ibcList.js

Lines changed: 70 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,64 @@ export const ibcList = [{
183183
coingecko_id: 'stride',
184184
},
185185
],
186+
}, {
187+
name: 'USDC',
188+
value: 'usdc',
189+
chain_name: 'noble',
190+
config: {
191+
RPC_URL: 'https://noble-rpc.polkachu.com',
192+
REST_URL: 'https://noble-api.polkachu.com',
193+
CHAIN_ID: 'noble-1',
194+
CHAIN_NAME: 'noble',
195+
NETWORK: 'mainnet',
196+
COIN_DENOM: 'USDC',
197+
COIN_MINIMAL_DENOM: 'uusdc',
198+
COIN_DECIMALS: 6,
199+
PREFIX: 'noble',
200+
gasPriceStep: {
201+
low: 0.005,
202+
average: 0.005,
203+
high: 0.05,
204+
},
205+
AVG_GAS_STEP: 0.005,
206+
EXPLORER_URL: 'https://www.mintscan.io/noble',
207+
},
208+
channel: {
209+
"chain_1": {
210+
"chain_name": "namada",
211+
},
212+
"chain_2": {
213+
"chain_name": "noble",
214+
},
215+
"channels": [
216+
{
217+
"chain_1": {
218+
"channel_id": "channel-5",
219+
"port_id": "transfer"
220+
},
221+
"chain_2": {
222+
"channel_id": "channel-136",
223+
"port_id": "transfer"
224+
},
225+
"ordering": "unordered",
226+
"version": "ics20-1"
227+
}
228+
]
229+
},
230+
image_URL: 'https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/ethereum/images/usdc.png',
231+
assets: [
232+
{
233+
base: 'uusdc',
234+
name: 'USDC',
235+
display: 'usdc',
236+
symbol: 'USDC',
237+
logo_URIs: {
238+
png: 'https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/ethereum/images/usdc.png',
239+
svg: 'https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/ethereum/images/usdc.svg',
240+
},
241+
coingecko_id: 'usdc',
242+
},
243+
],
186244
// }, {
187245
// name: 'Noble',
188246
// value: 'noble',
@@ -293,9 +351,16 @@ export const feeList = {
293351
};
294352

295353
export const namadaAssets = ibcList.flatMap((chain) =>
296-
chain.assets.map((asset) => ({
297-
...asset,
298-
config: chain.config, // Attach the chain's config to each asset
299-
channel_link: chain.channel_link,
300-
})),
354+
chain.assets.map((asset) => {
355+
const obj = {
356+
...asset,
357+
config: chain.config, // Attach the chain's config to each asset
358+
channel_link: chain.channel_link,
359+
};
360+
if (chain?.channel) {
361+
obj.channel = chain.channel;
362+
}
363+
364+
return obj;
365+
}),
301366
);

0 commit comments

Comments
 (0)