Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bridge-ui): reported issue fixes #12368

Merged
merged 10 commits into from
Jan 12, 2023
15 changes: 15 additions & 0 deletions packages/bridge-ui/src/components/ButtonWithTooltip.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<script lang="ts">
import Tooltip from "./Tooltip.svelte";

export let onClick: () => void;
</script>

<div class="label-text flex items-center">
<slot name="buttonText"></slot>
<button
class="inline-block cursor-pointer ml-1"
on:click={onClick}
>
<Tooltip />
</button>
</div>
48 changes: 25 additions & 23 deletions packages/bridge-ui/src/components/Transaction.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import { fetchSigner, switchNetwork } from "@wagmi/core";
import Tooltip from "./Tooltip.svelte";
import Bridge from "../constants/abi/Bridge";
import ButtonWithTooltip from "./ButtonWithTooltip.svelte";

export let transaction: BridgeTransaction;

Expand Down Expand Up @@ -114,7 +115,7 @@
}, 20 * 1000);
</script>

<tr>
<tr class="text-white">
<td>
<svelte:component this={fromChain.icon} height={18} width={18} />
<span class="ml-2 hidden md:inline-block">{fromChain.name}</span>
Expand All @@ -131,6 +132,8 @@
</td>

<td>
<ButtonWithTooltip onClick={() => ($showMessageStatusTooltip = true)}>
<span slot="buttonText">
{#if !processable}
Pending
{:else if !transaction.receipt && transaction.status === MessageStatus.New}
Expand All @@ -147,29 +150,28 @@
controlsLayout={[]}
/>
</div>
{:else if transaction.receipt && transaction.status === MessageStatus.New}
<span
class="cursor-pointer border rounded p-1"
on:click={async () => await claim(transaction)}
>
Claim
{:else if transaction.receipt && transaction.status === MessageStatus.New}
<span
class="cursor-pointer border rounded p-1"
on:click={async () => await claim(transaction)}
>
Claim
</span>
{:else if transaction.status === MessageStatus.Retriable}
<span
class="cursor-pointer border rounded p-1"
on:click={async () => await claim(transaction)}
>
Retry
</span>
{:else if transaction.status === MessageStatus.Failed}
<!-- todo: releaseTokens() on src bridge with proof from destBridge-->
Failed
{:else if transaction.status === MessageStatus.Done}
<span class="border border-transparent p-0">Claimed</span>
{/if}
</span>
{:else if transaction.status === MessageStatus.Retriable}
<span
class="cursor-pointer border rounded p-1"
on:click={async () => await claim(transaction)}
>
Retry
</span>
{:else if transaction.status === MessageStatus.Failed}
<!-- todo: releaseTokens() on src bridge with proof from destBridge-->
Failed
{:else if transaction.status === MessageStatus.Done}
<span class="border border-transparent p-0">Claimed</span>
{/if}
<span class="inline-block" on:click={() => ($showMessageStatusTooltip = true)}>
<Tooltip />
</span>
</ButtonWithTooltip>
</td>

<td>
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-ui/src/components/Transactions.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{#if $transactions.length}
<table class="table-auto">
<thead>
<tr>
<tr class="text-white">
<th>From</th>
<th>To</th>
<th>Amount</th>
Expand Down
12 changes: 10 additions & 2 deletions packages/bridge-ui/src/components/buttons/SelectToken.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import { ChevronDown } from "svelte-heros-v2";
import { successToast } from "../../utils/toast";

let dropdownElement: HTMLDivElement;

async function select(t: Token) {
if (t === $token) return;
token.set(t);
Expand All @@ -16,15 +18,21 @@
bridgeType.set(BridgeType.ERC20);
}
successToast(`Token changed to ${t.symbol.toUpperCase()}`);

// to close the dropdown on click
dropdownElement?.classList.remove('dropdown-open');
if (document.activeElement instanceof HTMLElement) {
document.activeElement.blur();
}
}
</script>

<div class="dropdown dropdown-bottom">
<div class="dropdown dropdown-bottom" bind:this={dropdownElement}>
<label
tabindex="0"
class="flex items-center justify-center hover:cursor-pointer"
>
<svelte:component this={$token.logoComponent} class="inline-block" />
<svelte:component this={$token.logoComponent} />
<p class="px-2 text-sm">{$token.symbol.toUpperCase()}</p>
<ChevronDown size='20' />
</label>
Expand Down
13 changes: 4 additions & 9 deletions packages/bridge-ui/src/components/form/Memo.svelte
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
<script lang="ts">
import TooltipModal from "../modals/TooltipModal.svelte";
import Tooltip from "../Tooltip.svelte";
import ButtonWithTooltip from "../ButtonWithTooltip.svelte";

export let memo: string = "";
let showMemo: boolean = false;
let tooltipOpen: boolean = false;
</script>

<div class="flex flex-row justify-between mb-2">
<span class="label-text">
Memo
<span
class="inline-block cursor-pointer"
on:click={() => (tooltipOpen = true)}
>
<Tooltip />
</span>
</span>
<ButtonWithTooltip onClick={() => (tooltipOpen = true)}>
<span slot="buttonText">Memo</span>
</ButtonWithTooltip>
<input
type="checkbox"
class="toggle rounded-full duration-300"
Expand Down
10 changes: 4 additions & 6 deletions packages/bridge-ui/src/components/form/ProcessingFee.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import { recommendProcessingFee } from "../../utils/recommendProcessingFee";
import Tooltip from "../Tooltip.svelte";
import TooltipModal from "../modals/TooltipModal.svelte";
import ButtonWithTooltip from "../ButtonWithTooltip.svelte";

export let customFee: string;
export let recommendedFee: string = "0";
Expand Down Expand Up @@ -35,12 +36,9 @@

<div class="my-10">
<div class="flex flex-row justify-between">
<span class="text-left label-text">
{$_("bridgeForm.processingFeeLabel")}
<span class="inline-block" on:click={() => (tooltipOpen = true)}>
<Tooltip />
</span>
</span>
<ButtonWithTooltip onClick={() => (tooltipOpen = true)}>
<span slot="buttonText">{$_("bridgeForm.processingFeeLabel")}</span>
</ButtonWithTooltip>
</div>

{#if $processingFee === ProcessingFeeMethod.CUSTOM}
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-ui/src/components/form/SelectChain.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</script>

<div
class="flex items-center justify-between w-full px-4 md:px-8 py-6 text-sm md:text-lg"
class="flex items-center justify-between w-full px-4 md:px-8 py-6 text-sm md:text-lg text-white"
>
<div class="flex items-center w-2/5 justify-center">
{#if $fromChain}
Expand Down