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.

Sign up for GitHub

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

Jump to bottom

fix(bridge): minor ui fixes #474

Merged
merged 5 commits into from
Dec 22, 2022
Merged

fix(bridge): minor ui fixes #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6307a1c
fix(bridge): align pending text and loader
shadab-taiko Dec 22, 2022
870bf55
fix(bridge): data and memo overflow
shadab-taiko Dec 22, 2022
2b7b678
fix(bridge): clear memo field after transaction success
shadab-taiko Dec 22, 2022
dffc4a7
fix(bridge): add transition duration to memo toggle
shadab-taiko Dec 22, 2022
d920e6d
fix(bridge): minor faucet button adjustment
shadab-taiko Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/bridge-ui/src/components/AddressDropdown.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@

<div class="dropdown dropdown-bottom dropdown-end">
<label tabindex="0" class="btn btn-md justify-around">
<span class="font-normal flex-1 text-left">
<span class="font-normal flex-1 text-left flex items-center">
{#if $pendingTransactions && $pendingTransactions.length}
{$pendingTransactions.length} Pending
<div class="inline-block">
<span>{$pendingTransactions.length} Pending</span>
<div class="inline-block ml-2">
<LottiePlayer
src="/lottie/loader.json"
autoplay={true}
Expand Down
14 changes: 9 additions & 5 deletions packages/bridge-ui/src/components/ERC20Faucet.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,21 @@
}
</script>

<button class="btn" on:click={mint}>
<Funnel class="mr-2" /> Faucet
</button>
<Tooltip />
<div class="flex items-start">
<button class="btn" on:click={mint}>
<Funnel class="mr-2" /> Faucet
</button>
<button class="inline-block ml-2" on:click={() => (tooltipOpen = true)}>
<Tooltip />
</button>
</div>

<TooltipModal title="{$token.symbol} Faucet" bind:isOpen={tooltipOpen}>
<span slot="body">
<p class="text-left">
You can request 1000 {$token.symbol}. {$token.symbol} is only available to
be minted on Ethereum A1. If you are on Taiko A1, your network will be changed
first. You must have a small amount of ether in your Ethereum A1 wallet to
first. You must have a small amount of ETH in your Ethereum A1 wallet to
send the transaction.
</p>
</span>
Expand Down
6 changes: 3 additions & 3 deletions packages/bridge-ui/src/components/TransactionDetail.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
export let transaction;
</script>
<Modal onClose={() => $showTransactionDetails = null} isOpen={!!transaction} title="Transaction Detail">
<table class="table table-normal w-2/3 m-auto">
<table class="table table-normal w-2/3 m-auto table-fixed border-spacing-0">
<tr>
<td>Tx Hash</td>
<td class="text-right">
Expand Down Expand Up @@ -61,13 +61,13 @@
</tr>
<tr>
<td>Data</td>
<td class="text-right">
<td class="text-right overflow-auto">
{transaction.message.data}
</td>
</tr>
<tr>
<td>Memo</td>
<td class="text-right">
<td class="text-right overflow-auto">
{transaction.message.memo}
</td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions packages/bridge-ui/src/components/form/BridgeForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@

successToast($_("toast.transactionSent"));
await $signer.provider.waitForTransaction(tx.hash, 1);
memo = "";
} catch (e) {
console.log(e);
errorToast($_("toast.errorSendingTransaction"));
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-ui/src/components/form/Memo.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</span>
<input
type="checkbox"
class="toggle rounded-full"
class="toggle rounded-full duration-300"
on:click={() => {
showMemo = !showMemo;
}}
Expand Down