-
-
- (activeTab = "bridge")}>Bridge
- (activeTab = "transactions")}
- >Transactions ({$transactions.length})
-
-
- {#if activeTab === "bridge"}
-
-
-
-
- {:else}
-
- {/if}
+
+
+
+ (activeTab = "bridge")}>Bridge
+ (activeTab = "transactions")}
+ >Transactions ({$transactions.length})
+
+ {#if activeTab === "bridge"}
+
+
+
+
+ {:else}
+
+ {/if}
diff --git a/packages/bridge-ui/src/store/transactions.ts b/packages/bridge-ui/src/store/transactions.ts
index f0061fad605..4f5ad98b251 100644
--- a/packages/bridge-ui/src/store/transactions.ts
+++ b/packages/bridge-ui/src/store/transactions.ts
@@ -6,4 +6,5 @@ import type { BridgeTransaction, Transactioner } from "../domain/transactions";
const pendingTransactions = writable
([]);
const transactions = writable([]);
const transactioner = writable();
-export { pendingTransactions, transactions, transactioner };
+const showTransactionDetails = writable();
+export { pendingTransactions, transactions, transactioner, showTransactionDetails };
diff --git a/packages/bridge-ui/src/utils/recommendProcessingFee.ts b/packages/bridge-ui/src/utils/recommendProcessingFee.ts
index 6f8012777de..2a42880159e 100644
--- a/packages/bridge-ui/src/utils/recommendProcessingFee.ts
+++ b/packages/bridge-ui/src/utils/recommendProcessingFee.ts
@@ -27,10 +27,16 @@ export async function recommendProcessingFee(
// to make it enticing, we say 900k.
let gasLimit = ethGasLimit;
if (token.symbol.toLowerCase() !== ETH.symbol.toLowerCase()) {
- const srcChainAddr = token.addresses.find(
+ let srcChainAddr = token.addresses.find(
(t) => t.chainId === fromChain.id
).address;
+ if (!srcChainAddr || srcChainAddr === "0x00") {
+ srcChainAddr = token.addresses.find(
+ (t) => t.chainId === toChain.id
+ ).address;
+ }
+
const chainIdsToTokenVault = get(chainIdToTokenVaultAddress);
const tokenVault = new Contract(
chainIdsToTokenVault.get(fromChain.id),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 92039fc1bc2..e56ae85a5fe 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -46,6 +46,7 @@ importers:
rollup-plugin-polyfill-node: ^0.10.2
svelte: ^3.53.1
svelte-check: ^2.8.0
+ svelte-heros-v2: ^0.3.10
svelte-i18n: ^3.5.1
svelte-jester: ^2.1.5
svelte-loader: ^3.1.2
@@ -100,6 +101,7 @@ importers:
rollup-plugin-polyfill-node: 0.10.2_rollup@2.79.1
svelte: 3.53.1
svelte-check: 2.9.2_abcb4yglsprjylcfcbep3tcqgq
+ svelte-heros-v2: 0.3.10
svelte-jester: 2.3.2_jest@27.5.1+svelte@3.53.1
svelte-loader: 3.1.4_svelte@3.53.1
svelte-preprocess: 4.10.7_axwq5llc4jwkf7awicvy3hu32q
@@ -18728,6 +18730,10 @@ packages:
resolution: {integrity: sha512-oU+Xv7Dl4kRU2kdFjsoPLfJfnt5hUhsFUZtuzI3Ku/f2iAFZqBoEuXOqK3N9ngD4dxQOmN4OKWPHVi3NeAeAfQ==}
dev: true
+ /svelte-heros-v2/0.3.10:
+ resolution: {integrity: sha512-e5ZhYN8blZwfhb2k4KYSfHnbbddonDNsglqMpwXLLwPVPBiJXeGpcPy2zkffq6kvkLS2tYipYOaAPSXimgtuUg==}
+ dev: true
+
/svelte-hmr/0.14.12_svelte@3.53.1:
resolution: {integrity: sha512-4QSW/VvXuqVcFZ+RhxiR8/newmwOCTlbYIezvkeN6302YFRE8cXy0naamHcjz8Y9Ce3ITTZtrHrIL0AGfyo61w==}
engines: {node: ^12.20 || ^14.13.1 || >= 16}