Skip to content

feat: add transaction status to transaction detail #502

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

Merged
merged 1 commit into from
Mar 18, 2021
Merged

feat: add transaction status to transaction detail #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions packages/shared/components/ActivityDetail.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
import type { Payload } from 'shared/lib/typings/message'

export let id

export let timestamp
export let confirmed
export let locale

export let payload: Payload

export let onBackClick = () => {}

const accounts = getContext<Writable<WalletAccount[]>>('walletAccounts')
Expand Down Expand Up @@ -47,7 +45,7 @@

<div class="flex flex-col h-full min-h-0">
<div
class="px-4 pt-7 pb-3.5 mb-5 rounded-xl text-center items-center justify-center flex flex-row bg-gray-100 dark:bg-gray-900 dark:bg-opacity-50">
class="px-4 pt-7 pb-3.5 mb-5 rounded-xl text-center items-center justify-center flex flex-row bg-gray-100 dark:bg-gray-900 dark:bg-opacity-50 {!confirmed && 'opacity-50'}">
<div class="flex flex-col flex-wrap justify-center items-center text-center">
{#if senderAccount}
<div
Expand Down Expand Up @@ -82,6 +80,10 @@
</div>
</div>
<div class="mb-6 h-full overflow-y-auto">
<div class="mb-5">
<Text secondary>{locale('general.status')}</Text>
<Text smaller>{locale(`general.${confirmed ? 'confirmed' : 'pending'}`)}</Text>
</div>
{#if timestamp}
<div class="mb-5">
<Text secondary>{locale('general.date')}</Text>
Expand Down
3 changes: 3 additions & 0 deletions packages/shared/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,9 @@
"inputAddress": "Input Address",
"receiveAddress": "Receive Address",
"date": "Date",
"status": "Status",
"confirmed": "Confirmed",
"pending": "Pending",
"noAccounts": "You have no accounts, please create one.",
"loadingAccounts": "Loading, please wait...",
"addProfile": "Add Profile",
Expand Down