Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ VITE_APP_BASE_API_URL=https://api.oraidex.io

VITE_APP_KADO_API_KEY=df0d2b3f-d829-4453-a4f6-1d6e8870e8f4
VITE_APP_MIX_PANEL_ENVIRONMENT=acbafd21a85654933cbb0332c5a6f4f8
VITE_APP_STRAPI_BASE_URL=https://nice-fireworks-d26703b63e.strapiapp.com
VITE_APP_STRAPI_BASE_URL=https://cms.oraidex.io
VITE_APP_SENTRY_ENVIRONMENT=production
VITE_APP_SOLANA_RPC=
VITE_APP_SOLANA_WEBSOCKET=
Expand Down
5 changes: 2 additions & 3 deletions src/layouts/NoticeBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,10 @@ export const NoticeBanner = ({

const [bannerIdx, setBannersIdx] = useState(0);
const [banners, setBanners] = useState<Banner[]>([]);

const BASE_URL = import.meta.env.VITE_APP_STRAPI_BASE_URL || 'https://cms.oraidex.io';
useEffect(() => {
const fetchBanners = async () => {
try {
const BASE_URL = import.meta.env.VITE_APP_STRAPI_BASE_URL || 'https://nice-fireworks-d26703b63e.strapiapp.com';
const res = await axios.get('api/banners?populate=*', { baseURL: BASE_URL });
return res.data.data;
} catch (error) {
Expand Down Expand Up @@ -143,7 +142,7 @@ export const NoticeBanner = ({
<div className={styles.noticeWrapper}>
<div className={`${styles.note} ${bannerInfo.headline ? '' : styles.onlyText}`}>
{bannerInfo.media?.data?.attributes?.url && (
<img src={bannerInfo.media.data.attributes.url} alt="banner-icon" width="30" height="30" />
<img src={BASE_URL + bannerInfo.media.data.attributes.url} alt="banner-icon" width="30" height="30" />
)}
<div className={`${styles.text}`}>
{bannerInfo.headline && <span className={styles.title}>{bannerInfo.headline}</span>}
Expand Down
14 changes: 11 additions & 3 deletions src/pages/Balance/TransferConvertToken/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import { NetworkChainId } from '@oraichain/common';
import { BigDecimal, BTC_CONTRACT, parseTokenInfoRawDenom, toDisplay, TokenItemType } from '@oraichain/oraidex-common';
import {
BigDecimal,
BTC_CONTRACT,
parseTokenInfoRawDenom,
toDisplay,
TokenItemType,
solChainId
} from '@oraichain/oraidex-common';
import loadingGif from 'assets/gif/loading.gif';
import ArrowDownIcon from 'assets/icons/arrow.svg?react';
import ArrowDownIconLight from 'assets/icons/arrow_light.svg?react';
Expand Down Expand Up @@ -475,7 +482,7 @@ const TransferConvertToken: FC<{
const isValidateAmount = !convertAmount || convertAmount <= 0 || convertAmount > maxAmount;
const isCosmosToCosmos = token?.cosmosBased && to?.cosmosBased;
const isValidateFee = !msgBridgeFee && !isCosmosToCosmos;
// const isSolBridge = token.chainId === solChainId || toNetworkChainId === solChainId;
const isSolBridge = token.chainId === solChainId || toNetworkChainId === solChainId;
// const isBridgeBitcoin = token.chainId === ('bitcoin' as any) || toNetworkChainId === ('bitcoin' as any);
const isDisabled =
isValidateFee ||
Expand All @@ -484,7 +491,8 @@ const TransferConvertToken: FC<{
!addressTransfer ||
receivedAmount < 0 ||
isBTCLegacy ||
isValidateFeeTon;
isValidateFeeTon ||
isSolBridge;

return (
<button
Expand Down
Loading