Skip to content

Commit

Permalink
Merge pull request #1020 from oraidex/fix/relayer-fee-btc
Browse files Browse the repository at this point in the history
show relayer fee btc
  • Loading branch information
haunv3 authored Oct 31, 2024
2 parents 908bcac + c9f579e commit 2c04c63
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/pages/Balance/TransferConvertToken/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const TransferConvertToken: FC<TransferConvertProps> = ({
const [[convertAmount, convertUsd], setConvertAmount] = useState([undefined, 0]);
const [transferLoading, setTransferLoading] = useState(false);
const [copied, setCopied] = useState(false);
const [toNetworkChainId, setToNetworkChainId] = useState<NetworkChainId>();
const [toNetworkChainId, setToNetworkChainId] = useState<NetworkChainId>(bridgeNetworks[0]?.chainId);
const [isOpen, setIsOpen] = useState(false);
const [chainInfo] = useConfigReducer('chainInfo');
const [theme] = useConfigReducer('theme');
Expand Down
5 changes: 5 additions & 0 deletions src/pages/UniversalSwap/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,8 @@ export const isAllowAlphaIbcWasm = (fromToken: TokenItemType, toToken: TokenItem
if ([toToken?.chainId, fromToken?.chainId].includes(COSMOS_CHAIN_ID_COMMON.CELESTIA_CHAIN_ID)) return true;
// cosmos -> cosmos
if (toToken?.cosmosBased && fromToken?.cosmosBased) return true;
// TODO: hardcode case bridge bitcoin
if (toToken?.coinGeckoId === 'bitcoin' && fromToken?.coinGeckoId === 'bitcoin') return true;
return false;
};

Expand Down Expand Up @@ -439,6 +441,9 @@ export const isAllowIBCWasm = (fromToken: TokenItemType, toToken: TokenItemType)
if (fromTokenIsCosmos && toTokenIsCosmos) return false;
// -----------------------------------

// TODO: hardcode case bridge bitcoin
if (toToken?.coinGeckoId === 'bitcoin' && fromToken?.coinGeckoId === 'bitcoin') return false;

// Oraichain -> Oraichain or Cosmos
if (fromTokenIsOraichain) {
if (toToken?.chainId == 'Neutaro-1') return true;
Expand Down

0 comments on commit 2c04c63

Please sign in to comment.