diff --git a/.release/.changeset/clean-items-search.md b/.release/.changeset/clean-items-search.md new file mode 100644 index 00000000..b17ac5c1 --- /dev/null +++ b/.release/.changeset/clean-items-search.md @@ -0,0 +1,6 @@ +--- +"@bnb-chain/canonical-bridge-widget": patch +"@bnb-chain/canonical-bridge-sdk": patch +--- + +Fix verification error on cBridge diff --git a/.release/.changeset/eight-spoons-divide.md b/.release/.changeset/eight-spoons-divide.md new file mode 100644 index 00000000..d71bd04c --- /dev/null +++ b/.release/.changeset/eight-spoons-divide.md @@ -0,0 +1,6 @@ +--- +"@bnb-chain/canonical-bridge-widget": patch +"@bnb-chain/canonical-bridge-sdk": patch +--- + +Modify polygon nativeCurrency diff --git a/.release/.changeset/pre.json b/.release/.changeset/pre.json index b0636b63..03d8d848 100644 --- a/.release/.changeset/pre.json +++ b/.release/.changeset/pre.json @@ -9,11 +9,15 @@ "big-candles-breathe", "blue-goats-shave", "brown-suits-matter", + "clean-items-search", "curvy-dingos-end", + "eight-spoons-divide", "large-years-cover", "modern-toys-give", + "shaggy-boats-rest", "short-ants-love", "smooth-vans-work", - "thick-donkeys-kneel" + "thick-donkeys-kneel", + "tidy-days-add" ] } diff --git a/.release/.changeset/shaggy-boats-rest.md b/.release/.changeset/shaggy-boats-rest.md new file mode 100644 index 00000000..842b183f --- /dev/null +++ b/.release/.changeset/shaggy-boats-rest.md @@ -0,0 +1,6 @@ +--- +"@bnb-chain/canonical-bridge-widget": patch +"@bnb-chain/canonical-bridge-sdk": patch +--- + +Fix could not jump to the app & toToken requiring two clicks on mobile diff --git a/.release/.changeset/tidy-days-add.md b/.release/.changeset/tidy-days-add.md new file mode 100644 index 00000000..1d46ff65 --- /dev/null +++ b/.release/.changeset/tidy-days-add.md @@ -0,0 +1,6 @@ +--- +"@bnb-chain/canonical-bridge-widget": patch +"@bnb-chain/canonical-bridge-sdk": patch +--- + +Add timeout to meson api diff --git a/apps/canonical-bridge-server/src/common/constants/chains.ts b/apps/canonical-bridge-server/src/common/constants/chains.ts index 90d7a315..32591257 100644 --- a/apps/canonical-bridge-server/src/common/constants/chains.ts +++ b/apps/canonical-bridge-server/src/common/constants/chains.ts @@ -190,7 +190,7 @@ export const chains: IServerChainConfig[] = [ chainType: 'evm', id: 137, name: 'Polygon', - nativeCurrency: { name: 'MATIC', symbol: 'MATIC', decimals: 18 }, + nativeCurrency: { name: 'POL', symbol: 'POL', decimals: 18 }, rpcUrls: { default: { http: ['https://polygon-rpc.com'] } }, blockExplorers: { default: { name: 'polygonscan', url: 'https://polygonscan.com' }, diff --git a/apps/canonical-bridge-ui/core/wallet/WalletProvider.tsx b/apps/canonical-bridge-ui/core/wallet/WalletProvider.tsx index b9f34b6a..52d25eae 100644 --- a/apps/canonical-bridge-ui/core/wallet/WalletProvider.tsx +++ b/apps/canonical-bridge-ui/core/wallet/WalletProvider.tsx @@ -18,6 +18,7 @@ import * as allChains from 'viem/chains'; import { defaultTronConfig, tronLink } from '@node-real/walletkit/tron'; import { defaultSolanaConfig, + phantomWallet, phantomWallet as solanaPhantomWallet, trustWallet as solanaTrustWallet, } from '@node-real/walletkit/solana'; @@ -62,11 +63,28 @@ export function WalletProvider(props: WalletProviderProps) { const isInDappBrowser = evmWallets.some((e) => e.isInstalled()); if (isInDappBrowser) { + if ( + binanceWeb3Wallet().isInstalled() && + phantomWallet().isInstalled() && + wallet.id === phantomWallet().id + ) { + onOpen(); + return false; + } + if ( + phantomWallet().isInstalled() && + metaMask().isInstalled() && + wallet.id === metaMask().id + ) { + onOpen(); + return false; + } + // Some wallets will set `isMetaMask=true` const counter = evmWallets.filter((e) => e.isInstalled()).length; if ( (counter === 1 && wallet.isInstalled()) || - (counter > 1 && wallet.isInstalled() && wallet.id !== 'metaMask') + (counter > 1 && wallet.isInstalled() && wallet.id !== metaMask().id) ) { return true; } else { diff --git a/apps/canonical-bridge-ui/token-config/mainnet/chains.ts b/apps/canonical-bridge-ui/token-config/mainnet/chains.ts index 1642669a..c54fa216 100644 --- a/apps/canonical-bridge-ui/token-config/mainnet/chains.ts +++ b/apps/canonical-bridge-ui/token-config/mainnet/chains.ts @@ -150,7 +150,7 @@ export const chains: IChainConfig[] = [ chainType: 'evm', id: 137, name: 'Polygon', - nativeCurrency: { name: 'MATIC', symbol: 'MATIC', decimals: 18 }, + nativeCurrency: { name: 'POL', symbol: 'POL', decimals: 18 }, rpcUrls: { default: { http: ['https://polygon-rpc.com'] } }, blockExplorers: { default: { name: 'polygonscan', url: 'https://polygonscan.com' }, diff --git a/packages/canonical-bridge-sdk/CHANGELOG.md b/packages/canonical-bridge-sdk/CHANGELOG.md index 40555e9c..5b7887bf 100644 --- a/packages/canonical-bridge-sdk/CHANGELOG.md +++ b/packages/canonical-bridge-sdk/CHANGELOG.md @@ -1,5 +1,29 @@ # @bnb-chain/canonical-bridge-sdk +## 0.5.0-alpha.16 + +### Patch Changes + +- Modify polygon nativeCurrency + +## 0.5.0-alpha.15 + +### Patch Changes + +- Fix verification error on cBridge + +## 0.5.0-alpha.14 + +### Patch Changes + +- Fix could not jump to the app & toToken requiring two clicks on mobile + +## 0.5.0-alpha.13 + +### Patch Changes + +- Add timeout to meson api + ## 0.5.0-alpha.12 ### Patch Changes diff --git a/packages/canonical-bridge-sdk/package.json b/packages/canonical-bridge-sdk/package.json index 2bf71a5e..49835bf5 100644 --- a/packages/canonical-bridge-sdk/package.json +++ b/packages/canonical-bridge-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bnb-chain/canonical-bridge-sdk", - "version": "0.5.0-alpha.12", + "version": "0.5.0-alpha.16", "description": "canonical bridge sdk", "author": "bnb-chain", "private": false, diff --git a/packages/canonical-bridge-widget/CHANGELOG.md b/packages/canonical-bridge-widget/CHANGELOG.md index d2f21b61..51f99c82 100644 --- a/packages/canonical-bridge-widget/CHANGELOG.md +++ b/packages/canonical-bridge-widget/CHANGELOG.md @@ -1,5 +1,37 @@ # @bnb-chain/canonical-bridge-widget +## 0.6.0-alpha.24 + +### Patch Changes + +- Modify polygon nativeCurrency +- Updated dependencies + - @bnb-chain/canonical-bridge-sdk@0.5.0-alpha.16 + +## 0.6.0-alpha.23 + +### Patch Changes + +- Fix verification error on cBridge +- Updated dependencies + - @bnb-chain/canonical-bridge-sdk@0.5.0-alpha.15 + +## 0.6.0-alpha.22 + +### Patch Changes + +- Fix could not jump to the app & toToken requiring two clicks on mobile +- Updated dependencies + - @bnb-chain/canonical-bridge-sdk@0.5.0-alpha.14 + +## 0.6.0-alpha.21 + +### Patch Changes + +- Add timeout to meson api +- Updated dependencies + - @bnb-chain/canonical-bridge-sdk@0.5.0-alpha.13 + ## 0.6.0-alpha.20 ### Patch Changes diff --git a/packages/canonical-bridge-widget/package.json b/packages/canonical-bridge-widget/package.json index 6c2a55e6..515df5da 100644 --- a/packages/canonical-bridge-widget/package.json +++ b/packages/canonical-bridge-widget/package.json @@ -1,6 +1,6 @@ { "name": "@bnb-chain/canonical-bridge-widget", - "version": "0.6.0-alpha.20", + "version": "0.6.0-alpha.24", "description": "canonical bridge widget", "author": "bnb-chain", "private": false, @@ -46,7 +46,7 @@ "@solana/web3.js": "^1", "tronweb": "^6", "@tronweb3/tronwallet-adapter-react-hooks": "^1", - "@bnb-chain/canonical-bridge-sdk": "^0.5.0-alpha.12" + "@bnb-chain/canonical-bridge-sdk": "^0.5.0-alpha.16" }, "devDependencies": { "@bnb-chain/canonical-bridge-sdk": "workspace:*", diff --git a/packages/canonical-bridge-widget/src/core/components/InfoTooltip/index.tsx b/packages/canonical-bridge-widget/src/core/components/InfoTooltip/index.tsx index 07e3da6f..919d40d8 100644 --- a/packages/canonical-bridge-widget/src/core/components/InfoTooltip/index.tsx +++ b/packages/canonical-bridge-widget/src/core/components/InfoTooltip/index.tsx @@ -12,10 +12,11 @@ import { useMemo } from 'react'; interface InfoTooltipProps extends Omit { iconProps?: IconProps; children?: React.ReactElement; + isDisabled?: boolean; } export const InfoTooltip = (props: InfoTooltipProps) => { - const { iconProps, children, ...restProps } = props; + const { iconProps, children, isDisabled = false, ...restProps } = props; // Make tooltip controlled on mobile devices, default tooltip doesn't work. const isBase = useBreakpointValue({ base: true, md: false }) ?? false; const { isOpen, onOpen, onToggle, onClose } = useDisclosure(); @@ -36,6 +37,8 @@ export const InfoTooltip = (props: InfoTooltipProps) => { }, [children, iconProps, isBase, onClose, onOpen, onToggle]); if (!restProps.label) return null; + if (isDisabled) return <>{clone}; + return ( { bridgeType: 'layerZero', endpoint: '', }, - { bridgeType: 'meson', endpoint: bridgeConfig.http.mesonEndpoint! }, + { + bridgeType: 'meson', + endpoint: bridgeConfig.http.mesonEndpoint!, + timeout, + }, ], }); }, [bridgeConfig.http.apiTimeOut, bridgeConfig.http.mesonEndpoint]); diff --git a/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferConfirmButton.tsx b/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferConfirmButton.tsx index dd0b6cb6..5bb558d8 100644 --- a/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferConfirmButton.tsx +++ b/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferConfirmButton.tsx @@ -148,7 +148,7 @@ export const TransferConfirmButton = ({ toTokenSymbol: toToken?.cBridge?.raw?.token.symbol, toTokenDecimals: toToken?.cBridge?.raw?.token.decimal as number, amount: Number(sendValue), - cBridgeEndpoint: `${CBRIDGE_ENDPOINT}/getTransferConfigsForAll`, + cBridgeEndpoint: `${CBRIDGE_ENDPOINT}/v2/getTransferConfigsForAll`, }); if (!isValidToken) { diff --git a/packages/canonical-bridge-widget/src/modules/transfer/components/ToTokenSection/index.tsx b/packages/canonical-bridge-widget/src/modules/transfer/components/ToTokenSection/index.tsx index 22b06f79..d7cfb0b8 100644 --- a/packages/canonical-bridge-widget/src/modules/transfer/components/ToTokenSection/index.tsx +++ b/packages/canonical-bridge-widget/src/modules/transfer/components/ToTokenSection/index.tsx @@ -72,7 +72,7 @@ function ToTokenItem({ token, isSelected }: { token: IBridgeToken; isSelected: b const tokenUrl = formatTokenUrl(toChain?.tokenUrlPattern, token.address); return ( - +