certusone
/
oyster
mirror of https://github.com/certusone/oyster.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: warnings

This commit is contained in:
bartosz-lipinski 2021-03-17 20:49:35 -05:00
parent 2573f525c5
commit 8a1b79a1cb
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/bridge/src/components/Transfer/index.tsx
View File

@ -78,9 +78,11 @@ export const Transfer = () => {
}); });
}, [A, B, mintAddress]); }, [A, B, mintAddress]);
const from = A.chain;
useEffect(() => { useEffect(() => {
const asset = request.asset; const asset = request.asset;
if (!asset || asset === request?.info?.address) { if (!asset || (asset === request?.info?.address && request.from === from)) {
return; return;
} }
@ -89,9 +91,9 @@ export const Transfer = () => {
return; return;
} }
try { try {
const bridgeAddress = programIds().wormhole.bridge;
if(request.from === ASSET_CHAIN.Solana) { if(request.from === ASSET_CHAIN.Solana) {
const bridgeAddress = programIds().wormhole.bridge;
let signer = provider.getSigner(); let signer = provider.getSigner();
let e = WrappedAssetFactory.connect(asset, provider); let e = WrappedAssetFactory.connect(asset, provider);
@ -132,23 +134,29 @@ export const Transfer = () => {
setRequest({ setRequest({
...request, ...request,
from,
asset, asset,
info, info,
}); });
} else { } else {
console.log(asset); console.log('Asset: ', asset);
debugger;
// get user address from asset
//
// let info = { // let info = {
// address: fromAddress, // address: fromAddress,
// name: "", // name: "",
// balance: acc.balance, // balance: acc.balance,
// allowance: 0, // allowance: 0,
// decimals: acc.assetMeta.decimals, // decimals: acc.assetMeta.decimals,
// isWrapped: acc.assetMeta.chain != ChainID.SOLANA, // isWrapped: acc.assetMeta.chain != ChainID.SOLANA,
// chainID: acc.assetMeta.chain, // chainID: acc.assetMeta.chain,
// assetAddress: acc.assetMeta.address, // assetAddress: acc.assetMeta.address,
// // Solana specific // // Solana specific
// mint: acc.mint, // mint: acc.mint,
// }; // };
} }
} catch (e) { } catch (e) {
@ -160,7 +168,7 @@ export const Transfer = () => {
}); });
} }
})(); })();
}, [request, provider]); }, [request, from, provider]);
return ( return (
<> <>

4
packages/bridge/src/views/home/index.tsx
View File

@ -81,7 +81,7 @@ export const HomeView = () => {
style: {}, style: {},
}, },
children: ( children: (
<a href={record.explorer} target="_blank"> <a href={record.explorer} target="_blank" rel="noopener noreferrer" >
{shortenAddress(text, 6)} {shortenAddress(text, 6)}
</a> </a>
), ),
@ -98,7 +98,7 @@ export const HomeView = () => {
style: {}, style: {},
}, },
children: ( children: (
<a href={record.wrappedExplorer} target="_blank"> <a href={record.wrappedExplorer} target="_blank" rel="noopener noreferrer" >
{shortenAddress(text, 6)} {shortenAddress(text, 6)}
</a> </a>
), ),