Skip to content

Commit

Permalink
Merge pull request #259 from bnb-chain/revert-258-wenty/binance
Browse files Browse the repository at this point in the history
Revert "feat: Update binance wallet name"
  • Loading branch information
wenty22 authored Jan 7, 2025
2 parents dc01105 + 9376e3d commit 8a1d949
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 42 deletions.
5 changes: 5 additions & 0 deletions .release/.changeset/hot-knives-pay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@bnb-chain/canonical-bridge-widget": patch
---

feat: Send confirm popup
11 changes: 11 additions & 0 deletions .release/.changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"mode": "pre",
"tag": "alpha",
"initialVersions": {
"@bnb-chain/canonical-bridge-sdk": "0.4.6",
"@bnb-chain/canonical-bridge-widget": "0.5.16"
},
"changesets": [
"hot-knives-pay"
]
}
54 changes: 27 additions & 27 deletions apps/canonical-bridge-server/src/shared/web3/web3.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,41 +60,41 @@ export class Web3Service {
}

async getTransferConfigsForAll() {
// try {
const { data } = await this.httpService.axiosRef.get<ITransferConfigsForAll>(
`${CBRIDGE_ENDPOINT}/v2/getTransferConfigsForAll`,
);
return data;
// } catch (e) {
// console.error(`Failed to retrieve cBridge data at ${new Date().getTime()}`, e.message);
// }
try {
const { data } = await this.httpService.axiosRef.get<ITransferConfigsForAll>(
`${CBRIDGE_ENDPOINT}/v2/getTransferConfigsForAll`,
);
return data;
} catch (e) {
console.error(`Failed to retrieve cBridge data at ${new Date().getTime()}`, e.message);
}
}

async getDebridgeChains() {
// try {
const { data } = await this.httpService.axiosRef.get<{ chains: IDebridgeChain[] }>(
`${DEBRIDGE_ENDPOINT}/supported-chains-info`,
);
try {
const { data } = await this.httpService.axiosRef.get<{ chains: IDebridgeChain[] }>(
`${DEBRIDGE_ENDPOINT}/supported-chains-info`,
);

return data;
// } catch (e) {
// console.error(`Failed to retrieve DeBridge chain data at ${new Date().getTime()}`, e.message);
// }
return data;
} catch (e) {
console.error(`Failed to retrieve DeBridge chain data at ${new Date().getTime()}`, e.message);
}
}

async getDebridgeChainTokens(chainId: number) {
// try {
const { data } = await this.httpService.axiosRef.get<{
tokens: Record<string, IDebridgeToken>;
}>(`${DEBRIDGE_ENDPOINT}/token-list?chainId=${chainId}`);
try {
const { data } = await this.httpService.axiosRef.get<{
tokens: Record<string, IDebridgeToken>;
}>(`${DEBRIDGE_ENDPOINT}/token-list?chainId=${chainId}`);

return data;
// } catch (e) {
// console.error(
// `Failed to retrieve DeBridge token data from ${chainId} at ${new Date().getTime()}`,
// e.message,
// );
// }
return data;
} catch (e) {
console.error(
`Failed to retrieve DeBridge token data from ${chainId} at ${new Date().getTime()}`,
e.message,
);
}
}

async getStargateConfigs() {
Expand Down
2 changes: 1 addition & 1 deletion apps/canonical-bridge-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@emotion/css": "~11.13.0",
"@emotion/react": "~11.13.3",
"@emotion/styled": "~11.13.0",
"@node-real/walletkit": "2.7.3",
"@node-real/walletkit": "2.4.1-alpha.8",
"@solana/spl-token": "~0.4.9",
"@solana/wallet-adapter-react": "~0.15.35",
"@solana/web3.js": "~1.95.4",
Expand Down
10 changes: 5 additions & 5 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions packages/canonical-bridge-widget/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# @bnb-chain/canonical-bridge-widget

## 0.5.17

### Patch Changes

- 2179e93: feat: Send confirm popup

## 0.5.17-alpha.0

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/canonical-bridge-widget/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bnb-chain/canonical-bridge-widget",
"version": "0.5.17",
"version": "0.5.17-alpha.0",
"description": "canonical bridge widget",
"author": "bnb-chain",
"private": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ export function useEvmSwitchChain(props?: UseEvmSwitchChainProps) {
connector?.id === 'walletConnect' ||
connector?.id === 'trust' ||
connector?.id === 'binanceWeb3Wallet' ||
connector?.id === 'BinanceW3WSDK' ||
connector?.id === 'binanceWallet'
connector?.id === 'BinanceW3WSDK'
) {
if (
err?.message?.includes('The JSON sent is not a valid Request object') ||
Expand Down

0 comments on commit 8a1d949

Please sign in to comment.