diff options
| author | Adam Soltys <[email protected]> | 2022-11-09 14:26:05 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-11-09 14:26:05 -0800 |
| commit | 2be0c31d324e312f7d0b59e910d864d6a1ae99ff (patch) | |
| tree | 8ca8d3af860f371c256df2c1c1e087acbc1841ba /src/components | |
| parent | 692ffd2b6819f6254f77f819a4072eae61a1d638 (diff) | |
| parent | c31cfed30e022acf1c58d8594a1027524f3079da (diff) | |
| download | coinos-ui-2be0c31d324e312f7d0b59e910d864d6a1ae99ff.tar.gz coinos-ui-2be0c31d324e312f7d0b59e910d864d6a1ae99ff.zip | |
Merge branch 'master' into maven
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/AppHeader.svelte | 4 | ||||
| -rw-r--r-- | src/components/Footer.svelte | 2 | ||||
| -rw-r--r-- | src/components/Numpad.svelte | 6 | ||||
| -rw-r--r-- | src/components/Pin.svelte | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index ec0f5174..728b025a 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -17,7 +17,7 @@ menuButtons = [ { key: 'nav.profile', icon: 'profile', href: `/${user.username}` }, { key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` }, - { key: 'nav.support', icon: 'support', href: `/${user.username}/support` }, + { key: 'nav.support', icon: 'support', href: `/support` }, { key: 'nav.signOut', icon: 'logout', href: `/logout` } ]; @@ -80,7 +80,7 @@ class="bg-white p-2 rounded-full w-12 h-12 drop-shadow-xl border border-black/10 {$page .url.pathname === `/${user.username}` || $page.url.pathname === `/${user.username}/settings` || - $page.url.pathname === `/${user.username}/support` + $page.url.pathname === `/support` ? 'opacity-100' : `opacity-70 hover:opacity-80 ${showMenu ? 'opacity-80' : ''}`}" on:click={() => (showMenu = !showMenu)} diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index 8ef97e65..bf8b8810 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -10,7 +10,7 @@ const companyLinks = [ { url: '/news', titleID: 'news' }, - { url: 'mailto:[email protected]', titleID: 'support' }, + { url: '/support', titleID: 'support' }, { url: '/jobs', titleID: 'jobs' } ]; </script> diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte index 55ce96d4..4f546499 100644 --- a/src/components/Numpad.svelte +++ b/src/components/Numpad.svelte @@ -1,7 +1,7 @@ <script> import { Left, Icon } from '$comp'; import { selectedRate } from '$lib/store'; - import { f, s, post, warning, sats } from '$lib/utils'; + import { f, s, post, warning, sat, sats } from '$lib/utils'; import { t } from '$lib/translations'; export let amount, @@ -36,7 +36,7 @@ $: amountFiatConverted = f(amountSats * ($selectedRate / sats), currency); - $: amountSatsConverted = s(amountFiat / ($selectedRate / sats)); + $: amountSatsConverted = sat(amountFiat / ($selectedRate / sats)); const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0', '<']; @@ -94,7 +94,7 @@ {fiat ? `${symbol}${amountFiat}` : '⚡️' + amountSatsFormatted} </div> <span class="text-secondary mr-1" - >{fiat ? `⚡️${amountSatsConverted}` : amountFiatConverted}</span + >{fiat ? amountSatsConverted : amountFiatConverted}</span > <button type="button" diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte index 2a6bf977..80e003b9 100644 --- a/src/components/Pin.svelte +++ b/src/components/Pin.svelte @@ -1,5 +1,6 @@ <script> import { pin } from '$lib/store'; + let pinCode = ''; let pinInput; @@ -9,7 +10,7 @@ <div class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-20"> <div class="relative top-1/3 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5"> <h1 class="text-center text-2xl font-semibold">Please enter your PIN</h1> - <input bind:value={pinCode} /> + <input bind:value={pinCode} autofocus /> <div class="w-full flex"> <button type="submit" |