Merge branch 'main' into limit_bridge_call_selector

taikoxyz · Feb 23, 2024 · 4a107b8 · 4a107b8
2 parents da41d9e + 0496ff4
commit 4a107b8
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,6 +1,6 @@
 {
   "packages/branding": "0.3.0",
-  "packages/bridge-ui": "2.9.0",
+  "packages/bridge-ui": "2.9.1",
   "packages/eventindexer": "0.13.0",
   "packages/fork-diff": "0.4.0",
   "packages/guardian-prover-health-check": "0.1.0",

diff --git a/packages/bridge-ui/CHANGELOG.md b/packages/bridge-ui/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [2.9.1](https://github.com/taikoxyz/taiko-mono/compare/bridge-ui-v2.9.0...bridge-ui-v2.9.1) (2024-02-22)
+
+
+### Bug Fixes
+
+* **bridge-ui:** add dependency ([#15999](https://github.com/taikoxyz/taiko-mono/issues/15999)) ([14484a0](https://github.com/taikoxyz/taiko-mono/commit/14484a00c1d59332361fba32b74d39db2ae4b864))
+* **bridge-ui:** fix wrong balance updates on network switch ([#15980](https://github.com/taikoxyz/taiko-mono/issues/15980)) ([b556e00](https://github.com/taikoxyz/taiko-mono/commit/b556e000b25fc8d5405cba77f3eebb4152dc1497))
+* **bridge-ui:** incorrectly detecting bridged tokens ([#16007](https://github.com/taikoxyz/taiko-mono/issues/16007)) ([b151bcb](https://github.com/taikoxyz/taiko-mono/commit/b151bcb2e159ece03da3c2014e35dbbbed7d8410))
+* **bridge-ui:** transactions view styling  ([#15997](https://github.com/taikoxyz/taiko-mono/issues/15997)) ([620a22d](https://github.com/taikoxyz/taiko-mono/commit/620a22dcb1ce77a9335dff8bbe0546c4c5065b23))
+* fix typos in tests and comments ([#15028](https://github.com/taikoxyz/taiko-mono/issues/15028)) ([54bf597](https://github.com/taikoxyz/taiko-mono/commit/54bf597c89a7f22161eeeffd13c20fe0acb4e2d7))
+
 ## [2.9.0](https://github.com/taikoxyz/taiko-mono/compare/bridge-ui-v2-v2.8.0...bridge-ui-v2-v2.9.0) (2023-10-18)
 
 

diff --git a/packages/bridge-ui/config/sample/configuredBridges.example b/packages/bridge-ui/config/sample/configuredBridges.example
@@ -36,7 +36,7 @@
         "signalServiceAddress": "",
         "hops": [
           {
-            "chaind: ,
+            "chaind": ,
             "crossChainSyncAddress": "",
             "signalServiceAddress": "",
           }
@@ -55,7 +55,7 @@
         "signalServiceAddress": "",
         "hops": [
           {
-            "chaind: ,
+            "chaind": ,
             "crossChainSyncAddress": "",
             "signalServiceAddress": "",
           }

diff --git a/...nfig/sample/configuredCustomToken.example → ...fig/sample/configuredCustomTokens.example b/...nfig/sample/configuredCustomToken.example → ...fig/sample/configuredCustomTokens.example
diff --git a/...schemas/configuredCustomToken.schema.json → ...chemas/configuredCustomTokens.schema.json b/...schemas/configuredCustomToken.schema.json → ...chemas/configuredCustomTokens.schema.json
diff --git a/packages/bridge-ui/package.json b/packages/bridge-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bridge-ui",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "private": true,
   "scripts": {
     "dev": "vite dev",

diff --git a/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte b/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
@@ -98,7 +98,10 @@
         }
         if (tokenInfo.canonical && tokenInfo.bridged) {
           // double check we have the correct address for the destination chain and it is not 0x0
-          if (value?.addresses[destChain.id] !== tokenInfo.canonical?.address) {
+          if (
+            value?.addresses[destChain.id] !== tokenInfo.canonical?.address &&
+            value?.addresses[destChain.id] !== zeroAddress
+          ) {
             log('selected token is bridged', value?.addresses[destChain.id]);
             $selectedTokenIsBridged = true;
           } else {

diff --git a/packages/bridge-ui/src/libs/connect/web3modal.ts b/packages/bridge-ui/src/libs/connect/web3modal.ts
@@ -10,6 +10,8 @@ const chainImages = getChainImages();
 export const web3modal = createWeb3Modal({
   wagmiConfig: config,
   projectId,
+  featuredWalletIds: [],
+  excludeWalletIds: ['c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96'],
   // chains,
   chainImages,
   themeVariables: {

diff --git a/packages/bridge-ui/src/libs/wagmi/client.ts b/packages/bridge-ui/src/libs/wagmi/client.ts
@@ -1,4 +1,4 @@
-import { walletConnect } from '@wagmi/connectors';
+import { injected, walletConnect } from '@wagmi/connectors';
 import { createConfig, getPublicClient, http, reconnect } from '@wagmi/core';
 
 import { PUBLIC_WALLETCONNECT_PROJECT_ID } from '$env/static/public';
@@ -15,7 +15,7 @@ const transports = chains.reduce((acc, { id }) => ({ ...acc, [id]: http() }), {}
 export const config = createConfig({
   //@ts-ignore
   chains: [...chains],
-  connectors: [walletConnect({ projectId })],
+  connectors: [walletConnect({ projectId, showQrModal: false }), injected()],
   transports,
 });